modified: .env.development modified: src/views/experiment/planAssignm...

zouyu

2023-09-06 154d53ca0f4c9a3f1a8433ae4d458f65a81341dc

 src/views/experiment/planAssignments/plan.vue

@@ -96,8 +96,8 @@
            </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" v-if="scope.row.testState==1">已报检</el-tag>
                  <el-tag type="danger" v-else-if="scope.row.testState==0">未报检</el-tag>
               </template>
            </el-table-column>
            <el-table-column prop="startTime" label="检验开始" width="100px">
@@ -106,7 +106,7 @@
            </el-table-column>
            <el-table-column label="操作" width="150">
               <template slot-scope="scope">
                  <el-button size="mini" type="primary" v-if="isIfReport(scope.row)"
                  <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>
@@ -121,7 +121,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>
@@ -139,7 +139,7 @@
            <el-button @click="upDia = false">取 消</el-button>
         </span>
      </el-dialog>
      <el-dialog title="检验" :visible.sync="upInsDia" width="500px">
      <el-dialog title="检验" :visible.sync="upInsDia" width="600px">
         <div class="body" style="max-height: 50vh;overflow-y: auto;">
            <el-row style="line-height: 46px;">
               <el-col :span="5" style="font-size: 14px;text-align: right;">申请单编码：</el-col>
@@ -160,7 +160,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>
@@ -182,7 +182,7 @@
                           </el-input>
                        </template>
                     </el-table-column>
                     <el-table-column label="操作" width="60">
                     <el-table-column label="操作" width="80">
                        <template slot-scope="scope">
                           <el-button size="mini" type="text"
                              @click.native.prevent="deleteRow(scope.$index, upData.testValue)">删除</el-button>
@@ -264,18 +264,25 @@
            row.children.forEach(a => {
               if (a.testState != null && a.testState != undefined) count++
            })
            return row.testState == undefined && row.orderNum == '01' && count == row
            return row.testState == undefined && count == row
               .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
@@ -292,6 +299,9 @@
               this.upDia = false
               this.selectDataList()
            })
         },
         selectChecker(){
            // console.log(this.upData.checker);
         },
         openUpInsDia(row) {
            this.upInsDia = true
@@ -355,7 +365,7 @@
               this.upInsDia = false
               this.selectDataList()
               this.$confirm(
                  `<p style="line-height: 80px">您的项目(${this.upData.name})检验结果为：<span class="${res.data==1?'ins_state_success':'ins_state_error'}">${res.data==1?'合格':'不合格'}</span></p>`,
                  `<p style="line-height: 80px">您的项目（${this.upData.name}）检验结果为：<span class="${res.data==1?'ins_state_success':'ins_state_error'}">${res.data==1?'合格':'不合格'}</span></p>`,
                  '提交成功', {
                     confirmButtonText: '确定',
                     cancelButtonText: '关闭',