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

src/api/basicData/configuration.js

@@ -192,6 +192,14 @@ export function repealCancel(data) {
       data: data
     })
   }
+// 撤销进口采购请核
+export function repealPurchase(data) {
+    return request({
+      url: '/api/trade-purchase/purchase-order/repealCancel',
+      method: 'post',
+      data: data
+    })
+  }
   export function genClient(data) {
     return request({
       url: '/api/blade-deliver-goods/delivery/submit',
@@ -205,4 +213,4 @@ export function repealCancel(data) {
         method: 'get',
         params: data
     })
-}
+}

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -49,7 +49,7 @@
           <el-button
               type="warning"
               size="small"
-              v-if="goodsForm.status > 3 && roleName.indexOf('车队') !== -1 && goodsForm.status !== 5"
+              v-if="goodsForm.status > 3 && ((roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('车队') !== -1 || roleName.indexOf('admin') !== -1) && goodsForm.status !== 5"
               @click="confirmChangeTwo"
           >变更车
           </el-button>
@@ -88,7 +88,7 @@
           </el-button>
           <el-button
               type="warning"
-              v-if="goodsForm.status === 3 && (roleName.indexOf('车队') !== -1 || roleName.indexOf('admin') !== -1)"
+              v-if="goodsForm.status === 3 && (roleName.indexOf('车队') !== -1 || roleName.indexOf('admin') !== -1) || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1)"
               size="small"
               @click="cancelScheduling('1')"
           >取消派车
@@ -102,7 +102,7 @@
           </el-button>
           <el-button
               type="success"
-              v-if="goodsForm.status === 1 && ((roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)||roleName.indexOf('admin') !== -1)"
+              v-if="goodsForm.status === 1 && ((roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)||roleName.indexOf('admin') !== -1 || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1))"
               size="small"
               @click="submit(false)"
           >取消提交
