检验标准多选，优化审核按钮

licp

2024-09-12 88810da4cf6f4c54c11fd11cbba760a7058e22b5

检验标准多选，优化审核按钮

 src/assets/api/controller.js

@@ -32,6 +32,7 @@
    insBushing,
    auxiliaryOriginalHours,
    evaluate,
    role,
  }
}

@@ -403,3 +404,7 @@
  getEvaluateGroup: "/evaluateGroup/getEvaluateGroup", //查询员工互评
  writeEvaluateGroup: "/evaluateGroup/writeEvaluateGroup", //填写员工互评
}

const role = {
  getRole:"/role/getRole",//获取当前用户角色
}

 src/components/do/b1-ins-order/add.vue

@@ -367,8 +367,8 @@
          <div class="search_thing">
            <div class="search_label">检验标准：</div>
            <div class="search_input">
              <el-select v-model="standardMethodListId" :placeholder="active>1 ? '' : '请输入'" size="small" @focus="methodFocus"
                :loading="methodLoad" @change="changeStandardMethodListId">
              <el-select v-model="standardMethodListId" :placeholder="active>1 ? '' : '请输选择'" size="small" @focus="methodFocus"
                :loading="methodLoad" multiple @change="changeStandardMethodListId">
                <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
                </el-option>
              </el-select>
@@ -410,7 +410,7 @@
            <template slot-scope="scope">
              <el-select v-model="scope.row.standardMethodListId" :disabled="scope.row.model==null||active>1"
                placeholder="检验标准" size="small" :loading="methodLoad" @change="(value)=>methodChange(value, scope.row)"
                @focus="methodFocus" :readonly="active>1" style="width: 100%;" clearable @clear="productList = []">
                @focus="methodFocus" :readonly="active>1" style="width: 100%;" clearable @clear="productList = []" multiple>
                <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
                </el-option>
              </el-select>
@@ -1102,7 +1102,7 @@
        RTS: '',
        totalArr: [],
        model: null,
        standardMethodListId: null,
        standardMethodListId: [],
        symbolList:[
        'RTS','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'],
        inspectionItem:null,
