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

src/views/warehouseBusiness/inStock/index.vue

@@ -1777,14 +1777,21 @@
           <el-table-column label="行号" type="index" width="80">
             </el-table-column>
           <el-table-column
-            prop="fCorpid"
+            prop="fCorpname"
             header-align="center"
             align="center"
             label="客户名称"
           >
           </el-table-column>
           <el-table-column
-            prop="createTime"
+            prop="fName"
+            header-align="center"
+            align="center"
+            label="费用名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="fFeeUnitid"
             header-align="center"
             align="center"
             width="180px"
@@ -1792,13 +1799,13 @@
           >
           </el-table-column>
           <el-table-column
-            prop="fGoodsid"
+            prop="fPrice"
             header-align="center"
             align="center"
             label="单价"
           >
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="fQtyblc"
             header-align="center"
             align="center"
@@ -1811,7 +1818,7 @@
             align="center"
             label="录入时间"
           >
-          </el-table-column>
+          </el-table-column> -->
           <!-- <el-table-column
             prop="fMarks"
             header-align="center"
@@ -2394,6 +2401,7 @@ export default {
         pageSize: 10,
         fCorpid: null,
         fLineno: null,
+
       },
       // 表单参数
       form: {
@@ -2700,20 +2708,26 @@ export default {
     // 导入付款信息
     whgenlegData() {
       console.log(this.dialogWhgenlegList)
+      console.log("...(")
       for (let whgen in this.dialogWhgenlegList) {
         this.warehouseDrList.push({
           fCorpid: this.dialogWhgenlegList[whgen].fCorpid,
-
+           fFeeid: this.dialogWhgenlegList[whgen].fFeeid +'',
+            fFeeUnitid: this.dialogWhgenlegList[whgen].fFeeUnitid +'',
+             fUnitprice: this.dialogWhgenlegList[whgen].fUnitprice + '',
         });
       }
       this.warehousingagreement = false;
-      
     },
-    zhgenlegData () {
+    zhgenlegData() {
        console.log(this.dialogWhgenlegList)
+       console.log("((((")
       for (let zhgen in this.dialogWhgenlegList) {
         this.warehouseCrList.push({
           fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
+          fFeeid: this.dialogWhgenlegList[whgen].fFeeid +'',
+          fFeeUnitid: this.dialogWhgenlegList[whgen].fFeeUnitid +'',
+          fUnitprice: this.dialogWhgenlegList[whgen].fUnitprice + '',
 
         });
       }