.env.dev

@@ -1,10 +1,3 @@
-###
- # @Author: zhp
- # @Date: 2024-04-12 14:30:48
- # @LastEditTime: 2024-04-12 14:31:16
- # @LastEditors: zhp
- # @Description:
-###
 # 开发环境配置
 ENV = 'development'
 

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-12 14:26:22
+ * @LastEditTime: 2024-04-11 13:35:46
  * @Description:
 -->
 <template>
@@ -100,6 +100,20 @@ 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',
@@ -123,36 +137,22 @@ const tableProps = [
     label: '备注',
   },
 ];
+
+const topBtnConfig = [
+  {
+    type: 'add',
+    btnName: 'btn.add'
+  }
+]
+
 export default {
 	mixins: [basicAdd],
 	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:[
+			topBtnConfig,
-        {
-          type: this.$auth.hasPermi('extend:process-equ-material-bom-det:add')
-            ? 'add'
-            : '',
-          btnName: 'btn.add'
-        }
-      ],
 			addOrUpdateVisible: false,
 			urlOptions: {
 			  isGetCode: false,

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:28:44
+ * @LastEditTime: 2024-04-11 13:35:42
  * @Description:
 -->
 <template>
@@ -110,6 +110,20 @@ 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',
@@ -143,35 +157,25 @@ 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 },
 	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:[
+			topBtnConfig,
-        {
-          type: this.$auth.hasPermi('extend:process-equ-value-bom-det:add')
-            ? 'add'
-            : '',
-          btnName: 'btn.add'
-        }
-      ],
       addOrUpdateVisible: false,
       enableList: [
         {

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-12 14:12:55
+ * @LastEditTime: 2024-04-10 16:31:48
  * @Description:
 -->
 <template>
@@ -131,7 +131,7 @@ export default {
           width: 250
         },
         {
-          type: this.$auth.hasPermi('base:material-use-log:query') ? 'button' : '',
+          type: this.$auth.hasPermi('monitoring:materiel-date-from:query') ? 'button' : '',
           btnName: '查询',
           name: 'search',
           color: 'primary',
@@ -163,13 +163,13 @@ export default {
         // },
         {
           type: this.$auth.hasPermi(
-            'base:material-use-log:export'
+            'monitoring:materiel-date-from:export'
           )
             ? 'separate'
             : '',
         },
         {
-          type: this.$auth.hasPermi('base:material-use-log:export') ? 'button' : '',
+          type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
         	btnName: '导出',
         	name: 'export',
           color: 'primary',

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-12 14:16:03
+ * @LastEditTime: 2024-04-07 16:26:56
  * @Description:
 -->
 <template>
@@ -96,14 +96,11 @@ export default {
         //     btnName: '编辑',
         //   }
         //   : undefined,
-        {
+          {
-        	 type: this.$auth.hasPermi(
+            type: 'processDetail',
-             'extend:process-retrospect:query'
-           )
-            ? 'button'
-            : '',
             btnName: '查看工艺详情',
           },
+
       ].filter((v) => v),
       list: [],
       listQuery: {
@@ -140,7 +137,7 @@ export default {
         {
 
        	 type: this.$auth.hasPermi(
-             'extend:process-retrospect:query'
+            'monitoring:process-traceability:query'
           )
             ? 'button'
             : '',

src/views/report/glass/day.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-24 15:15:24
- * @LastEditTime: 2024-04-12 15:13:43
+ * @LastEditTime: 2024-04-08 11:47:39
  * @LastEditors: zhp
  * @Description:
 -->
@@ -184,8 +184,8 @@ export default {
         // console.log(val.setHours(7, 0, 0))
         // console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
         // let time = this.format(val.setHours(7, 0, 0))
-        this.startTimeStamp = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.endTimeStamp = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
-        this.endTimeStamp  = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        this.startTimeStamp  = this.format(val.setHours(7, 0, 1) - 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
         // console.log(this.listQuery.reportTime);
         this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
         this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000

src/views/report/glass/inputTable.vue

@@ -1,15 +1,14 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-12-13 14:10:04
- * @LastEditTime: 2024-04-12 14:21:34
+ * @LastEditTime: 2024-03-29 09:43:52
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!edit && this.$auth.hasPermi('base:report-auto-original-glass:update')" :disabled="noData"
+      <el-button v-if="!edit" :disabled="noData" size="small" @click="edit = true">编辑</el-button>
-        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>

src/views/report/glass/year.vue

@@ -160,8 +160,8 @@ export default {
 		changeTime(val) {
 			if(val) {
 					// let timeStamp = val.getTime(); //标准时间转为时间戳，毫秒级别
-        this.endTimeStamp = this.timeFun(new Date(val.getFullYear(),11, 31, 7, 0, 0).getTime()); //开始时间
+        this.startTimeStamp = this.timeFun(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()); //开始时间
-        this.startTimeStamp = this.timeFun(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()); //结束时间
+        this.endTimeStamp = this.timeFun(new Date(val.getFullYear(), 11, 31, 7, 0, 0).getTime()); //结束时间
         this.listQuery.reportTime[0] = parseTime(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
         this.listQuery.reportTime[1] = parseTime(new Date(val.getFullYear(), 11, 31, 7, 0, 0).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
 			} else {

src/views/report/productionDayReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-12 15:15:39
+ * @LastEditTime: 2024-03-29 09:48:24
  * @LastEditors: zhp
  * @Description:
 -->
@@ -13,12 +13,11 @@
         </el-date-picker>
       </el-form-item>
       <el-button type="primary" @click="getDataList()">查询</el-button>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" size="small" plain
+      <el-button v-if="this.$auth.hasPermi('report:glass-month: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 && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
-        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>
@@ -29,26 +28,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>
@@ -57,24 +56,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>
@@ -83,7 +82,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 }}
@@ -92,7 +91,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 }}
@@ -101,7 +100,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
@@ -112,7 +111,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)) +
@@ -122,7 +121,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)) +
@@ -132,7 +131,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 ==
@@ -486,8 +485,8 @@ export default {
         // console.log(val.setHours(7, 0, 0))
         // console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
         // let time = this.format(val.setHours(7, 0, 0))
-        this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
-        this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1) - 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
         this.timeTips = this.listQuery.reportTime[0] + ' - ' + this.listQuery.reportTime[1]
         // console.log(this.listQuery.reportTime);
       } else {

src/views/report/productionMonthReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-12 14:22:46
+ * @LastEditTime: 2024-04-08 11:45:52
  * @LastEditors: zhp
  * @Description:
 -->
@@ -12,15 +12,13 @@
         <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('base:report-auto-production:query')" type="primary" @click="getDataList()">
+      <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
-        查询
       </el-button>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
+      <el-button v-if="this.$auth.hasPermi('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 && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
-        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>
@@ -53,9 +51,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 :
+                parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 :
-              null
+                null
-              }} </span>
+                }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -79,9 +77,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 :
+                parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
-              null
+                null
-              }} </span>
+                }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -90,8 +88,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)) +
+                100).toFixed(2)) +
-              '%' : null }}
+                '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -99,8 +97,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)) +
+                100).toFixed(2)) +
-              '%' : null }}
+                '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -109,10 +107,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 ?
+                parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ?
-              0 :
+                0 :
-              null
+                null
-              }} </span>
+                }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -122,8 +120,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)) +
+                100).toFixed(2)) +
-              '%' : null }}
+                '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -132,8 +130,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)) +
+                100).toFixed(2)) +
-              '%' : null }}
+                '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -142,11 +140,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 ==
+                parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
-              0 ?
+                0 ?
-              0 :
+                0 :
-              null
+                null
-              }} </span>
+                }} </span>
             </template>
           </el-table-column>
         </el-table-column>

