打样申请完成

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

@@ -8,9 +8,15 @@
         prop="linkType"
         align="center"
       />
-      <el-table-column label="工作站" prop="workstationId" align="center" />
+      <el-table-column label="工作站" prop="workstationName" align="center" />
+      <el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
       <el-table-column label="甘特图显示颜色" prop="colorCode" align="center" />
-      <el-table-column v-if="mode != 'info'" label="操作" align="center" width="150">
+      <el-table-column
+        v-if="mode != 'info'"
+        label="操作"
+        align="center"
+        width="150"
+      >
         <template slot-scope="{ row, $index }">
           <el-button
             type="text"
@@ -42,7 +48,7 @@
       v-dialogDrag
       :visible.sync="showFlag"
       width="800px"
-      title="添加工序"
+      title="工序修改"
     >
       <el-form
         ref="form"
@@ -54,75 +60,31 @@
       >
         <el-row>
           <el-col :span="12">
-            <el-form-item label="组件数量" prop="quantity">
-              <el-input
-                type="number"
-                v-model="form.quantity"
-                placeholder="请输入组件数量"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="计量单位" prop="unitOfMeasure">
-              <el-input
-                v-model="form.unitOfMeasure"
-                placeholder="请输入计量单位"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="报废百分比" prop="scrapPercentage">
-              <el-input
-                v-model="form.scrapPercentage"
-                placeholder="请输入报废百分比"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="替代组" prop="alternativeGroup">
-              <el-input
-                v-model="form.alternativeGroup"
-                placeholder="请输入替代组"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="替代优先级" prop="alternativePriorities">
-              <el-input
-                v-model="form.alternativePriorities"
-                placeholder="请输入替代优先级"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="策略" prop="alternativeStrategy">
+            <el-form-item label="工作站" prop="workstationId">
               <el-input
-                v-model="form.alternativeStrategy"
-                placeholder="请输入策略"
-              ></el-input>
+                v-model="form.workstationName"
+                disabled
+                placeholder="请选择工作站信息"
+              >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="handleWorkstationSelect"
+                ></el-button>
+              </el-input>
+              <WorkstationSelect
+                ref="WorkstationSelect"
+                :processId="form.processId"
+                @onSelected="onWorkstationSelected"
+              ></WorkstationSelect>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="使用概率" prop="alternativeProbability">
+            <el-form-item label="标准工时" prop="quantity">
               <el-input
-                v-model="form.alternativeProbability"
-                placeholder="请输入使用概率"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="BOM行备注" prop="bomItemRemark">
-              <el-input
-                v-model="form.bomItemRemark"
-                placeholder="请输入BOM行备注"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="物料备注" prop="itemRemark">
-              <el-input
-                v-model="form.itemRemark"
-                placeholder="请输入物料备注"
+                type="number"
+                v-model="form.quantity"
+                placeholder="请输入标准工时"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -139,9 +101,10 @@
 <script>
 import ItemBomSelect from "@/components/itemBomSelect/single.vue";
 import ProcessProd from "./ProcessProd.vue";
+import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
 export default {
-  components: { ItemBomSelect, ProcessProd },
-  inject: ['mode'],
+  components: { ItemBomSelect, ProcessProd, WorkstationSelect },
+  inject: ["mode"],
   props: {
     bomList: {
       type: Array,
@@ -158,15 +121,9 @@ export default {
       rules: {},
       /**表单初始化数据 */
       form: {
-        quantity: "",
-        unitOfMeasure: "",
-        scrapPercentage: "",
-        alternativeGroup: "",
-        alternativePriorities: "",
-        alternativeStrategy: "",
-        alternativeProbability: "",
-        bomItemRemark: "",
-        itemRemark: "",
+        stdWorkingTime: "",
+        workstationId: "",
+        workstationName: "",
       },
       currentRow: {},
       currentRowIndex: undefined,
@@ -174,9 +131,9 @@ export default {
   },
   methods: {
     setList(rows) {
-      this.tableData = rows.map(item => {
-        item.processItemList = []
-        return item
+      this.tableData = rows.map((item) => {
+        item.processItemList = [];
+        return item;
       });
     },
     /** 更新工序的物料信息 */
@@ -199,6 +156,8 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           this.showFlag = false;
+          Object.assign(this.currentRow, this.form);
+          this.tableData.splice(this.currentRowIndex, 1, this.currentRow);
         }
       });
     },
@@ -208,22 +167,27 @@ export default {
     /**重置表单 */
     resetForm() {
       this.form = {
-        quantity: "",
-        unitOfMeasure: "",
-        scrapPercentage: "",
-        alternativeGroup: "",
-        alternativePriorities: "",
-        alternativeStrategy: "",
-        alternativeProbability: "",
-        bomItemRemark: "",
-        itemRemark: "",
+        stdWorkingTime: "",
+        workstationId: "",
+        workstationName: "",
       };
     },
     /**重置组件状态 */
     resetState() {
-      this.resetForm()
-      this.tableData = []
-    }
+      this.resetForm();
+      this.tableData = [];
+    },
+    // 查询工作站信息
+    handleWorkstationSelect() {
+      this.$refs.WorkstationSelect.showFlag = true;
+    },
+    onWorkstationSelected(row) {
+      if (row != undefined && row != null) {
+        this.form.workstationId = row.workstationId;
+        this.form.workstationName = row.workstationName;
+        this.form.stdWorkingTime = row.stdWorkingTime;
+      }
+    },
   },
 };
 </script>

src/views/mes/proofing/proofingInfo.vue

@@ -259,7 +259,7 @@ export default {
             this.bomList = data.bomList;
             // 设置组件数据
             this.$refs["ProogingBomRef"].tableData = data.bomList;
-            this.$refs["ProogingProcess"].tableData = data.processList;
+            this.$refs["ProogingProcessRef"].tableData = data.processList;
           })
           .finally(() => {
             this.loading = false;