{{scope.row.content}}
+
@@ -59,7 +76,8 @@
append-to-body
@closed="handleCancle">
-
+
+
+
取 消
- {{formType==='add'?'取 消':'关 闭'}}
+ 确 定
@@ -118,7 +155,7 @@ export default {
data () {
return {
tableLoading: false,
-
+ formType: 'add',
tableData: [],
total: 0,
pageSize: 20,
@@ -189,11 +226,33 @@ export default {
},
handleAdd () {
+ this.formData.id = ''
+ this.formType = 'add'
+ this.dialogVisible = true
+ },
+
+ handleWatch (row) {
+ this.formType = 'detail'
+ this.formData = JSON.parse(JSON.stringify(row))
this.dialogVisible = true
},
async handleComfirm () {
+
+ this.$refs['ref_form'].validate((valid, messageObj) => {
+ if (!valid) {
+ app.util.validateRule(messageObj)
+
+ } else {
+ this.handleAddVisit()
+ }
+
+ })
+
+ },
+ async handleAddVisit () {
+
this.formData.visitTime = this.formData.visitTime + ':00'
let url = "/epmetuser/followup/save"
// let url = "http://yapi.elinkservice.cn/mock/245/epmetuser/followup/save"
@@ -206,15 +265,40 @@ export default {
} else {
this.$message.error(msg)
}
-
},
handleCancle () {
- this.$refs.ref_form.resetFields()
+ this.formData.visitTime = ''
+ this.formData.content = ''
this.dialogVisible = false
},
+ async handleDel (rowData) {
+ let message = "确认删除?";
+
+ this.$confirm(message, "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(() => {
+ this.delEvent(rowData.id);
+ }).catch((err) => { });
+ },
+ async delEvent (id) {
+ const url = "/epmetuser/followup/delete";
+ let idsArr = [id];
+
+ const { data, code, msg } = await requestPost(url, idsArr);
+
+ if (code === 0) {
+ this.$message.success("删除成功！");
+ this.loadTable();
+ } else {
+ this.$message.error("操作失败！");
+ }
+ },
+
//导出表格
async handleExport () {
let today = new Date()
@@ -324,5 +408,7 @@ export default {
\ No newline at end of file
diff --git a/src/views/modules/communityParty/regionalParty/activitysDetail.vue b/src/views/modules/communityParty/regionalParty/activitysDetail.vue
index bb36e0caa..46ba1d783 100644
--- a/src/views/modules/communityParty/regionalParty/activitysDetail.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysDetail.vue
@@ -1,11 +1,8 @@
+
+
+
+
+
+ 随访时间：
+ {{ formData.visitTime||'--' }}
+
+
+ 随访内容：
+ {{ formData.content||'--' }}
+
+
+
-
- ![]()
+
-
-
-
diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index 4777fb487..1c1dfc789 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -349,7 +349,7 @@ export default {
let style_img = "style='width:50px;height:40px;' "
if (this.formData.content) {
- this.formData.content = this.formData.content.replace(/
-
-
所属网格：
{{ formData.gridName }}
@@ -24,8 +21,7 @@
活动内容：
-
+
服务人数：
@@ -42,90 +38,70 @@
活动地图：
-
-
活动成果：
-
-
+
- 关 闭
-
+ 关 闭
-
-
+
-
+
-
+
-
+ v-model="fmData[item.keyName]"
+ class="item-input"
+ size="small"
+ clearable
+ show-word-limit
+ :maxlength="item.maxlength || ''"
+ :placeholder="item.placeholder || '请输入'"
+ >
-
+
+ v-model="fmData[item.keyName]"
+ type="textarea"
+ class="item-input"
+ size="small"
+ clearable
+ show-word-limit
+ :rows="3"
+ :maxlength="item.maxlength || ''"
+ :placeholder="item.placeholder || '请输入'"
+ >
-
{{ fmData[item.keyName] || "--" }}
- {{item.attach}}
+ {{ item.attach }}
-
+
+ v-model="fmData[item.keyName]"
+ :picker-options="item.pickerOptions"
+ class="item-input"
+ size="small"
+ clearable
+ show-word-limit
+ :value-format="item.format || 'yyyy-MM-dd'"
+ :placeholder="item.placeholder || '请输入'"
+ >
-
-
+
@@ -187,6 +187,15 @@
+
+
+
+
+
+
+
+
@@ -236,12 +245,12 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue b/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue index 5f33fa448..8842fb7f4 100644 --- a/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue +++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue @@ -19,44 +19,104 @@
{{ fmData[item.keyName] || "--" }}
-
+
+ v-model="fmData[item.keyName]"
+ class="item-number"
+ size="small"
+ clearable
+ :precision="item.precision || 0"
+ :step="item.step || 1"
+ :min="item.min || 0"
+ :max="item.max || 999999999999"
+ :placeholder="item.placeholder || '请输入'"
+ >
-
+
{{ fmData[item.keyName] || "--" }}
（{{ item.unitName }}）
-
+
-
-
+
+
-
+
-
-
{{ fmData[item.keyName] || "--" }}
-
-
-
+
-
+
-
+ ref="upload"
+ class="avatar-uploader"
+ :class="{ 'z-full': fmData[item.keyName].length >= item.limit }"
+ :action="item.uploadUrl || uploadUrl"
+ :data="{ customerId: customerId }"
+ :show-file-list="true"
+ :list-type="item.listType || 'picture'"
+ :limit="item.limit || 100"
+ :file-list="fmData[item.keyName]"
+ :on-success="(res, file) => handleImgSuccess(res, file, item)"
+ :on-error="(res, file) => handleImgError(res, file, item)"
+ :on-remove="(res) => handleImgRemove(res, item)"
+ :on-exceed="(res) => handleImgExceed(res, item)"
+ :before-upload="(file) => beforeImgUpload(file, item)"
+ >
点击上传
-
@@ -275,44 +309,52 @@
经度
-
+
纬度
-
+
- {{
+
-
+ {{
editConfig.cancelBtnName || "取消"
}}
- {{ editConfig.confirmBtnName || "确定" }}
- {{ editConfig.confirmBtnName || "确定" }}
+
-
- {{
+
@@ -385,7 +427,7 @@ export default {
},
},
- data () {
+ data() {
return {
iniLoaded: false,
loading: false,
@@ -407,19 +449,19 @@ export default {
computed: {},
watch: {
editParams: {
- handler () {
+ handler() {
this.computeFmData();
},
deep: true,
},
},
- async mounted () {
+ async mounted() {
this.initForm();
},
methods: {
- async initForm () {
+ async initForm() {
this.iniFmData();
if (this.formId && this.formType != "add") {
@@ -427,11 +469,11 @@ export default {
}
},
- computeFmData () {
+ computeFmData() {
console.log(this.fmData);
},
- iniFmData () {
+ iniFmData() {
const { editParams, fmData, editParamsDiv } = this;
editParams.forEach((item, index) => {
if (typeof item.value == "function") {
@@ -503,7 +545,7 @@ export default {
this.iniLoaded = true;
},
- handleClickHtmlNode (e) {
+ handleClickHtmlNode(e) {
//在判断事件目标节点的时候，考虑到兼容性应该统一转换成大写或小写进行判断
if (e.target.localName.toLowerCase() === "a") {
// 通过判端目标节点以后，就能在这里对其进行操作啦。
@@ -512,7 +554,7 @@ export default {
}
},
- async getFmOptions (index, url, params, cookFn) {
+ async getFmOptions(index, url, params, cookFn) {
const { data, code, msg } = await requestPost(url, {
...params,
});
@@ -525,13 +567,13 @@ export default {
}
},
- handleChangeCascader (vals, item) {
+ handleChangeCascader(vals, item) {
this.fmData[item["keyName"]] = vals;
if (typeof item.handleChangeFn == "function") {
item.handleChangeFn(vals, item, this);
}
},
- handleChangeSelect (vals, item) {
+ handleChangeSelect(vals, item) {
console.log(vals, item);
this.fmData[item["keyName"]] = vals;
if (typeof item.handleChangeFn == "function") {
@@ -539,14 +581,14 @@ export default {
}
},
- beforeImgUpload (file, item) {
+ beforeImgUpload(file, item) {
if (typeof item.beforeImgUpload == "function") {
if (!item.beforeImgUpload(file, item, this)) return false;
}
return true;
},
- handleImgRemove (file, item) {
+ handleImgRemove(file, item) {
console.log("handleImgRemove", file);
let url = file.response ? file.response.data.url : file.url;
if (url) {
@@ -568,7 +610,7 @@ export default {
}
},
- handleImgExceed (res, item) {
+ handleImgExceed(res, item) {
console.log(res);
// this.$message({
// type: "warning",
@@ -576,7 +618,7 @@ export default {
// });
},
- handleImgSuccess (res, file, item) {
+ handleImgSuccess(res, file, item) {
console.log("handleImgSuccess", res);
if (res.code === 0 && res.msg === "success") {
let { fmData } = this;
@@ -612,12 +654,12 @@ export default {
}
},
- handleImgError (res, file, item) {
+ handleImgError(res, file, item) {
console.log(res);
},
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
- initMap (item) {
+ initMap(item) {
let { latitude, longitude } = this.$store.state.user;
map = new daiMap(
@@ -756,12 +798,12 @@ export default {
}
},
- watchImg (src) {
+ watchImg(src) {
window.open(src);
},
// 过滤文本
- dormatHtml (content) {
+ dormatHtml(content) {
if (
content.startsWith(
"\n\n\n\n\n"
@@ -773,7 +815,7 @@ export default {
return content;
},
- cookBeforeSubmit (data) {
+ cookBeforeSubmit(data) {
Object.keys(data).forEach((k) => {
if (typeof data[k] == "string") {
data[k] = this.dormatHtml(data[k]);
@@ -782,7 +824,7 @@ export default {
return data;
},
- async handleComfirm () {
+ async handleComfirm() {
this.btnDisable = true;
setTimeout(() => {
this.btnDisable = false;
@@ -814,7 +856,7 @@ export default {
});
},
- async submit () {
+ async submit() {
const { editConfig, fmData, formType, editFixedParams } = this;
if (
typeof editConfig.beforeSubmit == "function" &&
@@ -854,7 +896,7 @@ export default {
}
},
- handleCancle () {
+ handleCancle() {
this.$emit("close");
},
},
@@ -927,13 +969,14 @@ export default {
.item {
min-width: 45%;
- .item-rich-text {
+ /deep/ .item-rich-text {
width: 817px;
max-height: 500px;
overflow: auto;
img {
max-width: 100%;
+ height: auto;
}
&.z-show {
box-sizing: border-box;
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index e5924a369..0ca43f14d 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -140,7 +140,7 @@
+ {{
editConfig.cancelBtnName || "取消"
}}
- {{ editConfig.confirmBtnName || "确定" }}
- {{ editConfig.confirmBtnName || "确定" }}
+
@@ -187,6 +187,15 @@
-
diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue b/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue index 5f33fa448..8842fb7f4 100644 --- a/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue +++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue @@ -19,44 +19,104 @@
+
@@ -92,7 +152,7 @@ export default {
data () {
return {
- info: {
+ formData: {
name: "",
mobile: "",
idCard: "",
@@ -132,8 +192,8 @@ export default {
});
if (code === 0) {
- this.$set(this.info, 'mobile', data.mobile)
- this.$set(this.info, 'idCard', data.idCard)
+ this.$set(this.formData, 'mobile', data.mobile)
+ this.$set(this.formData, 'idCard', data.idCard)
} else {
this.$message.error(msg);
}
@@ -151,7 +211,7 @@ export default {
//加载组织数据
async getInfo () {
- const url = "/epmetuser/tripreport/emphasisTripDetail";
+ const url = "/epmetuser/tripreport/detail";
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icTripReportRecord/emphasisTripDetail";
let params = {
id: this.detailId,
@@ -160,10 +220,10 @@ export default {
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
- this.info = data
+ this.formData = data
- if (this.info.topicInfo && this.info.topicInfo.publishedTime) {
- this.info.topicInfo.publishedTimeShow = dateFormat(new Date(this.info.topicInfo.publishedTime * 1000), "yyyy-MM-dd")
+ if (this.formData.topicInfo && this.formData.topicInfo.publishedTime) {
+ this.formData.topicInfo.publishedTimeShow = dateFormat(new Date(this.formData.topicInfo.publishedTime * 1000), "yyyy-MM-dd")
}
} else {
diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue
index c3084c377..184dc1c5f 100644
--- a/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue
+++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue
@@ -99,6 +99,7 @@ export default {
colorArray: [],
pieData: [],
+ name: '',
code: '',
dangerLevel: '',
@@ -192,11 +193,15 @@ export default {
},
async handleAreaChange (val) {
+
+ debugger
if (val.length > 0) {
// this.code = val.join('-')
- this.code = val[val.length - 1]
+ // this.code = val[val.length - 1]
+ this.name = this.$refs["sourceArea"].getCheckedNodes()[0].label
} else {
- this.code = ''
+ // this.code = ''
+ this.name = ''
}
await this.getPieChart()
@@ -268,7 +273,8 @@ export default {
const url = "/epmetuser/tripreport/emphasisTripPieDetail";
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/tripreport/emphasisTripPieDetail";
let params = {
- code: this.code,
+
+ name: this.name,
};
@@ -418,7 +424,7 @@ export default {
const url = "/epmetuser/tripreport/list";
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/tripreport/list";
let params = {
- code: this.code,
+ name: this.name,
dangerLevel: this.dangerLevel,
pageNo: this.demand.pageNo,
pageSize: this.demand.pageSize,
@@ -491,6 +497,9 @@ export default {
this.getApiData();
window.scrollTo(0, 0);
},
+ // sourceAllCode (val) {
+ // // debugger
+ // }
},
};
+ 姓名：
+ {{ formData.name||'--' }}
+
+
+
+ 手机号：
+ {{ formData.showMobile||'--' }}
+
- 姓名：
- {{ info.name||'--' }}
+ 证件号：
+ {{ formData.showIdCard||'--' }}
+
+
+ 户籍地：
+ {{ formData.registeredResidence||'--' }}
- 手机：
- {{ info.mobile||'--' }}
+ 来源地：
+ {{ formData.sourceAddress||'--' }}
- 证件号：
- {{ info.idCard||'--' }}
+ 详细地址：
+ {{ formData.sourceDetailAddress||'--' }}
- 来源地：
- {{ info.sourceAddress||'--' }}
+ 7天内到达或途经：
+ {{ formData.passBy||'--' }}
+
+
+ 来曹事由：
+ {{ formData.describeContent||'--' }}
+
+
+ 48小时核酸：
+ {{ formData.natOutcomeName||'--' }}
- 来曹事由：
- {{ info.describeContent||'--' }}
+ 来到本地时间：
+ {{ formData.arriveDate||'--' }}
+
+
+
+ 在曹居住地点：
+ {{ formData.presentAddress||'--' }}
+
+
+ 详细地址：
+ {{ formData.detailAddress||'--' }}
+
+
+ 返回方式：
+ {{ formData.trafficTypeName||'--' }}
+
+
+ 具体方式：
+ {{ formData.trafficTypeExplain||'--' }}
+
+
+ 7天内旅居史情况：
+ {{ formData.sojournHistoryName||'--' }}
+
+
+ 隔离状态：
+ {{ formData.isolateTypeName||'--' }}
- 48小时核酸：
- {{ info.natOutComeName||'--' }}
+ 备注：
+ {{ formData.remark||'--' }}
+
+
+ 是否落实"落地检"：
+ {{ formData.isArriveCheckName||'--' }}
+
+
+ 是否到达曹县：
+ {{ formData.isArriveName||'--' }}
+
+
+
+ 上报时间：
+ {{ formData.reportingTime||'--' }}
- 7天旅居史：
- {{ info.sojournHistoryName||'--' }}
+ 管控措施：
+ {{ formData.controlMeasures||'--' }}
- 隔离状态：
- {{ info.isolateTypeName||'--' }}
+ 类型：
+ {{ formData.tripDataTypeName||'--' }}
- 来曹时间：
- {{ info.arriveDate||'--' }}
+ 上报人：
+ {{ formData.createdByName||'--' }}