From 4ea8d10381288e34348c617ba86a61650adbb3f9 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Tue, 24 Oct 2023 15:45:57 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/inStore/index.vue           | 28 +++++++++---------
 src/views/base/materialInfo/index.vue      | 20 ++++++-------
 src/views/base/monitorWorkUnit/index.vue   | 14 ++++-----
 src/views/base/orderBomInfo/childIndex.vue | 14 +++++++++
 src/views/base/orderBomInfo/index.vue      | 32 +++-----------------
 src/views/base/outStore/index.vue          | 28 +++++++++---------
 src/views/base/workUnit/index.vue          | 34 +++++++++++-----------
 7 files changed, 80 insertions(+), 90 deletions(-)

diff --git a/src/views/base/inStore/index.vue b/src/views/base/inStore/index.vue
index 78280a2..410d428 100644
--- a/src/views/base/inStore/index.vue
+++ b/src/views/base/inStore/index.vue
@@ -132,11 +132,11 @@
           <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -217,15 +217,15 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </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="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>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/src/views/base/materialInfo/index.vue b/src/views/base/materialInfo/index.vue
index a5deb66..cba5b77 100644
--- a/src/views/base/materialInfo/index.vue
+++ b/src/views/base/materialInfo/index.vue
@@ -259,15 +259,15 @@
                           placeholder="请选择增量日期">
           </el-date-picker>
         </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="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>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -343,7 +343,7 @@ export default {
         { key: 8, label: `物料规格`, visible: true },
         { key: 9, label: `所属工厂`, visible: true },
         { key: 10, label: `产线工位`, visible: false },
-        { key: 11, label: `启用标识`, visible: true },
+        { key: 11, label: `启用标识`, visible: false },
         { key: 12, label: `创建人`, visible: false },
         { key: 13, label: `创建时间`, visible: false },
         { key: 14, label: `更新人`, visible: false },
diff --git a/src/views/base/monitorWorkUnit/index.vue b/src/views/base/monitorWorkUnit/index.vue
index 41ae96d..5e09e2f 100644
--- a/src/views/base/monitorWorkUnit/index.vue
+++ b/src/views/base/monitorWorkUnit/index.vue
@@ -182,7 +182,7 @@
     </el-row>
     <!-- 添加或修改统计计量信息对话框 -->
     <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="100px">
         <el-form-item label="计量设备" prop="monitorCode">
           <treeselect v-model="form.monitorCode" :options="monitorInfoOptions" :normalizer="normalizer" placeholder="请选择计量设备" />
         </el-form-item>
@@ -314,7 +314,7 @@ export default {
         ],
       },
       columns: [
-            { key: 0, label: `主键标识`, visible: true },
+            { key: 0, label: `主键标识`, visible: false },
             { key: 1, label: `计量设备编号`, visible: true },
             { key: 2, label: `统计单元编号`, visible: true },
             { key: 3, label: `计量设备状态`, visible: true },
@@ -322,11 +322,11 @@ export default {
             { key: 5, label: `计算方式`, visible: true },
             { key: 6, label: `比率`, visible: true },
             { key: 7, label: `备注`, visible: true },
-            { key: 8, label: `启用标识`, visible: true },
-            { key: 9, label: `创建人`, visible: true },
-            { key: 10, label: `创建时间`, visible: true },
-            { key: 11, label: `修改人`, visible: true },
-            { key: 12, label: `修改时间`, visible: true },
+            { key: 8, label: `启用标识`, visible: false },
+            { key: 9, label: `创建人`, visible: false },
+            { key: 10, label: `创建时间`, visible: false },
+            { key: 11, label: `修改人`, visible: false },
+            { key: 12, label: `修改时间`, visible: false },
         ]
     };
   },
diff --git a/src/views/base/orderBomInfo/childIndex.vue b/src/views/base/orderBomInfo/childIndex.vue
index da4c181..ebcc5b5 100644
--- a/src/views/base/orderBomInfo/childIndex.vue
+++ b/src/views/base/orderBomInfo/childIndex.vue
@@ -43,6 +43,15 @@
           @click="toggleExpandAll"
         >展开/折叠</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-close"
