From 87dbc3a153fd5eaef22326cbfd6e94d352abf31c Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 25 Jun 2024 15:37:57 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BC=98=E5=8C=96=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/base/processInfo/index.vue     | 34 ++++++++++----------
 src/views/mes/prod/prodOrderDetail/index.vue |  4 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/mes/base/processInfo/index.vue b/src/views/mes/base/processInfo/index.vue
index 0fa6368..ce5e7ed 100644
--- a/src/views/mes/base/processInfo/index.vue
+++ b/src/views/mes/base/processInfo/index.vue
@@ -17,10 +17,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="产线编号" prop="productLineCode">-->
+<!--      <el-form-item label="产线" prop="productLineCode">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.productLineCode"-->
-<!--          placeholder="请输入产线编号"-->
+<!--          placeholder="请输入产线"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
@@ -92,6 +92,7 @@
     <el-table v-loading="loading" :data="processInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="产线" align="center" prop="productLineName" v-if="columns[4].visible"/>
       <el-table-column label="工序编号" align="center" prop="processCode" v-if="columns[1].visible"/>
       <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[2].visible"/>
       <el-table-column label="工序类型" align="center" prop="processType" v-if="columns[3].visible">
@@ -99,7 +100,6 @@
           <dict-tag :options="dict.type.process_type" :value="scope.row.processType"/>
         </template>
       </el-table-column>
-      <el-table-column label="产线编号" align="center" prop="productLineCode" v-if="columns[4].visible"/>
       <el-table-column label="工位编号" align="center" prop="stationCodes" v-if="columns[5].visible"/>
       <el-table-column label="工位名称" align="center" prop="stationNames" v-if="columns[13].visible"/>
       <el-table-column label="日产能" align="center" prop="capacityDay" v-if="columns[6].visible"/>
@@ -142,6 +142,16 @@
     <!-- 添加或修改工序信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="所属产线" prop="productLineCode">
+          <el-select v-model="form.productLineCode" placeholder="请输入所属产线">
+            <el-option
+              v-for="item in productLineList"
+              :key="item.productLineCode"
+              :label="item.productLineName"
+              :value="item.productLineCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="工序编号" prop="processCode">
           <el-input v-model="form.processCode" placeholder="请输入工序编号"/>
         </el-form-item>
@@ -158,18 +168,8 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="所属产线" prop="productLineCode">
-          <el-select v-model="form.productLineCode" placeholder="请输入所属产线">
-            <el-option
-              v-for="item in productLineList"
-              :key="item.productLineCode"
-              :label="item.productLineName"
-              :value="item.productLineCode"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="工位编号" prop="stationCodes">
-          <el-select v-model="form.stationCodes" placeholder="请输入下级工位" multiple clearable>
+        <el-form-item label="下级工位" prop="stationCodes">
+          <el-select v-model="form.stationCodes" placeholder="请选择下级工位" multiple clearable>
             <el-option
               v-for="item in stationCodeList"
               :key="item.productLineCode"
@@ -262,7 +262,7 @@ export default {
         { key: 1, label: `工序编号`, visible: true },
         { key: 2, label: `工序名称`, visible: true },
         { key: 3, label: `工序类型`, visible: true },
-        { key: 4, label: `产线编号`, visible: true },
+        { key: 4, label: `产线`, visible: true },
         { key: 5, label: `工位编号`, visible: true },
         { key: 6, label: `日产能`, visible: false },
         { key: 7, label: `月产能`, visible: false },
@@ -309,7 +309,7 @@ export default {
         objId: null,
         processCode: null,
         processName: null,
-        processType: null,
+        processType: '1',
         productLineCode: null,
         stationCodes: [],
         capacityDay: null,
diff --git a/src/views/mes/prod/prodOrderDetail/index.vue b/src/views/mes/prod/prodOrderDetail/index.vue
index d31ac30..9842a66 100644
--- a/src/views/mes/prod/prodOrderDetail/index.vue
+++ b/src/views/mes/prod/prodOrderDetail/index.vue
@@ -110,8 +110,8 @@
 
     <el-table v-loading="loading" :data="prodOrderDetailList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label=" 主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
-      <el-table-column label="任务编号" align="center" prop="SeqNo" v-if="columns[1].visible" width="130"/>
+      <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="任务编号" align="center" prop="SeqNo" v-if="columns[1].visible" fixed="left" width="130"/>
       <el-table-column label="下单日期" align="center" prop="OrderDate" width="180" v-if="columns[2].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.OrderDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>