diff --git a/pages.json b/pages.json index 5530cc0..1cbca2c 100644 --- a/pages.json +++ b/pages.json @@ -210,7 +210,8 @@ "pages": [{ "path": "mbwa", "style": { - "navigationBarTitleText": "走动式管理" + "navigationBarTitleText": "走动式管理", + "navigationStyle": "custom" } }, { diff --git a/pages/index/index.vue b/pages/index/index.vue index 8b3db9a..b3a5616 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -291,6 +291,7 @@ export default { } ); this.modelMenu = res.Result_Data.List; + console.log("this.modelMenu", this.modelMenu); }, }, onReady() {}, diff --git a/pages/mbwa/mbwa.vue b/pages/mbwa/mbwa.vue index bf689d6..0d75d82 100644 --- a/pages/mbwa/mbwa.vue +++ b/pages/mbwa/mbwa.vue @@ -1,688 +1,647 @@ - + diff --git a/pages/mbwa/mbwaold.vue b/pages/mbwa/mbwaold.vue new file mode 100644 index 0000000..8aa0b5f --- /dev/null +++ b/pages/mbwa/mbwaold.vue @@ -0,0 +1,691 @@ + + + + + diff --git a/pages/walkAroundManager/detail.vue b/pages/walkAroundManager/detail.vue index 3d8eecd..ec60a0a 100644 --- a/pages/walkAroundManager/detail.vue +++ b/pages/walkAroundManager/detail.vue @@ -20,7 +20,12 @@

{{ detailObj.template.title || "-" }}

