Merge remote-tracking branch 'origin/dev' into dev

src/components/bill/config/mainLists.json

@@ -54,7 +54,6 @@
       "prop": "customerName",
       "overHidden": true,
       "search": true,
-      "width": 150,
       "index": 2
     },
     {

src/page/index/tags.vue

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

src/router/views/index.js

@@ -2472,6 +2472,19 @@ export default [{
     component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/basicData/supplier/index')
   }]
 }, {
+  path: '/tirePartsMall/basicData/commodityInformation/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tirePartsMall/basicData/commodityInformation/index',
+    name: '轮胎',
+    meta: {
+      i18n: '/tirePartsMall/basicData/commodityInformation/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/basicData/commodityInformation/index')
+  }]
+}, {
   path: '/tirePartsMall/purchasingManagement/warehouseEntryOrder/index',
   component: Layout,
   hidden: true,

src/store/getters.js

@@ -41,6 +41,7 @@ const getters = {
   domSaleStatus: state => state.ifdetail.domSaleStatus,
   domStockDetail: state => state.ifdetail.domStockDetail,
   domPurStatus: state => state.ifdetail.domPurStatus,
+  purchaseStatus: state => state.ifdetail.purchaseStatus,
   outputStatus: state => state.ifdetail.outputStatus,
   incomeStatus: state => state.ifdetail.incomeStatus,
   entranceCgStatus: state => state.ifdetail.entranceCgStatus,

src/store/modules/ifdetail.js

@@ -21,6 +21,7 @@ const ifdetail = {
     entranceXsStatus: false, //进口销售,
     xsStatus: false, //出口销售
     ltxsStatus: false,//轮胎销售
+    purchaseStatus:false,//轮胎采购
     bjStatus: false, //出口报价
     cgStatus: false, //出口采购
     officePurchaseStatus: false, // 办公采购
@@ -113,6 +114,14 @@ const ifdetail = {
     IN_LTXS_STATUS(state) {
       state.ltxsStatus = true;
     },
+    //轮胎采购
+    IN_LTCG_STATUS(state) {
+      state.purchaseStatus = true;
+    },
+    //退出详情页
+    OUT_LTCG_STATUS(state) {
+      state.purchaseStatus = false;
+    },
     IN_BJ_STATUS(state) {
       state.bjStatus = true;
     },

src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -10,14 +10,14 @@
                 <el-button class="el-button&#45;&#45;small-yh" type="primary" size="small"
                     v-if="form.id" @click="confirmEditing">编辑
                 </el-button>
-                <el-button class="el-button--small-yh" type="primary" size="small" v-if="form.statusName != '已入库'"
+                <el-button class="el-button--small-yh" type="primary" :disabled="isButton" size="small" v-if="form.statusName != '已入库'"
                     @click="editCustomer">保存数据
                 </el-button>
                 <el-button class="el-button--small-yh" type="success" size="small"
-                    v-if="form.statusName == '待入库' || form.statusName == '已撤销'" @click="complete">入库完成
+                    v-if="form.statusName == '待入库' || form.statusName == '已撤销'" @click="complete" :disabled="isButton">入库完成
                 </el-button>
                 <el-button class="el-button--small-yh" type="success" size="small" v-if="form.statusName == '已入库'"
-                    @click="revoke">撤销入库
+                    @click="revoke" :disabled="isButton">撤销入库
                 </el-button>
             </div>
         </div>
@@ -109,6 +109,7 @@ export default {
             switchDialog: false,
             isEdit:false,
             isEdits:false,
+            isButton:false,
             activeName: "sale_detail",
             disabled: false,
             isrowAdd: true,
@@ -596,6 +597,7 @@ export default {
         this.optionPaymentDetails = await this.getColumnData(this.getColumnName(274.2), this.optionPaymentDetailsBack);
         this.optionOutboundRecords = await this.getColumnData(this.getColumnName(274.3), this.optionOutboundRecordsBack);
         this.key++
+        this.isButton = true
         if (this.onLoad.id && this.detailData.id) {
             this.refresh(this.onLoad.id, true)
             this.$set(this.optionForm, 'disabled', true)
@@ -679,6 +681,7 @@ export default {
         },
         //编辑
         confirmEditing() {
+            this.isButton = false
             if (this.form.statusName == '待入库') {
                 this.isEdit = false
                 this.isrowAdd = false

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

@@ -35,7 +35,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>
@@ -230,6 +230,7 @@ export default {
                                 this.form.contacts = res.data.data.corpsAttnList[0].cname
                                 this.form.phone = res.data.data.corpsAttnList[0].tel
                                 this.contactsOption = res.data.data.corpsAddrList
+                                console.log('contactsOption',this.contactsOption);
                                 this.form.recAddress = res.data.data.corpsAddrList[0].belongtoarea + res.data.data.corpsAddrList[0].detailedAddress
 
                             })
@@ -1284,7 +1285,6 @@ export default {
         contactsChange(e) {
             console.log(e);
             console.log(this.contactsOption);
-
             // 假设this.contactsOption是你的数组对象
             let matchedContact = this.contactsOption.find(item => item.contacts == e);
             // 判断是否找到匹配的对象
@@ -1520,7 +1520,7 @@ export default {
                         const data = {
                             id: this.form.id,
                             url: '/tirePartsMall/salesManagement/purchaseOrder/index',
-                            pageStatus: "this.$store.getters.domSaleStatus",
+                            pageStatus: "this.$store.getters.purchaseStatus",
                             pageLabel: "采购订单",
                         }
                         const loading = this.$loading({

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

@@ -115,7 +115,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=0',
         }, {
           label: '仓库',
           prop: "storageId",
@@ -218,6 +218,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_LTCG_STATUS");
       }
       this.detailData = {
           id: this.$route.query.check.billId,
@@ -250,6 +251,7 @@ export default {
       if (type === 0) {
         this.detailData = {}
       }
+      this.$store.commit("OUT_LTCG_STATUS");
       this.onLoad(this.page, this.search)
     },
     editOpen(row, status) {
@@ -259,6 +261,7 @@ export default {
         status: status
       };
       console.log(status);
+      this.$store.commit("IN_LTCG_STATUS");
       this.detailsOpen = true;
     },
     //刷新