Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/views/agreement/agreementTask/index.vue

@@ -84,10 +84,12 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
+      <el-row>
+        <el-form-item style="float: right;padding: 5px">
+          <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">

src/views/finance/contrast/index.vue

@@ -159,7 +159,7 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="160"
+
       >
         <template slot-scope="scope">
           <el-button

src/views/fleet/plans/AddOrUpdate.vue

@@ -554,11 +554,11 @@
                 <el-table-column
                   label="已派车货量"
                   align="center"
-                  prop="cntrBlcQty"
+                  prop="planQty"
                 >
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.cntrBlcQty"
+                      v-model="scope.row.planQty"
                       placeholder="已派车货量"
                       :disabled="true"
                     />
@@ -1580,7 +1580,9 @@ export default {
         singleaddFtmsorderbillsplans(formData).then((response) => {
           this.msgSuccess("成功提交");
           if (response.code == 200) {
-            row["billStatus"] = response.data.billStatus;
+            // row["billStatus"] = response.data.billStatus;
+            this.$set(row, 'id', response.data.id)
+            this.$set(row, 'billStatus', response.data.billStatus)
           }
         });
       } else {
@@ -1605,6 +1607,7 @@ export default {
         revokeFtmsorderbillsplans(row).then((response) => {
           if (response.code == 200) {
             this.msgSuccess("成功撤回");
+            this.$set(row, 'billStatus', response.data.billStatus)
           }
         });
       }else{
@@ -1622,4 +1625,4 @@ export default {
     },
   },
 };
-</script>
+</script>

src/views/reportManagement/generalLedgerCr/index.vue

@@ -29,18 +29,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审核日期" prop="timeExamine">
-        <el-date-picker
-          v-model="queryParams.timeExamine"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          clearable
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          @keyup.enter.native="handleQuery">
-        </el-date-picker>
-      </el-form-item>
 
       <el-form-item label="结算单位" prop="fToCorpid">
         <el-select
@@ -112,6 +100,18 @@
 
         </el-select>
       </el-form-item>
+      <el-form-item label="审核日期" prop="timeExamine">
+        <el-date-picker
+          v-model="queryParams.timeExamine"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          clearable
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @keyup.enter.native="handleQuery">
+        </el-date-picker>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

src/views/reportManagement/generalLedgerDr/index.vue

@@ -29,19 +29,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审核日期" prop="timeExamine">
-        <el-date-picker
-          v-model="queryParams.timeExamine"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          clearable
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          @keyup.enter.native="handleQuery">
-        </el-date-picker>
-      </el-form-item>
-
       <el-form-item label="结算单位" prop="fToCorpid">
         <el-select
           v-model="queryParams.fToCorpid"
@@ -112,6 +99,18 @@
 
         </el-select>
       </el-form-item>
+      <el-form-item label="审核日期" prop="timeExamine">
+        <el-date-picker
+          v-model="queryParams.timeExamine"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          clearable
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @keyup.enter.native="handleQuery">
+        </el-date-picker>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

src/views/reportManagement/whgenleg/index.vue

@@ -2,11 +2,12 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="仓库" prop="fwarehouseid">
-        <treeselect style="width:160px"
+        <treeselect style="width:200px"
                     v-model="queryParams.fWarehouseLocationid"
                     :options="fWarehouseidOption"
                     @select="treeseLect"
                     :show-count="true"
+                    size="small"
                     placeholder="请选择归属库区" />
       </el-form-item>
       <el-form-item label="货物名称" prop="fgoodsid">
@@ -14,6 +15,7 @@
           v-model="queryParams.fGoodsid"
           filterable
           remote
+          style="width:200px"
           clearable
           size="small"
           :remote-method="goodsRemoteMethod"
@@ -28,23 +30,12 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="入库日期" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.timeInterval"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          clearable
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          @keyup.enter.native="handleQuery">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item label="贸易方式" prop="fTrademodeid">
         <el-select
           v-model="queryParams.fTrademodeid"
           placeholder="请选择贸易方式"
           clearable
+          style="width:200px"
           size="small"
           @keyup.enter.native="handleQuery"
         >
@@ -61,6 +52,7 @@
           v-model="queryParams.fCorpid"
           filterable
           remote
+          style="width:200px"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -80,6 +72,7 @@
           v-model="queryParams.fMblno"
           placeholder="请输入提单号"
           clearable
