From 9b09d13712c0c005891450a3bf4b6d848ec0ff37 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 29 十一月 2023 10:28:24 +0800
Subject: [PATCH] 2023.11.29
---
pages/mLedger/ledgerupload/ledgerupload.js | 191 ++++++++++++++++++++++++++++++++---------------
1 files changed, 131 insertions(+), 60 deletions(-)
diff --git a/pages/mLedger/ledgerupload/ledgerupload.js b/pages/mLedger/ledgerupload/ledgerupload.js
index 7257283..2544bb5 100644
--- a/pages/mLedger/ledgerupload/ledgerupload.js
+++ b/pages/mLedger/ledgerupload/ledgerupload.js
@@ -1,75 +1,113 @@
// pages/mLedger/ledgerupload/ledgerupload.js
-import bUploadLedger from '../behaviors/bUploadLedger'
-import ledgerservice from "../../../service/ledgerservice"
-import moment from '../../../utils/moment.min'
-import bLoadingToast from '../../../base/behaviors/bLoadingToast'
+import bUploadLedger from '../behaviors/bUploadLedger';
+import bUploadSelfPatrol from '../behaviors/bUploadSelfPatrol';
+import ledgerservice from '../../../service/ledgerservice';
+import selfpatrolservice from '../../../service/selfpatrolservice';
+import moment from '../../../utils/moment.min';
+import bLoadingToast from '../../../base/behaviors/bLoadingToast';
-const app = getApp()
+const app = getApp();
Page({
- behaviors: [bUploadLedger, bLoadingToast],
+ behaviors: [bUploadLedger, bLoadingToast, bUploadSelfPatrol],
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ barTitle: '涓婁紶鍙拌处',
imgFiles: [],
remark: '',
remarkDisable: false,
- previewImageUrls:[],
+ previewImageUrls: [],
previewCurrent: 0,
showPreview: false,
uploadMode: 0,
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- var that = this
- this.getOpenerEventChannel().on('acceptDataFromOpenerPage', function(data) {
- that.setData({
- ledger: data.ledger,
- indexGroup: data.indexGroup
- })
- if (data.barTitle) {
+ var that = this;
+ this.getOpenerEventChannel().on(
+ 'acceptDataFromOpenerPage',
+ function (data) {
+ data.ledger.description = data.ledger.description.replaceAll(
+ '\\n',
+ '\n',
+ );
+ that.setData({
+ ledger: data.ledger,
+ indexGroup: data.indexGroup,
+ type: data.type,
+ taskId: data.taskId,
+ reUpload: data.reUpload,
+ detail: data.detail,
+ });
+ if (data.barTitle) {
+ that.data.barTitle = data.barTitle;
+ }
wx.setNavigationBarTitle({
- title: data.barTitle,
- })
- }
+ title: that.data.barTitle,
+ });
- that.checkStatus()
- })
+ that.checkStatus();
+ },
+ );
},
+ /**
+ * 鍒ゆ柇褰撳墠鍙拌处鐘舵�侊紝濡傛灉鏈変笂浼犺褰曞垯鏄剧ず璁板綍
+ */
checkStatus() {
- if (this.data.ledger.path1) {
- let imgFiles = this.data.ledger.path1
- let remark = this.data.ledger.remark1 == null ? '' : this.data.ledger.remark1
- let remarkDisable = true
- this.setData({imgFiles, remark, remarkDisable})
- }else if (this.data.ledger.upLoad) {
- var that = this
- var userId = app.globalData.accessToken.userId
- var typeId = this.data.ledger.ledgerSubTypeId
- var sceneType = app.globalData.userInfo.extension2
- var time = moment().format('YYYY-MM-DD')
- ledgerservice.getLedgerDetail(userId, typeId, sceneType, time, {
- success (res) {
- if (res.length > 0) {
- let detail = res[0]
- if (detail.upLoad) {
- let imgFiles = detail.path1
- let remark = detail.remark1 == null ? '' : detail.remark1
- let remarkDisable = true
- that.setData({imgFiles, remark, remarkDisable})
+ if (this.data.reUpload) {
+ //do nothing
+ return;
+ } else if (this.data.ledger.path1) {
+ let imgFiles = this.data.ledger.path1;
+ let remark = this.data.remark;
+ if (this.data.ledger.remark1) remark = this.data.ledger.remark1;
+ let remarkDisable = true;
+ this.setData({ imgFiles, remark, remarkDisable });
+ } else if (this.data.ledger.upLoad) {
+ var that = this;
+ var userId = app.globalData.accessToken.userId;
+ var typeId = this.data.ledger.ledgerSubTypeId;
+ var taskId = this.data.taskId;
+ var sceneType = app.globalData.userInfo.extension2;
+ var time = moment().format('YYYY-MM-DD');
+ if (this.data.type == 0) {
+ ledgerservice.getLedgerDetail(userId, typeId, sceneType, time, {
+ success(res) {
+ if (res.length > 0) {
+ let detail = res[0];
+ if (detail.upLoad) {
+ let imgFiles = detail.path1;
+ let remark = detail.remark1 ? detail.remark1 : '';
+ let remarkDisable = true;
+ that.setData({ imgFiles, remark, remarkDisable, detail });
+ }
}
- }
- }
- })
+ },
+ });
+ } else {
+ selfpatrolservice.getSelfPatrolDetail(userId, typeId, taskId, {
+ success(res) {
+ if (res.success) {
+ let detail = res.data;
+ if (detail.upLoad) {
+ let imgFiles = detail.path1;
+ let remark = detail.remark1 ? detail.remark1 : '';
+ let remarkDisable = true;
+ that.setData({ imgFiles, remark, remarkDisable, detail });
+ }
+ }
+ },
+ });
+ }
}
},
@@ -79,12 +117,12 @@
wx.showToast({
title: '璇疯嚦灏戦�夋嫨涓�寮犲浘鐗�',
icon: 'none',
- })
+ });
} else {
this.setData({
showDialog: true,
- uploadMode: 0
- })
+ uploadMode: 0,
+ });
}
},
@@ -92,42 +130,75 @@
onSubmitNoLedger() {
this.setData({
showDialog: true,
- uploadMode: 1
- })
+ uploadMode: 1,
+ });
},
//鎻愪氦鍙拌处
submitLedger() {
this.setData({
showDialog: false,
- })
- if (this.uploadMode == 0) {
- this._uploadLedger()
+ });
+ if (this.data.uploadMode == 0) {
+ if (this.data.type == 0) {
+ this._uploadLedger();
+ } else {
+ this._uploadSelfPatrol();
+ }
} else {
- this._uploadNoLedger()
+ if (this.data.type == 0) {
+ this._uploadNoLedger();
+ } else {
+ this._uploadNoSelfPatrol();
+ }
}
+ },
+
+ reUpload() {
+ wx.navigateTo({
+ url: '/pages/mLedger/ledgerupload/ledgerupload',
+ success: res => {
+ res.eventChannel.emit('acceptDataFromOpenerPage', {
+ ledger: this.data.ledger,
+ detail: this.data.detail,
+ type: this.data.type,
+ indexGroup: this.data.indexGroup,
+ taskId: this.data.taskId,
+ barTitle: `閲嶆柊${this.data.barTitle}`,
+ reUpload: true,
+ });
+ },
+ events: {
+ uploadOver: data => {
+ this.checkStatus();
+ },
+ },
+ });
},
//鍙拌处鎻愪氦鎴愬姛鍚�
_success(res) {
this.getOpenerEventChannel().emit('uploadOver', {
- indexGroup: this.data.indexGroup
- })
+ indexGroup: this.data.indexGroup,
+ });
wx.navigateBack({
delta: 1,
- })
+ });
},
//鍥剧墖鏀惧ぇ棰勮
previewImage(e) {
- const {
- index
- } = e.currentTarget.dataset;
+ const { index } = e.currentTarget.dataset;
const previewImageUrls = this.data.imgFiles;
this.setData({
previewImageUrls,
previewCurrent: index,
- showPreview: true
+ showPreview: true,
});
},
-})
\ No newline at end of file
+
+ onRemarkChange(e) {
+ const { value } = e.detail;
+ this.setData({ remark: value });
+ },
+});
--
Gitblit v1.9.3