1

src/views/BidSystem/ContractList/edit.vue

@@ -527,7 +527,7 @@
     <!-- :mask-closable="false" -->
     <el-dialog
       title="新增产品"
-      :visible="showPDTModal"
+      :visible.sync="showPDTModal"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       class="addPDTFormModal"
@@ -789,7 +789,7 @@
     <!-- 编辑产品弹窗 -->
     <el-dialog
       title="编辑产品"
-      :visible="showPDTEditModal"
+      :visible.sync="showPDTEditModal"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       class="addPDTFormModal"

src/views/BidSystem/DeepeningOrder/detail.vue

@@ -501,7 +501,7 @@
     <!-- 新增产品弹窗 -->
     <el-dialog
       title="新增产品"
-      :visible="showPDTModal"
+      :visible.sync="showPDTModal"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       class="addPDTFormModal"

src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -613,11 +613,12 @@
     <!-- 相似产品弹窗 -->
     <el-dialog
       title="选择相似产品"
-      :visible="showSimilarProductModal"
+      :visible.sync="showSimilarProductModal"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       class="similarProductModal"
       width="1000px"
+      :before-close="handleClose"
     >
       <Form :label-width="100" :model="similarProductData">
         <FormItem label="产品分类">
@@ -2149,6 +2150,9 @@ export default {
         obj
       );
     },
+    handleClose(done) {
+      done();
+    },
     handlePartMetalsDele(row, index, parentIndex) {
       this.formData.parts[parentIndex].partsMetalseData.splice(index, 1);
     },

src/views/ProductionOrderList/Dispatchlist/confirm.vue

@@ -101,6 +101,16 @@ export default {
       proxyObj: { order_no: this.$route.query.order_no },
       produces: [],
       users: [],
+      house_list: [],
+      unit_list: [],
+      level_list: [],
+      room_list: [],
+      product_list: [],
+      part_list: [],
+      part_state_list: [],
+      url_number_list: [], 
+      part_label: [],
+      produce_type_list: [],
     };
   },
   created() {
@@ -113,26 +123,126 @@ export default {
     list() {
       const array = [
         {
-          title: "工序",
+          title: "楼幢",
           filterable: true,
           name: "Select",
           value: "",
-          serverName: "produce_id",
+          serverName: "house",
           optionName: "title",
           optionValue: "id",
-          option: this.produces,
+          option: this.house_list,
+        },
+        {
+          title: "单元",
+          filterable: true,
+          name: "Select",
+          value: "",
+          serverName: "unit",
+          optionName: "title",
+          optionValue: "id",
+          option: this.unit_list,
+        },
+        {
+          title: "楼层",
+          filterable: true,
+          name: "Select",
+          value: "",
+          serverName: "level",
+          optionName: "title",
+          optionValue: "id",
+          option: this.level_list,
+        },
+        {
+          title: "房号",
+          filterable: true,
+          name: "Select",
+          value: "",
+          serverName: "room",
+          optionName: "title",
+          optionValue: "id",
+          option: this.room_list,
+        },
+        {
+          title: "产品",
+          filterable: true,
+          name: "Select",
+          value: "",
+          serverName: "product",
+          optionName: "title",
+          optionValue: "id",
+          option: this.product_list,
+        },
+        {
+          title: "部件",
+          filterable: true,
+          name: "Select",
+          value: "",
+          serverName: "part",
+          optionName: "title",
+          optionValue: "id",
+          option: this.part_list,
+        },
+        {
+          title: "部件状态",
+          filterable: true,
+          name: "Select",
+          value: "",
+          serverName: "part_state",
+          optionName: "title",
+          optionValue: "id",
+          option: this.part_state_list,
         },
         {
-          title: "班组信息",
+          title: "图号",
           filterable: true,
           name: "Select",
           value: "",
-          optionName: "nickname",
+          serverName: "url_number",
+          optionName: "title",
           optionValue: "id",
-          serverName: "user_id",
-          option: this.users,
+          option: this.url_number_list,
         },
         {
+          title: "部件是否贴标签",
+          filterable: true,
+          name: "Select",
+          value: "",
+          serverName: "part_label",
+          optionName: "title",
+          optionValue: "id",
+          option: this.part_label_list,
+        },
+        {
+          title: "工序分类",
+          filterable: true,
+          name: "Select",
+          value: "",
+          serverName: "produce_type",
+          optionName: "title",
+          optionValue: "id",
+          option: this.produce_type_list,
+        },
+        {
+          title: "工序",
+          filterable: true,
+          name: "Select",
+          value: "",
+          serverName: "produce_id",
+          optionName: "title",
+          optionValue: "id",
+          option: this.produces,
+        },
+        // {
+        //   title: "班组信息",
+        //   filterable: true,
+        //   name: "Select",
+        //   value: "",
+        //   optionName: "nickname",
+        //   optionValue: "id",
+        //   serverName: "user_id",
+        //   option: this.users,
+        // },
+        {
           title: "完工状态",
           name: "Select",
           value: "",
@@ -142,18 +252,18 @@ export default {
             { label: "已完工", value: 3 },
           ],
         },
-        {
-          title: "派工时间",
-          name: "Input",
-          start_server: "start_time",
-          end_server: "end_time",
-          start_value: "",
-          end_value: "",
-          isDate: true,
-          serverName: "id2",
-          start_placeholder: "开始日期",
-          end_placeholder: "结束日期",
-        },
+        // {
+        //   title: "派工时间",
+        //   name: "Input",
+        //   start_server: "start_time",
+        //   end_server: "end_time",
+        //   start_value: "",
+        //   end_value: "",
+        //   isDate: true,
+        //   serverName: "id2",
+        //   start_placeholder: "开始日期",
+        //   end_placeholder: "结束日期",
+        // },
       ];
       return array;
     },