lshcom 1.0.17 → 1.0.18

package/package.json

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

package/src/assets/css/global.scss

@@ -0,0 +1,105 @@
+
+.container-fluid .el-button--primary:hover {
+    background-color: #4067a2;
+    border-color: #4067a2;
+}
+.container-fluid .el-button--success:hover {
+    background-color: #4b995b;
+    border-color: #4b995b;
+}
+.container-fluid .el-button--danger:hover {
+    background-color: #ff2b05;
+    border-color: #ff2b05;
+}
+.container-fluid .el-button--warning:hover {
+    background-color: #e68e07;
+    border-color: #e68e07;
+}
+.el-button {
+    padding: 4px 12px !important;
+    line-height: 1.5 !important;
+}
+
+
+.el-button--text.is-disabled, .el-button--text.is-disabled:focus, .el-button--text.is-disabled:hover {
+    background-color: transparent !important;
+    border-color: transparent !important;
+}
+.el-button--text:focus{outline: none;}
+.el-message-box{
+    .el-message-box__title{height:auto;min-height:18px;}
+}
+
+.f-fr{float:right}
+.f-ib{display:inline-block !important}
+.f-dn{display:none}
+.f-db{display:block !important}
+.f-pr{position:relative}
+.f-pa{position:absolute}
+.f-oh{overflow:hidden}
+.f-oa{overflow-y:auto}
+.f-ov{overflow:visible !important}
+.f-w1{width:100%}
+.f-wa{width:auto !important}
+.f-maw1{max-width:100%;}
+.f-h1{height:100%}
+.f-mh1{min-height:100%}
+.f-fwn{font-weight:normal}
+.f-fwb{font-weight:bold}
+.f-tal{text-align:left}
+.f-tac{text-align:center}
+.f-tar{text-align:right}
+.f-taj{text-align:justify;text-justify:inter-ideograph}
+.f-vam,.f-vama *{vertical-align:middle}
+.f-wsn{word-wrap:normal;white-space:nowrap;}
+.f-wsp{white-space:pre}
+.f-wspw{white-space:pre-wrap}
+.f-pre{overflow:hidden;text-align:left;white-space:pre-wrap;word-wrap:break-word;word-break:break-all;}
+.f-wwb{white-space:normal;word-wrap:break-word;word-break:break-all;}
+.f-ti2{text-indent:2em}
+.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-toe2{overflow:hidden;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;}
+.f-b1d{border:1px solid #ddd}
+.f-cp{cursor:pointer}
+.f-c0{color:#000}
+.f-c3{color:#333}
+.f-c6{color:#666}
+.f-c9{color:#999}
+.f-cb{color:blue}
+.f-cr{color:red}
+.f-cf{color:#fff}
+.f-bgf{background:#fff}
+.f-bgf2{background:#f2f2f2}
+.f-br0{border-radius:0}
+.f-br5{border-radius:5px}
+.f-br10{border-radius:10px}
+.f-br20{border-radius:20px}
+.f-bs{box-shadow: 0 0 5px #ccc}
+.f-df{display:flex}
+.f-fdc{flex-direction:column}
+.f-aic{align-items:center}
+.f-jcsb{justify-content:space-between}
+.f-f1{flex:1}
+// 字号
+@for $i from 6 through 12 {
+    .f-fs#{$i*2} { font-size: #{$i*2}px }
+}
+// 边距 填充
+@for $i from 1 through 4 {
+    .f-m#{$i*5} { margin: #{$i*5}px }
+    .f-mt#{$i*5} { margin-top: #{$i*5}px }
+    .f-mr#{$i*5} { margin-right: #{$i*5}px }
+    .f-mb#{$i*5} { margin-bottom: #{$i*5}px }
+    .f-ml#{$i*5} { margin-left: #{$i*5}px }
+    .f-p#{$i*5} { padding: #{$i*5}px }
+    .f-pt#{$i*5} { padding-top: #{$i*5}px }
+    .f-pr#{$i*5} { padding-right: #{$i*5}px }
+    .f-pb#{$i*5} { padding-bottom: #{$i*5}px }
+    .f-pl#{$i*5} { padding-left: #{$i*5}px }
+}
+
+.u-ti{display:flex;align-items:center;justify-content:space-between}
+.u-center{display:flex;align-items:center;justify-content:center}

package/src/components/LshVehicle/index.vue

@@ -407,6 +407,7 @@ export default {
       ],
       _relation: {},
       frameNo_ls: "",
+      bm6: '',
     };
   },
   watch: {
@@ -962,6 +963,9 @@ 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/el/Select.vue

@@ -20,7 +20,7 @@
     <el-option
       v-for="(item,index) in selectOptions"
       :key="item.id || index"
-      :label="item[optionLabel]"
+      :label="optionLabel ? item[optionLabel] : item"
       :value="optionValue ? item[optionValue] : item"
       :disabled="item.disabled">
       <slot :item="item"></slot>
@@ -67,6 +67,10 @@
     watch: {
       value: function (val, oldVal) {
         this.selectValue = val
+        if(this.selectValue.length && !this.selectOptions.length){
+          this.resetData()
+          this.getData()
+        }
       },
       options: function (val, oldVal) {
         this.selectOptions = []
@@ -105,7 +109,7 @@
             return
           } else if(value.length === 2 && value[0] === this.selectAllValue) {
             value.splice(0, 1)
-          } else if(value.includes(this.selectAllValue)) {
+          } else if(value.includes(this.selectAllValue) || value.length == this.selectOptions.length - 1) {
             value = [this.selectAllValue]
           } else {
             this.$emit('change', value)
@@ -132,6 +136,12 @@
             this.firstGetData = false
             if (obj.list.length < this.pageNums) this.nomore = true
             this.selectOptions = this.selectOptions.concat(obj.list)
+            // 全选交互
+            if(this.multiple && this.selectAllable){
+              if(this.selectValue.includes(this.selectAllValue) || this.selectValue.length == this.selectOptions.length - 1) {
+                this.selectValue = [this.selectAllValue]
+              }
+            }
             this.$emit('getData', this.selectOptions)
           })
         }
@@ -186,6 +196,18 @@
           this.selectOptions.unshift({[this.optionLabel]: this.selectAllLable, [this.optionValue]: this.selectAllValue})
         }
       },
+      // 获取选中项
+      getSelect(){
+        if(this.multiple){
+          return this.selectOptions.filter(item => this.selectValue.includes(item[this.optionValue]))
+        } else {
+          let obj = {}
+          if(this.selectValue && this.selectOptions.length){
+            obj = this.selectOptions.filter(item => item[this.optionValue] == this.selectValue)[0] || {}
+          }
+          return obj
+        }
+      },
     },
   };
 </script>

package/src/components/el/Table.vue

@@ -1,6 +1,11 @@
 <template>
   <div>
-    <el-table ref="table" :data="list" :stripe="stripe" :border="border" :max-height="maxHeight" :highlight-current-row="highlightCurrentRow" @current-change="handleCurrentChange" :row-class-name="rowClassName" @selection-change="handleSelectionChange">
+    <el-table ref="table" :data="list" :stripe="stripe" :border="border" :max-height="maxHeight" :highlight-current-row="highlightCurrentRow" @current-change="handleCurrentChange" :row-class-name="rowClassName" @selection-change="handleSelectionChange" @row-click="handleRowClick">
+      <el-table-column v-if="radio" label="单选" fixed width="65" align="center">
+        <template slot-scope="{ row }">
+          <el-radio style="margin:0" v-model="radioValue" :label="row" @click.native.prevent.stop="radioClick(row)">&nbsp;</el-radio>
+        </template>
+      </el-table-column>
       <slot></slot>
     </el-table>
     <ElePage v-if="ifPage" ref="ElePage" :isStartGetData="isStartGetData" :total="pageTotal" @change="getData"></ElePage>
@@ -22,6 +27,8 @@
       rowClassName: { type: Function, default: () => '' }, // 行的 className 的回调方法，也可以使用字符串为所有行设置一个固定的 className
       isStartGetData: { type: Boolean, default: true }, // 是否开始就获取数据
       pageKey: { type: Array, default: () => (['pageStart', 'pageNums']) }, // 分页参数
+      radio: { type: Boolean, default: false },  // 是否显示单选
+      selectable: { type: [Boolean,Function], default: false }, // 控制是否可选
     },
     data() {
       return {
@@ -29,18 +36,25 @@
         pageTotal: 0,
         currentRow: null,
         multipleSelection: [],
+        radioValue: null,
       };
     },
     watch: {
       data: {
         handler(val) {
           this.list = val
+          this.radioValue = null
         },
         deep: true
-      }
+      },
+      total: {
+        handler(val) {
+          this.pageTotal = val
+        },
+        deep: true
+      },
     },
     mounted() {
-      this.pageTotal = this.total
       if(this.data && this.data.length){
         this.list = this.data
       }
@@ -52,6 +66,7 @@
       // 获取数据
       getData(page){
         this.$nextTick(() => {
+          if(!this.api) return
           this.global.post(this.api, {
             ...this.query,
             [this.pageKey[0]]: page.pageStart,
@@ -63,6 +78,7 @@
               this.list = obj.list || [obj]
               this.pageTotal = obj.total
             }
+            this.radioValue = null
           })
         });
       },
@@ -89,10 +105,23 @@
           this.$refs.table.clearSelection();
         }
       },
