添加打样申请页面接口

src/views/mes/proofing/components/ProcessProd.vue

@@ -15,7 +15,7 @@
     <el-table :data="tableData">
       <el-table-column label="物料名称" prop="itemName" align="center" />
       <el-table-column label="单位" prop="unitOfMeasure" align="center" />
-      <el-table-column label="用料比例" prop="quantity" align="center" />
+      <el-table-column label="数量" prop="quantity" align="center" />
       <el-table-column label="备注" prop="remark" align="center" />
       <el-table-column label="操作" align="center" width="150">
         <template slot-scope="{ row, index }">
@@ -30,7 +30,7 @@
             type="text"
             icon="el-icon-delete"
             size="small"
-            @click="deleteRow(index)"
+            @click="$emit('deleteRow', row)"
             >删除</el-button
           >
         </template>
@@ -43,7 +43,11 @@
       width="800px"
       append-to-body
     >
-      <el-table :data="bomList" @selection-change="handleSelectionChange">
+      <el-table
+        :data="bomList"
+        @current-change="handleRowChange"
+        @row-dblclick="handleRowDbClick"
+      >
         <el-table-column width="50" align="center">
           <template v-slot="scope">
             <el-radio
@@ -59,10 +63,35 @@
         <el-table-column label="用料比例" prop="quantity" />
       </el-table>
       <div slot="footer">
-        <el-button>确认</el-button>
+        <el-button @click="configmSelect">确认</el-button>
         <el-button @click="showFlag = false">取消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :visible.sync="editConnectVisible" title="编辑物料关联信息">
+      <el-form :model="form" inline size="small" label-width="90px">
+        <el-form-item label="物料名称">
+          <el-input disabled v-model="form.itemName"></el-input>
+        </el-form-item>
+        <el-form-item label="单位">
+          <el-input disabled v-model="form.unitOfMeasure"></el-input>
+        </el-form-item>
+        <el-form-item label="数量">
+          <el-input type="number" v-model="form.quantity"></el-input>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="form.remark" type="textarea" :rows="3"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button type="primary" size="small" @click="confirmEditConnect"
+          >确认</el-button
+        >
+        <el-button size="small" @click="editConnectVisible = false"
+          >取消</el-button
+        >
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -77,22 +106,103 @@ export default {
       type: Number | undefined,
       default: undefined,
     },
+    bomConnectProcessList: {
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
+      form: {
+        itemName: "",
+        unitOfMeasure: "",
+        quantity: "",
+        remark: "",
+      },
+      currentRow: null,
       tableData: [],
       selectedItemId: undefined,
+      selectedRows: null,
       showFlag: false,
+      editConnectVisible: false,
     };
   },
+  watch: {
+    bomConnectProcessList: {
+      handler(val) {
+        if (val.length) {
+          this.tableData = this.bomConnectProcessList.filter(
+            (v) => v.processId == this.processId
+          );
+        } else {
+          this.tableData = [];
+        }
+      },
+      deep: true,
+    },
+  },
+  // computed: {
+  //   tableData() {
+  //     if (this.bomConnectProcessList.length) {
+  //       return this.bomConnectProcessList.filter(
+  //         (v) => v.processId == this.processId
+  //       );
+  //     }
+  //     return [];
+  //   },
+  // },
   methods: {
-    handleSelectionChange() {},
-    handleRowChange() {},
+    handleRowChange(row) {
+      if (row) {
+        this.selectedRows = row;
+      }
+    },
+    handleRowDbClick(row) {
+      if (row) {
+        this.selectedRows = row;
+        // 添加数据，并且添加时间戳作为保存前 删除的唯一凭证
+        this.$emit("onSetConnect", {
+          ...this.selectedRows,
+          processId: this.processId,
+          createTimes: new Date().getTime(),
+        });
+        this.showFlag = false;
+      }
+    },
+    /**新增按钮 */
     handleAdd() {
       this.showFlag = true;
     },
-    updateRow() {},
-    deleteRow() {},
+    /**确认选择关联的Bom */
+    configmSelect() {
+      if (this.selectedItemId == null || this.selectedItemId == 0) {
+        return;
+      }
+      // 添加数据，并且添加时间戳作为保存前 删除的唯一凭证
+      this.$emit("onSetConnect", {
+        ...this.selectedRows,
+        processId: this.processId,
+        createTime: new Date().getTime(),
+      });
+      this.showFlag = false;
+    },
+    updateRow(row) {
+      this.resetForm();
+      Object.assign(this.form, row);
+      this.editConnectVisible = true;
+    },
+    resetForm() {
+      this.form = {
+        itemName: "",
+        unitOfMeasure: "",
+        quantity: "",
+        remark: "",
+      };
+    },
+    confirmEditConnect() {
+      this.$emit('updateRow', this.form)
+      this.editConnectVisible = false;
+    },
   },
 };
 </script>

src/views/mes/proofing/components/ProogingBom.vue

