lshcom 1.0.21 → 1.0.23

package/package.json

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

package/src/assets/css/global.scss

@@ -29,6 +29,7 @@
 .el-message-box{
     .el-message-box__title{height:auto;min-height:18px;}
 }
+.is-invalid .el-input__inner{border-color:#f86c6b}
 
 .f-fr{float:right}
 .f-ib{display:inline-block !important}
@@ -60,7 +61,7 @@
 .f-lh2{line-height:2em}
 .f-tdu,.f-tdu:hover{text-decoration:underline}
 .f-tdn,.f-tdn:hover{text-decoration:none}
-.f-toe{overflow:hidden;word-wrap:normal;white-space:nowrap;text-overflow:ellipsis;}
+.f-toe,.f-toe input{overflow:hidden;word-wrap:normal;white-space:nowrap;text-overflow:ellipsis;}
 .f-toe2{overflow:hidden;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;}
 .f-b1d{border:1px solid #ddd}
 .f-cp{cursor:pointer}
@@ -69,6 +70,7 @@
 .f-c6{color:#666}
 .f-c9{color:#999}
 .f-cb{color:blue}
+.f-cb1{color:#577EB9}
 .f-cr{color:red}
 .f-cf{color:#fff}
 .f-bgf{background:#fff}
@@ -102,4 +104,5 @@
 }
 
 .u-ti{display:flex;align-items:center;justify-content:space-between}
-.u-center{display:flex;align-items:center;justify-content:center}
+.u-center{display:flex;align-items:center;justify-content:center}
+.u-par{position:absolute;top:12px;right:-15px;z-index:1;}

package/src/components/LshCust/index.vue

@@ -351,6 +351,30 @@
           <el-input v-model.trim="queryParams.renewalCustomerMobile" disabled />
         </b-form-fieldset>
       </div>
+      <div class="col-md-4">
+        <b-form-fieldset
+          horizontal
+          label="数据标记类型"
+          label-cols="4"
+          class="text-right"
+        >
+          <EleSelect v-model="queryParams.dataMarkType" :options="global.state('dataDictionarys','CustomerDataMarkType')" disabled/>
+          <i v-if="$route.name != 'lsh-customer-view' && global.showBtn('P-lshcustomer#B-ButtonTypeOther-dataMarkType')" class="el-icon-edit u-par f-cb1 f-cp" @click="dataMarkTypeEdit"></i>
+        </b-form-fieldset>
+      </div>
+      <div class="col-md-4">
+        <b-form-fieldset
+          horizontal
+          label="标记原因"
+          label-cols="4"
+          class="text-right"
+        >
+          <el-tooltip v-if="queryParams.markReason" class="item" effect="dark" :content="queryParams.markReason" placement="top">
+            <el-input class="f-toe" v-model.trim="queryParams.markReason" disabled />
+          </el-tooltip>
+          <el-input v-else v-model.trim="queryParams.markReason" disabled />
+        </b-form-fieldset>
+      </div>
     </div>
 
     <div class="f-tar">
@@ -368,6 +392,16 @@
 				<el-button type="primary" @click="checkAuthCustomerInfoConfirm">确定</el-button>
 			</div>
 		</EleDialog>
+    <EleDialog title="数据类型编辑" ref="dataTypeDialog" size="tiny" showFooter :modalAppendToBody="false" :modal="false" @confirm="dataTypeConfirm">
+			<el-form class="m-form" :model="dataTypeForm" ref="dataTypeForm" label-position="right" label-width="96px">
+        <el-form-item label="数据标记类型" prop="dataMarkType">
+          <EleSelect v-model="dataTypeForm.dataMarkType" :options="global.state('dataDictionarys','CustomerDataMarkType')" />
+        </el-form-item>
+        <el-form-item label="标记原因" prop="markReason" :rules="[dataTypeForm.dataMarkType == '3' ? {required: true, message: '不能为空'} : {}]">
+          <el-input v-model.trim="dataTypeForm.markReason" :maxlength="500" />
+        </el-form-item>
+      </el-form>
+		</EleDialog>
   </div>
 </template>
 
@@ -436,6 +470,10 @@ export default {
       visbileFlag: false,
       btnType: '',
       custInfo: {},
+      dataTypeForm: {
+        dataMarkType: '',
+        markReason: '',
+      },
     };
   },
 
@@ -807,6 +845,22 @@ export default {
     checkAuthCustomerInfoCancel(){
       this.$refs.EleDialog.visible = false
     },
+    dataMarkTypeEdit(){
+      this.dataTypeForm.dataMarkType = this.queryParams.dataMarkType || ''
+      this.dataTypeForm.markReason = this.queryParams.markReason
+      this.$refs.dataTypeDialog.visible = true
+    },
+    dataTypeConfirm(){
+      this.$refs.dataTypeForm.validate((valid) => {
+        if (valid) {
+          this.queryParams = {
+            ...this.queryParams,
+            ...this.dataTypeForm,
+          }
+          this.$refs.dataTypeDialog.visible = false
+        }
+      })
+    },
   },
 };
 </script>

package/src/components/LshVehicle/index.vue

@@ -328,6 +328,14 @@
           </el-select>
         </b-form-fieldset>
       </div>
+      <div class="col-md-4">
+        <b-form-fieldset horizontal label="车辆归属" label-cols="4" class="text-right">
+          <EleSelect v-model="queryParams.vehicleOwnership" :disabled="queryParams.vehicleOwnership == 'CompanyVehicle'" :options="global.state('dataDictionarys','CustomerVehicleOwnership').map(item => ({
+            ...item,
+            disabled: item.value == 'CompanyVehicle' ? true : false,
+          }))"/>
+        </b-form-fieldset>
+      </div>
 
       <div class="col-md-12">
         <div class="pull-right">
@@ -407,7 +415,6 @@ export default {
       ],
       _relation: {},
       frameNo_ls: "",
-      bm6: '',
     };
   },
   watch: {
@@ -643,6 +650,9 @@ export default {
         "businessTransactionOptions",
         false
       );
+      if(this.isAdd){
+        this.queryParams.vehicleOwnership = "CustomerVehicle"
+      }
     },
 
     /**
@@ -963,9 +973,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

@@ -138,6 +138,11 @@
                 prop="vehicleVariant"
                 show-overflow-tooltip
                 min-width="100" />
+              <el-table-column align="center" label="车辆归属" min-width="100" show-overflow-tooltip>
+                <template slot-scope="{ row }">
+                  {{ global.stateObj('dataDictionarys','CustomerVehicleOwnership')[row.vehicleOwnership] }}
+                </template>
+              </el-table-column>
 
               <el-table-column
 				        v-if="showChange"
@@ -311,7 +316,7 @@ export default {
           }else{
             this.$emit('comfirm', {
               ...this.selCont,
-              bm6: this.$refs.LshVehicle.bm6,
+              bm6: this.selCont.varient.slice(0,6),
             })
           }
         }
@@ -323,7 +328,9 @@ export default {
      * @desc 新增
      */
     add() {
-      this.selCont = null
+      this.selCont = {
+        vehicleOwnership: "CustomerVehicle",
+      }
       this.bindFlag =false
       this.activeName = 'second'
       this.isAdd = true