@@ -2147,7 +2147,9 @@ export default {
           delete this.goodsForm.itemList
           delete this.goodsForm.orderFeeList
           this.goodsForm.id = ''
+          this.goodsForm.orderNo = ''
           this.tableData.forEach(item => item.id = '')
+          this.tableDataTwo.forEach(item => item.id = '')
           this.entrustList.forEach(item => item.id = '')
           this.goodsList.forEach(item => item.id = '')
           this.vehicleList.forEach(item => item.id = '')
@@ -2628,7 +2630,7 @@ export default {
       // })
     },
     confirmChangeTwo(){
-      if (this.roleName.indexOf('车队') !== -1 && this.goodsForm.status >3){
+      if (((this.roleName.indexOf('平台') !== -1 && this.roleName.indexOf('分管调度') !== -1)||this.roleName.indexOf('车队') !== -1) && this.goodsForm.status >3){
         this.goodsOptionFormTwo.disabled = false
         this.findObject(this.goodsOptionFormTwo.column, "fleetId").disabled = true
         this.findObject(this.goodsOptionFormTwo.column, "plateNo").disabled = false

src/views/purchase/contract/detailsPage.vue

@@ -16,10 +16,9 @@
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item :loading="buttonLoading" :disabled="viewDisabled" @click.native="auditCheck">提交审批</el-dropdown-item>
               <el-dropdown-item :disabled="form.status == 0" @click.native="checkScheduleDialog = true">审批进度</el-dropdown-item>
-<!--              <el-dropdown-item :disabled="form.status != 1 && form.id" @click.native="repealCancel">撤销审批</el-dropdown-item>-->
+              <el-dropdown-item :disabled="form.status == 0 || form.status == 4 || !form.id" @click.native="repealCancel">撤销审批</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-
           <el-dropdown style="padding: 0 6px;line-height: 0" v-if="false">
             <el-button type="warning" :loading="buttonLoading" :disabled="!form.id || viewDisabled" size="small">
               账单处理<i class="el-icon-arrow-down el-icon--right"></i>
@@ -283,7 +282,7 @@ import {corpsattn} from "@/api/basicData/configuration"
 import { contrastObj, contrastList, contrastList2 } from "@/util/contrastData";
 import ApplyPayment from "../../../components/finance/applyPayment";
 import financialAccount from "../../../components/finance/financialAccount";
-import { pleaseCheck } from "@/api/basicData/configuration"
+import { pleaseCheck,repealPurchase } from "@/api/basicData/configuration"
 import checkSchedule from "../../../components/check/checkSchedule";
 import check from "@/components/check/check";
 import { getToken } from "@/util/auth";
@@ -1080,11 +1079,15 @@ export default {
           id : this.form.id,
           checkType: 'cgqh',
           pageLabel:"采购订单",
-          checkFlag: 1,
+          checkFlag: 2,
         }
-        this.viewDisabled = true
-        this.approverDisabled = true
-        this.buttonLoading = false
+        repealPurchase(data).then(res=>{
+          this.viewDisabled = true
+          this.approverDisabled = true
+          this.buttonLoading = false
+        }).finally(() => {
+          this.buttonLoading = false
+        })
       })
     },
     //新增商品明细保存触发

src/views/wel/components/audit-data.vue

@@ -113,17 +113,31 @@ export default {
       this.loading = true;
       checkDate({ tradeType: this.tradeType })
         .then(res => {
-          this.list.forEach(e => {
-            if (e.text == "报价订单/待审核") {
-              e.qty = res.data.data.offerNumber;
-            }
-            if (e.text == "销售订单/待审核") {
-              e.qty = res.data.data.sellNumber;
-            }
-            if (e.text == "采购订单/待审核") {
-              e.qty = res.data.data.purchaseNumber;
-            }
-          });
+          if (this.sysType == 2){
+            this.domList.forEach(e => {
+              if (e.text == "报价订单/待审核") {
+                e.qty = res.data.data.offerNumber;
+              }
+              if (e.text == "销售订单/待审核") {
+                e.qty = res.data.data.sellNumber;
+              }
+              if (e.text == "采购订单/待审核") {
+                e.qty = res.data.data.purchaseNumber;
+              }
+            });
+          }else {
+            this.list.forEach(e => {
+              if (e.text == "报价订单/待审核") {
+                e.qty = res.data.data.offerNumber;
+              }
+              if (e.text == "销售订单/待审核") {
+                e.qty = res.data.data.sellNumber;
+              }
+              if (e.text == "采购订单/待审核") {
+                e.qty = res.data.data.purchaseNumber;
+              }
+            });
+          }
         })
         .finally(() => {
           this.loading = false;
@@ -133,14 +147,25 @@ export default {
       this.loading = true;
       shipCheckDate({ tradeType: this.tradeType })
         .then(res => {
-          this.list.forEach(e => {
-            if (e.text == "发货/待审核") {
-              e.qty = res.data.data.sellNumber;
-            }
-            if (e.text == "收货/待审核") {
-              e.qty = res.data.data.purchaseNumber;
-            }
-          });
+          if (this.sysType == 2){
+            this.domList.forEach(e => {
+              if (e.text == "发货/待审核") {
+                e.qty = res.data.data.sellNumber;
+              }
+              if (e.text == "收货/待审核") {
+                e.qty = res.data.data.purchaseNumber;
+              }
+            });
+          }else {
+            this.list.forEach(e => {
+              if (e.text == "发货/待审核") {
+                e.qty = res.data.data.sellNumber;
+              }
+              if (e.text == "收货/待审核") {
+                e.qty = res.data.data.purchaseNumber;
+              }
+            });
+          }
         })
         .finally(() => {
           this.loading = false;
@@ -150,11 +175,19 @@ export default {
       this.loading = true;
       financeCheck({ tradeType: this.tradeType })
         .then(res => {
-          this.list.forEach(e => {
-            if (e.text == "申请付款/待审核") {
-              e.qty = res.data.data;
-            }
-          });
+          if (this.sysType == 2){
+            this.domList.forEach(e => {
+              if (e.text == "申请付款/待审核") {
+                e.qty = res.data.data;
+              }
+            });
+          }else {
+            this.list.forEach(e => {
+              if (e.text == "申请付款/待审核") {
+                e.qty = res.data.data;
+              }
+            });
+          }
         })
         .finally(() => {
           this.loading = false;