仓储模块更新

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -242,18 +242,20 @@
     <el-table
       v-loading="loading"
       :data="goodsTransferList"
+      show-summary :summary-method="getSum"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column type="index" label="行号" align="center"/>
+      <el-table-column  label="制单人" align="center" prop="createBy" />
       <el-table-column
-        :show-overflow-tooltip="true"
+        width="180"
         label="货权方"
         align="center"
         prop="fCorpid"
       />
       <el-table-column
-        :show-overflow-tooltip="true"
+        width="180"
         label="转货权方"
         align="center"
         prop="fTocorpid"
@@ -266,7 +268,7 @@
         prop="fMarks"
       />
       <el-table-column
-        :show-overflow-tooltip="true"
+        width="160"
         label="业务编号"
         align="center"
         prop="fBillno"
@@ -2013,6 +2015,29 @@
       this.Jump()
     },
     methods: {
+      //合计
+      getSum(param){
+        const { columns, data } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '总计'
+          } else if ( index ===10 || index ===11 || index ===12 ) {
+            const values = data.map(item => Number(item[column.property]))
+            if (!values.every(value => isNaN(value))) {
+              sums[index] = values.reduce((prev, curr) => {
+                const value = Number(curr)
+                if (!isNaN(value)) {
+                  return prev + curr
+                } else {
+                  return prev
+                }
+              }, 0)
+            }
+          }
+        })
+        return sums
+      },
       /** 查询部门下拉树结构 */
       treeseLect(tree){
         this.queryParams.fWarehouselocid = tree.id

src/views/warehouseBusiness/inStock/index.vue

@@ -268,9 +268,11 @@
       v-loading="loading"
       :data="warehousebillsList"
       @selection-change="handleSelectionChange"
+      show-summary :summary-method="getSum"
     >
       <el-table-column type="selection" width="55" fixed align="center" />
       <el-table-column type="index" label="行号" align="center" fixed/>
+      <el-table-column  label="制单人" align="center" prop="createBy" fixed/>
       <el-table-column
         width="100"
         label="入库状态"
@@ -287,13 +289,14 @@
       </el-table-column>
 
       <el-table-column
-        :show-overflow-tooltip="true"
+
         label="货权方"
         fixed
+        width="180"
         align="center"
         prop="fCorpid"
       />
-      <el-table-column label="提单号" fixed align="center" prop="fMblno" show-overflow-tooltip/>
+      <el-table-column label="提单号" fixed width="100" align="center" prop="fMblno" show-overflow-tooltip/>
       <el-table-column label="品名" fixed :show-overflow-tooltip="true" align="center" prop="fProductName" />
       <el-table-column label="品牌" fixed align="center" prop="fMarks" />
       <el-table-column
@@ -1318,7 +1321,6 @@
             >
               <template slot-scope="scope">
                 <el-input
-                  oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   v-model="scope.row.fPackagespecs"
                   placeholder="包装规格"
                   :disabled="
@@ -3400,6 +3402,29 @@ export default {
     this.adoPt()
   },
   methods: {
+    //合计
+    getSum(param){
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总计'
+        } else if (index ===9  || index ===10 || index ===11 || index ===12 ) {
+          const values = data.map(item => Number(item[column.property]))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+          }
+        }
+      })
+      return sums
+    },
     //仓库电话、仓库联系人带入
     warwhouseTel(){
       for(let item in this.warehouseOptions){
@@ -3917,7 +3942,7 @@ export default {
         this.warehouseDrList.push({
           fCorpid: null,
           fFeeid: null,
-          fFeeUnitid:this.form.fFeetunit,
+          fFeeUnitid:'',
           fQty: null,
           fUnitprice: null,
           fAmount: null,
@@ -3942,7 +3967,7 @@ export default {
         this.warehouseCrList.push({
           fCorpid: null,
           fFeeid: null,
-          fFeeUnitid: this.form.fFeetunit,
+          fFeeUnitid: '',
           fQty: null,
           fUnitprice: null,
           fAmount: null,
@@ -4875,6 +4900,7 @@ export default {
             }
             let formDatae = new window.FormData()
             // 附件数据
+            this.form.fItemsStatus = 4
             this.form.fBillingway = this.form.fFeetunit
             // this.form.fBstime = JSON.stringify(this.form.fBstime)
             formDatae.append('tWarehouseBills', JSON.stringify(this.form))
@@ -4910,9 +4936,11 @@ export default {
     },
     // 打印作业单
     addList() {
+      console.log("111")
       this.$refs["form"].validate((valid) => {
         if (valid) {
           let dataList = []
+          console.log(this.dataListSelection)
           for (let se in this.dataListSelection) {
             if (Number(this.dataListSelection[se].fBillstatus) >= 10) {
               dataList.push(this.dataListSelection[se])
@@ -4925,20 +4953,24 @@ export default {
             formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
             formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
             formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
-            addJoblist(formData).then((response) => {
-              this.formBrowseStatus = true
-              let dataSelection = response.data.warehousebillsitems
-              for (let li in dataSelection) {
-                for (let i in this.dataList) {
-                  if (dataSelection[li].fId === this.dataList[i].fId && this.dataList[i].fBillstatus === 10) {
-                    this.$set(this.dataList[i], 'fBillstatus', dataSelection[li].fBillstatus)
-                    this.$set(this.dataList[i], 'fSerialNumber', dataSelection[li].fSerialNumber)
-                    break
+            for(let index in dataList){
+              if(dataList[index].fBillstatus < 20){
+                addJoblist(formData).then((response) => {
+                  this.formBrowseStatus = true
+                  let dataSelection = response.data.warehousebillsitems
+                  for (let li in dataSelection) {
+                    for (let i in this.dataList) {
+                      if (dataSelection[li].fId === this.dataList[i].fId && this.dataList[i].fBillstatus === 10) {
+                        this.$set(this.dataList[i], 'fBillstatus', dataSelection[li].fBillstatus)
+                        this.$set(this.dataList[i], 'fSerialNumber', dataSelection[li].fSerialNumber)
+                        break
+                      }
+                    }
                   }
-                }
+                  this.$refs.checkout.clearSelection()
+                })
               }
-              this.$refs.checkout.clearSelection()
-            })
+            }
           }
         }
       });
@@ -5148,7 +5180,7 @@ export default {
       }
     },
     // 提交保存保存成功
-    preservation() {
+    preservation(status) {
       console.log(this.form.fBstime)
       this.$refs['form'].validate((valid) => {
         if (valid) {

src/views/warehouseBusiness/outStock/index.vue

@@ -253,9 +253,11 @@
       v-loading="loading"
       :data="warehousebillsList"
       @selection-change="handleSelectionChange"
+      show-summary :summary-method="getSum"
     >
       <el-table-column type="selection" width="55" fixed align="center" />
       <el-table-column type="index" label="行号" fixed align="center" />
+      <el-table-column  label="制单人" align="center" prop="createBy" fixed/>
       <el-table-column
         width="100"
         label="出库状态"
@@ -272,13 +274,13 @@
       </el-table-column>
 
       <el-table-column
-        :show-overflow-tooltip="true"
+        width="180"
         label="货权方"
         fixed
         align="center"
         prop="fCorpid"
       />
-      <el-table-column label="提单号" align="center" prop="fMblno" fixed show-overflow-tooltip/>
+      <el-table-column label="提单号" width="100" align="center" prop="fMblno" fixed show-overflow-tooltip/>
       <el-table-column label="品名" :show-overflow-tooltip="true" fixed align="ceter" prop="fProductName" />
       <el-table-column label="品牌" align="center" fixed prop="fMarks" />
       <el-table-column
@@ -1154,7 +1156,6 @@
             >
               <template slot-scope="scope">
                 <el-input
-                  oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   v-model="scope.row.fPackagespecs"
                   :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
                   placeholder="包装规格"
@@ -3287,6 +3288,29 @@ export default {
     this.adoPt()
   },
   methods: {
+    //合计
+    getSum(param){
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总计'
+        } else if (index ===9  || index ===10 || index ===11 || index ===12 ) {
+          const values = data.map(item => Number(item[column.property]))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+          }
+        }
+      })
+      return sums
+    },
     handleSelect(key, keyPath) {
       this.addAgreement(key)
       this.addAgreements(key)
@@ -4013,7 +4037,7 @@ export default {
         this.warehouseDrList.push({
           fcorpid: this.form.fCorpid,
           ffeeid: null,
-          fFeeunitid: this.form.fFeetunit,
+          fFeeunitid: '',
           fQty: 0,
           funitprice: 0,
           fAmount: 0,
@@ -4049,7 +4073,7 @@ export default {
         this.warehouseCrList.push({
           fcorpid: this.form.fCorpid,
           ffeeid: null,
-          fFeeunitid: this.form.fFeetunit,
+          fFeeunitid: '',
           fQty: 0,
           funitprice: 0,
           fAmount: 0,
@@ -4526,11 +4550,11 @@ export default {
       let fQty = 0;
       let fGrossweight = 0;
       let fNetweight = 0;
-      let volumn = 0;
+      let fCntqty = 0;
       let fixed = 1;
       for (let li in this.dataList) {
         if (this.dataList[li].fQty) {
-          fQty = parseFloat(Number(fQty) + Number(this.dataList[li].fQty)).toFixed(2)
+          fQty = Number(fQty) + Number(this.dataList[li].fQty)
         }
         if (this.dataList[li].fGrossweight) {
           fGrossweight = parseFloat(Number(fGrossweight) + Number(this.dataList[li].fGrossweight)).toFixed(2)
@@ -4539,17 +4563,17 @@ export default {
           fNetweight = parseFloat(Number(fNetweight) + Number(this.dataList[li].fNetweight)).toFixed(2)
         }
         if (this.dataList[li].volumn) {
-          volumn = parseFloat(Number(volumn) + Number(this.dataList[li].volumn)).toFixed(2)
+          fCntqty = parseFloat(Number(fCntqty) + Number(this.dataList[li].fCntqty)).toFixed(2)
         }
       }
       if (row.fFeeunitid == "1") {
-        this.$set(row, 'fQty', this.fQty.toFixed(2))
+        this.$set(row, 'fQty', fQty.toFixed(2))
       } else if (row.fFeeunitid == "2") {
         this.$set(row, 'fQty', (fGrossweight/1000).toFixed(2))
       }else if (row.fFeeunitid == "3") {
         this.$set(row, 'fQty', (fNetweight/1000).toFixed(2))
       }else if(row.fFeeunitid == "7"){
-        this.$set(row, "fQty", this.fCntqty);
+        this.$set(row, "fQty", fCntqty);
       } else {
         this.$set(row, "fQty", 0);
       }
@@ -4723,6 +4747,7 @@ export default {
                 this.form.fQty = this.fQty
                 setTimeout(() => {
                   let formData = new window.FormData()
+                  this.form.fItemsStatus = 4
                   formData.append("warehouseBills", JSON.stringify(this.form));
                   formData.append("warehousebillsitems", JSON.stringify(this.dataList));
                   formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
@@ -4772,20 +4797,26 @@ export default {
             formData.append("warehousebillsitems", JSON.stringify(this.dataList));
             formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
             formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
-            addJoblist(formData).then((response) => {
-              this.formBrowseStatus = true;
-              this.$refs.tableDr.clearSelection();
-              let dataitem = response.data.warehousebillsitems
-              for (let ite in dataitem) {
-                for (let li in this.dataList) {
-                  if (this.dataList[li].fId === dataitem[ite].fId) {
-                    this.$set(this.dataList[li], 'fBillstatus', dataitem[ite].fBillstatus)
-                    this.$set(this.dataList[li], 'fSerialNumber', dataitem[ite].fSerialNumber)
-                    break
+            console.log(dataList)
+            for(let index in dataList){
+              if(dataList[index].fBillstatus < 20){
+                addJoblist(formData).then((response) => {
+                  this.formBrowseStatus = true;
+                  this.$refs.tableDr.clearSelection();
+                  let dataitem = response.data.warehousebillsitems
+                  for (let ite in dataitem) {
+                    for (let li in this.dataList) {
+                      if (this.dataList[li].fId === dataitem[ite].fId) {
+                        this.$set(this.dataList[li], 'fBillstatus', dataitem[ite].fBillstatus)
+                        this.$set(this.dataList[li], 'fSerialNumber', dataitem[ite].fSerialNumber)
+                        break
+                      }
+                    }
                   }
-                }
+                })
+
               }
-            })
+            }
           }
         }
       });

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -253,10 +253,12 @@
     <el-table
       v-loading="loading"
       :data="warehousebillsList"
+      show-summary :summary-method="getSum"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" fixed align="center" />
       <el-table-column type="index" label="行号" fixed align="center" />
+      <el-table-column  label="制单人" align="center" prop="createBy" fixed/>
       <el-table-column
         width="100"
         fixed
@@ -268,18 +270,18 @@
           <span v-if="scope.row.fItemsStatus === 1">计划</span>
           <span v-if="scope.row.fItemsStatus === 2">待调拨</span>
           <span v-if="scope.row.fItemsStatus === 3">调拨中</span>
-          <span v-if="scope.row.fItemsStatus === 6">已调拨</span>
+          <span v-if="scope.row.fItemsStatus === 4">已调拨</span>
         </template>
       </el-table-column>
 
       <el-table-column
-        :show-overflow-tooltip="true"
+        width="180"
         label="货权方"
         fixed
         align="center"
         prop="fCorpid"
       />
-      <el-table-column label="提单号" fixed align="center" prop="fMblno" show-overflow-tooltip/>
+      <el-table-column label="提单号" fixed width="100" align="center" prop="fMblno" show-overflow-tooltip/>
       <el-table-column label="品名" fixed :show-overflow-tooltip="true" align="ceter" prop="fProductName" />
       <el-table-column label="品牌" fixed align="center" prop="fMarks" />
       <el-table-column
@@ -1111,7 +1113,6 @@
             >
               <template slot-scope="scope">
                 <el-input
-                  oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   v-model="scope.row.fPackagespecs"
                   :disabled=" browseStatus ||
                     scope.row.fBillstatus === 20 ||
@@ -1215,7 +1216,6 @@
             >
               <template slot-scope="scope">
                 <el-input
-                  oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   v-model="scope.row.fCntrtype"
                   :disabled=" browseStatus ||
                     scope.row.fBillstatus === 20 ||
@@ -2249,6 +2249,8 @@
               <span v-if="scope.row.fFeeUnitid === 3">净重</span>
               <span v-if="scope.row.fFeeUnitid === 4">尺码</span>
               <span v-if="scope.row.fFeeUnitid === 5">固定</span>
+              <span v-if="scope.row.fFeeUnitid === 6">其它</span>
+              <span v-if="scope.row.fFeeUnitid === 7">箱量</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -3005,6 +3007,29 @@ export default {
     this.Jump()
   },
   methods: {
+    //合计
+    getSum(param){
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总计'
+        } else if (index ===13  || index ===10 || index ===11 || index ===12 ) {
+          const values = data.map(item => Number(item[column.property]))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+          }
+        }
+      })
+      return sums
+    },
     closeDialog() {
       for (let aorp in this.Printinglist) {
         this.$set(
@@ -3731,7 +3756,7 @@ export default {
         this.warehouseDrList.push({
           fcorpid: this.form.fCorpid,
           ffeeid: null,
-          fFeeunitid: '2',
+          fFeeunitid: '',
           fQty: 0,
           funitprice: 0,
           fAmount: 0,
@@ -3754,7 +3779,7 @@ export default {
         this.warehouseCrList.push({
           fcorpid: this.form.fCorpid,
           ffeeid: null,
-          fFeeunitid: '2',
+          fFeeunitid: '',
           fQty: 0,
           funitprice: 0,
           fAmount: 0,
@@ -4376,30 +4401,31 @@ export default {
       let fQty = 0;
       let fGrossweight = 0;
       let fNetweight = 0;
-      let volumn = 0;
+      let fCntqty = 0;
       let fixed = 1;
       for (let li in this.dataList) {
         if (this.dataList[li].fQty) {
           fQty = parseFloat(Number(fQty) + Number(this.dataList[li].fQty)).toFixed(2)
         }
+        console.log(this.dataList[li].fGrossweight)
         if (this.dataList[li].fGrossweight) {
           fGrossweight = parseFloat(Number(fGrossweight) + Number(this.dataList[li].fGrossweight)).toFixed(2)
         }
         if (this.dataList[li].fNetweight) {
           fNetweight = parseFloat(Number(fNetweight) + Number(this.dataList[li].fNetweight)).toFixed(2)
         }
-        if (this.dataList[li].volumn) {
-          volumn = parseFloat(Number(volumn) + Number(this.dataList[li].volumn)).toFixed(2)
+        if (this.dataList[li].fCntqty) {
+          fCntqty = parseFloat(Number(fCntqty) + Number(this.dataList[li].fCntqty)).toFixed(2)
         }
       }
       if (row.fFeeunitid == "1") {
-        this.$set(row, 'fQty', this.fPlanqty.toFixed(2))
+        this.$set(row, 'fQty', fQty)
       } else if (row.fFeeunitid == "2") {
-        this.$set(row, 'fQty', (fPlannetweight/1000).toFixed(2))
+        this.$set(row, 'fQty', (fNetweight/1000).toFixed(2))
       }else if (row.fFeeunitid == "3") {
-        this.$set(row, 'fQty', (fPlangrossweight/1000).toFixed(2))
+        this.$set(row, 'fQty', (fGrossweight/1000).toFixed(2))
       }else if (row.fFeeunitid == "7") {
-        this.$set(row, 'fQty', this.fCntqty.toFixed(2))
+        this.$set(row, 'fQty', fCntqty)
       }else {
         this.$set(row, "fQty", 0);
       }
@@ -4456,6 +4482,91 @@ export default {
                 }
               }
             }
+            getStockTransfer(this.form.fId).then((response) => {
+              if (response.data.warehousebills) {
+                this.form = response.data.warehousebills;
+                this.$set(this.form, "fEta", Date.parse(this.form.fEta));
+                this.$set(this.form, "fStltypeid", this.form.fStltypeid + '');
+                this.$set(this.form, 'fFeetunit', Number(this.form.fFeetunit))
+                this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
+                this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + '');
+                this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
+                if(this.form.fBillstatus > 2){
+                  this.approvalStatus = false
+                }else{
+                  this.approvalStatus = true
+                }
+              }
+              if (response.data.corps) {
+                this.flabourOptions = response.data.corps;
+                this.fMblnoOptions = response.data.corps;
+                this.KHblnoOptions = response.data.corps;
+                this.fCompanyOptIons = response.data.corps;
+                this.fleetOptions = response.data.corps;
+              }
+              if (response.data.feesList) {
+                this.fWbuOptions = response.data.feesList;
+              }
+              if (response.data.warehouse) {
+                this.warehouseOptions = response.data.warehouse;
+              }
+
+              if (response.data.warehouseBillsItem) {
+                this.dataList = response.data.warehouseBillsItem;
+                for (let list in this.dataList) {
+                  if (!this.form.fMblno) {
+                    this.$set(this.form, "fMblno", this.dataList[list].fMblno);
+                  }
+                  if (this.dataList[list].fBillstatus > 10) {
+                    this.formBrowseStatus = true;
+                  }
+                  this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
+                  this.$set(this.dataList[list], 'fBusinessType', this.dataList[list].fBusinessType + '')
+                }
+              }
+              if (response.data.enclosures) {
+                this.relevantAttachments = response.data.enclosures;
+              }
+              if (response.data.warehouse) {
+                this.warehouseDrList = response.data.warehousebillsfeesDr;
+              }
+              if (response.data.warehousebillsfeesDr) {
+                this.warehouseDrList = response.data.warehousebillsfeesDr;
+                for (let dr in this.warehouseDrList) {
+                  this.$set(this.warehouseDrList[dr], "fFeeunitid", this.warehouseDrList[dr].fFeeunitid + '');
+                }
+              }
+              if (response.data.warehousebillsfeesCr) {
+                this.warehouseCrList = response.data.warehousebillsfeesCr;
+                for (let cr in this.warehouseCrList) {
+                  this.$set(this.warehouseCrList[cr], "fFeeunitid", this.warehouseCrList[cr].fFeeunitid + '');
+                }
+              }
+              if (response.data.sysUser) {
+                this.userVal = response.data.sysUser
+              }
+              if (response.data.dept) {
+                this.deptOptions = []
+                this.deptOptions.push(response.data.dept)
+              }
+              if (response.data.feesList) {
+                this.fWbuOptions = response.data.feesList;
+              }
+              if (response.data.goodsList) {
+                this.goodsOptions = response.data.goodsList;
+              }
+              if (response.data.warehouse) {
+                this.warehouseOptions = response.data.warehouse;
+              }
+              if (response.data.warehouseAreas) {
+                this.kqhouseOptions = response.data.warehouseAreas;
+              }
+              this.open = true;
+              this.title = "修改调拨";
+
+              this.warehousesssMethod()
+            });
+
             //保存
             this.$refs['form'].validate((valid) => {
               // if (this.dataList.length === 0) {
@@ -4467,8 +4578,8 @@ export default {
               }
               if (valid) {
                 setTimeout(() => {
-                  this.form.fBillstatus = 2
                   let formData = new window.FormData()
+                  this.form.fItemsStatus = 4
                   // this.dataList.fTransferWarehouselocid = this.treeselectList.fWarehouselocid
                   formData.append("warehouseBills", JSON.stringify(this.form));
                   formData.append("warehousebillsitems", JSON.stringify(this.dataList));
@@ -4492,6 +4603,7 @@ export default {
                   })
                 }, 200);
               }
+              console.log(this.form.fItemsStatus)
             })
           })
         }
@@ -4514,22 +4626,26 @@ export default {
             formData.append("warehousebillsitems", JSON.stringify(dataList));
             formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
             formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
-            addJoblist(formData).then((response) => {
-              this.formBrowseStatus = true;
-              // this.$refs.tableDr.clearSelection();
-              // this.$refs.tableList.clearSelection();
-              let dataSelection = response.data.warehousebillsitems
-              for (let ite in dataSelection) {
-                for (let li in this.dataList) {
-                  if (dataSelection[ite].fId === this.dataList[li].fId && this.dataList[li].fBillstatus === 10) {
-                    this.$set(this.dataList[li], 'fBillstatus', dataSelection[li].fBillstatus)
-                    this.$set(this.dataList[li], 'fSerialNumber', dataSelection[li].fSerialNumber)
-                    break
+            for(let index in dataList){
+              if(dataList[index].fBillstatus < 20) {
+                addJoblist(formData).then((response) => {
+                  this.formBrowseStatus = true;
+                  // this.$refs.tableDr.clearSelection();
+                  // this.$refs.tableList.clearSelection();
+                  let dataSelection = response.data.warehousebillsitems
+                  for (let ite in dataSelection) {
+                    for (let li in this.dataList) {
+                      if (dataSelection[ite].fId === this.dataList[li].fId && this.dataList[li].fBillstatus === 10) {
+                        this.$set(this.dataList[li], 'fBillstatus', dataSelection[li].fBillstatus)
+                        this.$set(this.dataList[li], 'fSerialNumber', dataSelection[li].fSerialNumber)
+                        break
+                      }
+                    }
                   }
-                }
+                  this.$refs.tableList.clearSelection()
+                });
               }
-              this.$refs.tableList.clearSelection()
-            });
+            }
           }
         }
       });
@@ -4780,18 +4896,18 @@ export default {
             return false
           }
         }
-        for (let list in this.warehouseDrList) {
-          if (!this.warehouseDrList[list].fCorpid) {
-            this.$message.error('请选择客户名称')
-            return false
-          }
-        }
-        for (let list in this.warehouseCrList) {
-          if (!this.warehouseCrList[list].fCorpid) {
-            this.$message.error('请选择客户名称')
-            return false
-          }
-        }
+        // for (let list in this.warehouseDrList) {
+        //   if (!this.warehouseDrList[list].fCorpid) {
+        //     this.$message.error('请选择客户名称')
+        //     return false
+        //   }
+        // }
+        // for (let list in this.warehouseCrList) {
+        //   if (!this.warehouseCrList[list].fCorpid) {
+        //     this.$message.error('请选择客户名称')
+        //     return false
+        //   }
+        // }
         if (valid) {
           setTimeout(() => {
             this.form.fBillstatus = status