+      // 当选择项发生变化时会触发该事件
       handleSelectionChange(val) {
         this.multipleSelection = val;
         this.$emit('selection-change', val)
-      }
+      },
+      // 当某一行被点击时会触发该事件
+      handleRowClick(row, event, column){
+        if(this.selectable && !this.selectable(row)) return
+        this.$refs.table.toggleRowSelection(row)
+        if(this.radio){
+          this.radioClick(row)
+        }
+      },
+      // 单选点击
+      radioClick(row){
+        this.radioValue = this.radioValue === row ? null : row
+      },
     }
   };
 </script>

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

@@ -0,0 +1,306 @@
+<template>
+  <div>
+    <div v-if="!view" class="u-ti f-mb20">
+      <div class="f-f1">
+        <div class="f-ib">
+          车型销售代码前6位
+          <b-form-input style="display:inline-block;width:200px;margin-right:20px;" v-model.trim="queryParams.bm6" placeholder="请输入车型销售代码前六位" autocomplete="off"/>
+        </div>
+        <div class="f-ib">
+          产品类型
+          <EleSelect style="display:inline-block;width:200px;margin-right:20px;" v-model="queryParams.typeCodes" :options="global.state('dataDictionarys','CardScopeProductType',[],'refDetailCode')" multiple/>
+        </div>
+        <div class="f-ib">
+          产品编号
+          <b-form-input style="display:inline-block;width:130px;" v-model.trim="queryParams.productNo" placeholder="请输入产品编号" autocomplete="off"/>
+        </div>
+      </div>
+      <div>
+        <b-button size="sm" variant="primary" @click="search()">查询</b-button>
+        <b-button size="sm" variant="default" @click="reset()">重置</b-button>
+      </div>
+    </div>
+    <div v-if="!view" class="f-mb10">
+      <b-button size="sm" variant="success" @click="add()">新增</b-button>
+      <b-button size="sm" variant="primary" @click="edit()">编辑</b-button>
+      <b-button size="sm" variant="danger" @click="del()">删除</b-button>
+      <EleUpload class="f-ml10 f-mr10 f-vam" text="批量导入" importText="模板下载" size="sm" :data="{relationCode:'importProductScope'}" :paramMap="{
+        phaseType,
+        cardTemplateCode,
+        cardMakeOrderNo,
+        relationNo: queryParams.relationNo,
+      }" accept=".xlsx" :showFileList="false" :importRelationCode="'importProductScopeTmpl'" :abnormal="true" @importsClosure="search" />
+      <b-button v-if="ifBatchProductRef" class="f-mr10" size="sm" variant="warning" @click="$refs.BatchProductRef.visible=true">引用历史批次适用产品</b-button>
+      <b-button size="sm" variant="default" @click="global.exportExcel({
+        fileExportType:'FileExportTypeCardProductScopeRpt',
+        fileRelactionCode:'FileExportTypeCardProductScopeRpt',
+        parameters:{
+          ...queryParams,
+          phaseType,
+          cardTemplateCode,
+          cardMakeOrderNo,
+        }
+      })">导出</b-button>
+    </div>
+    <EleTable ref="EleTable" :api="`${this.global.isdev}${cardNos.length ? '/v2/cardcoupons/scope/queryProductScopeByCardNos' : '/v2/cardcoupons/scope/queryProductScope'}`" :query="cardNos.length ? {cardNos} : {
+      ...queryParams,
+      phaseType,
+      cardTemplateCode,
+      cardMakeOrderNo,
+    }" :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 />
+      <el-table-column label="车型销售代码前6位" prop="bm6" min-width="168" show-overflow-tooltip />
+      <el-table-column label="品牌" prop="brandCode" min-width="168" show-overflow-tooltip />
+      <el-table-column label="来源" prop="factoryCode" min-width="168" show-overflow-tooltip />
+      <el-table-column label="车系" prop="seriesCode" min-width="168" show-overflow-tooltip />
+      <el-table-column label="产品类型" prop="typeName" min-width="168" show-overflow-tooltip />
+      <el-table-column label="产品编码" prop="productNo" min-width="168" show-overflow-tooltip />
+      <el-table-column label="工时是否参与计算" prop="calculateFlag" min-width="168" show-overflow-tooltip />
+      <el-table-column label="更新人" prop="updateByStr" min-width="168" show-overflow-tooltip />
+      <el-table-column label="更新时间" prop="updateTimeStr" min-width="168" show-overflow-tooltip />
+    </EleTable>
+    
+    <EleDialog ref="EleDialog" :title="`${title}适用产品`" size="mini">
+      <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>
+        </el-form-item>
+        <el-form-item label="车型销售代码前6位" prop="bm6" :rules="[{required: true, message: '不能为空'}]">
+          <el-input v-model="form.bm6" :maxlength="6" @blur="getModelInfoByBm6"></el-input>
+        </el-form-item>
+        <el-form-item label="品牌" prop="brandCode">
+          <EleSelect v-model="form.brandCode" :options="global.userInfo.benzProductVehicleSet" optionLabel="" optionValue="" @change="brandCodeChange"></EleSelect>
+        </el-form-item>
+        <el-form-item label="来源" prop="factoryCode">
+          <EleSelect ref="factoryCode" v-model="form.factoryCode" :api="`${global.isdev}/v1/sys/car/getDynamicCarRelationInfo.htm`" :query="{fatherProperty:'brandCode',fatherPropertyValue:this.form.brandCode}" :pageNums="1000" optionLabel="" optionValue="" :disabled="!form.brandCode" @change="factoryCodeChange"></EleSelect>
+        </el-form-item>
+        <el-form-item label="车系" prop="seriesCode">
+          <EleSelect ref="seriesCode" v-model="form.seriesCode" :api="`${global.isdev}/v1/sys/car/getDynamicCarRelationInfo.htm`" :query="{fatherProperty:'factoryCode',fatherPropertyValue:`${this.form.brandCode}|${this.form.factoryCode}`}" :pageNums="1000" optionLabel="" optionValue="" :disabled="!form.factoryCode" @change="seriesCodeChange"></EleSelect>
+        </el-form-item>
+        <el-form-item label="产品类型" prop="typeCode" :rules="[{required: true, message: '不能为空'}]">
+          <EleSelect ref="typeCode" v-model="form.typeCode" :options="global.state('dataDictionarys','CardScopeProductType',[],'refDetailCode')" @change="val => val == 'CSPT-All' ? form.productNo = '' : null"/>
+        </el-form-item>
+        <el-form-item label="产品编码" prop="productNo" :rules="[form.typeCode != 'CSPT-All' ? {required: true, message: '不能为空'} : {}]">
+          <el-input v-model="form.productNo" :disabled="form.typeCode == 'CSPT-All'"></el-input>
+        </el-form-item>
+        <el-form-item label="工时是否参与计算" prop="calculateFlag" :rules="[{required: true, message: '不能为空'}]">
+          <EleSelect v-model="form.calculateFlag" :options="[{label:'是',value:'是'},{label:'否',value:'否'}]"></EleSelect>
+        </el-form-item>
+        <div class="f-tar">
+          <b-button size="sm" variant="default" @click="$refs.EleDialog.visible=false">取消</b-button>
+          <b-button size="sm" variant="primary" @click="saveProductScope()">确认</b-button>
+        </div>
+      </el-form>
+    </EleDialog>
+    <EleDialog ref="BatchProductRef" :title="`历史制卡批次选择`" size="large">
+      <BatchProductRef @cancel="$refs.BatchProductRef.visible=false" @confirm="followProductScope"></BatchProductRef>
+    </EleDialog>
+  </div>
+</template>
+
+<script>
+import BatchProductRef from './BatchProductRef.vue'
+  export default {
+    components: {
+      BatchProductRef,
+    },
+    props:{
+      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)时必填
+      relationNo: { type: String, default(){return undefined} }, // ['MODIFY'].includes(phaseType)查看时必填
+      bm6: { type: String, default: '' }, // 放车辆卡匹配bm6
+      cardNos: { type: Array, default(){return []} }, // 通过卡券查询适用产品
+      ifBatchProductRef: { type: Boolean, default: false },  // 是否显示引用历史批次适用产品
+      selectable: { type: Function }, // 仅对 type=selection 的列有效，类型为 Function，Function 的返回值用来决定这一行的 CheckBox 是否可以勾选，Function(row, index)
+      view: Boolean, // 仅查看
+    },
+    data() {
+      return {
+        queryParamsBase: {
+          relationNo: this.relationNo,
+          bm6: this.bm6,
+          typeCodes: [],
+          productNo: '',
+        },
+        queryParams: {},
+        title: '',
+        formBase: {
+          discountFlag: '',
+          bm6: '',
+          brandCode: '',
+          factoryCode: '',
+          seriesCode: '',
+          typeCode: '',
+          productNo: '',
+          calculateFlag: '',
+        },
+        form: {},
+        bm6Flag: true,
+      }
+    },
+    mounted() {
+      this.reset()
+      if(this.phaseType == 'BATCH'){
+        this.search()
+      }
+      if(this.phaseType == 'MODIFY'){
+        if(this.relationNo){
+          this.search()
+        } else {
+          this.getSequence()
+        }
+      }
+    },
+    methods: {
+      reset(){
+        this.queryParams = JSON.parse(JSON.stringify(this.queryParamsBase))
+      },
+      getSequence(){
+        this.global.post(`${this.global.isdev}/systemFoundation_service/v1/sys/seq/getSequence`,{serviceCode:'CARDMORDRELSEQ'},obj => {
+          this.queryParamsBase.relationNo = obj
+          this.queryParams.relationNo = obj
+          // 批次修改带入历史
+          this.global.post(`${this.global.isdev}/v2/cardcoupons/scope/modifyInitProductScope`,{
+            phaseType: this.phaseType,
+            cardTemplateCode: this.cardTemplateCode,
+            cardMakeOrderNo: this.cardMakeOrderNo,
+            relationNo: this.queryParams.relationNo,
+          },obj=>{
+            this.search()
+          })
+        })
+      },
+      search(){
+        this.$nextTick(() => {
+          if(['BATCH','MODIFY'].includes(this.phaseType) && (!this.cardTemplateCode || !this.cardMakeOrderNo)) return
+          if(['MODIFY'].includes(this.phaseType) && !this.queryParams.relationNo) return
+          this.$refs.EleTable.resetData()
+        });
+      },
+      add(){
+        this.title = '新增'
+        this.form = JSON.parse(JSON.stringify(this.formBase))
+        this.$refs.EleDialog.visible = true
+      },
+      edit(){
+        if(this.$refs.EleTable.multipleSelection.length != 1) return this.$message('请选择一条数据')
+        this.title = '编辑'
+        this.bm6Flag = false
+        this.form = JSON.parse(JSON.stringify(this.$refs.EleTable.multipleSelection[0]))
+        this.$refs.EleDialog.visible = true
+        this.$nextTick(() => {
+          setTimeout(() => {
+            this.bm6Flag = true
+          }, 100);
+        });
+      },
+      // bm6查车型
+      getModelInfoByBm6(){
+        this.$nextTick(() => {
+          if(this.form.bm6.length == 6){
+            this.global.post(`${this.global.isdev}/systemFoundation_service/v1/sys/car/getModelInfoByBm6`,{bm6:this.form.bm6},obj => {
+              if(obj){
+                this.bm6Flag = false
+                this.form.brandCode = obj.brandCode
+                this.form.factoryCode = obj.factoryCode
+                this.form.seriesCode = obj.seriesCode
+                this.$refs.factoryCode.resetData()
+                this.$refs.seriesCode.resetData()
+                this.$nextTick(() => {
+                  this.bm6Flag = true
+                });
+              }
+            })
+          }
+        });
+      },
+      // 品牌改变
+      brandCodeChange(){
+        if(this.bm6Flag){
+          this.form.factoryCode=''
+          this.$refs.factoryCode.resetData()
+        }
+      },
+      // 来源改变
+      factoryCodeChange(){
+        if(this.bm6Flag){
+          this.form.seriesCode=''
+          this.$refs.seriesCode.resetData()
+        }
+      },
+      // 车系改变，车型查bm6
+      seriesCodeChange(){
+        if(this.bm6Flag){
+          this.$nextTick(() => {
+            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,
+                factoryCode: this.form.factoryCode,
+                seriesCode: this.form.seriesCode,
+              },obj => {
+                if(obj){
+                  this.form.bm6 = obj.bm6
+                }
+              })
+            }
+          });
+        }
+      },
+      // 新增/编辑适用产品 确认
+      saveProductScope(){
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.global.post(`${this.global.isdev}/v2/cardcoupons/scope/saveProductScope`,{
+              ...this.form,
+              typeName: this.$refs.typeCode.getSelect().label,
+              phaseType:  this.phaseType,
+              cardTemplateCode: this.cardTemplateCode,
+              cardMakeOrderNo: this.cardMakeOrderNo,
+              relationNo: this.queryParams.relationNo,
+            },obj => {
+              this.$message.success('操作成功')
+              this.$refs.EleDialog.visible = false
+              this.$refs.EleTable.resetData('')
+            })
+          }
+        })
+      },
+      // 删除
+      del(){
+        if(!this.$refs.EleTable.multipleSelection.length) return this.$message('请先选择数据')
+        this.$confirm('是否确认删除本次选择的数据', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.global.post(`${this.global.isdev}/v2/cardcoupons/scope/delProductScope`, {
+            ids: this.$refs.EleTable.multipleSelection.map(item => item.id),
+            phaseType: this.phaseType,
+            cardTemplateCode: this.cardTemplateCode,
+            cardMakeOrderNo: this.cardMakeOrderNo,
+            relationNo: this.queryParams.relationNo,
+          }, obj => {
+            this.$message.success('删除成功')
+            this.$refs.EleTable.resetData('')
+          })
+        })
+      },
+      // 引用历史批次产品
+      followProductScope(row){
+        this.global.post(`${this.global.isdev}/v2/cardcoupons/scope/followProductScope`, {
+          phaseType:  this.phaseType,
+          cardTemplateCode: this.cardTemplateCode,
+          cardMakeOrderNo: this.cardMakeOrderNo,
+          followCardMakeOrderNo: row.cardMakeOrderNo,
+          relationNo: this.queryParams.relationNo,
+        }, obj => {
+          this.$message.success('引用成功')
+          this.$refs.BatchProductRef.visible = false
+          this.$refs.EleTable.resetData()
+        })
+      },
+    },
+  }
+</script>

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