+          style="width:200px"
           size="small"
           @keyup.enter.native="handleQuery"
         />
@@ -89,10 +82,25 @@
           v-model="queryParams.fCntrno"
           placeholder="请输入箱号"
           clearable
+          style="width:200px"
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="入库日期" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.timeInterval"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          clearable
+          size="small"
+          style="width: 240px"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @keyup.enter.native="handleQuery">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

src/views/warehouseBusiness/agreement/index.vue

@@ -84,10 +84,12 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
+      <el-row>
+        <el-form-item style="float: right;padding: 5px">
+          <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">

src/views/warehouseBusiness/inStock/index.vue

@@ -2792,7 +2792,7 @@
               class="zzss"
               v-else
             >
-              日期：{{ Printinglist[0].fOriginalbilldate }} {{ fBstime.slice(11,19) }}
+              日期：{{ parseTime(Printinglist[0].fBsdate,"{y}-{m}-{d}") }} {{ fBstime.slice(11,19) }}
             </td>
 
             <!-- <td
@@ -2875,22 +2875,21 @@
           <tr>
             <td
               width="900"
-              colspan="2"
+              colspan="4"
               class="zzss"
               style="font-size: 28px; font-weight: bold;"
             >
             </td>
+            <td  width="500"v-if="!fBsdates || !fBstime" colspan="2" style="padding-bottom: 0; font-weight: bold;">入库时间：</td>
+
             <td
+              v-else
               width="500"
               colspan="2"
               style="padding-bottom: 0px; font-weight: bold;"
               class="zzss"
             >
-              入库日期：{{ fBsdates }}
-            </td>
-            <td v-if="!fBstime" colspan="2" style="padding-bottom: 0; font-weight: bold;">入库时间：</td>
-            <td v-else width="900" colspan="2" class="zzss" style="padding-bottom: 0; font-weight: bold;">
-              入库时间：{{ fBstime.slice(11,19) }}
+              入库日期：{{ fBsdates }} {{ fBstime.slice(11,19) }}
             </td>
           </tr>
 
