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

src/api/agreement/agreement.js

@@ -36,7 +36,7 @@ export function listAgreement(query) {
 // 查询作业费协议
 export function operationAgreement(query) {
   return request({
-    url: '/warehouseBusiness/agreementitems/list',
+    url: '/warehouseBusiness/agreementitems/warehousebills/list',
     method: 'get',
     params: query
   })

src/views/basicdata/dept/index.vue

@@ -47,31 +47,31 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column prop="fName" label="仓库名称" width="260"></el-table-column>
-      <el-table-column prop="fTotalgross" label="库容（吨）" width="200"></el-table-column>
+      <el-table-column prop="fTotalgross" label="库容（吨）" width="140"></el-table-column>
       <el-table-column prop="fLocation" label="库位" width="100">
         <template slot-scope="scope">
           <span v-if="scope.row.fLocation === 0">否</span>
           <span v-else>是</span>
         </template>
       </el-table-column>
-      <el-table-column prop="fAddr" label="地址" width="260"></el-table-column>
+      <el-table-column prop="fAddr" label="地址" width="100"></el-table-column>
       <el-table-column prop="fContacts" label="联系人" width="100"></el-table-column>
       <el-table-column prop="fTel" label="电话" width="150"></el-table-column>
-      <el-table-column prop="fCharg" label="计费" width="100">
+      <el-table-column prop="fCharg" label="计费" width="50">
         <template slot-scope="scope">
           <span v-if="scope.row.fCharg === 0">否</span>
           <span v-else>是</span>
         </template>
       </el-table-column>
-      <el-table-column prop="remark" label="备注" width="260"></el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
-      <el-table-column prop="fStatus" label="状态" :formatter="statusFormat" width="100"></el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+      <el-table-column prop="remark" label="备注" width="100"></el-table-column>
+      <el-table-column prop="orderNum" label="排序" width="50"></el-table-column>
+      <el-table-column prop="fStatus" label="状态" :formatter="statusFormat" width="50"></el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="170">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/warehouseBusiness/inStock/index.vue

@@ -380,7 +380,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="货1权方" prop="fCorpid">
+            <el-form-item label="货权方" prop="fCorpid">
               <el-select
                 v-model="form.fCorpid"
                 filterable
@@ -1960,7 +1960,7 @@
               </el-button>
               <el-button type="primary" size="small" @click="submitForm(2)" :disabled="browseStatus">保 存</el-button>
               <el-button type="danger" size="small" @click.prevent="handleSelect(1)" :disabled="browseStatus"
-              >作业费1协议</el-button>
+              >作业费协议</el-button>
             </div>
           </div>
           <el-table
@@ -2494,8 +2494,8 @@
         width="70%"
       >
         <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-item index="1">车队作业费</el-menu-item>
+          <el-menu-item index="2">劳务作业费</el-menu-item>
         </el-menu>
 
         <el-table
@@ -3906,26 +3906,30 @@ export default {
       // this.queryParams.fCorpid = this.form.fCorpid;
       // this.queryParams.fLineno = this.form.fCorpid;
       let data = {}
-      if (kye === 1){
+      let fTaskType = kye
+      if (kye == 2){
         this.Navigation = true
         data = {
           pageNum:1,
           pageSize:10,
+          fTaskType:Number(fTaskType),
           fLabour:this.form.fLabour
         }
-      }else if (kye === 2) {
+      }else if (kye == 1) {
         this.Navigation = true
         data = {
           pageNum:1,
           pageSize:10,
-          fCorpid:this.form.fCorpid
+          fTaskType:Number(fTaskType),
+          fFleet:this.form.fFleet
+
         }
       }else {
         this.Navigation = false
         data = {
           pageNum:1,
           pageSize:10,
-          fFleet:this.form.fFleet
+          fCorpid:this.form.fCorpid
         }
       }
       operationAgreement(data).then( response => {