update:修改补数订单查看

src/components/workunitSelect/single.vue

@@ -5,7 +5,6 @@
     :visible.sync="showFlag"
     :modal="false"
     width="80%"
-    center
   >
     <el-form
       :model="queryParams"
@@ -13,7 +12,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="100px"
     >
       <el-form-item label="工作单元编码" prop="workunitCode">
         <el-input
@@ -57,6 +56,7 @@
       :data="workunitList"
       @current-change="handleCurrent"
       @row-dblclick="handleRowDbClick"
+      height="500px"
     >
       <el-table-column width="55" align="center">
         <template v-slot="scope">
@@ -86,8 +86,8 @@
       @pagination="getList"
     />
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="confirmSelect">确 定</el-button>
       <el-button @click="showFlag = false">取 消</el-button>
+      <el-button type="primary" @click="confirmSelect">确 定</el-button>
     </div>
   </el-dialog>
 </template>
@@ -140,6 +140,15 @@ export default {
       },
     };
   },
+  watch: {
+    showFlag: {
+      handler(newName) {
+        this.selectedWorkunitId = null
+        this.selectedRows = []
+      },
+      immediate: true
+    }
+  },
   created() {
     this.getList();
     this.queryParams.workstationName = this.workstationName;

src/views/mes/pro/arrange/info.vue

@@ -105,7 +105,7 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="生产工单编号" align="center" prop="arrangeId"/>
       <el-table-column label="编排单号" align="center" prop="arrangeCode"/>
-      <el-table-column label="序号" align="center" prop="arrangeSort">
+      <el-table-column label="序号" width="150" align="center" prop="arrangeSort">
         <template slot-scope="scope">
           <el-input-number v-model="scope.row.arrangeSort" @change="handleChangeSort(scope.row)" :min="0"
                            style="width: 140px"
@@ -145,8 +145,8 @@
     />
 
     <!-- 添加或修改生产编排单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="编排单号" prop="arrangeCode">
           <el-input v-model="form.arrangeCode" placeholder="请输入编排单号"/>
         </el-form-item>

src/views/mes/pro/combination/info.vue

@@ -97,7 +97,7 @@
 
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="组合单号" align="center" prop="combinationCode"/>
-      <el-table-column label="序号" align="center" width prop="combinationSort">
+      <el-table-column label="序号" width="150" align="center" prop="combinationSort">
         <template slot-scope="scope">
           <el-input-number v-model="scope.row.combinationSort" @change="handleChangeSort(scope.row)" :min="0"
                            style="width: 140px"
@@ -137,8 +137,8 @@
     />
 
     <!-- 添加或修改生产组合单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="组合单号" prop="combinationCode">
           <el-input v-model="form.combinationCode" placeholder="请输入组合单号"/>
         </el-form-item>

src/views/mes/pro/workorder/components/ProogingBom.vue

 <template>
   <div>
-    <el-row :gutter="10" class="mb8" v-if="!(mode === 'info'|| mode === 'make')">
+    <el-row :gutter="10" class="mb8" v-if="!(mode === 'info'|| mode === 'make' || mode === 'makeInfo')">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -52,7 +52,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        v-if="!(mode === 'info'|| mode === 'make')"
+        v-if="!(mode === 'info'|| mode === 'make' || mode === 'makeInfo')"
         label="操作"
         align="center"
         width="120"

src/views/mes/pro/workorder/components/ProogingProcess.vue

@@ -5,7 +5,18 @@
       <el-table-column label="工序名称" prop="processName" align="center" />
       <el-table-column label="工序编码" prop="processCode" align="center" />
       <el-table-column label="工作站" prop="workstationName" align="center" />
-      <el-table-column v-if="mode === 'make'" label="工作单元名称" prop="workunitName" align="center" />
+      <el-table-column v-if="mode === 'make'" label="工作单元名称" width="200" prop="workunitName" align="center" >
+        <template slot-scope="scope">
+          <el-input readonly v-model="scope.row.workunitName">
+            <el-button
+              slot="append"
+              icon="el-icon-search"
+              @click="handleWorkUnitClick(scope.row)"
+            ></el-button>
+          </el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="工作单元名称" v-if="mode === 'makeInfo'" prop="workunitName" align="center" />
       <el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
       <el-table-column label="换型时间" prop="lineBreakTime" align="center" />
       <el-table-column label="工序总数量" prop="quantity" align="center" />
@@ -30,6 +41,7 @@
           </el-date-picker>
         </template>
       </el-table-column>
+      <el-table-column width="180" label="开始时间" v-if="mode === 'makeInfo'" prop="startTime" align="center" />
       <el-table-column width="220" v-if="mode === 'make'" label="结束时间" align="center" prop="endTime" >
         <template slot-scope="scope">
           <el-date-picker
@@ -42,11 +54,12 @@
           </el-date-picker>
         </template>
       </el-table-column>
+      <el-table-column width="180" label="结束时间" v-if="mode === 'makeInfo'" prop="endTime" align="center" />
       <el-table-column
-         v-if="!(mode === 'info'|| mode === 'make')"
+         v-if="!(mode === 'info'|| mode === 'make' || mode === 'makeInfo')"
         label="操作"
         align="center"
-        width="300"
+        width="120"
         fixed="right"
       >
         <template slot-scope="{ row, $index }">
@@ -69,10 +82,10 @@
         </template>
       </el-table-column>
       <el-table-column
-        v-if="mode == 'info'|| mode == 'make'"
+        v-if="mode == 'info'|| mode == 'make'|| mode === 'makeInfo'"
         label="操作"
         align="center"
-        width="300"
+        width="120"
         fixed="right"
       >
         <template slot-scope="{ row, $index }">
@@ -106,6 +119,12 @@
     <ProcessQcindex :process="currentRow" ref="ProcessQcindexRef" />
     <ProcessTool :process="currentRow" ref="ProcessToolRef" />
 
+    <WorkuintSelect
+      ref="WorkunitSelect"
+      :workstationName="form.workstationName"
+      @onSelected="onWorkunitSelect"
+    />
+
     <el-dialog
       v-dialogDrag
       :visible.sync="showFlag"
@@ -161,6 +180,7 @@
 </template>
 
 <script>
+import WorkuintSelect from "@/components/workunitSelect/single.vue";
 import ProcessQcindex from "./ProcessQcindex.vue";
 import ProcessTool from "./ProcessTool.vue";
 import ItemBomSelect from "@/components/itemBomSelect/single.vue";
@@ -173,6 +193,7 @@ export default {
     WorkstationSelect,
     ProcessQcindex,
     ProcessTool,
+    WorkuintSelect
   },
   inject: ["mode"],
   dicts: ["sap_control_code", "sys_yes_no"],
@@ -216,6 +237,10 @@ export default {
         return item;
       });
     },
