12

src/views/BidSystem/ContractList/edit.vue

@@ -287,7 +287,7 @@
             :disabled="isChecked"
             size="small"
             v-model="formData.remark"
-            placeholder=""
+            placeholder="请输入"
             style="width: 200px"
           />
         </FormItem>
@@ -523,12 +523,15 @@
       </div>
     </Modal>
     <!-- 新增产品弹窗 -->
-    <Modal
+    <!-- v-model="showPDTModal" -->
+    <!-- :mask-closable="false" -->
+    <el-dialog
       title="新增产品"
-      v-model="showPDTModal"
-      :mask-closable="false"
+      :visible="showPDTModal"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
       class="addPDTFormModal"
-      :width="1000"
+      width="1000px"
     >
       <div
         class="addPDTForm"
@@ -704,7 +707,7 @@
             >
           </FormItem>
         </Form>
-        <div class="addPDTProcess">
+        <div class="addPDTProcess" style="z-index:9999">
           <div
             v-for="(_item, _index) in tempItem.addPDTProcessAttrList"
             :key="_item.id"
@@ -713,7 +716,6 @@
             <Select
               v-model="_item.id"
               size="small"
-              transfer
               @on-change="
                 (value) => handleAddPDTAttrChange(_item, _index, value)
               "
@@ -731,7 +733,6 @@
               v-model="_item.process_detail"
               filterable
               clearable
-              transfer
               label-in-value
               @on-change="
                 (value) => handleAddPDTAttrDetailChange(_item, _index, value)
@@ -780,17 +781,20 @@
         </div>
       </div>
       <div class="modal-footer" slot="footer">
-        <Button @click="showPDTModal = false">取消</Button>
+        <Button style="margin-right:10px" @click="showPDTModal = false"
+          >取消</Button
+        >
         <Button type="primary" @click="handleAddPDTConfirm">确认</Button>
       </div>
-    </Modal>
+    </el-dialog>
     <!-- 编辑产品弹窗 -->
-    <Modal
+    <el-dialog
       title="编辑产品"
-      v-model="showPDTEditModal"
-      :mask-closable="false"
+      :visible="showPDTEditModal"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
       class="addPDTFormModal"
-      :width="1000"
+      width="1000px"
     >
       <div class="addPDTForm">
         <Form :label-width="100" :model="PDTEdit">
@@ -986,7 +990,6 @@
             <Select
               v-model="_item.id"
               size="small"
-              transfer
               @on-change="
                 (value) => handleAddPDTAttrChange(_item, _index, value)
               "
@@ -1005,7 +1008,6 @@
               filterable
               clearable
               label-in-value
-              transfer
               @on-change="
                 (value) => handleAddPDTAttrDetailChange(_item, _index, value)
               "
@@ -1035,7 +1037,7 @@
         <Button @click="showPDTEditModal = false">取消</Button>
         <Button type="primary" @click="handlePDTEditConfirm">确认</Button>
       </div>
-    </Modal>
+    </el-dialog>
     <!-- 特殊字段弹窗 -->
     <Modal
       title="特殊字段"
