流程优化

src/views/contractManage/contractBook/components/addDialog.vue

@@ -126,11 +126,11 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item
-            :label="form.type == '2' ? '付款类型' : '收款类型'"
-            prop="receiptPaymentType"
+            label="结算方式"
+            prop="settlementMode"
             style="margin-bottom: 22px"
           >
-            <el-select v-model="form.receiptPaymentType" placeholder="请选择">
+            <!-- <el-select v-model="form.receiptPaymentType" placeholder="请选择">
               <el-option
                 v-for="item in paymentTypeOptions"
                 :key="item.id"
@@ -138,7 +138,14 @@
                 :value="item.id"
               >
               </el-option>
-            </el-select>
+            </el-select> -->
+            <DictSelection
+              dictName="结算方式"
+              clearable
+              v-model="form.settlementMode"
+              style="width: 220px"
+            >
+            </DictSelection>
           </el-form-item>
         </el-col>
       </el-row>
@@ -392,6 +399,7 @@
         ref="inventoryTable"
         :contractStartDate="this.form.contractStartDate"
         :isDiscountTotalPrice="true"
+        :contractBookType="form.type"
       ></inventoryTable>
       <headerTitle
         :title="form.type == '2' ? '付款方式' : '收款方式'"
@@ -495,8 +503,8 @@
         partbLinkName: '',
         partbName: '',
         partbTel: '',
-
-        receiptPaymentType: '',
+        settlementModeName:"",
+        settlementMode:"",
         sourceId: '',
         sourceType: '',
         totalPrice: null,
@@ -529,9 +537,10 @@
           type: [
             { required: true, message: '请选择合同类型', trigger: 'change' }
           ],
-          receiptPaymentType: [
-            { required: true, message: '请选择收付款类型', trigger: 'change' }
+          settlementMode: [
+            { required: true, message: '请选择合结算方式', trigger: 'change' }
           ],
+  
           categoryId: [
             { required: true, message: '请选择合同分类', trigger: 'change' }
           ],
@@ -652,7 +661,7 @@
           partbLinkId: '',
           partbLinkName: '',
           partbEmail: '',
-          partbTel: '',
+          partbTel: ''
         });
         this.getLinkInfo(obj.id);
       },
