|
|
@@ -41,8 +41,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <u-picker :range="typeList" range-key="value" @confirm='typeCheck($event)' v-model="show2"
|
|
|
- mode="selector">
|
|
|
+ <u-picker :range="typeList" range-key="value" @confirm='typeCheck($event)' v-model="show2" mode="selector">
|
|
|
</u-picker>
|
|
|
<view class="c-row" v-if="detailData.purpose == '合同费用'">
|
|
|
<view class="title">合同编号</view>
|
|
|
@@ -64,7 +63,8 @@
|
|
|
<input v-model='detailData.payerHeader' maxlength='25' placeholder="输入付款方名头"></input>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view v-show="reType == 2&&detailData.purpose=='经营性费用' || expensesType == '2'&&detailData.purpose=='经营性费用'" class="c-row">
|
|
|
+ <view v-show="reType == 2&&detailData.purpose=='经营性费用' || expensesType == '2'&&detailData.purpose=='经营性费用'"
|
|
|
+ class="c-row">
|
|
|
<view class="title">所属名头</view>
|
|
|
<view class="con-list">
|
|
|
<view @click='show1=true'>{{detailData.belongName?detailData.belongName:"请选择所属名头"}}
|
|
|
@@ -72,8 +72,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <u-picker :range="namelist" range-key="name" @confirm='confirmname($event)' v-model="show1"
|
|
|
- mode="selector">
|
|
|
+ <u-picker :range="namelist" range-key="name" @confirm='confirmname($event)' v-model="show1" mode="selector">
|
|
|
</u-picker>
|
|
|
<view class="c-row">
|
|
|
<view class="title">金额（元）</view>
|
|
|
@@ -83,6 +82,9 @@
|
|
|
<input type='digit' v-if="reType == '1' || expensesType == '1'" v-model='detailData.amountMoney'
|
|
|
placeholder="输入收款金额"></input>
|
|
|
</view>
|
|
|
+ <checkbox-group @change="checkboxChange" v-if="reType == '2' || expensesType == '2'">
|
|
|
+ <checkbox value="1" style="transform:scale(0.7)" />备用金支付
|
|
|
+ </checkbox-group>
|
|
|
</view>
|
|
|
<view class="c-row">
|
|
|
<view class="left">备注</view>
|
|
|
@@ -115,7 +117,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view v-if="reType == 2 || expensesType == '2'" class='wrap margin-bottom'>
|
|
|
- <view class="xinxi" style="font-size: 28rpx; ">收款账户信息</view>
|
|
|
+ <view class="xinxi" style="font-size: 28rpx; ">收款账户信息</view>
|
|
|
<view class="c-row">
|
|
|
<view class="title">收款方</view>
|
|
|
<view class="con-list">
|
|
|
@@ -154,19 +156,19 @@
|
|
|
data() {
|
|
|
return {
|
|
|
show: false,
|
|
|
- show2:false,
|
|
|
+ show2: false,
|
|
|
showWare: false,
|
|
|
detailData: {
|
|
|
- flag:'否',
|
|
|
+ flag: '否',
|
|
|
purpose: '库点费用',
|
|
|
remark: "",
|
|
|
- wareExpenseType:'杂费',
|
|
|
+ wareExpenseType: '杂费',
|
|
|
warehouseName: '选择仓库',
|
|
|
expenseName: '',
|
|
|
amountMoney: '',
|
|
|
expensesPurpose: '3',
|
|
|
expensesType: '',
|
|
|
- // contractId: '',
|
|
|
+ paymentIdentifi: '',
|
|
|
fieldName: '',
|
|
|
identification: '1',
|
|
|
costType: '3',
|
|
|
@@ -174,11 +176,11 @@
|
|
|
totalDistribution: '0',
|
|
|
},
|
|
|
fileList1: [],
|
|
|
- show1:false,
|
|
|
+ show1: false,
|
|
|
warehouseType: '1',
|
|
|
typeRemark: 'textarea',
|
|
|
border: true,
|
|
|
- show3:false,
|
|
|
+ show3: false,
|
|
|
imglist: [], //存
|
|
|
imglist2: [], //展示
|
|
|
height: 150,
|
|
|
@@ -192,48 +194,120 @@
|
|
|
{
|
|
|
purpose: "经营性费用"
|
|
|
},
|
|
|
+ {
|
|
|
+ purpose: "备用金"
|
|
|
+ },
|
|
|
],
|
|
|
- typeList1:[
|
|
|
- {value: "是"},
|
|
|
- {value: "否"},
|
|
|
+ typeList1: [{
|
|
|
+ value: "是"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: "否"
|
|
|
+ },
|
|
|
],
|
|
|
- typeList:[
|
|
|
- {value: "杂费"},
|
|
|
- {value: "水电费"},
|
|
|
- {value: "伙食费"},
|
|
|
- {value: "人工费"},
|
|
|
- {value: "物质采买"},
|
|
|
- {value: "燃料费"},
|
|
|
- {value: "加油费"},
|
|
|
+ typeList: [{
|
|
|
+ value: "杂费"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: "水电费"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: "伙食费"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: "人工费"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: "物质采买"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: "燃料费"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: "加油费"
|
|
|
+ },
|
|
|
],
|
|
|
- namelist:[
|
|
|
- {name: "黑龙江中天昊元贸易有限公司"},
|
|
|
- {name: "中天昊元-建发合营"},
|
|
|
- {name: "中天昊元-六水香合营"},
|
|
|
- {name: "中天昊元-昊友合营"},
|
|
|
- {name: "黑龙江中天昊元贸易有限公司辽宁分公司"},
|
|
|
- {name: "黑龙江众利合粮食贸易有限公司"},
|
|
|
- {name: "黑龙江欣洋粮食贸易有限公司"},
|
|
|
- {name: "黑龙江启兴粮食贸易有限公司"},
|
|
|
- {name: "黑龙江鑫满仓粮食贸易有限公司"},
|
|
|
- {name: "黑龙江谷香粮食贸易有限公司"},
|
|
|
- {name: "黑龙江益储益运粮食贸易有限公司"},
|
|
|
- {name: "黑龙江海天粮食农业发展有限公司"},
|
|
|
- {name: "黑龙江中天绿粮供应链管理有限公司"},
|
|
|
- {name: "中天昊元（海南）国际贸易有限公司"},
|
|
|
- {name: "克东县嘉达建筑装潢有限责任公司"},
|
|
|
- {name: "克东县金博粮食有限公司"},
|
|
|
- {name: "克东县安正商贸有限公司"},
|
|
|
- {name: "克东县万祥农业科技开发有限公司"},
|
|
|
- {name: "克东县万润运输有限公司"},
|
|
|
- {name: "黑龙江大金仓农业科技有限公司"},
|
|
|
- {name: "克东县华祥通讯管线工程有限公司"},
|
|
|
- {name: "黑龙江峰海粮食贸易有限公司(季度报 增值税季度）"},
|
|
|
- {name: "黑龙江鑫宝仓粮食贸易有限公司"},
|
|
|
- {name: "黑龙江中仓粮食贸易有限公司"},
|
|
|
- {name: "黑龙江晟鸿泰粮食贸易有限公司"},
|
|
|
- {name: "黑龙江新粮仓粮食贸易有限公司"},
|
|
|
- {name: "齐齐哈尔米林设备制造有限公司"},
|
|
|
+ namelist: [{
|
|
|
+ name: "黑龙江中天昊元贸易有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "中天昊元-建发合营"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "中天昊元-六水香合营"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "中天昊元-昊友合营"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江中天昊元贸易有限公司辽宁分公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江众利合粮食贸易有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江欣洋粮食贸易有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江启兴粮食贸易有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江鑫满仓粮食贸易有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江谷香粮食贸易有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江益储益运粮食贸易有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江海天粮食农业发展有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江中天绿粮供应链管理有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "中天昊元（海南）国际贸易有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "克东县嘉达建筑装潢有限责任公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "克东县金博粮食有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "克东县安正商贸有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "克东县万祥农业科技开发有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "克东县万润运输有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江大金仓农业科技有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "克东县华祥通讯管线工程有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江峰海粮食贸易有限公司(季度报 增值税季度）"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江鑫宝仓粮食贸易有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江中仓粮食贸易有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江晟鸿泰粮食贸易有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "黑龙江新粮仓粮食贸易有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "齐齐哈尔米林设备制造有限公司"
|
|
|
+ },
|
|
|
],
|
|
|
reType: "",
|
|
|
flag: "",
|
|
|
@@ -244,8 +318,10 @@
|
|
|
onLoad(options) {
|
|
|
this.reType = options.reType
|
|
|
this.expensesType = options.expensesType
|
|
|
- if(this.reType==2||this.expensesType==2){
|
|
|
- uni.setNavigationBarTitle({title: '请款'});
|
|
|
+ if (this.reType == 2 || this.expensesType == 2) {
|
|
|
+ uni.setNavigationBarTitle({
|
|
|
+ title: '请款'
|
|
|
+ });
|
|
|
}
|
|
|
this.id = options.id
|
|
|
if (this.id) {
|
|
|
@@ -255,6 +331,8 @@
|
|
|
}
|
|
|
},
|
|
|
onShow() {
|
|
|
+ this.detailData.payerHeader = uni.getStorageSync('compName1').company
|
|
|
+ this.$forceUpdate()
|
|
|
this.warehouseInfo = uni.getStorageSync('theWarehouse');
|
|
|
if (this.warehouseInfo && this.detailData.purpose == "库点费用") {
|
|
|
this.detailData.warehouseName = this.warehouseInfo.warehouseName
|
|
|
@@ -267,10 +345,10 @@
|
|
|
this.$api.doRequest('get', 'customerInfo/getPayeeInfo', {
|
|
|
contractNo: this.detailData.contractNo
|
|
|
}).then(res => {
|
|
|
- this.detailData.payee=res.customerType=="企业客户"?res.compName:res.customerName
|
|
|
- this.detailData.accountNumber=res.bankCard
|
|
|
- this.detailData.bank=res.bankDeposit
|
|
|
- this.detailData.bankBranch=res.bankDepositBranch
|
|
|
+ this.detailData.payee = res.customerType == "企业客户" ? res.compName : res.customerName
|
|
|
+ this.detailData.accountNumber = res.bankCard
|
|
|
+ this.detailData.bank = res.bankDeposit
|
|
|
+ this.detailData.bankBranch = res.bankDepositBranch
|
|
|
this.$forceUpdate()
|
|
|
})
|
|
|
}
|
|
|
@@ -288,11 +366,19 @@
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- typeCheck(e){
|
|
|
- this.detailData.wareExpenseType=this.typeList[e[0]].value
|
|
|
+ checkboxChange(e){
|
|
|
+ if(e.detail.value[0] == 1){
|
|
|
+ this.detailData.paymentIdentifi = 1
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.detailData.paymentIdentifi = 0
|
|
|
+ }
|
|
|
+ },
|
|
|
+ typeCheck(e) {
|
|
|
+ this.detailData.wareExpenseType = this.typeList[e[0]].value
|
|
|
},
|
|
|
- typeCheck1(e){
|
|
|
- this.detailData.flag=this.typeList1[e[0]].value
|
|
|
+ typeCheck1(e) {
|
|
|
+ this.detailData.flag = this.typeList1[e[0]].value
|
|
|
},
|
|
|
afterRead(e) {
|
|
|
console.log(e)
|
|
|
@@ -300,58 +386,58 @@
|
|
|
async uploadClick() {
|
|
|
let baseUrlNew = config.def().baseUrlNew
|
|
|
let pcUserInfo = uni.getStorageSync('pcUserInfo')
|
|
|
- console.log('baseUrlNew',baseUrlNew)
|
|
|
- if(!pcUserInfo){
|
|
|
+ console.log('baseUrlNew', baseUrlNew)
|
|
|
+ if (!pcUserInfo) {
|
|
|
uni.showToast({
|
|
|
- title:"登录已失效，请重新登录"
|
|
|
+ title: "登录已失效，请重新登录"
|
|
|
})
|
|
|
- return
|
|
|
+ return
|
|
|
}
|
|
|
uni.chooseImage({
|
|
|
- count:10,
|
|
|
+ count: 10,
|
|
|
success: (chooseImageRes) => {
|
|
|
- console.log('chooseImageRes',chooseImageRes)
|
|
|
+ console.log('chooseImageRes', chooseImageRes)
|
|
|
let files = []
|
|
|
for (let item of chooseImageRes.tempFiles) {
|
|
|
files.push({
|
|
|
name: 'fileName',
|
|
|
- url : item.path
|
|
|
+ url: item.path
|
|
|
});
|
|
|
}
|
|
|
console.log(files)
|
|
|
for (let i = 0; i < files.length; i++) {
|
|
|
uni.uploadFile({
|
|
|
- url: baseUrlNew + 'appendix/api/uploadFiles',
|
|
|
- // url: baseUrlNew+'appendix/api/uploadFiles', //仅为示例，非真实的接口地址
|
|
|
- // files: files[i],
|
|
|
- filePath:files[i].url,
|
|
|
- name:files[i].name,
|
|
|
- formData: {
|
|
|
- // fileName: chooseImageRes.tempFiles[0],
|
|
|
- companyId: pcUserInfo.compId,
|
|
|
- modelId: '',
|
|
|
- vesselId: '',
|
|
|
- },
|
|
|
- success: (uploadFileRes) => {
|
|
|
- console.log(JSON.parse(uploadFileRes.data))
|
|
|
- var data = JSON.parse(uploadFileRes.data).data
|
|
|
- data.compId = pcUserInfo.compId
|
|
|
- this.$api.doRequest('post', '/appendix/api/saveFilesApp', {
|
|
|
- newAppendixs: [data],
|
|
|
- oldAppendixIds: ""
|
|
|
- }).then(res => {
|
|
|
- this.imglist.push(res.data.data[0])
|
|
|
- console.log(res)
|
|
|
- })
|
|
|
- console.log(uploadFileRes.data);
|
|
|
- },
|
|
|
- fail(res) {
|
|
|
-
|
|
|
- console.log(res);
|
|
|
- }
|
|
|
- });
|
|
|
+ url: baseUrlNew + 'appendix/api/uploadFiles',
|
|
|
+ // url: baseUrlNew+'appendix/api/uploadFiles', //仅为示例，非真实的接口地址
|
|
|
+ // files: files[i],
|
|
|
+ filePath: files[i].url,
|
|
|
+ name: files[i].name,
|
|
|
+ formData: {
|
|
|
+ // fileName: chooseImageRes.tempFiles[0],
|
|
|
+ companyId: pcUserInfo.compId,
|
|
|
+ modelId: '',
|
|
|
+ vesselId: '',
|
|
|
+ },
|
|
|
+ success: (uploadFileRes) => {
|
|
|
+ console.log(JSON.parse(uploadFileRes.data))
|
|
|
+ var data = JSON.parse(uploadFileRes.data).data
|
|
|
+ data.compId = pcUserInfo.compId
|
|
|
+ this.$api.doRequest('post', '/appendix/api/saveFilesApp', {
|
|
|
+ newAppendixs: [data],
|
|
|
+ oldAppendixIds: ""
|
|
|
+ }).then(res => {
|
|
|
+ this.imglist.push(res.data.data[0])
|
|
|
+ console.log(res)
|
|
|
+ })
|
|
|
+ console.log(uploadFileRes.data);
|
|
|
+ },
|
|
|
+ fail(res) {
|
|
|
+
|
|
|
+ console.log(res);
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -373,14 +459,18 @@
|
|
|
this.detailData.expensesPurpose = "3"
|
|
|
delete this.detailData.contractNo
|
|
|
|
|
|
- } else {
|
|
|
+ } else if(this.detailData.purpose == "备用金"){
|
|
|
+ this.detailData.expensesPurpose = "7"
|
|
|
+ delete this.detailData.warehouseName
|
|
|
+ delete this.detailData.contractNo
|
|
|
+ }else {
|
|
|
this.detailData.expensesPurpose = "5"
|
|
|
delete this.detailData.warehouseName
|
|
|
delete this.detailData.contractNo
|
|
|
- if(this.reType == 2){
|
|
|
+ if (this.reType == 2) {
|
|
|
this.show1 = true
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
console.log(this.detailData)
|
|
|
},
|
|
|
@@ -410,8 +500,9 @@
|
|
|
this.$api.msg('请选择合同编号')
|
|
|
return
|
|
|
}
|
|
|
+ debugger
|
|
|
if (this.expensesType == '2') {
|
|
|
- if(!this.detailData.payerHeader){
|
|
|
+ if (!this.detailData.payerHeader) {
|
|
|
this.$api.msg('付款方不能为空')
|
|
|
return
|
|
|
}
|
|
|
@@ -423,7 +514,7 @@
|
|
|
var that = this
|
|
|
var title
|
|
|
var theInterface
|
|
|
- if (that.expensesType == '1') {
|
|
|
+ if (that.expensesType == '1' || that.reType == '1') {
|
|
|
title = "确定提交收款信息？"
|
|
|
} else {
|
|
|
title = "确定提交请款信息？"
|
|
|
@@ -443,6 +534,7 @@
|
|
|
that.detailData.compId = uni.getStorageSync('pcUserInfo').compId
|
|
|
that.detailData.agent = uni.getStorageSync('userInfo').userName
|
|
|
that.detailData.identification = that.detailData.identification
|
|
|
+ that.detailData.paymentIdentifi = that.detailData.paymentIdentifi
|
|
|
that.detailData.costType = that.detailData.costType
|
|
|
that.detailData.expensesType = that.reType
|
|
|
that.detailData.fieldName = uni.getStorageSync('userInfo').userName
|
|
|
@@ -642,7 +734,8 @@
|
|
|
display: flex;
|
|
|
justify-content: center;
|
|
|
}
|
|
|
- .margin-bottom{
|
|
|
- margin-bottom:84px;
|
|
|
+
|
|
|
+ .margin-bottom {
|
|
|
+ margin-bottom: 84px;
|
|
|
}
|
|
|
</style>
|
