From 6050eb4df544a42d2d2a470b98ad4c88a4ba47d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 12 Apr 2024 14:27:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  6 +-
 .../processEquMaterialBom/add-or-updata.vue   | 33 +++++-----
 .../processEquValueBom/add-or-updata.vue      | 31 +++++----
 .../monitoring/materielDateFrom/index.vue     |  8 +--
 .../monitoring/processTraceability/index.vue  | 13 ++--
 src/views/report/glass/inputTable.vue         |  5 +-
 .../report/productionDayReport/index.vue      | 35 +++++-----
 .../report/productionMonthReport/index.vue    | 56 ++++++++--------
 .../report/productionWeekReport/index.vue     | 66 ++++++++++---------
 .../report/productionYearReport/index.vue     | 66 ++++++++++---------
 10 files changed, 165 insertions(+), 154 deletions(-)

diff --git a/.env.dev b/.env.dev
index 882a92fe..a2f4be87 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-04-10 16:58:06
+ # @LastEditTime: 2024-04-12 14:13:52
  # @LastEditors: zhp
  # @Description:
 ###
@@ -20,11 +20,11 @@ VUE_APP_TITLE = MES系统
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.173:9001'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.47:48082'
-VUE_APP_BASE_API = 'http://192.168.1.78:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 # socket地址
 # VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
 # VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
diff --git a/src/views/extend/processEquMaterialBom/add-or-updata.vue b/src/views/extend/processEquMaterialBom/add-or-updata.vue
index 19134792..b53d1dce 100644
--- a/src/views/extend/processEquMaterialBom/add-or-updata.vue
+++ b/src/views/extend/processEquMaterialBom/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-11 13:35:46
+ * @LastEditTime: 2024-04-12 14:26:22
  * @Description:
 -->
 <template>
@@ -100,20 +100,6 @@ import { parseTime } from '../../core/mixins/code-filter';
 import attrAdd from './attr-add';
 // import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import { publicFormatter } from '@/utils/dict';
