报名名单
diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue
index a60043b17..3e07aaeb1 100644
--- a/src/views/modules/communityParty/comPromotion/add.vue
+++ b/src/views/modules/communityParty/comPromotion/add.vue
@@ -172,10 +172,13 @@ export default {
}
this.formType=typeid
-
- console.log(this.formData,"5164");
+ console.log(typeid);
+ console.log(this.formType,"5164");
this.endLoading();
- this.setDefaultReleaseTime()
+ if(typeid=="add"){
+ this.setDefaultReleaseTime()
+ }
+
},
async advertisingTag () {
const url = "/actual/base/advertisingTag/page"
@@ -276,6 +279,7 @@ export default {
let url = '/actual/base/communityPublicity/update'
this.formData.sendMsg= this.formData.sendMsg? 1:0
this.formData.top= this.formData.top? 1:0
+ this.formData.status=0
console.log(this.formData,"formData");
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
@@ -296,6 +300,7 @@ export default {
console.log(this.formData,"formData");
this.formData.sendMsg= this.formData.sendMsg? 1:0
this.formData.top= this.formData.top? 1:0
+
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue
index 27e2ed482..5768a7eec 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue
@@ -24,7 +24,7 @@
prop="categoryCode">
-
@@ -363,9 +363,8 @@ export default {
// }
// },
async getDemandOptions() {
- const url = "/governance/icresidemanddict/demandoption"
- let params = {}
- const { data, code, msg } = await requestPost(url, params)
+ const url = "/actual/base/serviceitem/listAllCategory"
+ const { data, code, msg } = await requestPost(url)
if (code === 0) {
this.demandOptions = this.getFlagData(
this.getTreeData(data),
@@ -391,10 +390,10 @@ export default {
if (!Array.isArray(data)) return [];
let arr = data.map((item) => {
let _item = {};
- if (item.children) {
- if (item.children.length === 0)
- _item = { ...item, children: undefined };
- else _item = { ...item, children: this.getTreeData(item.children) };
+ if (item.childCateList) {
+ if (item.childCateList.length === 0)
+ _item = { ...item, childCateList: undefined };
+ else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
} else {
_item = { ...item };
}
@@ -406,8 +405,8 @@ export default {
if (!Array.isArray(data)) return [];
let arr1 = data.filter((item) => item[flag]);
let arr2 = arr1.map((item) => {
- if (item.children)
- return { ...item, children: this.getFlagData(item.children, flag) };
+ if (item.childCateList)
+ return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
else return item;
});
// console.log('arrr-oppp', arr2)
@@ -432,11 +431,11 @@ export default {
this.$message.error("请先选择服务类型!");
return;
}
- const url = "/actual/base/serviceitem/listServerOrg";
+ const url = "/actual/base/serviceitem/listServerOrgNewTask";
let params = {
- serviceTypeId: this.formData.categoryCode,
+ serverOrgCategoryCode: this.formData.categoryCode[1],
serverOrgType: val,
- businessType: "resi_service",
+ serverParentOrgCategoryCode:this.formData.categoryCode[0],
};
let { data, code, msg } = await requestPost(url, params);
if (code == 0) {
diff --git a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
index 1d04b7d2f..22f03e2da 100644
--- a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
+++ b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
@@ -11,6 +11,9 @@