@@ -1189,11 +1189,11 @@
      },
      'addObj.sample'(val) {
        this.model = null
        this.standardMethodListId = null
        this.standardMethodListId = []
      },
      'addObj.sampleNum'(val) {
        this.model = null
        this.standardMethodListId = null
        this.standardMethodListId = []
      }
    },
    mounted() {
@@ -1219,7 +1219,10 @@
            ...res.data.insOrder
          };
          this.addObj.type = String(this.addObj.type)
          this.sampleList = this.HaveJson(res.data.sampleProduct);
          this.sampleList = this.HaveJson(res.data.sampleProduct)
          this.sampleList.forEach(m=>{
            m.standardMethodListId = JSON.parse(m.standardMethodListId)
          });
          this.getProNum()
          this.addObj.sampleNum = this.sampleList.length
          this.$nextTick(() => {
@@ -1641,7 +1644,7 @@
          this.$message.error('请输入样品名称')
        } else if (!this.sampleList.every(m => m.model)) {
          this.$message.error('请输入样品型号')
        } else if (!this.sampleList.every(m => m.standardMethodListId)) {
        } else if (!this.sampleList.every(m => m.standardMethodListId&&m.standardMethodListId.length>0)) {
          this.$message.error('请选择检验标准')
        } else {
          //校验检验项的要求值和要求描述,仅委托要求
@@ -2243,7 +2246,7 @@
          this.sample.sample = this.addObj.sample
          this.sample.model = this.addObj.model
          this.sample.unit = this.addObj.unit
          this.sample.standardMethodListId = null
          this.sample.standardMethodListId = []
          this.sample.insProduct = []
          this.sample.id = this.count
          this.sample.childSampleList = []
@@ -2288,7 +2291,7 @@
          this.sample.sample = this.addObj.sample
          this.sample.model = this.addObj.model
          this.sample.unit = this.addObj.unit
          this.sample.standardMethodListId = null
          this.sample.standardMethodListId = []
          this.sample.insProduct = []
          this.sample.id = parseInt(i+1)
          this.sample.childSampleList = []
@@ -2328,12 +2331,6 @@
      },
      rowClick(row, column, event) {
        this.currentMethod = row
        let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
        if (obj && obj.code == '委托要求') {
          this.isAskOnlyRead = true
        } else {
          this.isAskOnlyRead = false
        }
        this.sampleId = row.id
        if (this.active !== 1) {
          this.sampleIds = []
@@ -2607,20 +2604,13 @@
      methodChange(val, row) {
        if (val === null || val === '') return
        this.currentMethod = row
        let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
        if (obj && obj.code == '委托要求') {
          this.isAskOnlyRead = true
        } else {
          this.isAskOnlyRead = false
        }
        this.getProductLoad = true
        let selectTreeList = this.selectTree.split(" - ")
        this.addObj.model&&(selectTreeList[selectTreeList.length - 1] = this.addObj.model)

        console.log( this.selectTree);
        this.$axios.post(this.$api.standardTree.selectStandardProductList, {
          model: (this.addObj.model?this.addObj.model:row.model) + '-' + row.modelNum,
          standardMethodListId: val,
          standardMethodListId: val.join(','),
          factory: selectTreeList.join(" - "),
        }, {
          headers: {

 src/components/do/b1-ins-order/cable-config.vue

@@ -24,7 +24,7 @@
      <div class="search_thing" v-if="currentTab=='绝缘'">
        <div class="search_label">检验标准：</div>
        <el-select v-model="insulating.standardMethodListId" placeholder="请选择检验标准" size="small"
        @change="(value)=>methodChange(value)">
        @change="(value)=>methodChange(value)" multiple>
          <el-option v-for="item in standards" :key="item.id" :label="item.code" :value="item.id">
          </el-option>
        </el-select>
@@ -32,7 +32,7 @@
      <div class="search_thing" v-if="currentTab=='护套'">
        <div class="search_label">检验标准：</div>
        <el-select v-model="sheath.standardMethodListId" placeholder="请选择检验标准" size="small"
        @change="(value)=>methodChange(value)">
        @change="(value)=>methodChange(value)" multiple>
          <el-option v-for="item in standards" :key="item.id" :label="item.code" :value="item.id">
          </el-option>
        </el-select>
@@ -56,7 +56,7 @@
          <template slot-scope="scope">
            <el-input size="small" placeholder="要求值" v-model="scope.row.ask" clearable type="textarea"
              :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)"
              v-if="active==1&&isAskOnlyRead"></el-input>
              v-if="active==1"></el-input>
            <span v-else>{{ scope.row.ask }}</span>
          </template>
        </el-table-column>
@@ -86,12 +86,12 @@
        tree: '',
        standards: [],
        insulating: {
          standardMethodListId: null,
          standardMethodListId: [],
          insProduct: [],
          num: 1
        },
        sheath: {
          standardMethodListId: null,
          standardMethodListId: [],
          insProduct: []
        },
        isAskOnlyRead: false
@@ -177,15 +177,9 @@
    },
    methodChange(val) {
      if (val === null || val === '') return
      let standard = this.standards.find(a => a.id === val)
      if(standard!=null && standard.code==='委托要求'){
        this.isAskOnlyRead = true
      }else{
        this.isAskOnlyRead = false
      }
      this.$axios.post(this.$api.standardTree.selectStandardProductList, {
        model: this.$parent.addObj.model,
        standardMethodListId: val,
        standardMethodListId: val.join(','),
        factory: this.tree + ' - '
      }, {
        headers: {

 src/components/do/b1-ins-order/equip-config.vue

@@ -48,7 +48,7 @@
          <template slot-scope="scope">
            <el-select v-model="scope.row.standardMethodListId" :disabled="scope.row.model==null||active>1"
              placeholder="检验标准" size="small" :loading="methodLoad" @change="(value)=>methodChange(value, scope.row)"
              @focus="methodFocus" :readonly="active>1" style="width: 100%;">
              @focus="methodFocus" :readonly="active>1" style="width: 100%;" multiple>
              <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
              </el-option>
            </el-select>
@@ -81,7 +81,7 @@
          <template slot-scope="scope">
            <el-input size="small" placeholder="要求值" v-model="scope.row.ask" clearable type="textarea"
              :autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)"
              v-if="active==1&&isAskOnlyRead"></el-input>
              v-if="active==1"></el-input>
            <span v-else>{{ scope.row.ask }}</span>
          </template>
        </el-table-column>
@@ -245,12 +245,6 @@
      },
      rowClick(row, column, event) {
        this.currentMethod = row
        let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
        if (obj && obj.code == '委托要求') {
          this.isAskOnlyRead = true
        } else {
          this.isAskOnlyRead = false
        }
        this.sampleId = row.id
        if (this.active !== 1) {
          this.sampleIds = []
@@ -286,16 +280,10 @@
      methodChange(val, row) {
        if (val === null || val === '') return
        this.currentMethod = row
        let obj = this.methods.find(a => a.id == this.currentMethod.standardMethodListId)
        if (obj && obj.code == '委托要求') {
          this.isAskOnlyRead = true
        } else {
          this.isAskOnlyRead = false
        }
        this.getProductLoad = true
        this.$axios.post(this.$api.standardTree.selectStandardProductList, {
          model: row.model + '-' + row.modelNum,
          standardMethodListId: val,
          standardMethodListId: val.join(','),
          factory: this.selectTree,
        }, {
          headers: {
@@ -473,7 +461,7 @@
        this.sample.sample = this.addObj.sample
        this.sample.model = this.addObj.model
        this.sample.unit = this.addObj.unit
        this.sample.standardMethodListId = null
        this.sample.standardMethodListId = []
        this.sample.insProduct = []
        this.sample.id = this.count
        this.sample.num = this.addObj.sampleNum

 src/components/view/b1-inspection-order.vue

@@ -530,7 +530,21 @@
                        type: 'text',
                        method: 'handleVerify',
                        disabFun: (row, index) => {
                            return row.state != 0
              let state0 = false
              if(this.currentRole=='检测中心主任'){
                if(row.checkState1||row.checkState1User){
                  state0 = true
                }
              }else if(this.currentRole=='研发部经理'){
                if(row.checkState2||row.checkState2User){
                  state0 = true
                }
              }else if(this.currentRole=='技术负责人'){
                if(row.checkState3||row.checkState3User){
                  state0 = true
                }
              }
                            return row.state != 0 || state0 ||(this.currentRole!='检测中心主任'&&this.currentRole!='研发部经理'&&this.currentRole!='技术负责人')
                        }
                    }, {
                        id: 'quash',
@@ -745,7 +759,8 @@
        ],
        qrData:[],
        multipleSelection:[],
        sonLaboratoryList:[]
        sonLaboratoryList:[],
        currentRole:''
            }
        },
    watch:{
@@ -757,6 +772,9 @@
          this.isIndeterminate = true;
        }
      }
    },
    created() {
      this.getAuthorizedPersonRole()
    },
        mounted() {
            this.entityCopy = this.HaveJson(this.componentData.entity)
@@ -861,6 +879,11 @@
                        })
                    })
                    this.personList = data
                })
            },
      getAuthorizedPersonRole() {
                this.$axios.get(this.$api.role.getRole).then(res => {
                    this.currentRole = res.message
                })
            },
            refreshTable(e) {
@@ -1115,6 +1138,7 @@
            playOrder(num) {
                this.active = num
        this.examine = 0
        this.getAuthorizedPersonRole()
        this.refreshTable('page')
            },
            handleTab(m, i) {

 src/main.js

@@ -20,11 +20,11 @@
//本地
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
// const javaApi = 'http://172.20.10.5:8001';
const javaApi = 'http://172.20.10.5:8001';

// //通信测试库
// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
const javaApi = 'http://10.1.13.77:8001';
// const javaApi = 'http://10.1.13.77:8001';

//云
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";