From 5034c93d1da6008eecc2f221ad15773fdb778eca Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sat, 13 Jan 2024 17:32:13 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/orderInfo/index.vue            | 53 +++++++------------
 .../qualityInspectionItem/defectIndex.vue     |  2 +-
 .../base/stationDefectRelation/index.vue      |  2 +-
 src/views/production/planInfo/index.vue       |  4 +-
 4 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/src/views/base/orderInfo/index.vue b/src/views/base/orderInfo/index.vue
index a196011..169838d 100644
--- a/src/views/base/orderInfo/index.vue
+++ b/src/views/base/orderInfo/index.vue
@@ -47,8 +47,8 @@
 <!--          />-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
-      <el-form-item label="是否已下达到生产计划" prop="isRelease">
-        <el-select v-model="queryParams.isRelease" placeholder="请选择工单类型" clearable>
+      <el-form-item label="是否已下达" prop="isRelease">
+        <el-select v-model="queryParams.isRelease" placeholder="是否已下达到生产计划" clearable>
           <el-option
             v-for="dict in dict.type.is_release"
             :key="dict.value"
@@ -115,26 +115,21 @@
       <el-table-column label="SAP计划编号" align="center" prop="orderCode" width="100px" v-if="columns[1].visible"/>
       <el-table-column label="销售订单编号" align="center" prop="saleOrderCode" v-if="columns[2].visible"/>
       <el-table-column label="销售订单行号" align="center" prop="saleOrderLineNumber" v-if="columns[3].visible"/>
-      <el-table-column label="物料编码" align="center" prop="materialCode" width="100px" v-if="columns[4].visible"/>
-      <el-table-column label="物料名称" align="center" prop="materialName" width="100px" v-if="columns[5].visible"/>
+      <el-table-column label="物料编码" align="center" prop="materialCode" width="100" v-if="columns[4].visible"/>
+      <el-table-column label="物料名称" align="center" prop="materialName" width="180" v-if="columns[5].visible"/>
       <el-table-column label="物料组" align="center" prop="matkl" v-if="columns[6].visible"/>
-      <el-table-column label="订单计划数量" align="center" prop="orderAmount" v-if="columns[7].visible"/>
-      <el-table-column label="完成数量" align="center" prop="completeAmount" v-if="columns[8].visible"/>
       <el-table-column label="工单类型" align="center" prop="orderType" v-if="columns[9].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.order_type" :value="scope.row.orderType"/>
         </template>
       </el-table-column>
-      <el-table-column label="工单状态" align="center" prop="orderStatus" width="200" v-if="columns[10].visible">
+      <el-table-column label="工单状态" align="center" prop="orderStatus" v-if="columns[10].visible" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否已下达生产计划" align="center" prop="isRelease" v-if="columns[20].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_release" :value="scope.row.isRelease"/>
-        </template>
-      </el-table-column>
+      <el-table-column label="订单计划数量" align="center" prop="orderAmount" width="80" v-if="columns[7].visible"/>
+      <el-table-column label="完成数量" align="center" prop="completeAmount" width="80" v-if="columns[8].visible"/>
       <el-table-column label="计划开始日期" align="center" prop="beginDate" width="100" v-if="columns[11].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
@@ -145,13 +140,18 @@
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="是否已下达生产计划" align="center" prop="isRelease" v-if="columns[20].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_release" :value="scope.row.isRelease"/>
+        </template>
+      </el-table-column>
       <el-table-column label="完成日期" align="center" prop="completeDate" width="100" v-if="columns[19].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.completeDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="工厂编码" align="center" prop="factoryCode" v-if="columns[13].visible"/>
-      <el-table-column label="工作中心编码" align="center" prop="workCenterCode" v-if="columns[13].visible"/>
+      <el-table-column label="工作中心编码" align="center" prop="workCenterCode" width="100" v-if="columns[21].visible"/>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[14].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
@@ -206,7 +206,7 @@
 
     <!-- 添加或修改工单信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="SAP计划编号" prop="orderCode">
           <el-input v-model="form.orderCode" placeholder="请输入SAP计划编号" />
         </el-form-item>
@@ -242,14 +242,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="工单状态" prop="orderStatus">
-          <el-select v-model="form.orderStatus" placeholder="请选择工单状态">
-            <el-option
-              v-for="dict in dict.type.order_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
+            <el-input v-model="form.orderStatus" placeholder="请输入工单状态" />
         </el-form-item>
         <el-form-item label="计划开始日期" prop="beginDate">
           <el-date-picker clearable
@@ -270,15 +263,6 @@
         <el-form-item label="工厂编码" prop="factoryCode">
           <el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
         </el-form-item>
