002201 1 жил өмнө
parent
commit
3fa8746e78

+ 33 - 27
src/components/ImageUpload/index.vue

@@ -15,16 +15,20 @@
       :headers="headers"
       :file-list="fileList"
       :on-preview="handlePictureCardPreview"
-      :class="{hide: this.fileList.length >= this.limit}"
+      :class="{ hide: this.fileList.length >= this.limit }"
     >
       <i class="el-icon-plus"></i>
     </el-upload>
-    
+
     <!-- 上传提示 -->
     <div class="el-upload__tip" slot="tip" v-if="showTip">
       请上传
-      <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
-      <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+      <template v-if="fileSize">
+        大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+      </template>
+      <template v-if="fileType">
+        格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
+      </template>
       的文件
     </div>
 
@@ -55,7 +59,7 @@ export default {
     },
     // 大小限制(MB)
     fileSize: {
-       type: Number,
+      type: Number,
       default: 5,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
@@ -66,8 +70,8 @@ export default {
     // 是否显示提示
     isShowTip: {
       type: Boolean,
-      default: true
-    }
+      default: true,
+    },
   },
   data() {
     return {
@@ -81,7 +85,7 @@ export default {
       headers: {
         Authorization: "Bearer " + getToken(),
       },
-      fileList: []
+      fileList: [],
     };
   },
   watch: {
@@ -89,14 +93,14 @@ export default {
       handler(val) {
         if (val) {
           // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',');
+          const list = Array.isArray(val) ? val : this.value.split(",");
           // 然后将数组转为对象数组
-          this.fileList = list.map(item => {
+          this.fileList = list.map((item) => {
             if (typeof item === "string") {
               if (item.indexOf(this.baseUrl) === -1) {
-                  item = { name: this.baseUrl + item, url: this.baseUrl + item };
+                item = { name: this.baseUrl + item, url: this.baseUrl + item };
               } else {
-                  item = { name: item, url: item };
+                item = { name: item, url: item };
               }
             }
             return item;
@@ -107,8 +111,8 @@ export default {
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   computed: {
     // 是否显示提示
@@ -125,7 +129,7 @@ export default {
         if (file.name.lastIndexOf(".") > -1) {
           fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
         }
-        isImg = this.fileType.some(type => {
+        isImg = this.fileType.some((type) => {
           if (file.type.indexOf(type) > -1) return true;
           if (fileExtension && fileExtension.indexOf(type) > -1) return true;
           return false;
@@ -135,7 +139,9 @@ export default {
       }
 
       if (!isImg) {
-        this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}图片格式文件!`);
+        this.$modal.msgError(
+          `文件格式不正确, 请上传${this.fileType.join("/")}图片格式文件!`
+        );
         return false;
       }
       if (this.fileSize) {
@@ -167,8 +173,8 @@ export default {
     },
     // 删除图片
     handleDelete(file) {
-      const findex = this.fileList.map(f => f.name).indexOf(file.name);
-      if(findex > -1) {
+      const findex = this.fileList.map((f) => f.name).indexOf(file.name);
+      if (findex > -1) {
         this.fileList.splice(findex, 1);
         this.$emit("input", this.listToString(this.fileList));
       }
@@ -202,25 +208,25 @@ export default {
           strs += list[i].url.replace(this.baseUrl, "") + separator;
         }
       }
-      return strs != '' ? strs.substr(0, strs.length - 1) : '';
-    }
-  }
+      return strs != "" ? strs.substr(0, strs.length - 1) : "";
+    },
+  },
 };
 </script>
 <style scoped lang="scss">
 // .el-upload--picture-card 控制加号部分
 ::v-deep.hide .el-upload--picture-card {
-    display: none;
+  display: none;
 }
 // 去掉动画效果
 ::v-deep .el-list-enter-active,
 ::v-deep .el-list-leave-active {
-    transition: all 0s;
+  transition: all 0s;
 }
 
-::v-deep .el-list-enter, .el-list-leave-active {
-    opacity: 0;
-    transform: translateY(0);
+::v-deep .el-list-enter,
+.el-list-leave-active {
+  opacity: 0;
+  transform: translateY(0);
 }
 </style>
-

+ 1 - 0
src/components/file-preview/index.vue

@@ -59,6 +59,7 @@ export default {
   },
   data() {
     return {
+      separator: ";",
       visible: false,
       fileList: [],
     };

+ 17 - 5
src/components/popover-select-v2/index.vue

@@ -60,6 +60,15 @@ export default {
       },
       set(value) {
         this.$emit("input", value);
+        if (!value) {
+          const {
+            $props: { source, dataMapping },
+          } = this;
+          for (let key in dataMapping) {
+            source[key] = undefined;
+          }
+          this.$emit("update:source", source);
+        }
       },
     },
     tableColumns() {
@@ -113,6 +122,8 @@ export default {
     // reset
     async useReset() {
       this.data = [];
+      this.page.pageNum = 1;
+      this.page.pageSize = 10;
       this.model.search = null;
       await this.fetchList(this.model, this.page);
     },
@@ -123,6 +134,7 @@ export default {
     // auto
     async useAutocomplete(prop, cb) {
       if (prop) {
+        this.page.pageSize = 25;
         this.model.search = prop;
         await this.fetchList(this.model, this.page);
         await cb(this.data);
@@ -143,8 +155,8 @@ export default {
       for (let key in dataMapping) {
         source[key] = prop[dataMapping[key]];
       }
+      this.innerValue = prop[valueKey];
       this.$emit("update:source", source);
-      this.$emit("input", prop[valueKey]);
       this.$emit("change", prop, this.$props);
     },
   },
@@ -170,7 +182,7 @@ export default {
           style="
             text-overflow: ellipsis;
             overflow: hidden;
-            line-height: 16px;
+            line-height: 15px;
             margin: 5px 0;
           "
         >
@@ -180,7 +192,7 @@ export default {
           style="
             font-size: 12px;
             color: #b4b4b4;
-            line-height: 16px;
+            line-height: 15px;
             margin: 5px 0;
           "
         >
@@ -225,9 +237,9 @@ export default {
       </template>
       <el-form
         v-loading="loading"
+        :size="size"
         :inline="true"
         :model="model"
-        :size="size"
         @submit.native.prevent
       >
         <el-form-item prop="search">
@@ -246,8 +258,8 @@ export default {
           :size="size"
           height="45vh"
           highlight-current-row
-          @row-click="useSelect([$event])"
           @row-dblclick="useConfirm"
+          @row-click="useSelect([$event])"
         >
           <el-table-column
             v-for="(column, index) in tableColumns"

+ 1 - 1
src/views/purchase/apply/column.js

@@ -54,7 +54,7 @@ export const SearchColumns = [
       is: "el-popover-select-v2",
       referName: "CONTACTS_PARAM",
       valueKey: "name",
-      dataMapping: { buyer: "id", buyerName: "name" },
+      dataMapping: { buyer: "code", buyerName: "name" },
     },
   },
   {

+ 1 - 0
src/views/purchase/apply/index.vue

@@ -241,6 +241,7 @@ export default {
       v-if="tableData.length"
       :size="size"
       :data="tableData"
+      stripe
       highlight-current-row
       @row-dblclick="useSee"
       @selection-change="useSelect"

+ 1 - 0
src/views/purchase/apply/see/index.vue

@@ -101,6 +101,7 @@ export default {
   >
     <div
       style="
+        z-index: 6666;
         position: fixed;
         right: 20px;
         top: 50%;