@@ -700,6 +709,8 @@
       dictChange(val) {
         this.form = Object.assign({}, this.form, {
           typeName: val.dictValue,
+          contractName:'',
+          sourceCode:"",
           partaAddress: '',
           partaEmail: '',
           partaFax: '',
@@ -814,7 +825,7 @@
       },
       //选择客户回调
       changeParent(obj) {
-        console.log(obj,'obj')
+        console.log(obj, 'obj');
 
         this.form = Object.assign({}, this.form, {
           partaId: obj.id,
@@ -824,9 +835,8 @@
           partaLinkName: '',
           partaEmail: '',
           partaTel: '',
-          contractName: obj.simpleName,
-          partaUnifiedSocialCreditCode: obj.unifiedSocialCreditCode,
-          
+          contractName: obj.name,
+          partaUnifiedSocialCreditCode: obj.unifiedSocialCreditCode
         });
         this.getLinkInfo(obj.id);
       },
@@ -882,9 +892,7 @@
       salesmanChange(val, info) {
         this.otherForm.salesmanName = info.name;
       },
-      settlementModeChange(info) {
-        this.otherForm.settlementModeName = info.dictValue;
-      },
+  
       ifChiefChange(value, idx) {
         if (value === 1) {
           this.tableLinkData.forEach((e) => (e.ifChief = 0));
@@ -953,7 +961,10 @@
               this.form.categoryId
             );
           }
-
+          this.form.settlementModeName = this.getDictValue(
+            '结算方式',
+            this.form.settlementMode
+          );
           let commitData = Object.assign(
             {},
             {
@@ -1016,6 +1027,7 @@
       },
 
       changeInquiryList({ data, sourceCode }) {
+        console.log(data,'data')
         this.setValue(data);
         this.$set(this.form, 'sourceCode', sourceCode);
       },

src/views/contractManage/contractBook/components/detailDialog.vue

@@ -73,11 +73,11 @@
               {{ form.contractEndDate }}
             </el-form-item>
             <el-form-item
-              :label="form.type == '2' ? '付款类型：' : '收款类型：'"
-              prop="receiptPaymentType"
+              label="结算方式："
+              prop="payWay"
               style="margin-bottom: 16px"
             >
-              {{ form.receiptPaymentType == 1 ? '固定' : '分期' }}
+              {{ form.settlementModeName }}
             </el-form-item>
             <el-form-item prop="contractFile" label="合同附件：">
               <div v-if="form.contractFile && form.contractFile?.length">
@@ -224,6 +224,7 @@
       <headerTitle title="产品清单"></headerTitle>
       <inventoryTabledetail
         ref="inventoryTabledetailRef"
+        :contractBookType="form.type"
       ></inventoryTabledetail>
 
       <headerTitle

src/views/contractManage/contractBook/components/inquiryList.vue

@@ -181,8 +181,8 @@
         let data = await this.addGenerateContract();
 
         if (data) {
+          data.contractVO.contractName=data.contractVO.partbName
           this.$emit('changeParent', {data,sourceCode:this.selection.map(item=>item.inquiryCode).toString()});
-
           this.handleClose();
         }
       }

src/views/contractManage/contractBook/components/inventoryTable.vue

@@ -457,6 +457,9 @@
       isCustomerMark: {
         default: false,
         type: Boolean
+      },
+      contractBookType: {
+        default: 1
       }
     },
     data() {
@@ -590,7 +593,7 @@
           {
             width: 160,
             prop: 'customerExpectDeliveryDeadline',
-            label: '客户期望交期',
+            label: this.contractBookType == 1 ? '客户期望交期' : '交付日期',
             slot: 'customerExpectDeliveryDeadline',
             headerSlot: 'headerCustomerExpectDeliveryDeadline'
           },
@@ -598,7 +601,8 @@
             width: 160,
             prop: 'produceDeliveryDeadline',
             label: '生产交付交期',
-            slot: 'produceDeliveryDeadline'
+            slot: 'produceDeliveryDeadline',
+            show: this.contractBookType == 1 ? true : false
           },
 
           {
@@ -681,18 +685,19 @@
       }
     },
     watch: {
-      // contractStartDate() {
-      //   this.form.datasource.forEach((item,index) => {
-      //     if (item.deliveryDays&&!item.deliveryDeadline) {
-      //       this.$set(
-      //         this.form.datasource[index],
-      //         'deliveryDeadline',
-      //         this.setDay(item.deliveryDays)
-      //       );
-      //     }
-      //   });
-      // }
+      contractBookType(n) {
+        this.columns.forEach(item=>{
+          if(item.label=='生产交付交期'){
+            item.show=n==1?true:false
+          }
+          if(item.prop=='customerExpectDeliveryDeadline'){
+            item.label=n==1?'客户期望交期':'交付日期'
+          }
+        })
+        this.$refs.table.reRenderTable()
+      }
     },
