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

src/views/landTransportation/bulkReportAnalysis/index.vue

@@ -1017,7 +1017,7 @@ export default {
           delete queryParams.arrivalTime
         }
         const routeData = this.$router.resolve({
-          path: '/api/blade-land/order/acct-export',      //跳转目标窗口的地址
+          path: '/api/blade-land/order/bulkCargo-export',      //跳转目标窗口的地址
           query: {
             ...queryParams    //括号内是要传递给新窗口的参数
           }
@@ -1026,7 +1026,7 @@ export default {
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: '已取消' //
+          message: '已取消'
         });
       })
     },
@@ -1230,7 +1230,7 @@ export default {
     },
     incidentalConfirm(row) {
       incidental({
-        itemId: row.itemId,
+        orderId: row.orderId,
         plateNo: row.plateNo,
         type: '1'
       }).then(res => {
@@ -1241,12 +1241,12 @@ export default {
     },
     incidentalClick() {
       if (this.confirmStatus == 0) {
-        incidentalConfirm({itemId: this.collectionList[0].itemId}).then(res => {
+        incidentalConfirm({orderId: this.collectionList[0].orderId}).then(res => {
           this.$message.success("确认成功");
           this.onLoad(this.page)
         })
       } else {
-        cancelConfirm({itemId: this.collectionList[0].itemId}).then(res => {
+        cancelConfirm({orderId: this.collectionList[0].orderId}).then(res => {
           this.$message.success("取消成功");
           this.onLoad(this.page)
         })

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

@@ -37,12 +37,12 @@
               <span @click="getsalesTrend({status: 0, mold:mold})">今日业务详情{{ mold == 1 ? '（集装箱）' : mold == 2 ? '（散货）' : mold == 3 ? '（特种）' : '' }}</span>
             </template>
             <template slot="status" slot-scope="{row}">
-              <span v-if="row.status == 0" style="color: #ffa21e;">未提交</span>
-              <span v-if="row.status == 1" style="color: #fb5b60;">未调度</span>
-              <span v-if="row.status == 2" style="color: #42bc6f;">未派车</span>
-              <span v-if="row.status == 3" style="color: #14cde1;">未受理</span>
-              <span v-if="row.status == 4" style="color: #04421fa1;">未完工</span>
-              <span v-if="row.status == 5" style="color: #3C9CFF;">工单关闭</span>
+              <span v-if="row.status == 0" style="color: #3C9CFF;">未提交</span>
+              <span v-if="row.status == 1" style="color: #ffa21e;">未调度</span>
+              <span v-if="row.status == 2" style="color: #fb5b60;">未派车</span>
+              <span v-if="row.status == 3" style="color: #42bc6f;">未受理</span>
+              <span v-if="row.status == 4" style="color: #14cde1;">未完工</span>
+              <span v-if="row.status == 5" style="color: #04421fa1;">工单关闭</span>
               <span v-if="row.status == 6" style="color: #F56C6C;">未到厂</span>
             </template>
           </avue-crud>