Compare commits
No commits in common. "c7b3018eedf0c8bbce5e2d8a33d3c808c6baf26d" and "fc087ecdf177d601f15199b1d46158ead096a4d7" have entirely different histories.
c7b3018eed
...
fc087ecdf1
|
@ -88,9 +88,7 @@
|
||||||
:options="hiddenCreatorDeptList"
|
:options="hiddenCreatorDeptList"
|
||||||
:props="defaultProps1"
|
:props="defaultProps1"
|
||||||
v-model="condform.reorganizeDept"
|
v-model="condform.reorganizeDept"
|
||||||
collapse-tags
|
clearable/>
|
||||||
clearable
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
@ -249,7 +247,7 @@
|
||||||
</span>
|
</span>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<el-dialog :visible.sync="addTempSafeMeasureDialogForm" title="添加临时安全措施" width="600px">
|
<el-dialog :visible.sync="addTempSafeMeasureDialogForm" title="添加临时安全措施" width="600px">
|
||||||
<el-form ref="AddTempSafeMeasureForm" :model="addSafeMeasureForm" label-width="110px" style="width: 500px;">
|
<el-form ref="AddTempSafeMeasureForm" :model="addSafeMeasureForm" :rules="rules" label-width="110px" style="width: 500px;">
|
||||||
<el-form-item :rules="dayNum >= 1 ?addSafeMeasureFormRule.TEMPORARY_SAFE_MEASURE:[{required: false}]" label="临时安全措施" label-width="110px" prop="TEMPORARY_SAFE_MEASURE" >
|
<el-form-item :rules="dayNum >= 1 ?addSafeMeasureFormRule.TEMPORARY_SAFE_MEASURE:[{required: false}]" label="临时安全措施" label-width="110px" prop="TEMPORARY_SAFE_MEASURE" >
|
||||||
<el-input :rows="9" v-model="addSafeMeasureForm.TEMPORARY_SAFE_MEASURE" type="textarea" placeholder="请在此处输入临时安全措施..."/>
|
<el-input :rows="9" v-model="addSafeMeasureForm.TEMPORARY_SAFE_MEASURE" type="textarea" placeholder="请在此处输入临时安全措施..."/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -398,17 +396,6 @@ export default {
|
||||||
this.getHiddenNames()
|
this.getHiddenNames()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
getSafeOptions(options) {
|
|
||||||
console.log('-------------------')
|
|
||||||
console.log(options)
|
|
||||||
console.log('-------------------')
|
|
||||||
return options
|
|
||||||
},
|
|
||||||
handleDeptChange(value) {
|
|
||||||
console.log('Selected department:', value)
|
|
||||||
// 确认选择后的值是否正确更新
|
|
||||||
this.reorganizeDept = value
|
|
||||||
},
|
|
||||||
getEditMyInfo() { // 获取登录人信息
|
getEditMyInfo() { // 获取登录人信息
|
||||||
requestFN(
|
requestFN(
|
||||||
'/user/goEditMyInfo',
|
'/user/goEditMyInfo',
|
||||||
|
@ -432,9 +419,8 @@ export default {
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
const reorganizeDept = this.condform.reorganizeDept
|
const reorganizeDept = this.condform.reorganizeDept
|
||||||
let deptIds = ''
|
let deptIds = ''
|
||||||
console.log(reorganizeDept)
|
|
||||||
if (reorganizeDept != null && reorganizeDept.length > 0) {
|
if (reorganizeDept != null && reorganizeDept.length > 0) {
|
||||||
deptIds = reorganizeDept.join(',')
|
reorganizeDept.forEach(item => { deptIds = deptIds + ',' + item })
|
||||||
}
|
}
|
||||||
requestFN(
|
requestFN(
|
||||||
'/hiddenApi/getList?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
|
'/hiddenApi/getList?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
|
||||||
|
@ -699,10 +685,6 @@ export default {
|
||||||
data += '&ENDTIME=' + _this.condform.creatTime[1]
|
data += '&ENDTIME=' + _this.condform.creatTime[1]
|
||||||
data += '&sessionID=' + ssionID
|
data += '&sessionID=' + ssionID
|
||||||
data += '&tm=' + new Date().getTime()
|
data += '&tm=' + new Date().getTime()
|
||||||
const reorganizeDept = this.condform.reorganizeDept
|
|
||||||
if (reorganizeDept != null && reorganizeDept.length > 0) {
|
|
||||||
data += '&reorganizeDept=' + reorganizeDept.join(',')
|
|
||||||
}
|
|
||||||
window.location.href = config.httpurl + '/hiddenExcel/excel2' + data
|
window.location.href = config.httpurl + '/hiddenExcel/excel2' + data
|
||||||
|
|
||||||
var timingTask = setInterval(function() {
|
var timingTask = setInterval(function() {
|
||||||
|
|
Loading…
Reference in New Issue