+
+
+
+
+
+
- {{ fmData[item.keyName] || "--" }}
+ {{ fmData[item.keyName] || "" }}
{{ item.attach }}
@@ -409,6 +421,10 @@ export default {
type: Array,
default: () => [],
},
+ editParam: {
+ type: Array,
+ default: () => [],
+ },
editFixedParams: {
type: Object,
default: () => ({}),
@@ -456,8 +472,15 @@ export default {
},
},
- async mounted() {
+ async mounted() {
+ console.log(this)
+ this.iniFmData();
+ },
+
+ created() {
this.initForm();
+
+
},
methods: {
@@ -474,7 +497,9 @@ export default {
},
iniFmData() {
+ console.log(this.editParam)
const { editParams, fmData, editParamsDiv } = this;
+ console.log(fmData)
editParams.forEach((item, index) => {
if (typeof item.value == "function") {
fmData[item.keyName] = item.value();
@@ -535,6 +560,7 @@ export default {
});
this.fmData = { ...fmData };
+ console.log(fmData)
if (editParamsDiv) {
this.editParams1 = editParams.slice(0, editParamsDiv);
this.editParams2 = editParams.slice(editParamsDiv);
@@ -871,7 +897,7 @@ export default {
...editFixedParams,
// serviceType: this.fmData.serviceTypeArr.join(","),
};
-
+ console.log(fmData)
params = this.cookBeforeSubmit(params);
if (this.formType === "add") {
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 5eabd1f41..cad570fca 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -196,13 +196,16 @@
align="center"
width="200">
-
+
查看
+
删除
+ class="div-table-button--delete"> 删除
-
+
+
@@ -254,6 +258,7 @@
:formId="formId"
:formType="formType"
:infoUrl="infoUrl"
+ :editParam="editParam"
:addUrl="addUrl"
:editUrl="editUrl"
:editParams="editParams"
@@ -429,6 +434,7 @@ export default {
formType: "", // 列表list 新增add 修改edit 详情info
ref_search_height: 100,
multipleSelection: [],
+ editParam:[]
};
},
@@ -687,17 +693,28 @@ export default {
},
handleWatch (row) {
+ console.log(this)
const { idName } = this;
+ console.log(idName);
this.formType = "watch";
this.formId = row[idName];
+ console.log(this.formId)
this.formTitle = "查看";
this.formShow = true;
+ console.log(this.editParams)
+ this.editParam=row
+ console.log(this.editParam)
},
handleEdit (row) {
const { idName } = this;
this.formType = "edit";
- this.formId = row[idName];
+
+ if(!row[idName]){
+ this.formId = row[idName];
+ }else{
+ this.formId=row.id;
+ }
this.formTitle = "修改";
this.formShow = true;
},
@@ -734,7 +751,7 @@ export default {
console.log(rowData, rowIndex);
let { delUrl: url } = this;
if (!url) return;
-
+ console.log(url);
const { tableData, idName } = this;
const idValue = tableData[rowIndex][idName];
let param = {
@@ -768,6 +785,7 @@ export default {
});
}
});
+ console.log("----------------computeFmData", fmData);
return fmData;
},
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index b2dbead49..d0b652438 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -249,33 +249,7 @@ export default {
myChart: {},
myBarchart: {},
agencyLevel: '',
- yData: [
- // {
- // value: 720,
- // itemStyle: {
- // color: {
- // type: 'linear',
- // x: 0,
- // y: 0,
- // x2: 0,
- // y2: 1,
- // colorStops: [{
- // offset: 0, color: '#2D7DF2' // 上部颜色
- // }, {
- // offset: 0.45, color: '#7EB1FE' // 中部颜色
- // }, {
- // offset: 0.45, color: '#EFB632' // 中部颜色
- // }, {
- // offset: 1, color: '#FDD77D' // 下部颜色
- // }],
- // global: false // 默认为 false
- // },
- // shadowColor: "#91cc75",
- // borderType: "dashed",
- // // opacity: 0.5
- // }
- // },725,165,765,742,710,720,730,735,762,754
- ],
+ yData: [],
myChartStyle: { float: "left", width: "140%", height: "100%" },
}
},
@@ -726,7 +700,6 @@ export default {
type: 'shadow'
}
},
-
legend: {
x: 'center',
bottom: '8%',
@@ -773,6 +746,7 @@ export default {
name: '分类信息不完整数',
type: 'bar',
stack: '总量',
+ barWidth: '30px',
data: data.categoryStatsDatas.map((item, index) => ({
value: item.nonIntegratedNum,
extraProperty: item.resiCategory
diff --git a/src/views/modules/plugins/rent/upload-image.vue b/src/views/modules/plugins/rent/upload-image.vue
index 5791c78ae..eb14222d1 100644
--- a/src/views/modules/plugins/rent/upload-image.vue
+++ b/src/views/modules/plugins/rent/upload-image.vue
@@ -80,7 +80,10 @@ export default {
this.fileList.splice(key, 1)
}
})
+ this.$emit('file-removed', file);
+ console.log(this.fileList);
},
+
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url
this.dialogVisible = true
diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue
index ab1ddd4c2..85c171b5b 100644
--- a/src/views/modules/resourceManagement/enterprise/addForm.vue
+++ b/src/views/modules/resourceManagement/enterprise/addForm.vue
@@ -557,8 +557,8 @@ export default {
}
});
}else if(this.pageType === 'patrol'){
- if(this.checkboxOptions.length > 0 && this.hiddenDangeArr.length != 0 && this.checkResultFlag != '1' && this.this.patrolForm.checkResultFlag != '1'){
- this.checkboxMessageFlag = true;
+ if(this.checkboxOptions.legth < 1 && this.hiddenDangeArr.length != 0 && this.checkResultFlag != '1' && this.patrolForm.checkResultFlag != '1'){
+ this.checkboxMessagneFlag = true;
}else if(this.patrolForm.checkResultFlag == '0'&& this.inputList[0].hazardDesc === '' && this.checkResultFlag == '1'){
this.inputMessageFlag = true;
}else{
diff --git a/src/views/modules/satisfaction/communitySelfInsp/index.vue b/src/views/modules/satisfaction/communitySelfInsp/index.vue
index 51471b7ec..03af8dda0 100644
--- a/src/views/modules/satisfaction/communitySelfInsp/index.vue
+++ b/src/views/modules/satisfaction/communitySelfInsp/index.vue
@@ -1051,7 +1051,7 @@ export default {
resetSearch() {
this.formData = {};
let date = new Date();
- this.formData.period = unit.formatDate(date,'yyyy-MM')
+ this.formData.period = util.formatDate(date, "yyyy-MM");
this.initData();
},
handleView(row) {
diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
index bd47b311b..06d5258d2 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
@@ -489,6 +489,7 @@ export default {
this.formData.operationType == "5" ||
this.formData.operationType == "6" ||
this.formData.operationType == "0" ||
+ this.formData.operationType == "7" ||
(this.formData.operationType == 2 && this.demand.demandUserName)
) {
if (Array.isArray(this.formData.gridId) && this.formData.gridId.length) {
@@ -503,10 +504,15 @@ export default {
this.formData.agencyId = "";
this.formData.gridId = "";
}
+ if(this.formData.operationType == "7"){
+ this.formData.openFlag = 1
+ this.formData.operationType = ""
+ }else{
+ this.formData.openFlag = 0
+ }
const url = "/governance/icEventOld/add";
- const { formData } = this;
const { data, code, msg } = await requestPost(url, {
- ...formData,
+ ...this.formData,
});
if (code === 0) {
this.$message.success("操作成功！");
@@ -523,12 +529,11 @@ export default {
},
async handelDispose() {
- console.log(this.$refs.ref_processinfo_dispose.okflag);
- this.$refs.ref_processinfo_dispose.getProcessInfo();
+ this.$refs.ref_processinfo_dispose.getProcessInfo();
if (this.$refs.ref_processinfo_dispose.okflag) {
this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType;
if (this.formData.operationType === "0" || this.formData.operationType === '5'
- || this.formData.operationType === '6') {
+ || this.formData.operationType === '6' || this.formData.operationType === '7') {
this.project = {};
this.demand = {};
if (this.$refs.ref_processinfo_dispose.replayInfo.okflag) {
@@ -537,6 +542,14 @@ export default {
}
this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo;
this.replayInfo.icEventId = this.eventId;
+ if(this.formData.operationType === '7'){
+ this.replayInfo.openFlag = 1
+ this.replayInfo.operationType = ''//不可以openFlag为true时去掉校验吗?
+ this.replayInfo.content = '1111'//不可以openFlag为true时去掉校验吗?
+ }else{
+ this.replayInfo.openFlag = 0
+ }
+
//回复属性赋值
let url = "/governance/icEventOld/reply";
await this.submitDispose(url, this.replayInfo);
@@ -574,6 +587,7 @@ export default {
}
},
async submitDispose(url, params) {
+ console.log(params);
const { data, code, msg } = await requestPost(url, {
...params,
});
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
index 3522bc207..634d43b39 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue
@@ -1,7 +1,7 @@
-
+
-
+
+
+
+
+
+
@@ -193,10 +200,16 @@
--
+
+
+ 否
+ 是
+
+
-
+
处理
@@ -207,6 +220,10 @@
" @click="handleWatch(scope.row)" type="text" size="small" class="">去评价
查看
删除
+ {{scope.row.openFlag === 0 ? '开启表决' : '关闭表决'}}
+
+
+
@@ -286,13 +303,33 @@ export default {
agencyId: "",
gridList: [], //所属网格list--场所区域
tableData: [],
-
+ online: 0,
orgOptions: [],
orgOptionProps,
level: '',
optionsG: [],
sarr: [],
+ statusArray: [
+ {
+ value: "processing",
+ label: "处理中",
+ },
+ {
+ value: "closed_case",
+ label: "已完成",
+ },
+ ],
+ Publicvoting:[
+ {
+ value: 0,
+ label: "否",
+ },
+ {
+ value: 1,
+ label: "是",
+ },
+ ],
statusArray: [
{
value: "processing",
@@ -362,6 +399,7 @@ export default {
status: "",
firstIdList: [],
secondIdList: [],
+ openFlag:''
},
cateOptions: [],
optionProps: {
@@ -604,7 +642,25 @@ export default {
this.handleClose();
this.getTableData();
},
+ async handleVote(row){
+ const url = "/governance/icEventOld/updateSpecialColumn";
+ let params = {
+
+ icEventId:row.icEventId,
+ openFlag:row.openFlag==1?0:1,
+ }
+
+ const { data, code, msg } = await requestPost(url, params);
+
+ if (code === 0) {
+ this.$message.success("操作成功！");
+ this.getTableData();
+ } else {
+ this.$message.error("操作失败！");
+ }
+
+ },
async handleDel(rowData) {
let message = "确认删除?";
this.$confirm(message, "提示", {
@@ -631,6 +687,7 @@ export default {
async getTableData() {
const url = "/governance/icEventOld/list";
+ console.log(this.formData,"formData");
if (this.eventTypeCheck) {
this.formData.secondIdList = this.eventTypeCheck
}
diff --git a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
new file mode 100644
index 000000000..22f03e2da
--- /dev/null
+++ b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
@@ -0,0 +1,239 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+
+ 确
+ 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+ {{ scope.row.status === 1 ? '显示' : '关闭' }}
+
+
+
+
+
+
+
+
+ 查看
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ tagName }}
+
+
+
+
+
+
+
+
+
+ 取 消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+
+ 确
+ 定
+
+
+
+
+
+
+
+
+ {{ typeName }}
+
+
+
+
+
+
+
+ 取 消
+
+