Fixiaobai
2023-09-06 ce3be66189098e60bac79251d44ae390fa0450d7
src/views/experiment/planAssignments/plan.vue
@@ -96,8 +96,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 +111,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 +123,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 +162,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 +270,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 +301,9 @@
               this.selectDataList()
            })
         },
         selectChecker(){
            // console.log(this.upData.checker);
         },
         openUpInsDia(row) {
            this.upInsDia = true
            this.upData = this.HaveJson(row)