-        <el-form-item label="启用标识" prop="isFlag">
-          <el-radio-group v-model="form.isFlag">
-            <el-radio
-              v-for="dict in dict.type.is_flag"
-              :key="dict.value"
-              :label="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <el-form-item label="完成日期" prop="completeDate">
           <el-date-picker clearable
             v-model="form.completeDate"
@@ -363,8 +347,8 @@ export default {
       columns: [
             { key: 0, label: `主键标识`, visible: false },
             { key: 1, label: `SAP计划编号`, visible: true },
-            { key: 2, label: `销售订单编号`, visible: true },
-            { key: 3, label: `销售订单行号`, visible: true },
+            { key: 2, label: `销售订单编号`, visible: false },
+            { key: 3, label: `销售订单行号`, visible: false },
             { key: 4, label: `物料编码`, visible: true },
             { key: 5, label: `物料名称`, visible: true },
             { key: 6, label: `物料组`, visible: false },
@@ -374,7 +358,7 @@ export default {
             { key: 10, label: `工单状态`, visible: true },
             { key: 11, label: `计划开始日期`, visible: true },
             { key: 12, label: `计划结束日期`, visible: true },
-            { key: 13, label: `工厂编码`, visible: true },
+            { key: 13, label: `工厂编码`, visible: false },
             { key: 14, label: `启用标识`, visible: false },
             { key: 15, label: `创建人`, visible: false },
             { key: 16, label: `创建时间`, visible: false },
@@ -382,6 +366,7 @@ export default {
             { key: 18, label: `更新时间`, visible: false },
             { key: 19, label: `完成日期`, visible: true },
             { key: 20, label: `是否已下达生产计划`, visible: true },
+            { key: 21, label: `工作中心编号`, visible: true },
         ],
       // 产线选项
       productLineList: [],
diff --git a/src/views/base/qualityInspectionItem/defectIndex.vue b/src/views/base/qualityInspectionItem/defectIndex.vue
index 4983374..dcacfb6 100644
--- a/src/views/base/qualityInspectionItem/defectIndex.vue
+++ b/src/views/base/qualityInspectionItem/defectIndex.vue
@@ -12,7 +12,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="缺陷小类" prop="materialSubclass">
-        <el-select v-model="queryParams.materialSubclass" placeholder="请选择缺陷大类" clearable>
+        <el-select v-model="queryParams.materialSubclass" filterable placeholder="请选择缺陷大类" clearable>
           <el-option
             v-for="dict in dict.type.defect_subclass"
             :key="dict.value"
diff --git a/src/views/base/stationDefectRelation/index.vue b/src/views/base/stationDefectRelation/index.vue
index 7179b77..1d3f48f 100644
--- a/src/views/base/stationDefectRelation/index.vue
+++ b/src/views/base/stationDefectRelation/index.vue
@@ -140,7 +140,7 @@
 <!--          <el-input v-model="form.stationName" placeholder="请输入质检工位名称" />-->
 <!--        </el-form-item>-->
         <el-form-item label="缺陷描述" prop="defectCode">
-          <el-select v-model="form.defectCode" placeholder="缺陷描述">
+          <el-select v-model="form.defectCode" filterable placeholder="缺陷描述">
             <el-option
               v-for="item in defectList"
               :key="item.qualityDefectCode"
diff --git a/src/views/production/planInfo/index.vue b/src/views/production/planInfo/index.vue
index 1fcc138..b7c11d2 100644
--- a/src/views/production/planInfo/index.vue
+++ b/src/views/production/planInfo/index.vue
@@ -120,9 +120,9 @@
       <el-table-column label="销售订单行号" align="center" prop="saleorderLinenumber" width="100" v-if="columns[5].visible"/>
       <el-table-column label="MES工单编号" align="center" prop="planCode" width="110" v-if="columns[6].visible"/>
       <el-table-column label="物料编号" align="center" prop="materialCode" width="100" v-if="columns[7].visible"/>
-      <el-table-column label="物料名称" align="center" prop="materialName" width="200" v-if="columns[8].visible"/>
+      <el-table-column label="物料名称" align="center" prop="materialName" width="240" v-if="columns[8].visible"/>
       <el-table-column label="计划工位编号" align="center" prop="stationCode" width="100" v-if="columns[9].visible"/>
-      <el-table-column label="计划工位名称" align="center" prop="stationName" width="100" v-if="columns[10].visible"/>
+      <el-table-column label="计划工位名称" align="center" prop="stationName" width="120" v-if="columns[10].visible"/>
       <el-table-column label="计划数量" align="center" prop="planAmount" v-if="columns[11].visible"/>
       <el-table-column label="完成数量" align="center" prop="completeAmount" v-if="columns[12].visible"/>
       <el-table-column label="计划开始日期" align="center" prop="planBeginTime" width="100" v-if="columns[20].visible"/>