lshcom 1.0.21 → 1.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lshcom",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "files": [
     "src/assets/*",
     "src/common/*",

package/src/components/LshVehicle/index.vue

@@ -407,7 +407,6 @@ export default {
       ],
       _relation: {},
       frameNo_ls: "",
-      bm6: '',
     };
   },
   watch: {
@@ -963,9 +962,6 @@ export default {
             label: `${item.displayName}---&---${item.carModelCode}`,
           }
         })
-        if(obj.list && obj.list.length){
-          this.bm6 = obj.list[0].carModelCode.slice(0,6)
-        }
       })
     },
 

package/src/components/iris-card-modal/ApplicableProduct.vue

@@ -47,6 +47,8 @@
       phaseType,
       cardTemplateCode,
       cardMakeOrderNo,
+      cardMakeModifyNo,
+      bm6UseSet: bm6UseSet.length ? bm6UseSet : undefined,
     }" :selectable="selectable" :isStartGetData="['TEMPLATE'].includes(phaseType)" :ifPage="!cardNos.length">
       <el-table-column type="selection" fixed width="50" :selectable="selectable" />
       <el-table-column label="是否参与打折" prop="discountFlag" min-width="168" show-overflow-tooltip />
@@ -115,8 +117,9 @@ import BatchProductRef from './BatchProductRef.vue'
       phaseType: { type: String, default: 'TEMPLATE' }, // TEPLATE-模板，BATCH-批次，MODIFY-批次修改
       cardTemplateCode: { type: String, default(){return this.$route.query.cardTemplateCode || ''} }, // 模板编号，必填
       cardMakeOrderNo: { type: String, default(){return undefined} }, // 批次号，['BATCH','MODIFY'].includes(phaseType)时必填
+      cardMakeModifyNo: { type: String, default(){return undefined} }, // 修改/删除审批单号，修改审批查询
       relationNo: { type: String, default(){return undefined} }, // ['MODIFY'].includes(phaseType)查看时必填
-      bm6: { type: String, default: '' }, // 放车辆卡匹配bm6
+      bm6UseSet: { type: Array, default(){return []} }, // 发放车辆卡时，用bm6匹配适用产品
       cardNos: { type: Array, default(){return []} }, // 通过卡券查询适用产品
       ifBatchProductRef: { type: Boolean, default: false },  // 是否显示引用历史批次适用产品
       selectable: { type: Function }, // 仅对 type=selection 的列有效，类型为 Function，Function 的返回值用来决定这一行的 CheckBox 是否可以勾选，Function(row, index)
@@ -126,7 +129,7 @@ import BatchProductRef from './BatchProductRef.vue'
       return {
         queryParamsBase: {
           relationNo: this.relationNo,
-          bm6: this.bm6,
+          bm6: '',
           typeCodes: [],
           productNo: '',
         },
@@ -153,7 +156,7 @@ import BatchProductRef from './BatchProductRef.vue'
         this.search()
       }
       if(this.phaseType == 'MODIFY'){
-        if(this.relationNo){
+        if(this.queryParams.relationNo || this.cardMakeModifyNo){
           this.search()
         } else {
           this.getSequence()
@@ -168,6 +171,7 @@ import BatchProductRef from './BatchProductRef.vue'
         this.global.post(`${this.global.isdev}/systemFoundation_service/v1/sys/seq/getSequence`,{serviceCode:'CARDMORDRELSEQ'},obj => {
           this.queryParamsBase.relationNo = obj
           this.queryParams.relationNo = obj
+          this.queryParams = JSON.parse(JSON.stringify(this.queryParams))
           // 批次修改带入历史
           this.global.post(`${this.global.isdev}/v2/cardcoupons/scope/modifyInitProductScope`,{
             phaseType: this.phaseType,
@@ -182,7 +186,7 @@ import BatchProductRef from './BatchProductRef.vue'
       search(){
         this.$nextTick(() => {
           if(['BATCH','MODIFY'].includes(this.phaseType) && (!this.cardTemplateCode || !this.cardMakeOrderNo)) return
-          if(['MODIFY'].includes(this.phaseType) && !this.queryParams.relationNo) return
+          if(['MODIFY'].includes(this.phaseType) && !this.queryParams.relationNo && !this.cardMakeModifyNo) return
           this.$refs.EleTable.resetData()
         });
       },

package/src/components/iris-card-modal/BatchProductRef.vue

@@ -38,6 +38,7 @@
     data() {
       return {
         queryBase: {
+          storeCodeSet: [this.global.userInfo.userAvailableInfo.storeInfoVo.storeCode],
           cardTemplateCode: this.$route.query.cardTemplateCode || '',
           cardMakeOrderNo: '',
           batchName: '',

package/src/components/lsh-vehicle/index.vue

@@ -311,7 +311,7 @@ export default {
           }else{
             this.$emit('comfirm', {
               ...this.selCont,
-              bm6: this.$refs.LshVehicle.bm6,
+              bm6: this.selCont.varient.slice(0,6),
             })
           }
         }