流程优化

src/views/bpm/handleTask/components/businessOpportunity/submit.vue

@@ -64,7 +64,7 @@
         type="danger"
         size="mini"
         @click="handleAudit(0)"
-        v-if="!['starter'].includes(taskDefinitionKey)"
+        v-if="!['starter','salesmanApprove'].includes(taskDefinitionKey)"
         >驳回
       </el-button>
 

src/views/bpm/handleTask/components/contractBook/addDialog.vue

@@ -91,19 +91,17 @@
             </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-option
-                v-for="item in paymentTypeOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
+            <DictSelection
+              dictName="结算方式"
+              clearable
+              v-model="form.settlementMode"
+              style="width: 220px"
+            >
+            </DictSelection>
           </el-form-item>
         </el-col>
       </el-row>
@@ -357,6 +355,7 @@
         ref="inventoryTable"
         :contractStartDate="this.form.contractStartDate"
         :isDiscountTotalPrice="true"
+        :contractBookType="form.type"
       ></inventoryTable>
       <headerTitle
         :title="form.type == '2' ? '付款方式' : '收款方式'"
@@ -400,7 +399,8 @@
       paymentList,
       inventoryTable,
       supplierList,
-      parentList,headList
+      parentList,
+      headList
     },
     props: {
       businessId: {
@@ -437,8 +437,8 @@
         partbLinkName: '',
         partbName: '',
         partbTel: '',
-
-        receiptPaymentType: '',
+        settlementModeName: '',
+        settlementMode: '',
         sourceId: '',
         sourceType: '',
         totalPrice: null,
@@ -469,8 +469,8 @@
           type: [
             { required: true, message: '请选择合同类型', trigger: 'change' }
           ],
-          receiptPaymentType: [
-            { required: true, message: '请选择收付款类型', trigger: 'change' }
+          settlementMode: [
+            { required: true, message: '请选择结算方式', trigger: 'change' }
           ],
           categoryId: [
             { required: true, message: '请选择合同分类', trigger: 'change' }
@@ -590,8 +590,7 @@
           partbLinkName: '',
           partbEmail: '',
           partbTel: '',
-          contractName:obj.simpleName
-
+          contractName: obj.simpleName
         });
         this.getLinkInfo(obj.id);
       },
@@ -861,7 +860,10 @@
               this.form.categoryId
             );
           }
-
+          this.form.settlementModeName = this.getDictValue(
+            '结算方式',
+            this.form.settlementMode
+          );
           let commitData = Object.assign(
             {},
             {
@@ -870,7 +872,7 @@
               receiptPaymentList: this.$refs.paymentListTable.getTableValue()
             }
           );
-          console.log(commitData,'commitData')
+          console.log(commitData, 'commitData');
           return commitData;
         } catch (error) {
           console.log(error);

src/views/bpm/handleTask/components/contractBook/detailDialog.vue

@@ -49,12 +49,12 @@
             {{ form.contractEndDate }}
           </el-form-item>
           <el-form-item
-            :label="form.type == '2' ? '付款类型：' : '收款类型：'"
-            prop="receiptPaymentType"
-            style="margin-bottom: 16px"
-          >
-            {{ form.receiptPaymentType == 1 ? '固定' : '分期' }}
-          </el-form-item>
+              label="结算方式："
+              prop="payWay"
+              style="margin-bottom: 16px"
+            >
+              {{ form.settlementModeName }}
+            </el-form-item>
           <el-form-item prop="contractFile" label="合同附件：">
             <div v-if="form.contractFile && form.contractFile?.length">
               <el-link

src/views/bpm/handleTask/components/contractBook/inventoryTable.vue

@@ -18,9 +18,9 @@
             icon="el-icon-plus"
             class="ele-btn-icon"
             @click="handlAdd"
-            v-if="!taskDefinitionKey||taskDefinitionKey!='produceLeader'"
+            v-if="!taskDefinitionKey || taskDefinitionKey != 'produceLeader'"
           >
-            新增{{ taskDefinitionKey }}
+            新增
           </el-button>
           <div class="pricebox">
             <span class="amount" v-if="isSinglePrice"
@@ -52,7 +52,7 @@
           <el-input
             v-model="row.productName"
             placeholder="请输入"
-            :disabled="taskDefinitionKey=='produceLeader'"
+            :disabled="taskDefinitionKey == 'produceLeader'"
             @click.native="handParent(row, $index)"
           ></el-input>
         </el-form-item>
@@ -333,7 +333,7 @@
         <el-form-item
           :prop="'datasource.' + scope.$index + '.produceDeliveryDeadline'"
           :rules="{
-            required:taskDefinitionKey=='produceLeader'?true:false,
+            required: taskDefinitionKey == 'produceLeader' ? true : false,
             message: '请输入',
             trigger: 'change'
           }"
