陆运

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -40,7 +40,7 @@
           <el-button
               type="warning"
               size="small"
-              v-if="goodsForm.status > 0 && !(roleName.indexOf('总调度') !== -1) && !(goodsForm.status > 3 && !(roleName.indexOf('车队') !== -1))"
+              v-if="goodsForm.status > 0 && goodsForm.status !== 5 && !(roleName.indexOf('总调度') !== -1) && !(goodsForm.status > 3 && !(roleName.indexOf('车队') !== -1)) || (goodsForm.status !== 5 && roleName.indexOf('admin') !== -1)"
               :disabled="
             !(roleName.indexOf('业务员') !== -1||roleName.indexOf('分管调度') !== -1||roleName.indexOf('经理') !== -1||roleName.indexOf('部门经理') !== -1||roleName.indexOf('总经理') !== -1) && !(roleName.indexOf('admin') !== -1)"
               @click="confirmChange"
@@ -830,10 +830,10 @@
       </avue-crud>
     </basic-container>
     </span>
-    <trade-card title="杂费明细" v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -1">
+    <trade-card title="杂费明细" v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -1 || roleName.indexOf('admin') !== -1">
       <el-tabs v-model="activeIndex" @tab-click="handleSelect">
         <el-tab-pane label="应收" name="1"></el-tab-pane>
-        <el-tab-pane label="应付" name="2" v-if="roleName.indexOf('平台') !== -1"></el-tab-pane>
+        <el-tab-pane label="应付" name="2" v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('admin') !== -1"></el-tab-pane>
       </el-tabs>
       <avue-crud
           v-if="activeIndex === '1'"
@@ -870,7 +870,7 @@
           <el-button
               type="text"
               size="small"
-              v-if="roleName.indexOf('平台') !== -1"
+              v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1 || (roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)"
               :disabled="goodsForm.status === 5"
               :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"
               @click="rowCell(row,index)"
@@ -879,7 +879,7 @@
           <el-button type="text"
                      icon="el-icon-delete"
                      size="small"
-                     v-if="roleName.indexOf('平台') !== -1"
+                     v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1 || (roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)"
                      :disabled="goodsForm.status === 5"
                      @click="$refs.collection.rowDel(row,index)"
           >删除
@@ -896,7 +896,7 @@
           <el-button
               type="primary"
               icon="el-icon-plus"
-              v-if="roleName.indexOf('平台') !== -1"
+              v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1 || (roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)"
               :disabled="goodsForm.status === 5"
               @click="addRowCollection"
               size="small">录入明细
@@ -1074,6 +1074,16 @@ export default {
             this.findObject(this.goodsOptionFormTwo.column, "freightPay").disabled = true
           }
         }
+        if (this.typeTwo){
+          if (this.roleName.indexOf('admin') !== -1 || (this.roleName.indexOf('平台') !== -1 && this.roleName.indexOf('分管调度') !== -1)){
+            this.goodsOptionFormTwo.disabled = false
+            this.findObject(this.goodsOptionFormTwo.column, "fleetId").disabled = false
+            this.findObject(this.goodsOptionFormTwo.column, "plateNo").disabled = false
+            this.findObject(this.goodsOptionFormTwo.column, "driverId").disabled = false
+            this.findObject(this.goodsOptionFormTwo.column, "driverTel").disabled = false
+            this.findObject(this.goodsOptionFormTwo.column, "freightPay").disabled = false
+          }
+        }
       }
     }
   },