-const tableBtn = [
-	{
-    type: this.$auth.hasPermi('extend:process-equ-material-bom-det:update')
-      ? 'edit'
-      : '',
-		btnName: '编辑',
-	},
-	{
-    type: this.$auth.hasPermi('extend:process-equ-material-bom-det:delete')
-      ? 'delete'
-      : '',
-		btnName: '删除',
-	},
-];
 const tableProps = [
 	{
     prop: 'materialName',
@@ -150,7 +136,22 @@ export default {
 	components: { SmallTitle, attrAdd },
 	data() {
 		return {
-			tableBtn,
+      tableBtn:[
+        {
+          type: this.$auth.hasPermi(
+            'extend:process-equ-material-bom-det:query'
+          )
+            ? 'edit'
+            : '',
+          btnName: '编辑',
+        },
+        {
+          type: this.$auth.hasPermi('extend:process-equ-material-bom-det:delete')
+            ? 'delete'
+            : '',
+          btnName: '删除',
+        },
+      ],
 			tableProps,
 			topBtnConfig,
 			addOrUpdateVisible: false,
diff --git a/src/views/extend/processEquValueBom/add-or-updata.vue b/src/views/extend/processEquValueBom/add-or-updata.vue
index 9ee1876b..a7c8cacc 100644
--- a/src/views/extend/processEquValueBom/add-or-updata.vue
+++ b/src/views/extend/processEquValueBom/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-11 13:35:42
+ * @LastEditTime: 2024-04-12 14:27:07
  * @Description:
 -->
 <template>
@@ -110,20 +110,6 @@ import { parseTime } from '../../core/mixins/code-filter';
 import attrAdd from './attr-add';
 // import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 
-const tableBtn = [
-	{
-    type: this.$auth.hasPermi('extend:process-equ-value-bom-det:update')
-      ? 'edit'
-      : '',
-		btnName: '编辑',
-	},
-	{
-    type: this.$auth.hasPermi('extend:process-equ-value-bom-det:delete')
-      ? 'delete'
-      : '',
-		btnName: '删除',
-	},
-];
 const tableProps = [
 	{
     prop: 'valueName',
@@ -173,7 +159,20 @@ export default {
 	components: { SmallTitle, attrAdd },
 	data() {
 		return {
-			tableBtn,
+      tableBtn:[
+        {
+          type: this.$auth.hasPermi('extend:process-equ-value-bom-det:update')
+            ? 'edit'
+            : '',
+          btnName: '编辑',
+        },
+        {
+          type: this.$auth.hasPermi('extend:process-equ-value-bom-det:delete')
+            ? 'delete'
+            : '',
+          btnName: '删除',
+        },
+      ],
 			tableProps,
 			topBtnConfig,
       addOrUpdateVisible: false,
diff --git a/src/views/quality/monitoring/materielDateFrom/index.vue b/src/views/quality/monitoring/materielDateFrom/index.vue
index c1b3d982..62375d57 100644
--- a/src/views/quality/monitoring/materielDateFrom/index.vue
+++ b/src/views/quality/monitoring/materielDateFrom/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-10 16:31:48
+ * @LastEditTime: 2024-04-12 14:12:55
  * @Description:
 -->
 <template>
@@ -131,7 +131,7 @@ export default {
           width: 250
         },
         {
-          type: this.$auth.hasPermi('monitoring:materiel-date-from:query') ? 'button' : '',
+          type: this.$auth.hasPermi('base:material-use-log:query') ? 'button' : '',
           btnName: '查询',
           name: 'search',
           color: 'primary',
@@ -163,13 +163,13 @@ export default {
         // },
         {
           type: this.$auth.hasPermi(
-            'monitoring:materiel-date-from:export'
+            'base:material-use-log:export'
           )
             ? 'separate'
             : '',
         },
         {
-          type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
+          type: this.$auth.hasPermi('base:material-use-log:export') ? 'button' : '',
         	btnName: '导出',
         	name: 'export',
           color: 'primary',
diff --git a/src/views/quality/monitoring/processTraceability/index.vue b/src/views/quality/monitoring/processTraceability/index.vue
index 1a641f23..26492d55 100644
--- a/src/views/quality/monitoring/processTraceability/index.vue
+++ b/src/views/quality/monitoring/processTraceability/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-07 16:26:56
+ * @LastEditTime: 2024-04-12 14:16:03
  * @Description:
 -->
 <template>
@@ -96,11 +96,14 @@ export default {
         //     btnName: '编辑',
         //   }
         //   : undefined,
-          {
-            type: 'processDetail',
+        {
+        	 type: this.$auth.hasPermi(
+             'extend:process-retrospect:query'
+           )
+            ? 'button'
+            : '',
             btnName: '查看工艺详情',
           },
-
       ].filter((v) => v),
       list: [],
       listQuery: {
@@ -137,7 +140,7 @@ export default {
         {
 
        	 type: this.$auth.hasPermi(
-            'monitoring:process-traceability:query'
+             'extend:process-retrospect:query'
           )
             ? 'button'
             : '',
diff --git a/src/views/report/glass/inputTable.vue b/src/views/report/glass/inputTable.vue
index d1a7f80d..556a5ec4 100644
--- a/src/views/report/glass/inputTable.vue
+++ b/src/views/report/glass/inputTable.vue
@@ -1,14 +1,15 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-12-13 14:10:04
- * @LastEditTime: 2024-03-29 09:43:52
+ * @LastEditTime: 2024-04-12 14:21:34
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!edit" :disabled="noData" size="small" @click="edit = true">编辑</el-button>
+      <el-button v-if="!edit && this.$auth.hasPermi('base:report-auto-original-glass:update')" :disabled="noData"
+        size="small" @click="edit = true">编辑</el-button>
       <el-button v-if="edit" size="small" @click="handleReturn()">返回</el-button>
       <el-button v-if="edit" size="small" @click="updateData">保存</el-button>
     </el-row>
diff --git a/src/views/report/productionDayReport/index.vue b/src/views/report/productionDayReport/index.vue
index 03698658..558bfb05 100644
--- a/src/views/report/productionDayReport/index.vue
+++ b/src/views/report/productionDayReport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-29 09:48:24
+ * @LastEditTime: 2024-04-12 14:22:16
  * @LastEditors: zhp
  * @Description:
 -->
@@ -13,11 +13,12 @@
         </el-date-picker>
       </el-form-item>
       <el-button type="primary" @click="getDataList()">查询</el-button>
-      <el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain
+      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" size="small" plain
         @click="handleExport">导出</el-button>
     </el-form>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
+      <el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+        size="small" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
       <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
     </el-row>
@@ -28,26 +29,26 @@
       <el-table-column :label="'许昌安彩日成品生产汇总' + '(' + timeTips + ')'" align="center">
         <el-table-column prop="lineName" label="生产线" align="center">
           <template slot-scope="scope">
-            <el-input  v-if="!disabled"  type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
+            <el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
             <span v-else>{{ scope.row.lineName }} </span>
           </template>
         </el-table-column>
         <el-table-column label="投入数㎡" align="center">
           <el-table-column prop="inputNow" label="今日" align="center">
             <template slot-scope="scope">
-              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputHis" label="昨日" align="center">
             <template slot-scope="scope">
-              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
+              <el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
               <span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ? parseFloat((scope.row.inputTrend *
               100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 : null }} </span>
             </template>
@@ -56,24 +57,24 @@
         <el-table-column label="完成良品产量" align="center">
           <el-table-column prop="goodProductNow" label="今日" align="center">
             <template slot-scope="scope">
-              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
+              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductHis" label="昨日" align="center">
             <template slot-scope="scope">
-              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
+              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
+              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
-                parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
+              parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
               null
               }} </span>
             </template>
@@ -82,7 +83,7 @@
         <el-table-column label="原片漏检率" align="center">
           <el-table-column prop="missCheckNow" label="今日" align="center">
             <template slot-scope="scope">
-              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
               100).toFixed(2)) +
               '%' : null }}
@@ -91,7 +92,7 @@
           </el-table-column>
           <el-table-column prop="missCheckHis" label="昨日" align="center">
             <template slot-scope="scope">
-              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
               100).toFixed(2)) +
               '%' : null }}
@@ -100,7 +101,7 @@
           </el-table-column>
           <el-table-column prop="missCheckTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
+              <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
               parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ? 0 : null
@@ -111,7 +112,7 @@
         <el-table-column label="综合良品率" align="center">
           <el-table-column prop="goodProductPassNow" label="今日" align="center">
             <template slot-scope="scope">
-              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
+              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
               100).toFixed(2)) +
@@ -121,7 +122,7 @@
           </el-table-column>
           <el-table-column prop="goodProductPassHis" label="昨日" align="center">
             <template slot-scope="scope">
-              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
+              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
               100).toFixed(2)) +
@@ -131,7 +132,7 @@
           </el-table-column>
           <el-table-column prop="goodProductPassTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
+              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
               parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
diff --git a/src/views/report/productionMonthReport/index.vue b/src/views/report/productionMonthReport/index.vue
index 3a4d4c8f..d7970418 100644
--- a/src/views/report/productionMonthReport/index.vue
+++ b/src/views/report/productionMonthReport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-08 11:45:52
+ * @LastEditTime: 2024-04-12 14:22:46
  * @LastEditors: zhp
  * @Description:
 -->
@@ -12,13 +12,15 @@
         <el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
         </el-date-picker>
       </el-form-item>
-      <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
+      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
+        查询
       </el-button>
-      <el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
+      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
         @click="handleExport">导出</el-button>
     </el-form>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
+      <el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+        size="small" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
       <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
     </el-row>
@@ -51,9 +53,9 @@
 
               <el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
               <span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
-                parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 :
-                null
-                }} </span>
+              parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -77,9 +79,9 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
-                parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
-                null
-                }} </span>
+              parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -88,8 +90,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
-                100).toFixed(2)) +
-                '%' : null }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -97,8 +99,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
-                100).toFixed(2)) +
-                '%' : null }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -107,10 +109,10 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
-                parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ?
-                0 :
-                null
-                }} </span>
+              parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -120,8 +122,8 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
-                100).toFixed(2)) +
-                '%' : null }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -130,8 +132,8 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
-                100).toFixed(2)) +
-                '%' : null }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -140,11 +142,11 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
-                parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
-                0 ?
-                0 :
-                null
-                }} </span>
+              parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
diff --git a/src/views/report/productionWeekReport/index.vue b/src/views/report/productionWeekReport/index.vue
index a915b3bd..1a759e21 100644
--- a/src/views/report/productionWeekReport/index.vue
+++ b/src/views/report/productionWeekReport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-29 09:48:41
+ * @LastEditTime: 2024-04-12 14:22:51
  * @LastEditors: zhp
  * @Description:
 -->
