Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -83,17 +83,24 @@
               type="warning"
               v-if="goodsForm.status === 2 && ((roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1)||roleName.indexOf('admin') !== -1) "
               size="small"
-              @click="cancelScheduling(false)"
+              @click="cancelScheduling('2')"
           >取消调度
           </el-button>
           <el-button
               type="warning"
               v-if="goodsForm.status === 3 && (roleName.indexOf('车队') !== -1 || roleName.indexOf('admin') !== -1)"
               size="small"
-              @click="cancelScheduling(true)"
+              @click="cancelScheduling('1')"
           >取消派车
           </el-button>
           <el-button
+              type="warning"
+              v-if="goodsForm.status === 6 && (roleName.indexOf('司机') !== -1 || roleName.indexOf('admin') !== -1)"
+              size="small"
+              @click="cancelScheduling('3')"
+          >取消受理
+          </el-button>
+          <el-button
               type="success"
               v-if="goodsForm.status === 1 && ((roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)||roleName.indexOf('admin') !== -1)"
               size="small"
@@ -2771,16 +2778,21 @@ export default {
     },
     //取消调度
     cancelScheduling(type) {
-      if (type) {
+      if (type == '1') {
         statusBulkLoad({id: this.goodsForm.id, status: 2}).then(res => {
           this.$message.success('取消成功');
           this.refreshData()
         })
-      } else {
+      } else if (type == '2') {
         statusBulkLoad({id: this.goodsForm.id, status: 1}).then(res => {
           this.$message.success('取消成功');
           this.refreshData()
         })
+      }else if (type == '3'){
+        statusBulkLoad({id: this.goodsForm.id, status: 3}).then(res => {
+          this.$message.success('取消成功');
+          this.refreshData()
+        })
       }
     },
     //收费新增