+    handleWorkUnitClick(row) {
+      this.currentRow = row
+      this.$refs['WorkunitSelect'].showFlag = true
+    },
     /** 更新工序的物料信息 */
     updateItem(items) {
       this.tableData[this.currentRowIndex].processItemList = items;
@@ -231,6 +256,15 @@ export default {
       this.currentRowIndex = idx;
       this.$refs["ProcessProdRef"].showProcessProd = true;
     },
+    // 获取工作单元
+    onWorkunitSelect(row) {
+      // console.log(45456, row);
+      if (row) {
+        this.currentRow.workunitName = row.workunitName
+        this.currentRow.workunitId = row.workunitId
+        this.currentRow.workunitCode = row.workunitCode
+      }
+    },
     /**查看物料 */
     SearchProd(row, idx) {
       this.currentRow = row;

src/views/mes/pro/workorder/components/WorkOrderSale.vue

@@ -490,7 +490,7 @@
       <!-- </el-table-column> -->
 
       <el-table-column
-        v-if="!(mode === 'info'|| mode === 'make')"
+        v-if="!(mode === 'info'|| mode === 'make' ||  mode === 'makeInfo')"
         label="操作"
         align="center"
         width="120"

src/views/mes/pro/workorder/indexApply.vue

@@ -791,13 +791,13 @@
     </el-dialog>
 
 
-    <el-dialog title="组合单明细" v-if="combOpen" :visible.sync="combOpen" width="800px" append-to-body
+    <el-dialog title="组合单明细" v-if="combOpen" :visible.sync="combOpen" width="1000px" append-to-body
                @close="getList">
       <CombinationInfos :combinationCodes="combinationCodes"></CombinationInfos>
     </el-dialog>
 
 
-    <el-dialog title="编排单明细" v-if="arrangeOpen" :visible.sync="arrangeOpen" width="800px" append-to-body
+    <el-dialog title="编排单明细" v-if="arrangeOpen" :visible.sync="arrangeOpen" width="1000px" append-to-body
                @close="getList">
       <ArrangeInfo :arrange-code="arrangeCode"></ArrangeInfo>
     </el-dialog>
@@ -1170,10 +1170,17 @@ export default {
     },
     // 查询明细按钮操作
     handleView(row) {
-      this.reset();
-      this.getTreeselect();
-      const workorderId = row.workorderId || this.ids;
-      this.$router.push("/mes/pro/workorder/info?workorderId=" + workorderId);
+      if(row.workorderType === 'complements') {
+        this.reset();
+        this.getTreeselect();
+        const workorderId = row.workorderId || this.ids;
+        this.$router.push("/mes/pro/workorder/makeInfo?workorderId=" + workorderId);
+      } else {
+        this.reset();
+        this.getTreeselect();
+        const workorderId = row.workorderId || this.ids;
+        this.$router.push("/mes/pro/workorder/info?workorderId=" + workorderId);
+      }
 
       // this.reset();
       // this.getTreeselect();

src/views/mes/pro/workorder/proofingInfo.vue

@@ -25,7 +25,7 @@
         label-width="8em"
       >
         <el-row>
-          <el-col v-if="mode === 'make'" :lg="6" :md="8" :sm="12" :xs="12">
+          <el-col v-if="mode === 'make'|| mode === 'makeInfo'" :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="父工单编码" prop="parentCode">
               <el-input
                 disabled
@@ -68,11 +68,12 @@
               <el-input
                 v-model="form.routeName"
                 readonly
+                :disabled="mode == 'make'"
                 placeholder="请选择工艺路线"
               >
                 <el-button
                   slot="append"
-                  v-if="mode !== 'make'"
+                  v-if="!(mode === 'make' ||  mode === 'makeInfo')"
                   icon="el-icon-search"
                   @click="$refs['RoutesProcessSelectRef'].showFlag = true"
                 ></el-button>
@@ -84,7 +85,7 @@
               <el-input :disabled="mode == 'make'" v-model="form.productCode" placeholder="请选择产品">
                 <el-button
                   slot="append"
-                  v-if="mode !== 'make'"
+                  v-if="!(mode === 'make' ||  mode === 'makeInfo')"
                   @click="handleSelectProduct"
                   icon="el-icon-search"
                 ></el-button>
@@ -194,6 +195,7 @@
             <el-form-item label="派工倍数" :disabled="mode == 'make'" prop="dispatchMultiple">
               <el-input
                 v-model="form.dispatchMultiple"
+                :disabled="mode == 'make'"
                 placeholder="请输入派工倍数"
               />
             </el-form-item>
@@ -421,7 +423,8 @@ export default {
         edit: "工单修改",
         info: "工单新增",
         apply: "工单申请",
-        make: "补单工单"
+        make: "补单工单",
+        makeInfo: "补数订单查看",
       };
       return titles[this.mode];
     },