@@ -405,10 +405,13 @@
       <template v-slot:headerCustomerExpectDeliveryDeadline="{ column }">
         <span class="is-required">{{ column.label }}</span>
       </template>
-      <template v-slot:headeProduceDeliveryDeadline="{ column }" v-if="taskDefinitionKey=='produceLeader'">
+      <template
+        v-slot:headeProduceDeliveryDeadline="{ column }"
+        v-if="taskDefinitionKey == 'produceLeader'"
+      >
         <span class="is-required">{{ column.label }}</span>
       </template>
-      
+
       <template
         v-slot:headerSingleWeight="{ column }"
         v-if="taskDefinitionKey === 'technicianApprove'"
@@ -422,7 +425,7 @@
           class="ele-action"
           title="确定要删除吗？"
           @confirm="remove(row)"
-          v-if="taskDefinitionKey!='produceLeader'"
+          v-if="taskDefinitionKey != 'produceLeader'"
         >
           <template v-slot:reference>
             <el-link type="danger" :underline="false" icon="el-icon-delete">
@@ -478,7 +481,10 @@
         type: Boolean
       },
       taskDefinitionKey: {},
-      pageName: { type: String }
+      pageName: { type: String },
+      contractBookType: {
+        default: 1
+      }
     },
     data() {
       const defaultForm = {
@@ -613,7 +619,7 @@
           {
             width: 160,
             prop: 'customerExpectDeliveryDeadline',
-            label: '客户期望交期',
+            label: this.contractBookType == 1 ? '客户期望交期' : '交付日期',
             slot: 'customerExpectDeliveryDeadline',
             headerSlot: 'headerCustomerExpectDeliveryDeadline'
           },
@@ -622,8 +628,9 @@
             prop: 'produceDeliveryDeadline',
             label: '生产交付交期',
             slot: 'produceDeliveryDeadline',
-            headerSlot: 'headeProduceDeliveryDeadline'
-
+            headerSlot: 'headeProduceDeliveryDeadline',
+            show: this.contractBookType == 1 ? true : false
+            // show:this.contractBookType===1?true:false
           },
 
           {
@@ -708,8 +715,8 @@
         if (
           [
             'productionSupervisorApprove1',
-            'productionSupervisorApprove2','produceLeader'
-            
+            'productionSupervisorApprove2',
+            'produceLeader'
           ].includes(this.taskDefinitionKey) ||
           !this.taskDefinitionKey
         ) {
@@ -739,6 +746,19 @@
         return false;
       }
     },
+    watch: {
+      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) {
@@ -819,6 +839,7 @@
           v.technicalDrawings = v.technicalDrawings ? v.technicalDrawings : [];
           v.customerReqFiles = v.customerReqFiles || [];
           v.industryArtFiles = v.industryArtFiles || [];
+
           v.otherFiles = v.otherFiles || [];
         });
         return comitDatasource;
