2024-04-11 11:16:11 +08:00
15 changed files with 82 additions and 28 deletions
--- a/src/views/base/packagingPrintLog/index.vue
+++ b/src/views/base/packagingPrintLog/index.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-08-01 14:55:51
 * @LastEditors: zhp
- * @LastEditTime: 2024-04-08 11:49:33
+ * @LastEditTime: 2024-04-10 16:34:40
 * @Description:
 -->
 <template>
@@ -141,8 +141,8 @@ export default {
 				// 	btnName: '重置',
 				// 	name: 'reset',
 				// },
-				{
-					type: 'separate',
+        {
+          type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'separate' : '',
 				},
 				{
          type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',
--- a/src/views/extend/processEquMaterialBom/index.vue
+++ b/src/views/extend/processEquMaterialBom/index.vue
@@ -118,7 +118,8 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+          // type: 'separate',
+          type: this.$auth.hasPermi('extend:process-equ-material-bom:create') ? 'separate' : '',
 				},
 				{
          type: this.$auth.hasPermi('extend:process-equ-material-bom:create') ? 'button' : '',
--- a/src/views/extend/processEquValueBom/index.vue
+++ b/src/views/extend/processEquValueBom/index.vue
@@ -119,7 +119,8 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+          // type: 'separate',
+          type: this.$auth.hasPermi('extend:process-equ-value-bom:create') ? 'separate' : '',
 				},
 				{
          type: this.$auth.hasPermi('extend:process-equ-value-bom:create') ? 'button' : '',
--- a/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
@@ -62,7 +62,9 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+          type: this.$auth.hasPermi('base:quality-inspection-box-btn:create')
+            ? 'separate'
+            : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:quality-inspection-box-btn:create')
--- a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
@@ -74,7 +74,9 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+          type: this.$auth.hasPermi('base:quality-inspection-box-permissions:create')
+            ? 'separate'
+            : '',
 				},
 				{
          type: this.$auth.hasPermi('base:quality-inspection-box-permissions:create')
--- a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
+++ b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-08 13:46:17
- * @LastEditTime: 2024-03-25 08:50:25
+ * @LastEditTime: 2024-04-10 16:46:44
 * @LastEditors: zhp
 * @Description:
 -->
@@ -73,13 +73,13 @@
          </el-form-item>
        </el-row>
        <el-row :gutter="24" v-for="(item,index) in ingredientList" :key="item.id">
-          <el-col :span="6">
+          <el-col :span="4">
            <el-form-item label="成分">
              {{ item.name }}
            </el-form-item>
          </el-col>
          <el-col :span="6">
-            <el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量"
+            <el-form-item :prop="'checkValueList.' + index + '.minCheckValue'" label="最小检测值"
              :rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
              <el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
                style="width: 90%;margin-right: 10px;" :max="item.maxValue" :min='item.minValue'
@@ -93,11 +93,25 @@
            </el-form-item>
          </el-col>
          <el-col :span="6">
+            <el-form-item :prop="'checkValueList.' + index + '.maxCheckValue'" label="最大检测值"
+              :rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
+              <el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
+                style="width: 90%;margin-right: 10px;" :max="item.maxValue" :min='item.minValue'
+                v-model.number="dataForm.checkValueList[index].checkValue"
+                @change="judgeValue(arguments[0],item.minValue,item.maxValue,index)"></el-input>
+              <span v-if="dataForm.checkValueList[index].showIcon">
+                <!-- <i class="el-icon-success"></i> -->
+                <svg-icon v-if="dataForm.checkValueList[index].isStandard" icon-class="standards" />
+                <svg-icon v-else icon-class="noStandards" />
+              </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
            <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值">
              <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.minValue"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
            <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最大值">
              <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.maxValue"></el-input>
            </el-form-item>
@@ -304,7 +318,9 @@ export default {
                mainId: this.dataForm.id,
                id:ele.id,
                checkDetId: ele.checkDetId,
-                checkValue: ele.checkValue
+                minCheckValue: ele.minCheckValue,
+                maxCheckValue: ele.maxCheckValue
+
              }))
            })
            Promise.all(array).then(res => {
@@ -344,7 +360,9 @@ export default {
            array.push(this.createDet({
              mainId: response.data,
              checkDetId: ele.checkDetId,
-              checkValue: ele.checkValue
+              minCheckValue: ele.minCheckValue,
+              maxCheckValue: ele.maxCheckValue
+
            }))
          })
          Promise.all(array).then(res => {
@@ -382,7 +400,8 @@ export default {
          return {
            mainId: null,
            checkDetId: ele.id,
-            checkValue: null,
+            minCheckValue:null,
+            maxCheckValue: null,
            isStandard: true,
            showIcon:false,
          }
--- a/src/views/quality/base/qualityHotMaterial/index.vue
+++ b/src/views/quality/base/qualityHotMaterial/index.vue
@@ -140,8 +140,9 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
+        {
+          type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'separate' : '',
+					// type: 'separate',
 				},
 				{
          type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'button' : '',
--- a/src/views/quality/base/qualityInspectionDet/index.vue
+++ b/src/views/quality/base/qualityInspectionDet/index.vue
@@ -105,7 +105,10 @@ export default {
 				// 	name: 'reset',
 				// },
 				{
-					type: 'separate',
+          // type: 'separate',
+          type: this.$auth.hasPermi('base:quality-inspection-det:create')
+            ? 'separate'
+            : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:quality-inspection-det:create')
--- a/src/views/quality/base/qualityInspectionType/index.vue
+++ b/src/views/quality/base/qualityInspectionType/index.vue
@@ -146,8 +146,11 @@ export default {
 				// 	btnName: '重置',
 				// 	name: 'reset',
 				// },
-				{
-					type: 'separate',
+        {
+          type: this.$auth.hasPermi('base:quality-inspection-type:create')
+            ? 'separate'
+            : '',
+					// type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('base:quality-inspection-type:create')
--- a/src/views/quality/base/qualityScrapDet/index.vue
+++ b/src/views/quality/base/qualityScrapDet/index.vue
@@ -97,8 +97,9 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
+        {
+          type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'separate' : '',
+					// type: 'separate',
 				},
 				{
          type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '',
--- a/src/views/quality/base/qualityScrapLog/index.vue
+++ b/src/views/quality/base/qualityScrapLog/index.vue
@@ -124,8 +124,9 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
+        {
+          type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'separate' : '',
+					// type: 'separate',
 				},
 				{
          type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '',
--- a/src/views/quality/base/qualityScrapType/index.vue
+++ b/src/views/quality/base/qualityScrapType/index.vue
@@ -87,8 +87,9 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
+        {
+          type: this.$auth.hasPermi('base:quality-scrap-type:create') ? 'separate' : '',
+					// type: 'separate',
 				},
 				{
          type: this.$auth.hasPermi('base:quality-scrap-type:create') ? 'button' : '',
--- a/src/views/quality/monitoring/equipmentTraceability/index.vue
+++ b/src/views/quality/monitoring/equipmentTraceability/index.vue
@@ -269,6 +269,13 @@ export default {
 					name: 'search',
 					color: 'primary',
        },
+        {
+          type: this.$auth.hasPermi(
+            'monitoring:equipment-traceability:export'
+          )
+            ? 'separate'
+            : '',
+        },
        {
          type: this.$auth.hasPermi(
            'monitoring:equipment-traceability:export'
--- 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-07 16:19:18
+ * @LastEditTime: 2024-04-10 16:31:48
 * @Description:
 -->
 <template>
@@ -161,6 +161,13 @@ export default {
        // 	type: 'separate',
        // 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
        // },
+        {
+          type: this.$auth.hasPermi(
+            'monitoring:materiel-date-from:export'
+          )
+            ? 'separate'
+            : '',
+        },
        {
          type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
        	btnName: '导出',
--- a/src/views/quality/monitoring/qualityInspectionRecord/index.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
@@ -168,8 +168,13 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
+        {
+          type: this.$auth.hasPermi(
+            'base:quality-inspection-record:create'
+          )
+            ? 'separate'
+            : '',
+					// type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi(