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

src/views/warehouseBusiness/inStock/index.vue

@@ -1975,7 +1975,7 @@
             <td width="100">{{form.fMblno}}</td>
             <td width="100">{{fGoodsids}}</td>
             <td width="100">{{fCntrtype}}</td>
-            <td width="100">某某</td>
+            <td width="100"></td>
             <td width="100">包</td>
             <td width="100">吨</td>
             <td width="100"></td>
@@ -2021,7 +2021,7 @@
             </td>
             <td width="100" colspan="3" class="zzss" style="border: none"></td>
             <td width="100" colspan="2" class="zzss" style="border: none">
-              仓管员：张三
+              仓管员：
             </td>
           </tr>
           <tr style="border: none">

src/views/warehouseBusiness/outStock/index.vue

@@ -778,7 +778,7 @@
       </el-form>
 
       <div style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
-        
+
         <div>
           <el-button type="primary" :disabled="browseStatus" @click.prevent="addRelevant()"
           >新行
@@ -814,7 +814,7 @@
         </div>
         <div style="font-size:18px">出库明细</div>
          <!--点击展开-->
-       
+
       </div>
       <el-table
         :data="dataList"
@@ -1450,8 +1450,8 @@
         </el-table-column>
       </el-table>
       <div class="dialogTableTitle flex a-center jlr" style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
-       
-       <div> 
+
+       <div>
          <el-button :disabled="browseStatus" @click.prevent="addpayment()"
           >新行
         </el-button>
@@ -1461,9 +1461,9 @@
         <el-button type="primary" @click="submitForm(2)">保 存</el-button>
         <el-button type="warning" @click.prevent="addStorages()">仓储费协议</el-button>
         <el-button type="danger" @click.prevent="addAgreements()">作业费协议</el-button>
-         </div> 
+         </div>
          <div style="font-size:18px">付款信息</div>
-       
+
       </div>
       <el-table
         :data="warehouseCrList"
@@ -2133,7 +2133,7 @@
             <td width="100">{{form.fMblno}}</td>
             <td width="100">{{fGoodsids}}</td>
             <td width="100">{{fCntrtype}}</td>
-            <td width="100">某某</td>
+            <td width="100"></td>
             <td width="100">包</td>
             <td width="100">吨</td>
             <td width="100"></td>
@@ -2179,7 +2179,7 @@
             </td>
             <td width="100" colspan="3" class="zzss" style="border: none"></td>
             <td width="100" colspan="2" class="zzss" style="border: none">
-              仓管员：张三
+              仓管员：
             </td>
           </tr>
           <tr style="border: none">
@@ -2602,7 +2602,7 @@ export default {
         fMarks: [
           { required: true, message: " ", trigger: "blur" },
         ],
-        
+
         fFeeUnitid: [
           { required: true, message: " ", trigger: "blur" },
         ],
@@ -2743,7 +2743,7 @@ export default {
       this.whgenlegTotal = 0;
       this.storageAgreement = true;
       // this.whgenlegData()
-      this.getAgreement(); 
+      this.getAgreement();
       }
     },
       // 新增仓储费协议
@@ -2759,7 +2759,7 @@ export default {
       this.whgenlegTotal = 0;
       this.storageAgreements = true;
       // this.whgenlegData()
-      this.getAgreementt(); 
+      this.getAgreementt();
       }
     },
     // 查询仓储费协议
@@ -2797,7 +2797,7 @@ export default {
         });
       }
       this.warehousingagreement = false;
-      
+
     },
     zhgenlegData () {
        console.log(this.dialogWhgenlegList)
@@ -2855,6 +2855,8 @@ export default {
           fPlangrossweight: this.dialogWhgenlegList[whgen].fGrossweightblc,
           fWarehouseLocationids: this.dialogWhgenlegList[whgen].fWarehouseLocationids,
           fGoodsids: this.dialogWhgenlegList[whgen].fGoodsids,
+          fBillingway: this.dialogWhgenlegList[whgen].fBillingway,
+          fChargedate: this.dialogWhgenlegList[whgen].fChargedate,
           fGrossweight: 0,
           fNetweight: 0,
           fQty: 0,