@@ -0,0 +1,63 @@
+<template>
+  <div>
+    <b-row class="f-mb10">
+      <b-col>
+        <b-form-fieldset horizontal label="卡券批次号" :label-cols="4" class="text-right">
+          <b-form-input autocomplete="off" v-model.trim="query.cardMakeOrderNo"></b-form-input>
+        </b-form-fieldset>
+      </b-col>
+      <b-col>
+        <b-form-fieldset horizontal label="卡券批次名称" :label-cols="4" class="text-right">
+          <b-form-input autocomplete="off" v-model.trim="query.batchName"></b-form-input>
+        </b-form-fieldset>
+      </b-col>
+      <b-col>
+        <b-form-fieldset horizontal label="制卡日期" :label-cols="4" class="text-right">
+          <EleDatePicker ref="inDateOrder" type="daterange" valueFormat="yyyy-MM-dd" @change="val => {query.makeDateStart = val[0];query.makeDateEnd = val[1]}" />
+        </b-form-fieldset>
+      </b-col>
+    </b-row>
+    <div class="f-mb20 f-tar">
+      <b-button size="sm" variant="primary" @click="$refs.EleTable.resetData()">查询</b-button>
+      <b-button size="sm" variant="default" @click="reset()">重置</b-button>
+    </div>
+    <EleTable class="f-mb20" ref="EleTable" :api="`${this.global.isdev}/v2/cardcoupons/batch/query.htm`" :query="query" radio>
+      <el-table-column label="批次号" prop="cardMakeOrderNo" min-width="168" show-overflow-tooltip />
+      <el-table-column label="批次名称" prop="batchName" min-width="168" show-overflow-tooltip />
+      <el-table-column label="制卡人" prop="makeEmpName" min-width="168" show-overflow-tooltip />
+      <el-table-column label="制卡时间" prop="makeDate" min-width="168" show-overflow-tooltip />
+    </EleTable>
+    <div class="f-tar">
+      <b-button size="sm" variant="default" @click="$emit('cancel')">取消</b-button>
+      <b-button size="sm" variant="primary" @click="confirm">确认</b-button>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        queryBase: {
+          cardTemplateCode: this.$route.query.cardTemplateCode || '',
+          cardMakeOrderNo: '',
+          batchName: '',
+          makeDateStart: '',
+          makeDateEnd: '',
+        },
+        query: {},
+      }
+    },
+    mounted() {
+      this.reset()
+    },
+    methods: {
+      reset(){
+        this.query = JSON.parse(JSON.stringify(this.queryBase))
+      },
+      confirm(){
+        if(!this.$refs.EleTable.radioValue) return this.$message('请选择一条数据')
+        this.$emit('confirm',this.$refs.EleTable.radioValue)
+      },
+    },
+  }
+</script>

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

