|
|
@@ -24,7 +24,7 @@
|
|
|
<el-form-item label="检查类型:">
|
|
|
<p style="width:450px;background:#f5f5f5;border-radius:4px;padding:0 15px;">校院巡查</p>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="检查周期:" prop="dateRange">
|
|
|
+ <el-form-item label="计划周期:" prop="dateRange">
|
|
|
<div class="date-range-box">
|
|
|
<div class="date-range-left-box">
|
|
|
<el-date-picker
|
|
|
@@ -74,7 +74,7 @@
|
|
|
:disabled="lookInfoType"
|
|
|
type="textarea"
|
|
|
:autosize="{ minRows: 4, maxRows: 4}"
|
|
|
- :placeholder="lookInfoType?'未输入':'请输入检查检查要点：'"
|
|
|
+ :placeholder="lookInfoType?'未输入':'请输入检查要求：'"
|
|
|
v-model="dialogForm.checkDemand"
|
|
|
maxlength="100"
|
|
|
resize="none"
|
|
|
@@ -82,7 +82,7 @@
|
|
|
style="width:450px;">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="检查材料:">
|
|
|
+ <el-form-item label="材料附件:">
|
|
|
<div class="dialog-material-max-box">
|
|
|
<div class="dialog-material-button-box" v-if="!lookInfoType&&dialogForm.uploadDtoList.length<10">
|
|
|
<el-upload
|
|
|
@@ -155,7 +155,7 @@
|
|
|
<p v-if="lookInfoType">{{deptNumLeft}}</p>
|
|
|
</div>
|
|
|
<div class="dept-table-max-box">
|
|
|
- <el-form v-if="!lookInfoType" :model="deptQueryParamsLeft" class="form-box" ref="queryForm" :inline="true" label-width="50px">
|
|
|
+ <el-form :model="deptQueryParamsLeft" class="form-box" ref="queryForm" :inline="true" label-width="50px">
|
|
|
<el-form-item label="" prop="searchValue" class="form-index">
|
|
|
<el-input
|
|
|
maxLength="30"
|
|
|
@@ -163,16 +163,25 @@
|
|
|
placeholder="搜索学院"
|
|
|
clearable
|
|
|
style="width: 240px">
|
|
|
- <p class="el-icon-search" slot="append" @click="deptGetListLeft"></p>
|
|
|
+ <p v-if="!lookInfoType" class="el-icon-search" slot="append" @click="deptGetListLeft"></p>
|
|
|
+ <p v-if="lookInfoType" class="el-icon-search" slot="append" @click="lookDeptLeftSearch"></p>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item style="margin-right:0;">
|
|
|
- <p class="inquire-button-one" @click="deptResetQueryLeft" style="width:60px;margin-right:0;">重置</p>
|
|
|
+ <p v-if="!lookInfoType" class="inquire-button-one" @click="deptResetQueryLeft" style="width:60px;margin-right:0;">重置</p>
|
|
|
+ <p v-if="lookInfoType" class="inquire-button-one" @click="lookDeptLeftReset" style="width:60px;margin-right:0;">重置</p>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<el-table ref="leftDeptTable" border :data="deptTableListLeft" @select-all="deptChange" @select="deptChange" :row-key="getDeptRowKeys">
|
|
|
<el-table-column v-if="!lookInfoType" type="selection" width="50" :reserve-selection="true" align="center"/>
|
|
|
- <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip/>
|
|
|
+ <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div style="display: flex;">
|
|
|
+ <p style="flex:1;">{{scope.row.deptName}}</p>
|
|
|
+ <p style="width:80px;text-align: center">共{{scope.row.subNum}}间</p>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -182,7 +191,7 @@
|
|
|
<p></p>
|
|
|
</div>
|
|
|
<div class="dept-table-max-box">
|
|
|
- <el-form v-if="!lookInfoType" :model="deptQueryParamsRight" class="form-box" ref="queryForm" :inline="true" label-width="50px">
|
|
|
+ <el-form :model="deptQueryParamsRight" class="form-box" ref="queryForm" :inline="true" label-width="50px">
|
|
|
<el-form-item label="" prop="typeId">
|
|
|
<el-select v-model="deptQueryParamsRight.typeId" clearable placeholder="选择分类" style="width: 120px">
|
|
|
<el-option
|
|
|
@@ -220,11 +229,13 @@
|
|
|
placeholder="实验室/房间号"
|
|
|
clearable
|
|
|
style="width: 190px">
|
|
|
- <p class="el-icon-search" slot="append" @click="deptHandleQueryRight"></p>
|
|
|
+ <p v-if="!lookInfoType" class="el-icon-search" slot="append" @click="deptHandleQueryRight"></p>
|
|
|
+ <p v-if="lookInfoType" class="el-icon-search" slot="append" @click="lookDeptRightSearch"></p>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item style="margin-right:0;">
|
|
|
- <p class="inquire-button-one" @click="deptResetQueryRight" style="width:60px;margin-right:0;">重置</p>
|
|
|
+ <p v-if="!lookInfoType" class="inquire-button-one" @click="deptResetQueryRight" style="width:60px;margin-right:0;">重置</p>
|
|
|
+ <p v-if="lookInfoType" class="inquire-button-one" @click="lookDeptRightReset" style="width:60px;margin-right:0;">重置</p>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<el-table border :data="deptTableListRight">
|
|
|
@@ -333,9 +344,9 @@
|
|
|
<p v-if="lookInfoType">{{subTotalRight}}</p>
|
|
|
</div>
|
|
|
<div class="dept-table-max-box">
|
|
|
- <el-form v-if="!lookInfoType" :model="subQueryParamsRight" class="form-box" ref="queryForm" :inline="true" label-width="50px">
|
|
|
+ <el-form :model="subQueryParamsRight" class="form-box" ref="queryForm" :inline="true" label-width="50px">
|
|
|
<el-form-item label="" prop="typeId">
|
|
|
- <el-select v-model="subQueryParamsRight.typeId" clearable placeholder="选择分类" style="width: 110px">
|
|
|
+ <el-select v-model="subQueryParamsRight.typeId" clearable placeholder="选择分类" :style="!lookInfoType?'width:110px':'width:140px'">
|
|
|
<el-option
|
|
|
v-for="item in classTypeList"
|
|
|
:key="item.id"
|
|
|
@@ -345,7 +356,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="" prop="level">
|
|
|
- <el-select v-model="subQueryParamsRight.level" clearable placeholder="选择分级" style="width: 110px">
|
|
|
+ <el-select v-model="subQueryParamsRight.level" clearable placeholder="选择分级" :style="!lookInfoType?'width:110px':'width:140px'">
|
|
|
<el-option
|
|
|
v-for="item in classifiedList"
|
|
|
:key="item.id"
|
|
|
@@ -355,7 +366,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="" prop="deptId">
|
|
|
- <el-select v-model="subQueryParamsRight.deptId" clearable placeholder="学院" style="width: 80px">
|
|
|
+ <el-select v-model="subQueryParamsRight.deptId" clearable placeholder="学院" :style="!lookInfoType?'width:80px':'width:180px'">
|
|
|
<el-option
|
|
|
v-for="item in deptSelectList"
|
|
|
:key="item.deptId"
|
|
|
@@ -370,7 +381,7 @@
|
|
|
v-model="subQueryParamsRight.searchValue"
|
|
|
placeholder="实验室/房间号"
|
|
|
clearable
|
|
|
- style="width: 140px">
|
|
|
+ :style="!lookInfoType?'width:140px':'width:180px'">
|
|
|
<p class="el-icon-search" slot="append" @click="subHandleQueryRight"></p>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
@@ -597,7 +608,7 @@
|
|
|
{ required: true, message: "请输入计划标题", validator: this.spaceJudgment, trigger: "change" },
|
|
|
],
|
|
|
dateRange: [
|
|
|
- { required: true, message: "请选择检查周期", trigger: "change" },
|
|
|
+ { required: true, message: "请选择计划周期", trigger: "change" },
|
|
|
],
|
|
|
checkRange: [
|
|
|
{ required: true, message: "请选择检查范围", trigger: "change" },
|
|
|
@@ -960,6 +971,7 @@
|
|
|
}
|
|
|
self.$set(self,'deptTableListLeft',response.data);
|
|
|
self.$set(self,'deptTotalLeft',response.data.length);
|
|
|
+ self.$set(self,'changeDeptSelectList',response.data);
|
|
|
let obj = JSON.parse(JSON.stringify(this.deptQueryParamsRight));
|
|
|
obj.deptIds = self.dialogForm.collegeIds;
|
|
|
findSubInfoByDeptIds(obj).then(response => {
|
|
|
@@ -1467,6 +1479,118 @@
|
|
|
}).then(() => {
|
|
|
}).catch(() => {});
|
|
|
},
|
|
|
+ //查看时学院左侧搜索
|
|
|
+ lookDeptLeftSearch(){
|
|
|
+ let self = this;
|
|
|
+ conditionCollegeInfo(self.deptQueryParamsLeft).then(response => {
|
|
|
+ let list = [];
|
|
|
+ for(let i=0;i<response.data.length;i++){
|
|
|
+ for(let o=0;o<self.dialogForm.collegeIds.length;o++){
|
|
|
+ if(response.data[i].deptId == self.dialogForm.collegeIds[o] && response.data[i].deptName.indexOf(this.deptQueryParamsLeft.searchValue)!= -1){
|
|
|
+ list.push(response.data[i]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ self.$set(self,'deptTableListLeft',list);
|
|
|
+ self.$set(self,'deptTotalLeft',list.length);
|
|
|
+ self.$set(self,'changeDeptSelectList',list);
|
|
|
+ this.$set(this,'deptQueryParamsRight',{
|
|
|
+ pageNum:1,
|
|
|
+ pageSize:20,
|
|
|
+ searchValue:"",
|
|
|
+ deptId:"",
|
|
|
+ level:"",
|
|
|
+ typeId:"",
|
|
|
+ });
|
|
|
+ let obj = JSON.parse(JSON.stringify(this.deptQueryParamsRight));
|
|
|
+ let ids = [];
|
|
|
+ for(let o=0;o<list.length;o++){
|
|
|
+ ids.push(list[o].deptId)
|
|
|
+ }
|
|
|
+ obj.deptIds = ids;
|
|
|
+ findSubInfoByDeptIds(obj).then(response => {
|
|
|
+ this.deptTotalRight = response.total;
|
|
|
+ this.deptTableListRight = response.rows;
|
|
|
+ this.$set(this.deptCheckData,'subNum',response.total);
|
|
|
+ this.$set(this,'deptNumLeft',self.dialogForm.collegeIds.length);
|
|
|
+ });
|
|
|
+ })
|
|
|
+ },
|
|
|
+ //查看时学院左侧重置
|
|
|
+ lookDeptLeftReset(){
|
|
|
+ let self = this;
|
|
|
+ this.$set(this,'deptQueryParamsLeft',{ searchValue:"", });
|
|
|
+ conditionCollegeInfo(self.deptQueryParamsLeft).then(response => {
|
|
|
+ //查看时
|
|
|
+ for(let i=0;i<response.data.length;i++){
|
|
|
+ let num = 0;
|
|
|
+ for(let o=0;o<self.dialogForm.collegeIds.length;o++){
|
|
|
+ if(response.data[i].deptId == self.dialogForm.collegeIds[o]){
|
|
|
+ num++
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(num == 0){
|
|
|
+ response.data.splice(i,1);
|
|
|
+ i--
|
|
|
+ }
|
|
|
+ }
|
|
|
+ self.$set(self,'deptTableListLeft',response.data);
|
|
|
+ self.$set(self,'deptTotalLeft',response.data.length);
|
|
|
+ self.$set(self,'changeDeptSelectList',response.data);
|
|
|
+ this.$set(this,'deptQueryParamsRight',{
|
|
|
+ pageNum:1,
|
|
|
+ pageSize:20,
|
|
|
+ searchValue:"",
|
|
|
+ deptId:"",
|
|
|
+ level:"",
|
|
|
+ typeId:"",
|
|
|
+ });
|
|
|
+ let obj = JSON.parse(JSON.stringify(this.deptQueryParamsRight));
|
|
|
+ obj.deptIds = self.dialogForm.collegeIds;
|
|
|
+ findSubInfoByDeptIds(obj).then(response => {
|
|
|
+ this.deptTotalRight = response.total;
|
|
|
+ this.deptTableListRight = response.rows;
|
|
|
+ this.$set(this.deptCheckData,'subNum',response.total);
|
|
|
+ this.$set(this,'deptNumLeft',self.dialogForm.collegeIds.length);
|
|
|
+ });
|
|
|
+ })
|
|
|
+ },
|
|
|
+ //查看时学院右侧搜索
|
|
|
+ lookDeptRightSearch(){
|
|
|
+ let self = this;
|
|
|
+ let obj = JSON.parse(JSON.stringify(this.deptQueryParamsRight));
|
|
|
+ let ids = [];
|
|
|
+ for(let o=0;o<self.deptTableListLeft.length;o++){
|
|
|
+ ids.push(self.deptTableListLeft[o].deptId)
|
|
|
+ }
|
|
|
+ obj.deptIds = ids;
|
|
|
+ findSubInfoByDeptIds(obj).then(response => {
|
|
|
+ this.deptTotalRight = response.total;
|
|
|
+ this.deptTableListRight = response.rows;
|
|
|
+ });
|
|
|
+ },
|
|
|
+ //查看时学院右侧重置
|
|
|
+ lookDeptRightReset(){
|
|
|
+ let self = this;
|
|
|
+ this.$set(this,'deptQueryParamsRight',{
|
|
|
+ pageNum:1,
|
|
|
+ pageSize:20,
|
|
|
+ searchValue:"",
|
|
|
+ deptId:"",
|
|
|
+ level:"",
|
|
|
+ typeId:"",
|
|
|
+ });
|
|
|
+ let obj = JSON.parse(JSON.stringify(this.deptQueryParamsRight));
|
|
|
+ let ids = [];
|
|
|
+ for(let o=0;o<self.deptTableListLeft.length;o++){
|
|
|
+ ids.push(self.deptTableListLeft[o].deptId)
|
|
|
+ }
|
|
|
+ obj.deptIds = ids;
|
|
|
+ findSubInfoByDeptIds(obj).then(response => {
|
|
|
+ this.deptTotalRight = response.total;
|
|
|
+ this.deptTableListRight = response.rows;
|
|
|
+ });
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
</script>
|
dedsudiyu