@@ -14,13 +14,15 @@
           style="width: 350px" placeholder="选择周">
         </el-date-picker>
       </el-form-item>
-      <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
+      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
+        查询
       </el-button>
-      <el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
+      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
         @click="handleExport">导出</el-button>
     </el-form>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
+      <el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+        size="small" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
       <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
     </el-row>
@@ -52,11 +54,11 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
               <span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
-                parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
-                0 ?
-                0 :
-                null
-                }} </span>
+              parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -80,11 +82,11 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
-                parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
-                0 ?
-                0 :
-                null
-                }} </span>
+              parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -93,8 +95,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
-                100).toFixed(2)) +
-                '%' : null }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -102,8 +104,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
-                100).toFixed(2)) +
-                '%' : null }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -112,11 +114,11 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
-                parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
-                0 ?
-                0 :
-                null
-                }} </span>
+              parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -126,8 +128,8 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
-                100).toFixed(2)) +
-                '%' : null }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -136,8 +138,8 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
-                100).toFixed(2)) +
-                '%' : null }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -146,11 +148,11 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
-                parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
-                0 ?
-                0 :
-                null
-                }} </span>
+              parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
diff --git a/src/views/report/productionYearReport/index.vue b/src/views/report/productionYearReport/index.vue
index baafb129..6f4f47e9 100644
--- a/src/views/report/productionYearReport/index.vue
+++ b/src/views/report/productionYearReport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-08 11:46:49
+ * @LastEditTime: 2024-04-12 14:22:54
  * @LastEditors: zhp
  * @Description:
 -->
