合并冲突

licp

2024-04-25 a24f5347bfd2331f8a4819b215f79555776534cd

合并冲突

 src/assets/api/controller.js

@@ -123,6 +123,7 @@
    selectEquipmentOverview: "/deviceScope/selectEquipmentOverview", //获取设备总览
    uploadFile: "/deviceScope/uploadFile", //上传图片
    selectDevicePrincipal: "/user/getDeviceManager", //获取设备负责人
  selectDeviceByCode: "/deviceScope/selectDeviceByCode", //通过设备编号获取设备列表
}

const insOrder = {
@@ -197,6 +198,7 @@
  upReportUrl: "/insReport/upReportUrl", //报告还原
  writeReport: "/insReport/writeReport", //报告提交
  examineReport: "/insReport/examineReport", //报告审核
  ratifyReport: "/insReport/ratifyReport", //报告批准
}

const warehouse = {

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

@@ -138,6 +138,12 @@
    color: #3A7BFA;
    background-color: #fff;
  }

  .inspection .center-box .el-input__inner{
    font-size: 12px;
    padding: 0 6px;
    text-align: center;
  }
</style>
<template>
  <div v-loading="loading" class="inspection">
@@ -193,9 +199,9 @@
                :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}`">
                  <template v-if="n.v.ps!=undefined && n.v.ps.value==='检验值'">
                  <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 != '')||state>1"
                      :disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
                      @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)">
                      <el-button slot="append" type="primary" icon="el-icon-edit" size="mini" v-if="getInspectionItemType(n.i) == 1" @click="getSystemValue(n)"></el-button>
                    </el-input>
@@ -214,9 +220,9 @@
                    <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==='设备编码'">
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='设备编码' && state==1">
                    <el-select v-model="n.v.v" placeholder="设备" @visible-change="e=>getEquipOptions(e,n.i)"
                      :disabled="state>1">
                       remote @change="(val)=>changeEquip(val, n)">
                      <el-option v-for="item in equipOptions" :key="item.value" :label="item.value" :value="item.value">
                      </el-option>
                    </el-select>
@@ -261,12 +267,12 @@
      <ValueTable class="value-table" ref="insOrderPlan" :url="$api.insOrderPlan.selectInsOrderPlanList"
        :componentData="componentData" :key="upIndex" />
    </el-drawer>
    <el-dialog title="检验复核" :visible.sync="reviewDia" width="400px">
      <div class="body" style="display: flex;" v-if="reviewDia">
        <div class="search_label" style="width: 120px;"><span class="required-span">* </span>不通过原因：</div>
        <div class="search_input">
    <el-dialog title="检验复核" :visible.sync="reviewDia" width="500px">
      <div class="body" style="display: flex;padding: 10px;" v-if="reviewDia">
        <div class="search_label" style="width: 150px;"><span class="required-span">* </span>不通过的理由：</div>
        <div class="search_input" style="width: 100%;">
          <el-input size="small" clearable v-model="noReason" type="textarea"
            :autosize="{ minRows: 3, maxRows: 5}"></el-input>
            :autosize="{ minRows: 4}"></el-input>
        </div>
      </div>
      <span slot="footer" class="dialog-footer">
@@ -375,6 +381,7 @@
              comValue: [],
              resValue: null,
              equipValue: [],
              equipName: [],
              insResult: null
            }
          })
@@ -396,6 +403,7 @@
            comValue: [],
            resValue: null,
            equipValue: [],
            equipName: [],
            insResult: null
          }
        })
@@ -616,6 +624,10 @@
              b.v.v = ''
              this.param[b.i].equipValue.push(b)
            }
            if (b.v.ps != undefined && b.v.ps.value === '设备名称') {
              b.v.v = ''
              this.param[b.i].equipName.push(b)
            }
            if (b.v.ps != undefined && b.v.ps.value === '最终值') {
              b.v.v = ''
              if (b.i === undefined) {
@@ -674,6 +686,12 @@
            let equipValue = JSON.parse(a.insProductResult.equipValue)
            for (var i = 0; i < equipValue.length; i++) {
              this.param[a.id].equipValue[i].v.v = equipValue[i].v
            }
          } catch (e) {}
          try {
            let equipName = JSON.parse(a.insProductResult.equipName)
            for (var i = 0; i < equipName.length; i++) {
              this.param[a.id].equipName[i].v.v = equipName[i].v
            }
          } catch (e) {}
          try {
@@ -893,9 +911,11 @@
      },
      getEquipOptions(e, id) {
        if (e) {
          let category = this.currentSample.insProduct.find(m => m.id == id).deviceGroup
          this.equipOptions = []
          let product = this.currentSample.insProduct.find(m => m.id == id)
          this.$axios.post(this.$api.deviceScope.selectDeviceByCategory, {
            category
            inspectionItem: product.inspectionItem,
            inspectionItemSubclass: product.inspectionItemSubclass
          }).then(res => {
            if (res.code === 200 && res.data) {
              this.equipOptions = res.data.map(m => {
@@ -989,6 +1009,17 @@
          }
          this.$message.success('已保存')
        })
      },
      changeEquip(val,n){
        for(let i in this.equipOptions){
          if(this.equipOptions[i].value === val){
            for(let i1 in this.param[n.i].equipName){
              if(this.param[n.i].equipName[i1].i === n.i && this.param[n.i].equipName[i1].r === n.r){
                this.param[n.i].equipName[i1].v.v = this.equipOptions[i].label
              }
            }
          }
        }
      }
    }
  }

 src/components/view/a5-laboratory-qualifications.vue

@@ -61,7 +61,7 @@
                    </el-radio-group>
                </el-col>
                <el-col :span="12" style="text-align: right;" v-if="radio==0">
                    <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">新增</el-button>
                    <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">资质更新</el-button>
                    <el-button size="medium" icon="el-icon-delete" @click="handleDel" v-if="delPower">删除</el-button>
                </el-col>
            </el-row>
@@ -149,7 +149,7 @@
        </div>
    <el-dialog title="资质更新" :visible.sync="qualificationsConnectVisible" width="400px">
            <div class="search_thing" style="margin-bottom: 16px;">
        <div class="search_label" style="width:120px">资质名称：</div>
        <div class="search_label" style="width:120px"><span class="required-span">* </span>资质名称：</div>
        <div class="search_input">
          <el-select v-model="formData.name" placeholder="请选择" style="width: 100%;" size="small" clearable>
            <el-option
@@ -162,7 +162,7 @@
        </div>
      </div>
      <div class="search_thing" style="margin-bottom: 16px;">
        <div class="search_label" style="width:120px">资质编码：</div>
        <div class="search_label" style="width:120px"><span class="required-span">* </span>资质编码：</div>
        <div class="search_input">
          <el-input
          size="small"
@@ -172,7 +172,7 @@
        </div>
      </div>
      <div class="search_thing" style="margin-bottom: 16px;">
        <div class="search_label" style="width:120px">颁发机构：</div>
        <div class="search_label" style="width:120px"><span class="required-span">* </span>颁发机构：</div>
        <div class="search_input">
          <el-input
          size="small"
@@ -191,7 +191,7 @@
                    v-model="formData.explanation"></el-input>
        </div>
      </div>
      <div class="search_thing" style="margin-bottom: 16px;">
      <!-- <div class="search_thing" style="margin-bottom: 16px;">
        <div class="search_label" style="width:120px">首次颁发时间：</div>
        <div class="search_input">
          <el-date-picker style="width:100%" v-model="formData.firstTime"
@@ -216,9 +216,9 @@
          placeholder="选择日期">
                    </el-date-picker>
        </div>
      </div>
      </div> -->
      <div class="search_thing" style="margin-bottom: 16px;">
        <div class="search_label" style="width:120px">到期颁发时间：</div>
        <div class="search_label" style="width:120px"><span class="required-span">* </span>到期时间：</div>
        <div class="search_input">
          <el-date-picker style="width:100%" v-model="formData.expireTime"
          type="datetime"

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

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

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

@@ -172,7 +172,7 @@
                    </el-row>
                </span>
            </el-dialog>
            <el-dialog title="数据查看" :visible.sync="dataDialogVisible" width="70%">
            <el-dialog title="数据查看" :visible.sync="dataDialogVisible" width="80%">
                <div style="height: 70vh;overflow-y: auto;" v-if="dataDialogVisible">
                    <ValueTable ref="ValueTableDataLook" :url="$api.insOrder.selectSampleAndProductByOrderId"
                        :componentData="componentDataDataLook"/>
@@ -233,7 +233,7 @@
                        type: 'text',
                        method: 'handleDataLook',
                        disabFun: (row, index) => {
                            return row.state != 1
                            return row.state != 1 && row.state != 4
                        }
                    }, {
                        id: 'download',
@@ -241,7 +241,7 @@
                        type: 'text',
                        method: 'download',
                        disabFun: (row, index) => {
                            return row.state != 1 || row.reportId == null
                            return row.state != 4 || row.reportId == null
                        }
                    }, {
                        id: 'verify',
@@ -257,7 +257,7 @@
                        type: 'text',
                        method: 'handlEquash',
                        disabFun: (row, index) => {
                            return row.state == 2 || row.state == 3
                            return row.state != 1 && row.state != 0
                        }
                    }, {
                        font: '分配',
@@ -326,6 +326,22 @@
                        inspectionValueType: {select: []}
                    },
                    selectField: {},
          spanConfig:{
            rows:[
              {
                name:'sampleCode',
                index:0
              },
              {
                name:'sample',
                index:1
              },
              {
                name:'model',
                index:2
              }
            ]
          },
                    requiredAdd: [],
                    requiredUp: []
                },

 src/components/view/b1-report-preparation.vue

@@ -88,9 +88,11 @@
                    :key="upIndex"/>
            </div>
        </div>
    <el-dialog title="在线编制" :visible.sync="claimVisible" width="22cm" :modal-append-to-body="false" :fullscreen="fullscreen">
    <el-dialog title="在线编制" :visible.sync="claimVisible" width="22cm" :modal-append-to-body="false"
      :fullscreen="fullscreen">
      <div class="full-screen">
        <i class="el-icon-full-screen" style="cursor: pointer;font-size: 18px" @click="fullscreen=true;" v-if="!fullscreen"></i>
        <i class="el-icon-full-screen" style="cursor: pointer;font-size: 18px" @click="fullscreen=true;"
          v-if="!fullscreen"></i>
        <img src="../../../static/img/no-full.svg" alt="" v-else style="cursor: pointer;" @click="fullscreen=false;" >
      </div>
      <Word style="height:70vh" :class="{fullscreen:fullscreen}" v-if="claimVisible" ref="Word" :value="value"/>
@@ -99,7 +101,8 @@
                <el-button type="primary" @click="confirmClaim">确 定</el-button>
            </span>
        </el-dialog>
    <el-dialog title="报告审核" :visible.sync="issuedVisible" width="400px" :modal-append-to-body="false" :fullscreen="fullscreen">
    <el-dialog title="报告审核" :visible.sync="issuedVisible" width="400px" :modal-append-to-body="false"
      :fullscreen="fullscreen">
      <!-- <div class="full-screen">
        <i class="el-icon-full-screen" style="cursor: pointer;font-size: 18px" @click="fullscreen=true;" v-if="!fullscreen"></i>
        <img src="../../../static/img/no-full.svg" alt="" v-else style="cursor: pointer;" @click="fullscreen=false;" >
@@ -116,8 +119,7 @@
    <el-dialog title="不通过原因" :visible.sync="issuedReasonVisible" width="400px" :modal-append-to-body="false">
      <div class="search_thing">
        <div class="search_label">不通过原因：</div>
        <div class="search_input"><el-input size="small" placeholder="请输入" clearable
            v-model="reason"></el-input></div>
        <div class="search_input"><el-input size="small" placeholder="请输入" clearable v-model="reason"></el-input></div>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="issuedReasonVisible=false" :disabled="loadingIssuedReason">取消</el-button>
@@ -141,8 +143,7 @@
    <el-dialog title="不批准原因" :visible.sync="approveReasonVisible" width="400px" :modal-append-to-body="false">
      <div class="search_thing">
        <div class="search_label">不批准原因：</div>
        <div class="search_input"><el-input size="small" placeholder="请输入" clearable
            v-model="reason"></el-input></div>
        <div class="search_input"><el-input size="small" placeholder="请输入" clearable v-model="reason"></el-input></div>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="approveReasonVisible=false" :disabled="loadingApproveReason">取消</el-button>
@@ -156,7 +157,9 @@
  import ValueTable from '../tool/value-table.vue'
  import Word from '../tool/word.vue'
  import file from '../../util/file';
  import { convertToHtml } from 'mammoth';
  import {
    convertToHtml
  } from 'mammoth';
    export default {
        components: {
            ValueTable,
@@ -233,9 +236,11 @@
            type: 'text',
            method: 'handleApprove',
            disabFun: (row, index) => {
              return row.state == null||row.state == 0||row.isExamine == 0||row.isExamine == null ||row.isRatify==1
                return row.state == null || row.state == 0 || row.isExamine == 0 || row.isExamine == null || row
                  .isRatify == 1
            }
          }],
            }
          ],
          linkEvent: {
            // code: {
            //   method: 'selectAllByOne'
@@ -432,12 +437,12 @@
                                id: this.currentInfo.id,
                isExamine: 1
          }).then(res => {
          this.loadingIssued = false;
            if (res.code === 201) {
              return
            }
            this.$message.success('提交成功')
            this.refreshTable()
            this.loadingIssued = false;
            this.currentInfo = null;
            this.issuedVisible = false;
          }).catch(e => {
@@ -451,6 +456,20 @@
      },
      subApprove(){
        this.loadingApprove = true;
        this.$axios.post(this.$api.insReport.ratifyReport, {
          id: this.currentInfo.id,
          isRatify: 1
        }).then(res => {
          this.loadingApprove = false;
          if (res.code == 201) {
            this.$message.error('批准失败')
            return
          }
          this.$message.success('已批准')
          this.refreshTable()
          this.currentInfo = null;
          this.approveVisible = false;
        })
      },
      handleSubmit(row){
        this.$confirm('是否提交当前报告?', "提交", {
@@ -481,12 +500,12 @@
                isExamine: 0,
                examineTell:this.reason
          }).then(res => {
          this.loadingIssuedReason = false;
            if (res.code === 201) {
              return
            }
            this.$message.success('操作成功')
            this.refreshTable()
            this.loadingIssuedReason = false;
            this.currentInfo = null;
            this.reason = '';
            this.issuedVisible = false;
@@ -501,6 +520,25 @@
          return this.$message.error('请输入原因')
        }
        this.loadingApproveReason = true
        this.$axios.post(this.$api.insReport.examineReport, {
          id: this.currentInfo.id,
          isExamine: 0,
          examineTell: this.reason
        }).then(res => {
          this.loadingApproveReason = false
          if (res.code === 201) {
            return
          }
          this.$message.success('操作成功')
          this.refreshTable()
          this.currentInfo = null;
          this.reason = '';
          this.issuedVisible = false;
          this.issuedReasonVisible = false;
        }).catch(e => {
          this.$message.error('操作失败')
          this.loadingIssuedReason = false;
        })
      }
    }
  }