zhangzl
/
nsgk_wechat
1
0
Форк 0
Код Проблеми 0 Запити на злиття 0 Релізи 0 Вікі Активність
Переглянути джерело

Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_wechat 

# Conflicts:
#	env/env.js
rongxin_dev
yujk 3 роки тому
джерело
7dc01eda7c 7e9e520a5a
коміт
a0ab21d32e
12 змінених файлів з 763 додано та 263 видалено
Розділений перегляд
Параметри порівняння
Показати статистику Завантажити патч Завантажити файл різниці
  1. +6
    -6
      env/env.js
  2. +122
    -66
      pages/apply/paymentTemplate/add/add.js
  3. +266
    -35
      pages/handle/expenditureAudit/expenditureAudit.js
  4. +8
    -1
      pages/handle/expenditureAudit/expenditureAudit.json
  5. +156
    -71
      pages/handle/expenditureAudit/expenditureAudit.wxml
  6. +109
    -31
      pages/handle/expenditureAudit/expenditureAudit.wxss
  7. +32
    -13
      pages/handle/liist.js
  8. +7
    -7
      pages/handle/liist.wxml
  9. +28
    -12
      pages/index/index.js
  10. +18
    -18
      pages/index/index.wxml
  11. +10
    -2
      utils/API.js
  12. +1
    -1
      utils/util.js

+ 6
- 6
env/env.js Переглянути файл

@@ -4,15 +4,15 @@ module.exports = {
URL_PREFIX: 'http://192.168.31.228:8080',
},
PRE: {
// URL_PREFIX: 'http://192.168.31.178:8080/api',
URL_PREFIX: 'https://dazu.nongshen.net/api',
URL_PREFIX: 'http://192.168.31.178:8080/api',
// URL_PREFIX: 'https://dazu.nongshen.net/api',
},
PROD: {
// URL_PREFIX: 'http://192.168.31.178:8080/api',
URL_PREFIX: 'https://dazu.nongshen.net/api',
URL_PREFIX: 'http://192.168.31.178:8080/api',
// URL_PREFIX: 'https://dazu.nongshen.net/api',
},
IMGURL: {
// URL_PREFIX: 'http://192.168.31.178:8080',
URL_PREFIX: 'https://dazu.nongshen.net',
URL_PREFIX: 'http://192.168.31.178:8080',
// URL_PREFIX: 'https://dazu.nongshen.net',
}
}

+ 122
- 66
pages/apply/paymentTemplate/add/add.js Переглянути файл

