检验模板调整

value

2024-04-18 990cc4c609bf603c6e6702df3063383aa84e8566

检验模板调整

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

@@ -174,8 +174,8 @@
        <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
          <tbody>
            <tr v-for="(m,i) in item.arr" :key="i">
              <!-- v-if="n.v.mc==undefined || n.v.mc.rs!=undefined" :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" -->
              <td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j"
                :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;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}`">
                  <template v-if="n.v.ps!=undefined && n.v.ps.value==='检验值'">
@@ -201,10 +201,10 @@
                    <span v-else-if="n.v.v===0" :style="`font-family:${n.v.ff} !important;color: red;`">不合格</span>
                    <span v-else :style="`font-family:${n.v.ff} !important;`">待定</span>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='设备'">
                    <el-select v-model="n.v.v" placeholder="请选择" @visible-change="e=>getEquipOptions(e,n.i)"
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='设备编码'">
                    <el-select v-model="n.v.v" placeholder="设备" @visible-change="e=>getEquipOptions(e,n.i)"
                      :disabled="state>1">
                      <el-option v-for="item in equipOptions" :key="item.value" :label="item.label" :value="item.label">
                      <el-option v-for="item in equipOptions" :key="item.value" :label="item.value" :value="item.value">
                      </el-option>
                    </el-select>
                  </template>
@@ -224,7 +224,7 @@
        </el-table-column>
        <el-table-column prop="sampleCode" label="样品编号" min-width="100px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="model" label="样品型号" min-width="100px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="insState" label="检测状态" width="95px" show-overflow-tooltip>
        <el-table-column prop="insState" label="检测状态" width="100px" show-overflow-tooltip>
          <template slot-scope="scope">
            <el-tag v-for="(item, i) in typeList" :key="i" v-if="item.value == scope.row.insState" :type="item.type"
              size="medium" style="margin-right: 5px;">{{item.label}}</el-tag>
@@ -265,7 +265,8 @@
</template>

<script>
  import ValueTable from '../../tool/value-table.vue'
  import { set } from 'shelljs';
import ValueTable from '../../tool/value-table.vue'
  export default {
    props: ['sonLaboratory', 'orderId', 'state'],
    components: {
@@ -446,67 +447,82 @@
        const mySet1 = new Set();
        this.tableList = JSON.parse(JSON.stringify(this.currentSample.insProduct)).filter(m => {
          let num0 = mySet1.size;
          mySet1.add(JSON.stringify({
            template: m.template,
            templateId: m.templateId
          }))
          if(m.templateId!=null){
            mySet1.add(JSON.stringify({
              template: m.template,
              templateId: m.templateId
            }))
          }
          let num1 = mySet1.size;
          if (num1 > num0) {
            return m
          }
        })
        this.tableList.forEach(a => {
          let dels = []
          let mcList = []
          a.template.forEach(b => {
            if (b.v.mc != undefined && b.v.mc.cs != undefined && b.v.mc.rs != undefined) {
              mcList.push(b)
            }
          })
          mcList.forEach(b => {
            for (var c in a.template) {
              for (var i = 0; i < b.v.mc.cs; i++) {
                for (var i2 = 0; i2 < b.v.mc.rs; i2++) {
                  if (a.template[c].c === b.c + i && a.template[c].r === b.r + i2) {
                    a.template[c].v.v = this.HaveJson(b).v.v
                    a.template[c].v.ps = this.HaveJson(b).v.ps
                    break
                  }
                }
              }
            }
          })
        })
        this.tableList.forEach(a => {
          let dels = new Set()
          let ids = []
          a.template.forEach(b => {
            if (b.v.ps != undefined && b.v.ps.value === '检验项') {
              let count = 0
              for (let i in this.currentSample.insProduct) {
                if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample.insProduct[i].inspectionItem === b.v.v) {
                if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
                  .insProduct[i].inspectionItem === b.v.v) {
                  let count2 = 0
                  for (var c in a.template) {
                    if (a.template[c].r === b.r && a.template[c].v.ps != undefined && a.template[c].v.ps.value === '检验子项') {
                      if(this.currentSample.insProduct[i].inspectionItemSubclass === a.template[c].v.v){
                        ids.push({
                          r: b.r,
                          id: this.currentSample.insProduct[i].id,
                          product: this.currentSample.insProduct[i]
                        })
                      if (this.currentSample.insProduct[i].inspectionItemSubclass === a.template[c].v.v) {
                        break
                      }
                    }
                    count2++
                  }
                  if (count2 < a.template.length) {
                  if (count2 <= a.template.length) {
                    ids.push({
                      r: b.r,
                      id: this.currentSample.insProduct[i].id,
                      product: this.currentSample.insProduct[i]
                    })
                    break
                  }
                }
                count++
              }
              if (count === this.currentSample.insProduct.length) {
                dels.push(b)
                dels.add(b.r)
              }
            }
          })
          console.log(dels);
          dels.forEach(del => {
            for (let b = 0; b < a.template.length; b++) {
              if (a.template[b].r === del.r) {
                if (a.template[b].v.mc != undefined) {
                  if (a.template[b].v.mc.rs != undefined && a.template[b].v.mc.rs > 1) {
                    if (a.template[b].r === a.template[b].v.mc.r) {
                      a.template[b].r += 1
                      a.template[b].v.mc.r += 1
                      a.template[b].v.mc.rs -= 1
                      continue
                    }
                  }
                }
              if (a.template[b].r === del) {
                a.template.splice(b, 1)
                b -= 1
              }
            }
          })
          ids.forEach(id => {
          /* ids.forEach(id => {
            for (let b = 0; b < a.template.length; b++) {
              if (a.template[b].r === id.r) {
                a.template[b].i = id.id
@@ -515,7 +531,7 @@
                }
              }
            }
          })
          }) */
        })
        this.tableList.forEach(a => {
          let arrs = []
@@ -534,30 +550,30 @@
              b.v.v = this.getAsk(b.i)
            }
            if (b.v.ps != undefined && b.v.ps.value === '检验值') {
              delete b.v.v
              b.v.v = ''
              b.u = ''
              this.param[b.i].insValue.push(b)
              // this.param[b.i].insValue.push(b)
            }
            if (b.v.ps != undefined && b.v.ps.value === '计算值') {
              b.v.v = ''
              this.param[b.i].comValue.push(b)
              // this.param[b.i].comValue.push(b)
            }
            if (b.v.ps != undefined && b.v.ps.value === '设备') {
              b.v.v = ''
              this.param[b.i].equipValue = b
              // this.param[b.i].equipValue = b
            }
            if (b.v.ps != undefined && b.v.ps.value === '最终值') {
              b.v.v = ''
              if (b.i === undefined) {
              /* if (b.i === undefined) {
                for (var c in this.param) {
                  this.param[c].resValue = b
                }
              } else {
                this.param[b.i].resValue = b
              }
              } */
            }
            if (b.v.ps != undefined && b.v.ps.value === '结论') {
              for (var c in this.param) {
              /* for (var c in this.param) {
                this.param[c].insResult = b
              }
              conclusionList.forEach((n, i) => {
@@ -565,7 +581,7 @@
                  b.v.f =
                    `(${this.comparisonList.find(j=>j.value==(finalList[i].c)).label}${finalList[i].r+1})`
                }
              })
              }) */
            }
            set.add(b.r)
            if (b.v.f) {
@@ -577,20 +593,7 @@
            let arr = []
            a.template.forEach(c => {
              if (c.r === b) {
                if (arr.length === 0) {
                  if (c.v.mc == undefined || Object.keys(c.v.mc).length == 4) arr.push(c)
                } else {
                  for (let d = 0; d < arr.length; d++) {
                    if (c.c < arr[d].c) {
                      if (c.v.mc == undefined || Object.keys(c.v.mc).length == 4) arr.splice(d, 0, c)
                      break
                    }
                    if (d === arr.length - 1) {
                      if (c.v.mc == undefined || Object.keys(c.v.mc).length == 4) arr.push(c)
                      break
                    }
                  }
                }
                arr.push(c)
              }
            })
            arrs.push(arr)
@@ -841,7 +844,7 @@
          }).then(res => {
            if (res.code === 200 && res.data) {
              this.equipOptions = res.data.map(m => {
                m.value = m.id
                m.value = m.factoryNo
                m.label = m.deviceName
                return m
              })

 src/components/tool/excel.vue

@@ -96,7 +96,7 @@
                    strikethrough: false, // '删除线 (Alt+Shift+5)'
                    underline: false, // '下划线 (Alt+Shift+6)'
                    italic: false, // '斜体 (Ctrl+I)'
                    textWrapMode: false, // '换行方式'
                    textWrapMode: true, // '换行方式'
                    textRotateMode: false, // '文本旋转方式'
                    conditionalFormat: false, // '条件格式'
                    splitColumn: false, // '分列'

 src/components/tool/value-table.vue

@@ -178,7 +178,7 @@
                                v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)&&!showCascader(a.label)" :disabled="isDisabled(a.label)"></el-input>
                            <el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
                                v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
                                clearable>
                                clearable filterable>
                                <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
                                    :label="b.label">
                                </el-option>
@@ -222,7 +222,7 @@
                                v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)&&!showCascader(a.label)" :disabled="isDisabled(a.label)"></el-input>
                            <el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
                                v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
                                clearable>
                                clearable filterable>
                                <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
                                    :label="b.label"></el-option>
                            </el-select>
@@ -263,7 +263,7 @@
                            <el-input v-model="upData[a.label]" size="small" clearable :placeholder="`请输入${a.value}`"
                                v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)&&!showCascader(a.label)"></el-input>
                            <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
                                style="width: 100%;" :placeholder="`请选择${a.value}`" clearable>
                                style="width: 100%;" :placeholder="`请选择${a.value}`" clearable filterable>
                                <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
                                    :label="b.label"></el-option>
                            </el-select>

 src/components/view/a7-standard-method.vue

@@ -140,10 +140,20 @@
                value: 1,
                label: '是'
              }]
            },
            isUse: {
              select: [{
                value: 0,
                type: 'info',
                label: '否'
              }, {
                value: 1,
                label: '是'
              }]
            }
          },
          requiredAdd: ['code', 'name', 'structureTestObjectId', 'isProduct'],
          requiredUp: ['code', 'name', 'structureTestObjectId', 'isProduct']
          requiredAdd: ['code', 'name', 'structureTestObjectId', 'isProduct','isUse','nameEn'],
          requiredUp: ['code', 'name', 'structureTestObjectId', 'isProduct','isUse','nameEn']
        },
        entityCopy: {},
        upIndex: 0,

 src/components/view/b1-inspect-order-plan.vue

@@ -229,7 +229,7 @@
                            type: 'text',
                            method: 'handleInspection',
                            disabFun: (row, index) => {
                                return row.userId == null
                                return row.userId == null || row.insState == 3
                            }
                        }, {
                            id: '',
@@ -237,7 +237,7 @@
                            type: 'text',
                            method: 'handleConnect',
                            disabFun: (row, index) => {
                                return row.userId == null
                                return row.userId == null || row.insState == 3
                            }
                        },
                        {
@@ -246,7 +246,7 @@
                            type: 'text',
                            method: 'handleReview',
                            disabFun: (row, index) => {
                                return row.userId == null || row.insState != 4
                                return row.userId == null || row.insState != 3
                            }
                        }, {
                            id: '',

 src/components/view/b2-standard-template.vue

@@ -195,6 +195,13 @@
                        }
                    }
                }
        data.data[0].celldata.forEach(a=>{
          if(a.v.ps!=undefined&&a.v.ps.value==='检验值'){
            if(a.v.v === undefined){
              a.v.v = ""
            }
          }
        })
                this.$axios.post(this.$api.StandardTemplate.upStandardTemplate, {
                    id: this.row.id,
                    thing: JSON.stringify(data),