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

src/views/warehouseBusiness/inStock/index.vue

@@ -655,7 +655,7 @@
                 :disabled="contrOl"
                 placeholder="请输入劳务公司">
                 <el-option
-                  v-for="(dict, index) in fSbuOptions"
+                  v-for="(dict, index) in fLabourOptions"
                   :key="index.fId"
                   :label="dict.fName"
                   :value="dict.fId"
@@ -681,7 +681,7 @@
                 placeholder="请输入车队">
 
                 <el-option
-                  v-for="(dict, index) in fSbuOptions"
+                  v-for="(dict, index) in fLeetOptions"
                   :key="index.fId"
                   :label="dict.fName"
                   :value="dict.fId"
@@ -2967,6 +2967,8 @@ export default {
   },
   data() {
     return {
+      fLabourOptions:[],
+      fLeetOptions:[],
       information:'',
       informationId:'',
       inDex:'',
@@ -3315,8 +3317,6 @@ export default {
   },
   methods: {
     handleSelect(key, keyPath) {
-      console.log(key, keyPath);
-      console.log(key)
       this.addAgreements(key)
     },
     /** 查询部门下拉树结构 */
@@ -4212,7 +4212,6 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(status) {
-      this.changefLourd()
       this.reset()
       this.form = {
           fItemsStatus: null,
@@ -4997,7 +4996,7 @@ export default {
       let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 6};
       listCorps(queryParams).then((response) => {
         console.log(response)
-        this.fSbuOptions = response.rows;
+        this.fLabourOptions = response.rows;
       });
     },
     /* 远程模糊查询车队 */
@@ -5007,7 +5006,7 @@ export default {
       }
       let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 2};
       listCorps(queryParams).then((response) => {
-        this.fSbuOptions = response.rows;
+        this.fLeetOptions = response.rows;
       });
     },
     /* 远程模糊查询经营单位 */

src/views/warehouseBusiness/outStock/index.vue

@@ -2214,6 +2214,11 @@
         :visible.sync="warehousingagreements"
         width="70%"
       >
+        <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect">
+          <el-menu-item index="1">作业费</el-menu-item>
+          <el-menu-item index="2">劳务费</el-menu-item>
+        </el-menu>
+
         <el-table
           :data="tasklegList"
           ref="table"
@@ -2722,6 +2727,8 @@ export default {
   },
   data() {
     return {
+      activeIndex: '1',
+      activeIndex2: '1',
       //控制选择库位弹出
       choiceWarehouse:false,
       information:'',
@@ -3010,6 +3017,29 @@ export default {
     this.adoPt()
   },
   methods: {
+    handleSelect(key, keyPath) {
+      this.addAgreements(key)
+    },
+    // 新增付款作业费协议
+    addAgreements(kye) {
+      if (!this.form.fCorpid) {
+        this.$message({
+          message: "请维护货权方",
+          type: "warning",
+        });
+      }else if(this.form.fProductName == undefined) {
+        this.$message({
+          message: "请维护入库明细品名",
+          type: "warning",
+        });
+      } else {
+        this.whgenlegList = [];
+        this.dialogWhgenlegList = [];
+        this.whgenlegTotal = 0;
+        this.warehousingagreements = true;
+        this.getWhgenlegList(kye);
+      }
+    },
     hanDleclose(done){
       this.$confirm('确认关闭？')
         .then(_ => {

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -2138,7 +2138,13 @@
         style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
         :visible.sync="warehousingagreements"
         width="70%"
+
       >
+        <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect">
+          <el-menu-item index="1">作业费</el-menu-item>
+          <el-menu-item index="2">劳务费</el-menu-item>
+        </el-menu>
+
         <el-table
           :data="tasklegList"
           ref="table"
@@ -2372,6 +2378,8 @@ export default {
   },
   data() {
     return {
+      activeIndex: '1',
+      activeIndex2: '1',
       //控制选择库位弹出
       choiceWarehouse:false,
       information:'',
@@ -2660,6 +2668,29 @@ export default {
   //   'form.fWarehouseid' : 'warehouseMethod'
   // },
   methods: {
+    handleSelect(key, keyPath) {
+      this.addAgreements(key)
+    },
+    // 新增付款作业费协议
+    addAgreements(kye) {
+      if (!this.form.fCorpid) {
+        this.$message({
+          message: "请维护货权方",
+          type: "warning",
+        });
+      }else if(this.form.fProductName == undefined) {
+        this.$message({
+          message: "请维护入库明细品名",
+          type: "warning",
+        });
+      } else {
+        this.whgenlegList = [];
+        this.dialogWhgenlegList = [];
+        this.whgenlegTotal = 0;
+        this.warehousingagreements = true;
+        this.getWhgenlegList(kye);
+      }
+    },
     /** 查询部门下拉树结构 */
     getTreeselect(row) {
       this.treeselectList.fWarehouselocid = null