提交bug

src/page/index/tags.vue

@@ -330,6 +330,9 @@ export default {
         if (tag.label == "销售订单(I)") {
           this.$store.commit("XSACE_OUT_DETAIL");
         }
+        if (tag.label == "销售订单") {
+          this.$store.commit("OUT_LTXS_STATUS");
+        }
         if (tag.label == "采购申请") {
           this.$store.commit('OFFICEPUR_OUT_DETAIL');
         }

src/store/getters.js

@@ -46,6 +46,7 @@ const getters = {
   entranceCgStatus: state => state.ifdetail.entranceCgStatus,
   entranceXsStatus: state => state.ifdetail.entranceXsStatus,
   xsStatus: state => state.ifdetail.xsStatus,
+  ltxsStatus: state => state.ifdetail.ltxsStatus,
   bjStatus: state => state.ifdetail.bjStatus,
   officePurchaseStatus: state => state.ifdetail.officePurchaseStatus,
   officeLyStatus: state => state.ifdetail.officeLyStatus,

src/store/modules/ifdetail.js

@@ -12,7 +12,7 @@ const ifdetail = {
     mainItemStatus: false, //主营业务明细
     settleStatus: false, //结算明细
     domSaleStatus: false, // 内贸销售
-    domPurchaseOrder:false,
+    domPurchaseOrder: false,
     domStockDetail: false, // 国内库存账
     domPurStatus: false, // 内贸采购
     outputStatus: false, //销项发票
@@ -20,6 +20,7 @@ const ifdetail = {
     entranceCgStatus: false, //进口采购
     entranceXsStatus: false, //进口销售,
     xsStatus: false, //出口销售
+    ltxsStatus: false,//轮胎销售
     bjStatus: false, //出口报价
     cgStatus: false, //出口采购
     officePurchaseStatus: false, // 办公采购
@@ -29,28 +30,28 @@ const ifdetail = {
     dealerSaleStatus: false, //经销商销售
     xsjhStatus: false,
     ckglStatus: false, //出口报价
-    pjxsStatus:false,
-    pjxsStatusTwo:false,
-    pjcgStatus:false,
-    maritimeExport:false,
-    collectionSettlement:false
+    pjxsStatus: false,
+    pjxsStatusTwo: false,
+    pjcgStatus: false,
+    maritimeExport: false,
+    collectionSettlement: false
   },
   actions: {},
   mutations: {
     // 海运出口打开
-    DOMXS_OPEN_EXPORT_DETAIL(state){
+    DOMXS_OPEN_EXPORT_DETAIL(state) {
       state.maritimeExport = true;
     },
     // 海运出口关闭
-    DOMXS_CLOSE_EXPORT_DETAIL(state){
+    DOMXS_CLOSE_EXPORT_DETAIL(state) {
       state.maritimeExport = false;
     },
     // 收款结算打开
-    COLL_OPEN_EXPORT_DETAIL(state){
+    COLL_OPEN_EXPORT_DETAIL(state) {
       state.collectionSettlement = true;
     },
     // 收款结算关闭
-    COLL_CLOSE_EXPORT_DETAIL(state){
+    COLL_CLOSE_EXPORT_DETAIL(state) {
       state.collectionSettlement = false;
     },
     //国内状态发货单
@@ -105,6 +106,13 @@ const ifdetail = {
     OUT_XS_STATUS(state) {
       state.xsStatus = false;
     },
+    //退出详情页
+    OUT_LTXS_STATUS(state) {
+      state.ltxsStatus = false;
+    },
+    IN_LTXS_STATUS(state) {
+      state.ltxsStatus = true;
+    },
     IN_BJ_STATUS(state) {
       state.bjStatus = true;
     },
@@ -215,10 +223,10 @@ const ifdetail = {
       state.domStockDetail = false;
     },
     //库存账里面的账明细
-    DEMKC_IN_DETAIL(state){
+    DEMKC_IN_DETAIL(state) {
       state.domStockDetail = true;
     },
-    DEMKC_OUT_DETAIL(state){
+    DEMKC_OUT_DETAIL(state) {
       state.domStockDetail = false;
 
     },
@@ -326,16 +334,16 @@ const ifdetail = {
       if (tag.label == '报价(E)') {
         state.bjStatus = true;
       }
-      if(tag.label=='出库管理'){
+      if (tag.label == '出库管理') {
         state.ckglStatus = true;
       }
-      if(tag.label=='销售单'){
+      if (tag.label == '销售单') {
         state.pjxsStatus = true;
       }
-      if(tag.label=='销售计划单'){
+      if (tag.label == '销售计划单') {
         state.pjxsStatusTwo = true;
       }
-      if(tag.label=='采购单'){
+      if (tag.label == '采购单') {
         state.pjcgStatus = true;
       }
       if (tag.label == '付费申请') {

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -36,7 +36,7 @@
                         审 批<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item @click.native="examineBtn('审批')" :disabled="isExamineBtn">审批
+                        <el-dropdown-item @click.native="examineBtn('审批')" :disabled="isExamineBtn && !detailData.check">审批
                         </el-dropdown-item>
                         <el-dropdown-item @click.native="checkScheduleDialog = true, checkId = form.id">请核进度
                         </el-dropdown-item>
@@ -837,6 +837,7 @@ export default {
             this.viewDisabled = false;
             this.form.businessSource = '内部销售'
         }
+        console.log('this.detailData.check',this.detailData.check);
         if (this.detailData.check) {
             this.isExamineBtn = false
             // this.batchNo = this.detailData.check.batchNo
@@ -913,7 +914,6 @@ export default {
             // }
         }
     },
-
     methods: {
         editBtn(row, index) {
             console.log(123);
@@ -953,6 +953,11 @@ export default {
                 //     }
                 // })
             }
+            if(this.form.status == '退款请核'){
+                this.viewDisabled = false
+                this.isAddBtn = true
+                return
+            }
             if (this.form.status == '已取消' || this.form.status == '退款请核') {
                 this.isAddBtn = true
                 // this.$message.error('当前状态不允许编辑')
@@ -1195,7 +1200,6 @@ export default {
                                                 this.isContacts = true
                                                 this.$message.success("生成出库任务成功");
                                                 this.isApplySettlement = false
-                                            loading.close();
 
                                             }).finally(() => {
                                                 loading.close();
@@ -1408,6 +1412,9 @@ export default {
                 if (this.form.status == '退款请核' || this.form.status == '退款中') {
                     this.isRevocationRequest = false;
                 }
+                if(this.form.status == '待发货'){
+                    this.isApplySettlement = false
+                }
                 //成本、毛利对销售角色隐藏
                 this.optionForm.column.forEach(its => {
                     if (JSON.parse(localStorage.getItem('saber-userInfo')).content.role_name.split(',').includes('销售')) {
@@ -1503,7 +1510,7 @@ export default {
                         const data = {
                             id: this.form.id,
                             url: '/tirePartsMall/salesManagement/saleOrder/index',
-                            pageStatus: "this.$store.getters.domSaleStatus",
+                            pageStatus: "this.$store.getters.ltxsStatus",
                             pageLabel: "销售订单",
                         }
                         const loading = this.$loading({

src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -27,7 +27,7 @@
 
       </avue-crud>
     </basic-container>
-    <detailsPage v-if="detailsOpen" :onLoad="form" :detailData="detailData" @backToList="backToList"></detailsPage>
+    <detailsPage v-if="detailsOpen" @goBack="goBack" :onLoad="form" :detailData="detailData" @backToList="backToList"></detailsPage>
   </div>
 </template>
 
@@ -214,6 +214,7 @@ export default {
       console.log(this.$route.query.check);
       if (this.$route.query.check) {
         this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
+        this.$store.commit("IN_LTXS_STATUS");
       }
       this.detailData = {
           id: this.$route.query.check.billId,
@@ -247,6 +248,8 @@ export default {
         this.detailData = {}
       }
       this.onLoad(this.page, this.search)
+      this.$store.commit("OUT_LTXS_STATUS");
+
     },
     editOpen(row, status) {
       this.form = row
@@ -255,6 +258,7 @@ export default {
         status: status
       };
       console.log(status);
+      this.$store.commit("IN_LTXS_STATUS");
       this.detailsOpen = true;
     },
     //刷新