Browse Source

Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

002390 1 year ago
parent
commit
a16bc1c8c6

+ 5 - 0
src/assets/styles/element-ui.scss

@@ -89,4 +89,9 @@
   > .el-submenu__title
   .el-submenu__icon-arrow {
   display: none;
+}
+
+
+.el-autocomplete-suggestion .el-autocomplete-suggestion__wrap{
+  padding: 10px 0 0 0;
 }

+ 2 - 4
src/components/popover-select-v2/index.vue

@@ -148,14 +148,12 @@ export default {
       this.$emit("change", prop, this.$props);
     },
   },
-  created() {
-    console.log("this", this);
-  },
+  created() {},
   mounted() {},
   destroyed() {},
 };
 </script>
-<!-- v-on="$listeners" -->
+
 <template>
   <div class="popover-select-v2">
     <el-autocomplete

+ 1 - 4
src/views/purchase/apply/edit/index.vue

@@ -69,9 +69,6 @@ export default {
           }
         );
       }
-      if (type === "ORG_PARAM") {
-        console.log(prop, type, source);
-      }
     },
     //
     async fetchItem(prop) {
@@ -119,7 +116,7 @@ export default {
       const { tableColumns } = tabColumns.find(
         (element) => element.key === prop
       );
-      this.params[prop].push(initParams(tableColumns));
+      this.params[prop].push({ ...initParams(tableColumns), delFlag: "0" });
     },
     //
     async useRowRemove(prop, scope) {

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

@@ -198,6 +198,8 @@ export default {
               v-bind="column.attr"
               v-model="params[column.item.key]"
               :source.sync="params"
+              @change="useQuery(params, page)"
+              @keyup.enter.native="useQuery(params, page)"
               style="width: 100%"
             >
               <template v-if="column.attr.dictName">