@@ -857,7 +878,11 @@
       //修改回显
       putTableValue(data) {
         let productList =
-          (data && (data.redressProductList||data.quoteProductList || data.productList)) || [];
+          (data &&
+            (data.redressProductList ||
+              data.quoteProductList ||
+              data.productList)) ||
+          [];
         if (productList) {
           productList.forEach((item) => {
             item.guaranteePeriodUnitCode = item.guaranteePeriodUnitCode + '';

src/views/bpm/handleTask/components/inquiryManage/inquiryTable.vue

@@ -220,7 +220,7 @@
           style="margin-bottom: 20px"
           :prop="'resultList.' + scope.$index + '.supplierProductCode'"
           :rules="{
-            required: true,
+            required: false,
             message: '请输入',
             trigger: 'blur'
           }"
@@ -337,7 +337,7 @@
           style="margin-bottom: 20px"
           :prop="'resultList.' + scope.$index + '.measuringUnit'"
           :rules="{
-            required: true,
+            required: false,
             message: '请输入',
             trigger: 'blur'
           }"
@@ -418,6 +418,20 @@
       label: '供应商产品名称',
       slot: 'supplierProductName'
     },
+    
+    {
+      width: 130,
+      prop: 'modelType',
+      label: '型号',
+      slot: 'modelType'
+    },
+
+    {
+      width: 120,
+      prop: 'specification',
+      label: '规格',
+      slot: 'specification'
+    },
     {
       width: 80,
       prop: 'totalCount',
@@ -443,19 +457,6 @@
       slot: 'measuringUnit'
     },
 
-    {
-      width: 130,
-      prop: 'modelType',
-      label: '型号',
-      slot: 'modelType'
-    },
-
-    {
-      width: 120,
-      prop: 'specification',
-      label: '规格',
-      slot: 'specification'
-    },
 
     // {
     //   width: 130,

src/views/bpm/handleTask/components/inquiryManage/inventoryTable.vue

@@ -44,7 +44,6 @@
         <el-form-item
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.productCode'"
-        
         >
           <el-input v-model="scope.row.productCode" disabled></el-input>
         </el-form-item>
@@ -53,7 +52,6 @@
         <el-form-item
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.productCategoryName'"
-        
         >
           <el-input v-model="scope.row.productCategoryName" disabled></el-input>
         </el-form-item>
@@ -240,7 +238,7 @@
         </el-popconfirm>
       </template>
     </ele-pro-table>
-   
+
     <!-- <head-list ref="headRef" @changeParent="changeAnswer"></head-list> -->
   </el-form>
 </template>
@@ -348,9 +346,9 @@
       fileUpload
       // headList
     },
-    props:{
-      acceptUnpack:{
-        default:''
+    props: {
+      acceptUnpack: {
+        default: ''
       }
     },
     data() {

src/views/bpm/handleTask/components/inquiryManage/submit.vue

@@ -128,9 +128,12 @@
           }
           if (this.taskDefinitionKey === 'deptLeaderApprove' && !arr.winnerId) {
             this.$message.error('请选择中标单位');
+            return;
           }
 
           let data = await UpdateInformation(arr);
+          // console.log(data)
+          // return
           if (data.code != '0') {
             return;
           }

src/views/bpm/handleTask/components/purchaseNeedManage/addDialog.vue

@@ -5,15 +5,15 @@
       <el-row>
         <el-col :span="12">
           <el-form-item
-            label="需求来源类型"
+            label="需求类型"
             prop="sourceType"
             style="margin-bottom: 22px"
           >
-            <DictSelection
+          <DictSelection
               dictName="需求来源类型"
               clearable
               v-model="form.sourceType"
-              valueName="dictValue"
+              :listFormatte="listFormatte"
             >
             </DictSelection>
           </el-form-item>
@@ -37,12 +37,11 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12"    style="height: 58px;">
+        <el-col :span="12" style="height: 58px">
           <el-form-item
             label="需求人"
             prop="requireUserId"
-            style="margin-bottom: 0px;"
-            
+            style="margin-bottom: 0px"
           >
             <personSelect
               ref="directorRef"
@@ -177,7 +176,7 @@
           ],
           useTo: [{ required: true, message: '请输入用途', trigger: 'change' }],
           sourceType: [
-            { required: true, message: '请选择需求来源类型', trigger: 'change' }
+            { required: true, message: '请选择需求类型', trigger: 'change' }
           ]
         },
         // 提交状态
