修改bug

2024-04-11 15:26:51 +08:00
--- a/src/api/base/qualityHotMaterial.js
+++ b/src/api/base/qualityHotMaterial.js
@@ -2,7 +2,7 @@
 /*
 * @Author: zhp
 * @Date: 2023-11-06 15:38:12
- * @LastEditTime: 2024-04-09 15:14:40
+ * @LastEditTime: 2024-04-11 14:57:02
 * @LastEditors: zhp
 * @Description:
 */
@@ -94,7 +94,7 @@ export function getWorkerList(query) {

 export function getMaterialCheckList(query) {
  return request({
-    url: '/base/core-hot-material-check/listByMaterial',
+    url: 'base/quality-hot-material-det/filterList',
    method: 'get',
    params: query
  })
@@ -102,7 +102,7 @@ export function getMaterialCheckList(query) {

 export function createQualityHotMaterialDet(query){
   return request({
-    url: '/base/quality-hot-material-det/create',
+    url: 'base/quality-hot-material-det/createBatch',
    method: 'post',
    data: query
  })
@@ -110,7 +110,7 @@ export function createQualityHotMaterialDet(query){

 export function updateQualityHotMaterialDet(query){
   return request({
-    url: '/base/quality-hot-material-det/listbyfilter',
+    url: 'base/quality-hot-material-det/updateBatch',
    method: 'put',
    data: query
  })
@@ -118,7 +118,7 @@ export function updateQualityHotMaterialDet(query){

 export function getQualityHotMaterialDetList(query){
   return request({
-    url: '/base/quality-hot-material-det/listbyfilter',
+    url: '/base/quality-hot-material-det/filterList',
    method: 'get',
    params: query
  })
--- 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 09:10:16
+ * @LastEditTime: 2024-04-11 13:35:46
 * @Description:
 -->
 <template>
@@ -62,7 +62,8 @@
        <div v-if="!isdetail" class="action_btn">
          <template>
            <span style="display: inline-block;">
-              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
+              <el-button v-if="this.$auth.hasPermi('extend:process-equ-material-bom-det:add')" type="text"
+                @click="addNew()" icon="el-icon-plus">新增</el-button>
            </span>
          </template>
        </div>
@@ -101,11 +102,15 @@ import attrAdd from './attr-add';
 import { publicFormatter } from '@/utils/dict';
 const tableBtn = [
 	{
-		type: 'edit',
+    type: this.$auth.hasPermi('extend:process-equ-material-bom-det:update')
+      ? 'edit'
+      : '',
 		btnName: '编辑',
 	},
 	{
-		type: 'delete',
+    type: this.$auth.hasPermi('extend:process-equ-material-bom-det:delete')
+      ? 'delete'
+      : '',
 		btnName: '删除',
 	},
 ];
--- 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 09:10:35
+ * @LastEditTime: 2024-04-11 13:35:42
 * @Description:
 -->
 <template>
@@ -72,7 +72,8 @@
        <div v-if="!isdetail" class="action_btn">
          <template>
            <span style="display: inline-block;">
-              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
+              <el-button v-if="this.$auth.hasPermi('extend:process-equ-value-bom-det:add')" type="text"
+                @click="addNew()" icon="el-icon-plus">新增</el-button>
            </span>
          </template>
        </div>
@@ -111,11 +112,15 @@ import attrAdd from './attr-add';

 const tableBtn = [
 	{
-		type: 'edit',
+    type: this.$auth.hasPermi('extend:process-equ-value-bom-det:update')
+      ? 'edit'
+      : '',
 		btnName: '编辑',
 	},
 	{
-		type: 'delete',
+    type: this.$auth.hasPermi('extend:process-equ-value-bom-det:delete')
+      ? 'delete'
+      : '',
 		btnName: '删除',
 	},
 ];
@@ -156,7 +161,9 @@ const tableProps = [

 const topBtnConfig = [
  {
-    type: 'add',
+    type: this.$auth.hasPermi('extend:process-equ-value-bom-det:add')
+      ? 'add'
+      : '',
    btnName: 'btn.add'
  }
 ]
--- 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-04-10 16:46:44
+ * @LastEditTime: 2024-04-11 15:25:51
 * @LastEditors: zhp
 * @Description:
 -->
@@ -75,7 +75,7 @@
        <el-row :gutter="24" v-for="(item,index) in ingredientList" :key="item.id">
          <el-col :span="4">
            <el-form-item label="成分">
-              {{ item.name }}
+              {{ item.checkName }}
            </el-form-item>
          </el-col>
          <el-col :span="6">
@@ -83,11 +83,11 @@
              :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>
+                v-model.number="dataForm.checkValueList[index].minCheckValue"
+                @change="judgeMinValue(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-if="dataForm.checkValueList[index].isMinStandard" icon-class="standards" />
                <svg-icon v-else icon-class="noStandards" />
              </span>
            </el-form-item>
@@ -97,11 +97,11 @@
              :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>
+                v-model.number="dataForm.checkValueList[index].maxCheckValue"
+                @change="judgeMaxValue(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-if="dataForm.checkValueList[index].isMaxStandard" icon-class="standards" />
                <svg-icon v-else icon-class="noStandards" />
              </span>
            </el-form-item>
@@ -274,14 +274,25 @@ export default {
    onInput() {
      this.$forceUpdate();
    },
-    judgeValue(val, minValue, maxValue, index) {
+    judgeMinValue(val, minValue, maxValue, index) {
+      // console.log(cal);
      if (val >= minValue && val <= maxValue) {
        console.log(val)
        this.dataForm.checkValueList[index].showIcon = true
-        this.dataForm.checkValueList[index].isStandard = true
+        this.dataForm.checkValueList[index].isMinStandard = true
      } else {
        this.dataForm.checkValueList[index].showIcon = true
-        this.dataForm.checkValueList[index].isStandard = false
+        this.dataForm.checkValueList[index].isMinStandard = false
+      }
+    },
+    judgeMaxValue(val, minValue, maxValue, index) {
+      if (val >= minValue && val <= maxValue) {
+        console.log(val)
+        this.dataForm.checkValueList[index].showIcon = true
+        this.dataForm.checkValueList[index].isMaxStandard = true
+      } else {
+        this.dataForm.checkValueList[index].showIcon = true
+        this.dataForm.checkValueList[index].isMaxStandard = false
      }
    },
    handleClose() {
@@ -304,7 +315,7 @@ export default {
            checkerId: this.dataForm.checkerId,
            checkTime: this.dataForm.checkTime,
            appearance: this.dataForm.appearance,
-            checkResult: this.dataForm.checkResult,
+            // checkResult: this.dataForm.checkResult,
            materialGrade: this.dataForm.materialGrade,
            // checkValueList: [],
            checkResult: this.dataForm.checkResult,
@@ -349,7 +360,7 @@ export default {
          checkResult: this.dataForm.checkResult,
          materialGrade: this.dataForm.materialGrade,
          // checkValueList: [],
-          checkResult: this.dataForm.checkResult,
+          // checkResult: this.dataForm.checkResult,
          materialGrade: this.dataForm.materialGrade,
          remark:this.dataForm.remark
        }
@@ -357,13 +368,15 @@ export default {
          // this.idAttrShow = true;
          let array = []
          this.dataForm.checkValueList.forEach(ele => {
-            array.push(this.createDet({
-              mainId: response.data,
-              checkDetId: ele.checkDetId,
-              minCheckValue: ele.minCheckValue,
-              maxCheckValue: ele.maxCheckValue
+            array.push(this.createDet([
+              {
+                mainId: response.data,
+                checkDetId: ele.checkDetId,
+                minCheckValue: ele.minCheckValue,
+                maxCheckValue: ele.maxCheckValue

-            }))
+              }
+            ]))
          })
          Promise.all(array).then(res => {
            this.$modal.msgSuccess("新增成功");
@@ -394,15 +407,17 @@ export default {
      getMaterialCheckList({
        materialId:val
      }).then((res) => {
+        console.log('aaaaaaaa', res.data);
        this.ingredientList = res.data
        this.ingredientFlag = true
        this.dataForm.checkValueList = res.data.map((ele) => {
          return {
            mainId: null,
-            checkDetId: ele.id,
-            minCheckValue:null,
-            maxCheckValue: null,
-            isStandard: true,
+            checkDetId: ele.checkDetId,
+            minCheckValue:undefined,
+            maxCheckValue: undefined,
+            isMinStandard: true,
+            isMaxStandard: true,
            showIcon:false,
          }
        })
@@ -496,28 +511,31 @@ export default {
          this.urlOptions.infoURL(id).then(response => {
            this.dataForm = response.data
            getMaterialCheckList({
-              materialId: response.data.materialId
+              materialId: response.data.materialId,
+              mainId:id,
            }).then((res) => {
              console.log(res.data);
              let arr  = res.data
              valueList = arr.map((ele) => {
                // console.log(ele)
                return {
-                  checkDetId:ele.id,
+                  checkDetId: ele.checkDetId,
                  maxValue: ele.maxValue,
                  minValue: ele.minValue
                }
              })
              console.log(valueList);
              getQualityHotMaterialDetList({
-                mainId: response.data.id
+                mainId: response.data.id,
+                materialId: response.data.materialId,
              }).then((result) => {
                this.ingredientList = result.data.map((ele) => {
                  return {
-                    name: ele.checkName,
+                    checkName: ele.checkName,
                    id: ele.id,
                    checkDetId: ele.checkDetId,
-                    checkValue: ele.checkValue,
+                    minCheckValue: ele.minCheckValue,
+                    maxCheckValue: ele.maxCheckValue,
                    maxValue:null,
                    minValue: null
                  }
@@ -528,8 +546,10 @@ export default {
                    mainId: ele.mainId,
                    id: ele.id,
                    checkDetId: ele.checkDetId,
-                    checkValue: ele.checkValue,
-                    isStandard: true,
+                    minCheckValue: ele.minCheckValue,
+                    maxCheckValue: ele.maxCheckValue,
+                    isMinStandard: true,
+                    isMaxStandard: true,
                    showIcon: false,
                  }
                })
@@ -543,13 +563,21 @@ export default {
                })
                valueList.forEach((ele, index) => {
                 this.dataForm.checkValueList.forEach((item, i) => {
-                   if (ele.checkDetId == item.checkDetId && item.checkValue >= ele.minValue && item.checkValue <= ele.maxValue) {
+                   if (ele.checkDetId == item.checkDetId && item.minCheckValue >= ele.minValue && item.minCheckValue <= ele.maxValue) {
                     console.log(1111)
                     item.showIcon = true
-                     item.isStandard = true
+                     item.isMinStandard = true
                   } else {
                     item.showIcon = true
-                     item.isStandard = false
+                     item.isMinStandard = false
+                   }
+                   if (ele.checkDetId == item.checkDetId && item.maxCheckValue >= ele.minValue && item.maxCheckValue <= ele.maxValue) {
+                     console.log(1111)
+                     item.showIcon = true
+                     item.isMaxStandard = true
+                   } else {
+                     item.showIcon = true
+                     item.isMaxStandard = false
                   }
                  })
                })