浏览代码

优化

master
yujk 3 年前
父节点
当前提交
ec57cadc0b
共有 18 个文件被更改,包括 271 次插入157 次删除
  1. +2
    -3
      pages/bank/add/add.js
  2. +4
    -15
      pages/bank/add/add.wxml
  3. +28
    -13
      pages/bank/bank.js
  4. +3
    -1
      pages/bank/bank.wxml
  5. +1
    -1
      pages/bankDraft/add/add.js
  6. +3
    -3
      pages/bankDraft/add/add.wxml
  7. +47
    -14
      pages/bankDraft/bankDraft.js
  8. +4
    -2
      pages/bankDraft/bankDraft.wxml
  9. +26
    -4
      pages/contract/add/add.js
  10. +21
    -21
      pages/contract/add/add.wxml
  11. +27
    -2
      pages/contract/contract.js
  12. +2
    -2
      pages/contract/contract.wxml
  13. +30
    -7
      pages/fixedAssets/add/add.js
  14. +10
    -10
      pages/fixedAssets/add/add.wxml
  15. +27
    -38
      pages/fixedAssets/fixedAssets.js
  16. +4
    -2
      pages/fixedAssets/fixedAssets.wxml
  17. +4
    -4
      pages/project/add/add.wxml
  18. +28
    -15
      pages/project/project.js

+ 2
- 3
pages/bank/add/add.js 查看文件

