diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 5701ea49..80d8118e 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -1,87 +1,90 @@ /*--------------------------------------------------------------- | 请求接口封装 | ---------------------------------------------------------------*/ -import axios from 'axios' -import log from 'dai-js/modules/log' -import curry from 'dai-js/tools/curry' +import axios from "axios"; +import message from "dai-js/modules/message/message"; +import curry from "dai-js/tools/curry"; const request = curry( (method, url, data = {}, headers = {}, progress = () => {}) => { return new Promise((reslove) => { let returnIniData = { - httpCode: '', + httpCode: "", data: {}, - msg: '', - code: '' - } + msg: "", + code: "", + }; // 添加服务器端URL function processUrl(url) { - if (url.indexOf('http://') > -1 || url.indexOf('https://') > -1) { - return url + if (url.indexOf("http://") > -1 || url.indexOf("https://") > -1) { + return url; } - return process.env.VUE_APP_API_SERVER + url + return process.env.VUE_APP_API_SERVER + url; } - url = processUrl(url) + url = processUrl(url); const succFn = (res) => { // log(`[request成功] ${url}`, data, res); let retData = { ...returnIniData, ...res.data, - httpCode: res.statusCode - } + httpCode: res.statusCode, + }; // if(typeof Vue.$afterRequestHook == 'function'){ // retData = Vue.$afterRequestHook(retData); // } + if (res.data.code > 8000 && res.data.code < 10000) { + message.error(res.data.msg); + } - reslove(retData) - } + reslove(retData); + }; const failFn = (err) => { // log(`[request失败] ${url}`, data, err); reslove( Object.assign({}, returnIniData, { - httpCode: '9999', //访问出现意外 - msg: '网络错误' + httpCode: "9999", //访问出现意外 + msg: "网络错误", }) - ) - } + ); + }; - if (method.toUpperCase() == 'POST') { + if (method.toUpperCase() == "POST") { axios .post(url, data, { headers, - responseType: 'json' + responseType: "json", // progress, // credentials: false, }) .then(succFn) - .catch(failFn) + .catch(failFn); } else { axios .get(url, { params: data, headers, - responseType: 'json' + responseType: "json", // credentials: true, }) .then(succFn) - .catch(failFn) + .catch(failFn); } - }) + }); } -) +); -export const requestGet = request('get') +export const requestGet = request("get"); -export const requestPost = request('post') +export const requestPost = request("post"); export default { install(Vue) { - Vue.prototype.$requestGet = requestGet - Vue.prototype.$requestPost = requestPost - } -} + Vue.prototype.$requestGet = requestGet; + Vue.prototype.$requestPost = requestPost; + }, +}; diff --git a/src/views/modules/communityService/dqfwzx/cpts/edit.vue b/src/views/modules/communityService/dqfwzx/cpts/edit.vue index 90ebcff9..4aeab7ba 100644 --- a/src/views/modules/communityService/dqfwzx/cpts/edit.vue +++ b/src/views/modules/communityService/dqfwzx/cpts/edit.vue @@ -408,18 +408,31 @@ export default { }, ]; }, - handleDelStaff(index) { + async handleDelStaff(index) { const { matterList } = this.dataForm; - let delItem = matterList.splice(index, 1); + let list = [...matterList]; + let delItem = list.splice(index, 1); console.log(delItem); if (delItem[0].matterId) { + if (!confirm("删除后无法恢复，确认删除？")) + return console.log("不删了"); + if (!(await this.delStaff(delItem[0].matterId))) return; this.dataForm.delMatterList = [ ...this.dataForm.delMatterList, delItem[0].matterId, ]; } - this.dataForm.matterList = matterList; + this.dataForm.matterList = list; + }, + async delStaff(matterId) { + const { data, code, msg } = await requestPost( + "/gov/org/icpartyservicecenter/delmatter", + { + matterId, + } + ); + return code === 0; }, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 initMap() { diff --git a/src/views/modules/communityService/dqfwzx/cpts/order.vue b/src/views/modules/communityService/dqfwzx/cpts/order.vue index 501266fd..49ad2ce8 100644 --- a/src/views/modules/communityService/dqfwzx/cpts/order.vue +++ b/src/views/modules/communityService/dqfwzx/cpts/order.vue @@ -139,6 +139,7 @@ import { mapGetters } from "vuex"; import { Loading } from "element-ui"; // 引入Loading服务 import { requestPost } from "@/js/dai/request"; import dateFormat from "dai-js/tools/dateFormat"; +import formVltHelper from "dai-js/tools/formVltHelper"; const deepClone = function (arg) { if (typeof arg == "object" || typeof arg == "array") { @@ -295,6 +296,9 @@ export default { } console.log(list); this.timeList = list; + this.dataForm.timeId = list + .filter((item) => item.selected && item.isAppointment) + .map((item) => item.timeId); return false; }, @@ -350,6 +354,12 @@ export default { app.util.validateRule(messageObj); this.btnDisable = false; } else { + if (!formVltHelper.userOrMobile(this.dataForm.appointmentPhone)) { + return this.$message({ + type: "error", + message: "手机号格式有误", + }); + } this.submit(); } }); diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue index 0544cbf9..c081cfe6 100644 --- a/src/views/modules/communityService/dqfwzx/index.vue +++ b/src/views/modules/communityService/dqfwzx/index.vue @@ -17,6 +17,13 @@ :key="'ct' + index" v-for="(item, index) in tableData" > +
+ 修改 +
{{ item.centerName }}
社区地址：
@@ -38,11 +45,11 @@
-
+
@@ -191,7 +198,7 @@ export default { }, async mounted() { await this.loadAgency(); - // await this.getTableData(); + await this.getTableData(); }, methods: { // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 @@ -371,6 +378,7 @@ export default { width: 25%; .list { .item { + position: relative; box-sizing: border-box; margin-bottom: 10px; border: 2px solid #6aa; @@ -383,6 +391,21 @@ export default { background-color: #ffffff; box-shadow: 0 0 10px #6aa; } + .item-btn { + position: absolute; + top: 5px; + right: 5px; + font-size: 14px; + color: rgb(235, 192, 4); + width: 50px; + line-height: 30px; + text-align: center; + cursor: pointer; + &:hover { + // text-decoration: underline; + color: rgb(250, 208, 23); + } + } .item-name { font-size: 16px; font-weight: bold; diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue index 66af8c1e..ac413f23 100644 --- a/src/views/modules/communityService/measure/index.vue +++ b/src/views/modules/communityService/measure/index.vue @@ -33,6 +33,19 @@ + +
+
+ + + + + + +
- - - - - - + 查询 - 重置 + 重置
@@ -1119,6 +1124,8 @@ export default { diff --git a/src/views/modules/visual/warning/components/screen-table/index.vue b/src/views/modules/visual/warning/components/screen-table/index.vue index 41c80f97..a4171708 100644 --- a/src/views/modules/visual/warning/components/screen-table/index.vue +++ b/src/views/modules/visual/warning/components/screen-table/index.vue @@ -23,7 +23,7 @@ :key="indexs" :style="tableContentStyle[indexs]" > - {{ item }} + {{ item }} 更多> - + {{ item }} @@ -180,6 +184,10 @@ export default { created() {}, methods: { + toUserInfo(uid) { + // this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` }); + }, + onClickMorePop(index) { this.visiblePopList.forEach((item, indexs) => { if (index == indexs) {