Merge remote-tracking branch 'origin/master'

value

2023-09-07 523d7a54fb07fdf756fbc4faa5eb7fef7263a556

 src/views/experiment/planAssignments/plan.vue

@@ -44,18 +44,23 @@
<template>
   <div class="plan">
      <div class="title">
         <span>申请单编号：</span>
         <el-input v-model="search.code" size="medium" style="width: 200px;margin-right: 20px;"></el-input>
         <span>检验时间：</span>
         <el-date-picker v-model="search.date" type="daterange" range-separator="至" start-placeholder="开始日期"
            end-placeholder="结束日期" size="medium" value-format="yyyy-MM-dd" style="margin-right: 20px;">
         </el-date-picker>
         <span>检验结果：</span>
         <el-select v-model="search.testValue" size="medium" style="width: 200px;margin-right: 20px;">
            <el-option label="全部" :value="null"></el-option>
            <el-option label="合格" :value="1"></el-option>
            <el-option label="不合格" :value="0"></el-option>
         </el-select>
         <el-form :model="search" :inline="true" label-position="left">
            <el-form-item prop="code" label="申请单编号：" width="200" style="margin: 20px 10px;">
               <el-input v-model="search.code" size="small" ></el-input>
            </el-form-item>
            <el-form-item prop="date" label="检验时间：" width="200" style="margin: 20px 10px;">
               <el-date-picker v-model="search.date" type="daterange" range-separator="至" start-placeholder="开始日期"
                  end-placeholder="结束日期" size="small" value-format="yyyy-MM-dd" style="margin-right: 20px;">
               </el-date-picker>
            </el-form-item>
            <el-form-item prop="testValue" label="检验结果：" width="200" style="margin: 20px 10px;">
               <el-select v-model="search.testValue" size="small">
                  <el-option label="全部" :value="null"></el-option>
                  <el-option label="合格" :value="1"></el-option>
                  <el-option label="不合格" :value="0"></el-option>
               </el-select>
            </el-form-item>
         </el-form>
         <el-button size="small" type="primary" @click="selectDataList">查询</el-button>
         <el-button size="small" @click="cleanBtn">重置</el-button>
      </div>
@@ -96,8 +101,10 @@
            </el-table-column>
            <el-table-column prop="testState" label="检验状态" width="100px">
               <template slot-scope="scope">
                  <el-tag type="success" v-if="scope.row.testState==1">已报检</el-tag>
                  <el-tag type="danger" v-else-if="scope.row.testState==0">未报检</el-tag>
                  <el-tag type="success" effect="dark" v-if="scope.row.children!=undefined&&scope.row.testState!=null">已上报</el-tag>
                  <el-tag type="danger" effect="dark" v-else-if="scope.row.children!=undefined&&scope.row.testState==null">未上报</el-tag>
                  <el-tag type="success" v-else-if="scope.row.children==undefined&&scope.row.testState!=null">已检验</el-tag>
                  <el-tag type="danger" v-else-if="scope.row.children==undefined&&scope.row.testState==null">未检验</el-tag>
               </template>
            </el-table-column>
            <el-table-column prop="startTime" label="检验开始" width="100px">
@@ -109,9 +116,9 @@
                  <el-button size="mini" :disabled="!isIfReport(scope.row)" type="primary" v-if="scope.row.orderNum == '01'"
                     @click="addReported(scope.row.id)">上报</el-button>
                  <el-button size="mini" type="text" @click="openUpDia(scope.row)"
                     v-if="scope.row.orderNum=='02'">分配</el-button>
                     v-if="scope.row.orderNum=='02'&&scope.row.children==undefined&&scope.row.testState==null">分配</el-button>
                  <el-button size="mini" type="text" @click="openUpInsDia(scope.row)"
                     v-if="scope.row.orderNum=='02'">检验</el-button>
                     v-if="scope.row.orderNum=='02'&&scope.row.children==undefined&&scope.row.testState==null">检验</el-button>
               </template>
            </el-table-column>
         </el-table>
@@ -121,7 +128,7 @@
            <el-row style="line-height: 50px;">
               <el-col :span="4" style="font-size: 14px;text-align: right;">人员:</el-col>
               <el-col :span="16" :offset="1">
                  <el-select v-model="upData.checker" size="medium" clearable style="width: 100%;">
                  <el-select @change="selectChecker" v-model="upData.checker" size="medium" clearable style="width: 100%;">
                     <el-option v-for="(a, ai) in users" :key="ai" :label="a.name" :value="a.id"></el-option>
                  </el-select>
               </el-col>
@@ -160,7 +167,7 @@
               <el-col :span="7">{{upData.internal}}</el-col>
            </el-row>
            <el-row style="line-height: 46px;">
               <el-col :span="5" style="font-size: 14px;text-align: right;">检验状态：</el-col>
               <el-col :span="5" style="font-size: 14px;text-align: right;">检验结果：</el-col>
               <el-col :span="7">
                  <el-tag type="success" v-if="upData.testState==1">合格</el-tag>
                  <el-tag type="danger" v-else-if="upData.testState==0">不合格</el-tag>
@@ -268,15 +275,20 @@
               .children.length
         },
         openUpDia(row) {
            console.log(row);
            // console.log(row);
            this.upDia = true
            this.upData = {
               id: row.code,
               checker: null,
               device: null
            }
            this.upData.checker=row.uId
            this.upData.device=row.isuId
         },
         submitUpData() {
            // console.log(this.upData.device);
            // console.log(this.devices);
            // return;
            if (this.upData.checker == null || this.upData.checker == '') {
               this.$message.error('人员未分配')
               return
@@ -294,6 +306,9 @@
               this.selectDataList()
            })
         },
         selectChecker(){
            // console.log(this.upData.checker);
         },
         openUpInsDia(row) {
            this.upInsDia = true
            this.upData = this.HaveJson(row)