@@ -2640,8 +2642,8 @@ export default {
           params: { id: e },
         }).then((res) => {
           if (res.code == 200) {
-            if (res.data.measure_id.length>0) {
-              item.tempPDTTypeList = res.data.measure_id
+            if (res.data.measure_id.length > 0) {
+              item.tempPDTTypeList = res.data.measure_id;
               item.tempMeasureList = JSON.parse(
                 JSON.stringify(this.measureList)
               );

src/views/BidSystem/DeepeningOrder/detail.vue

@@ -499,12 +499,13 @@
       </div>
     </Modal>
     <!-- 新增产品弹窗 -->
-    <Modal
+    <el-dialog
       title="新增产品"
-      v-model="showPDTModal"
-      :mask-closable="false"
+      :visible="showPDTModal"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
       class="addPDTFormModal"
-      :width="1000"
+      width="1000px"
     >
       <div
         class="addPDTForm"
@@ -676,7 +677,6 @@
             <Select
               :value="_item.id"
               size="small"
-              transfer
               @on-change="
                 (value) => handleAddPDTAttrChange(_item, _index, value)
               "
@@ -744,10 +744,10 @@
         </div>
       </div>
       <div class="modal-footer" slot="footer">
-        <Button @click="showPDTModal = false">取消</Button>
+        <Button style="margin-right:10px" @click="showPDTModal = false">取消</Button>
         <Button type="primary" @click="handleAddPDTConfirm">确认</Button>
       </div>
-    </Modal>
+    </el-dialog>
   </div>
 </template>
 

src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -1452,70 +1452,8 @@ export default {
               res.data.product_id,
               this.formData
             );
-            // this.formData.parts.map((element) => {
-            //   console.log('element :>> ', element);
-            //   element.partsProcessLineTableData = [];
-            //   element.wide = element.formula_w;
-            //   element.proportion = element.ratio;
-            //   element.thick = element.formula_h;
-            //   element.long = element.formula_l;
-            //   (element.ProcessAttrList = this.tempProcessAttrList), //工艺属性列表
-            //     this.axios("/api/parts_detail", {
-            //       params: { id: element.part_id },
-            //     })
-            //       .then((re) => {
-            //         // element.company = re.data.company
-            //         element.isAddPart = true;
-            //         element.isAddProcessRoute = true;
-            //         element.parts_type = re.data.p_id;
-            //         // element.part_id = re.data.title
-            //         this.axios({
-            //           method: "get",
-            //           url: "/api/parts_index",
-            //           params: {
-            //             bp_id: element.parts_type,
-            //           },
-            //         })
-            //           .then((r) => {
-            //             element.partsNameList = r.data.data;
-            //             if (isEditItem) {
-            //               let item = isEditItem;
-            //               // let item = JSON.parse(JSON.stringify(isEditItem));
-            //               item.parts.forEach((element) => {
-            //                 element.processCombination = element.route_id;
-            //                 let obj = { value: element.route_id, label: "" };
-            //                 this.handleProcessRouteSelect(element, obj);
-            //               });
-            //               isEditItem = item;
-            //             }
-            //             this.$forceUpdate()
-            //           })
-            //           .catch((err) => { });
-            //         element.company = re.data.company;
-            //         // element.partsNameList = [{ id: re.data.id, title: re.data.title }]
-            //         element.pay_state = re.data.label;
-            //         // element.partsWoodTableData = re.data.detail;
-            //         this.showSimilarProductModal = false;
-            //       })
-            //       .catch((err) => { });
-            //   let obj = { value: element.part_id };
-            //   this.handlePartsNameSelect(element, obj);
-            // });
-
-            this.formData.parts.map((element) => {
-              // element.properties = element.process_ids;
-              // 1 木板  2 木皮  3 实木  4 辅料  5 五金  6 油漆
-              //   if (element.type_id == 0 || element.type_id == 1) {
-              //     this.tableData.push(element)
-              //   } else if (element.type_id == 5) {
-              //     this.metalsTableData.push(element)
-              //   }
-              // process_ids: "1,3"
-              // route_id: 10
-            });
           }
         })
-        .catch((err) => {});
     },
     handleMatchBP(array, id) {
       array.forEach((element, index) => {
@@ -1680,8 +1618,8 @@ export default {
             // }
             this.formData.parts.map((element) => {
               element.partsProcessLineTableData = [];
-              element.wide = element.formula_w;
               element.proportion = element.ratio;
+              element.wide = element.formula_w;
               element.thick = element.formula_h;
               element.long = element.formula_l;
               element.ProcessAttrList = JSON.parse(
@@ -2285,6 +2223,8 @@ export default {
                 });
                 element.route_id = res.data.id;
                 element.part_id = result.data.id;
+              }else{
+                element.route_id = element.processCombination;
               }
             } else {
               save_sucess = false;

src/views/MeasurementOrderMannage/edit.vue

@@ -200,7 +200,7 @@ export default {
         {
           title: "产品名称",
           align: "center",
-          key: "product",
+          key: "product_title",
           minWidth: 200,
         },
         { title: "产品型号", align: "center", key: "model", minWidth: 150 },