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

src/views/product/index.vue

@@ -7,19 +7,8 @@
         placeholder="产品名称"
         clearable
       ></el-input>
-
+      <!-- 炼厂名称 -->
       <autocomplete :params="parameter.params" :config="configAutocomplete" />
-
-      <!-- <el-autocomplete
-        v-model="parameter.params.refineryName"
-        :fetch-suggestions="querySearchAsync"
-        @select="selectAutocomplete"
-        value-key="refineryName"
-        placeholder="炼厂名称"
-        clearable
-        @clear="parameter.params.refineryId = ''"
-      ></el-autocomplete> -->
-
       <el-input
         v-model="parameter.params.belongLibrary"
         placeholder="所处炼厂库"
@@ -181,7 +170,7 @@
       direction="ltr"
       size="60%"
       :withHeader="false"
-      :visible="controlWindows.detail"
+      :visible.sync="controlWindows.detail"
     >
       <general-details
         title="详情"
@@ -211,6 +200,17 @@ import pagination from "components/pagination/index.vue";
 import generalDetails from "components/generalDetails/index.vue";
 
 export default {
+  components: {
+    add,
+    create,
+    record,
+    batch,
+    adjust,
+
+    pagination,
+    autocomplete,
+    generalDetails,
+  },
   data() {
     return {
       controlWindows: {
@@ -264,17 +264,6 @@ export default {
       ],
     };
   },
-  components: {
-    add,
-    create,
-    record,
-    batch,
-    adjust,
-
-    pagination,
-    autocomplete,
-    generalDetails,
-  },
   mounted() {
     this.$nextTick(() => {
       this.heightHandle();
@@ -303,25 +292,7 @@ export default {
         this.parameter.total = res.data.totalCount;
       });
     },
-    // 远程搜索
-    // querySearchAsync(queryString, cb) {
-    //   if (queryString) {
-    //     refineryServe
-    //       .findByEntity({ refineryName: queryString })
-    //       .then((res) => {
-    //         let timeInstance = setTimeout(() => {
-    //           clearTimeout(timeInstance);
-    //           if (res.data.length) {
-    //             console.log(res.data);
-    //             cb(res.data);
-    //           } else cb([]);
-    //         }, 1000 * Math.random());
-    //       });
-    //   } else cb([]);
-    // },
-    // selectAutocomplete(item) {
-    //   this.parameter.params.refineryId = item.id;
-    // },
+
     //新增
     addition() {
       this.controlWindows.addInfo.title = "产品新增";
@@ -330,8 +301,10 @@ export default {
 
     //下单
     createOrder(row) {
+      this.controlWindows.addInfo = {}
       this.controlWindows.addInfo.title = "创建订单";
       this.controlWindows.create = true;
+      console.log(this.controlWindows,'新增')
     },
     //修改订单
     updateCreate(row){
@@ -340,6 +313,7 @@ export default {
           ...row,
         };
         this.controlWindows.create = true;
+        console.log('修改')
     },
     //详情
     detail(row) {
@@ -392,12 +366,11 @@ export default {
     },
     //重置
     reset() {
-      this.parameter = {
+      Object.assign(this.parameter, {
         currentPage: 1,
         pageSize: 10,
-        total: 0,
         params: {},
-      };
+      });
     },
     // table height
     heightHandle() {