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

src/views/warehouseBusiness/inStock/index.vue

@@ -1606,7 +1606,7 @@
             </el-button> -->
               <el-button type="primary" size="small" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>
               <!-- <el-button @click.prevent="addAgreement()" type="warning">仓储费协议</el-button> -->
-              <el-button size="small" @click.prevent="handleSelect(1)" :disabled="browseStatus" type="danger"
+              <el-button size="small" @click.prevent="handleSelect(3)" :disabled="browseStatus" type="danger"
               >作业费协议</el-button
               >
             </div>
@@ -2482,9 +2482,9 @@
         :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 :default-active="activeIndex" v-if="Navigation === true" 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
@@ -2554,7 +2554,7 @@
         />
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="zhgenlegData">导入</el-button>
-          <el-button @click="warehousingagreements = false">取 消</el-button>
+          <el-button @click="warehousingagreements = false ; Navigation = false">取 消</el-button>
         </div>
       </el-dialog>
       <el-dialog
@@ -2967,6 +2967,7 @@ export default {
       isrequired:2,
       isrequired_s:2,
       approval:[],
+      Navigation: false,
       doNot:false,
       // 修改查看状态
       browseStatus: false,
@@ -3314,8 +3315,6 @@ export default {
       this.cancel()
     },
     handleSelect(key, keyPath) {
-      console.log(key, keyPath);
-      console.log(key)
       this.addAgreements(key)
     },
     /** 查询部门下拉树结构 */
@@ -3866,12 +3865,28 @@ export default {
     getWhgenlegList(kye) {
       // this.queryParams.fCorpid = this.form.fCorpid;
       // this.queryParams.fLineno = this.form.fCorpid;
-      let data = {
-        pageNum:1,
-        pageSize:10,
-        fLineno:this.form.fCorpid,
-        fFeeid:this.dataList[0].fGoodsid,
-        fTaskType: kye
+      let data = {}
+      if (kye === 1){
+        this.Navigation = true
+        data = {
+          pageNum:1,
+          pageSize:10,
+          fLabour:this.form.fLabour
+        }
+      }else if (kye === 2) {
+        this.Navigation = true
+        data = {
+          pageNum:1,
+          pageSize:10,
+          fCorpid:this.form.fCorpid
+        }
+      }else {
+        this.Navigation = false
+        data = {
+          pageNum:1,
+          pageSize:10,
+          fFleet:this.form.fFleet
+        }
       }
       operationAgreement(data).then( response => {
         console.log(response)