caojunjie 3 роки тому
батько
коміт
edfae3638f

+ 4 - 4
src/views/landTransportation/bulkCargo/detailPage.vue

@@ -56,7 +56,7 @@
           <el-button
               type="success"
               v-if="goodsForm.status === 0 && typeTwo === false"
-              v-show="roleName.indexOf('业务员') !== -1 || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1)"
+              v-show="roleName.indexOf('admin') !== -1 || roleName.indexOf('业务员') !== -1 || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1)"
               size="small"
               :loading="type"
               @click="submit(true)"
@@ -1044,7 +1044,7 @@ export default {
             this.goodsOptionFormTwo.disabled = true
           }else if (this.goodsForm.status === 1){
             this.goodsOptionFormTwo.disabled = false
-            if (this.roleName.indexOf('平台') !== -1){
+            if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('admin') !== -1){
               this.findObject(this.goodsOptionFormTwo.column, "fleetId").disabled = false
               this.findObject(this.goodsOptionFormTwo.column, "plateNo").disabled = false
               this.findObject(this.goodsOptionFormTwo.column, "driverId").disabled = false
@@ -1053,7 +1053,7 @@ export default {
             }
           }else if (this.goodsForm.status === 2){
             this.goodsOptionFormTwo.disabled = false
-            if (this.roleName.indexOf('车队') !== -1){
+            if (this.roleName.indexOf('车队') !== -1 || this.roleName.indexOf('admin') !== -1){
               this.findObject(this.goodsOptionFormTwo.column, "fleetId").disabled = true
               this.findObject(this.goodsOptionFormTwo.column, "plateNo").disabled = false
               this.findObject(this.goodsOptionFormTwo.column, "driverId").disabled = false
@@ -1568,7 +1568,7 @@ export default {
           format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
         }, {
-          label: '车体积',
+          label: '车',
           span: 6,
           prop: 'fleetVolum'
         }, {

+ 4 - 4
src/views/landTransportation/bulkCargo/index.vue

@@ -485,7 +485,7 @@ export default {
             filterable: true,
             search: true,
           }, {
-            label: '车体积',
+            label: '车',
             width: 100,
             index: 9,
             prop: 'fleetVolum'
@@ -642,7 +642,7 @@ export default {
             index: 8,
             prop: 'plateNo'
           },{
-            label: '车体积',
+            label: '车',
             width: 100,
             index: 9,
             prop: 'fleetVolum'
@@ -831,7 +831,7 @@ export default {
             index: 10,
             prop: 'tel'
           }, {
-            label: '车体积',
+            label: '车',
             width: 100,
             index: 11,
             prop: 'fleetVolum'
@@ -999,7 +999,7 @@ export default {
             index: 10,
             prop: 'tel'
           }, {
-            label: '车体积',
+            label: '车',
             width: 100,
             index: 11,
             prop: 'fleetVolum'

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

@@ -30,7 +30,7 @@
                       @click="openTrackTwo(row,0)">{{ row.dispatchNumber }}</span>
             </template>
             <template slot="menuLeft">
-              <span>今日业务详情{{ mold == 1 ? '(集装箱)' : mold == 2 ? '(散货)' : mold == 3 ? '(特种)' : '' }}</span>
+              <span @click="getsalesTrend({status: 0, mold:mold})">今日业务详情{{ mold == 1 ? '(集装箱)' : mold == 2 ? '(散货)' : mold == 3 ? '(特种)' : '' }}</span>
             </template>
           </avue-crud>
           <!--集装箱-->
@@ -38,7 +38,7 @@
                      @resetColumn="resetColumn"
                      @saveColumn="saveColumn">
             <template slot="menuLeft">
-              <span>今日业务详情{{ mold == 1 ? '(集装箱)' : mold == 2 ? '(散货)' : mold == 3 ? '(特种)' : '' }}</span>
+              <span @click="getsalesTrend({status: 0, mold: mold})">今日业务详情{{ mold == 1 ? '(集装箱)' : mold == 2 ? '(散货)' : mold == 3 ? '(特种)' : '' }}</span>
             </template>
             <template slot="billNo" slot-scope="{row}">
                 <span class="el-button--text" style="cursor: pointer"