From 3e84604ed07e6f91d9543b1878157e48919b7a26 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 18 Jun 2024 14:42:40 +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/baseStaffInfo/index.vue |  7 +++++--
 src/views/mes/prod/prodOrderInfo/index.vue | 22 +++++++++++-----------
 src/views/mes/prod/prodPlanInfo/index.vue  | 10 +++++-----
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/views/mes/base/baseStaffInfo/index.vue b/src/views/mes/base/baseStaffInfo/index.vue
index 47dc683..49a1f9e 100644
--- a/src/views/mes/base/baseStaffInfo/index.vue
+++ b/src/views/mes/base/baseStaffInfo/index.vue
@@ -123,7 +123,7 @@
           <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
         </template>
       </el-table-column>
-      <el-table-column label="卡密" align="center" prop="passWord" v-if="columns[8].visible"/>
+      <el-table-column label="身份证" align="center" prop="passWord" v-if="columns[8].visible"/>
       <el-table-column label="备注" align="center" prop="remark" v-if="columns[14].visible"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
@@ -177,6 +177,9 @@
         <el-form-item label="卡号" prop="cardId">
           <el-input v-model="form.cardId" placeholder="请输入卡号"/>
         </el-form-item>
+        <el-form-item label="身份证" prop="passWord">
+          <el-input v-model="form.passWord" placeholder="请输入身份证"/>
+        </el-form-item>
         <el-form-item label="岗位" prop="postCode">
           <el-select v-model="form.postCode" placeholder="请选择岗位" clearable>
             <el-option
@@ -311,7 +314,7 @@ export default {
         { key: 5, label: `班组编号`, visible: true },
         { key: 6, label: `手机号`, visible: true },
         { key: 7, label: `用户性别`, visible: true },
-        { key: 8, label: `卡密`, visible: false },
+        { key: 8, label: `身份证`, visible: true },
         { key: 9, label: `删除标志`, visible: false },
         { key: 10, label: `创建者`, visible: false },
         { key: 11, label: `创建时间`, visible: true },
diff --git a/src/views/mes/prod/prodOrderInfo/index.vue b/src/views/mes/prod/prodOrderInfo/index.vue
index 20c3608..f6b9269 100644
--- a/src/views/mes/prod/prodOrderInfo/index.vue
+++ b/src/views/mes/prod/prodOrderInfo/index.vue
@@ -25,8 +25,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单状态" prop="orderStatus">
-        <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>
+      <el-form-item label="订单状态" prop="orderStatus">
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
           <el-option
             v-for="dict in dict.type.order_status"
             :key="dict.value"
@@ -150,8 +150,8 @@
       <el-table-column label="BOM编号" align="center" prop="bomCode" v-if="columns[7].visible"/>
       <el-table-column label="订单计划数量" align="center" prop="orderAmount" v-if="columns[8].visible" width="100"/>
       <el-table-column label="完成数量" align="center" prop="completeAmount" v-if="columns[9].visible"/>
-      <el-table-column label="工单类型" align="center" prop="orderType" v-if="columns[10].visible"/>
-      <el-table-column label="工单状态" align="center" prop="orderStatus" v-if="columns[11].visible">
+      <el-table-column label="订单类型" align="center" prop="orderType" v-if="columns[10].visible"/>
+      <el-table-column label="订单状态" align="center" prop="orderStatus" v-if="columns[11].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>
         </template>
@@ -264,11 +264,11 @@
         <el-form-item label="完成数量" prop="completeAmount">
           <el-input v-model="form.completeAmount" placeholder="请输入完成数量"/>
         </el-form-item>
-        <el-form-item label="工单类型" prop="orderType">
-          <el-input v-model="form.orderType" placeholder="请输入工单类型"/>
+        <el-form-item label="订单类型" prop="orderType">
+          <el-input v-model="form.orderType" placeholder="请输入订单类型"/>
         </el-form-item>
-        <el-form-item label="工单状态" prop="orderStatus">
-          <el-select v-model="form.orderStatus" placeholder="请选择工单状态">
+        <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"
@@ -329,7 +329,7 @@
         <el-form-item label="下计划标识" prop="isRelease">
           <el-radio-group v-model="form.isRelease">
             <el-radio
-              v-for="dict in dict.type.finish_flag"
+              v-for="dict in dict.type.is_release"
               :key="dict.value"
               :label="dict.value"
             >{{ dict.label }}
@@ -491,8 +491,8 @@ export default {
         { key: 7, label: `BOM编号`, visible: false },
         { key: 8, label: `订单计划数量`, visible: true },
         { key: 9, label: `完成数量`, visible: true },
-        { key: 10, label: `工单类型`, visible: false },
-        { key: 11, label: `工单状态`, visible: true },
+        { key: 10, label: `订单类型`, visible: false },
+        { key: 11, label: `订单状态`, visible: true },
         { key: 12, label: `完成标识`, visible: true },
         { key: 13, label: `计划开始时间`, visible: true },
         { key: 14, label: `计划结束时间`, visible: true },
diff --git a/src/views/mes/prod/prodPlanInfo/index.vue b/src/views/mes/prod/prodPlanInfo/index.vue
index 91caf9c..9572517 100644
--- a/src/views/mes/prod/prodPlanInfo/index.vue
+++ b/src/views/mes/prod/prodPlanInfo/index.vue
@@ -146,11 +146,11 @@
     <el-table v-loading="loading" :data="prodPlanInfoList" @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="planCode" v-if="columns[1].visible"/>
-      <el-table-column label="订单编号" align="center" prop="orderCode" v-if="columns[2].visible"/>
-      <el-table-column label="物料编号" align="center" prop="materialCode" v-if="columns[3].visible"/>
-      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[4].visible"/>
-      <el-table-column label="计划工位" align="center" prop="stationName" v-if="columns[5].visible"/>
+      <el-table-column label="订单编号" align="center" prop="orderCode" v-if="columns[2].visible" width="130"/>
+      <el-table-column label="工单编号" align="center" prop="planCode" v-if="columns[1].visible" width="130"/>
+      <el-table-column label="物料编号" align="center" prop="materialCode" v-if="columns[3].visible" width="130"/>
+      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[4].visible" width="130"/>
+      <el-table-column label="计划工位" align="center" prop="stationName" v-if="columns[5].visible" width="130"/>
       <el-table-column label="设备编号" align="center" prop="deviceCode" v-if="columns[6].visible"/>
       <el-table-column label="计划班组" align="center" prop="teamName" v-if="columns[7].visible"/>
       <el-table-column label="计划数量" align="center" prop="planAmount" v-if="columns[8].visible"/>