Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zouyu

2023-11-09 f0b5226a49dd90ede8e716ae405c9247480f2ff8

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 src/views/equipment/metering/index.vue

@@ -37,7 +37,7 @@
        uploadInfo: {
          // 是否展示上传EXCEL以及对应的url
          isShow: true,
          url: '/mes/equipment/upload'
          url: '/mes/equipmentDevice/upload'
        },
        prelang: 'workstation',
        options: {
@@ -94,41 +94,23 @@
            //   isSearch: true,
            //   searchInfoType: 'text'
            // },
            {
              minWidth: '30',
              prop: 'type',
              label: '设备类型',
            //   sort: true,
              isTrue: true,
              isSearch: true,
            //   searchInfoType: 'select',
              formatter: this.workShopFormatter,
            //   optList: () => {
            //     return this.workshopList
            //   }
            },
            // {
            //   minWidth: '30',
            //   prop: 'type',
            //   label: '设备类型',
            // //   sort: true,
            //   isTrue: true,
            //   isSearch: true,
            // //   searchInfoType: 'select',
            //   formatter: this.workShopFormatter,
            // //   optList: () => {
            // //     return this.workshopList
            // //   }
            // },
            // 型号规格
            {
              minWidth: '30',
              prop: 'supplier',
              label: '厂家',
              sort: true,
              isTrue: true,
              isSearch: false,
              searchInfoType: 'text'
            },
                         // 状态
                         {
              minWidth: '30',
              prop: 'status',
              label: '状态',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            // 制造日期
            {

 // 制造日期
 {
              minWidth: '150',
              width: '250',
              prop: 'createTime',
@@ -151,6 +133,99 @@
              isSearch: true,
              searchInfoType: 'datetime'
            },
            {
              minWidth: '30',
              prop: 'createUser',
              label: '负责人',
              sort: true,
              isTrue: true,
              isSearch: false,
              searchInfoType: 'text'
            },

            {
              minWidth: '30',
              prop: 'supplier',
              label: '厂家',
              sort: true,
              isTrue: true,
              isSearch: false,
              searchInfoType: 'text'
            },
                         // 状态
                         {
              minWidth: '30',
              prop: 'status',
              label: '状态',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
               // 状态
               {
              minWidth: '30',
              prop: 'responsibleDepartment',
              label: '负责部门',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '30',
              prop: 'InspectionUnit',
              label: '检验单位',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '30',
              prop: 'certificate',
              label: '证书编号',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '30',
              prop: 'verification',
              label: '检定',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '30',
              prop: 'classification',
              label: '分类',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '30',
              prop: 'FixedPointPosition',
              label: '定点位置',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '30',
              prop: 'specifications',
              label: '规格',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
          ],
          toolbar: [
            {

 src/views/quality/processInspect/processInspect-form.vue

@@ -143,7 +143,7 @@
                                    </div>
                                </template>
                            </el-table-column>
                            <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
                            <el-table-column 
                                label="检验描述" width="240" style="text-align: center;">
                                <template slot-scope="scope">
                                    <el-col v-if="scope.row.itype === '1'">
@@ -151,26 +151,26 @@
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <el-input :disabled="scope.row.eId == null"
                                                v-model="scope.row.inote"
                                                @blur="changeState(scope.row, index)" placeholder="请输入检验描述"></el-input>
                                                @blur="changeState(scope.row, inote)" placeholder="请输入检验描述"></el-input>
                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.inote"></span>
                                        </el-tooltip>
                                    </el-col>
                                    <el-col v-else>
                                <el-col v-else>
                                        <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <!-- <el-input :disabled="scope.row.eId == null"
                                                v-model="scope.row.empiricalValueAddss[index]"
                                                @blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input> -->
                                            <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="请选择">
                                            <el-input :disabled="scope.row.eId == null"
                                                v-model="scope.row.inote"
                                                @blur="changeState(scope.row, inote)" placeholder="请输入检测值"></el-input>
                                            <!-- <el-select style="width: 100%;" @change="changeState(scope.row, inote)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="请选择">
                                                <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
                                                    :value="item.value">
                                                </el-option>
                                            </el-select>
                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                            </el-select>  -->
                                         <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.inote"></span>
                                        </el-tooltip>
                                    </el-col>
                                    </el-col> 
                                </template>
                            </el-table-column>
                            <el-table-column label="结论" fixed="right" min-width="100">