@@ -154,7 +154,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="配置管理" name="second" disabled>
-          <LshVehicle :vehicleVo="selCont" v-show="!bindFlag" :isAdd="isAdd" @preserve="preserve1" @cancel="cancel"/>
+          <LshVehicle ref="LshVehicle" :vehicleVo="selCont" v-show="!bindFlag" :isAdd="isAdd" @preserve="preserve1" @cancel="cancel"/>
           <LshCust :bindFlag="bindFlag" :custVo="selCont" @changeMaster="changeMaster"  @preserve="preserve" v-show="bindFlag" @cancel="cancel"/>
         </el-tab-pane>
       </el-tabs>
@@ -309,7 +309,10 @@ export default {
               } 
             })
           }else{
-            this.$emit('comfirm', this.selCont)
+            this.$emit('comfirm', {
+              ...this.selCont,
+              bm6: this.$refs.LshVehicle.bm6,
+            })
           }
         }
       })

package/src/components/portrayal/portrayal.vue

@@ -2028,7 +2028,8 @@
             </div>
             <el-row :gutter="10">
               <el-col :span="8" class="f-mt5 f-mb5" v-for="(item,index) in portrayalCarTagArrFilter" :key="index">
-                <div class="f-p5 f-wwb f-b1d f-bgf2 f-br5">{{ item.name }}：{{ item.tagValue }}</div>
+                <div class="f-c0 f-wwb">{{ item.name }}</div>
+                <div class="f-c6 f-wwb">{{ item.tagValue }}</div>
               </el-col>
             </el-row>
           </el-tab-pane>