@@ -21,7 +21,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-delete" size="mini"
           >产品分类导入</el-button
         >
@@ -36,7 +36,7 @@
           >产品导入</el-button
         >
         <ItemBomSelect ref="ItemBomSelectRef" @onSelected="onItemBomSelect" />
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table :data="tableData" @selection-change="handleSelectionChange">

src/views/mes/proofing/components/ProogingProcess.vue

@@ -3,7 +3,15 @@
     <el-table :data="tableData" @selection-change="handleSelectionChange">
       <el-table-column type="expand" width="55" align="center">
         <template slot-scope="{ row, index }">
-          <ProcessProd :processId="row.processId" :bomList="bomList" />
+          <ProcessProd
+            :key="index"
+            :processId="row.processId"
+            :bomList="bomList"
+            :bomConnectProcessList="bomConnectProcessList"
+            @onSetConnect="onSetConnect"
+            @deleteRow='deleteConnect'
+            @updateRow="updateConnect"
+          />
         </template>
       </el-table-column>
       <el-table-column label="工序名称" prop="processName" align="center" />
@@ -133,9 +141,9 @@ export default {
   components: { ItemBomSelect, ProcessProd },
   props: {
     bomList: {
-    type: Array,
-    default: () => [],
-  },
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
@@ -143,11 +151,11 @@ export default {
       showFlag: false,
       /**表格数据 */
       tableData: [],
-      bomData: [],
       /**表单规则 */
       rules: {},
       /**多选 */
       selection: [],
+      bomConnectProcessList: [],
       /**表单初始化数据 */
       form: {
         quantity: "",
@@ -162,25 +170,25 @@ export default {
       },
     };
   },
-  watch: {
-    bomList: {
-      handler(val) {
-        console.log(val, "000000000");
-        this.bomData = val;
-      },
-      deep: true,
-    },
-  },
   methods: {
     setList(rows) {
       this.tableData = rows;
+      // 重置关联表
+      this.bomConnectProcessList = []
     },
     /**多选 */
     handleSelectionChange(val) {
       this.selection = val;
     },
-    /**删除操作 */
-    handleDelete() {},
+    validateConnect(row) {
+
+    },
+    onSetConnect(row) {
+      // 验证用料比例是否超过
+
+      // 验证通过 添加
+      this.bomConnectProcessList.push(row)
+    },
     /**添加操作 */
     handleAdd() {
       this.resetForm();
@@ -191,15 +199,30 @@ export default {
       Object.assign(this.form, row);
       this.showFlag = true;
     },
+    updateConnect(row) {
+      const idx = this.bomConnectProcessList.findIndex(v => {
+        if (v.createTimes) {
+          return v.createTimes == row.createTimes
+        } else {
+          return v.prototypeRequestProcessItemId == row.prototypeRequestProcessItemId
+        }
+      })
+      this.bomConnectProcessList.splice(idx, 1, row)
+    },
+    deleteConnect(row) {
+      const idx = this.bomConnectProcessList.findIndex(v => {
+        if (v.createTimes) {
+          return v.createTimes == row.createTimes
+        } else {
+          return v.prototypeRequestProcessItemId == row.prototypeRequestProcessItemId
+        }
+      })
+      this.bomConnectProcessList.splice(idx, 1)
+    },
     /**删除行 */
     deleteRow(index) {
       this.tableData.splice(index, 1);
     },
-    onItemBomSelect(row) {
-      // if (row != undefined && row != null) {
-      //   this.tableData.unshift({...row})
-      // }
-    },
     /**表单提交 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
@@ -209,7 +232,12 @@ export default {
         }
       });
     },
-    getComData() {},
+    getComData() {
+      return {
+        processList: this.tableData,
+        processItemList: this.bomConnectProcessList
+      }
+    },
     /**重置表单 */
     resetForm() {
       this.form = {

src/views/mes/proofing/proofingInfo.vue

@@ -178,6 +178,8 @@ import ProogingProcess from "./components/ProogingProcess.vue";
 import ItemSelect from "@/components/itemSelect/single.vue";
 import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
 import { listRouteprocess } from "@/api/mes/pro/routeprocess";
+import { Loading } from 'element-ui'
+import { addPrototypeRequest } from '@/api/mes/pro/prototypeRequest'
 
 export default {
   components: { ProogingBom, ProogingProcess, ItemSelect, RoutesProcessSelect },
@@ -263,12 +265,17 @@ export default {
     /**提交 */
     saveForm() {
       const bomData = this.$refs.ProogingBomRef.getComData();
-      const processData = this.$refs.ProogingProcess.getComData();
+      const {processList, processItemList} = this.$refs.ProogingProcessRef.getComData();
       const params = {
         ...this.form,
         bomList: bomData,
-        processList: processData,
+        processList,
+        processItemList
       };
+      const loadingInstance = Loading.service({ fullscreen: true })
+      addPrototypeRequest(params).then(res => {
+        loadingInstance.close()
+      })
     },
     /**重置表单 */
     resetForm() {