合并冲突

licp

2024-04-19 0de6edd66b21331abbb2513ee5b0b8013fea03df

合并冲突

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

@@ -180,8 +180,9 @@
            <tr v-for="(m,i) in item.arr" :key="i" style="overflow: auto;">
              <!-- 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"
                :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':''};`">
                :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}`" :style="`width:${item.style.columnlen[n.c]}px !important;`">
                  {{n.mc}}
                  <template v-if="n.v.ps!=undefined && n.v.ps.value==='检验值'">
                    <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 != '')||state>1"
@@ -469,6 +470,7 @@
              mcList.push(b)
            }
          })
          let count = 0
          mcList.forEach(b => {
            for (var c in a.template) {
              for (var i = 0; i < b.v.mc.cs; i++) {
@@ -476,11 +478,13 @@
                  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
                    a.template[c].mc = count
                    break
                  }
                }
              }
            }
            count++
          })
        })
        this.tableList.forEach(a => {
@@ -517,7 +521,6 @@
              }
            }
          })
          console.log(dels);
          dels.forEach(del => {
            for (let b = 0; b < a.template.length; b++) {
              if (a.template[b].r === del) {
@@ -526,16 +529,25 @@
              }
            }
          })
          /* 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
                if (a.template[b].v.ps != undefined && a.template[b].v.ps.value === '单位') {
                  a.template[b].v.v = id.product.unit
                }
                if (a.template[b].v.ps != undefined && a.template[b].v.ps.value === '试验方法') {
                  a.template[b].v.v = id.product.method
                }
              }
            }
          }) */
          })
          let set2 = new Set()
          a.template.forEach(b=>{
            if(b.mc!=undefined&&set2.add(b.mc)){
              console.log(b.v);
            }
          })
        })
        this.tableList.forEach(a => {
          let arrs = []
@@ -562,7 +574,7 @@
              b.v.v = ''
              // this.param[b.i].comValue.push(b)
            }
            if (b.v.ps != undefined && b.v.ps.value === '设备') {
            if (b.v.ps != undefined && b.v.ps.value === '设备编码') {
              b.v.v = ''
              // this.param[b.i].equipValue = b
            }

 src/components/view/a5-capacity-scope.vue

@@ -70,11 +70,6 @@
                    <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                            v-model="itemParameterData.entity.laboratory" @keyup.enter.native="refreshTable()"></el-input></div>
                </div>
                <div class="search_thing">
                    <div class="search_label">设备组：</div>
                    <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                            v-model="itemParameterData.entity.deviceGroup" @keyup.enter.native="refreshTable()"></el-input></div>
                </div>
                <div class="search_thing" style="padding-left: 30px;">
                    <el-button size="small" @click="refresh()">重 置</el-button>
                    <el-button size="small" type="primary" @click="refreshTable()">查 询</el-button>
@@ -122,7 +117,6 @@
                    entity: {
                        inspectionItem: null,
                        laboratory: null,
                        deviceGroup: null,
                        orderBy: {
                            field: 'id',
                            order: 'asc'
@@ -158,7 +152,6 @@
                            select:[]
                        },
                        method:{select:[]},
                        deviceGroup:{select:[]},
                        templateId:{
                            select:[]
                        },
@@ -184,14 +177,13 @@
                            select:[]
                        },
                        method:{select:[],choose: true},
                        deviceGroup:{select:[]},
                        sample: {select:[]},
                        sonLaboratory: {select:[]},
                        unit: {select:[]},
            dic:{select:[]},
                    },
                    requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','sample'],
                    requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','sample']
                    requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','sample'],
                    requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','sample']
                },
                testObjectData: {
                    entity: {
@@ -238,7 +230,6 @@
            this.selectEnumByCategoryForInspectionValueType()
            this.obtainItemParameterList()
            this.selectStandardMethods()
            this.selectEnumByCategoryForDevice()
            this.selectTestObjectByName()
            this.getStandardTemplate()
            this.selectEnumByCategoryForSLaboratory()
@@ -310,14 +301,6 @@
                }).then(res => {
                    this.itemParameterData.selectField.inspectionValueType.select = res.data
                    this.itemParameterData.tagField.inspectionValueType.select = res.data
                })
            },
            selectEnumByCategoryForDevice() {
                this.$axios.post(this.$api.enums.selectEnumByCategory, {
                    category: "设备分类"
                }).then(res => {
                    this.itemParameterData.selectField.deviceGroup.select = res.data
                    this.itemParameterData.tagField.deviceGroup.select = res.data
                })
            },
            selectEnumByCategoryForSLaboratory() {