@@ -14,15 +14,17 @@
           style="width: 350px" placeholder="选择年">
         </el-date-picker>
       </el-form-item>
-      <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
+      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
+        查询
       </el-button>
-      <el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
+      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
         @click="handleExport">导出</el-button>
       <!-- <el-button type="primary" icon="el-icon-edit-outline" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" type="success" @click="saveDataList()">保存</el-button> -->
     </el-form>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
+      <el-button v-if="!isSave && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+        size="small" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
       <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
     </el-row>
@@ -55,11 +57,11 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
               <span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
-                parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
-                0 ?
-                0 :
-                null
-                }} </span>
+              parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -83,11 +85,11 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
-                parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
-                0 ?
-                0 :
-                null
-                }} </span>
+              parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -96,8 +98,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
-                100).toFixed(2)) +
-                '%' : null }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -105,8 +107,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
-                100).toFixed(2)) +
-                '%' : null }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -115,11 +117,11 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
-                parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
-                0 ?
-                0 :
-                null
-                }} </span>
+              parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -129,8 +131,8 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
-                100).toFixed(2)) +
-                '%' : null }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -139,8 +141,8 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
-                100).toFixed(2)) +
-                '%' : null }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -149,11 +151,11 @@
               <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
-                parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
-                0 ?
-                0 :
-                null
-                }} </span>
+              parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
-- 
2.45.2


From 2a599d96b3a4f33527b2554141e89106bbb9ccbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 12 Apr 2024 14:30:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processEquMaterialBom/add-or-updata.vue   | 17 +++++++--------
 .../processEquValueBom/add-or-updata.vue      | 21 ++++++++-----------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/views/extend/processEquMaterialBom/add-or-updata.vue b/src/views/extend/processEquMaterialBom/add-or-updata.vue
index b53d1dce..97b4d05e 100644
--- a/src/views/extend/processEquMaterialBom/add-or-updata.vue
+++ b/src/views/extend/processEquMaterialBom/add-or-updata.vue
@@ -123,14 +123,6 @@ const tableProps = [
     label: '备注',
   },
 ];
-
-const topBtnConfig = [
-  {
-    type: 'add',
-    btnName: 'btn.add'
-  }
-]
-
 export default {
 	mixins: [basicAdd],
 	components: { SmallTitle, attrAdd },
@@ -153,7 +145,14 @@ export default {
         },
       ],
 			tableProps,
-			topBtnConfig,
+      topBtnConfig:[
+        {
+          type: this.$auth.hasPermi('extend:process-equ-material-bom-det:add')
+            ? 'add'
+            : '',
+          btnName: 'btn.add'
+        }
+      ],
 			addOrUpdateVisible: false,
 			urlOptions: {
 			  isGetCode: false,
diff --git a/src/views/extend/processEquValueBom/add-or-updata.vue b/src/views/extend/processEquValueBom/add-or-updata.vue
index a7c8cacc..275171ab 100644
--- a/src/views/extend/processEquValueBom/add-or-updata.vue
+++ b/src/views/extend/processEquValueBom/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-12 14:27:07
+ * @LastEditTime: 2024-04-12 14:28:44
  * @Description:
 -->
 <template>
@@ -143,17 +143,7 @@ const tableProps = [
     prop: 'remark',
     label: '备注',
   },
-];
-
-const topBtnConfig = [
-  {
-    type: this.$auth.hasPermi('extend:process-equ-value-bom-det:add')
-      ? 'add'
-      : '',
-    btnName: 'btn.add'
-  }
 ]
-
 export default {
 	mixins: [basicAdd],
 	components: { SmallTitle, attrAdd },
@@ -174,7 +164,14 @@ export default {
         },
       ],
 			tableProps,
-			topBtnConfig,
+      topBtnConfig:[
+        {
+          type: this.$auth.hasPermi('extend:process-equ-value-bom-det:add')
+            ? 'add'
+            : '',
+          btnName: 'btn.add'
+        }
+      ],
       addOrUpdateVisible: false,
       enableList: [
         {
-- 
2.45.2