diff --git a/pages/workBenchNew/components/installMeter/index.js b/pages/workBenchNew/components/installMeter/index.js index 72b9ae9..2f00a38 100644 --- a/pages/workBenchNew/components/installMeter/index.js +++ b/pages/workBenchNew/components/installMeter/index.js @@ -390,6 +390,9 @@ Page({ return; } alertSuccess("新增成功") + wx.navigateTo({ + url: '/pages/workBenchTodoList/index', + }) }, goback() { wx.navigateBack() diff --git a/pages/workBenchNew/components/kaihu/index.js b/pages/workBenchNew/components/kaihu/index.js index 264a79b..71d2b19 100644 --- a/pages/workBenchNew/components/kaihu/index.js +++ b/pages/workBenchNew/components/kaihu/index.js @@ -52,7 +52,7 @@ Page({ phone, building, feeType, park, editType, id, parkName, } = this.data; - const { code, message } = await createBackTenement(park, { name, shortName, address, contact, phone, building, feeType }) + const { code, message, tenement } = await createBackTenement(park, { name, shortName, address, contact, phone, building, feeType }) if (code !== OK) { alertInfo(message) return @@ -60,7 +60,7 @@ Page({ alertSuccess("开户成功") // wx.navigateBack() wx.redirectTo({ - url: `/pages/workBenchNew/components/workBenchTenement/index?park=${park}&parkName=${parkName}&name=${name}`, + url: `/pages/workBenchNew/components/workBenchTenement/index?park=${park}&parkName=${parkName}&name=${name}&id=${tenement}`, }) }, handleBack() { diff --git a/pages/workBenchNew/components/uninstallMeter/index.js b/pages/workBenchNew/components/uninstallMeter/index.js index 62ed294..0d14347 100644 --- a/pages/workBenchNew/components/uninstallMeter/index.js +++ b/pages/workBenchNew/components/uninstallMeter/index.js @@ -42,6 +42,9 @@ Page({ this.setData({ park: data.id, parkName: data.name, + meter: null, + meterInfo: null, + meterName: null, }) break; case "tenement": @@ -113,13 +116,43 @@ Page({ type: "", }) }, + changeCritical(e) { + this.setData({ + critical: e.detail, + }) + }, + changePeak(e) { + this.setData({ + peak: e.detail, + }) + }, + changeFlat(e) { + this.setData({ + flat: e.detail, + }) + }, + changeValley(e) { + this.setData({ + valley: e.detail, + }) + }, + changeOverall(e) { + this.setData({ + overall: e.detail, + }) + }, + changeDeppValley(e) { + this.setData({ + deepOverall: e.detail, + }) + }, async onSubmit() { - const { meter, reason, url, meterInfo } = this.data; + const { meter, reason, url, meterInfo, critical, peak, flat, valley, overall, deepOverall } = this.data; if (!meter) { alertInfo("请选择表号") return; } - const { code, message } = await uninstallMeter({sn: meterInfo.meterSn, images: url, reason}) + const { code, message } = await uninstallMeter({sn: meterInfo.meterSn, images: url, reason, tenement: meterInfo.tenement, critical, peak, flat, valley, overall, deepOverall}) if (code !== OK) { alertInfo(message) return diff --git a/pages/workBenchNew/components/uninstallMeter/index.wxml b/pages/workBenchNew/components/uninstallMeter/index.wxml index a3b5474..a1bb62c 100644 --- a/pages/workBenchNew/components/uninstallMeter/index.wxml +++ b/pages/workBenchNew/components/uninstallMeter/index.wxml @@ -50,6 +50,48 @@ + + + + + + 提交 返回 diff --git a/pages/workBenchNew/components/workBenchMeterControl/index.js b/pages/workBenchNew/components/workBenchMeterControl/index.js index 7238e8b..04b55de 100644 --- a/pages/workBenchNew/components/workBenchMeterControl/index.js +++ b/pages/workBenchNew/components/workBenchMeterControl/index.js @@ -1,7 +1,8 @@ // pages/workBenchNew/components/workBenchMeter/index.js import { alertInfo, alertSuccess, loadingFunc } from "../../../../utils/index"; -import { getParkMeterList, handleOperateMeterSwitch } from "../../../../service/meter" +import { getParkMeterList, handleOperateMeterMode } from "../../../../service/meter" +import { uploadMeterForce } from "../../../../service/public" import request from "../../../../utils/request" const { OK } = request @@ -87,7 +88,34 @@ Page({ }) }, handleSubmit() { - const { } = this.data; + const that = this; + const { mode, days, reason, meter, meterName, url } = this.data; + if (mode === 2 && days == null) { + alertInfo("请填写天数") + return; + } + wx.showModal({ + title: '提示', + content: `确定要对${meterName}进行${["预付费", "强控", "临时强控"][mode]}操作吗？`, + complete: async (res) => { + if (res.cancel) { + + } + + if (res.confirm) { + loadingFunc(async () => { + const { code, message } = await handleOperateMeterMode({ ids: [meter], mode, days: days == null ? undefined : Number(days), reason, images: url }) + if (code !== OK) { + alertInfo(message) + return + } + alertSuccess("操作成功") + + await that.init(); + }) + } + } + }) }, uploadImage() { const that = this; @@ -107,7 +135,7 @@ Page({ } var tempFilePaths = path; loadingFunc(async () => { - const { code, message, url } = await uploadInstallMeter(tempFilePaths) + const { code, message, url } = await uploadMeterForce(tempFilePaths) if (code !== OK) { alertError(message) return @@ -178,56 +206,6 @@ Page({ meter: e.detail }) }, - async handleMeterSwitchOn() { - const that = this; - const { meter, meterName } = this.data; - wx.showModal({ - title: '提示', - content: `您确认要对${meterName || 当前电表}进行合闸吗？`, - complete: async (res) => { - if (res.cancel) { - - } - - if (res.confirm) { - loadingFunc(async () => { - const { code, message } = await handleOperateMeterSwitch({ ids: [meter], status: 0 }) - if (code !== OK) { - alertInfo(message) - return; - } - alertSuccess("合闸成功") - that.init(); - }) - - } - } - }) - }, - async handleMeterSwitchOff() { - const that = this; - const { meter, meterName } = this.data; - wx.showModal({ - title: '提示', - content: `您确认要对${meterName || 当前电表}进行拉闸吗？`, - complete: async (res) => { - if (res.cancel) { - return; - } - if (res.confirm) { - loadingFunc(async () => { - const { code, message } = await handleOperateMeterSwitch({ ids: [meter], status: 1 }) - if (code !== OK) { - alertInfo(message) - return; - } - alertSuccess("拉闸成功") - that.init(); - }) - } - } - }) - }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/workBenchNew/components/workBenchMeterControl/index.wxml b/pages/workBenchNew/components/workBenchMeterControl/index.wxml index 97a2091..498c469 100644 --- a/pages/workBenchNew/components/workBenchMeterControl/index.wxml +++ b/pages/workBenchNew/components/workBenchMeterControl/index.wxml @@ -143,7 +143,7 @@ - 提交 + 确认 返回 diff --git a/service/meter.js b/service/meter.js index 276cc0e..7a11a40 100644 --- a/service/meter.js +++ b/service/meter.js @@ -37,6 +37,12 @@ export const getBackTenementMeters = async function(park, tenement) { export const handleOperateMeterSwitch = async function({ ids = [], status }) { return await PUT(`/equipment/batchSwtich`, { ids, status }); } + +// 预付费模式 +export const handleOperateMeterMode = async function({ ids = [], mode, days, images, reason }) { + return await PUT(`/equipment/batchSetMode`, { ids, mode, days, images, reason }); +} + // 绑定时获取电表的最新信息 export const getWorkMeterDetail = async function(code = '') { return await GET(`/vx/getWorkMeterDetail?code=${code}`); @@ -70,6 +76,6 @@ export const installMeter = async function(data) { } // 拆表 -export const uninstallMeter = async function({sn = "", reason = "", images = ""}) { - return await DELETE(`/flow/doMeterRemoveApproval?sn=${sn}&reason=${reason}&images=${images}`); +export const uninstallMeter = async function(data) { + return await POST(`/flow/doMeterRemoveApproval`, data); } \ No newline at end of file diff --git a/service/public.js b/service/public.js index a7c1acd..731f413 100644 --- a/service/public.js +++ b/service/public.js @@ -63,6 +63,25 @@ export const uploadInstallMeter = (filePath) => { }) } +export const uploadMeterForce = (filePath) => { + const { api } = getConfigByEnv(); + return new Promise((resolve, reject) => { + wx.uploadFile({ + filePath: filePath, + name: 'data', + url: `${api}/image/meter/force`, + header: { + authorization: 'Bearer ' + wx.getStorageSync("token") + }, + success: (res) => { + resolve(res?.data ? JSON.parse(res?.data) : res?.data); + }, + fail: (err) => { + reject(err); + } + }) + }) +} export const uploadUninstallMeter = (filePath) => { const { api } = getConfigByEnv(); return new Promise((resolve, reject) => {