src/views/report/productionWeekReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-12 14:22:51
+ * @LastEditTime: 2024-03-29 09:48:41
  * @LastEditors: zhp
  * @Description:
 -->
@@ -14,15 +14,13 @@
           style="width: 350px" placeholder="选择周">
         </el-date-picker>
       </el-form-item>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
+      <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
-        查询
       </el-button>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
+      <el-button v-if="this.$auth.hasPermi('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 && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
-        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>
@@ -54,11 +52,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 ==
+                parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
-              0 ?
+                0 ?
-              0 :
+                0 :
-              null
+                null
-              }} </span>
+                }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -82,11 +80,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 ==
+                parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
-              0 ?
+                0 ?
-              0 :
+                0 :
-              null
+                null
-              }} </span>
+                }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -95,8 +93,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)) +
+                100).toFixed(2)) +
-              '%' : null }}
+                '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -104,8 +102,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)) +
+                100).toFixed(2)) +
-              '%' : null }}
+                '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -114,11 +112,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 ==
+                parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
-              0 ?
+                0 ?
-              0 :
+                0 :
-              null
+                null
-              }} </span>
+                }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -128,8 +126,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)) +
+                100).toFixed(2)) +
-              '%' : null }}
+                '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -138,8 +136,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)) +
+                100).toFixed(2)) +
-              '%' : null }}
+                '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -148,11 +146,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 ==
+                parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
-              0 ?
+                0 ?
-              0 :
+                0 :
-              null
+                null
-              }} </span>
+                }} </span>
             </template>
           </el-table-column>
         </el-table-column>

src/views/report/productionYearReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-12 14:22:54
+ * @LastEditTime: 2024-04-08 11:46:49
  * @LastEditors: zhp
  * @Description:
 -->
@@ -14,17 +14,15 @@
           style="width: 350px" placeholder="选择年">
         </el-date-picker>
       </el-form-item>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" @click="getDataList()">
+      <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
-        查询
       </el-button>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:export')" type="primary" size="small" plain
+      <el-button v-if="this.$auth.hasPermi('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 && this.$auth.hasPermi('base:report-auto-production:update')" :disabled="noData"
+      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
-        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>
@@ -57,11 +55,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 ==
+                parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
-              0 ?
+                0 ?
-              0 :
+                0 :
-              null
+                null
-              }} </span>
+                }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -85,11 +83,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 ==
+                parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
-              0 ?
+                0 ?
-              0 :
+                0 :
-              null
+                null
-              }} </span>
+                }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -98,8 +96,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)) +
+                100).toFixed(2)) +
-              '%' : null }}
+                '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -107,8 +105,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)) +
+                100).toFixed(2)) +
-              '%' : null }}
+                '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -117,11 +115,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 ==
+                parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
-              0 ?
+                0 ?
-              0 :
+                0 :
-              null
+                null
-              }} </span>
+                }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -131,8 +129,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)) +
+                100).toFixed(2)) +
-              '%' : null }}
+                '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -141,8 +139,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)) +
+                100).toFixed(2)) +
-              '%' : null }}
+                '%' : null }}
               </span>
             </template>
           </el-table-column>
@@ -151,11 +149,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 ==
+                parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
-              0 ?
+                0 ?
-              0 :
+                0 :
-              null
+                null
-              }} </span>
+                }} </span>
             </template>
           </el-table-column>
         </el-table-column>