@@ -130,75 +130,131 @@ Page({
res.data.transfers[index].payeeList.forEach( (response,i) => {
res.data.transfers[index].payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions);
})
})
that.setData({
form:res.data
})
//收据附件
UTIL.httpRequest(
API.URL_GET_FINDLIST,
{
method:'GET',
tableName:'t_yinnong_transfer',
tableId:res.data.approvalItemTemplate.id,
fileType:1
},
{
success: (res) => {
let list = [];
res.data.forEach(item=>{
list.push({
tempFilePath:URL_PREFIX+item.fileUrl

UTIL.httpRequest(
API.URL_GET_FINDLIST,
{
method:'GET',
tableName:'t_yinnong_transfer',
tableId:item.id,
fileType:1
},
{
success: (res) => {
let list = [];
res.data.forEach((item2,index2)=>{
wx.downloadFile({
url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
success (response) {
if (response.statusCode === 200) {
let fileForm = item.fileForm?item.fileForm:[];
fileForm.push({
file: response.tempFilePath,
fileType:'1',
bizPath:'transfer',
tableName:'t_yinnong_transfer',
tableId:''
})
console.log("--------------fileForm2 start----------------");
console.log(fileForm);
console.log("--------------fileForm2 end----------------");
list.push({
tempFilePath:response.tempFilePath
})
that.setData({
["form.transfers["+index+"].SJimage"]:list,
["form.transfers["+index+"].fileForm"]:fileForm
});
}
}
})
})
})
that.setData({
SJimage:list
});
}
})
//发票
UTIL.httpRequest(
API.URL_GET_FINDLIST,
{
method:'GET',
tableName:'t_yinnong_transfer',
tableId:res.data.approvalItemTemplate.id,
fileType:2
},
{
success: (res) => {
let list = [];
res.data.forEach(item=>{
list.push({
tempFilePath:URL_PREFIX+item.fileUrl
}
})
//发票
UTIL.httpRequest(
API.URL_GET_FINDLIST,
{
method:'GET',
tableName:'t_yinnong_transfer',
tableId:item.id,
fileType:2
},
{
success: (res) => {
let list = [];
res.data.forEach((item2,index2)=>{
wx.downloadFile({
url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
success (response) {
if (response.statusCode === 200) {
let fileForm = item.fileForm?item.fileForm:[];
fileForm.push({
file: response.tempFilePath,
fileType:'2',
bizPath:'transfer',
tableName:'t_yinnong_transfer',
tableId:item.id
})
list.push({
tempFilePath:response.tempFilePath
})
that.setData({
["form.transfers["+index+"].FPimage"]:list,
["form.transfers["+index+"].fileForm"]:fileForm
});
}
}
})
})
})
that.setData({
FPimage:list
});
}
})
//其他
UTIL.httpRequest(
API.URL_GET_FINDLIST,
{
method:'GET',
tableName:'t_yinnong_transfer',
tableId:res.data.approvalItemTemplate.id,
fileType:3
},
{
success: (res) => {
let list = [];
res.data.forEach(item=>{
list.push({
tempFilePath:URL_PREFIX+item.fileUrl
}
})
//其他
UTIL.httpRequest(
API.URL_GET_FINDLIST,
{
method:'GET',
tableName:'t_yinnong_transfer',
tableId:item.id,
fileType:3
},
{
success: (res) => {
let list = [];
let fileForm = item.fileForm?item.fileForm:[];
res.data.forEach((item2,index2)=>{
wx.downloadFile({
url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
success (response) {
if (response.statusCode === 200) {
let fileForm = item.fileForm?item.fileForm:[];
fileForm.push({
file: response.tempFilePath,
fileType:'3',
bizPath:'transfer',
tableName:'t_yinnong_transfer',
tableId:item.id
})
list.push({
tempFilePath:response.tempFilePath
})
that.setData({
["form.transfers["+index+"].QTimage"]:list,
["form.transfers["+index+"].fileForm"]:fileForm
});
}
}
})
})
})
that.setData({
QTimage:list
});
}
}
})
})
that.setData({
form:res.data
})
}
}


+ 266
- 35
pages/handle/expenditureAudit/expenditureAudit.js Переглянути файл

@@ -1,4 +1,11 @@
// pages/handle/expenditureAudit/expenditureAudit.js
import * as UTIL from '../../../utils/util.js';
import * as API from '../../../utils/API.js';
let EVN_CONFIG = require('../../../env/env');
const DISTRIBUTE_ENVIROMENT = 'IMGURL';
let {
URL_PREFIX,
} = EVN_CONFIG[DISTRIBUTE_ENVIROMENT];
const app = getApp();
Page({

@@ -7,49 +14,273 @@ Page({
*/
data: {
isIPX: app.globalData.isIPX,
steps: [
{
assigneeName: '同意',
activityName: '测试测试',
durationInMillis: '描述信息',
endTime: '2022-01-02',
comment: '同意',
type: '1'
},
{
assigneeName: '申请中',
activityName: '测试测试',
durationInMillis: '描述信息',
endTime: '2022-01-02',
comment: '同意',
type: '2'
},
{
assigneeName: '驳回',
activityName: '测试测试',
durationInMillis: '描述信息',
endTime: '2022-01-02',
comment: '同意',
type: '3'
},
{
assigneeName: '步骤四',
activityName: '测试测试',
durationInMillis: '描述信息',
endTime: '2022-01-02',
comment: '同意'
},
],
active:0
active:0,
spsxOptions:[]
},

/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
var that = this;
console.log(options);
that.setData({
taskId:options.taskId
})
UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, {
success: (res) => {
if (res.code == API.SUCCESS_CODE) {
that.setData({
["form.approvalItemTemplate.submitCompany"]:res.user.bookName,
["form.approvalItemTemplate.submitDate"]:UTIL.js_date_time(new Date()),
["form.approvalItemTemplate.submitter"]:res.user.nickName,
["form.approvalItemTemplate.telephone"]:res.user.phonenumber,
})

},
}
}
})
//所属银行
UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, {
success: (res) => {
this.setData({
bankTypeOptions:res.data
});
}
})
// 资金支出类别字典查询
UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'capital_expenditure_type', {method:'GET'}, {
success: (res) => {
that.setData({
capitalExpenditureTypeOptions:res.data,
})
}
})
// 付款方式类型字典查询
UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'transfer_type', {method:'GET'}, {
success: (res) => {
that.setData({
transferTypeOptions:res.data,
})
}
})
// 项目工程列表
UTIL.httpRequest(API.URL_GET_GETPROJECTLIST , {method:'GET'}, {
success: (res) => {
that.setData({
projectOptions:res.rows,
})
}
})
// 工程款类型字典查询
UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'project_fund_type', {method:'GET'}, {
success: (res) => {
that.setData({
projectFundTypeOptions:res.data,
})
}
})
// 获取合同信息列表
UTIL.httpRequest(API.URL_GET_CONTRACTIONLIST , {method:'GET'}, {
success: (res) => {
that.setData({
contractionOptions:res.rows,
})
}
})
UTIL.httpRequest(API.URL_GET_APPROVALITEMS+options.id, {method:'GET'}, {
success: (res) => {
if (res.code == API.SUCCESS_CODE) {
console.log(that.data.capitalExpenditureTypeOptions);
if(res.data.approvalItemTemplate == null){return;}
res.data.transfers.forEach( (item,index) => {
res.data.transfers[index].capitalExpenditureTypeText = UTIL.getTransform(item.capitalExpenditureType,that.data.capitalExpenditureTypeOptions);
res.data.transfers[index].transferTypeText = UTIL.getTransform(item.transferType,that.data.transferTypeOptions);

res.data.transfers[index].bankTypeText = UTIL.getTransform(item.bankType,that.data.bankTypeOptions);

res.data.transfers[index].payeeList.forEach( (response,i) => {
res.data.transfers[index].payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions);
})

UTIL.httpRequest(
API.URL_GET_FINDLIST,
{
method:'GET',
tableName:'t_yinnong_transfer',
tableId:item.id,
fileType:1
},
{
success: (res) => {
let list = [];
res.data.forEach((item2,index2)=>{
wx.downloadFile({
url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
success (response) {
if (response.statusCode === 200) {
let fileForm = item.fileForm?item.fileForm:[];
fileForm.push({
file: response.tempFilePath,
fileType:'1',
bizPath:'transfer',
tableName:'t_yinnong_transfer',
tableId:''
})
console.log("--------------fileForm2 start----------------");
console.log(fileForm);
console.log("--------------fileForm2 end----------------");
list.push({
tempFilePath:response.tempFilePath
})
that.setData({
["form.transfers["+index+"].SJimage"]:list,
["form.transfers["+index+"].fileForm"]:fileForm
});
}
}
})
})
}
})
//发票
UTIL.httpRequest(
API.URL_GET_FINDLIST,
{
method:'GET',
tableName:'t_yinnong_transfer',
tableId:item.id,
fileType:2
},
{
success: (res) => {
let list = [];
res.data.forEach((item2,index2)=>{
wx.downloadFile({
url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
success (response) {
if (response.statusCode === 200) {
let fileForm = item.fileForm?item.fileForm:[];
fileForm.push({
file: response.tempFilePath,
fileType:'2',
bizPath:'transfer',
tableName:'t_yinnong_transfer',
tableId:item.id
})
list.push({
tempFilePath:response.tempFilePath
})
that.setData({
["form.transfers["+index+"].FPimage"]:list,
["form.transfers["+index+"].fileForm"]:fileForm
});
}
}
})
})
}
})
//其他
UTIL.httpRequest(
API.URL_GET_FINDLIST,
{
method:'GET',
tableName:'t_yinnong_transfer',
tableId:item.id,
fileType:3
},
{
success: (res) => {
let list = [];
let fileForm = item.fileForm?item.fileForm:[];
res.data.forEach((item2,index2)=>{
wx.downloadFile({
url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
success (response) {
if (response.statusCode === 200) {
let fileForm = item.fileForm?item.fileForm:[];
fileForm.push({
file: response.tempFilePath,
fileType:'3',
bizPath:'transfer',
tableName:'t_yinnong_transfer',
tableId:item.id
})
list.push({
tempFilePath:response.tempFilePath
})
that.setData({
["form.transfers["+index+"].QTimage"]:list,
["form.transfers["+index+"].fileForm"]:fileForm
});
}
}
})
})
}
})
})
that.setData({
form:res.data
})
}
}
})
// 查询审批事项流转进度
UTIL.httpRequest(API.URL_GET_GETPROCESS+options.id , {method:'GET'}, {
success: (res) => {
console.log(res);
that.setData({
spsxOptions:res.data.processSchedule.spsx,
instanceId:res.data.instanceId
})
}
})
},
goDis(){
var that = this ;
let data = {
taskId:that.data.taskId,
instanceId:that.data.instanceId,
variables:JSON.stringify({
comment:'驳回',
pass:false,
}),
method:'POST'
};
UTIL.httpRequest(API.URL_GET_PROCESSCOMPLETE , data, {
success: (res) => {
console.log(res);
// that.setData({
// spsxOptions:res.data.processSchedule.spsx
// })
}
})
},
goAgree(){
var that = this ;
let data = {
taskId:that.data.taskId,
instanceId:that.data.instanceId,
variables:JSON.stringify({
"comment":'同意',
"pass":true,
})
};
UTIL.httpRequest(API.URL_GET_PROCESSCOMPLETE ,data, {
success: (res) => {
console.log(res);
// that.setData({
// spsxOptions:res.data.processSchedule.spsx
// })
}
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/


+ 8
- 1
pages/handle/expenditureAudit/expenditureAudit.json Переглянути файл

@@ -8,6 +8,13 @@
"van-tag": "@vant/weapp/tag/index",
"van-icon": "@vant/weapp/icon/index",
"van-steps": "@vant/weapp/steps/index",
"van-button": "@vant/weapp/button/index"
"van-button": "@vant/weapp/button/index",
"van-radio": "@vant/weapp/radio/index",
"van-radio-group": "@vant/weapp/radio-group/index",
"van-field": "@vant/weapp/field/index",
"van-popup": "@vant/weapp/popup/index",
"van-picker": "@vant/weapp/picker/index",
"van-calendar": "@vant/weapp/calendar/index",
"van-dialog": "@vant/weapp/dialog/index"
}
}

+ 156
- 71
pages/handle/expenditureAudit/expenditureAudit.wxml Переглянути файл

@@ -6,80 +6,165 @@
<view class="pure_top" style="top:{{isIPX?'88px':'64px'}};"></view>
<view class="main-box top-box" style="margin-top:{{isIPX?'100px':'75px'}};">
<text class="box-title">审批事项</text>
<text style="margin-bottom: 20px;">房屋出租整年费用</text>
<text>提交单位：龙华村联合社</text>
<text>提交日期：2022年1月18日</text>
<text>提 交 人：报账员</text>
<text>联系电话：13906311234</text>
<input class="input_tit" placeholder="请输入审批事项" value="{{form.approvalItemTemplate.approvalItems}}" bindinput="bindKeyInput"/>
<text>提交单位：{{form.approvalItemTemplate.submitCompany}}</text>
<text>提交日期：{{form.approvalItemTemplate.submitDate}}</text>
<text>提 交 人：{{form.approvalItemTemplate.submitter}}</text>
<text>联系电话：{{form.approvalItemTemplate.telephone}}</text>
</view>
<view class="main-title">事项一</view>
<view class="center">
<text class="title">基础信息</text>
<view class="main-box table-box">
<view><text>申请流水号</text> <text>2056886342464224214</text></view>
<view><text>申请时间</text> <text>2021-1-26</text></view>
<view><text>合计支出</text> <text>¥ 00.00</text></view>
<view><text>支出原因</text> <text>请输入支出原因</text></view>
<view><text>资金支出类别</text> <text>结算类</text></view>
</view>
<text class="title">付款方信息</text>
<view class="main-box table-box">
<view><text>付款方式</text> <text>2056886342464224214</text></view>
<view><text>付款方名称<icon>必填</icon></text> <text>2021-1-26</text></view>
<view><text>付款方账号</text> <text>¥ 00.00</text></view>
<view><text>所属银行</text> <text>请输入支出原因</text></view>
<view><text>转账附言</text> <text>结算类</text></view>
</view>
<text class="title">收款方信息</text>
<view class="center-box">
<view class="main-box table-box"><view><text>收款账户类型</text> <text>结算类</text></view></view>
<block wx:for="{{form.transfers}}" wx:key="index">
<view class="main-title">事项{{form.transfers[index].num}}</view>
<view class="center">
<text class="title">基础信息</text>
<view class="main-box table-box">
<view class="xm"><text>张曼玉</text> <text>2056886342464224214</text></view>
<view><text>李四</text> <text>2021-1-26</text></view>
<view><text>收款账户</text> <text>6785 4565 4554 5111 542</text></view>
<view><text>开户银行</text> <text>中国银行哈工大支行</text></view>
<view><text>收入金额</text> <text>￥153000</text></view>
<view><text>所属银行</text> <text>中国银行哈工大支行</text></view>
<van-field label="申请时间" readonly is-link value="{{ form.transfers[index].applyDate }}" placeholder="请选择申请时间" border="{{ false }}" bind:change="onChange" input-align="right" bindtap="openBox" data-name="showApplyDate" />

<van-field readonly label="合计支出" value="{{ form.transfers[index].expenditureAmount }}" placeholder="(自动计算)" border="{{ false }}" data-formname="form.transfers[{{index}}].expenditureAmount" input-align="right"/>

<van-field label="支出原因" readonly value="{{ form.transfers[index].remark }}" placeholder="请输入支出原因" border="{{ false }}" bind:change="onChange" input-align="right" data-formname="form.transfers[{{index}}].remark" data-value="form.transfers[{{index}}].remark"/>

<van-field label="资金支出类别" readonly value="{{ form.transfers[index].capitalExpenditureTypeText }}" placeholder="请选择资金支出类别" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction ="down" bindtap="openBox" data-name="showCapitalExpenditureType"/>
</view>
</view>
<block wx:if="{{form.transfers[index].capitalExpenditureType == 2}}">
<text class="title">关联项目</text>
<view class="main-box table-box">
<van-field label="项目名称" readonly value="{{ projectForm.projectName }}" placeholder="请输入项目名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link bindtap="openBox" data-name="showProject"/>
<van-field label="承建单位" readonly value="{{ projectForm.projectContractor }}" placeholder="请输入承建单位" border="{{ false }}" bind:change="onChange" input-align="right"/>
<van-field label="合同价款(元)" readonly value="{{ projectForm.projectAmount }}" placeholder="请输入合同价款（元）" border="{{ false }}" bind:change="onChange" input-align="right"/>
<van-field label="工程款类型" readonly value="{{ projectForm.projectFundTypeText }}" placeholder="请选择工程款类型" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction ="down" bindtap="openBox" data-name="showProjectFundType"/>
<van-field label="工程发票号" readonly value="{{ projectForm.projectBillNum }}" placeholder="请输入工程发票号" border="{{ false }}" bind:change="onChange" input-align="right"/>
</view>
</block>

<view class="main-box">
<van-cell>
<!-- <view slot="icon">
<van-icon class-prefix="my-icon" name="extra" />
</view> -->
<view slot="title">
<view class="van-cell-text">附件<van-tag type="danger" style="margin-left: 10px;">可拍照</van-tag></view>
<block wx:if="{{form.transfers[index].capitalExpenditureType == 4}}">
<text class="title">关联合同</text>
<view class="main-box table-box">
<van-field label="合同名称" readonly value="{{ contractionForm.name }}" placeholder="请选择合同名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link bindtap="openBox" data-name="showContraction"/>
<van-field label="合同编码" readonly value="{{ contractionForm.code }}" placeholder="请输入合同编码" border="{{ false }}" bind:change="onChange" input-align="right"/>
<van-field label="合同价款(元)" readonly value="{{ contractionForm.totalAmount }}" placeholder="请输入合同价款（元）" border="{{ false }}" bind:change="onChange" input-align="right"/>
</view>
<view>
<view class="van-cell-text">总数<van-tag round color="#5CAE77" plain style="margin-left: 10px;">6张</van-tag></view>
</block>


<text class="title">付款方信息</text>
<view class="main-box table-box">
<van-field label="付款方式" readonly value="{{ form.transfers[index].transferTypeText }}" placeholder="请输入付款方式" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction ="down" bindtap="openBox" data-name="showTransferType"/>

<van-field wx:if="{{form.transfers[index].transferType != 12}}" readonly value="{{ form.transfers[index].payer }}" placeholder="请选择付款方名称" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction ="down" bindtap="openBox" data-name="showAccount">
<view slot="label">
付款方<van-tag plain type="danger" color="red" round style="margin-left:10px;">必填</van-tag>
</view>
</van-field>

<van-field readonly wx:if="{{form.transfers[index].transferType == 11}}" label="可用余额(元)" value="{{ balance }}" placeholder="可用余额" border="{{ false }}" bind:change="onChange" input-align="right"/>
<block wx:elif="{{form.transfers[index].transferType == 12}}">
<van-field readonly label="出票方" value="{{ form.transfers[index].payerAccount }}" placeholder="请选择出票方" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction ="down" bindtap="openBox" data-name="showMoneyorder"/>

<van-field readonly label="汇票号码" value="{{ form.transfers[index].bankTypeText }}" placeholder="汇票号码" border="{{ false }}" bind:change="onChange" input-align="right"/>
<van-field readonly label="出票金额(元)" value="{{ form.transfers[index].bankTypeText }}" placeholder="出票金额(元)" border="{{ false }}" bind:change="onChange" input-align="right"/>
<van-field readonly label="汇票类型" value="{{ form.transfers[index].bankTypeText }}" placeholder="汇票类型" border="{{ false }}" bind:change="onChange" input-align="right"/>
<van-field readonly label="开票日" value="{{ form.transfers[index].bankTypeText }}" placeholder="开票日" border="{{ false }}" bind:change="onChange" input-align="right"/>
<van-field readonly label="到期日" value="{{ form.transfers[index].bankTypeText }}" placeholder="到期日" border="{{ false }}" bind:change="onChange" input-align="right"/>
</block>
<block wx:else>
<van-field readonly label="付款方账号" value="{{ form.transfers[index].payerAccount }}" placeholder="请输入付款方账号" border="{{ false }}" bind:change="onChange" input-align="right"/>
<van-field readonly label="所属银行" value="{{ form.transfers[index].bankTypeText }}" placeholder="请输入所属银行" border="{{ false }}" bind:change="onChange" input-align="right"/>
</block>

</view>
<text class="title">收款方信息</text>
<view class="center-box">
<view class="main-box table-box" wx:if="{{form.transfers[index].bankType == 1 && form.transfers[index].transferType != 10 && form.transfers[index].transferType != 11 && form.transfers[index].transferType != 12}}">
<van-cell title="收款账户类型" center border="{{false}}">
<view style="float: right;">
<van-radio-group
value="{{ form.transfers[index].bankAccountType }}"
bind:change="onChange"
direction="horizontal"
data-value="form.transfers[{{index}}].bankAccountType"
>
<van-radio name="1" checked-color="#2C8E68">公户</van-radio>
<van-radio name="2" checked-color="#2C8E68">私户</van-radio>
</van-radio-group>
</view>
</van-cell>
</view>
</van-cell>
<view class="fj-box">
<view class="fj-li">
<text>
收
据
</text>
<view class="main-box table-box" wx:if="{{(form.transfers[index].bankType == 2 || form.transfers[index].bankType == 3 || form.transfers[index].bankType == 4) && (form.transfers[index].transferType != 10 && form.transfers[index].transferType != 11 && form.transfers[index].transferType != 12)}}">
<van-cell title="是否同行" center border="{{false}}">
<view style="float: right;">
<van-radio-group
value="{{ form.transfers[index].isPeers }}"
bind:change="onChange"
direction="horizontal"
data-value="form.transfers[{{index}}].isPeers"
>
<van-radio name="Y" checked-color="#2C8E68">是</van-radio>
<van-radio name="N" checked-color="#2C8E68">否</van-radio>
</van-radio-group>
</view>
</van-cell>
</view>
<view class="fj-li">
<text>
发
票
</text>

<view class="main-box table-box" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId">
<van-field readonly value="{{ form.transfers[index].payeeList[childrenIndex].payee }}" placeholder="请输入姓名" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction ="down" bindtap="goPayeeList" data-payer="{{form.transfers[index].payer}}" data-index="{{index}}" data-isPeers="{{ form.transfers[index].isPeers }}" data-bankType="{{ form.transfers[index].bankType }}" data-accountType="{{ form.transfers[index].bankAccountType }}" data-transferType="{{ form.transfers[index].transferType }}">
<view slot="label">
姓名<van-tag plain type="danger" color="#5CAE77" round style="margin-left:10px;">收款方</van-tag>
</view>
</van-field>
<van-field readonly label="收款账户" value="{{ form.transfers[index].payeeList[childrenIndex].payeeAccount }}" placeholder="请输入收款账户" border="{{ false }}" bind:change="onChange" input-align="right"/>
<van-field readonly label="开户银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankDeposit }}" placeholder="请输入开户银行" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction ="down"/>
<van-field readonly label="收入金额" value="{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" placeholder="请输入收入金额" border="{{ false }}" bind:change="onChangeMoney" input-align="right" data-formname="form.transfers[{{index}}].payeeList[{{childrenIndex}}]" data-index="{{index}}" data-childrenIndex="{{childrenIndex}}"/>

<van-field readonly label="所属银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankTypeText }}" placeholder="请输入所属银行" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction ="down"/>
</view>
<view class="fj-li">
<text>
其
他
</text>
</view>

<view class="main-box">
<van-cell>
<!-- <view slot="icon">
<van-icon class-prefix="my-icon" name="extra" />
</view> -->
<view slot="title">
<view class="van-cell-text">附件<van-tag type="danger" style="margin-left: 10px;">可拍照</van-tag></view>
</view>
<view>
<view class="van-cell-text">总数<van-tag round color="#5CAE77" plain style="margin-left: 10px;"> {{form.transfers[index].fileNum?form.transfers[index].fileNum:0}}张 </van-tag></view>
</view>
</van-cell>
<view class="fj-box">
<view class="fj-li">
<view>
<text>收\n据</text>
</view>
<view class="img_box">
<image wx:for="{{form.transfers[index].SJimage}}" src="{{item.tempFilePath}}" wx:key="index" data-option="{{form.transfers[index].SJimage}}" data-index="{{index}}" bindtap="openPreview"></image>
<!-- <image src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="SJtakephoto"></image> -->
</view>
</view>
<view class="fj-li">
<view>
<text>发\n票</text>
</view>
<view class="img_box">
<image wx:for="{{form.transfers[index].FPimage}}" src="{{item.tempFilePath}}" data-option="{{form.transfers[index].FPimage}}" data-index="{{index}}" bindtap="openPreview" wx:key="index"></image>
<!-- <image src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="FPtakephoto"></image> -->
</view>
</view>
<view class="fj-li">
<view>
<text>其\n他</text>
</view>
<view class="img_box">
<image wx:for="{{form.transfers[index].QTimage}}" src="{{item.tempFilePath}}" data-option="{{form.transfers[index].QTimage}}" data-index="{{index}}" bindtap="openPreview" wx:key="index"></image>
<!-- <image src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="QTtakephoto"></image> -->
</view>
</view>
</view>
</view>
</view>

<view class="main-box steps-box">
<view class="steps-tit">审批流程</view>
<van-row wx:for="{{steps}}" wx:key="index">
<van-row wx:for="{{spsxOptions}}" wx:key="index">
<van-col span="3">
<view class="index">{{index+1}}</view>
<!-- :class="{'indexCenter':index==0 ? false : true}" -->
@@ -87,36 +172,36 @@
<view class="indexBorder">
<view class="ssT" wx:if="{{index>0}}"></view>
<view class="yq"></view>
<view class="ss" wx:if="{{steps.length != index+1}}"></view>
<view class="ss" wx:if="{{spsxOptions.length != index+1}}"></view>
</view>
</block>
<block wx:else>
<view class="indexBorder indexCenter">
<view class="ssT" wx:if="{{index>0}}"></view>
<view class="yq"></view>
<view class="ss" wx:if="{{steps.length != index+1}}"></view>
<view class="ss" wx:if="{{spsxOptions.length != index+1}}"></view>
</view>
</block>
</van-col>
<van-col span="21">
<van-cell title="{{item.activityName}}" center="{{true}}" border="{{false}}">
<view class="agree" wx:if="{{item.type=='1'}}">{{ item.assigneeName }}</view>
<view class="in" wx:if="{{item.type=='2'}}">{{ item.assigneeName }}</view>
<view class="disagree" wx:if="{{item.type=='3'}}">{{ item.assigneeName }}</view>
<van-cell title="{{item.assigneeName}}{{item.deptLabel}}" center="{{true}}" border="{{false}}">
<view class="agree" wx:if="{{item.type=='1'}}">{{ item.comment }}</view>
<view class="in" wx:if="{{item.type=='2'}}">{{ item.comment }}</view>
<view class="disagree" wx:if="{{item.type=='3'}}">{{ item.comment }}</view>
</van-cell>

<van-cell center border="{{false}}">
<view slot="title">
<view style="color: #999999;">{{ item.durationInMillis }}</view>
</view>
<view style="color: #999999;font-size: 12px;">{{ item.endTime }}</view>
<view style="color: #999999;font-size: 12px;">{{ item.time.substr(0,10) }}</view>
</van-cell>
</van-col>
</van-row>
</view>
</view>
</block>
<view class="bottom">
<button type="warn" plain class="btnDis">驳回</button>
<button type="primary" class="btnAgree">同意</button>
<button type="warn" plain class="btnDis" bindtap="goDis">驳回</button>
<button type="primary" class="btnAgree" bindtap="goAgree">同意</button>
</view>

+ 109
- 31
pages/handle/expenditureAudit/expenditureAudit.wxss Переглянути файл

@@ -1,4 +1,4 @@
/* pages/handle/expenditureAudit/expenditureAudit.wxss */
/* pages/apply/paymentTemplate/add/add.wxss */
text{display: block;}
.top{
height: 64px;
@@ -17,24 +17,13 @@ text{display: block;}
width: 100%;
font-size: 16px;
}
.pure_top {
width: 100%;
height: 120px;
position: absolute;
z-index: -1;
overflow: hidden
}
.pure_top::after {
content: '';
width: 140%;
height: 120px;
position: absolute;
left: -20%;
top: 0;
z-index: -1;
border-radius: 0 0 50% 50%;
background: linear-gradient(to right, #2C8E68, #B3DB62);
.input_tit{
border: 1px solid #DCDCDC;
padding: 0px 10px;
height: 32px;
line-height: 32px;
border-radius: 5px;
margin-bottom: 15px;
}
.bgPage{
width: 140%;
@@ -43,6 +32,9 @@ text{display: block;}
height: 300px;
z-index: -1;
}
.center{
padding-bottom: 28px;
}
.main-title{
background-image: linear-gradient(to right, #2C8E68 , #B3DB62);
color: #ffffff;
@@ -71,27 +63,28 @@ text{display: block;}
.top-box text{
margin-bottom: 15px;
}
.main-box view{
margin-bottom: 15px;
}
.main-box view:last-child{
.top-box text:last-child{
margin-bottom: 0px;
}
.box-title{
color: #2C8E68;
text-align: center;
font-size: 16px;
}
.center-box .main-box{
margin-bottom: 15px;
}
.xm{
.xm van-cell:first-child .van-cell{
border-bottom: 1px solid #cccccc;
margin: 0;
padding-bottom: 15px;
padding-bottom: 15px!important;
margin-bottom: 15px;
}
.table-box view{
display: flex;
justify-content: space-between;
.table-box van-field van-cell .van-cell{
margin-bottom: 15px;
}
.table-box van-field:last-child van-cell .van-cell{
margin-bottom: 0px;
}
.table-box view text icon{
display: inline-block;
@@ -116,13 +109,85 @@ text{display: block;}
.fj-box text{
background-color: #5CAE77;
color: #ffffff;
display: inline-block;
text-align: center;
border-radius: 5px;
white-space:pre-wrap
white-space:pre-wrap;
padding: 22px 15px;
}
.fj-li{
margin-top: 20px;
display: flex;
/* flex-wrap: wrap; */
}
.fj-li image{
width: 25%;
height: 18.5vw;
margin-left: 5%;
}
.fj-li image:nth-child(n+5){
margin-top: 15px;
}
.bottomBtn{
display: flex;
width: 94%;
margin: 0 auto;
justify-content:space-between;
}
.bottomBtn view{
display: flex;
width: 48%;
background-color: #ffffff;
border-radius: 5px;
box-shadow: 0px 5px 9px #DCDCDC;
padding: 10px 0px;
text-align: center;
align-items:center;
justify-content:center;
font-size: 14px;
color: #2C8E68;
}
.bottomBtn view image{
width: 18px;
height: 18px;
margin-right: 5px;
}


.bottom{
width: 84%;
margin: 0 auto;
text-align: center;
margin-top: 50px;
margin-bottom: 50px;
display: flex;
}

.bottom view {
width: 47%;
margin: 0 auto;
border-radius: 30px;
display: inline-block;
}

.bottom .btn1{
border: 1px solid #2C8E68;
padding: 8px 0px;
color: #2C8E68;
}

.bottom .btn2{
border: 1px solid transparent;
padding: 8px 0px;
background-image: linear-gradient(to right, #2C8E68, #5CAE77);
margin-left: 6%;
color: #fff;
}
.bottom .btn3{
border: 1px solid transparent;
padding: 8px 0px;
background-image: linear-gradient(to right, #2C8E68, #5CAE77);
color: #fff;
width: 100%;
}
.steps-box{
padding: 0;
@@ -245,7 +310,7 @@ text{display: block;}
margin: 0 auto;
text-align: center;
margin-top: 30px;
margin-bottom: 30px;
margin-bottom: 80px;
}

.bottom button {
@@ -259,4 +324,17 @@ text{display: block;}
border: 1px solid transparent;
background-image: linear-gradient(to right, #2C8E68, #5CAE77);
margin-left: 6%;
}

.input_tit{
border: 1px solid #DCDCDC;
padding: 0px 10px;
height: 32px;
line-height: 32px;
border-radius: 5px;
margin-bottom: 15px;
}
.img_box{
position: relative;
width: 100%;
}

+ 32
- 13
pages/handle/liist.js Переглянути файл

@@ -1,6 +1,7 @@
// pages/handle/liist.js
import * as UTIL from '../../utils/util.js';
import * as API from '../../utils/API.js';
const app = getApp();
Page({

/**
@@ -37,7 +38,8 @@ Page({
{"dictVale":10,"dictLabel":"现金提现"},
{"dictVale":11,"dictLabel":"现金使用"},
{"dictVale":12,"dictLabel":"汇票支出"}
]
],
userInfoObj:[]
},

/**
@@ -50,15 +52,29 @@ Page({
}else{
this.setData({pageTitle:"发起/制单"})
}
//查询待办
this.getTaskList();
//查询已办
this.getTaskDoneList();
//查询已发起
this.getTransferList();
this.getTransferList1();
//查询已制单
this.getTransferList2();
//获取用户信息
this.getUserInfo()
},
/* 获取用户信息*/
getUserInfo(){
UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, {
success: (res) => {
if (res.code == API.SUCCESS_CODE) {
this.setData({userInfoObj:res.user})
this.setData({region:res.user.deptName})
this.setData({item:JSON.stringify(res.user)})
//查询待办
this.getTaskList();
//查询已办
this.getTaskDoneList();
//查询已发起
this.getTransferList();
//查询已制单
this.getTransferList2();
}
}
})
},
bindPickerChange:function(e){zhibob
this.setData({index:e.detail.value});
@@ -68,6 +84,7 @@ Page({
active:e.currentTarget.dataset.gid
})
},

dictTranslate(d,value){
let val = ""
for(var index in d){
@@ -127,7 +144,7 @@ Page({
// pageNum:1,
// pageSize:10,
transferType:"1",
auditStatus:"2",
status:"5",
method:"GET",
capitalExpenditureType:(this.data.index+1)
}
@@ -173,12 +190,14 @@ Page({
},
//已制单
getTransferList2:function(e){
console.log(this.data.userInfoObj)
let data = {
// pageNum:1,
// pageSize:10,
transferType:"1",
auditStatus:"0",
method:"GET"
status:"0",
method:"GET",
submitter:this.data.userInfoObj.nickName
}
UTIL.httpRequest(API.URL_GET_TRANSFERLIST,data, {
success: (res) => {


+ 7
- 7
pages/handle/liist.wxml Переглянути файл

@@ -32,7 +32,7 @@
</view> -->
</view>
<scroll-view scroll-y="true" wx-if="{{active==1}}" style="height: {{wrokScrollHeight}}px;">
<view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="id">
<view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="index">
<!--1-->
<view class="workflow_list">
<view class="process_intro">
@@ -52,7 +52,7 @@
</scroll-view>
<scroll-view scroll-y="true" wx-if="{{active==2}}" style="height: {{wrokScrollHeight}}px;">
<view class="workflow" wx:if="{{active=='2'}}" wx:for-item="item" wx:for="{{doneList}}" wx:key="id">
<view class="workflow" wx:if="{{active=='2'}}" wx:for-item="item" wx:for="{{doneList}}" wx:key="index">
<!--1-->
<view class="workflow_list">
<view class="process_intro">
@@ -71,7 +71,7 @@
</view>
</scroll-view>
<scroll-view scroll-y="true" wx-if="{{active==3}}" style="height: {{wrokScrollHeight}}px;">
<view class="workflow" wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id">
<view class="workflow" wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="index">
<!--1-->
<view class="workflow_list">
<view class="process_intro">
@@ -95,16 +95,16 @@
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">{{item.payer}}</view>
<view class="name">{{item.submitter}}</view>
<!-- <view class="state">已制单</view> -->
<view class="time">{{item.applyDate}}</view>
<view class="time">{{item.submitDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.remark}}</text>
<text class="textLimit">{{item.approvalItems}}</text>
</view>
<view class="amount"><text class="unit">￥</text>{{item.expenditureAmount}}</view>
<view class="amount"><text class="unit">￥</text>{{item.totalAmount}}</view>
</view>
</view>
</view>


+ 28
- 12
pages/index/index.js Переглянути файл

@@ -59,11 +59,7 @@ Page({
this.getTaskList();
//查询已办
this.getTaskDoneList();
//查询已发起
this.getTransferList();
this.getTransferList1();
//查询已制单
this.getTransferList2();
//查询dept
this.getTreeDept();
},
@@ -101,7 +97,8 @@ Page({
orderByColumn:"A.ID_",
isAsc:"desc",
systemType:4,
method:"GET"
method:"GET",
taskName:'相关人员审批'
}
UTIL.httpRequest(API.URL_GET_TASKLIST,data, {
success: (res) => {
@@ -129,7 +126,8 @@ Page({
orderByColumn:"A.ID_",
isAsc:"desc",
systemType:4,
method:"GET"
method:"GET",
taskName:'相关人员审批'
}
UTIL.httpRequest(API.URL_GET_TASKDONELIST,data, {
success: (res) => {
@@ -155,8 +153,9 @@ Page({
// pageNum:1,
// pageSize:10,
transferType:"1",
auditStatus:"2",
method:"GET"
status:"5",
method:"GET",
applyUserName:this.data.userInfoObj.nickName
}
UTIL.httpRequest(API.URL_GET_TRANSFERLIST,data, {
success: (res) => {
@@ -202,8 +201,9 @@ Page({
// pageNum:1,
// pageSize:10,
transferType:"1",
auditStatus:"0",
method:"GET"
status:"0",
method:"GET",
submitter:this.data.userInfoObj.nickName
}
UTIL.httpRequest(API.URL_GET_TRANSFERLIST,data, {
success: (res) => {
@@ -280,6 +280,12 @@ Page({
this.setData({region:res.user.deptName})
this.setData({item:JSON.stringify(res.user)})
this.getBookList()
//查询已制单
this.getTransferList2();
//查询已发起
this.getTransferList();
// this.getTransferList1();
}
}
})
@@ -460,5 +466,15 @@ Page({
})
})
}
}
},
godetail:function(e){
wx.navigateTo({
url: '/pages/apply/paymentTemplate/add/add?id='+e.currentTarget.dataset.id,
})
},
gosee:function(e){
wx.navigateTo({
url: '/pages/handle/expenditureAudit/expenditureAudit?id='+e.currentTarget.dataset.id+'&taskId='+e.currentTarget.dataset.taskid,
})
},
})

+ 18
- 18
pages/index/index.wxml Переглянути файл

@@ -100,20 +100,20 @@
</view>

<scroll-view scroll-y="true" style="height: {{wrokScrollHeight}}px;" >
<view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="id">
<view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="id" data-id="{{item.formData.id}}" data-taskId="{{item.taskId}}" bindtap="gosee">
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">{{item.formData.payer}}</view>
<view class="name">{{item.formData.approvalItems}}</view>
<!-- <view class="state">待审</view> -->
<view class="time">{{item.formData.applyDate}}</view>
<view class="time">{{item.formData.applyTime}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.formData.remark}}</text>
<text class="textLimit">{{item.formData.activityBusinessType=='35'?'现金转账':'银行转账'}}</text>
</view>
<view class="amount"><text class="unit">￥</text>{{item.formData.expenditureAmount}}</view>
<view class="amount"><text class="unit">￥</text>{{item.formData.totalAmount}}</view>
</view>
</view>
</view>
@@ -121,16 +121,16 @@
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">{{item.formData.payer}}</view>
<view class="name">{{item.formData.approvalItems}}</view>
<!-- <view class="state">已审</view> -->
<view class="time">{{item.formData.applyDate}}</view>
<view class="time">{{item.formData.applyTime}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.formData.remark}}</text>
<text class="textLimit">{{item.formData.activityBusinessType=='35'?'现金转账':'银行转账'}}</text>
</view>
<view class="amount"><text class="unit">￥</text>{{item.formData.expenditureAmount}}</view>
<view class="amount"><text class="unit">￥</text>{{item.formData.totalAmount}}</view>
</view>
</view>
</view>
@@ -138,33 +138,33 @@
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">{{item.payer}}</view>
<view class="name">{{item.submitter}}</view>
<!-- <view class="state">已发起</view> -->
<view class="time">{{item.applyDate}}</view>
<view class="time">{{item.submitDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.remark}}</text>
<text class="textLimit">{{item.approvalItems}}</text>
</view>
<view class="amount"><text class="unit">￥</text>{{item.expenditureAmount}}</view>
<view class="amount"><text class="unit">￥</text>{{item.totalAmount}}</view>
</view>
</view>
</view>
<view class="workflow" wx:if="{{active=='4'}}" wx:for-item="item" wx:for="{{yzdList}}" wx:key="id">
<view class="workflow" wx:if="{{active=='4'}}" wx:for-item="item" wx:for="{{yzdList}}" wx:key="id" data-id="{{item.id}}" bindtap="godetail">
<!--1-->
<view class="workflow_list">
<view class="process_intro">
<view class="name">{{item.payer}}</view>
<view class="name">{{item.submitter}}</view>
<!-- <view class="state">已制单</view> -->
<view class="time">{{item.applyDate}}</view>
<view class="time">{{item.submitDate}}</view>
</view>
<view class="process_pay">
<view class="describe">
<image class="amount_icon" src="../../image/index/process_icon.png" mode="aspectFit"></image>
<text class="textLimit">{{item.remark}}</text>
<text class="textLimit">{{item.approvalItems}}</text>
</view>
<view class="amount"><text class="unit">￥</text>{{item.expenditureAmount}}</view>
<view class="amount"><text class="unit">￥</text>{{item.totalAmount}}</view>
</view>
</view>
</view>


+ 10
- 2
utils/API.js Переглянути файл

@@ -38,7 +38,7 @@ const URL_GET_TASKLIST = `${URL_PREFIX}/activiti/process/taskList`;
//获取已办
const URL_GET_TASKDONELIST = `${URL_PREFIX}/activiti/process/taskDoneList`;
//获取已发起、已制单
const URL_GET_TRANSFERLIST = `${URL_PREFIX}/yinnong/transfer/list`;
const URL_GET_TRANSFERLIST = `${URL_PREFIX}/yinnong/approvalItems/list`;
// 修改密码
const URL_POST_UPDATEPWD = `${URL_PREFIX}/system/user/profile/updatePwd`;
// 上传图片
@@ -125,6 +125,12 @@ const URL_GET_APPROVALITEMS = `${URL_PREFIX}/yinnong/approvalItems/getApprovalIt
//通过审批事项id删除审批模板
const URL_GET_REMOVEAPPROVAL = `${URL_PREFIX}/yinnong/approvalItems/remove/`;

//查询审批事项流转进度
const URL_GET_GETPROCESS = `${URL_PREFIX}/yinnong/approvalItems/getProcessSchedule/`;

//审批流办理
const URL_GET_PROCESSCOMPLETE = `${URL_PREFIX}/activiti/process/mobileComplete`;

/****************接口地址end****************/

export {
@@ -179,5 +185,7 @@ export {
URL_GET_USERAPPRO,
URL_GET_FINDLIST,
URL_GET_APPROVALITEMS,
URL_GET_REMOVEAPPROVAL
URL_GET_REMOVEAPPROVAL,
URL_GET_GETPROCESS,
URL_GET_PROCESSCOMPLETE
}

+ 1
- 1
utils/util.js Переглянути файл

@@ -118,7 +118,7 @@ function httpRequest(url, data, {
wx.request({
url,
data: finalData,
method:data.method,
method:data.method?data.method:'POST',
timeout: 60000,
header: {
'Authorization':'Bearer '+getApp().globalData.userInfo.token


Писати Попередній перегляд
Завантаження…
Відмінити
Зберегти