@@ -197,6 +196,9 @@
     },
 
     methods: {
+      listFormatte(data) {
+        return data.filter((item) => item.dictCode != 1);
+      },
       // 获取公司数据
       getGroupAll() {
         listOrganizations().then((list) => {
@@ -285,6 +287,11 @@
             return;
           }
           this.form.files = this.form.files || [];
+
+          this.form.sourceTypeName = this.getDictValue(
+            '需求来源类型',
+            this.form.sourceType
+          );
           let commitData = Object.assign({}, this.form, {
             detailList: this.$refs.inventoryTable.getTableValue()
           });
@@ -293,8 +300,7 @@
           console.log(error);
           // 表单验证未通过，不执行保存操作
         }
-      },
-
+      }
     }
   };
 </script>

src/views/bpm/handleTask/components/purchaseNeedManage/detailDialog.vue

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

src/views/bpm/handleTask/components/purchaseNeedManage/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>
@@ -358,18 +358,6 @@
             label: '牌号',
             slot: 'productBrand'
           },
-          {
-            width: 80,
-            prop: 'totalCount',
-            label: '数量',
-            slot: 'totalCount'
-          },
-          {
-            width: 100,
-            prop: 'measuringUnit',
-            label: '单位',
-            slot: 'measuringUnit'
-          },
           {
             width: 130,
             prop: 'modelType',
@@ -383,6 +371,18 @@
             label: '规格',
             slot: 'specification'
           },
+          {
+            width: 80,
+            prop: 'totalCount',
+            label: '数量',
+            slot: 'totalCount'
+          },
+          {
+            width: 100,
+            prop: 'measuringUnit',
+            label: '单位',
+            slot: 'measuringUnit'
+          },
           {
             width: 130,
             prop: 'brand',

src/views/bpm/handleTask/components/purchaseOrder/addDialog.vue

@@ -334,7 +334,8 @@
       contractListDialog,
       inventoryTable,
       parentList,
-      personSelect,headList
+      personSelect,
+      headList
     },
     props: {
       businessId: {
@@ -374,7 +375,9 @@
         partbLinkId: '',
         partbLinkName: '',
         partbName: '',
-        partbTel: ''
+        partbTel: '',
+        settlementMode: '',
+        settlementModeName: ''
       };
 
       return {
@@ -543,7 +546,9 @@
               totalPrice,
               discountTotalPrice,
               partaUnifiedSocialCreditCode,
-              partbUnifiedSocialCreditCode
+              partbUnifiedSocialCreditCode,
+              settlementMode,
+              settlementModeName
             } = contractVO;
             this.form = Object.assign({}, this.form, {
               partaAddress,
@@ -568,7 +573,9 @@
               partbUnifiedSocialCreditCode,
               totalAmount: totalPrice,
               payAmount: discountTotalPrice,
-              receiveAddress: partaAddress
+              receiveAddress: partaAddress,
+              settlementMode,
+              settlementModeName
             });
             this.getLinkInfo(partaId);
 
@@ -754,7 +761,6 @@
           // 表单验证通过，执行保存操作
           this.loading = true;
 
-  
           if (!this.form.contractId) {
             this.form.totalAmount = this.allcountAmount;
           }

src/views/bpm/handleTask/components/purchasePlanManage/detailDialog.vue

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

src/views/bpm/handleTask/components/saleOrder/addDialog.vue

@@ -398,7 +398,9 @@
         partbLinkId: '',
         partbLinkName: '',
         partbName: '',
-        partbTel: ''
+        partbTel: '',
+        settlementMode: '',
+        settlementModeName: ''
       };
 
       return {
@@ -500,8 +502,8 @@
           });
         });
       },