@@ -1570,7 +1580,14 @@ export default {
         }, {
           label: '车型',
           span: 6,
-          prop: 'fleetVolum'
+          prop: 'fleetVolum',
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=vehicle_type",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
+          dataType: "string",
         }, {
           label: '合同号',
           span: 6,
@@ -2582,11 +2599,11 @@ export default {
     confirmChange() {
       // validChange({id:this.id}).then(res => {
       //   if (res.data.data){
-      this.goodsForm.status = 0
       this.goodsOptionFormC.disabled = false
       this.goodsOptionForm.disabled = false
       this.goodsOptionFormTwo.disabled = false
       this.typeTwo = true
+      this.goodsForm.status = 0
       // }else {
       //   this.$message.error('不允许变更')
       // }

src/views/landTransportation/bulkCargo/index.vue

@@ -489,11 +489,6 @@ export default {
             width: 100,
             index: 9,
             prop: 'fleetVolum'
-          },{
-            label: '货物体积',
-            width: 100,
-            index: 10,
-            prop: 'volumeSum'
           }, {
             label: '运费',
             index: 11,
@@ -513,18 +508,24 @@ export default {
             overHidden: true,
             search: true,
             width: 140
+          },{
+            label: '备注',
+            index: 13,
+            overHidden: true,
+            width: 140,
+            prop: 'remarks',
           }, {
             label: '公司名称',
             prop: 'corpName',
             overHidden: true,
-            index: 13,
+            index: 14,
             width: 112,
             search: true,
           }, {
             label: '制单人',
             prop: 'createUserName',
             overHidden: true,
-            index: 14,
+            index: 15,
             width: 80,
           }, {
             label: '制单日期',
@@ -535,7 +536,7 @@ export default {
             defaultTime: ['00:00:00', '23:59:59'],
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index: 15,
+            index: 16,
             width: 135,
             search: true,
           }]
@@ -646,11 +647,6 @@ export default {
             width: 100,
             index: 9,
             prop: 'fleetVolum'
-          },{
-            label: '货物体积',
-            width: 100,
-            index: 10,
-            prop: 'volumeSum'
           }, {
             label: '应收运费',
             index: 11,
@@ -676,18 +672,24 @@ export default {
             overHidden: true,
             width: 100,
             index: 13,
+          },{
+            label: '备注',
+            index: 14,
+            overHidden: true,
+            width: 140,
+            prop: 'remarks',
           }, {
             label: '公司名称',
             prop: 'corpName',
             overHidden: true,
-            index: 14,
+            index: 15,
             width: 112,
             search: true,
           }, {
             label: '制单人',
             prop: 'createUserName',
             overHidden: true,
-            index: 15,
+            index: 16,
             width: 80,
           }, {
             label: '制单日期',
@@ -698,7 +700,7 @@ export default {
             defaultTime: ['00:00:00', '23:59:59'],
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index: 16,
+            index: 17,
             width: 135,
             search: true,
           }]
@@ -835,11 +837,6 @@ export default {
             width: 100,
             index: 11,
             prop: 'fleetVolum'
-          },{
-            label: '货物体积',
-            width: 100,
-            index: 12,
-            prop: 'volumeSum'
           },
           // {
           //   label: '状态',
@@ -1003,11 +1000,6 @@ export default {
             width: 100,
             index: 11,
             prop: 'fleetVolum'
-          },{
-            label: '货物体积',
-            width: 100,
-            index: 12,
-            prop: 'volumeSum'
           },
           // {
           //   label: '状态',

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -240,12 +240,12 @@ export default {
           overHidden: true,
           prop: 'contractNo'
         }, {
-          label: '装货地址',
+          label: '装货地点',
           prop: 'addressDetail',
           index: 6,
           width: 132,
         }, {
-          label: '卸货地址',
+          label: '卸货地点',
           prop: 'unloadingPlace',
           index: 7,
           width: 132,
@@ -341,12 +341,12 @@ export default {
           overHidden: true,
           prop: 'contractNo'
         }, {
-          label: '装货地址',
+          label: '装货地点',
           prop: 'addressDetail',
           index: 6,
           width: 132,
         }, {
-          label: '卸货地址',
+          label: '卸货地点',
           prop: 'unloadingPlace',
           index: 7,
           width: 132,
@@ -454,12 +454,12 @@ export default {
           overHidden: true,
           prop: 'contractNo'
         }, {
-          label: '装货地址',
+          label: '装货地点',
           prop: 'addressDetail',
           index: 6,
           width: 132,
         }, {
-          label: '卸货地址',
+          label: '卸货地点',
           prop: 'unloadingPlace',
           index: 7,
           width: 132,