+          size="mini"
+          @click="handleClose"
+        >关闭</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
@@ -314,6 +323,11 @@ export default {
       this.open = true;
       this.title = "添加订单BOM";
     },
+    /** 返回按钮操作 */
+    handleClose() {
+      const obj = { path: "/product/orderBomInfo" };
+      this.$tab.closeOpenPage(obj);
+    },
     /** 展开/折叠操作 */
     toggleExpandAll() {
       this.refreshTable = false;
diff --git a/src/views/base/orderBomInfo/index.vue b/src/views/base/orderBomInfo/index.vue
index cdbf2e5..9fa4a81 100644
--- a/src/views/base/orderBomInfo/index.vue
+++ b/src/views/base/orderBomInfo/index.vue
@@ -185,33 +185,9 @@
         <el-form-item label="父级编号" prop="parentId">
           <el-input v-model="form.parentId" placeholder="请输入父级编号"/>
         </el-form-item>
-        <el-form-item label="是否标识" prop="isFlag">
-          <el-input v-model="form.isFlag" placeholder="请输入是否标识"/>
-        </el-form-item>
-        <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="form.createdBy" placeholder="请输入创建人"/>
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createdTime">
-          <el-date-picker clearable
-                          v-model="form.createdTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择创建时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="form.updatedBy" placeholder="请输入更新人"/>
-        </el-form-item>
-        <el-form-item label="更新时间" prop="updatedTime">
-          <el-date-picker clearable
-                          v-model="form.updatedTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择更新时间"
-          >
-          </el-date-picker>
-        </el-form-item>
+<!--        <el-form-item label="是否标识" prop="isFlag">-->
+<!--          <el-input v-model="form.isFlag" placeholder="请输入是否标识"/>-->
+<!--        </el-form-item>-->
         <el-form-item label="工厂编号" prop="factoryCode">
           <el-input v-model="form.factoryCode" placeholder="请输入工厂编号"/>
         </el-form-item>
@@ -297,7 +273,7 @@ export default {
         { key: 4, label: `物料类别`, visible: true },
         { key: 5, label: `标准数量`, visible: true },
         { key: 6, label: `父级编号`, visible: true },
-        { key: 7, label: `是否标识`, visible: true },
+        { key: 7, label: `是否标识`, visible: false },
         { key: 8, label: `创建人`, visible: false },
         { key: 9, label: `创建时间`, visible: false },
         { key: 10, label: `更新人`, visible: false },
diff --git a/src/views/base/outStore/index.vue b/src/views/base/outStore/index.vue
index b99f13d..92b2dfe 100644
--- a/src/views/base/outStore/index.vue
+++ b/src/views/base/outStore/index.vue
@@ -107,11 +107,11 @@
           <dict-tag :options="dict.type.entry_or_exit" :value="scope.row.exitPattern"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[8].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[8].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[9].visible"/>
       <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[10].visible">
         <template slot-scope="scope">
@@ -203,15 +203,15 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </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="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>
       <div slot="footer" class="dialog-footer">
diff --git a/src/views/base/workUnit/index.vue b/src/views/base/workUnit/index.vue
index 99915f4..0c2470c 100644
--- a/src/views/base/workUnit/index.vue
+++ b/src/views/base/workUnit/index.vue
@@ -82,23 +82,23 @@
           <dict-tag :options="dict.type.work_unit_type" :value="scope.row.workUnitType"/>
         </template>
       </el-table-column>
-      <el-table-column label="启用标识" align="center" prop="isFlag">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createdBy" />
-      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updatedBy" />
-      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="启用标识" align="center" prop="isFlag">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="创建人" align="center" prop="createdBy" />-->
+<!--      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="更新人" align="center" prop="updatedBy" />-->
+<!--      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button