Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

src/views/ProductionOrderList/ProductionPlanlist/BST_two.vue

@@ -23,13 +23,13 @@
           ghost
           >批量派工</Button
         >
-        <Button
+        <!-- <Button
           v-if="persimissionData['批量派工单'] || persimissionData.all"
           type="primary"
           @click="dispatchList(selects)"
           ghost
           >批量派工单</Button
-        >
+        > -->
       </div>
 
       <div slot="navButton">
@@ -61,12 +61,12 @@
             @click="goDetial(row)"
             >详情</a
           >
-          <a
+          <!-- <a
             v-if="persimissionData['派工单'] || persimissionData.all"
             style="margin:0 5px"
             @click="dispatchList(row)"
             >派工单</a
-          >
+          > -->
         </div>
       </template> 
       <template slot="pageSlot">
@@ -393,7 +393,7 @@ export default {
                 : ""
             ),
         },
-        { title: "业务员", align: "center", key: "nickname", minWidth: 150 },
+        // { title: "业务员", align: "center", key: "nickname", minWidth: 150 },
         {
           title: "紧急程度",
           align: "center",
@@ -540,16 +540,16 @@ export default {
           placeholder: "请填写计划单号",
           value: "",
         },
-        {
-          title: "业务员",
-          name: "Select",
-          serverName: "nickname",
-          placeholder: "请选择",
-          value: "",
-          optionName: "nickname",
-          optionValue: "id",
-          option: this.userList,
-        },
+        // {
+        //   title: "业务员",
+        //   name: "Select",
+        //   serverName: "nickname",
+        //   placeholder: "请选择",
+        //   value: "",
+        //   optionName: "nickname",
+        //   optionValue: "id",
+        //   option: this.userList,
+        // },
         {
           title: "计划开始时间",
           name: "Input",

src/views/ProductionOrderList/ProductionsOrder/Decorationlist.vue

@@ -530,16 +530,16 @@ export default {
             { label: "否", value: 0 },
           ],
         },
-        {
-          title: "是否贴标签",
-          name: "Select",
-          value: "",
-          serverName: "label",
-          option: [
-            { label: "是", value: 1 },
-            { label: "否", value: 0 },
-          ],
-        },
+        // {
+        //   title: "是否贴标签",
+        //   name: "Select",
+        //   value: "",
+        //   serverName: "label",
+        //   option: [
+        //     { label: "是", value: 1 },
+        //     { label: "否", value: 0 },
+        //   ],
+        // },
         // {
         //   title: '是否绑定芯片',
         //   name: 'Select',
@@ -661,13 +661,13 @@ export default {
           key: "rework_require",
           minWidth: 200
         },
-        {
-          title: "部件是否贴标签",
-          align: "center",
-          minWidth: 150,
-          render: (h, params) =>
-            h("span", {}, params.row.label == 0 ? "否" : "是"),
-        },
+        // {
+        //   title: "部件是否贴标签",
+        //   align: "center",
+        //   minWidth: 150,
+        //   render: (h, params) =>
+        //     h("span", {}, params.row.label == 0 ? "否" : "是"),
+        // },
         // {
         //   title: "零部件名称",
         //   align: "center",

src/views/leadMatch/MatchList/matchPage.vue

@@ -1041,6 +1041,9 @@ export default {
           })
           .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=>{