-      listFormatte(data){
-        return data.filter(item=>item.dictCode!==0)
+      listFormatte(data) {
+        return data.filter((item) => item.dictCode !== 0);
       },
       //选择供应商
       changeSupplier(obj) {
@@ -545,7 +547,9 @@
               totalPrice,
               discountTotalPrice,
               partaUnifiedSocialCreditCode,
-              partbUnifiedSocialCreditCode
+              partbUnifiedSocialCreditCode,
+              settlementMode,
+              settlementModeName
             } = contractVO;
             this.form = Object.assign({}, this.form, {
               partaAddress,
@@ -570,7 +574,9 @@
               partbUnifiedSocialCreditCode,
               totalAmount: totalPrice,
               payAmount: discountTotalPrice,
-              receiveAddress: partaAddress
+              receiveAddress: partaAddress,
+              settlementMode,
+              settlementModeName
             });
             this.getLinkInfo(partaId);
             this.$refs.inventoryTable &&

src/views/bpm/handleTask/components/saleOrder/invoice/addInvoiceDialog.vue

@@ -91,7 +91,13 @@
               placeholder="请输入"
             />
           </el-form-item>
-          <el-form-item prop="repliedFiles" label="回执附件">
+          <el-form-item
+            prop="repliedFiles"
+            label="回执附件"
+            :rules="[
+              { required: true, message: '回执附件不能为空', trigger: 'change' }
+            ]"
+          >
             <fileUpload
               v-model="form.repliedFiles"
               module="main"
