Merge remote-tracking branch 'origin/master'

value

2023-09-05 9b26870265cbbc75bcd32529e46b229a49ec30a0

 src/views/experiment/inspectionApplication/Viewdetails/index.vue

@@ -86,20 +86,20 @@
                  </el-table-column>
                  <el-table-column prop="required" label="内控值">
                  </el-table-column>
                  <el-table-column prop="userName" label="责任人" width="220px">
                  <el-table-column prop="userId" label="责任人" width="220px">
                     <template slot-scope="scope">
                        <el-select v-model="scope.row.username" slot="append"
                        <el-select v-model="scope.row.userId" slot="append"
                           @change="(val)=>chooseUseProId(val, scope.row)">
                           <el-option v-for="(item,indxe) in ZERENren" :key="indxe" :label="item.name"
                              :value="item.id"></el-option>
                        </el-select>
                     </template>
                  </el-table-column>
                  <el-table-column prop="inspectionMaterialId" label="实验设备" width="220px">
                  <el-table-column prop="instrumentId" label="实验设备" width="300px">
                     <template slot-scope="scope">
                        <el-cascader v-model="scope.row.instrumentName" :options="devices"
                        <el-cascader v-model="scope.row.instrumentId" :options="devices"
                           :props="{label: 'Name',value: 'Id',children: 'childrenList'}"
                           @change="(val)=>chooseEquipment(val, scope.row)"></el-cascader>
                           @change="(val)=>chooseEquipment(val, scope.row)" style="width: 100%;"></el-cascader>
                     </template>
                  </el-table-column>
               </el-table>
@@ -174,7 +174,7 @@
               id: row.id,
               userProId: val
            }).then(res => {
               if (res.data) this.$message.success('责任人分配成功')
               this.$message.success('责任人分配成功')
            })
         },
         chooseEquipment(val, row) {
@@ -182,7 +182,7 @@
               id: row.id,
               equipmentId: val[2]
            }).then(res => {
               if (res.data) this.$message.success('设备分配成功')
               this.$message.success('设备分配成功')
            })
         }
      }