From ff8d7b522db25fd027a91c7dc6dc8f683131ffff Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 27 Mar 2023 10:52:32 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../communityService/measure/detail.vue | 12 +-
.../communityService/measure/index.vue | 1027 +++++++++--------
2 files changed, 575 insertions(+), 464 deletions(-)
diff --git a/src/views/modules/communityService/measure/detail.vue b/src/views/modules/communityService/measure/detail.vue
index e9a5e09c5..52d28dabd 100644
--- a/src/views/modules/communityService/measure/detail.vue
+++ b/src/views/modules/communityService/measure/detail.vue
@@ -86,11 +86,13 @@
-
- 关 闭
-
-
+
+
+
+ 关 闭
+
+
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 7636e6ca2..c1f202d0d 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -1,36 +1,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
- 重置
-
-
-
-
-
-
-
- 新增
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
-
-
+
+
+ 新增
+
+
+
-
+
{{ handleFilterSpan(scope.row, item) }}
-
+
- 指派
+ type="text"
+ size="small"
+ @click="handleAppoint(scope.row, 'appoint')"
+ >指派
-
-
+ 完成情况
+ type="text"
+ size="small"
+ @click="handleFinish(scope.row, 'finish')"
+ >完成情况
- 完成情况
+ type="text"
+ size="small"
+ @click="handleFinish(scope.row, 'finish')"
+ >完成情况
- 修改
-
- 修改
+
+ 取消
+ slot="reference"
+ type="text"
+ size="small"
+ >取消
- 查看
+ 查看
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
+ label="服务方"
+ prop="serviceType"
+ >
-
+
-
-
+
+
-
-
-
+
+
-
+
{{ form.cancelTime }}
-
-
-
+ "
+ >
+
+
-
- 已解决
- 未解决
+
+ 已解决
+ 未解决
-
-
+
+
-
-
+
+
-
-
+
+
- {{
+ {{
addType != "look" ? "取消" : "关闭"
}}
- 提交
+ 提交
-
-
+
+
@@ -521,7 +628,7 @@ import detail from "./detail";
export default {
components: { info, detail },
- data () {
+ data() {
return {
tableLoading: false,
btnLoading: false,
@@ -752,7 +859,11 @@ export default {
{ required: true, message: "上报人不能为空", trigger: "blur" },
],
reportUserMobile: [
- { required: true, message: "上报人联系电话不能为空", trigger: "blur" },
+ {
+ required: true,
+ message: "上报人联系电话不能为空",
+ trigger: "blur",
+ },
],
reportTime: [
{ required: true, message: "上报时间不能为空", trigger: "blur" },
@@ -779,18 +890,18 @@ export default {
visitableInfo: false,
currDemandId: "",
infoAddType: "look",
- detailShow: false
+ detailShow: false,
};
},
computed: {
...mapGetters(["clientHeight", "iframeHeight"]),
- tableHeight () {
+ tableHeight() {
const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh;
const _h = this.clientHeight - 280 - this.searchH;
return this.$store.state.inIframe ? h : _h;
},
},
- async created () {
+ async created() {
this.customerId = localStorage.getItem("customerId");
this.getTableData();
@@ -802,24 +913,24 @@ export default {
}, 200);
this.pageLoading = true;
},
- mounted () {
+ mounted() {
this.$nextTick(() => {
this.searchH = this.$refs.searchCard.$el.offsetHeight;
console.log("tableHeight", this.tableHeight);
});
},
methods: {
- handleSizeChange (val) {
+ handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pageSize = val;
this.getTableData();
},
- handleCurrentChange (val) {
+ handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.currentPage = val;
this.getTableData();
},
- handleFilterSpan (row, item) {
+ handleFilterSpan(row, item) {
let _val = "";
if (item.options && item.options.length > 0) {
item.options.forEach((n) => {
@@ -828,11 +939,11 @@ export default {
}
return _val || row[item.columnName];
},
- filterEdit (id) {
+ filterEdit(id) {
const { user } = this.$store.state;
return id === user.agencyId;
},
- resetForm (formName) {
+ resetForm(formName) {
this.searchForm.reportStartTime = "";
this.searchForm.reportEndTime = "";
this.searchForm.wantServiceStartTime = "";
@@ -844,12 +955,12 @@ export default {
this.$refs[formName].resetFields();
this.handleSearch();
},
- handleCateCHange (val) {
+ handleCateCHange(val) {
console.log("val", val);
this.searchForm.categoryCode = val[1] || val[0];
this.searchForm.level = val.length;
},
- handleCateSlect (val) {
+ handleCateSlect(val) {
console.log("val", val);
if (val.length === 1) {
this.demandOptions.forEach((item) => {
@@ -861,14 +972,14 @@ export default {
this.form.categoryCode = val[1];
}
},
- handleDemandChange (val) {
+ handleDemandChange(val) {
console.log("val", val, this.selectDemandUser);
this.selectDemandUser = val.label;
this.form.demandUserName = val.demandUserName;
this.form.demandUserMobile = val.demandUserMobile;
this.form.demandUserId = val.demandUserId;
},
- handleSearch (val) {
+ handleSearch(val) {
console.log("searchhh--", val);
this.currentPage = 1;
if (Array.isArray(this.reportTime) && this.reportTime.length > 0) {
@@ -881,27 +992,27 @@ export default {
}
this.getTableData();
},
- handelBlurServiceTime (val) {
+ handelBlurServiceTime(val) {
console.log("val", val);
if (val.length > 0) {
this.form.serviceStartTime = val[0];
this.form.serviceEndTime = val[1];
}
},
- handleServiceChange (type, val) {
+ handleServiceChange(type, val) {
if (val === "social_org") {
if (type === "add") this.getServiceuserList(val, "add_demand");
else this.getServiceuserList(val, "query_demand");
} else this.getServiceuserList(val, "");
},
- handleGridChange (val) {
+ handleGridChange(val) {
this.getDemandUserList();
},
- handleAdd (addType) {
+ handleAdd(addType) {
this.addType = addType;
this.dialogVisible = true;
},
- handlerCancle () {
+ handlerCancle() {
// this.form.categoryCode = ''
// this.form.parentCode = ''
// this.form.demandUserName = ''
@@ -917,7 +1028,7 @@ export default {
// this.$refs.ruleForm.resetFields()
this.dialogVisible = false;
},
- async formatRowForm (row, addType, disabled) {
+ async formatRowForm(row, addType, disabled) {
this.form = { ...row, categoryCode: [row.parentCode, row.categoryCode] };
this.addType = addType;
@@ -958,27 +1069,26 @@ export default {
this.dialogVisible = true;
},
- async handleLook (row, type) {
- this.detailShow = true
- console.log('row', row)
+ async handleLook(row, type) {
+ this.detailShow = true;
+ console.log("row", row);
this.$nextTick(() => {
- this.$refs.ref_form_detail.initForm(row)
- })
+ this.$refs.ref_form_detail.initForm(row);
+ });
// await this.formatRowForm(row, type, true);
},
- detailFormCancle () {
-
- this.detailShow = false
+ detailFormCancle() {
+ this.detailShow = false;
},
- async handleAppoint (row, type) {
+ async handleAppoint(row, type) {
await this.formatRowForm(row, type, true);
},
- async handleFinish (row, type) {
+ async handleFinish(row, type) {
await this.formatRowForm(row, type, true);
},
- async handleEdit (row, type) {
+ async handleEdit(row, type) {
await this.formatRowForm(row, type, false);
// this.form = { ...row, categoryCode: [row.parentCode, row.categoryCode] }
// this.addType = addType
@@ -992,12 +1102,12 @@ export default {
// console.log('selectDemandUser', this.selectDemandUser)
// this.dialogVisible = true
},
- formatRowForm2 (row, type) {
+ formatRowForm2(row, type) {
this.visitableInfo = true;
this.currDemandId = row.demandRecId;
this.infoAddType = type;
},
- async addNew () {
+ async addNew() {
const _form = {
...this.form,
};
@@ -1016,7 +1126,7 @@ export default {
});
this.btnLoading = false;
},
- async appointAjax () {
+ async appointAjax() {
const _form = {
demandRecId: this.form.demandRecId,
serviceType: this.form.serviceType,
@@ -1037,7 +1147,7 @@ export default {
});
this.btnLoading = false;
},
- async finishAjax () {
+ async finishAjax() {
const { reportType, serviceShowFlag, serviceType } = this.form;
const _form = {
demandRecId: this.form.demandRecId,
@@ -1063,7 +1173,7 @@ export default {
});
this.btnLoading = false;
},
- async editCate () {
+ async editCate() {
const categoryCode = this.form.categoryCode;
if (Array.isArray(categoryCode)) {
if (categoryCode.length === 1) {
@@ -1096,7 +1206,7 @@ export default {
});
this.btnLoading = false;
},
- handleSUbmit () {
+ handleSUbmit() {
this.$refs.ruleForm.validate(async (valid) => {
if (valid) {
this.btnLoading = true;
@@ -1110,7 +1220,7 @@ export default {
}
});
},
- handleDel (row) {
+ handleDel(row) {
let params = {
demandRecId: row.demandRecId,
};
@@ -1132,7 +1242,7 @@ export default {
return this.$message.error("网络错误");
});
},
- getTreeData (data) {
+ getTreeData(data) {
if (!Array.isArray(data)) return [];
let arr = data.map((item) => {
let _item = {};
@@ -1147,7 +1257,7 @@ export default {
});
return arr;
},
- getFlagData (data, flag) {
+ getFlagData(data, flag) {
if (!Array.isArray(data)) return [];
let arr1 = data.filter((item) => item[flag]);
let arr2 = arr1.map((item) => {
@@ -1158,7 +1268,7 @@ export default {
// console.log('arrr-oppp', arr2)
return arr2;
},
- async getGridList (type, agencyId) {
+ async getGridList(type, agencyId) {
const { user } = await this.$store.state;
console.log("user---ppp", user);
// addorupdate query
@@ -1181,7 +1291,7 @@ export default {
return this.$message.error("网络错误");
});
},
- async getDemandUserList () {
+ async getDemandUserList() {
const { user } = await this.$store.state;
console.log("user---ppp", user);
const params = {
@@ -1205,7 +1315,7 @@ export default {
});
},
- async getDemandOptions () {
+ async getDemandOptions() {
this.$http
.post("/governance/icresidemanddict/demandoption")
.then(({ data: res }) => {
@@ -1223,7 +1333,7 @@ export default {
return this.$message.error("网络错误");
});
},
- async getServiceuserList (serviceType, query) {
+ async getServiceuserList(serviceType, query) {
if (!serviceType) return false;
const { demandUserId } = this.form;
const params = {
@@ -1246,7 +1356,7 @@ export default {
return this.$message.error("网络错误");
});
},
- async getDictOptions () {
+ async getDictOptions() {
this.$http
.post("/sys/dict/data/dictlist", { dictType: "user_demand_status" })
.then(({ data: res }) => {
@@ -1289,7 +1399,7 @@ export default {
return this.$message.error("网络错误");
});
},
- async getTableData () {
+ async getTableData() {
this.tableLoading = true;
let params = {
...this.searchForm,
@@ -1316,8 +1426,7 @@ export default {