@@ -115,7 +115,7 @@ Page({
[even.currentTarget.dataset.value]:even.detail.value.bankDeposit,
[even.currentTarget.dataset.value+"Text"]:even.detail.value.bankDeposit,
[even.currentTarget.dataset.name]:false,
["form.payeePaymentLines"]:even.detail.value.payeePaymentLines
["form.bankDeposit"]:even.detail.value.bankDeposit
})
},
onChange(even){
@@ -160,7 +160,7 @@ Page({
}
})
}else{
UTIL.httpRequest(API.URL_GET_DEPOSITUPDATE, that.data.form, {
UTIL.httpRequest(API.URL_POST_DEPOSITUPDATE, that.data.form, {
success: (res) => {
wx.showToast({
title: "修改成功!",
@@ -175,7 +175,6 @@ Page({
}
})
}

}
},
/**


+ 4
- 15
pages/bank/add/add.wxml 查看文件

@@ -1,7 +1,7 @@
<!--pages/payee/add/add.wxml-->
<view class="ns" style="height:{{isIPX?'88px':'64px'}};">
<image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
<text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"查看":"新增"}}开户行</text>
<text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"":"新增"}}开户行</text>
</view>
<view class="main-box table-box" style="margin-top:{{isIPX?'100px':'75px'}};">

@@ -19,20 +19,9 @@
/>
</van-popup>
<van-field readonly label="所属银行" value="{{ form.bankTypeText }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction ="down" bindtap="openBox" data-name="showBankType"/>
<van-popup show="{{showDeposit}}" round position="bottom" bind:close="closeBox" data-name="showDeposit">
<van-picker
columns="{{depositOptions}}"
show-toolbar
value-key="bankDeposit"
bind:cancel="closeBox"
bind:confirm="onConfirmDeposit"
data-name="showDeposit"
data-value="form.bankDeposit"
/>
</van-popup>
<van-field label="开户行" value="{{ form.bankDeposit }}" placeholder="请输入开户银行" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.bankDepositText" />
<van-field label="联行号" value="{{ form.payeePaymentLines }}" placeholder="请输入联行号" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.payeePaymentLines"/>
<van-field label="开户行" value="{{ form.bankDeposit }}" placeholder="请输入开户银行" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.bankDeposit" />
<van-field label="联行号" value="{{ form.payeePaymentLines }}" type="digit" placeholder="请输入联行号" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.payeePaymentLines"/>
</view>
<view class="bottom">
<view class="btn2" bindtap="goSubmit">确认</view>
<view class="btn2" bindtap="goSubmit">保存</view>
</view>

+ 28
- 13
pages/bank/bank.js 查看文件

@@ -12,7 +12,9 @@ Page({
depositList:[],
bankTypeOptions:[],
value:"",
scrollHeight:''
scrollHeight:'',
itemId:'',
itemIndex:''
},
goAdd(){
wx.navigateTo({
@@ -80,19 +82,32 @@ Page({
this.onShow()
},
delete(e){
var that = this;
UTIL.httpRequest(API.URL_GET_DEPOSITDELETE + e.currentTarget.dataset.id, {method:'GET'},{
this.setData({
'itemId':e.currentTarget.dataset.id,
'itemIndex':e.currentTarget.dataset.index,
"showPopupDel":true
});
},
cancelTemDel:function(e){
this.setData({
"itemId":"",
"itemIndex":"",
"showPopupDel":false
});
},
confirmTemDel:function(e){
this.setData({
"showPopupDel":false
});
UTIL.httpRequest(API.URL_GET_DEPOSITDELETE+this.data.itemId , {method:'GET'}, {
success: (res) => {
if (res.code == API.SUCCESS_CODE) {
that.data.depositList.splice(e.currentTarget.dataset.index, 1);
wx.showToast({
title: '删除成功!',
icon: 'success',
duration: 2000
})
that.setData({
depositList : that.data.depositList,
})
if(res.code==200){
let new_list = this.data.depositList
new_list.splice(this.data.itemIndex,1)
this.setData({'depositList':new_list})
UTIL.showToastNoneIcon('删除成功!');
}else{
UTIL.showToastNoneIcon('删除失败!');
}
}
})


+ 3
- 1
pages/bank/bank.wxml 查看文件

@@ -9,7 +9,7 @@
value="{{ value }}"
shape="round"
background="transparent"
placeholder="请输入搜索关键词"
placeholder="请输入开户行名称"
clearable
bind:change="goSearch"
/>
@@ -43,6 +43,8 @@
</view>
</van-swipe-cell>
</scroll-view>
<modal hidden="{{!showPopupDel}}" title="是否删除?" confirm-text="是" cancel-text="否" bindcancel="cancelTemDel" bindconfirm="confirmTemDel">
</modal>
<wxs module="iOf">
var indexOf = function(name,value){
return name.indexOf(value);


+ 1
- 1
pages/bankDraft/add/add.js 查看文件

@@ -160,7 +160,7 @@ Page({
var that = this;
that.data.form.method = 'POST';
if(that.data.form.id==""||that.data.form.id==null){
UTIL.httpRequest(API.URL_GET_MONEYORDERADD, that.data.form , {
UTIL.httpRequest(API.URL_POST_MONEYORDERADD, that.data.form , {
success: (res) => {
wx.showToast({
title: '新增成功',


+ 3
- 3
pages/bankDraft/add/add.wxml 查看文件

@@ -1,7 +1,7 @@
<!--pages/payee/add/add.wxml-->
<view class="ns" style="height:{{isIPX?'88px':'64px'}};">
<image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
<text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"查看":"新增"}}银行汇票</text>
<text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"":"新增"}}银行汇票</text>
</view>
<view class="main-box table-box" style="margin-top:{{isIPX?'100px':'75px'}};">

@@ -20,7 +20,7 @@
</van-popup>
<van-field label="汇票类型" value="{{ form.orderTypeText }}" placeholder="汇票类型" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.orderType" is-link arrow-direction ="down" bindtap="openBox" data-name="showOrderType"/>

<van-field label="出票金额" value="{{ form.orderAmount }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.orderAmount"/>
<van-field label="出票金额" value="{{ form.orderAmount }}" type="number" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.orderAmount"/>
<van-field label="付票单位" value="{{ form.billPayUnit }}" placeholder="付票单位" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.billPayUnit" />
<van-field label="收票单位" value="{{ form.billReceiveUnit }}" placeholder="收票单位" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.billReceiveUnit"/>
@@ -47,5 +47,5 @@
<van-field label="备注" value="{{ form.remark }}" placeholder="备注" border="{{ false }}" bind:change="onChange" input-align="right" data-value="form.remark"/>
</view>
<view class="bottom" wx:if="{{showBtn}}">
<view class="btn2" bindtap="goSubmit">确认</view>
<view class="btn2" bindtap="goSubmit">保存</view>
</view>

+ 47
- 14
pages/bankDraft/bankDraft.js 查看文件

@@ -32,9 +32,11 @@ Page({
value:'',
pageNums:1,
showUpload:false,
showPopupDel:false,
uploadOptions:[],
fileList:[],
itemId:"",
itemIndex:"",
list:[],
fileEvent:{},
},
@@ -128,21 +130,52 @@ Page({
}
})
},
// delete(e){
// var that = this;
// UTIL.httpRequest(API.URL_GET_MONEYORDERDELETE + e.currentTarget.dataset.id, {method:'GET'},{
// success: (res) => {
// if (res.code == API.SUCCESS_CODE) {
// let list = that.data.moneyorderList
// list.splice(e.currentTarget.dataset.index, 1);
// wx.showToast({
// title: '删除成功!',
// icon: 'success',
// duration: 2000
// })
// that.setData({
// moneyorderList : list,
// })
// }
// }
// })
// },
delete(e){
var that = this;
UTIL.httpRequest(API.URL_GET_MONEYORDERDELETE + e.currentTarget.dataset.id, {method:'GET'},{
this.setData({
'itemId':e.currentTarget.dataset.id,
'itemIndex':e.currentTarget.dataset.index,
"showPopupDel":true
});
},
cancelTemDel:function(e){
this.setData({
"itemId":"",
"itemIndex":"",
"showPopupDel":false
});
},
confirmTemDel:function(e){
this.setData({
"showPopupDel":false
});
UTIL.httpRequest(API.URL_GET_MONEYORDERDELETE + this.data.itemId , {method:'GET'}, {
success: (res) => {
if (res.code == API.SUCCESS_CODE) {
let list = that.data.moneyorderList
list.splice(e.currentTarget.dataset.index, 1);
wx.showToast({
title: '删除成功!',
icon: 'success',
duration: 2000
})
that.setData({
moneyorderList : list,
})
if(res.code==200){
let new_list = this.data.moneyorderList
new_list.splice(this.data.index,1)
this.setData({'moneyorderList':new_list})
UTIL.showToastNoneIcon('删除成功!');
}else{
UTIL.showToastNoneIcon('删除失败!');
}
}
})
@@ -286,7 +319,7 @@ Page({
return new Promise((resolve, reject) => {
wx.uploadFile({
url: API.URL_GET_UPLOAD,
filePath: uploadFile.file.file[0].url,
filePath: uploadFile.file.file.url,
name: 'file',
header: {
"Content-Type": "multipart/form-data",//记得设置


+ 4
- 2
pages/bankDraft/bankDraft.wxml 查看文件

@@ -9,7 +9,7 @@
value="{{ value }}"
shape="round"
background="transparent"
placeholder="请输入搜索关键词"
placeholder="请输入付票单位名称"
clearable
bind:change="goSearch"
/>
@@ -83,7 +83,7 @@
</view>
<view class="img_box">
<view class="img_li">
<van-upload file-list="{{ item.list }}" bind:after-read="afterRead" bind:delete="deleteImg" bind:click-preview="lookDown" multiple="{{true}}" data-idx="{{index}}">
<van-upload file-list="{{ item.list }}" bind:after-read="afterRead" bind:delete="deleteImg" bind:click-preview="lookDown" data-idx="{{index}}">
</van-upload>
</view>
</view>
@@ -93,4 +93,6 @@
</van-action-sheet>
<modal hidden="{{!showPopup}}" title="是否删除?" confirm-text="是" cancel-text="否" bindcancel="cancelTem" bindconfirm="confirmTem">
</modal>
<modal hidden="{{!showPopupDel}}" title="是否删除?" confirm-text="是" cancel-text="否" bindcancel="cancelTemDel" bindconfirm="confirmTemDel">
</modal>

+ 26
- 4
pages/contract/add/add.js 查看文件

@@ -141,7 +141,12 @@ Page({
getNewDate(date){
//date是传过来的时间戳,注意需为13位,10位需*1000
//也可以不传,获取的就是当前时间
var time = new Date(date);
var time
if(date){
time = new Date(date);
}else{
time = new Date();
}
var year= time.getFullYear() //年
var month = ("0" + (time.getMonth() + 1)).slice(-2); //月
var day = ("0" + time.getDate()).slice(-2); //日
@@ -196,6 +201,11 @@ Page({
success: (res) => {
if(res.code == 200){
UTIL.showToastNoneIcon('修改成功');
setTimeout(function(){
wx.navigateBack({
delta:1
})
},2000)
}else{
UTIL.showToastNoneIcon('修改失败');
}
@@ -207,9 +217,14 @@ Page({
UTIL.httpRequest(API.URL_POST_CONTRACTADD,data,{
success: (res) => {
if(res.code == 200){
UTIL.showToastNoneIcon(res.msg);
UTIL.showToastNoneIcon('新增成功');
setTimeout(function(){
wx.navigateBack({
delta:1
})
},2000)
}else{
UTIL.showToastNoneIcon(res.msg);
UTIL.showToastNoneIcon('新增失败');
}
}
})
@@ -341,6 +356,13 @@ Page({
})
}else{
let that = this;
this.setData({
'form.reviewTime':this.getNewDate(),
'form.buildingTime':this.getNewDate(),
'form.startTime':this.getNewDate(),
'form.endTime':this.getNewDate(),
'form.biddingDate':this.getNewDate(),
})
//获取收入合同状态
UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'type_of_contract', {method:'GET'}, {
success: (res) => {
@@ -391,7 +413,7 @@ Page({
if(res.data.length>0){
that.setData({
contractionStatusOptions:res.data,
'form.contractionStatus':res.data[1].dictValue
'form.contractionStatus':res.data[0].dictValue
})
}
}


+ 21
- 21
pages/contract/add/add.wxml 查看文件

@@ -14,7 +14,7 @@
<text><text style="color:red;margin-right: 10rpx;">*</text>合同编码</text>
</view>
<view>
<input type="text" value="{{form.code}}" bindinput="bindNewInput" data-name="form.code" placeholder="请输入合同编码" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.code}}" bindinput="bindNewInput" data-name="form.code" placeholder="合同编码" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -22,7 +22,7 @@
<text><text style="color:red;margin-right: 10rpx;">*</text>合同名称</text>
</view>
<view>
<input type="text" value="{{form.name}}" bindinput="bindNewInput" data-name="form.name" placeholder="请输入合同名称" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.name}}" bindinput="bindNewInput" data-name="form.name" placeholder="合同名称" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view class="section">
@@ -46,7 +46,7 @@
<text><text style="color:red;margin-right: 10rpx;">*</text>甲方名称</text>
</view>
<view>
<input type="text" value="{{form.firstParty}}" bindinput="bindNewInput" data-name="form.firstParty" placeholder="请输入甲方名称" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.firstParty}}" bindinput="bindNewInput" data-name="form.firstParty" placeholder="甲方名称" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -54,7 +54,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>甲方代表</text>
</view>
<view>
<input type="text" value="{{form.firstPartyDirector}}" bindinput="bindNewInput" data-name="form.firstPartyDirector" placeholder="请输入甲方代表" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.firstPartyDirector}}" bindinput="bindNewInput" data-name="form.firstPartyDirector" placeholder="甲方代表" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -62,7 +62,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>甲方电话</text>
</view>
<view>
<input type="text" value="{{form.firstPartyPhone}}" bindinput="bindNewInput" data-name="form.firstPartyPhone" placeholder="请输入甲方电话" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.firstPartyPhone}}" bindinput="bindNewInput" data-name="form.firstPartyPhone" placeholder="甲方电话" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -70,7 +70,7 @@
<text><text style="color:red;margin-right: 10rpx;">*</text>乙方名称</text>
</view>
<view>
<input type="text" value="{{form.secondParty}}" bindinput="bindNewInput" data-name="form.secondParty" placeholder="请输入乙方名称" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.secondParty}}" bindinput="bindNewInput" data-name="form.secondParty" placeholder="乙方名称" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -78,7 +78,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>乙方代表</text>
</view>
<view>
<input type="text" value="{{form.secondPartyDirector}}" bindinput="bindNewInput" data-name="form.secondPartyDirector" placeholder="请输入乙方代表" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.secondPartyDirector}}" bindinput="bindNewInput" data-name="form.secondPartyDirector" placeholder="乙方代表" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -86,7 +86,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>乙方电话</text>
</view>
<view>
<input type="text" value="{{form.secondPartyPhone}}" bindinput="bindNewInput" data-name="form.secondPartyPhone" placeholder="请输入乙方电话" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.secondPartyPhone}}" bindinput="bindNewInput" data-name="form.secondPartyPhone" placeholder="乙方电话" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view class="section">
@@ -110,7 +110,7 @@
<text><text style="color:red;margin-right: 10rpx;">*</text>合同金额</text>
</view>
<view>
<input type="text" value="{{form.totalAmount}}" bindinput="bindNewInput" data-name="form.totalAmount" placeholder="请输入合同金额" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.totalAmount}}" bindinput="bindNewInput" type="digit" data-name="form.totalAmount" placeholder="合同金额" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -118,7 +118,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>数量/面积</text>
</view>
<view>
<input type="text" value="{{form.num}}" bindinput="bindNewInput" data-name="form.num" placeholder="请输入数量/面积" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.num}}" bindinput="bindNewInput" type="digit" data-name="form.num" type="number" placeholder="数量/面积" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -134,7 +134,7 @@
<text><text style="color:red;margin-right: 10rpx;">*</text>单价(元)</text>
</view>
<view>
<input type="text" value="{{form.price}}" bindinput="bindNewInput" data-name="form.price" placeholder="单价(元)" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.price}}" bindinput="bindNewInput" type="digit" data-name="form.price" placeholder="单价(元)" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -142,7 +142,7 @@
<text><text style="color:red;margin-right: 10rpx;">*</text>已结款(元)</text>
</view>
<view>
<input type="text" value="{{form.receivedAmount}}" bindinput="bindNewInput" data-name="form.receivedAmount" placeholder="已结款(元)" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.receivedAmount}}" bindinput="bindNewInput" type="digit" data-name="form.receivedAmount" placeholder="已结款(元)" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -150,7 +150,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>下次结款(元)</text>
</view>
<view>
<input type="text" value="{{form.settledAmount}}" bindinput="bindNewInput" data-name="form.settledAmount" placeholder="下次结款(元)" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.settledAmount}}" bindinput="bindNewInput" type="digit" data-name="form.settledAmount" placeholder="下次结款(元)" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view class="section">
@@ -214,7 +214,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>项目编号</text>
</view>
<view>
<input type="text" value="{{form.itemId}}" bindinput="bindNewInput" data-name="form.itemId" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.itemId}}" bindinput="bindNewInput" placeholder="项目编号" data-name="form.itemId" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -222,7 +222,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>项目名称</text>
</view>
<view>
<input type="text" value="{{form.itemName}}" bindinput="bindNewInput" data-name="form.itemName" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.itemName}}" bindinput="bindNewInput" placeholder="项目名称" data-name="form.itemName" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -230,7 +230,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>经办人</text>
</view>
<view>
<input type="text" value="{{form.handleName}}" bindinput="bindNewInput" data-name="form.handleName" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.handleName}}" bindinput="bindNewInput" placeholder="经办人" data-name="form.handleName" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -238,7 +238,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>预算金额(元)</text>
</view>
<view>
<input type="text" value="{{form.budget}}" bindinput="bindNewInput" data-name="form.budget" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.budget}}" bindinput="bindNewInput" type="digit" placeholder="预算金额(元)" data-name="form.budget" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view class="section">
@@ -262,7 +262,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>中标单位</text>
</view>
<view>
<input type="text" value="{{form.winBiddingCompany}}" bindinput="bindNewInput" data-name="form.winBiddingCompany" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.winBiddingCompany}}" bindinput="bindNewInput" placeholder="中标单位" data-name="form.winBiddingCompany" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -270,7 +270,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>中标金额(元)</text>
</view>
<view>
<input type="text" value="{{form.winBiddingPrice}}" bindinput="bindNewInput" data-name="form.nawinBiddingPriceme" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.winBiddingPrice}}" bindinput="bindNewInput" type="digit" placeholder="中标金额(元)" data-name="form.nawinBiddingPriceme" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -278,7 +278,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>审核人</text>
</view>
<view>
<input type="text" value="{{form.reviewer}}" bindinput="bindNewInput" data-name="form.reviewer" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.reviewer}}" bindinput="bindNewInput" placeholder="审核人" data-name="form.reviewer" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view class="section">
@@ -292,5 +292,5 @@
</view>
</view>
<view class="bottom">
<view class="btn2" bindtap="goSubmit">确认</view>
<view class="btn2" bindtap="goSubmit">保存</view>
</view>

+ 27
- 2
pages/contract/contract.js 查看文件

@@ -128,12 +128,14 @@ Page({
delete(e){
this.setData({
'itemId':e.currentTarget.dataset.id,
'itemIndex':e.currentTarget.dataset.index,
"showPopupDel":true
});
},
cancelTemDel:function(e){
this.setData({
"itemId":"",
"itemIndex":"",
"showPopupDel":false
});
},
@@ -145,7 +147,7 @@ Page({
success: (res) => {
if(res.code==200){
let new_list = this.data.list
new_list.splice(e.currentTarget.dataset.index,1)
new_list.splice(this.data.index,1)
this.setData({'list':new_list})
UTIL.showToastNoneIcon('删除成功!');
}else{
@@ -273,7 +275,7 @@ Page({
return new Promise((resolve, reject) => {
wx.uploadFile({
url: API.URL_GET_UPLOAD,
filePath: uploadFile.file.file[0].url,
filePath: uploadFile.file.file.url,
name: 'file',
header: {
"Content-Type": "multipart/form-data",//记得设置
@@ -347,8 +349,31 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow() {
console.log(this.data.contractionId);
if(this.data.contractionId!=""&&this.data.contractionId!=null){
this.relevanceBack()
}else{
let _this = this
let params = {
pageNum:1,
pageSize:10,
name:this.data.name
}
UTIL.httpRequest(API.URL_GET_CONTRACTLIST,params,{
success: (res) => {
if(res.code == 200){
res.rows.map((rr,index) => {
rr.totalAmount = Number(rr.totalAmount ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
return $1 + ","; }).replace(/\.$/, "")
if(index==(res.rows.length-1)){
_this.setData({list:res.rows})
}
})
}else{
UTIL.showToastNoneIcon(res.msg);
}
}
})
}
},



+ 2
- 2
pages/contract/contract.wxml 查看文件

@@ -9,7 +9,7 @@
value="{{ name }}"
shape="round"
background="transparent"
placeholder="请输入搜索关键词"
placeholder="请输入合同名称"
clearable
bind:change="goSearch"
/>
@@ -90,7 +90,7 @@
</view>
<view class="img_box">
<view class="img_li">
<van-upload file-list="{{ item.list }}" bind:after-read="afterRead" bind:delete="deleteImg" bind:click-preview="lookDown" multiple="{{true}}" data-idx="{{index}}">
<van-upload file-list="{{ item.list }}" bind:after-read="afterRead" bind:delete="deleteImg" bind:click-preview="lookDown" data-idx="{{index}}">
</van-upload>
</view>
</view>


+ 30
- 7
pages/fixedAssets/add/add.js 查看文件

@@ -12,13 +12,14 @@ Page({
id:null,
form:{
reviewTime:'2022-01-01',
buildingTime:'2022-01-01',
buildTime:'2022-01-01',
startTime:'2022-01-01',
endTime:'2022-01-01',
biddingDate:'2022-01-01',
fixedValue:'153:固定资产清理',
fixedSubject:'152:累计折旧',
depreciationSubject:'541005:管理费用-折旧及修理费',
fixedValue:'',
fixedSubject:'153:固定资产清理',
depreciationSubject:'152:累计折旧',
depreciationFeeSubject:'541005:管理费用-折旧及修理费',
originalValue:0.00,
quantity:0.00,
netValue:0.00,
@@ -93,8 +94,8 @@ Page({
onConfirmAddType (e) {
let obj = e.detail.value;
this.setData({
'form.addWay':this.data.addWayOptions[obj].dictValue,
'addWayindex':obj
'form.addType':this.data.addTypeOptions[obj].dictValue,
'addTypeindex':obj
})
},
onConfirmUseType (e) {
@@ -149,7 +150,12 @@ Page({
getNewDate(date){
//date是传过来的时间戳,注意需为13位,10位需*1000
//也可以不传,获取的就是当前时间
var time = new Date(date);
var time
if(date){
time = new Date(date);
}else{
time = new Date();
}
var year= time.getFullYear() //年
var month = ("0" + (time.getMonth() + 1)).slice(-2); //月
var day = ("0" + time.getDate()).slice(-2); //日
@@ -201,6 +207,11 @@ Page({
success: (res) => {
if(res.code == 200){
UTIL.showToastNoneIcon('修改成功');
setTimeout(function(){
wx.navigateBack({
delta:1
})
},2000)
}else{
UTIL.showToastNoneIcon('修改失败');
}
@@ -213,6 +224,11 @@ Page({
success: (res) => {
if(res.code == 200){
UTIL.showToastNoneIcon(res.msg);
setTimeout(function(){
wx.navigateBack({
delta:1
})
},2000)
}else{
UTIL.showToastNoneIcon(res.msg);
}
@@ -392,6 +408,13 @@ Page({
})
}else{
let that = this;
this.setData({
'form.reviewTime':this.getNewDate(),
'form.buildTime':this.getNewDate(),
'form.startTime':this.getNewDate(),
'form.endTime':this.getNewDate(),
'form.biddingDate':this.getNewDate(),
})
//获取资产类别
UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, {
success: (res) => {


+ 10
- 10
pages/fixedAssets/add/add.wxml 查看文件

@@ -43,7 +43,7 @@
</view>
<view class="section">
<view class="section__title"><text style="color:red;margin-right: 10rpx;">*</text>增加方式</view>
<picker bindchange="onConfirmAddType" value="{{addTypeindex}}" range="{{addOptions}}" range-key="{{'dictLabel'}}">
<picker bindchange="onConfirmAddType" value="{{addTypeindex}}" range="{{addTypeOptions}}" range-key="{{'dictLabel'}}">
<view class="picker">
{{addTypeOptions[addTypeindex].dictLabel?addTypeOptions[addTypeindex].dictLabel:"选择增加方式"}}
</view>
@@ -126,7 +126,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>数量/面积</text>
</view>
<view>
<input type="text" value="{{form.quantity}}" bindinput="bindNewInput" data-name="form.quantity" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.quantity}}" bindinput="bindNewInput" data-name="form.quantity" type="number" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view class="section">
@@ -142,7 +142,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>原值(元)</text>
</view>
<view>
<input type="text" value="{{form.originalValue}}" bindinput="bindNewInput" data-name="form.originalValue" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.originalValue}}" bindinput="bindNewInput" type="digit" data-name="form.originalValue" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -150,7 +150,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>净值(元)</text>
</view>
<view>
<input type="text" value="{{form.netValue}}" bindinput="bindNewInput" data-name="form.netValue" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.netValue}}" bindinput="bindNewInput" disabled="{{true}}" data-name="form.netValue" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -158,7 +158,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>残值率 N%</text>
</view>
<view>
<input type="text" value="{{form.residualsRate}}" bindinput="bindNewInput" data-name="form.residualsRate" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.residualsRate}}" bindinput="bindNewInput" type="digit" data-name="form.residualsRate" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -166,7 +166,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>净残值(元)</text>
</view>
<view>
<input type="text" value="{{form.netSalvage}}" bindinput="bindNewInput" data-name="form.netSalvage" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.netSalvage}}" bindinput="bindNewInput" type="digit" data-name="form.netSalvage" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -174,7 +174,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>资产清理(元)</text>
</view>
<view>
<input type="text" value="{{form.fixedValue}}" bindinput="bindNewInput" data-name="form.fixedValue" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.fixedValue}}" placeholder="无需输入" bindinput="bindNewInput" disabled="true" data-name="form.fixedValue" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -230,7 +230,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>预计使用年数</text>
</view>
<view>
<input type="text" value="{{form.expectedYears}}" bindinput="bindNewInput" data-name="form.expectedYears" type="digit" placeholder="(原值-净残值)/预计使用年数" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.expectedYears}}" bindinput="bindNewInput" type="number" data-name="form.expectedYears" type="digit" placeholder="(原值-净残值)/预计使用年数" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -246,7 +246,7 @@
<text><text style="color:red;margin-right: 22rpx;"></text>已折旧年数</text>
</view>
<view>
<input type="text" value="{{form.depreciationYears}}" bindinput="bindNewInput" data-name="form.depreciationYears" type="digit" style="text-align: right;margin-top: 20rpx;" />
<input type="text" value="{{form.depreciationYears}}" bindinput="bindNewInput" type="number" data-name="form.depreciationYears" type="digit" style="text-align: right;margin-top: 20rpx;" />
</view>
</view>
<view>
@@ -261,5 +261,5 @@
</view>
</view>
<view class="bottom">
<view class="btn2" bindtap="goSubmit">确认</view>
<view class="btn2" bindtap="goSubmit">保存</view>
</view>

+ 27
- 38
pages/fixedAssets/fixedAssets.js 查看文件

@@ -159,49 +159,38 @@ Page({
url: '/pages/fixedAssets/add/add?id='+e.currentTarget.dataset.id,
})
},
delete(e){
this.setData({
'itemId':e.currentTarget.dataset.id,
'itemIndex':e.currentTarget.dataset.index,
"showPopupDel":true
});
},
// cancelTemDel:function(e){
// this.setData({
// "itemId":"",
// "showPopupDel":false
// });
// },
// confirmTemDel:function(e){
// this.setData({
// "showPopupDel":false
// });
// UTIL.httpRequest(API.URL_GET_CONTRACTDELETE+this.data.itemId , {method:'GET'}, {
// success: (res) => {
// if(res.code==200){
// let new_list = this.data.list
// new_list.splice(e.currentTarget.dataset.index,1)
// this.setData({'list':new_list})
// UTIL.showToastNoneIcon('删除成功!');
// }else{
// UTIL.showToastNoneIcon('删除失败!');
// }
// }
// })
// },
// delete(e){
// UTIL.httpRequest(API.URL_GET_PERMANENTDELETE + e.currentTarget.dataset.id, {method:'GET'}, {
// success: (res) => {
// if(res.code==200){
// let new_list = this.data.list
// new_list.splice(e.currentTarget.dataset.index,1)
// this.setData({'list':new_list})
// UTIL.showToastNoneIcon('删除成功!');
// }else{
// UTIL.showToastNoneIcon('删除失败!');
// }
// }
// })
// },
cancelTemDel:function(e){
this.setData({
"itemId":"",
"itemIndex":"",
"showPopupDel":false
});
},
confirmTemDel:function(e){
this.setData({
"showPopupDel":false
});
UTIL.httpRequest(API.URL_GET_PERMANENTDELETE + this.data.itemId , {method:'GET'}, {
success: (res) => {
if(res.code==200){
let new_list = this.data.list
new_list.splice(this.data.index,1)
this.setData({'list':new_list})
UTIL.showToastNoneIcon('删除成功!');
}else{
UTIL.showToastNoneIcon('删除失败!');
}
}
})
},
upload(e){
this.setData({itemId:e.currentTarget.dataset.id});
this.asyncFun(e.currentTarget.dataset.id)
@@ -279,7 +268,7 @@ Page({
return new Promise((resolve, reject) => {
wx.uploadFile({
url: API.URL_GET_UPLOAD,
filePath: uploadFile.file.file[0].url,
filePath: uploadFile.file.file.url,
name: 'file',
header: {
"Content-Type": "multipart/form-data",//记得设置


+ 4
- 2
pages/fixedAssets/fixedAssets.wxml 查看文件

@@ -9,7 +9,7 @@
value="{{ name }}"
shape="round"
background="transparent"
placeholder="请输入搜索关键词"
placeholder="请输入固定资产名称"
clearable
bind:change="goSearch"
/>
@@ -76,7 +76,7 @@
</view>
<view class="img_box">
<view class="img_li">
<van-upload file-list="{{ item.list }}" bind:after-read="afterRead" bind:delete="deleteImg" bind:click-preview="lookDown" multiple="{{true}}" data-idx="{{index}}">
<van-upload file-list="{{ item.list }}" bind:after-read="afterRead" bind:delete="deleteImg" bind:click-preview="lookDown" data-idx="{{index}}">
</van-upload>
</view>
</view>
@@ -85,4 +85,6 @@
</scroll-view>
</van-action-sheet>
<modal hidden="{{!showPopup}}" title="是否删除?" confirm-text="是" cancel-text="否" bindcancel="cancelTem" bindconfirm="confirmTem">
</modal>
<modal hidden="{{!showPopupDel}}" title="是否删除?" confirm-text="是" cancel-text="否" bindcancel="cancelTemDel" bindconfirm="confirmTemDel">
</modal>

+ 4
- 4
pages/project/add/add.wxml 查看文件

@@ -1,7 +1,7 @@
<!--pages/payee/add/add.wxml-->
<view class="ns" style="height:{{isIPX?'88px':'64px'}};">
<image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
<text style="top:{{isIPX?'54px':'30px'}};">新增工程项目</text>
<text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"":"新增"}}工程项目</text>
</view>
<view class="main-box table-box" style="margin-top:{{isIPX?'100px':'75px'}};">

@@ -14,7 +14,7 @@
<van-field label="竣工日期" value="{{ form.endTime }}" placeholder="竣工日期" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction ="down" bindtap="openBox" data-name="showEndTime" />
<van-calendar show="{{ showEndTime }}" bind:close="closeBox" data-name="showEndTime" bind:confirm="onConfirmTime" data-value="form.endTime" show-confirm="{{ false }}" />

<van-field label="合共价款(元)" value="{{ form.projectAmount }}" placeholder="合共价款(元)" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.projectAmount"/>
<van-field label="合共价款(元)" value="{{ form.projectAmount }}" type="number" placeholder="合共价款(元)" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.projectAmount"/>


<van-popup show="{{showYnProjcetStatus}}" round position="bottom" bind:close="closeBox" data-name="showYnProjcetStatus">
@@ -30,8 +30,8 @@
</van-popup>
<van-field label="工程状态" value="{{ form.ynProjcetStatusText }}" placeholder="工程状态" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.ynProjcetStatus" is-link arrow-direction ="down" bindtap="openBox" data-name="showYnProjcetStatus"/>

<van-field label="备注" value="{{ form.remark }}" placeholder="备注" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.remark"/>
<van-field label="备注" value="{{ form.remark }}" placeholder="备注" border="{{ false }}" bind:change="onChange" input-align="right" data-value="form.remark"/>
</view>
<view class="bottom">
<view class="btn2" bindtap="goSubmit">确认</view>
<view class="btn2" bindtap="goSubmit">保存</view>
</view>

+ 28
- 15
pages/project/project.js 查看文件

@@ -21,6 +21,7 @@ Page({
uploadOptions:[],
fileList:[],
itemId:"",
itemIndex:"",
list:[],
fileEvent:{},
projectList:[]
@@ -52,7 +53,7 @@ Page({
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
this.onShow();
this.onShow();
},
goSearch(e){
this.setData({name:e.detail})
@@ -109,20 +110,32 @@ this.onShow();
})
},
delete(e){
var that = this;
UTIL.httpRequest(API.URL_GET_PROJECTDELETE + e.currentTarget.dataset.id, {method:'GET'},{
this.setData({
'itemId':e.currentTarget.dataset.id,
'itemIndex':e.currentTarget.dataset.index,
"showPopupDel":true
});
},
cancelTemDel:function(e){
this.setData({
"itemId":"",
"itemIndex":"",
"showPopupDel":false
});
},
confirmTemDel:function(e){
this.setData({
"showPopupDel":false
});
UTIL.httpRequest(API.URL_GET_PROJECTDELETE + this.data.itemId , {method:'GET'}, {
success: (res) => {
if (res.code == API.SUCCESS_CODE) {
let list = that.data.projectList
list.splice(e.currentTarget.dataset.index, 1);
wx.showToast({
title: '删除成功!',
icon: 'success',
duration: 2000
})
that.setData({
projectList : list,
})
if(res.code==200){
let new_list = this.data.projectList
new_list.splice(this.data.index,1)
this.setData({'projectList':new_list})
UTIL.showToastNoneIcon('删除成功!');
}else{
UTIL.showToastNoneIcon('删除失败!');
}
}
})
@@ -261,7 +274,7 @@ this.onShow();
return new Promise((resolve, reject) => {
wx.uploadFile({
url: API.URL_GET_UPLOAD,
filePath: uploadFile.file.file[0].url,
filePath: uploadFile.file.file.url,
name: 'file',
header: {
"Content-Type": "multipart/form-data",//记得设置


正在加载...
取消
保存