xiaohaizhao 2 anni fa
parent
commit
c3ca296bd2

+ 2 - 3
packageA/remitVoucher/detail.js

@@ -283,13 +283,12 @@ Page({
 		this.partialRenewal();
 	},
 	onUnload() {
-		console.log("更新列表数据")
 		let page = getCurrentPages().find(v => v.__route__ == 'packageA/remitVoucher/index');
 		let content = JSON.parse(JSON.stringify(page.data.content));
-		content.pageNumber = 1;
 		content.pageSize = (page.data.content.pageNumber - 1) * page.data.content.pageSize;
+		content.pageNumber = 1;
 		_Http.basic({
-			"id": 20230111141104,
+			"id": 20221226152904,
 			content
 		}).then(res => {
 			console.log("更新订单列表", res)

+ 0 - 18
packageA/remitVoucher/modules/list.js

@@ -1,23 +1,5 @@
-// packageA/remitVoucher/modules/list.js
 Component({
-  /**
-   * 组件的属性列表
-   */
   properties: {
     list: Array
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
   }
 })

+ 0 - 2
packageA/remitVoucher/modules/list.scss

@@ -30,8 +30,6 @@
 			box-sizing: border-box;
 
 			.num {
-					height: 40rpx;
-					line-height: 40rpx;
 					font-size: 28rpx;
 					color: #333333;
 					padding: 20rpx 0;

+ 5 - 5
packageA/remitVoucher/modules/selectAccount/index.wxml

@@ -5,14 +5,14 @@
 <view class="total">共{{params.content.total}}个</view>
 
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
-	<navigator class="item" url="#" wx:for="{{list}}" wx:key="{{item.sa_accountclassid}}" data-id="{{item.sa_accountclassid}}" bindtap="changeResult">
-		<van-checkbox wx:if="{{!radio}}" value="{{ handle.isCheck(item.sa_accountclassid,result) }}" shape="square" icon-size='28rpx' />
+	<navigator class="item" url="#" wx:for="{{list}}" wx:key="{{item.sa_accountclassid}}">
+		<van-checkbox wx:if="{{!radio}}" value="{{ handle.isCheck(item.sa_accountclassid,result) }}" shape="square" icon-size='28rpx' data-id="{{item.sa_accountclassid}}" bindtap="changeResult" />
 		<view class="main" style="padding-left: {{!radio?'10rpx':''}};">
 			<view class="title line-1">账户名称:{{item.accountname}}</view>
 			<view class="title" style="display:flex;margin:20rpx 0;align-items: center;">
-                金额:
-                <input type="text" class="input" value="{{item.amount}}" data-item="{{item}}" bindinput="amountChange"/>
-            </view>
+				金额:
+				<input type="text" class="input" value="{{item.amount}}" data-item="{{item}}" bindinput="amountChange" />
+			</view>
 
 		</view>
 	</navigator>

+ 180 - 219
packageA/remitVoucher/update.js

@@ -1,225 +1,186 @@
 const _Http = getApp().globalData.http,
-    getTime = require("../../utils/getTime");
+	getTime = require("../../utils/getTime");
 
 Page({
-    data: {
-        showAll: false,
-        disabled: true,
-        content: {
-            "sa_paybillid": 0,
-            "sys_enterpriseid": '',
-            "payer": "",
-            "paydate": "",
-            "amount": "",
-            "remarks": "",
-            "bank": "",
-            "bankcardno": ""
-        },
-        form: [{
-                label: "经销商",
-                error: false,
-                errMsg: "",
-                type: "route",
-                url: "/select/agent/index",
-                params: {
-                    "classname": "webmanage.sale.agents.agents",
-                    "method": "query_agentList",
-                    "content": {
-                        "pageNumber": 1,
-                        "pageSize": 20,
-                        "where": {
-                            "condition": ""
-                        }
-                    }
-                  },
-                query: '&radio=true',
-                value: "",
-                placeholder: "选择经销商信息",
-                valueName: "sys_enterpriseid",
-                checking: "base",
-                required: true,
-                interrupt:true
-            },
-            {
-                label: "付款人",
-                error: false,
-                errMsg: "",
-                type: "text",
-                value: "",
-                placeholder: "付款人",
-                valueName: "payer",
-                required: false,
-                disabled:true
-            },{
-                label: "银行账号",
-                error: false,
-                errMsg: "",
-                type: "text",
-                value: "",
-                placeholder: "银行账号",
-                valueName: "bankcardno",
-                required: false,
-                disabled:true
+	data: {
+		showAll: false,
+		disabled: true,
+		content: {
+			"sa_paybillid": 0,
+			enterprisename: "",
+			period: ""
+		},
+		form: [{
+				label: "付款人",
+				error: false,
+				errMsg: "",
+				type: "text",
+				value: "",
+				placeholder: "付款人",
+				valueName: "payer",
+				required: true
+			}, {
+				label: "银行账号",
+				error: false,
+				errMsg: "",
+				type: "number",
+				value: "",
+				placeholder: "银行账号",
+				valueName: "bankcardno",
+				required: true
 
-            },{
-                label: "银行",
-                error: false,
-                errMsg: "",
-                type: "text",
-                value: "",
-                placeholder: "银行",
-                valueName: "bank",
-                required: false,
-                disabled:true
-            },{
-                label: "付款时间",
-                error: false,
-                errMsg: "",
-                type: "date",
-                value: getTime.formatTime(new Date(),'-').split(' ')[0],
-                placeholder: "请选择付款时间",
-                valueName: "paydate",
-                required: true,
-            },{
-                label: "打款总金额",
-                error: false,
-                errMsg: "",
-                type: "number",
-                value: "",
-                placeholder: "请输入打款总金额",
-                valueName: "amount",
-                required: true,
+			}, {
+				label: "银行",
+				error: false,
+				errMsg: "",
+				type: "text",
+				value: "",
+				placeholder: "银行",
+				valueName: "bank",
+				required: true
+			}, {
+				label: "付款时间",
+				error: false,
+				errMsg: "",
+				type: "date",
+				value: getTime.formatTime(new Date(), '-').split(' ')[0],
+				placeholder: "请选择付款时间",
+				valueName: "paydate",
+				required: true,
+			}, {
+				label: "打款总金额",
+				error: false,
+				errMsg: "",
+				type: "digit",
+				value: "",
+				placeholder: "请输入打款总金额",
+				valueName: "amount",
+				required: true,
 
-            },{
-                label: "转入银行",
-                error: false,
-                errMsg: "",
-                type: "text",
-                value: "",
-                placeholder: "请输入转入银行",
-                valueName: "inbank",
-                required: false,
-            },
-            {
-                label: "转入账户",
-                error: false,
-                errMsg: "",
-                type: "text",
-                value: "",
-                placeholder: "请输入转入账户",
-                valueName: "inbankcardno",
-                required: false,
-            },
-            {
-                label: "备注",
-                error: false,
-                errMsg: "",
-                type: "text",
-                value: "",
-                placeholder: "请输入备注",
-                valueName: "remarks",
-                required: false,
-            },
-        ]
-    },
-    onLoad(options) {
-        if (options.rowData) {
-            // wx.setNavigationBarTitle({
-            //   title: 'title',
-            // })
-            let data = JSON.parse(options.rowData);
-            console.log(data);
-            this.setData({
-                form: this.data.form.map(v => {
-                    if (v.valueName != 'region') {
-                        if (v.valueName == 'enterprisename') {
-                            v.value = [data[v.valueName]]
-                        } else {
-                            v.value = data[v.valueName];
-                        }
-                    } else {
-                        v.value = data.province ? [data.province, data.city, data.county] : []
-                    }
-                    return v
-                }),
-                'form[0].value': [data.enterprisename,[data.sys_enterpriseid]],
-                'content.sa_paybillid':data.sa_paybillid
-            })
-            this.selectComponent('#Form').confirm()
-            console.log(this.data.form);
-        }
-    },
-    /* 打断处理form */
-    interrupt({
-        detail
-    }) {
-        console.log("打断", detail)
-        detail.form[1].value = ''
-        detail.form[2].value = ''
-        detail.form[3].value = ''
-        detail.form[detail.temporary.index].value = detail.data.value
-        this.queryMoneyInfo(detail.data.id[0],detail.form)
-
-        this.selectComponent('#Form').confirm()
-        wx.navigateBack()
-    },
-    /* 获取财务信息 */
-    async queryMoneyInfo (id,form) {
-        let res = await _Http.basic({
-            "id": 20221013160602,
-            "content": {
-                "sys_enterpriseid":id,
-                "pageNumber": 1,
-                "pageSize": 20,
-                "where": {
-                    "condition": ""
-                }
-            },
-        })
-        form[1].value = res.data[0].enterprisename
-        form[2].value = res.data[0].bank
-        form[3].value = res.data[0].bankcardno
-        this.setData({
-            form:form
-        })
-        console.log(this.data.form);
-    },
-    async submit() {
-        let content = {
-            ...this.data.content,
-            ...this.selectComponent("#Form").submit()
-        }
-        content.sys_enterpriseid = content.sys_enterpriseid[1][0] || ''
-        let res = await _Http.basic({
-            "id": "20221226153004",
-            content
-        })
-        console.log(res);
-        if (res.msg == '成功') {
-            wx.navigateBack()
-            getCurrentPages().forEach(item => {
-                if (item.__route__ == 'packageA/remitVoucher/index') {
-                    item.getList(true)
-                } else if (item.__route__ == 'packageA/remitVoucher/detail') {
-                    item.getDetail(true)
-                }
-            })
-        }
-    },
-    // 是否显示全部
-    onChange({
-        detail
-    }) {
-        this.setData({
-            showAll: detail
-        })
-    },
-    /* 表单必填项是否完成 */
-    onConfirm({
-        detail
-    }) {
-        this.setData({
-            disabled: detail
-        })
-    }
+			}, {
+				label: "转入银行",
+				error: false,
+				errMsg: "",
+				type: "selector",
+				range: [],
+				value: "",
+				rangeKey: "remarks",
+				rangeIndex: "",
+				placeholder: "请选择转入银行",
+				valueName: "inbank",
+				required: false,
+				interrupt: true
+			},
+			{
+				label: "转入账户",
+				error: false,
+				errMsg: "",
+				type: "text",
+				value: "",
+				placeholder: "请选择转入银行后自动带入",
+				valueName: "inbankcardno",
+				required: false,
+			},
+			{
+				label: "备注",
+				error: false,
+				errMsg: "",
+				type: "text",
+				value: "",
+				placeholder: "请输入备注",
+				valueName: "remarks",
+				required: false,
+			},
+		]
+	},
+	onLoad(options) {
+		if (options.rowData) {
+			let data = JSON.parse(options.rowData);
+			this.setData({
+				form: this.data.form.map(v => {
+					v.value = data[v.valueName];
+					return v
+				}),
+				'content.sa_paybillid': data.sa_paybillid
+			})
+			this.selectComponent('#Form').confirm()
+		}
+		_Http.basic({
+			"classname": "sysmanage.develop.optiontype.optiontype",
+			"method": "optiontypeselect",
+			"content": {
+				"pageNumber": 1,
+				"pageSize": 1000,
+				"typename": "inbank",
+				"parameter": {}
+			},
+		}).then(res => {
+			console.log("银行列表", res)
+			if (res.msg == '成功') {
+				let item = this.data.form.find(v => v.label == '转入银行')
+				item.range = res.data;
+				this.setData({
+					form: this.data.form
+				})
+			}
+		})
+	},
+	/* 打断处理form */
+	interrupt({
+		detail
+	}) {
+		if (detail.data.label == '转入银行') {
+			detail.form[5] = detail.data;
+			detail.form[6].value = detail.result.value;
+			this.setData({
+				form: detail.form
+			})
+		}
+		this.selectComponent('#Form').confirm()
+	},
+	async submit() {
+		let content = {
+			...this.data.content,
+			...this.selectComponent("#Form").submit()
+		}
+		let res = await _Http.basic({
+			"id": "20221226153004",
+			content,
+			version: 1
+		})
+		console.log("创建打款凭证", res);
+		if (res.msg == '成功') {
+			let page = getCurrentPages()[getCurrentPages().length - 2];
+			if (page.__route__ == 'packageA/remitVoucher/index') {
+				wx.redirectTo({
+					url: '/packageA/remitVoucher/detail?id=' + res.data.sa_paybillid,
+				})
+			} else if (page.__route__ == 'packageA/remitVoucher/detail') {
+				wx.navigateBack();
+				page.getDetail(true)
+			}
+		} else {
+			wx.showToast({
+				title: res.msg,
+				icon: "none",
+				mask: true
+			})
+		}
+	},
+	// 是否显示全部
+	onChange({
+		detail
+	}) {
+		this.setData({
+			showAll: detail
+		})
+	},
+	/* 表单必填项是否完成 */
+	onConfirm({
+		detail
+	}) {
+		this.setData({
+			disabled: detail
+		})
+	}
 })