lshcom 1.0.26 → 1.0.28

package/package.json

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

package/src/assets/css/global.scss

@@ -91,7 +91,7 @@
     .f-fs#{$i*2} { font-size: #{$i*2}px }
 }
 // 边距 填充
-@for $i from 1 through 4 {
+@for $i from 1 through 6 {
     .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 }
@@ -107,4 +107,5 @@
 .u-ti{display:flex;align-items:center;justify-content:space-between}
 .u-center{display:flex;align-items:center;justify-content:center}
 .u-par{position:absolute;top:12px;right:-15px;z-index:1;}
-.u-vh1{height:calc(100vh - 200px)}
+.u-vh1{height:calc(100vh - 200px)}
+.f-borerb-c{border-bottom: 1px solid #ccc}

package/src/common/lixinghang-api.js

@@ -1562,6 +1562,11 @@ export const liApi = {
                 sc(r)
             })
         },
+        getOriginalCardInfo(params, sc) {
+            return axios.post(liUrl.cardSales.getOriginalCardInfo, params).then((r) => {
+                sc(r)
+            })
+        },
 
     },
     giftReason: {

package/src/common/lixinghang-url.js

@@ -515,6 +515,8 @@ export default {
         getBatchCardInfoByCode: `${common.isdev()}/v2/cardcoupons/card/getBatchCardInfoByCode`, // 根据卡券号查询卡券信息
         batchCardUploadAttachments: `${common.isdev()}/systemFoundation_service/v1/fileSys/file/batchCardUploadAttachments`, // 批量上传绑定文件关系
         checkOaBatchCardInfo: `${common.isdev()}/v1/card/oa/checkOaBatchCardInfo.htm`, // 校验OA批量发放卡券
+        //查询作废的卡券详情
+        getOriginalCardInfo: `${common.isdev()}/v1/replacement/card/getOriginalCardInfo`,
     },
     giftReason: {
         getCardGiftReaAccNoMappingInfo: `${common.isdev()}/v1/cardRule/cardGiftReaAccNoMappingInfo/get.htm`,

package/src/components/account-type-select/account-type-select.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="row">
-    <!-- 自费 -->
+    <!-- 自费3333 -->
     <div class="col-md-6">
         <b-form-select v-model="params.accountTypeCode" :options="_accountTypeList" :disabled="disabled" 
            v-if="params.accountTypeCode != 'CountingCard' && params.accountTypeCode != 'DepositUse'" @input="accountTypeChange">

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

@@ -164,6 +164,9 @@ import BatchProductRef from './BatchProductRef.vue'
       }
     },
     methods: {
+      setList(data){
+        this.$refs.EleTable.list = data
+      },
       reset(){
         this.queryParams = JSON.parse(JSON.stringify(this.queryParamsBase))
       },

package/src/components/portrayal/portrayal.vue

@@ -2731,6 +2731,7 @@ export default {
         this.saveCustomerPhoneNo("");
         this.portrayalVo = {};
         this.vehicleListObj = {};
+        this.name = "";
         this.mobileNo = "";
         this.valueNum = "";
         this.tags = [];

package/src/components/sidebar/SidebarNavLink.vue

@@ -10,7 +10,7 @@
         <router-link v-if="isNative == 'livecs'" :to="url" class="nav-link pl7">
             {{ name }}
         </router-link>
-        <a v-else class="nav-link" @click="navLink(url)">
+        <a v-else class="nav-link pl7" @click="navLink(url)">
             {{ name }}
         </a>
     </div>