lshcom 1.0.18 → 1.0.19

package/package.json

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

package/src/components/el/Dialog.vue

@@ -7,6 +7,8 @@
     :top="top"
     :modal="modal"
     :modal-append-to-body="modalAppendToBody"
+    :close-on-click-modal="closeOnClickModal"
+    :show-close="showClose"
     :before-close="handleClose">
     <template v-if="customTitle" slot="title">
       <slot name="title"></slot>
@@ -35,6 +37,8 @@
       top: {type: String,default: '15%'}, // Dialog CSS 中的 top 值（仅在 size 不为 full 时有效）
       modal: {type: Boolean, default: true}, // 是否需要遮罩层
       modalAppendToBody: {type: Boolean, default: true}, // 遮罩层是否插入至 body 元素上，若为 false，则遮罩层会插入至 Dialog 的父元素上
+      closeOnClickModal: {type: Boolean, default: true}, // 是否可以通过点击 modal 关闭 Dialog
+      showClose: {type: Boolean, default: true}, // 是否显示关闭按钮
     },
     data() {
       return {

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

@@ -61,7 +61,7 @@
       <el-table-column label="更新时间" prop="updateTimeStr" min-width="168" show-overflow-tooltip />
     </EleTable>
     
-    <EleDialog ref="EleDialog" :title="`${title}适用产品`" size="mini">
+    <EleDialog ref="EleDialog" :title="`${title}适用产品`" size="mini" beforeClose>
       <el-form class="m-form" :model="form" ref="form" label-position="right" label-width="145px">
         <el-form-item label="是否参与打折" prop="discountFlag" :rules="[{required: true, message: '不能为空'}]">
           <EleSelect v-model="form.discountFlag" :options="[{label:'是',value:'是'},{label:'否',value:'否'}]"></EleSelect>
@@ -93,6 +93,12 @@
         </div>
       </el-form>
     </EleDialog>
+    <EleDialog ref="bm6Dialog" title="选择车型销售代码前6位" size="mini" :closeOnClickModal="false" :showClose="false" showFooter customFooter>
+      <EleSelect ref="bm6Select" :options="bm6List" optionLabel="" optionValue=""></EleSelect>
+      <template slot="footer">
+        <el-button type="primary" @click="bm6Confirm">确 定</el-button>
+      </template>
+    </EleDialog>
     <EleDialog ref="BatchProductRef" :title="`历史制卡批次选择`" size="large">
       <BatchProductRef @cancel="$refs.BatchProductRef.visible=false" @confirm="followProductScope"></BatchProductRef>
     </EleDialog>
@@ -138,6 +144,7 @@ import BatchProductRef from './BatchProductRef.vue'
         },
         form: {},
         bm6Flag: true,
+        bm6List: [],
       }
     },
     mounted() {
@@ -234,6 +241,7 @@ import BatchProductRef from './BatchProductRef.vue'
       seriesCodeChange(){
         if(this.bm6Flag){
           this.$nextTick(() => {
+            this.bm6List = []
             if(this.form.brandCode && this.form.factoryCode && this.form.seriesCode){
               this.global.post(`${this.global.isdev}/systemFoundation_service/v1/sys/car/getModelBm6Info`,{
                 brandCode: this.form.brandCode,
@@ -241,13 +249,24 @@ import BatchProductRef from './BatchProductRef.vue'
                 seriesCode: this.form.seriesCode,
               },obj => {
                 if(obj){
-                  this.form.bm6 = obj.bm6
+                  if(obj.length == 1){
+                    this.form.bm6 = obj[0].bm6
+                  } else {
+                    this.$refs.bm6Dialog.visible = true
+                    this.bm6List = obj.map(item => item.bm6)
+                  }
                 }
               })
             }
           });
         }
       },
+      // 选择bm6确认
+      bm6Confirm(){
+        if(!this.$refs.bm6Select.selectValue) return this.$message('请选择车型销售代码前6位')
+        this.form.bm6 = this.$refs.bm6Select.selectValue
+        this.$refs.bm6Dialog.visible = false
+      },
       // 新增/编辑适用产品 确认
       saveProductScope(){
         this.$refs.form.validate((valid) => {

package/src/components/portrayal/portrayal.vue

@@ -1997,7 +1997,7 @@
               <el-input v-model="portrayalCustomerTagInput" placeholder="请输入标签名称或者标签值" class="f-mr5" style="width:240px !important"></el-input>
               <el-button type="primary" size="large" @click="portrayalCustomerTagSearch">查询</el-button>
             </div>
-            <el-collapse v-model="portrayalCustomerTagActiveName" accordion>
+            <el-collapse v-model="portrayalCustomerTagActiveName">
               <el-collapse-item v-for="(item,index) in portrayalCustomerTagArrFilter" :key="index" :title="item.categoryName" :name="index">
                 <el-row :gutter="10" v-if="item.tags">
                   <el-col :span="6" class="f-mt5 f-mb5" v-for="(item2,index2) in item.tags" :key="index2">
@@ -2396,7 +2396,7 @@ export default {
       typeFilter: { 0: "呼入", 1: "呼出" },
       queryBalanceDataInfoQuery: {},
       getSettlementOfClaimsByVinQuery: {},
-      portrayalCustomerTagActiveName: 0, // 客户标签
+      portrayalCustomerTagActiveName: [], // 客户标签
       portrayalCustomerTagArr: [],
       portrayalCustomerTagInput: '',
       portrayalCustomerTagArrFilter: [],
@@ -2946,7 +2946,6 @@ export default {
         this.queryPortrayalPerson();
         this.handleQuery(1);
 
-        this.portrayalCustomerTagActiveName = 0
         this.portrayalCustomerTagArr = []
         this.portrayalCustomerTagInput = ''
         this.portrayalCrowdTagArr = []
@@ -3118,7 +3117,6 @@ export default {
       this.handleQuery();
       this.queryFinanceExpiryDate();
       
-      this.portrayalCustomerTagActiveName = 0
       this.portrayalCustomerTagArr = []
       this.portrayalCustomerTagInput = ''
       this.portrayalCrowdTagArr = []
@@ -3188,6 +3186,9 @@ export default {
           }, obj => {
             this[this.activeName1 + "Arr"] = obj
             this[this.activeName1 + "Search"]()
+            if(['portrayalCustomerTag'].includes(this.activeName1)){
+              this.portrayalCustomerTagActiveName = obj.map((item,index) => index)
+            }
           })
         }
       });

package/src/components/table/index.vue

@@ -108,7 +108,7 @@
        */
       minWidth: {
         type: Object,
-        default: () => {}
+        default: () => ({})
       },
       minWidthDefault: {
         type: String,