提交

licp

2024-07-03 f560bbdfffb05d1670ca821148ee052010e7a046

提交

 src/assets/api/controller.js

@@ -189,6 +189,7 @@
  checkSubmitPlan: "/insOrderPlan/checkSubmitPlan", // 校验检验任务提交
  getReportModel: "/insOrderPlan/getReportModel", // 切换光纤-光纤带记录模版查询检验内容
  write: "/insOrderPlan/write", // 填写温度与湿度
  temCycle: "/insOrderPlan/temCycle", // 温度循环查看列表数据(包括通过样品id,循环次数,温度,循环次数进行筛选)
}

const systemLog = {

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

@@ -257,7 +257,7 @@
      </el-form>
    </div>
    <div class="center">
      <div class="search" style="text-align: left;display: flex;align-items: center;justify-content: space-between;">
      <div class="search" style="text-align: left;display: flex;align-items: center;justify-content: space-between;overflow-x: auto;">
        <div style="display: flex;align-items: center;">
          <span v-if="tableList.length>0">检验模板：</span>
          <el-radio-group v-model="currentTable" size="small">
@@ -265,7 +265,7 @@
              size="small">{{ item.templateName }}</el-radio-button>
          </el-radio-group>
        </div>
        <div>
        <div style="display: flex;align-items: center;">
          <span v-if="fibers.length>0">&nbsp;&nbsp;光纤带：</span>
          <el-radio-group v-model="currentTab" size="small" v-if="fibers.length>0" @input="m=>handleChange(m,1)">
            <el-radio-button :label="item.id" v-for="(item,index) in fibers" :key="index"
@@ -276,13 +276,13 @@
            <el-radio-button :label="item.id" v-for="(item,index) in fiber" :key="index"
              size="small">{{ item.color }}</el-radio-button>
          </el-radio-group>
          <el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px">
          <el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;">
            <el-form-item label="温度:" style="margin-bottom: 0;">
              <el-input clearable v-model="otherForm.temperature" size="small" placeholder="" style="width: 70px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
              <el-input clearable v-model="otherForm.temperature" size="small" placeholder="" style="width: 50px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
              <span style="margin-left: 4px;">℃</span>
            </el-form-item>
            <el-form-item label="湿度:" style="margin-bottom: 0;">
              <el-input clearable v-model="otherForm.humidity" size="small" placeholder="" style="width: 70px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
              <el-input clearable v-model="otherForm.humidity" size="small" placeholder="" style="width: 50px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
              <span style="margin-left: 4px;">%</span>
            </el-form-item>
          </el-form>
@@ -395,20 +395,20 @@
        </table>
      </div>
      <div class="center-box" v-loading="tableLoading" v-else>
        <!-- <el-divider></el-divider> -->
        <el-divider></el-divider>
        <h4 style="margin-bottom: 20px;">温度循环检验原始记录</h4>
        <el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px">
        <el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
        <el-form-item label="型号:" style="margin-bottom: 0;">
          <el-input clearable v-model="wareForm.entrustCode" disabled size="small" placeholder=""></el-input>
          <el-input clearable v-model="wareForm0.model" disabled size="small" placeholder=""></el-input>
        </el-form-item>
        <el-form-item label="试验方法:" style="margin-bottom: 0;">
          <el-input clearable v-model="wareForm.sampleCode" disabled size="small" placeholder=""></el-input>
          <el-input clearable v-model="wareForm0.methodName" disabled size="small" placeholder=""></el-input>
        </el-form-item>
        <el-form-item label="检测依据:" style="margin-bottom: 0;">
          <el-input clearable v-model="wareForm.sample" disabled size="small" placeholder=""></el-input>
        </el-form-item>
        <!-- <el-form-item label="检测依据:" style="margin-bottom: 0;">
          <el-input clearable v-model="wareForm0.sample" disabled size="small" placeholder=""></el-input>
        </el-form-item> -->
        <el-form-item label="循环次数:" style="margin-bottom: 0;">
          <el-select v-model="wareForm.value" placeholder="请选择" size="small">
          <el-select v-model="wareForm.inspectionItem" placeholder="请选择" size="small" @change="m=>wareFormChange(m,'inspectionItem')">
            <el-option
              v-for="item in numOptions"
              :key="item.value"
@@ -418,7 +418,7 @@
          </el-select>
        </el-form-item>
        <el-form-item label="温度:" style="margin-bottom: 0;">
          <el-select v-model="wareForm.value" placeholder="请选择" size="small">
          <el-select v-model="wareForm.inspectionItemSubclass" placeholder="请选择" size="small" @change="m=>wareFormChange(m,'inspectionItemSubclass')">
            <el-option
              v-for="item in temperatureOptions"
              :key="item.value"
@@ -430,9 +430,9 @@
        </el-form-item>
        </el-form>
        <el-divider></el-divider>
        <el-form :inline="true" :model="wareForm" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
        <el-form :inline="true" :model="wareForm0" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
          <el-form-item label="仪器名称:">
            <el-select v-model="wareForm.value" placeholder="请选择" size="small">
            <el-select v-model="wareForm0.value" placeholder="请选择" size="small">
              <el-option
                v-for="item in temperatureOptions"
                :key="item.value"
@@ -442,7 +442,7 @@
            </el-select>
          </el-form-item>
          <el-form-item label="仪器编号:">
            <el-select v-model="wareForm.value" placeholder="请选择" size="small">
            <el-select v-model="wareForm0.value" placeholder="请选择" size="small">
              <el-option
                v-for="item in temperatureOptions"
                :key="item.value"
@@ -452,7 +452,7 @@
            </el-select>
          </el-form-item>
          <el-form-item label="仪器名称:" style="margin-left: 80px;">
            <el-select v-model="wareForm.value" placeholder="请选择" size="small">
            <el-select v-model="wareForm0.value" placeholder="请选择" size="small">
              <el-option
                v-for="item in temperatureOptions"
                :key="item.value"
@@ -462,7 +462,7 @@
            </el-select>
          </el-form-item>
          <el-form-item label="仪器编号:">
            <el-select v-model="wareForm.value" placeholder="请选择" size="small">
            <el-select v-model="wareForm0.value" placeholder="请选择" size="small">
              <el-option
                v-for="item in temperatureOptions"
                :key="item.value"
@@ -480,53 +480,73 @@
            label="序号"
            type="index"
            width="65"
            align="center"
            >
          </el-table-column>
          <el-table-column
            prop="date"
            prop="bushColor"
            label="管色标"
            width="150">
            width="120"
            align="center">
          </el-table-column>
          <el-table-column
            prop="name"
            prop="code"
            label="光纤带编号"
            width="180">
            width="150"
            align="center">
          </el-table-column>
          <el-table-column
            prop="province"
            prop="color"
            label="光纤色标"
            width="150">
            align="center"
            width="120">
          </el-table-column>
          <el-table-column
            prop="city"
            prop="inspectionItemClass"
            label="光纤项目"
            align="center"
            width="130">
          </el-table-column>
          <el-table-column
            prop="value0"
            label="外端"
            width="150">
            align="center"
            width="130">
            <template slot-scope="scope">
              <el-input size="small" v-model="scope.row.input" placeholder="请输入内容"></el-input>
              <el-input size="small" v-model="scope.row.value0" placeholder="" @change="m=>changeItem(m,0)"></el-input>
            </template>
          </el-table-column>
          <el-table-column
            prop="address"
            prop="value1"
            label="内端"
            width="150">
            align="center"
            width="130">
            <template slot-scope="scope">
              <el-input size="small" v-model="scope.row.input" placeholder="请输入内容"></el-input>
              <el-input size="small" v-model="scope.row.value1" placeholder="" @change="m=>changeItem(m,1)"></el-input>
            </template>
          </el-table-column>
          <el-table-column
            prop="zip"
            align="center"
            label="平均值"
            min-width="150">
          </el-table-column>
          <el-table-column
            prop="zip"
            prop="lastValue"
            label="衰减差"
            align="center"
            min-width="150">
          </el-table-column>
          <el-table-column
            prop="zip"
            label="检测人"
            prop="insResult"
            label="结论"
            align="center"
            min-width="150">
            <template slot-scope="scope">
              <span v-if="scope.row.insResult===1" style="color: green;">合格</span>
              <span v-if="scope.row.insResult===0" style="color: red;">不合格</span>
              <span v-else>待定</span>
            </template>
          </el-table-column>
        </el-table>
      </div>
@@ -780,7 +800,11 @@
        fiber:[],
        fibers:[],
        currentTab:null,
        wareForm:{},
        wareForm:{
          inspectionItem:1,
          inspectionItemSubclass:20,
        },
        wareForm0:{},
        numOptions:[],
        temperatureOptions:[],
        wareTableData:[
@@ -789,7 +813,7 @@
        otherForm:{
          humidity:null,
          temperature:null,
        }
        },
      }
    },
    computed: {
@@ -890,6 +914,27 @@
      },
    },
    methods: {
      changeItem(m,index){},
      wareFormChange(m,type){
        if(m&&type){
          this.wareForm[type] = Number(m)
        }
        let wareForm = {...this.wareForm}
        wareForm.inspectionItemSubclass = wareForm.inspectionItemSubclass+'℃'
        this.$axios.post(this.$api.insOrderPlan.temCycle,{
          sampleId:this.currentSample.id,
          ...wareForm
        }).then(res => {
          if (res.code == 201) return
          let {productVos,sampleVo} = res.data
          this.wareForm0 = sampleVo
          productVos = productVos.map(m=>{
            let obj = {...m,...m.insProduct}
            return obj
          })
          this.wareTableData = productVos
        })
      },
      subOtherForm(m,type){
        let ids = []
        for (let i in this.param) {
@@ -1164,6 +1209,33 @@
      handleTableData() {
        this.excelMethodList = []
        this.widthList = this.tableList[0].style.columnlen;
        // 温度循环检验原始记录--开始
        if(this.tableLists.find(m=>m.templateId==this.currentTable)||this.tableLists.find(m=>m.templateId==this.currentTable).templateName!='温度循环检验原始记录'){
          let ask = this.currentSample.insProduct[0].ask
          let askList = ask.split(';')
          this.numOptions = []
          for (let i = 1; i <= askList[askList.length-1]; i++) {
            this.numOptions.push({
              value:i,
              label:i
            })
          }
          let mySet1 = new Set();
          askList.forEach((m,i) => {
            if(i<askList.length-1){
              mySet1.add(m.split(',')[0].replace('℃',''))
            }
          })
          this.temperatureOptions = []
          mySet1.forEach(m => {
            this.temperatureOptions.push({
              value:m,
              label:m
            })
          })
          this.wareFormChange()
        }
        // 温度循环检验原始记录---结束
        this.tableList.forEach(a => {
          let mcList = []
          a.template.forEach(b => {

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

@@ -369,16 +369,16 @@
        </el-row>
      </span>
    </el-dialog>
    <div class="el-dialog__body" style="width:320px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;position: fixed;top: 0;display: none;">
    <div class="el-dialog__body" style="overflow-y: auto;position: absolute;margin-top: 0;position: fixed;top: 0;z-index: 99999;">
        <div id="printMOrder">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-before:always;page-break-after: always;color: #000;">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-before:always;page-break-after: always;color: #000;box-shadow: none;margin-bottom: 6px;padding-left: 160px;" >
            <div style="display: flex;">
              <div>
                <el-col :span="8" :offset="4">
                  <vueQr :text="JSON.stringify(item.sampleCode)" :size="78" :margin="2"></vueQr>
                </el-col>
              </div>
              <div style="margin-left: 57px;line-height: 9px;">
              <div style="margin-left: 40px;line-height: 9px;">
                <el-row>
                  <el-col  style="font-size: 8px;"><span>样品编号:&nbsp; </span>{{ item.sampleCode }}</el-col>
                </el-row>
@@ -412,7 +412,7 @@
            </div>
          </el-card>
        </div>
      </div>
    </div>
    </div>
</template>

@@ -651,9 +651,9 @@
        insOrderRow:{},
        checkIndexList:[],
        checkDataList:[
          // {
          //   sampleCode:'11111'
          // }
          {
            sampleCode:'11111'
          }
        ],
        qrData:[],
        multipleSelection:[]
@@ -730,11 +730,11 @@
        PrintJS({
            printable: 'printMOrder',//页面
            type: "html",//文档类型
              maxWidth:450,
              maxWidth:360,
              targetStyles:['*'],
              style: `@page {
                margin:0;
                size: 360px 175px portrait;
                size: 360px 175px collapse;
              }
              html{
                zoom:100%;

 src/main.js

@@ -17,7 +17,7 @@
//本地
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
const javaApi = 'http://192.168.47.249:8001';
// const javaApi = 'http://192.168.47.249:8001';

//云
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
@@ -25,7 +25,7 @@

//检测中心正式库
// Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
// const javaApi = 'http://10.1.200.86:8001';
const javaApi = 'http://10.1.200.86:8001';

//装备电缆测试库
// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";