- 巡查时间：{{ detailObj.createdAt }} + 巡查时间：{{ + detailObj.createdAt + ? $moment(detailObj.createdAt).format("YYYY-MM-DD HH:mm:ss") + : "-" + }}
@@ -29,13 +34,7 @@
@@ -150,6 +153,155 @@ + + + + + + + + + + @@ -184,6 +336,15 @@ export default { imgsList: [], submit: false, // 是否提交成功了 requiredList: [], // 必填项的数组 + pageType: "", // 页面类型 + extendObj: {}, + selectPerson: "--请选择处理人--", + selectPersonIndex: -1, + selectPersonList: [], + suggestion: "", // 整改意见 + feedbackContent: "", // 反馈内容 + feedbackImgList: [], // 反馈图片 + showPersonName: "", // 当状态过了 直接显示 名称 }; }, computed: { @@ -193,12 +354,29 @@ export default { }, onLoad(query) { console.log("query", query); - this.handleGetDetail(query.id); + if (query.pageType) { + this.pageType = query.pageType; + } + console.log("this.pageType", this.pageType); + console.log("user", this.user); + + if (query.id) { + this.handleGetDetail(query.id); + } }, methods: { - showImg2(index) { + // 删除图片 + deleteImgFunc(item, index) { + this.feedbackImgList.splice(index, 1); + }, + // 修改选择的异常处理人 + handleChangePerson(e) { + let index = Number(e.detail.value); + this.selectPersonIndex = index; + }, + showImg2(index, imgList) { uni.previewImage({ - urls: this.imgsList, + urls: imgList, current: index, loop: true, indicator: "number", @@ -218,7 +396,213 @@ export default { this.uploadResult = extend.uploadResult; this.imgsList = extend.imgsList; this.current = extend.situation; + this.extendObj = extend; + if (extend.errorStatus === 1) { + this.suggestion = extend.suggestion; + this.showPersonName = extend.person.MEMBERSHIP_NAME; + } + if (extend.errorStatus > 1) { + this.feedbackContent = extend.feedbackContent; + this.feedbackImgList = extend.feedbackImgList; + } } + console.log("this.extendObj", this.extendObj); + // 获取处理人列表 + if (this.extendObj.errorStatus === 0) { + this.handleGetPersonList(); + } + }, + async handleGetPersonList() { + const req = { + SERVERPART_ID: this.detailObj.serverPartId, + PROVINCE_CODE: this.user.ProvinceCode, + }; + console.log("req", req); + + const data = await this.$request.$getMp("GetDealerList", req); + console.log("handleGetPersonList", data); + let list = data.Data.List; + this.selectPersonList = list; + }, + async handleGetUpdate() { + let req = {}; + if (this.extendObj.errorStatus === 0) { + if (this.selectPersonIndex === -1) { + uni.showToast({ + title: "请选择处理人！", + icon: "none", + }); + return; + } + if (!this.suggestion) { + uni.showToast({ + title: "请输入整改意见！", + icon: "none", + }); + return; + } + let personObj = this.selectPersonList[this.selectPersonIndex]; + console.log("personObj", personObj); + req = { + ...this.extendObj, + person: personObj, + errorStatus: 1, + suggestion: this.suggestion, + suggestTime: this.$util.cutDate(new Date(), "YYYY-MM-DD hh:mm:ss"), // 选处理人的时间 + suggestPerson: { + STAFF_NAME: this.user.UserName, + STAFF_ID: this.user.UserId, + MEMBERSHIP_NAME: this.user.Membership_Name, + MEMBERSHIP_ID: this.user.Membership_Id, + }, + }; + } else if (this.extendObj.errorStatus === 1) { + if (!(this.feedbackImgList && this.feedbackImgList.length > 0)) { + uni.showToast({ + title: "请选择上传反馈图片！", + icon: "none", + }); + return; + } + if (!this.feedbackContent) { + uni.showToast({ + title: "请输入反馈内容！", + icon: "none", + }); + return; + } + + console.log("this.feedbackImgList", this.feedbackImgList); + console.log("his.feedbackContent", this.feedbackContent); + + req = { + ...this.extendObj, + feedbackImgList: this.feedbackImgList, + feedbackContent: this.feedbackContent, + feedbackTime: this.$util.cutDate(new Date(), "YYYY-MM-DD hh:mm:ss"), // 反馈时间 + errorStatus: 2, + }; + } + + const data = await this.$request.$webNodePOST( + `questionnaire-responses/${this.detailObj.id}/extend`, + { extend: JSON.stringify(req) } + ); + console.log("data", data); + if (data.code === 200) { + uni.showToast({ + title: "提交成功！", + icon: "success", + }); + setTimeout(() => { + uni.navigateBack({ + delta: 1, + }); + }, 1000); + } else { + uni.showToast({ + title: data.message, + icon: "none", + }); + } + }, + submitImg(e) { + this.imgfocus = true; + let _this = this; + uni.chooseImage({ + count: 9, //默认9 + sizeType: ["original", "compressed"], + sourceType: ["camera"], + // "album", + success: function (rs) { + console.log("rs", rs); + + let quality = 100; + if (rs.tempFiles[0].size > 1024 * 200) { + quality = ((1024 * 200) / rs.tempFiles[0].size) * 100; + } + if (quality < 100 && rs.tempFiles[0].path.indexOf(".jpg") > -1) { + uni.compressImage({ + src: rs.tempFilePaths[0], // 图片路径 + quality: quality, // 压缩质量 + success(res) { + console.log("res", res); + let data = {}; + if (res.data) { + data = JSON.parse(res.data); + } + console.log("data", data); + uni.showLoading({ + title: "图片上传中...", + }); + uni.uploadFile({ + // url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=MBWA", + url: "https://es.robot-z.cn/oss/upload", + filePath: res.tempFilePath, + header: { + "Content-Type": "multipart/form-data", + }, + formData: {}, + fileType: "image", + name: "file", + success(res) { + console.log("res", res); + let data = {}; + if (res.data) { + data = JSON.parse(res.data); + } + console.log("data", data); + uni.hideLoading(); + _this.feedbackImgList.push( + `https://es.robot-z.cn/${data.data.path}` + ); + }, + fail(error) { + console.log("error", error); + _this.noPost = true; + }, + }); + }, + fail(error) { + _this.noPost = true; + }, + }); + } else { + uni.showLoading({ + title: "图片上传中...", + // mask: true + }); + uni.uploadFile({ + // url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=MBWA", + url: "https://es.robot-z.cn/oss/upload", + filePath: rs.tempFilePaths[0], + fileType: "image", + header: { + "Content-Type": "multipart/form-data", + }, + name: "file", + success(res) { + console.log("res", res); + let data = {}; + if (res.data) { + data = JSON.parse(res.data); + } + console.log("data", data); + uni.hideLoading(); + _this.feedbackImgList.push( + `https://es.robot-z.cn/${data.data.path}` + ); + // path; + }, + fail(error) { + console.log("error", error); + _this.noPost = true; + }, + }); + } + }, + fail: function (err) {}, + }); }, }, }; diff --git a/pages/walkAroundManager/index.vue b/pages/walkAroundManager/index.vue index 699ecab..a86e4dc 100644 --- a/pages/walkAroundManager/index.vue +++ b/pages/walkAroundManager/index.vue @@ -199,7 +199,6 @@ export default { this.handleGetModalData(query.id); }, methods: { - // 删除图片 deleteImgFunc(item, index) { this.imgsList.splice(index, 1); @@ -270,6 +269,7 @@ export default { uploadResult: this.uploadResult, imgsList: this.imgsList, situation: this.current, // 0 正常 1 紧急 + errorStatus: this.current === 1 ? 0 : undefined, // 0是经理选择人 1 是反馈结果 }; const req = { diff --git a/util/apiPath.js b/util/apiPath.js index 5185a28..e1255c5 100644 --- a/util/apiPath.js +++ b/util/apiPath.js @@ -1,3 +1,11 @@ +/* + * @Author: cclu 1106109051@qq.com + * @Date: 2023-05-16 09:06:13 + * @LastEditors: cclu 1106109051@qq.com + * @LastEditTime: 2025-03-19 11:20:27 + * @FilePath: \wechat_yxcl\util\apiPath.js + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ export default { baseURL: 'https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx', // 合作商户请求 diff --git a/util/index.js b/util/index.js index 7ed6ce7..6c58280 100644 --- a/util/index.js +++ b/util/index.js @@ -18,10 +18,10 @@ export default { // data.action_type = control // return Api.request('GET', ApiPath.mobUrl ,data) // }, - // getMp: function (control,data) { // mp.eshangtech.com - // data.action_type = control - // return Api.request('GET', ApiPath.mpUrl ,data) - // }, + $getMp: function (control, data) { // mp.eshangtech.com + data.action_type = control + return Api.request('GET', ApiPath.mpUrl, data) + }, $get: function (controller, data) { // 合作商户请求 data.action_type = controller return this.get(data) diff --git a/wechat_yxcl.zip b/wechat_yxcl.zip index b8e7762..309d0ea 100644 Binary files a/wechat_yxcl.zip and b/wechat_yxcl.zip differ