@@ -3777,7 +3776,6 @@ export default {
     showEditDialog_ss() {
       if (this.Printinglist.length > 0) {
         for (let li in this.Printinglist) {
-          console.log(this.Printinglist[li])
           if (this.dataListSelection.length > 0) {
             this.fTruckno = this.dataListSelection[0].fTruckno;
             this.fCntrtype = this.dataListSelection[0].fCntrtype;
@@ -4190,8 +4188,8 @@ export default {
             qty = (this.fGrossweight/1000).toFixed(2)
           } else if (this.dialogWhgenlegList[zhgen].fFeeUnitid == 3) {
             qty = (this.fNetweight/1000).toFixed(2)
-          } else if (this.dialogWhgenlegList[zhgen].fFeeUnitid == 4) {
-            qty = this.fVolumn
+          } else if (this.dialogWhgenlegList[zhgen].fFeeUnitid == 7) {
+            qty = this.fCntqty
           }
           // qty=(qty/1000).toFixed(2);
           let fAmount = parseFloat(Number(this.dialogWhgenlegList[zhgen].fPrice) * Number(qty)).toFixed(2)
@@ -4546,7 +4544,6 @@ export default {
     // 库存总账多选框
     whgenlegSelectionChange(selection) {
       this.dialogWhgenlegList = selection;
-      console.log(selection)
     },
     // 合计
     getSummaries(param) {
@@ -4926,7 +4923,6 @@ export default {
               }
               this.fid = response.data.warehouseBills.fId
               this.getList()
-              console.log("000")
             })
             this.$refs.checkout.clearSelection()
             this.contrOl = true
@@ -4936,11 +4932,9 @@ 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])
@@ -5181,11 +5175,9 @@ export default {
     },
     // 提交保存保存成功
     preservation(status) {
-      console.log(this.form.fBstime)
       this.$refs['form'].validate((valid) => {
         if (valid) {
           if(!this.dataList.length){
-            console.log(status)
             // this.form.fBillstatus = status
             this.form.fNetweight = this.fNetweight
             this.form.fPlanvolumn = this.fPlanvolumn
@@ -5232,12 +5224,10 @@ export default {
               }
               this.fid = response.data.warehouseBills.fId
               this.getList()
-              console.log("000")
             })
           }else{
             for(let item in this.dataList){
               if(!this.dataList[item].fGoodsids){
-                console.log(this.dataList[item].fGoodsids)
                 this.$message.error("请维护第"+ (Number(item)+1) +"行品名！")
                 return false
               }
@@ -5246,19 +5236,11 @@ export default {
                 return false
               }
             }
-            console.log(status)
-            // this.form.fBillstatus = status
+
             this.form.fNetweight = this.fNetweight
             this.form.fPlanvolumn = this.fPlanvolumn
             this.form.fGrossweight = this.fGrossweight
             this.form.fQty = this.fQty
-            // if (!this.form.fId) {
-            //   this.form.fId = this.fid
-            // }
-            // if (!this.form.fBusinessType) {
-            //   this.$message.error('请选择货物属性!')
-            //   return false
-            // }
             for (let list in this.dataList) {
               if (!this.dataList[list].fBusinessType) {
                 this.$message.error('请输入库存明细的货物属性!')
@@ -5267,8 +5249,6 @@ export default {
             }
             let formDatae = new window.FormData()
             // 附件数据
-            // this.form.fBillingway = this.form.fFeetunit
-            console.log(this.form.fBillstatus)
             formDatae.append('tWarehouseBills', JSON.stringify(this.form))
             // 库存明细
             formDatae.append('tWarehousebillsitems', JSON.stringify(this.dataList))
@@ -5279,7 +5259,6 @@ export default {
             // 收款
             formDatae.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
             addWarehousebills(formDatae).then((response) => {
-              console.log(this.form.fBillstatus)
               this.msgSuccess('保存成功')
               this.form = response.data.warehouseBills
               this.$set(this.form, 'fEta', Date.parse(this.form.fEta))
@@ -5294,7 +5273,6 @@ export default {
               }
               this.fid = response.data.warehouseBills.fId
               this.getList()
-              console.log("111")
             })
           }
         }
@@ -5326,6 +5304,34 @@ export default {
             return false
           }
         }
+        for(let item in this.warehouseDrList){
+          if(!this.warehouseDrList[item].fCorpid){
+            this.$message.error("请维护收款信息第"+ (Number(item)+1) +"行客户名称")
+            return false
+          }
+          if(!this.warehouseDrList[item].fFeeid){
+            this.$message.error("请维护收款信息第"+ (Number(item)+1) +"行费用名称")
+            return false
+          }
+          if(!this.warehouseDrList[item].fFeeUnitid){
+            this.$message.error("请维护收款信息第"+ (Number(item)+1) +"行计价单位")
+            return false
+          }
+        }
+        for(let item in this.warehouseCrList){
+          if(!this.warehouseCrList[item].fCorpid){
+            this.$message.error("请维护付款信息第"+ (Number(item)+1) +"行客户名称")
+            return false
+          }
+          if(!this.warehouseCrList[item].fFeeid){
+            this.$message.error("请维护付款信息第"+ (Number(item)+1) +"行费用名称")
+            return false
+          }
+          if(!this.warehouseCrList[item].fFeeUnitid){
+            this.$message.error("请维护付款信息第"+ (Number(item)+1) +"行计价单位")
+            return false
+          }
+        }
         if (valid) {
           this.form.fBillstatus = status
           this.form.fNetweight = this.fNetweight
@@ -5435,7 +5441,6 @@ export default {
     },
     /* 远程模糊查询用户 */
     corpsRemoteMethod(name) {
-      console.log(name)
       if (name == null || name === "") {
         return false;
       }

src/views/warehouseBusiness/outStock/index.vue

@@ -2659,15 +2659,10 @@
               style="padding-bottom: 0px; font-weight: bold;"
             >车辆类型：{{ fCartype }}
             </td>
-            <td
-              width="500"
-              colspan="2"
-              style="padding-bottom: 0px; font-weight: bold;"
-              class="zzss"
-            >
-              出库日期：{{ fBsdate }}
+            <td colspan="2">
+
             </td>
-            <td v-if="!fBstime" colspan="2" style="padding-bottom: 0; font-weight: bold;">出库时间</td>
+            <td  width="500"v-if="!fBsdate || !fBstime" colspan="2" style="padding-bottom: 0; font-weight: bold;">入库时间：</td>
             <td
               v-else
               width="500"
@@ -2675,7 +2670,7 @@
               style="padding-bottom: 0px; font-weight: bold;"
               class="zzss"
             >
-              出库时间：{{ fBstime.slice(11,19) }}
+              出库日期：{{ fBsdate }} {{ fBstime.slice(11,19) }}
             </td>
           </tr>
 <!--          <tr v-for="(item, index) in printinglist" :key="index">-->
@@ -4038,8 +4033,8 @@ export default {
           fcorpid: this.form.fCorpid,
           ffeeid: null,
           fFeeunitid: '',
-          fQty: 0,
-          funitprice: 0,
+          fQty: '',
+          funitprice: '',
           fAmount: 0,
           fCurrency: "RMB",
           fExrate: 1,
@@ -4055,11 +4050,7 @@ export default {
     //仓库电话、仓库联系人带入
     warwhouseTel(){
       for(let item in this.warehouseOptions){
-        console.log(this.form.fWarehouseid)
-        console.log(this.warehouseOptions)
         if(this.form.fWarehouseid == this.warehouseOptions[item].fId){
-
-          console.log(this.warehouseOptions[item].fTel)
           this.form.fTel = this.warehouseOptions[item].fTel
           this.form.fContacts = this.warehouseOptions[item].fContacts
         }
@@ -4118,7 +4109,6 @@ export default {
       });
       this.loading = true;
       listWarehousebills(this.queryParams).then((response) => {
-        console.log(response)
         this.warehousebillsList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -4321,7 +4311,6 @@ export default {
       }
       getWarehousebills(fId).then((response) => {
         if (response.data.warehousebills) {
-          console.log(response)
           this.form = response.data.warehousebills;
           this.before = this.form.createBy
           this.$set(this.form,'fCartype',response.data.warehousebills.fCartype + '')
@@ -4562,7 +4551,7 @@ export default {
         if (this.dataList[li].fNetweight) {
           fNetweight = parseFloat(Number(fNetweight) + Number(this.dataList[li].fNetweight)).toFixed(2)
         }
-        if (this.dataList[li].volumn) {
+        if (this.dataList[li].fCntqty) {
           fCntqty = parseFloat(Number(fCntqty) + Number(this.dataList[li].fCntqty)).toFixed(2)
         }
       }
@@ -4646,25 +4635,19 @@ export default {
             this.dataWithdrawList = []
             this.dataListSelection = []
             this.msgSuccess("出库成功");
-            console.log(this.form.fBillstatus)
             this.$refs.tableList.clearSelection();
             this.formBrowseStatus = true;
             this.contrOl = true
             this.form.fBillstatus = 40
             for (let li in listSelection) {
               for (let i in this.dataList) {
-                console.log(this.dataList[i].fId)
-                console.log(listSelection[li].fId)
                 if (listSelection[li].fId == this.dataList[i].fId) {
                   this.$set(this.dataList[i], "fBillstatus", 40);
-                  console.log(this.dataList[i].fBillstatus)
                 }
               }
             }
-            console.log(this.form.fBillstatus)
             getWarehousebills(this.form.fId).then((response) => {
               if (response.data.warehousebills) {
-                console.log(response)
                 this.form = response.data.warehousebills;
                 this.before = this.form.createBy
                 this.$set(this.form,'fCartype',response.data.warehousebills.fCartype + '')
@@ -4729,7 +4712,6 @@ export default {
               this.open = true;
               this.title = "修改仓入库";
               this.warehousesssMethod()
-              console.log(this.form.fBillstatus)
             });
 
             this.$refs['form'].validate((valid) => {
@@ -4754,7 +4736,6 @@ export default {
                   formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
                   formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
                   addWarehousebills(formData).then((response) => {
-                    console.log(response.data.warehouseBills)
                     this.form = response.data.warehouseBills
                     this.$set(this.form,'fCartype',response.data.warehouseBills.fCartype + '')
                     this.$set(this.form, 'fEta', Date.parse(this.form.fEta))
@@ -4772,7 +4753,6 @@ export default {
                     }
                   })
                 }, 200);
-                console.log(this.form.fBillstatus)
               }
             })
           });
@@ -4797,7 +4777,6 @@ export default {
             formData.append("warehousebillsitems", JSON.stringify(this.dataList));
             formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
             formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
-            console.log(dataList)
             for(let index in dataList){
               if(dataList[index].fBillstatus < 20){
                 addJoblist(formData).then((response) => {
@@ -5019,9 +4998,7 @@ export default {
             formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
             addWarehousebills(formData).then((response) => {
               this.msgSuccess('保存成功')
-              console.log(response.data.warehouseBills)
               this.form = response.data.warehouseBills
-              console.log(this.form.fBusinessType)
               this.$set(this.form,'fCartype',response.data.warehouseBills.fCartype + '')
               this.$set(this.form, 'fEta', Date.parse(this.form.fEta))
               this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
@@ -5031,7 +5008,6 @@ export default {
               this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
               this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
               this.$set(this.form, 'fBusinessType', this.form.fBusinessType + '')
-              console.log(this.form.fBusinessType)
               this.dataList = response.data.warehousebillsitems
               for (let list in this.dataList) {
                 this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -2301,23 +2301,13 @@
           <tr>
             <td
               width="900"
-              colspan="2"
+              colspan="4"
               class="zzss"
               style="font-size: 28px; font-weight: bold"
             >
             </td>
-            <td
-              width="500"
-              colspan="2"
-              style="padding-bottom: 0px; font-weight: bold;"
-              class="zzss"
-            >
-              调拨日期：{{ form.fBsdates }}
-            </td>
-            <td v-if="!fBstime"
-                colspan="2"
-                style="padding-bottom: 0px; font-weight: bold;"
-            >调拨时间：</td>
+            <td  width="500"v-if="this.printinglist.length === 0 || !fBstime" colspan="2" style="padding-bottom: 0; font-weight: bold;">入库时间：111</td>
+
             <td
               v-else
               width="500"
@@ -2325,7 +2315,7 @@
               style="padding-bottom: 0px; font-weight: bold;"
               class="zzss"
             >
-              调拨时间：{{ fBstime.slice(11,19) }}
+              调拨日期：{{ parseTime(this.printinglist[0].fBsdate,"{y}-{m}-{d}") }} {{ fBstime.slice(11,19) }}
             </td>
           </tr>
 <!--          <tr v-for="(item, index) in printinglist" :key="index">-->
@@ -2438,19 +2428,18 @@
             colspan="4"
             style="padding-bottom: 0px; font-weight: bold;"
             class="zzss"
-            v-if="printinglist.length === 0 || !fBstime"
+            v-if="this.printinglist.length === 0"
           >
-            日期：
+            日期：11
           </td>
           <td
-
             width="500"
             colspan="4"
             style="padding-bottom: 0px; font-weight: bold;"
             class="zzss"
             v-else
           >
-            日期：{{ printinglist[0].fOriginalbilldate }} {{ fBstime.slice(11,19) }}
+            日期：{{ parseTime(this.printinglist[0].fBsdate,"{y}-{m}-{d}") }} {{ fBstime.slice(11,19) }}
           </td>
 
           <!-- <td
@@ -3102,6 +3091,7 @@ export default {
             this.$message.error('请选择相同车号')
             return false
           }
+          this.fBstime = this.form.fBstime
         }
         this.editDialogVisible_ss = true
       } else {
@@ -3757,8 +3747,8 @@ export default {
           fcorpid: this.form.fCorpid,
           ffeeid: null,
           fFeeunitid: '',
-          fQty: 0,
-          funitprice: 0,
+          fQty: '',
+          funitprice: '',
           fAmount: 0,
           fCurrency: "RMB",
           fExrate: 1,
@@ -3780,8 +3770,8 @@ export default {
           fcorpid: this.form.fCorpid,
           ffeeid: null,
           fFeeunitid: '',
-          fQty: 0,
-          funitprice: 0,
+          fQty: '',
+          funitprice: '',
           fAmount: 0,
           fCurrency: "RMB",
           fExrate: 1,
@@ -4407,7 +4397,6 @@ export default {
         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)
         }
@@ -4603,7 +4592,6 @@ export default {
                   })
                 }, 200);
               }
-              console.log(this.form.fItemsStatus)
             })
           })
         }

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -1293,6 +1293,7 @@
 
             for (let li in this.dataList) {
               this.$set(this.dataList[li], 'fBsdate', Date.parse(this.dataList[li].fBsdate))
+              this.$set(this.dataList[li], 'fBillingway', this.dataList[li].fBillingway + '')
               this.$set(this.dataList[li], 'fChargedate', Date.parse(this.dataList[li].fChargedate))
               this.$set(this.dataList[li], 'fBillingDeadline', Date.parse(this.dataList[li].fBillingDeadline))
               this.$set(this.dataList[li], 'fOriginalbilldate', Date.parse(this.dataList[li].fOriginalbilldate))