package/src/components/table/index.vue

@@ -9,6 +9,11 @@
         <template slot-scope="scope">{{ scope.$index + 1 + listIndex }}</template>
       </el-table-column>
       <el-table-column type="selection" width="55" fixed="left" v-if="operateType == 'multipleTable'" />
+      <el-table-column label="单选" width="65" fixed="left" v-if="operateType == 'radio'">
+        <template slot-scope="{ row }">
+          <el-radio style="margin:0" v-model="radioValue" :label="row">&nbsp;</el-radio>
+        </template>
+      </el-table-column>
       <el-table-column
         show-overflow-tooltip
         v-for="(item, i) in fields"
@@ -23,6 +28,7 @@
           <slot :name="item.columnCode" :row="data[scope.$index]">{{ scope.row[item.columnCode] }}</slot>
         </template>
       </el-table-column>
+      <slot name="tableEnd"></slot>
       <el-table-column
         v-show="custRow.length"
         v-for="item in custRow"
@@ -130,6 +136,13 @@
         default: 1000
       }
     },
+    watch: {
+      data: {
+        handler(val) {
+          this.radioValue = null
+        }
+      },
+    },
     computed: {
       listIndex(){
         return (this.pageNum - 1) * this.pageSize
@@ -141,6 +154,7 @@
         fields: [], // columns to display
         fixColumn: [], // column fixed left 
         ifTable: true,
+        radioValue: null,
       }
     },
     created() {

package/src/components/tabletwo/index.vue

@@ -38,6 +38,19 @@
 
 
       </el-table-column>
+      <el-table-column
+        v-show="custRow.length"
+        v-for="item in custRow"
+        :key="item.prop"
+        :label="item.label"
+        :prop="item.prop"
+        :min-width="item.width"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <slot :name="item.prop" :row="data[scope.$index]">{{ scope.row[item.prop] }}</slot>
+        </template>
+      </el-table-column>
     </el-table>
     <dialog-model ref="dialog" @handleOk="handleOk" />
   </div>
@@ -66,6 +79,10 @@
         type: String,
         default: ''
       },
+      custRow: {
+        type: Array,
+        default: () => []
+      },
       /**
        * index
        */