11

src/routerMap/index.js

@@ -396,7 +396,27 @@ const routerMap = [
       index: 4,
     },
     component: (resolve) =>
-      require(["@/views/ProductionOrderList/ProductionsOrder/list"], resolve),
+      require(["@/views/ProductionOrderList/ProductionsOrder/demo_list"], resolve),
+  },
+  {
+    path: "/cms/productionorderlist/productionsorder/bst_list",
+    name: "bstProductionOrderList", //生产订单列表-->生产订单列表
+    meta: {
+      index: 4,
+    },
+    component: (resolve) =>
+      require(["@/views/ProductionOrderList/ProductionsOrder/BST_list"], resolve),
+  },
+  {
+    path: "/cms/productionorderlist/productionsorder/bst_Decorationlist",
+    name: "bstProductionOrderDecorationlist", //生产订单列表-->生产订单列表-->生产计划订单详情
+    meta: {
+      index: 4,
+    },
+    component: (resolve) =>
+      require([
+        "@/views/ProductionOrderList/ProductionsOrder/BST_Decorationlist",
+      ], resolve),
   },
   {
     path: "/cms/productionorderlist/productionsorder/Decorationlist",
@@ -406,7 +426,7 @@ const routerMap = [
     },
     component: (resolve) =>
       require([
-        "@/views/ProductionOrderList/ProductionsOrder/Decorationlist",
+        "@/views/ProductionOrderList/ProductionsOrder/demo_Decorationlist",
       ], resolve),
   },
   {

src/views/ProductionOrderList/ProductionsOrder/demo_one.vue → src/views/ProductionOrderList/ProductionsOrder/BST_list.vue

@@ -270,7 +270,7 @@ export default {
     },
     goDetial (row) {
       this.$router.push({
-        path: '/cms/productionorderlist/productionsorder/Decorationlist',
+        path: '/cms/productionorderlist/productionsorder/bst_Decorationlist',
         query: {
           order_no: row.order_no,
           type: 'produce',

src/views/ProductionOrderList/ProductionsOrder/Decorationlist.vue

@@ -1,19 +0,0 @@
-<template>
-  <div>
-    <BSTDecorationlist v-if="true"/>
-    <demoDecorationlist v-else/>
-  </div>
-</template>
-<script>
-import demoDecorationlist from '@/views/ProductionOrderList/ProductionsOrder/demo_Decorationlist'
-import BSTDecorationlist from '@/views/ProductionOrderList/ProductionsOrder/BST_Decorationlist'
-export default {
-  components:{
-    demoDecorationlist,
-    BSTDecorationlist
-  }
-}
-</script>
-<style scoped>
-
-</style>

src/views/ProductionOrderList/ProductionsOrder/list.vue

@@ -1,19 +0,0 @@
-<template>
-  <div>
-    <demoOne v-if="true"/>
-    <BSTTwo v-else/>
-  </div>
-</template>
-<script>
-import demoOne from '@/views/ProductionOrderList/ProductionsOrder/demo_one'
-import BSTTwo from '@/views/ProductionOrderList/ProductionsOrder/BST_two'
-export default {
-  components:{
-    demoOne,
-    BSTTwo
-  }
-}
-</script>
-<style scoped>
-
-</style>

src/views/leadMatch/MatchList/matchPage.vue

@@ -170,7 +170,7 @@
                               filter-by-label
                               transfer
                               clearable
-                              v-model="info.wool_size"
+                              v-model="info.wool_size1"
                               size="small"
                               style="width: 120px"
                             >
@@ -401,7 +401,7 @@
                               filter-by-label
                               clearable
                               transfer
-                              v-model="info.wool_size"
+                              v-model="info.wool_size2"
                               size="small"
                               style="width: 120px"
                             >
@@ -742,7 +742,8 @@ export default {
         number: "",
         part_name: "",
         region: "",
-        wool_size: "",
+        wool_size1: "",
+        wool_size2:'',
         image_number: [],
         product_name: [],
       },
@@ -995,7 +996,7 @@ export default {
               number: this.info.number,
               part_name: this.info.part_name,
               region: this.info.region,
-              wool_size1: this.info.wool_size,
+              wool_size1: this.info.wool_size1,
             },
           })
           .then((res) => {
@@ -1036,21 +1037,11 @@ export default {
               number: this.info.number,
               part_name: this.info.part_name,
               region: this.info.region,
-              wool_size2: this.info.wool_size,
+              wool_size2: this.info.wool_size2,
             },
           })
           .then((res) => {
-            this.unmatchedObj.part_list = res.data.part_list;
-            this.unmatchedObj.part_list.forEach(v=>{
-                 v.isHidden=true
-            })
             this.unmatchedRoomList.house_list = res.data.house_list;
-            this.unmatchedRoomList.house_list.forEach(v=>{
-               this.unmatchedObj.part_list[0].key.list.forEach(item=>{
-                    v[item.key]=item.value
-               })
-            })
-            console.log(this.unmatchedRoomList.house_list)
             this.unmatchedRoomTableColumnsUsed = this.unmatchedRoomTableColumns.concat(
               res.data.head_word.map((v) => {
                 return { title: v, align: "center", key: v, minWidth: 60 };