From 851b8b2bae0e72d19db834c6e686b951764fa334 Mon Sep 17 00:00:00 2001
From: pangdongxu <850374051@qq.com>
Date: Tue, 18 Nov 2025 15:14:47 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-18=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.wxss | 2 +-
component/editor/editor.js | 4 +
component/editor/editor.wxml | 2 +-
pages/apply/paymentTemplate/addNew/addNew.js | 2 +-
pages/index/index.wxml | 8 +-
pages/index/majorDetail/majorDetail.js | 120 +++++++++++++++++--
pages/index/majorDetail/majorDetail.wxml | 68 +++++++++--
pages/index/majorDetail/majorDetail.wxss | 17 ++-
pages/majorEvent/majorEvent.js | 2 +-
pages/payee/index.js | 2 +-
pages/paymentManager/toPay/toPay.js | 4 +-
pages/paymentManager/toPay/toPay.wxml | 2 +-
pages/user/login/login.js | 6 +-
pages/user/login/login.wxml | 86 +++----------
project.private.config.json | 2 +-
utils/API.js | 2 +-
16 files changed, 219 insertions(+), 110 deletions(-)
diff --git a/app.wxss b/app.wxss
index 776d6f6..731bb16 100644
--- a/app.wxss
+++ b/app.wxss
@@ -67,7 +67,7 @@ contact-button {
top: 30px;
margin-right: 30px;
display: block;
- color: #000000;
+ color: #ffffff;
text-align: center;
width: 100%;
font-size: 16px;
diff --git a/component/editor/editor.js b/component/editor/editor.js
index 1cf3543..9f87be9 100644
--- a/component/editor/editor.js
+++ b/component/editor/editor.js
@@ -10,6 +10,10 @@ Component({
type: Boolean,
value: true
},
+ hidden: {
+ type: Boolean,
+ value: false
+ },
placeholder: {
type: String,
value: '输入文字...'
diff --git a/component/editor/editor.wxml b/component/editor/editor.wxml
index 53d9c35..e5ceacf 100644
--- a/component/editor/editor.wxml
+++ b/component/editor/editor.wxml
@@ -1,4 +1,4 @@
-
+
@@ -192,11 +192,11 @@
{{item.data.transferType=='2'?'信用卡转账':item.data.transferType=='1'?'银行转账':'其他'}}
- ￥{{item.data.expenditureAmount}}
+ ￥{{item.data.expenditureAmount}}
-
+
@@ -211,7 +211,7 @@
{{item.data.transferType=='2'?'信用卡转账':item.data.transferType=='1'?'银行转账':'其他'}}
- ￥{{item.data.expenditureAmount}}
+ ￥{{item.data.expenditureAmount}}
diff --git a/pages/index/majorDetail/majorDetail.js b/pages/index/majorDetail/majorDetail.js
index 33f45a5..a0b0b3a 100644
--- a/pages/index/majorDetail/majorDetail.js
+++ b/pages/index/majorDetail/majorDetail.js
@@ -21,7 +21,8 @@ Page({
comment:'',
pageType:'',
fileList:[],
- uploadOptions:[]
+ uploadOptions:[],
+ majorTypeOptions:[]
},
/**
@@ -33,6 +34,29 @@ Page({
taskId:options.taskId,
pageType:options.type
})
+ let templateQueryParams = {
+ // 分页
+ type:'5'
+ };
+ UTIL.httpRequest(API.URL_GET_TEMPLATELIST , templateQueryParams, {
+ success: (res) => {
+ that.setData({
+ approvalTemplateList:res.rows,
+ ["form.approvalTemplateId"]:res.rows[0].id,
+ ["form.approvalTemplateName"]:res.rows[0].name,
+ })
+ }
+ })
+
+ //所属银行
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'major_type', {method:'GET'}, {
+ success: (res) => {
+ this.setData({
+ majorTypeOptions:res.data
+ });
+ }
+ })
+
if(options.id!=null&&options.id!=""){
this.setData({id:options.id})
UTIL.httpRequest(API.URL_GET_MAJOREVENTGET + this.data.id, {method:'GET'}, {
@@ -41,23 +65,33 @@ Page({
if(res.data.auditStatus!='0'&&res.data.auditStatus!='2'){
this.setData({'showBtn':false});
}
+ res.data.majorTypeText = UTIL.getTransform(res.data.majorType,that.data.majorTypeOptions);
+ let op = that.data.approvalTemplateList.filter(function (e) { return e.id == res.data.approvalTemplateId; });
+ res.data.approvalTemplateName = op[0].name;
this.setData({'form':res.data})
- that.setData({instanceId:res.data.instanceId})
+ that.setData({auditbatchNo:res.data.auditbatchNo})
let parData = {
- processInstanceId:res.data.instanceId,
- method:'POST'
+ // processInstanceId:res.data.auditbatchNo,
+ method:'GET'
}
- // 查询审批事项流转进度
- UTIL.httpRequest(API.URL_GET_GETPROCESSHISTORY , parData, {
+ // 查询审批事项流转进度 API.URL_GET_GETPROCESSHISTORY
+ UTIL.httpRequest( '/approval/audit/historyList/'+res.data.auditbatchNo, parData, {
success: (res) => {
console.log(res);
that.setData({spsxOptions:res.rows})
}
})
+ this.selectComponent('#hf_editor').setHtml(res.data.eventContent);
+ this.selectComponent('#hf_editor2').setHtml(res.data.dzbty);
+ this.selectComponent('#hf_editor3').setHtml(res.data.lwhsy);
+ this.selectComponent('#hf_editor4').setHtml(res.data.dqyshsyhjy);
+ this.selectComponent('#hf_editor5').setHtml(res.data.cydbhjy);
+ this.selectComponent('#hf_editor6').setHtml(res.data.jcjggk);
+ this.selectComponent('#hf_editor7').setHtml(res.data.ssqkgk);
}
})
//获取附件字典
- UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'common_attach', {method:'GET'}, {
+ UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'major_attach', {method:'GET'}, {
success: (res) => {
this.setData({
uploadOptions:res.data,
@@ -128,7 +162,7 @@ Page({
tableId: id,
tableName: "t_yinnong_majorevent", //上传表
bizPath: "yinnong",
- fileType: res.dictValue, //附件类型 1原始发票 2会议纪要 3会议照片 4 参会人员签字
+ // fileType: res.dictValue, //附件类型 1原始发票 2会议纪要 3会议照片 4 参会人员签字
method:'GET'
}
console.log('aaa');
@@ -338,6 +372,76 @@ Page({
}
})
},
+ goAgreeNew(){//2024-7-15审批功能修改 字段名称、接口地址、请求参数格式发生变动
+ var that = this ;
+ let data = {
+ taskId:that.data.taskId,
+ auditbatchNo:that.data.auditbatchNo,
+ pass:true,
+ remark:that.data.comment == '' ? '同意':that.data.comment,
+ deptId:JSON.parse(wx.getStorageSync('user')).deptId,
+ method:'POST'
+ };
+ console.log(data);
+ UTIL.httpRequest(API.A_audit ,data, {
+ success: (res) => {
+ console.log(res);
+ if (res.code == API.SUCCESS_CODE) {
+ wx.showToast({
+ title: '审批成功',
+ icon: 'success',
+ duration: 2000,
+ complete(){
+ setTimeout(function(){
+ that.back();
+ },2000)
+ }
+ })
+ }else{
+ wx.showToast({
+ title: '操作失败',
+ icon: 'error',
+ duration: 2000
+ })
+ }
+ }
+ })
+ },
+ goDisNew(){//2024-7-15审批功能修改 字段名称、接口地址、请求参数格式发生变动
+ var that = this ;
+ let data = {
+ taskId:that.data.taskId,
+ auditbatchNo:that.data.auditbatchNo,
+ pass:false,
+ remark:that.data.comment == '' ? '驳回':that.data.comment,
+ deptId:JSON.parse(wx.getStorageSync('user')).deptId,
+ method:'POST'
+ };
+ console.log(data);
+ UTIL.httpRequest(API.A_audit ,data, {
+ success: (res) => {
+ console.log(res);
+ if (res.code == API.SUCCESS_CODE) {
+ wx.showToast({
+ title: '审批成功',
+ icon: 'success',
+ duration: 2000,
+ complete(){
+ setTimeout(function(){
+ that.back();
+ },2000)
+ }
+ })
+ }else{
+ wx.showToast({
+ title: '操作失败',
+ icon: 'error',
+ duration: 2000
+ })
+ }
+ }
+ })
+ },
/**
* 生命周期函数--监听页面隐藏
*/
diff --git a/pages/index/majorDetail/majorDetail.wxml b/pages/index/majorDetail/majorDetail.wxml
index f56a3a6..6a9a4fe 100644
--- a/pages/index/majorDetail/majorDetail.wxml
+++ b/pages/index/majorDetail/majorDetail.wxml
@@ -4,11 +4,56 @@
{{form.id?"":"新增"}}重大项目
-
-
- {{form.eventContent}}
-
-
+
+
+ *发生日期
+
+
+ {{form.eventTime?form.eventTime:'发生日期'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -36,7 +81,7 @@
-
+
@@ -50,8 +95,7 @@
- {{item.assigneeName == null ? '' : item.assigneeName}}
- {{item.activityName}}
+ {{item.auditbatchNo == null ? '' : item.auditbatchNo}}