@@ -469,7 +475,7 @@
           new Promise((resolve, reject) => {
             if (this.taskDefinitionKey == 'salesmanUploadReceipt') {
               resolve(true);
-              return
+              return;
             }
             this.$refs.inventoryTableref.validateForm((valid) => {
               if (!valid) {

src/views/bpm/handleTask/components/saleOrder/invoice/detailDialog.vue

@@ -126,6 +126,42 @@
         <span class="amount">应付金额：{{detailData.payAmount}}元</span>
       </div>
       </template> -->
+      <template v-slot:industryArtFiles="{ row, $index }">
+        <el-form-item
+          style="margin-bottom: 20px"
+          :prop="'datasource.' + $index + '.industryArtFiles'"
+        >
+          <div v-if="row.industryArtFiles && row.industryArtFiles?.length">
+            <el-link
+              v-for="link in row.industryArtFiles"
+              :key="link.id"
+              type="primary"
+              :underline="false"
+              @click="downloadFile(link)"
+            >
+              {{ link.name }}</el-link
+            >
+          </div>
+        </el-form-item>
+      </template>
+      <template v-slot:otherFiles="{ row, $index }">
+        <el-form-item
+          style="margin-bottom: 20px"
+          :prop="'datasource.' + $index + '.otherFiles'"
+        >
+          <div v-if="row.otherFiles && row.otherFiles?.length">
+            <el-link
+              v-for="link in row.otherFiles"
+              :key="link.id"
+              type="primary"
+              :underline="false"
+              @click="downloadFile(link)"
+            >
+              {{ link.name }}</el-link
+            >
+          </div>
+        </el-form-item>
+      </template>
       <template v-slot:technicalDrawings="{ row }">
         <div v-if="row.technicalDrawings && row.technicalDrawings?.length">
           <el-link

src/views/bpm/handleTask/components/saleOrder/invoice/inventoryTable.vue

@@ -90,6 +90,42 @@
           </el-select>
         </el-form-item>
       </template>
+      <template v-slot:industryArtFiles="{ row, $index }">
+        <el-form-item
+          style="margin-bottom: 20px"
+          :prop="'datasource.' + $index + '.industryArtFiles'"
+        >
+          <div v-if="row.industryArtFiles && row.industryArtFiles?.length">
+            <el-link
+              v-for="link in row.industryArtFiles"
+              :key="link.id"
+              type="primary"
+              :underline="false"
+              @click="downloadFile(link)"
+            >
+              {{ link.name }}</el-link
+            >
+          </div>
+        </el-form-item>
+      </template>
+      <template v-slot:otherFiles="{ row, $index }">
+        <el-form-item
+          style="margin-bottom: 20px"
+          :prop="'datasource.' + $index + '.otherFiles'"
+        >
+          <div v-if="row.otherFiles && row.otherFiles?.length">
+            <el-link
+              v-for="link in row.otherFiles"
+              :key="link.id"
+              type="primary"
+              :underline="false"
+              @click="downloadFile(link)"
+            >
+              {{ link.name }}</el-link
+            >
+          </div>
+        </el-form-item>
+      </template>
       <template v-slot:warehouseNum="scope">
         <el-form-item style="margin-bottom: 20px">
           {{ scope.row.warehouseNum }}
@@ -254,15 +290,35 @@
             slot: 'totalPrice'
           },
           {
-            width: 80,
-            prop: 'deliveryDays',
-            label: '交期(天)',
-            slot: 'deliveryDays'
+            width: 120,
+            prop: 'singleWeight',
+            label: '单重',
+            slot: 'singleWeight'
+          },
+          {
+            width: 120,
+            prop: 'totalWeight',
+            label: '总重',
+            slot: 'totalWeight'
+          },
+          {
+            width: 120,
+            prop: 'weightUnit',
+            label: '重量单位',
+            slot: 'weightUnit'
           },
           {
             width: 160,
-            prop: 'deliveryDeadline',
-            label: '交期截止日期'
+            prop: 'customerExpectDeliveryDeadline',
+            label: '客户期望交期',
+            slot: 'customerExpectDeliveryDeadline',
+            headerSlot: 'headerCustomerExpectDeliveryDeadline'
+          },
+          {
+            width: 160,
+            prop: 'produceDeliveryDeadline',
+            label: '生产交付交期',
+            slot: 'produceDeliveryDeadline'
           },
           {
             width: 200,
@@ -293,6 +349,18 @@
             label: '技术图纸',
             slot: 'technicalDrawings'
           },
+          {
+            width: 240,
+            prop: 'industryArtFiles',
+            label: '工艺附件',
+            slot: 'industryArtFiles'
+          },
+          {
+            width: 240,
+            prop: 'otherFiles',
+            label: '其他附件',
+            slot: 'otherFiles'
+          },
           {
             width: 220,
             prop: 'remark',
@@ -380,7 +448,7 @@
           } else if (Number(value) > row.warehouseNum) {
             this.$message.error('输入的数字不能大于仓库物品数');
             callback(new Error('输入的数字不能大于仓库物品数'));
-            callback()
+            callback();
           } else if (Number(value) > row.orderTotalCount) {
             this.$message.error('输入的数字不能大于最大发货值');
             callback(new Error('输入的数字不能大于最大发货值'));
@@ -398,6 +466,11 @@
           v.technicalDrawings = Array.isArray(v.technicalDrawings)
             ? v.technicalDrawings
             : [];
+          v.customerReqFiles = Array.isArray(v.customerReqFiles)
+            ? v.customerReqFiles
+            : [];
+          v.industryArtFiles = v.industryArtFiles || [];
+          v.otherFiles = v.otherFiles || [];
         });
         return comitDatasource;
       },

src/views/bpm/handleTask/components/saleOrder/invoice/submit.vue

@@ -131,11 +131,14 @@
             this.$message.error('回执附件不能为空');
             return;
           }
+          // console.log(arr)
+          // return
           let data = await UpdateSendInformation(arr);
           if (data.code != '0') {
             return;
           }
         }
+        
         if (this.taskDefinitionKey === 'deptLeaderApprove') {
           let arr = await this.getTableValue();
           let ids = arr.productList.map((item) => item.warehouseId);

src/views/bpm/handleTask/components/saleOrder/returnGoods/inventoryTable.vue

@@ -198,12 +198,12 @@
             label: '仓库名称',
             slot: 'warehouseName'
           },
-          {
-            width: 100,
-            prop: 'warehouseNum',
-            label: '库存',
-            slot: 'warehouseNum'
-          },
+          // {
+          //   width: 100,
+          //   prop: 'warehouseNum',
+          //   label: '库存',
+          //   slot: 'warehouseNum'
+          // },
           {
             width: 120,
             prop: 'sendTotalCount',
@@ -345,12 +345,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) {
@@ -404,18 +404,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();
         }
       },