From 09a2d898a9d8366ca60e0c1d226dc633b836a767 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 8 Oct 2024 09:32:45 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=AE=A2=E5=8D=95=E3=80=81?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/prod/prodOrderDetail/index.vue |  2 +-
 src/views/mes/prod/prodPlanErpInfo/index.vue | 70 ++++++++++----------
 src/views/mes/prod/prodPlanInfo/index.vue    | 12 ++--
 3 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/src/views/mes/prod/prodOrderDetail/index.vue b/src/views/mes/prod/prodOrderDetail/index.vue
index 546cdca..920aa37 100644
--- a/src/views/mes/prod/prodOrderDetail/index.vue
+++ b/src/views/mes/prod/prodOrderDetail/index.vue
@@ -667,7 +667,7 @@ export default {
       // 表单校验
       rules: {
         objId: [
-          { required: true, message: ' 主键标识不能为空', trigger: 'blur' }
+          { required: true, message: '主键标识不能为空', trigger: 'blur' }
         ],
         SeqNo: [
           { required: true, message: '任务编号不能为空', trigger: 'blur' }
diff --git a/src/views/mes/prod/prodPlanErpInfo/index.vue b/src/views/mes/prod/prodPlanErpInfo/index.vue
index cec8add..10c3b81 100644
--- a/src/views/mes/prod/prodPlanErpInfo/index.vue
+++ b/src/views/mes/prod/prodPlanErpInfo/index.vue
@@ -62,41 +62,41 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['mes/prod:prodPlanErpInfo:add']"
-        >新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['mes/prod:prodPlanErpInfo:edit']"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['mes/prod:prodPlanErpInfo:remove']"
-        >删除
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['mes/prod:prodPlanErpInfo:add']"-->
+<!--        >新增-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['mes/prod:prodPlanErpInfo:edit']"-->
+<!--        >修改-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['mes/prod:prodPlanErpInfo:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
diff --git a/src/views/mes/prod/prodPlanInfo/index.vue b/src/views/mes/prod/prodPlanInfo/index.vue
index b7ffbbc..ec5428b 100644
--- a/src/views/mes/prod/prodPlanInfo/index.vue
+++ b/src/views/mes/prod/prodPlanInfo/index.vue
@@ -147,7 +147,7 @@
       <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="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="planCode" v-if="columns[1].visible" width="230"/>
       <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"/>
@@ -182,12 +182,13 @@
           <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-right"
+            v-if="scope.row.importFlag === '1'"
             @click="handlePlanDetails(scope.row)"
           >查看明细
           </el-button>
@@ -357,6 +358,7 @@ export default {
         teamCode: null,
         planAmount: null,
         completeAmount: null,
+        importFlag: null,
         beginTime: null,
         endTime: null,
         compFlag: null,
@@ -380,11 +382,11 @@ export default {
         { key: 0, label: `主键标识`, visible: false },
         { key: 1, label: `工单编号`, visible: true },
         { key: 2, label: `订单编号`, visible: true },
-        { key: 3, label: `物料编号`, visible: true },
-        { key: 4, label: `物料名称`, visible: true },
+        { key: 3, label: `物料编号`, visible: false },
+        { key: 4, label: `物料名称`, visible: false },
         { key: 5, label: `计划工位`, visible: true },
         { key: 6, label: `设备编号`, visible: false },
-        { key: 7, label: `计划班组`, visible: true },
+        { key: 7, label: `计划班组`, visible: false },
         { key: 8, label: `计划数量`, visible: true },
         { key: 9, label: `完成数量`, visible: true },
         { key: 10, label: `实际开始时间`, visible: true },