+
     methods: {
       setDeliveryDays(row, index, type, isAll) {
         if (isAll) {

src/views/contractManage/contractBook/components/inventoryTabledetail.vue

@@ -97,6 +97,9 @@
       isSinglePrice: {
         default: true,
         type: Boolean
+      },
+      contractBookType: {
+        default: 1
       }
     },
     data() {
@@ -216,14 +219,16 @@
           {
             width: 160,
             prop: 'customerExpectDeliveryDeadline',
-            label: '客户期望交期',
+            label: this.contractBookType == 1 ? '客户期望交期' : '交付日期',
             slot: 'customerExpectDeliveryDeadline'
           },
           {
             width: 160,
             prop: 'produceDeliveryDeadline',
             label: '生产交付交期',
-            slot: 'produceDeliveryDeadline'
+            slot: 'produceDeliveryDeadline',
+            show: this.contractBookType == 1 ? true : false
+
           },
           {
             width: 200,

src/views/contractManage/contractBook/components/quotationList.vue

@@ -212,7 +212,7 @@
             categoryName: '',
             contractEndDate: '',
             contractFile: [],
-            contractName: '',
+            contractName: data.contactName,
             contractNo: '',
             contractNumber: '',
             contractStartDate: '',

src/views/purchasingManage/inquiryManage/components/addDialog.vue

@@ -6,7 +6,7 @@
     :visible.sync="visible"
     :title="title"
     :close-on-click-modal="false"
-    width="60%"
+    width="80%"
     @close="cancel"
   >
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
@@ -388,7 +388,6 @@
             delete this.form.id;
           }
           this.form.files = this.form.files || [];
-
           if (this.isUpdate) {
             UpdateInformation(this.form)
               .then((res) => {

src/views/purchasingManage/inquiryManage/components/detailDialog.vue

@@ -7,7 +7,7 @@
     :title="title"
     :close-on-click-modal="false"
     :model="isModal"
-    width="60%"
+    width="80%"
     @close="cancel"
   >
     <div class="switch">

src/views/purchasingManage/inquiryManage/components/inquiryTable.vue

@@ -16,7 +16,6 @@
           :label="form.supplierId"
           style="margin-right;: 10px"
           :disabled="status == 'Detail'"
-          v-if="form.id && isUpdate"
           >是否中标</el-radio
         >
         <el-popconfirm
@@ -221,7 +220,7 @@
           style="margin-bottom: 20px"
           :prop="'resultList.' + scope.$index + '.supplierProductCode'"
           :rules="{
-            required: true,
+            required: false,
             message: '请输入',
             trigger: 'blur'
           }"
@@ -338,7 +337,7 @@
           style="margin-bottom: 20px"
           :prop="'resultList.' + scope.$index + '.measuringUnit'"
           :rules="{
-            required: true,
+            required: false,
             message: '请输入',
             trigger: 'blur'
           }"
@@ -364,9 +363,9 @@
           ></el-input>
         </el-form-item>
       </template>
-      <template v-slot:headerSupplierProductCode="{ column }">
+      <!-- <template v-slot:headerSupplierProductCode="{ column }">
         <span class="is-required">{{ column.label }}</span>
-      </template>
+      </template> -->
       <template v-slot:headerSupplierProductName="{ column }">
         <span class="is-required">{{ column.label }}</span>
       </template>
@@ -420,15 +419,27 @@
       prop: 'supplierProductCode',
       label: '供应商产品编码',
       slot: 'supplierProductCode',
-      headerSlot: 'headerSupplierProductCode',
+      headerSlot: 'headerSupplierProductCode'
     },
     {
       width: 200,
       prop: 'supplierProductName',
       label: '供应商产品名称',
       slot: 'supplierProductName',
-      headerSlot: 'headerSupplierProductName',
+      headerSlot: 'headerSupplierProductName'
+    },
+    {
+      width: 130,
+      prop: 'modelType',
+      label: '型号',
+      slot: 'modelType'
+    },
 
+    {
+      width: 120,
+      prop: 'specification',
+      label: '规格',
+      slot: 'specification'
     },
     {
       width: 80,
@@ -441,8 +452,7 @@
       prop: 'singlePrice',
       label: '销售单价（元）',
       slot: 'singlePrice',
-      headerSlot: 'headerSinglePrice',
-
+      headerSlot: 'headerSinglePrice'
     },
     {
       width: 150,
@@ -457,20 +467,6 @@
       slot: 'measuringUnit'
     },
 
-    {
-      width: 130,
-      prop: 'modelType',
-      label: '型号',
-      slot: 'modelType'
-    },
-
-    {
-      width: 120,
-      prop: 'specification',
-      label: '规格',
-      slot: 'specification'
-    },
-
     // {
     //   width: 130,
     //   prop: 'brand',
@@ -580,8 +576,8 @@
               supplierName: this.form.supplierName,
               supplierId: this.form.supplierId
             });
-          }else{
-            this.radio1=''
+          } else {
+            this.radio1 = '';
           }
         });
       },

src/views/purchasingManage/purchaseNeedManage/components/addDialog.vue

@@ -13,11 +13,12 @@
       <headerTitle title="基本信息"></headerTitle>
       <el-row>
         <el-col :span="12" style="height: 58px">
-          <el-form-item label="需求来源类型" prop="sourceType">
+          <el-form-item label="需求类型" prop="sourceType">
             <DictSelection
               dictName="需求来源类型"
               clearable
               v-model="form.sourceType"
+              :listFormatte="listFormatte"
             >
             </DictSelection>
           </el-form-item>
@@ -199,7 +200,7 @@
           ],
           useTo: [{ required: true, message: '请输入用途', trigger: 'change' }],
           sourceType: [
-            { required: true, message: '请选择需求来源类型', trigger: 'change' }
+            { required: true, message: '请选择需求类型', trigger: 'change' }
           ]
         },
         // 提交状态
