入库

src/views/agreement/agreementTask/index.vue

@@ -287,6 +287,18 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="作业费类型" prop="" label-width="90px">
+          <el-select v-model="form.未填写" placeholder="请选择作业费类型" :disabled="browseStatus">
+            <el-option label="车队作业费" value="1"></el-option>
+            <el-option label="劳务作业费" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="费用类型" prop="">
+          <el-select v-model="form.未填写2" placeholder="请选择费用类型" :disabled="browseStatus">
+            <el-option label="收" value="D"></el-option>
+            <el-option label="付" value="C"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <el-button @click="confirmCharge" :disabled="stop" v-if="form.fBillstatus < 4" type="primary">请 核</el-button>
       <el-button @click="revokeCharge" v-if="form.fBillstatus === '6'" type="danger">撤销请核</el-button>

src/views/warehouseBusiness/inStock/index.vue

@@ -2410,13 +2410,18 @@
       </el-dialog>
       <!-- 选择作业费协议数据 -->
       <el-dialog
-        title="作业费协议"
+        title="作业费协1议"
         :close-on-click-modal="false"
         :modal="false"
         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"
@@ -2981,6 +2986,8 @@ export default {
       warehousebillsList: [],
       // 弹出层标题
       title: "",
+      activeIndex: '1',
+      activeIndex2: '1',
       // 是否显示弹出层
       open: false,
       // 货权方(客户数据)
@@ -3193,6 +3200,9 @@ export default {
     this.adoPt()
   },
   methods: {
+    handleSelect(key, keyPath) {
+      console.log(key, keyPath);
+    },
     /** 查询部门下拉树结构 */
     getTreeselect() {
       treeselect().then(response => {
@@ -3710,6 +3720,7 @@ export default {
         pageSize:10,
         fLineno:this.form.fCorpid,
         fFeeid:this.dataList[0].fGoodsid
+        
       }
       operationAgreement(data).then((response) => {
         this.tasklegList = response.rows;