Merge tag 'Hotfix-zh-47' into develop

Finish Hotfix-zh-47

src/views/engin_deposit/deposit_list.vue

@@ -353,7 +353,7 @@ export default {
         isRefundDeposit: this.deduction === '已退押' ? true : null,
         ...this.screenForm
       }
-      
+
       getList(params).then((res) => {
         this.dataList = res.data.records
         res.data.records.forEach((item) => {

src/views/login/index.vue

@@ -247,22 +247,23 @@
       </div>
       <div class="info">
         <div class="info-item">
-          <a :href="companyList[0].icpRecordLink">{{
-            companyList[0].icpRecord
-          }}</a>
+          <el-link :href="companyList[0].icpRecordLink" :underline="false" target="_blank">{{
+              companyList[0].icpRecord
+            }}</el-link>
           <div
             style="margin: 0 20px"
             v-if="companyList[0].companyName && companyList[0].icpRecordLink"
           >
             |
           </div>
-          <a :href="companyList[0].pubSecurityRecordLink">
+          <el-link :href="companyList[0].pubSecurityRecordLink" :underline="false" target="_blank">
             <el-image
               style="width: 14px; height: 16px"
               :src="require('@/assets/login/icon_0001.png')"
             ></el-image>
-            {{ companyList[0].pubSecurityRecord }}</a
-          >
+            {{ companyList[0].pubSecurityRecord }}
+          </el-link>
+
         </div>
         <div>{{ companyList[0].companyName }}</div>
       </div>
@@ -271,14 +272,7 @@
 </template>
 
 <script>
-import { validUsername } from "@/utils/validate";
-import Cookies from "js-cookie";
-import {
-  getCode,
-  getCompanyList,
-  getList,
-  getAdminUserSmsCode,
-} from "@/api/user";
+import { getAdminUserSmsCode, getCode, getCompanyList, getList } from '@/api/user'
 
 export default {
   name: "Login",
@@ -525,7 +519,9 @@ $back: #333;
     color: $cursor;
   }
 }
-
+.el-link--inner{
+  color: #ffffff;
+}
 /* reset element-ui css */
 .login-container {
   background: url("~@/assets/login/background.png") center center;

src/views/sales_policy/components/AddPolicy.vue

@@ -653,8 +653,9 @@ export default {
       const rebateList = []
       this.rebateList.forEach((k) => {
         k.saleTypes.forEach((j) => {
-          if (!linshi.includes(j.saleTypeId) && j.saleTypeId == e) {
+          if (!linshi.includes(j.saleTypeId) && j.saleTypeId === e) {
             rebateList.push(k)
+            linshi.push(j.saleTypeId)
           }
         })
       })
@@ -707,7 +708,7 @@ export default {
       const result = await handleImport('/policy/material/import', formData)
       this.importLoading = false
       this.importFileList = []
-      if (result.code == 200) {
+      if (result.code === 200) {
         this.$alert(result.message, '导入成功', {
           confirmButtonText: '确定'
         })
@@ -911,7 +912,7 @@ export default {
           return
         }
         if (!this.dataList[i].walletIds.length) {
-          this.$errorMsg('请选择钱包')
+          this.$errorMsg('请选择支付钱包')
           return
         }
       }

src/views/sales_policy/components/TabelTransfer.vue

@@ -236,16 +236,17 @@ export default {
       comCode: ''
     }
   },
+  watch: {
+    'dataL': (val, oval) => {
+      console.log(val, oval)
+    }
+  },
   created() {
     this.comCode = this.code
     if (this.comCode) {
       this.getCond()
     }
   },
-  updated() {
-    this.comCode = this.code
-    console.log(this.code, 'kkkkk')
-  },
   methods: {
     getList() {
       this.getCrList()
@@ -259,7 +260,6 @@ export default {
       }
       // 获取经销商列表
       getCrList(customerParams).then((res) => {
-        this.dataL = res.data.records
         for (let j = 0; j < this.custoList.length; j++) {
           for (let i = 0; i < res.data.records.length; i++) {
             if (res.data.records[i].id === this.custoList[j].customerId) {
@@ -267,6 +267,7 @@ export default {
             }
           }
         }
+        this.dataL = res.data.records
         for (let k = 0; k < this.dataL.length; k++) {
           (this.dataL[k].customerId = this.dataL[k].id),
           (this.dataL[k].customerName = this.dataL[k].name),
@@ -288,14 +289,14 @@ export default {
     },
     // 提交筛选表单
     submitScreenForm() {
-      this.currentPages = 1;
-      this.getCrList();
+      this.currentPages = 1
+      this.getCrList()
     },
     // 重置筛选表单
     resetScreenForm() {
       this.keyword = ''
-      this.currentPages = 1;
-      this.getCrList();
+      this.currentPages = 1
+      this.getCrList()
     },
     // 去掉相同数据
     resArr(arr1, arr2) {
@@ -341,11 +342,10 @@ export default {
       console.log(
         this.cpolicyId,
         this.comCode,
-        this.cpolicyId == this.comCode
+        this.cpolicyId === this.comCode
       )
     },
     getCond() {
-      console.log(this.code, 'hhjkhkj', this.comCode, '999999')
       this.listLoading = true
       const custoParams = {
         pageNum: this.currentPages,
@@ -390,7 +390,7 @@ export default {
      */
     selectable: function(row, index) {
       // row.disabled == undefined 才能被选中
-      if (row.disabled == undefined || row.disabled == false) {
+      if (row.disabled === undefined || row.disabled === false) {
         return true
       } else {
         return false
@@ -422,10 +422,10 @@ export default {
       this.type = 2
     },
     handleAllAdd() {
-      if (this.type == 1 && this.leftData.length) {
+      if (this.type === 1 && this.leftData.length) {
         for (let i = 0; i < this.dataL.length; i++) {
           for (let j = 0; j < this.leftData.length; j++) {
-            if (this.dataL[i].id == this.leftData[j].id) {
+            if (this.dataL[i].id === this.leftData[j].id) {
               this.dataL[i].disabled = true
             }
           }
@@ -446,8 +446,8 @@ export default {
             }
           }
         }
-        const arr = this.resArr(this.custoList, this.rightData)
-        this.custoList = arr
+        this.custoList = this.resArr(this.custoList, this.rightData)
+        this.$refs.multipleTable.clearSelection()
       } else {
         this.$errorMsg('请选择要删除的经销商')
       }
@@ -478,8 +478,8 @@ export default {
             }
           }
         }
-        const arr = this.resArr(this.custoList, this.rightData)
-        this.custoList = arr
+        this.custoList = this.resArr(this.custoList, this.rightData)
+        this.$refs.multipleTable.clearSelection()
       } else {
         this.$errorMsg('请选择要删除的经销商')
       }

src/views/sales_policy/components/editPolicy.vue

@@ -661,6 +661,7 @@ export default {
         k.saleTypes.forEach((j) => {
           if (!linshi.includes(j.saleTypeId) && j.saleTypeId == e) {
             rebateList.push(k)
+            linshi.push(j.saleTypeId)
           }
         })
       })
@@ -712,7 +713,7 @@ export default {
       const result = await handleImport('/policy/material/import', formData)
       this.importLoading = false
       this.importFileList = []
-      if (result.code == 200) {
+      if (result.code === 200) {
         this.$alert(result.message, '导入成功', {
           confirmButtonText: '确定'
         })
@@ -740,7 +741,7 @@ export default {
         },
 
         this.srcList = [this.$imageUrl + this.detail.imgSrc]
-        if (this.$parent.isShow == 5 && this.detail.imgSrc) {
+        if (this.$parent.isShow === 5 && this.detail.imgSrc) {
           this.fileList = [
             {
               hover: '',
@@ -932,7 +933,7 @@ export default {
           return
         }
         if (!this.dataList[i].walletIds.length) {
-          this.$errorMsg('请选择钱包')
+          this.$errorMsg('请选择支付钱包')
           return
         }
       }