@@ -219,6 +220,9 @@
     },
 
     methods: {
+      listFormatte(data) {
+        return data.filter((item) => item.dictCode != 1);
+      },
       // 获取公司数据
       getGroupAll() {
         listOrganizations().then((list) => {
@@ -267,7 +271,6 @@
             //   this.$set(this.form, 'files', data?.files);
             // }
             // 根据部门获取人员
-
             this.$refs.inventoryTable &&
               this.$refs.inventoryTable.putTableValue(data.detailList);
             this.getrequireUser(this.form.requireDeptId);
@@ -281,6 +284,14 @@
         this.visible = true;
         if (type == 'add') {
           this.isUpdate = false;
+          this.$nextTick(() => {
+            this.form.requireDeptId = this.$store.getters.user.info.groupId;
+            this.form.requireUserId = this.$store.getters.user.info.userId;
+            this.form.requireDeptName = this.$store.getters.user.info.groupName;
+            this.form.requireUserName = this.$store.getters.user.info.name;
+
+            this.getrequireUser(this.form.requireDeptId);
+          });
         } else {
           this.isUpdate = true;
           this.getDetailData(row.id);
@@ -338,7 +349,7 @@
 
           this.form.files = this.form.files || [];
 
-          this.form.sourceName = this.getDictValue(
+          this.form.sourceTypeName = this.getDictValue(
             '需求来源类型',
             this.form.sourceType
           );
@@ -383,7 +394,7 @@
       },
       saleOrderSubmit(res) {
         submit({
-          businessId: res.id
+          businessId: this.businessId || res.id
           // productionSupervisorId
         }).then((res) => {
           this.cancel();

src/views/purchasingManage/purchaseNeedManage/components/detailDialog.vue

@@ -39,8 +39,8 @@
         </headerTitle>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="需求来源类型：" prop="contactTel">
-              {{ form?.sourceName }}
+            <el-form-item label="需求类型：" prop="sourceTypeName">
+              {{ form?.sourceTypeName }}
             </el-form-item>
           </el-col>
 

src/views/purchasingManage/purchaseNeedManage/components/inventoryTable.vue

@@ -132,7 +132,7 @@
           <el-input
             v-model="scope.row.measuringUnit"
             placeholder="请输入"
-            disabled
+            :disabled="!!scope.row.productCode"
           ></el-input>
         </el-form-item>
       </template>
@@ -373,19 +373,6 @@
             label: '牌号',
             slot: 'productBrand'
           },
-          {
-            width: 80,
-            prop: 'totalCount',
-            label: '数量',
-            slot: 'totalCount',
-            headerSlot: 'headerTotalCount'
-          },
-          {
-            width: 100,
-            prop: 'measuringUnit',
-            label: '单位',
-            slot: 'measuringUnit'
-          },
           {
             width: 130,
             prop: 'modelType',
@@ -399,6 +386,20 @@
             label: '规格',
             slot: 'specification'
           },
+          {
+            width: 80,
+            prop: 'totalCount',
+            label: '数量',
+            slot: 'totalCount',
+            headerSlot: 'headerTotalCount'
+          },
+          {
+            width: 100,
+            prop: 'measuringUnit',
+            label: '单位',
+            slot: 'measuringUnit'
+          },
+       
           {
             width: 130,
             prop: 'brand',

src/views/purchasingManage/purchaseNeedManage/index.vue

@@ -161,8 +161,8 @@
             minWidth: 200
           },
           {
-            prop: 'sourceType',
-            label: '需求来源类型',
+            prop: 'sourceTypeName',
+            label: '需求类型',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 140

src/views/purchasingManage/purchaseOrder/components/addDialog.vue

@@ -377,7 +377,8 @@
         saleType: '',
         saleTypeName: '',
         totalAmount: '',
-
+        settlementMode: '',
+        settlementModeName: '',
         partaUnifiedSocialCreditCode: '',
         partbUnifiedSocialCreditCode: '',
         partaAddress: '',
@@ -470,7 +471,7 @@
         loading: false,
         // 是否是修改
         isUpdate: false,
-        businessId:''
+        businessId: ''
       };
     },
     computed: {
@@ -563,7 +564,9 @@
               totalPrice,
               discountTotalPrice,
               partaUnifiedSocialCreditCode,
-              partbUnifiedSocialCreditCode
+              partbUnifiedSocialCreditCode,
+              settlementMode,
+              settlementModeName
             } = contractVO;
             this.form = Object.assign({}, this.form, {
               partaAddress,
@@ -583,6 +586,8 @@
               partbName,
               partbTel,
               totalPrice,
+              settlementMode,
+              settlementModeName,
               discountTotalPrice,
               partaUnifiedSocialCreditCode,
               partbUnifiedSocialCreditCode,
@@ -604,7 +609,7 @@
 
       //获取订单详情
       async getpurchaseorderDetail(id) {
-        this.businessId=id
+        this.businessId = id;
         this.loading = true;
         const data = await getpurchaseorderDetail(id);
         this.loading = false;

src/views/purchasingManage/purchaseOrder/invoice/index.vue

@@ -163,7 +163,7 @@
           },
           {
             prop: 'receiveNo',
-            label: '收货编码',
+            label: '收货单编码',
             align: 'center',
             slot: 'receiveNo',
             showOverflowTooltip: true,

src/views/purchasingManage/purchaseOrder/orderAssociation/invoiceList.vue

@@ -65,7 +65,7 @@
           },
           {
             prop: 'receiveNo',
-            label: '收货编码',
+            label: '收货单编码',
             align: 'center',
             slot: 'receiveNo',
             showOverflowTooltip: true,

src/views/purchasingManage/purchaseOrder/orderAssociation/returnGoodsList.vue

@@ -75,7 +75,7 @@
             },
             {
               prop: 'returnNo',
-              label: '退货编码',
+              label: '退货单编码',
               align: 'center',
               slot: 'returnNo',
               showOverflowTooltip: true,
@@ -83,7 +83,7 @@
             },
             {
               prop: 'receiveNo',
-              label: '收货编码',
+              label: '收货单编码',
               align: 'center',
               slot: 'receiveNo',
               showOverflowTooltip: true,

src/views/purchasingManage/purchaseOrder/returnGoods/index.vue

@@ -139,7 +139,7 @@ export default {
           },
           {
             prop: 'returnNo',
-            label: '退货编码',
+            label: '退货单编码',
             align: 'center',
             slot: 'returnNo',
             showOverflowTooltip: true,
@@ -147,7 +147,7 @@ export default {
           },
           {
             prop: 'receiveNo',
-            label: '收货编码',
+            label: '收货单编码',
             align: 'center',
             slot: 'receiveNo',
             showOverflowTooltip: true,

src/views/purchasingManage/purchasePlanManage/components/addDialog.vue

@@ -27,7 +27,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item
-            label="负责人"
+            label="责任人"
             prop="responsibleName"
             style="margin-bottom: 22px"
           >
@@ -41,7 +41,7 @@
 
         <el-col :span="12">
           <el-form-item
-            label="需求来源类型"
+            label="需求类型"
             prop="sourceType"
             style="margin-bottom: 22px"
           >
@@ -50,8 +50,15 @@
               clearable
               v-model="form.sourceType"
               :disabled="!!form.requirementCode"
+              :listFormatte="listFormatte"
+              v-if="form.sourceType != 1"
             >
             </DictSelection>
+            <el-input
+              v-if="form.sourceType == 1"
+              v-model="form.sourceTypeName"
+              disabled
+            ></el-input>
           </el-form-item>
         </el-col>
 
@@ -324,7 +331,7 @@
         ],
         rules: {
           responsibleName: [
-            { required: true, message: '请选择负责人', trigger: 'change' }
+            { required: true, message: '请选择责任人', trigger: 'change' }
           ],
           requireDeptId: [
             { required: true, message: '请选择需求部门', trigger: 'change' }
@@ -354,6 +361,9 @@
     created() {},
 
     methods: {
+      listFormatte(data) {
+        return data.filter((item) => item.dictCode != 1);
+      },
       // 获取公司数据
       getGroupAll() {
         listOrganizations().then((list) => {
@@ -376,7 +386,7 @@
         this.$nextTick(() => {});
         this.getrequireUser(id);
       },
-    
+
       getrequireUser(groupId) {
         if (groupId) {
           this.$refs.directorRef.getList({ groupId });
@@ -492,7 +502,10 @@
           if (!this.isUpdate) {
             delete this.form.id;
           }
-          this.form.sourceName = this.getDictValue('需求来源类型', this.form.sourceType);
+          this.form.sourceTypeName = this.getDictValue(
+            '需求来源类型',
+            this.form.sourceType
+          );
 
           this.form.files = this.form.files || [];
           let commitData = Object.assign({}, this.form, {

src/views/purchasingManage/purchasePlanManage/components/detailDialog.vue

@@ -57,8 +57,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="需求来源类型：" prop="contactTel">
-              {{ form.sourceName }}
+            <el-form-item label="需求类型：" prop="sourceTypeName">
+              {{ form.sourceTypeName }}
             </el-form-item>
           </el-col>
 

src/views/purchasingManage/purchasePlanManage/index.vue

@@ -172,6 +172,13 @@
             showOverflowTooltip: true,
             minWidth: 200
           },
+          {
+            prop: 'sourceTypeName',
+            label: '需求类型',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 140
+          },
           {
             prop: 'requireDeptName',
             label: '需求部门',

src/views/saleManage/quotation/components/addDialog.vue

@@ -620,9 +620,7 @@
       salesmanChange(val, info) {
         this.otherForm.salesmanName = info.name;
       },
-      settlementModeChange(info) {
-        this.otherForm.settlementModeName = info.dictValue;
-      },
+ 
       ifChiefChange(value, idx) {
         if (value === 1) {
           this.tableLinkData.forEach((e) => (e.ifChief = 0));

src/views/saleManage/quotation/components/detailDialog.vue

@@ -145,11 +145,11 @@
           </el-col>
           <el-col :span="6">
             <el-form-item
-              label="付款方式"
+              label="结算方式"
               prop="payWay"
               style="margin-bottom: 22px"
             >
-              {{ form.payWayName }}
+              {{ form.settlementModeName }}
             </el-form-item>
           </el-col>
           <el-col :span="6">

src/views/saleManage/quotation/index.vue

@@ -119,7 +119,7 @@
   import popModal from '@/components/pop-modal';
   import { reviewStatus } from '@/enum/dict';
   import addContractBookDialog from '@/views/contractManage/contractBook/components/addDialog.vue';
-  import { contactTypeTree,contactDetail } from '@/api/saleManage/contact';
+  import { contactTypeTree, contactDetail } from '@/api/saleManage/contact';
 
   import {
     getTableList,
@@ -333,7 +333,7 @@
       async addGenerateContract(row) {
         //获取详情
         const data = await getDetail(row.id);
-        const contact=await contactDetail(data.contactId);
+        const contact = await contactDetail(data.contactId);
         let obj = {
           contractVO: {
             categoryId: '',
@@ -380,9 +380,10 @@
             type: '1',
             typeName: '销售合同',
             updateUsername: '',
-            sourceCode:row.code,
-            contractName: contact.base.simpleName
-
+            sourceCode: row.code,
+            contractName: contact.base.simpleName,
+            settlementModeName: data.settlementModeName,
+            settlementMode: data.settlementMode
           },
           receiptPaymentList: [],
           productList: data.quoteProductList
@@ -400,7 +401,7 @@
       },
       quotationSubmit(res) {
         submit({
-          businessId:res.id
+          businessId: res.id
         }).then((res) => {
           this.$message.success('提交成功！');
           this.reload();

src/views/saleManage/saleOrder/components/addDialog.vue

@@ -561,7 +561,9 @@
               totalPrice,
               discountTotalPrice,
               partaUnifiedSocialCreditCode,
-              partbUnifiedSocialCreditCode
+              partbUnifiedSocialCreditCode,
+              settlementMode,
+              settlementModeName
             } = contractVO;
             this.form = Object.assign({}, this.form, {
               partaAddress,
@@ -586,7 +588,9 @@
               partbUnifiedSocialCreditCode,
               totalAmount: totalPrice,
               payAmount: discountTotalPrice,
-              receiveAddress: partaAddress
+              receiveAddress: partaAddress,
+              settlementMode,
+              settlementModeName
             });
             this.getLinkInfo(partaId);
             this.$refs.inventoryTable &&

src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue

@@ -350,7 +350,8 @@
             delete this.form.id;
           }
           this.form.repliedFiles = this.form.repliedFiles || [];
-
+     
+          
           this.form.replied = this.form.repliedFiles.length > 0 ? 1 : 0;
           let commitData = Object.assign({}, this.form, {
             productList: this.$refs.inventoryTableref.getTableValue()

src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -95,7 +95,7 @@
           </div>
         </el-form-item>
       </template>
-      
+
       <template v-slot:remark="{ row, $index }">
         <el-form-item
           style="margin-bottom: 20px"
@@ -493,7 +493,6 @@
             // this.$message.error('输入的数字不能大于仓库物品数');
             // callback(new Error('输入的数字不能大于仓库物品数'));
             callback();
-
           } else if (Number(value) > row.orderTotalCount) {
             this.$message.error('输入的数字不能大于最大发货值');
             callback(new Error('输入的数字不能大于最大发货值'));
@@ -511,10 +510,11 @@
           v.technicalDrawings = Array.isArray(v.technicalDrawings)
             ? v.technicalDrawings
             : [];
-            v.customerReqFiles = Array.isArray(v.customerReqFiles)
+          v.customerReqFiles = Array.isArray(v.customerReqFiles)
             ? v.customerReqFiles
             : [];
-            
+          v.industryArtFiles = v.industryArtFiles || [];
+          v.otherFiles = v.otherFiles || [];
         });
         return comitDatasource;
       },

src/views/saleManage/saleOrder/invoice/index.vue

@@ -181,7 +181,7 @@
           },
           {
             prop: 'docNo',
-            label: '发货编码',
+            label: '发货单编码',
             align: 'center',
             slot: 'docNo',
             showOverflowTooltip: true,

src/views/saleManage/saleOrder/orderAssociation/invoiceList.vue

@@ -76,7 +76,7 @@
             },
             {
               prop: 'docNo',
-              label: '发货编码',
+              label: '发货单编码',
               align: 'center',
               slot: 'docNo',
               showOverflowTooltip: true,

src/views/saleManage/saleOrder/orderAssociation/returnGoodsList.vue

@@ -81,7 +81,7 @@
             },
             {
               prop: 'returnNo',
-              label: '退货编码',
+              label: '退货单编码',
               align: 'center',
               slot: 'returnNo',
               showOverflowTooltip: true,
@@ -89,7 +89,7 @@
             },
             {
               prop: 'sendNo',
-              label: '发货编码',
+              label: '发货单编码',
               align: 'center',
               slot: 'sendNo',
               showOverflowTooltip: true,

src/views/saleManage/saleOrder/returnGoods/components/inventoryTable.vue

@@ -218,12 +218,12 @@
             label: '仓库名称',
             slot: 'warehouseName'
           },
-          {
-            width: 100,
-            prop: 'warehouseNum',
-            label: '库存',
-            slot: 'warehouseNum'
-          },
+          // {
+          //   width: 100,
+          //   prop: 'warehouseNum',
+          //   label: '库存',
+          //   slot: 'warehouseNum'
+          // },
           {
             width: 120,
             prop: 'sendTotalCount',
@@ -361,12 +361,12 @@
         obj.sendProductId = obj.id;
         obj.id = '';
 
-        if (obj.warehouseId) {
-          obj['warehouseNum'] = await getWarehouseOutStock({
-            warehouseId: obj.warehouseId,
-            code: obj.productCode
-          });
-        }
+        // if (obj.warehouseId) {
+        //   obj['warehouseNum'] = await getWarehouseOutStock({
+        //     warehouseId: obj.warehouseId,
+        //     code: obj.productCode
+        //   });
+        // }
         this.$set(this.form.datasource, this.form.datasource.length, obj);
       },
       validateTotalCount(row) {
@@ -419,18 +419,18 @@
           });
 
           this.form.datasource = data;
-          this.form.datasource.forEach(async (v, index) => {
-            if (v.warehouseId) {
-              this.$set(
-                this.form.datasource[index],
-                'warehouseNum',
-                await getWarehouseOutStock({
-                  warehouseId: v.warehouseId,
-                  code: v.productCode
-                })
-              );
-            }
-          });
+          // this.form.datasource.forEach(async (v, index) => {
+          //   if (v.warehouseId) {
+          //     this.$set(
+          //       this.form.datasource[index],
+          //       'warehouseNum',
+          //       await getWarehouseOutStock({
+          //         warehouseId: v.warehouseId,
+          //         code: v.productCode
+          //       })
+          //     );
+          //   }
+          // });
           this.gettotalAmount();
         }
       },

src/views/saleManage/saleOrder/returnGoods/index.vue

@@ -176,7 +176,7 @@
           },
           {
             prop: 'returnNo',
-            label: '退货编码',
+            label: '退货单编码',
             align: 'center',
             slot: 'returnNo',
             showOverflowTooltip: true,
@@ -184,7 +184,7 @@
           },
           {
             prop: 'sendNo',
-            label: '发货编码',
+            label: '发货单编码',
             align: 'center',
             slot: 'sendNo',
             showOverflowTooltip: true,