|
|
@@ -24,26 +24,42 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="共同申请人：" prop="userId2" class="selsectbox"
|
|
|
+ <el-form-item label="管理员：" prop="safeUserId"
|
|
|
style="display: inline-block">
|
|
|
<el-select
|
|
|
style="width:500px;"
|
|
|
- @change="userChangeOne"
|
|
|
- v-model="form.userId2"
|
|
|
- filterable
|
|
|
- placeholder="搜索选择共同申请人"
|
|
|
+ v-model="form.safeUserId"
|
|
|
+ placeholder="请选择管理员"
|
|
|
remote
|
|
|
- :remote-method="userSelectListOne"
|
|
|
:loading="loading">
|
|
|
<el-option
|
|
|
v-for="item in optionsUserOne"
|
|
|
- :key="item.userId"
|
|
|
- :label="item.nickName"
|
|
|
- :value="item.userId">
|
|
|
- {{item.nickName}}-{{item.userName}}
|
|
|
+ :key="item.safeUserId"
|
|
|
+ :label="item.safeUserName"
|
|
|
+ :value="item.safeUserId">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <!--<el-form-item label="共同申请人：" prop="userId2" class="selsectbox"-->
|
|
|
+ <!--style="display: inline-block">-->
|
|
|
+ <!--<el-select-->
|
|
|
+ <!--style="width:500px;"-->
|
|
|
+ <!--@change="userChangeOne"-->
|
|
|
+ <!--v-model="form.userId2"-->
|
|
|
+ <!--filterable-->
|
|
|
+ <!--placeholder="搜索选择共同申请人"-->
|
|
|
+ <!--remote-->
|
|
|
+ <!--:remote-method="userSelectListOne"-->
|
|
|
+ <!--:loading="loading">-->
|
|
|
+ <!--<el-option-->
|
|
|
+ <!--v-for="item in optionsUserOne"-->
|
|
|
+ <!--:key="item.userId"-->
|
|
|
+ <!--:label="item.nickName"-->
|
|
|
+ <!--:value="item.userId">-->
|
|
|
+ <!--{{item.nickName}}-{{item.userName}}-->
|
|
|
+ <!--</el-option>-->
|
|
|
+ <!--</el-select>-->
|
|
|
+ <!--</el-form-item>-->
|
|
|
<el-form-item label="位置：" prop="laboratoryId">
|
|
|
<p style="line-height:40px;color:#333;">{{text?text:'请选择实验室'}}</p>
|
|
|
</el-form-item>
|
|
|
@@ -62,7 +78,7 @@
|
|
|
|
|
|
<script>
|
|
|
import { subjectList,selectUserListByName } from "@/api/laboratory/approval";
|
|
|
-import { subjectVo,openDoorApply } from "@/api/laboratory/subject";
|
|
|
+import { subjectVo,openDoorApply,subjectRelationList } from "@/api/laboratory/subject";
|
|
|
export default {
|
|
|
name: "addPage",
|
|
|
data(){
|
|
|
@@ -76,6 +92,9 @@ import { subjectVo,openDoorApply } from "@/api/laboratory/subject";
|
|
|
userId2: [
|
|
|
{ required: true, message: "请选择共同申请人", trigger: "blur" },
|
|
|
],
|
|
|
+ safeUserId: [
|
|
|
+ { required: true, message: "请选择管理员", trigger: "blur" },
|
|
|
+ ],
|
|
|
},
|
|
|
optionsUser:[],
|
|
|
optionsUserOne:[],
|
|
|
@@ -135,9 +154,12 @@ import { subjectVo,openDoorApply } from "@/api/laboratory/subject";
|
|
|
this.$set(this.newObj,'college',response.data.deptName);
|
|
|
this.$set(this.newObj,'subjectName',response.data.name);
|
|
|
this.$set(this.newObj,'subjectId',response.data.id);
|
|
|
- this.$set(this.newObj,'safeUserName',response.data.safeUserName);
|
|
|
- this.$set(this.newObj,'safeUserId',response.data.safeUserId);
|
|
|
- this.$set(this.newObj,'safeUserPhone',response.data.safeUserPhone);
|
|
|
+ // this.$set(this.newObj,'safeUserName',response.data.safeUserName);
|
|
|
+ // this.$set(this.newObj,'safeUserId',response.data.safeUserId);
|
|
|
+ // this.$set(this.newObj,'safeUserPhone',response.data.safeUserPhone);
|
|
|
+ subjectRelationList({subjectId:response.data.id}).then(response => {
|
|
|
+ this.$set(this,'optionsUserOne',response.rows);
|
|
|
+ })
|
|
|
});
|
|
|
},
|
|
|
//人员选中
|
|
|
@@ -153,6 +175,13 @@ import { subjectVo,openDoorApply } from "@/api/laboratory/subject";
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|
|
|
}).then(() => {
|
|
|
+ for(let i=0;i<self.optionsUserOne.length;i++){
|
|
|
+ if(self.form.safeUserId == self.optionsUserOne[i].safeUserId){
|
|
|
+ self.newObj.safeUserId = self.optionsUserOne[i].safeUserId;
|
|
|
+ self.newObj.safeUserName = self.optionsUserOne[i].safeUserName;
|
|
|
+ self.newObj.safeUserPhone = self.optionsUserOne[i].safeUserPhone;
|
|
|
+ }
|
|
|
+ }
|
|
|
openDoorApply(self.newObj).then(response => {
|
|
|
self.msgSuccess(response.msg);
|
|
|
self.$parent.goPageButton(3);
|
dedsudiyu