diff --git a/src/views/administrative/deptFilter.vue b/src/views/administrative/deptFilter.vue
index 1bfbc47..0ef1a61 100644
--- a/src/views/administrative/deptFilter.vue
+++ b/src/views/administrative/deptFilter.vue
@@ -18,7 +18,7 @@
-->
-
+
@@ -100,7 +100,11 @@
deptName: '',
parentId: '0',
},
- searchKey: "",
+ userSearch: {
+ deptId:"",
+ userName: "",
+ parentId:"",
+ },
dataList: [],
checked: ref([]),
checkboxRefs: ref([]),
@@ -118,6 +122,8 @@
toDrill(deptId, parentId) {
this.nextParentId = parentId;
this.searchParam.parentId = deptId;
+ this.userSearch.deptId = deptId;
+ this.userSearch.parentId = parentId;
this.queryList();
},
next() {
@@ -150,11 +156,11 @@
})
},
queryUserList() {
- if (null == this.searchKey || "" == this.searchKey) {
+ if (null == this.userSearch.userName || "" == this.userSearch.userName) {
showSuccessToast('人员过多, 请输入关键字!');
return;
}
- queryUsersNoPermission({"userName": this.searchKey}, success => {
+ queryUsersNoPermission(this.userSearch, success => {
this.dataList = [];
this.userList = success.data;
}, error => {
@@ -163,6 +169,9 @@
cancel() {
this.searchParam.deptName = '';
this.searchKey = '';
+ this.userSearch.deptId = "";
+ this.userSearch.parentId = "";
+ this.userSearch.userName = "";
this.queryList()
},
selectData() {
diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue
index d1f8a75..f3b74d0 100644
--- a/src/views/enforce/earlyWarning.vue
+++ b/src/views/enforce/earlyWarning.vue
@@ -99,16 +99,6 @@
t.warningLevel==3?"Ⅲ级 (一般)": "Ⅳ (一般)"}}
-
@@ -166,7 +156,7 @@
//是否投诉
isComplaint: null,
//企业统一信用码
- enterpriseNumber: ref(useCommon.enterpriseNumber),
+ enterpriseNumber: "",
//搜索时间
searchDate: ref(),
warnType: 1,
diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue
index 98a89e5..bb4d022 100644
--- a/src/views/enforce/enforcementPlanAdd.vue
+++ b/src/views/enforce/enforcementPlanAdd.vue
@@ -450,12 +450,12 @@
const onMouthConfirm = (value) => {
value.selectedValues.forEach((item, index) => {
// submitData.planYear = item;
- console.log(item)
data.mouthText = item;
- nameObj.mouth = item;
+ nameObj.mouth = item + "月";
});
// submitData.establishmentTime = "2023-04-21"
data.showMouthPicker = false;
+ data.quarterText = "";
}
//取消日期选择
const cancelSelectDate = () => {
@@ -489,12 +489,25 @@
if(selectedOptions[0].value == "quarter"){
data.showQuarter = true;
data.showMouth = false;
+ nameObj.mouth = "";
+ submitData.mouth = null;
}else if (selectedOptions[0].value == "month") {
data.showMouth = true;
data.showQuarter = false;
var date = new Date();
var month = date.getMonth();
data.currentMouth = ref([month + 1])
+ nameObj.quarter = "";
+ submitData.quarter = null;
+ }else if( selectedOptions[0].value == "year"){
+ data.showMouth = false;
+ data.showQuarter = false;
+ data.mouthText = "";
+ data.quarterText = "";
+ nameObj.mouth = "";
+ nameObj.quarter = "";
+ submitData.quarter = null;
+ submitData.mouth = null;
}
console.log(data.showMouth)
console.log(data.showQuarter)
@@ -507,6 +520,8 @@
submitData.quarter = selectedOptions[0].value;
data.quarterText = selectedOptions[0].text;
nameObj.quarter = selectedOptions[0].text;
+ data.mouthText = "";
+ nameObj.mouthText = "";
};
const foucePlan = () =>{
diff --git a/src/views/enterprise/compaint/uniteDept.vue b/src/views/enterprise/compaint/uniteDept.vue
index 071e022..ec76cb5 100644
--- a/src/views/enterprise/compaint/uniteDept.vue
+++ b/src/views/enterprise/compaint/uniteDept.vue
@@ -10,7 +10,7 @@