Explorar o código

修改陆运判断条件

caojunjie %!s(int64=3) %!d(string=hai) anos
pai
achega
9ac73e9b0d

+ 5 - 2
src/views/landTransportation/bulkCargo/detailPage.vue

@@ -40,9 +40,9 @@
           <el-button
               type="warning"
               size="small"
-              v-if="goodsForm.status > 0"
+              v-if="goodsForm.status > 0 && !(roleName.indexOf('总调度') !== -1)"
               :disabled="
-            !(roleName.indexOf('平台') !== -1||roleName.indexOf('经理') !== -1||roleName.indexOf('部门经理') !== -1||roleName.indexOf('总经理') !== -1) && !(roleName.indexOf('admin') !== -1)"
+            !(roleName.indexOf('分管调度') !== -1||roleName.indexOf('经理') !== -1||roleName.indexOf('部门经理') !== -1||roleName.indexOf('总经理') !== -1) && !(roleName.indexOf('admin') !== -1)"
               @click="confirmChange"
           >变更
           </el-button>
@@ -2182,6 +2182,9 @@ export default {
       } else {
         detailDelegationList({id: this.id, kind: '1'}).then(res => {
           this.goodsForm = res.data.data
+          if (this.roleName.indexOf('经理') !== -1 || this.roleName.indexOf('部门经理') !== -1 || this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('总调度') !== -1) {
+            this.goodsForm.status = 5
+          }
           this.tableData = res.data.data.loadingAddressList || []
           this.tableDataTwo = res.data.data.unloadedAddressList || []
           this.entrustList = res.data.data.itemList

+ 0 - 1
src/views/landTransportation/bulkCargo/index.vue

@@ -1063,7 +1063,6 @@ export default {
     }
     this.option = await this.getColumnData(this.getColumnName(85.7), this.optionList);
     this.key++
-
     customerList({
       size:500,current:1,corpType:'CD'
     }).then(res=>{

+ 16 - 25
src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -85,14 +85,10 @@
         </div>
       </div>
     </div>
-    <containerTitle
-        title="业务类型"
-        style="margin-top: 50px"></containerTitle>
-    <basic-container>
+    <trade-card title="业务类型" style="margin-top: 50px">
       <avue-form v-model="goodsForm" :option="goodsOptionFormC" ref="goodsFormE"></avue-form>
-    </basic-container>
-    <containerTitle title="委托信息"></containerTitle>
-    <basic-container>
+    </trade-card>
+    <trade-card title="委托信息">
       <avue-form :option="goodsOptionForm" ref="goodsForm" v-model="goodsForm">
         <template slot-scope="scope" slot="corpId">
           <crop-select
@@ -138,9 +134,8 @@
           />
         </template>
       </avue-form>
-    </basic-container>
-    <containerTitle title="其他信息"></containerTitle>
-    <basic-container :showBtn="true" ref="other">
+    </trade-card>
+    <trade-card title="其他信息" ref="other">
       <avue-form :option="goodsOptionFormTwo" v-model="goodsForm">
         <template slot-scope="scope" slot="corpId">
           <crop-select
@@ -187,9 +182,8 @@
           />
         </template>
       </avue-form>
-    </basic-container>
-    <containerTitle title="箱信息"></containerTitle>
-    <basic-container v-if="goodsForm.status === 0 || !goodsForm.status">
+    </trade-card>
+    <trade-card title="箱信息" v-if="goodsForm.status === 0 || !goodsForm.status">
       <avue-crud :data="entrustList"
                  :option="entrustOptionTwo"
                  @row-save="(row,done,loading)=>{rowSave(row,0,done,loading)}"
@@ -221,8 +215,8 @@
           {{ column.label }}<span style="color:#F56C6C">*</span>
         </template>
       </avue-crud>
-    </basic-container>
-    <basic-container v-if="goodsForm.status !== 0 && goodsForm.status">
+    </trade-card>
+    <trade-card title="箱信息" v-if="goodsForm.status !== 0 && goodsForm.status">
       <avue-crud
           :data="entrustList"
           :option="entrustOptionTwoT"
@@ -242,9 +236,8 @@
           <span v-else>{{ row.fleetName }}</span>
         </template>
       </avue-crud>
-    </basic-container>
-    <containerTitle title="起止地信息"></containerTitle>
-    <basic-container>
+    </trade-card>
+    <trade-card title="起止地信息">
       <el-table
           ref="singleTable"
           :data="tableData"
@@ -377,9 +370,8 @@
           </template>
         </el-table-column>
       </el-table>
-    </basic-container>
-    <containerTitle title="车辆信息"></containerTitle>
-    <basic-container>
+    </trade-card>
+    <trade-card title="车辆信息">
       <avue-crud
           :data="vehicleList"
           ref="crudContact"
@@ -392,9 +384,8 @@
                       @click="openTrack(row)">{{ row.plateNo }}</span>
         </template>
       </avue-crud>
-    </basic-container>
-    <containerTitle title="杂费明细"></containerTitle>
-    <basic-container>
+    </trade-card>
+    <trade-card title="杂费明细">
       <el-tabs v-model="activeIndex" @tab-click="handleSelect">
         <el-tab-pane label="应收" name="1"></el-tab-pane>
         <!--        <el-tab-pane label="应付" name="2"></el-tab-pane>-->
@@ -520,7 +511,7 @@
           </el-button>
         </template>
       </avue-crud>
-    </basic-container>
+    </trade-card>
     <containerTitle title="上传附件"></containerTitle>
     <c-upload
         typeUpload="CD"