Merge remote-tracking branch 'origin/master'

value

2024-04-30 bfdc9394de921bdc90475ade0552ccd7f19f2338

Merge remote-tracking branch 'origin/master'

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -189,16 +189,22 @@
      </el-form>
    </div>
    <div class="center">
      <div class="search">
        <el-radio-group v-model="currentTable" size="small">
          <el-radio-button :label="item.templateId" v-for="(item,index) in tableLists"
            :key="index" size="small">{{ item.templateName }}</el-radio-button>
        </el-radio-group>
      </div>
      <div class="center-box">
        <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index"
          :style="`width: ${tableWidth}px;`">
          >
          <tbody>
            <tr v-for="(m,i) in item.arr" :key="i">
              <td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j"
                v-if="n.v.mc==undefined || Object.keys(n.v.mc).length === 4" :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1"
                :rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1"
                :style="`background:${n.v.bg};color:${n.v.fc};font-size:${n.v.fs}px;width:${item.style.columnlen[n.c]}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
                <div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`">
                :style="`background:${n.v.bg};color:${n.v.fc};font-size:${n.v.fs}px;width:${handleWidth(n)}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
                <div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`" :style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;`">
                  <template v-if="n.v.ps!=undefined && n.v.ps.value==='检验值' && state==1">
                    <el-input v-if="getInspectionValueType(n.i) == 1" class="table_input" v-model="n.v.v"
                      :disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
@@ -207,7 +213,7 @@
                    </el-input>
                    <el-input v-else-if="getInspectionValueType(n.i) == 2" class="table_input" type="textarea"
                      :autosize="{ minRows: 1}" v-model="n.v.v" :disabled="state>1" />
                    <el-select v-else-if="getInspectionValueType(n.i) == 5" class="table_input" v-model="n.v.v"
                    <el-select v-else-if="getInspectionValueType(n.i) == 5" class="table_input"  v-model="n.v.v"
                      :disabled="state>1">
                      <el-option label="是" value="是"></el-option>
                      <el-option label="否" value="否"></el-option>
@@ -347,7 +353,10 @@
        reviewLoading: false,
        reviewDia: false,
        noReason: '',
        tableWidth: 1000
        tableWidth: 1000,
        currentTable:null,
        tableLists:[],
        widthList:[]
      }
    },
    created() {
@@ -387,10 +396,22 @@
          })
          if (this.currentSample.index == undefined) this.currentSample['index'] = 1
          this.loading = false
          this.handleTableData()
          // this.handleTableData()
          this.getTableLists();
          this.componentData.currentId = val;
          this.currentKey = 1;
        })
      },
      currentTable(val1,val0){
        if(val0!=null&&val1!=val0){
          this.tableLists.forEach((m,i)=>{
            if(m.templateId==val1){
              this.tableList = null;
              this.tableList = [(this.tableLists[i])];
              this.handleTableData()
            }
          })
        }
      }
    },
    methods: {
@@ -407,7 +428,8 @@
            insResult: null
          }
        })
        this.handleTableData()
        // this.handleTableData()
        this.getTableLists();
        this.sampleVisible = false;
        this.currentKey = row.index
      },
@@ -466,10 +488,9 @@
      }) {
        row.index = rowIndex + 1;
      },
      handleTableData() {
        this.excelMethodList = []
      getTableLists(){
        const mySet1 = new Set();
        this.tableList = JSON.parse(JSON.stringify(this.currentSample.insProduct)).filter(m => {
        this.tableLists = this.currentSample.insProduct.filter(m => {
          let num0 = mySet1.size;
          if (m.templateId != null) {
            mySet1.add(JSON.stringify({
@@ -481,7 +502,17 @@
          if (num1 > num0) {
            return m
          }
        })
        });
        if(this.tableLists&&this.tableLists.length>0){
          this.tableList = null;
          this.tableList = [this.tableLists[0]]
          this.currentTable = this.tableLists[0].templateId;
          this.handleTableData()
        }
      },
      handleTableData() {
        this.excelMethodList = []
        this.widthList = this.tableList[0].style.columnlen;
        this.tableList.forEach(a => {
          let mcList = []
          a.template.forEach(b => {
@@ -831,6 +862,73 @@
            }
          }
        })
        this.getCurrentInsProduct(pId)
      },
      getCurrentInsProduct(pId){
        if(!this.tableList[0].insProductResult){
          this.tableList[0].insProductResult = {}
        }
        for (let m in this.param[pId]){
          let value = this.param[pId][m]
          switch (m){
            case 'comValue':
              if(value&&value.length>0){
                this.tableList[0].insProductResult[m]=[];
                value.forEach((a,i)=>{
                  let obj = {
                    v:a.v.v,
                  }
                  this.tableList[0].insProductResult[m].push(obj);
                })
              }
              this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
              break;
            case 'insValue':
              if(value&&value.length>0){
                this.tableList[0].insProductResult[m]=[];
                value.forEach((a,i)=>{
                  let obj = {
                    v:a.v.v,
                    u:a.u,
                  }
                  this.tableList[0].insProductResult[m].push(obj);
                })
              }
              this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
              break;
            case 'equipValue':
              if(value&&value.length>0){
                this.tableList[0].insProductResult[m]=[];
                value.forEach((a,i)=>{
                  let obj = {
                    v:a.v.v,
                  }
                  this.tableList[0].insProductResult[m].push(obj);
                })
              }
              this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
              break;
            case 'equipName':
              if(value&&value.length>0){
                this.tableList[0].insProductResult[m]=[];
                value.forEach((a,i)=>{
                  let obj = {
                    v:a.v.v,
                  }
                  this.tableList[0].insProductResult[m].push(obj);
                })
              }
              this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
              break;
            case 'resValue':
              console.log(this.param)
              this.tableList[0].lastValue = value.v.v
              break;
            case 'insResult':
              this.tableList[0].insResult = value.v.v
              break;
          }
        }
      },
      handleExcelMethod() {
        if (this.excelMethodList.length > 0) {
@@ -884,6 +982,18 @@
          }
        }
      },
      handleWidth(n){
        let sum = 0;
        if(n.v.mc&&n.v.mc.cs&&n.v.mc.c!=undefined){
          for(let i=0;i<n.v.mc.cs;i++){
            let num = this.widthList[i+n.v.mc.c]?this.widthList[i+n.v.mc.c]:100
            sum+=num;
          }
        }else{
          sum = this.widthList[n.c]?this.widthList[n.c]:100
        }
        return sum
      },
      getInspectionItemType(id) {
        for (var a in this.currentSample.insProduct) {
          if (this.currentSample.insProduct[a].id == id) {

 src/components/view/b3-classes.vue