2023年9月6日10:11:25

src/api/tirePartsMall/basicData/listingManagement/index.js

@@ -36,14 +36,14 @@ export const getDetail = (params) => {
 // 所有品牌
 export const listAll = (params) => {
   return request({
-    url: '/api/blade-sales-part/brandDesc/listAll',
+    url: '/api/blade-sales-part/brandDesc/listAll?type=PP',
     method: 'get'
   })
 }
 
 export const listAllP = (params) => {
   return request({
-    url: '/api/blade-sales-part/brandDesc/listAll',
+    url: '/api/blade-sales-part/brandDesc/listAll?type=PP',
     method: 'get',
     params: params
   })

src/views/tirePartsMall/basicData/commodityInformation/detailsPage.vue

@@ -183,7 +183,7 @@ export default {
                             label: 'cname',
                             value: 'id'
                         },
-                        dicUrl: '/api/blade-sales-part/brandDesc/listAll',
+                        dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP',
                         rules: [{
                             required: true,
                             message: " ",

src/views/tirePartsMall/basicData/commodityInformation/js/optionList.js

@@ -57,7 +57,7 @@ export const option = {
         label: 'cname',
         value: 'cname'
       },
-      dicUrl: '/api/blade-sales-part/brandDesc/listAll'
+      dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
     }, {
       label: "库存预警",
       prop: "inventoryAlert",

src/views/tirePartsMall/basicData/listingManagement/commodity.json

@@ -61,7 +61,7 @@
           "label": "cname",
           "value": "id"
         },
-        "dicUrl": "/api/blade-sales-part/brandDesc/listAll"
+        "dicUrl": "/api/blade-sales-part/brandDesc/listAll?type=PP"
 
       },
       {

src/views/tirePartsMall/basicData/listingManagement/index.vue

@@ -333,30 +333,26 @@ export default {
           label: "品牌",
           prop: "brandName",
           disabled: true,
-          overHidden: true,
+          overHidden: false,
         }, {
           label: "售价1",
           prop: "priceOne",
-          hide: true,
-          showColumn: false,
+          hide: false,
           overHidden: true,
         }, {
           label: "售价2",
           prop: "priceTwo",
-          hide: true,
-          showColumn: false,
+          hide: false,
           overHidden: true,
         }, {
           label: "售价3",
           prop: "priceThree",
-          hide: true,
-          showColumn: false,
+          hide: false,
           overHidden: true,
         }, {
           label: "售价4",
           prop: "priceFour",
-          hide: true,
-          showColumn: false,
+          hide: false,
           overHidden: true,
         },
         {

src/views/tirePartsMall/basicData/shareListing/index.vue

@@ -221,25 +221,25 @@ export default {
         }, {
           label: "售价1",
           prop: "priceOne",
-          hide: true,
+          hide: false,
           showColumn: false,
           overHidden: true,
         }, {
           label: "售价2",
           prop: "priceTwo",
-          hide: true,
+          hide: false,
           showColumn: false,
           overHidden: true,
         }, {
           label: "售价3",
           prop: "priceThree",
-          hide: true,
+          hide: false,
           showColumn: false,
           overHidden: true,
         }, {
           label: "售价4",
           prop: "priceFour",
-          hide: true,
+          hide: false,
           showColumn: false,
           overHidden: true,
         }, {

src/views/tirePartsMall/financialManagement/collectionSettlement/detailsPage.vue

@@ -135,8 +135,7 @@ export default {
           }],
         }, {
           label: '收款账户',
-          prop: "accountName",
-          remote: true,
+          prop: "accountId",
           type: 'select',
           props: {
             label: 'cname',
@@ -147,14 +146,6 @@ export default {
             this.$refs.form.dicInit()
           },
           dicUrl: '/api/blade-sales-part/accountManagement/list?enableOrNot=1&cname={{key}}&billType=HYCK',
-          // change: (data => {
-          //   console.log(data);
-          //   console.log(this.$refs.form.DIC.accountName);
-          //   if(this.$refs.form.DIC.accountName){
-          //     const targetObject = this.$refs.form.DIC.accountName.find(obj => obj.cname == data.value);
-          //     this.form.accountId = targetObject.id
-          //   }
-          // }),
           rules: [{
             required: true,
             message: " ",
@@ -447,6 +438,7 @@ export default {
     },
     //保存数据
     editCustomer() {
+      console.log(this.form,441)
       this.$refs["form"].validate((valid, done) => {
         done()
         if (valid) {
@@ -455,6 +447,7 @@ export default {
             dc: 'd',
             billType: 'SK',
             corpName: this.form.$corpId,
+            accountName: this.form.$accountId,
               filesList:this.filesList
           }
           const loading = this.$loading({

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

@@ -419,7 +419,7 @@ export default {
                         label: 'cname',
                         value: 'id'
                     },
-                    dicUrl: '/api/blade-sales-part/brandDesc/listAll'
+                    dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
                 }, {
                     label: "规格型号",
                     prop: "propertyName",

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

@@ -133,7 +133,7 @@ export default {
               label: 'cname',
               value: 'id'
             },
-            dicUrl: '/api/blade-sales-part/brandDesc/listAll'
+            dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
           }, {
             label: "规格型号",
             prop: "propertyName",

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

@@ -268,7 +268,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/brandDesc/listAll'
+          dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
         }, {
           label: '规格型号',
           prop: 'propertyName',

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

@@ -93,7 +93,7 @@ export default {
               label: 'cname',
               value: 'id'
             },
-            dicUrl: '/api/blade-sales-part/brandDesc/listAll'
+            dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
           }, {
             label: '规格型号',
             prop: 'propertyName',

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

@@ -165,7 +165,7 @@ export default {
               label: 'cname',
               value: 'id'
             },
-            dicUrl: '/api/blade-sales-part/brandDesc/listAll'
+            dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
           },
           {
             label: '规格型号',

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

@@ -25,8 +25,8 @@
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item @click.native="applySettlement('申请')" :disabled="isApplySettlement">申请退款
                         </el-dropdown-item>
-                        <el-dropdown-item @click.native="confirmRefundBtn('确认')" :disabled="isConfirmRefundBtn">确认退款
-                        </el-dropdown-item>
+<!--                        <el-dropdown-item @click.native="confirmRefundBtn('确认')" :disabled="isConfirmRefundBtn">确认退款
+                        </el-dropdown-item>-->
                         <el-dropdown-item @click.native="revocationRequest('撤销')" :disabled="isRevocationRequest">撤销请核
                         </el-dropdown-item>
                     </el-dropdown-menu>
@@ -1357,11 +1357,11 @@ export default {
                 this.viewDisabled = false
                 return
             }
-            if (this.form.status == '退款中') {
+           /* if (this.form.status == '退款中') {
                 this.viewDisabled = false
                 this.isRevocationRequest = true
                 return
-            }
+            }*/
             this.isAddBtn = false
             if (this.form.status == '已取消' || this.form.status == '已退款' || this.form.status == '已发货') {
                 return
@@ -1819,7 +1819,8 @@ export default {
                 //         this.$refs.formContacts.doLayout()
                 //     })
                 // })
-                if (this.form.status !== '录入' && this.form.status !== '退款中' && this.form.status !== '已取消' && this.form.status !== '退款请核' && this.form.status !== '已退款' && this.form.status !== '待确认' && this.form.status !== '待发货') {
+                // if (this.form.status !== '录入' && this.form.status !== '退款中' && this.form.status !== '已取消' && this.form.status !== '退款请核' && this.form.status !== '已退款' && this.form.status !== '待确认' && this.form.status !== '待发货') {
+                if (this.form.status !== '录入' && this.form.status !== '已取消' && this.form.status !== '退款请核' && this.form.status !== '已退款' && this.form.status !== '待确认' && this.form.status !== '待发货') {
                     console.log(1);
                     this.isApplySettlement = false;
                 }
@@ -1847,9 +1848,9 @@ export default {
                 //     this.viewDisabled = true;
                 // }
 
-                if (this.form.status == '退款中') {
+                /*if (this.form.status == '退款中') {
                     this.isConfirmRefundBtn = false;
-                }
+                }*/
                 if (this.form.status == '已取消') {
                     this.isConfirmRefundBtn = true;
                 }
@@ -1859,7 +1860,7 @@ export default {
                     // this.isDisabledTask = false;
                     this.buttonColor = 'warning'
                 }
-                if (this.form.status == '退款请核' || this.form.status == '退款中') {
+                if (this.form.status == '退款请核') {
                     this.isRevocationRequest = false;
                 }
                 if (this.form.status == '待发货') {
@@ -1946,7 +1947,8 @@ export default {
                 let _this = this
 
                 this.dataList = res.data.data.paymentRecordsList ? res.data.data.paymentRecordsList : [];
-                if (this.form.status !== '录入' && this.form.status !== '退款中' && this.form.status !== '已取消' && this.form.status !== '退款请核' && this.form.status !== '已退款' && this.form.status !== '待确认' && this.form.status !== '待发货') {
+                // if (this.form.status !== '录入' && this.form.status !== '退款中' && this.form.status !== '已取消' && this.form.status !== '退款请核' && this.form.status !== '已退款' && this.form.status !== '待确认' && this.form.status !== '待发货') {
+                if (this.form.status !== '录入' && this.form.status !== '已取消' && this.form.status !== '退款请核' && this.form.status !== '已退款' && this.form.status !== '待确认' && this.form.status !== '待发货') {
                     console.log(1);
                     this.isApplySettlement = false;
                 }
@@ -1968,9 +1970,9 @@ export default {
                     this.viewDisabled = true;
                     this.isEditButton = false;
                 }
-                if (this.form.status == '退款中') {
+               /* if (this.form.status == '退款中') {
                     this.isConfirmRefundBtn = false;
-                }
+                }*/
                 if (this.form.status == '已取消') {
                     this.isConfirmRefundBtn = true;
                 }
@@ -1980,7 +1982,7 @@ export default {
                     // this.isDisabledTask = false;
                     this.buttonColor = 'warning'
                 }
-                if (this.form.status == '退款请核' || this.form.status == '退款中') {
+                if (this.form.status == '退款请核') {
                     this.isRevocationRequest = false;
                 }
                 if (this.form.status == '待发货') {

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

@@ -128,7 +128,7 @@ export default {
               label: 'cname',
               value: 'id'
             },
-            dicUrl: '/api/blade-sales-part/brandDesc/listAll'
+            dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
           },
           {
             label: '花纹',