Merge branch 'xiaozy_产品列表' of http://121.196.213.68:3000/xiaozhiyong/refinery-admin into lixuan

src/views/product/components/add.vue

@@ -3,7 +3,7 @@
     :title="controlWindows.addInfo.title"
     direction="ltr"
     size="40%"
-    :visible="controlWindows.add"
+    :visible.sync="controlWindows.add"
     @opened="openDrawer"
     :before-close="closeWindow"
   >
@@ -175,11 +175,9 @@ export default {
         this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo));
         this.configAutocomplete.echoId = id;
         this.configAutocomplete.echoName = this.form.refineryName;
-        console.log("this.form", this.form.floorPrice);
       }
     },
     submit() {
-      console.log("this.form", this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           this.judgeInterface(this.form).then((res) => {
@@ -196,27 +194,7 @@ export default {
       if (id) return serve.update(form);
       else return serve.save(form);
     },
-    //炼厂list
-    // findByEntity() {
-    //   refineryServe.findByEntity().then((res) => {
-    //     this.refineryList = res.data;
-    //   });
-    // },
-    // 远程搜索
-    // querySearchAsync(queryString, cb) {
-    //   if (queryString) {
-    //     refineryServe
-    //       .findByEntity({ refineryName: queryString })
-    //       .then((res) => {
-    //         let timeInstance = setTimeout(() => {
-    //           clearTimeout(timeInstance);
-    //           if (res.data.length) {
-    //             cb(res.data);
-    //           } else cb([]);
-    //         }, 1000 * Math.random());
-    //       });
-    //   } else cb([]);
-    // },
+
     closeWindow() {
       this.$emit("closeWindow");
       this.form = {};

src/views/product/components/adjust.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     title="调价"
-    :visible="controlWindows.adjust"
+    :visible.sync="controlWindows.adjust"
     width="30%"
     :before-close="closeWindow"
     @opened="openDrawer"

src/views/product/components/batch.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     title="批量修改"
-    :visible="controlWindows.batch"
+    :visible.sync="controlWindows.batch"
     width="30%"
     :before-close="closeWindow"
     @opened="openDrawer"

src/views/product/components/create.vue

@@ -3,7 +3,7 @@
     :title="controlWindows.addInfo.title"
     direction="ltr"
     size="40%"
-    :visible="controlWindows.create"
+    :visible.sync="controlWindows.create"
     @opened="openDrawer"
     :before-close="closeWindow"
   >
@@ -226,13 +226,20 @@ export default {
       }
     },
     openDrawer() {
+      this.form = {}
       let { id } = this.controlWindows.addInfo;
       if (id) {
         //回显
         this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo));
         this.configAutocomplete.echoId = id;
         this.configAutocomplete.echoName = this.form.refineryName;
-        console.log("this.form", this.form.floorPrice);
+        this.form.salePrice = this.form.salePrice2company
+        this.productData()
+        // this.productDataList(this.form.productName)
+        this.productRowData = this.productNameList.filter(
+          (item) => item.id == e
+        );
+        console.log("this.form", this.form,this.productRowData,this.productNameList);
       }
     },
     submit() {
@@ -278,6 +285,7 @@ export default {
     closeWindow() {
       this.$emit("closeWindow");
       this.form = {};
+      this.controlWindows.addInfo = {};
       this.$refs.form.clearValidate();
       this.controlWindows.create = false;
     },

src/views/product/components/record.vue

@@ -3,7 +3,7 @@
     title="调价记录"
     direction="ltr"
     size="60%"
-    :visible="controlWindows.record"
+    :visible.sync="controlWindows.record"
     :before-close="closeWindow"
     @opened="openDrawer"
   >