lshcom 1.0.13 → 1.0.14

package/package.json

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

package/src/common/api.js

@@ -94,6 +94,13 @@ axios.interceptors.response.use((res) => {
 
 			}
 		}
+        if ([res.data.errorcode,res.data.errorCode].includes("importBasisDistribuRelations")) {
+            Message.closeAll()
+            Message({
+                message: res.data.message,
+                type: 'success',
+            })
+        }
 	}
      else if (res.data.code === 'fail') {
         Message.closeAll()

package/src/components/el/Upload.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="f-ib f-maw1">
+    <span v-if="uploadDialogFlag">
+      <el-button :size="size" :type="type" :class="btnClass" :style="btnStyle" @click="$refs.EleDialog.visible = true">{{ text }}</el-button>
+    </span>
     <el-upload
+      v-else
       class="f-ib f-maw1"
       ref="upload"
       :action="global.uploadUrl"
@@ -18,6 +22,28 @@
     <el-button v-if="importRelationCode && importFlag" :type="importType" :size="size" :class="btnClass" :style="btnStyle" @click.stop="global.getFileList(importRelationCode,'download')">{{ importText }}</el-button>
     <el-button v-if="abnormal" type="danger" :disabled="!downloadErrorInfo.downloadErrorUrl" :size="size" :class="btnClass" @click.stop="global.open(downloadErrorInfo.downloadErrorUrl)">异常数据下载</el-button>
     <el-button v-if="importRelationCode && !importFlag" :type="importType" :size="size" :class="btnClass" :style="btnStyle" @click.stop="global.getFileList(importRelationCode,'download')">{{ importText }}</el-button>
+
+    <EleDialog title="导入" ref="EleDialog" showFooter customFooter>
+      请按照导入模板的规范，使用excel表格导入。
+      <div slot="footer">
+        <el-button v-if="uploadDialogImportRelationCode" :size="size" :class="btnClass" :style="btnStyle" @click.stop="global.getFileList(uploadDialogImportRelationCode,'download')">导入模板下载</el-button>
+        <el-upload
+          class="f-ib f-maw1"
+          ref="upload"
+          :action="global.uploadUrl"
+          :data="params"
+          :accept="accept"
+          :show-file-list="showFileList"
+          :auto-upload="autoUpload"
+          :before-upload="beforeUpload"
+          :on-success ='onSuccess'
+          :on-preview="onPreview"
+          :on-remove="onRemove"
+          :file-list="fileList">
+          <el-button :size="size" :type="type" :class="btnClass" :style="btnStyle">立即导入</el-button>
+        </el-upload>
+      </div>
+    </EleDialog>
   </div>
 </template>
 
@@ -39,6 +65,8 @@
       abnormal: { type: Boolean, default: false }, // 是否显示异常数据下载
       btnClass: { type: String, default: '' }, // 按钮class
       btnStyle: { type: Object, default: () => ({}) }, // 按钮style
+      uploadDialogFlag: { type: Boolean, default: false }, // 上传按钮点击弹框显示
+      uploadDialogImportRelationCode: { type: String, default: '' }, // 导入模板的relationCode
     },
     data() {
       return {
@@ -121,6 +149,11 @@
 							if (status > 1) {
 								clearInterval(this.timer);
 							}
+              if([res.data.errorcode,res.data.errorCode].includes("importBasisDistribuRelations")){
+                this.$emit('importsClosure', obj[0]);
+                if(this.uploadDialogFlag) this.$refs.EleDialog.visible = false
+                return
+              }
 
 							switch (status) {
 								case "2":
@@ -129,6 +162,7 @@
 										message: "导入完成",
 										type: "success"
 									});
+                  if(this.uploadDialogFlag) this.$refs.EleDialog.visible = false
 									break;
 								case "3":
 									this.downloadErrorInfo = {

package/src/components/iris-areaqueryshop/lsh-index.vue

@@ -247,12 +247,12 @@ export default {
       this.storeCodes = value[1] || []
     },
     // 设置缓存
-    setCache(){
-      this.$store.commit('queryParams/setParams', {params: this.getOrgStore(), key: `${this.$route.path}Store`})
+    setCache(key = ''){
+      this.$store.commit('queryParams/setParams', {params: this.getOrgStore(), key: `${this.$route.path}Store${key}`})
     },
     // 应用缓存
-    useCache(){
-      this.setOrgStore(this.$store.state.queryParams[`${this.$route.path}Store`])
+    useCache(key = ''){
+      this.setOrgStore(this.$store.state.queryParams[`${this.$route.path}Store${key}`])
     },
   },
   computed: {

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

@@ -87,6 +87,7 @@ export default {
       orgPropertyList_store: [{ label: "门店", value: "4" }],
       orgList: [],
       isDisabled: false,
+      useCacheFlag: false,
     };
   },
 
@@ -163,6 +164,7 @@ export default {
      * @param {string} val 组织code
      */
     handleChange(val) {
+      console.log('handleChange',val)
       let label;
       let storeCode;
       let index = 0;
@@ -246,6 +248,12 @@ export default {
           } else {
             this.orgCode = this.orgList[0].value;
           }
+          if(this.useCacheFlag){
+            let obj = this.$store.state.queryParams[`${this.$route.path}Organiza`]
+            if(obj){
+              this.orgCode = obj.orgCode || ''
+            }
+          }
         }
       });
     },
@@ -255,6 +263,21 @@ export default {
         this.isDisabled = true;
       }, 1000);
     },
+    // 设置缓存
+    setCache(){
+      this.$store.commit('queryParams/setParams', {params: {
+        orgProperty: this.orgProperty,
+        orgCode: this.orgCode,
+      }, key: `${this.$route.path}Organiza`})
+    },
+    // 应用缓存
+    useCache(){
+      let obj = this.$store.state.queryParams[`${this.$route.path}Organiza`]
+      if(obj){
+        this.orgProperty = obj.orgProperty || ''
+        this.useCacheFlag = true
+      }
+    },
   },
 };
 </script>

package/src/components/portrayal/portrayal.vue

@@ -1998,7 +1998,7 @@
               <el-button type="primary" size="large" @click="portrayalCustomerTagSearch">查询</el-button>
             </div>
             <el-collapse v-model="portrayalCustomerTagActiveName" accordion>
-              <el-collapse-item v-for="(item,index) in portrayalCustomerTagArrFilter" :title="item.categoryName" :name="index">
+              <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">
                     <div class="f-c0 f-wwb">{{ item2.name }}</div>