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

src/views/fleet/plans/AddOrUpdate.vue

@@ -17,6 +17,7 @@
                 filterable
                 :disabled="disabled"
                 size="mini"
+                style="width:180px"
               >
                 <el-option
                   v-for="(dict, index) in fMblnoOptions"
@@ -34,6 +35,7 @@
                 placeholder="请选择业务类型"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               >
                 <el-option
                   v-for="(dict, index) in billTypeList"
@@ -51,6 +53,7 @@
                 placeholder="请选择运输方式"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               >
                 <el-option
                   v-for="(dict, index) in transTypeList"
@@ -68,6 +71,7 @@
                 placeholder="请选择运输方式"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               >
                 <el-option
                   v-for="(dict, index) in transPropList"
@@ -87,6 +91,7 @@
                 placeholder="请输入提单号"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -99,6 +104,7 @@
                 clearable
                 filterable
                  size="mini"
+                 style="width:180px"
               >
                 <el-option
                   v-for="(dict, index) in goodsOptions"
@@ -117,6 +123,7 @@
                 :disabled="disabled"
                 v-input-limit="2"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -128,6 +135,7 @@
                 :disabled="disabled"
                 v-input-limit="2"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -140,6 +148,7 @@
                 placeholder="请输入船名"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -150,6 +159,7 @@
                 placeholder="请输入航次"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -160,6 +170,7 @@
                 placeholder="请输入起运港"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -170,6 +181,7 @@
                 placeholder="请输入目的港"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -186,6 +198,7 @@
                 placeholder="请输入提箱地点"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
             <el-form-item v-else label="装货地点" prop="loadAddr">
@@ -202,7 +215,7 @@
               <el-date-picker
                 clearable
                 size="mini"
-                style="width: 200px"
+                style="width: 180px"
                 v-model="form.loadDate"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -219,6 +232,7 @@
                 placeholder="请输入装车联系人"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -230,6 +244,7 @@
                 :disabled="disabled"
                 v-input-limit="0"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -246,6 +261,7 @@
                 placeholder="请输入装卸货地点"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
             <el-form-item
@@ -258,6 +274,7 @@
                 placeholder="请输入装货地点"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -266,7 +283,7 @@
               <el-date-picker
                 clearable
                 size="mini"
-                style="width: 200px"
+                style="width: 180px"
                 v-model="form.mdLoadDate"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -283,6 +300,7 @@
                 placeholder="请输入装卸货联系人"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -294,6 +312,7 @@
                 :disabled="disabled"
                 v-input-limit="0"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -306,6 +325,7 @@
                 placeholder="请输入卸箱地点"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -316,6 +336,7 @@
                 placeholder="请输入卸箱地点"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -324,7 +345,7 @@
               <el-date-picker
                 clearable
                 size="mini"
-                style="width: 200px"
+                style="width: 180px"
                 v-model="form.unLoadDate"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -341,6 +362,7 @@
                 placeholder="请输入卸车联系人"
                 :disabled="disabled"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -352,6 +374,7 @@
                 :disabled="disabled"
                 v-input-limit="0"
                  size="mini"
+                 style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -366,6 +389,7 @@
                 placeholder="请输入线路描述"
                 :disabled="disabled"
                 size="mini"
+                style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -380,6 +404,7 @@
                 placeholder="请输入备注"
                 :disabled="disabled"
                 size="mini"
+                style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -529,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"
                     />
@@ -1555,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 {
@@ -1580,6 +1607,7 @@ export default {
         revokeFtmsorderbillsplans(row).then((response) => {
           if (response.code == 200) {
             this.msgSuccess("成功撤回");
+            this.$set(row, 'billStatus', response.data.billStatus)
           }
         });
       }else{
@@ -1593,9 +1621,8 @@ export default {
       this.showDialog = this.addOrUpdateVisible;
     },
     planList(val) {
-      console.log(val);
       this.showSure(val);
     },
   },
 };
-</script>
+</script>

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -1298,6 +1298,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))