diff --git a/api/charge.js b/api/charge.js index 0479269..424f97b 100644 --- a/api/charge.js +++ b/api/charge.js @@ -2,8 +2,10 @@ const { http } = uni.$u /* 拜访列表 */ export const getMcVisitList = params => http.get('/schsf/mcVisit/list', { params }) -/* 附件 */ +/* 批量查看附件 */ export const getMcFileList = data => http.post('/schsf/mcFile/detailsList',data) +/* 文件-查看详情(单个) */ +export const getByUuid = uuid => http.get('/schsf/mcFile/getByUuid/'+uuid) /* 流程记录 */ export const getMcOperationLogList = params => http.get('/schsf/mcOperationLog/list', { params }) /* 查询财年 */ @@ -42,3 +44,5 @@ export const getMcConstructionList = params => http.get('/schsf/mcConstruction/l export const mcConstructionEngineering = data => http.post('/schsf/mcConstruction/engineering', data ) /* 运营维护 */ export const mcConstructionOperation = data => http.post('/schsf/mcConstruction/operations', data ) +/* 钉钉认证接口 */ +export const getDingtalkConfig = params => http.get('/schsf/dingtalk/getConfig', { params }) diff --git a/common/config.js b/common/config.js index 6cc6fd4..6ab88d7 100644 --- a/common/config.js +++ b/common/config.js @@ -7,6 +7,7 @@ module.exports = { // baseUrl: 'http://172.17.56.16:18082/api', //ip正式环境 // baseUrl: 'https://scdcapp.chinagasholdings.com/api', //域名正式环境 // 超时 + timeout: 30000, gaodeMapKey:"", // 禁用 Cookie 等信息 diff --git a/components/popUpFillIn/popUpFillIn.vue b/components/popUpFillIn/popUpFillIn.vue index bbeb6fa..e6bd41a 100644 --- a/components/popUpFillIn/popUpFillIn.vue +++ b/components/popUpFillIn/popUpFillIn.vue @@ -11,7 +11,7 @@ - + 是 否 @@ -20,7 +20,7 @@ - + 是 否 @@ -30,63 +30,76 @@ - + 是 否 - + 基本维护 - + + + + + - + - + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - 取消 + 取消 - 确定 + 确定 @@ -96,7 +109,7 @@ @cancel="pickerShow = false" @confirm="pickerConfirm"> + @cancel="datetimeShow = false" @close="datetimeShow = false" mode="date"> @@ -120,6 +133,10 @@ IgnitionID: { type: Number }, + userCode: { + type: String, + default: "" + }, }, data() { return { @@ -129,26 +146,30 @@ dataTimeValue: Number(new Date()), radiovalueDHWH: "", radiovalueGCWH: "", - radiovalueYYWH:"", + radiovalueYYWH: "", model: { - ignTime: "", - nIgnRsn: "" + + // ignTime: "", + // nIgnRsn: "" }, rules: {}, pickerShow: false, columns: [], dhShow: true, gcShow: true, - yyShow:true, - currentName:"", + yyShow: true, + currentName: "", }; }, methods: { open() { + this.model.userCode = this.userCode; this.show = true; }, close() { + console.log("close") this.show = false; + this.model = {}; }, handleIgnition(dict) { let dictArr = this.getDictDatas(dict); @@ -167,7 +188,7 @@ uni.$u.toast('请选择点火时间'); return } - if (!this.model.nIgnRsn) { + if (!this.model.nIgnRsn && this.radiovalueDHWH === '否') { uni.$u.toast('请选择未点火原因'); return } @@ -186,7 +207,7 @@ uni.$u.toast('请选择市场竣工时间'); return } - if (!this.model.nonNcmpRsn) { + if (!this.model.nonNcmpRsn && this.radiovalueGCWH === '否') { uni.$u.toast('请选择竣工原因'); return } @@ -206,7 +227,7 @@ uni.$u.toast('请选择通气到表前时间'); return } - if (!this.model.gctNcmpRsn) { + if (!this.model.gctNcmpRsn && this.radiovalueGCWH === '否') { uni.$u.toast('请选择未完成原因'); return } @@ -214,12 +235,12 @@ } this.show = false; }, - async submitDh(){ + async submitDh() { let data = { id: this.IgnitionID, ignCnfStatusCode: this.radiovalueDHWH === '是' ? 'Y' : 'N', nIgnRsn: this.model.nIgnRsn, - ignTime: this.model.ignTime + ignTime: this.model.ignTime + ' 00:00:00' } console.log(this.radiovalueGCWH); console.log("点火数据", data); @@ -232,12 +253,12 @@ uni.$u.toast(result.msg) } }, - async submitGc(){ + async submitGc() { let data = { id: this.IgnitionID, isCompleted: this.radiovalueGCWH === '是' ? 'Y' : 'N', - assignmentTime: this.model.assignmentTime, - completionTime: this.model.completionTime, + assignmentTime: this.model.assignmentTime + ' 00:00:00', + completionTime: this.model.completionTime + ' 00:00:00', nonNcmpRsn: this.model.nonNcmpRsn } console.log(this.radiovalueGCWH); @@ -251,13 +272,13 @@ uni.$u.toast(result.msg) } }, - async submitYy(){ + async submitYy() { let data = { id: this.IgnitionID, gasConnMtrRis: this.radiovalueYYWH === '是' ? 'Y' : 'N', - assignmentTime: this.model.assignmentTime, - gctMtrrisTime: this.model.gctMtrrisTime, - gctNcmpRsn:this.model.gctNcmpRsn + assignmentTime: this.model.assignmentTime + ' 00:00:00', + gctMtrrisTime: this.model.gctMtrrisTime + ' 00:00:00', + gctNcmpRsn: this.model.gctNcmpRsn } console.log("运营数据", data); const result = await mcConstructionOperation(data); @@ -286,7 +307,7 @@ this.model = {} } }, - YYchange(e){ + YYchange(e) { if (e === '是') { this.yyShow = true } else { @@ -294,20 +315,20 @@ this.model = {} } }, - multipleChange(name){ + multipleChange(name) { this.currentName = name; this.datetimeShow = true; }, pickerConfirm(e) { console.log(e); let data = e.value[0].value; - if(this.type === 'dhwh'){ + if (this.type === 'dhwh') { this.model.nIgnRsn = data; } - if(this.type === 'gcwh'){ + if (this.type === 'gcwh') { this.model.nonNcmpRsn = data; } - if(this.type === 'yywh'){ + if (this.type === 'yywh') { this.model.gctNcmpRsn = data; } this.pickerShow = false; @@ -318,15 +339,15 @@ this.calendarShow = false; }, dateConfirm(e) { - let time = this.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss'); - if(this.type === 'dhwh'){ + let time = this.$u.timeFormat(e.value, 'yyyy-mm-dd'); + if (this.type === 'dhwh') { this.model.ignTime = time; } - if(this.type === 'gcwh'){ + if (this.type === 'gcwh') { this.model[this.currentName] = time; // this.model.nonNcmpRsn = data; } - if(this.type === 'yywh'){ + if (this.type === 'yywh') { this.model[this.currentName] = time; // this.model.gctNcmpRsn = data; } diff --git a/main.js b/main.js index a6d3a78..ea0f8bf 100644 --- a/main.js +++ b/main.js @@ -20,6 +20,7 @@ import { dDingJudgeEnvPlatform } from 'utils/isDing.js' +import VConsole from '@/utils/vconsole.js' import dayjs from '@/uni_modules/uview-ui/libs/util/dayjs.js'; import { diff --git a/manifest.json b/manifest.json index 3b9b09e..961325e 100644 --- a/manifest.json +++ b/manifest.json @@ -83,7 +83,7 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://192.168.0.8:8001", + "target" : "http://192.168.0.34:8001", "changeOrigin" : true, "secure" : true, "pathRewrite" : { diff --git a/package-lock.json b/package-lock.json index f574e90..6216b03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2,6 +2,24 @@ "requires": true, "lockfileVersion": 1, "dependencies": { + "@babel/runtime": { + "version": "7.24.7", + "resolved": "http://www.hotent.xyz:8081/nexus/repository/group-npm/@babel/runtime/-/runtime-7.24.7.tgz", + "integrity": "sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==", + "requires": { + "regenerator-runtime": "^0.14.0" + } + }, + "copy-text-to-clipboard": { + "version": "3.2.0", + "resolved": "http://www.hotent.xyz:8081/nexus/repository/group-npm/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz", + "integrity": "sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q==" + }, + "core-js": { + "version": "3.37.1", + "resolved": "http://www.hotent.xyz:8081/nexus/repository/group-npm/core-js/-/core-js-3.37.1.tgz", + "integrity": "sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==" + }, "dingtalk-jsapi": { "version": "3.0.29", "resolved": "https://registry.npmmirror.com/dingtalk-jsapi/-/dingtalk-jsapi-3.0.29.tgz", @@ -15,10 +33,31 @@ "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz", "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A==" }, + "mutation-observer": { + "version": "1.0.3", + "resolved": "http://www.hotent.xyz:8081/nexus/repository/group-npm/mutation-observer/-/mutation-observer-1.0.3.tgz", + "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==" + }, "promise-polyfill": { "version": "7.1.2", "resolved": "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz", "integrity": "sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ==" + }, + "regenerator-runtime": { + "version": "0.14.1", + "resolved": "http://www.hotent.xyz:8081/nexus/repository/group-npm/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" + }, + "vconsole": { + "version": "3.15.1", + "resolved": "http://www.hotent.xyz:8081/nexus/repository/group-npm/vconsole/-/vconsole-3.15.1.tgz", + "integrity": "sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g==", + "requires": { + "@babel/runtime": "^7.17.2", + "copy-text-to-clipboard": "^3.0.1", + "core-js": "^3.11.0", + "mutation-observer": "^1.0.3" + } } } } diff --git a/package.json b/package.json index c4951e2..12cc5d2 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ }, "dependencies": { "dingtalk-jsapi": "^3.0.29", - "jsencrypt": "^3.3.2" + "jsencrypt": "^3.3.2", + "vconsole": "^3.15.1" } } diff --git a/pages/charge/constructionMaintenance/index.vue b/pages/charge/constructionMaintenance/index.vue index a3060c0..e7157b9 100644 --- a/pages/charge/constructionMaintenance/index.vue +++ b/pages/charge/constructionMaintenance/index.vue @@ -1,9 +1,9 @@ diff --git a/pages/charge/ignitionMaintenance/detail.vue b/pages/charge/ignitionMaintenance/detail.vue index 04354ef..8b23a07 100644 --- a/pages/charge/ignitionMaintenance/detail.vue +++ b/pages/charge/ignitionMaintenance/detail.vue @@ -73,7 +73,11 @@ name: "详细地址", value: "", key: "userDetailedAddress" - }, { + },{ + name: "用户编号", + value: "", + key: "userCode" + },{ name: "户名", value: "", key: "userName" @@ -84,7 +88,8 @@ }, { name: "点火确认", value: "", - key: "ignCnfStatusCode" + key: "ignCnfStatusCode", + dict:"sys_mc_ign_status" }, { name: "点火时间", value: "", diff --git a/pages/charge/ignitionMaintenance/index.vue b/pages/charge/ignitionMaintenance/index.vue index c98d434..ed3b8b4 100644 --- a/pages/charge/ignitionMaintenance/index.vue +++ b/pages/charge/ignitionMaintenance/index.vue @@ -3,7 +3,7 @@ - + + + + + + + + {{searchForm[item.name]}} + + {{ item.title }} + + + + + + + + + + @@ -41,7 +61,8 @@ 查看详情 - + 点火维护 @@ -52,14 +73,25 @@ - + + + + + + + + @@ -192,4 +368,9 @@ border: 1px solid #EFF1FD; border-style: none none solid solid; } + + .topSelectCss { + padding: 10px 20px; + background: #fff; + } diff --git a/pages/charge/visitsAndFees/createaVisit.vue b/pages/charge/visitsAndFees/createaVisit.vue index da48650..db56bd5 100644 --- a/pages/charge/visitsAndFees/createaVisit.vue +++ b/pages/charge/visitsAndFees/createaVisit.vue @@ -20,8 +20,8 @@ + :disabled="operationStatus ==='YD' || item.key === 'billingPersonName'" :type="item.mode" + :maxlength="item.max" :disabledColor="operationStatus==='YD'?'#F5F7FA':'#fff'" border="none"> @@ -105,8 +105,9 @@ - + @@ -139,8 +140,8 @@ - + @@ -178,8 +179,8 @@ 上传附件 - - + + {{item.fileName}} - + + - + @@ -213,10 +217,12 @@