Merge branch 'ldx' into dev

src/components/general/upload_file.vue

 <template>
   <div>
     <div v-if="type == 'cropper'">
-      <cropper :max="max" :readOnly="readOnly" :fileArray="fileArray" :fit="fit" @getNewUrl="getNewUrl"></cropper>
+      <cropper
+        :max="max"
+        :readOnly="readOnly"
+        :fileArray="fileArray"
+        :fit="fit"
+        @getNewUrl="getNewUrl"
+      ></cropper>
     </div>
     <div v-else>
       <el-upload
@@ -38,50 +44,54 @@
 import cropper from "@/components/general/cropper";
 export default {
   components: {
-    cropper
+    cropper,
   },
   data() {
     return {
       hideUpload: false,
       fileArray: [],
       anotherData: {
-        directory: "file"
-      }
+        directory: "file",
+      },
     };
   },
   props: {
     multiple: {
       type: Boolean,
-      default: false
+      default: false,
     },
     directory: {
       type: String,
-      default: ''
+      default: "",
     },
     max: {
       type: Number,
-      default: 1
+      default: 1,
     },
     list: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     type: {
       type: String,
-      default: ""
+      default: "",
     },
     readOnly: {
       type: Boolean,
-      default: false
+      default: false,
     },
     fit: {
       type: String,
-      default: ""
+      default: "",
     },
     drag: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
+    unique: {
+      type: Boolean,
+      default: false,
+    },
   },
   watch: {
     list(value) {
@@ -90,19 +100,20 @@ export default {
         for (var i = 0; i < value.length; i++) {
           getListImg.push({
             name: value[i],
-            url: value[i]
+            url: value[i],
           });
         }
       }
       this.fileArray = [...getListImg];
       this.hideUpload = this.fileArray.length >= this.max;
-    }
     },
-  created(){
-    if(this.directory){
-      this.anotherData={
-        directory: this.directory
-      }
+  },
+  created() {
+    if (this.directory) {
+      this.anotherData = {
+        directory: this.directory,
+        "unique-code": this.unique ? "" : false,
+      };
     }
   },
   methods: {
@@ -128,7 +139,6 @@ export default {
         }
         return isJPG && isLt10M;
       } else {
-
       }
     },
     handleAvatarSuccess(response, file, fileList) {
@@ -137,7 +147,7 @@ export default {
         if (response.success == 1) {
           this.fileArray.push({
             url: response.data,
-            name: file.name
+            name: file.name,
           });
         }
         this.$emit("getNewList", this.fileArray);
@@ -146,7 +156,7 @@ export default {
           this.fileArray.push({
             url: response.data,
             name: file.name,
-            size: file.size
+            size: file.size,
           });
         }
         this.$emit("getNewList", this.fileArray);
@@ -154,7 +164,7 @@ export default {
         if (response.success == 1) {
           this.fileArray.push({
             url: response.data,
-            name: file.name
+            name: file.name,
           });
         }
         this.$emit("getNewList", this.fileArray);
@@ -185,17 +195,20 @@ export default {
       this.hideUpload = fileList.length >= this.max;
       this.$emit("getNewList", this.fileArray);
     },
-    remove_pic(){
-      document.querySelector('.eeupload').querySelector('.el-upload-list__item-delete').click();
-      setTimeout(()=>{
-        document.querySelector('.eeupload').querySelector('.el-upload').click();
-      },1000)
+    remove_pic() {
+      document
+        .querySelector(".eeupload")
+        .querySelector(".el-upload-list__item-delete")
+        .click();
+      setTimeout(() => {
+        document.querySelector(".eeupload").querySelector(".el-upload").click();
+      }, 1000);
     },
     getNewUrl(val) {
       let fileObj = [{ name: val, url: val }];
       this.$emit("getNewList", fileObj);
-    }
-  }
+    },
+  },
 };
 </script>
  <style>

src/components/shop-cloud/shop-cloud.vue

@@ -232,6 +232,7 @@
                       <info-list :list_arr="docTemplate" class="doc_template"></info-list>
                       <upload-file
                         :multiple="false"
+                        :unique="false"
                         :max="1"
                         type="zip"
                         :readOnly="false"
@@ -509,6 +510,7 @@
                         <info-list :list_arr="docTemplate" class="doc_template"></info-list>
                         <upload-file
                           :multiple="false"
+                          :unique="false"
                           :max="1"
                           type="zip"
                           :readOnly="false"

src/components/table/table-select.vue

@@ -58,7 +58,7 @@ export default {
     }
   },
   data: () => ({
-    selectValue: "0"
+    selectValue: 0
   }),
   mounted() {
     this.selectValue = this.item;

src/pages/workbench/fwzc_fwcs.vue

@@ -408,8 +408,8 @@ export default {
           align: "left",
           width: 100,
           selectArr: [
-            { label: "是", value: "1" },
-            { label: "否", value: "0" }
+            { label: "是", value: 1 },
+            { label: "否", value: 0 }
           ],
           hasDefault: true
         },