From 1a3821ba88c51a8d8baf8644f068a40f5eec8410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B7=9D=E8=99=8E?= <h17602169347@163.com>
Date: Wed, 19 Jun 2024 14:47:20 +0800
Subject: [PATCH] APP

---
 .../jnpf/jnpf-upload-pound/index.vue          |  248 +++
 jnpf-app/manifest.json                        |    2 +-
 jnpf-app/pages/index/portal.vue               |  414 ++--
 .../scm/form/purchaseReceiptVoucher/index.vue | 1872 ++++++++---------
 jnpf-app/utils/define.js                      |   12 +-
 5 files changed, 1416 insertions(+), 1132 deletions(-)
 create mode 100644 jnpf-app/components/jnpf/jnpf-upload-pound/index.vue

diff --git a/jnpf-app/components/jnpf/jnpf-upload-pound/index.vue b/jnpf-app/components/jnpf/jnpf-upload-pound/index.vue
new file mode 100644
index 00000000..cff2e9ba
--- /dev/null
+++ b/jnpf-app/components/jnpf/jnpf-upload-pound/index.vue
@@ -0,0 +1,248 @@
+<template>
+	<view class="upload-v">
+		<view class="jnpf-upload">
+			<template v-if="fileList.length">
+				<view class="u-list-item u-preview-wrap" v-for="(item, index) in fileList" :key="index">
+					<view v-if="!disabled" class="u-delete-icon" @tap.stop="deleteItem(index)">
+						<u-icon class="u-icon" name="close" size="20" color="#ffffff"></u-icon>
+					</view>
+					<image class="u-preview-image" :src="baseURL+item.url" mode="aspectFill"
+						@tap.stop="doPreviewImage(baseURL+item.url)"></image>
+				</view>
+			</template>
+			<u-upload width="150" height="150" :action="comUploadUrl+'annexpic'" :header="uploadHeaders"
+				:form-data="params" @on-list-change="onListChange" :max-size="maxSize" :max-count="realLimit"
+				:show-upload-list="false" :show-progress="false" :deletable="deletable" @on-success="onSuccess"
+				@on-error="handleError" ref="uUpload" :file-list="lists" :disabled='disabled'>
+			</u-upload>
+		</view>
+		<view class="tipText u-p-l-20">
+			{{tipText}}
+		</view>
+	</view>
+</template>
+<script>
+	const units = {
+		KB: 1024,
+		MB: 1024 * 1024,
+		GB: 1024 * 1024 * 1024
+	}
+	export default {
+		name: 'jnpf-upload-pound',
+		model: {
+			prop: 'value',
+			event: 'input'
+		},
+		props: {
+			value: {
+				type: [Array, String],
+				default: () => []
+			},
+			tipText: {
+				type: String,
+				default: ''
+			},
+			limit: {
+				type: Number,
+				default: 99
+			},
+			sizeUnit: {
+				type: String,
+				default: 'MB'
+			},
+			pathType: {
+				type: String,
+				default: 'defaultPath'
+			},
+			isAccount: {
+				type: Number,
+				default: 0
+			},
+			folder: {
+				type: String,
+				default: ''
+			},
+			fileSize: {
+				type: Number,
+				default: 10
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				fileList: [],
+				realLimit: 0,
+				deletable: true,
+				uploadHeaders: {
+					Authorization: this.$store.getters.token
+				},
+				params: {
+					pathType: this.pathType,
+					isAccount: this.isAccount,
+					folder: this.folder
+				},
+				lists: [],
+				maxSize: ''
+			}
+		},
+		watch: {
+			limit(val) {
+				this.realLimit = val
+			},
+			value: {
+				immediate: true,
+				handler(val) {
+					this.fileList = Array.isArray(val) ? JSON.parse(JSON.stringify(val)) : []
+				}
+			}
+		},
+		created() {
+			this.uploadHeaders.Authorization = uni.getStorageSync('token')
+			this.maxSize = this.fileSize ? this.fileSize * units[this.sizeUnit] : 10000000000000
+			this.$nextTick(function() {
+				this.lists = this.fileList
+			})
+			this.realLimit = this.limit
+			if (this.disabled) this.deletable = false
+		},
+		computed: {
+			baseURL() {
+				return this.define.baseURL
+			},
+			comUploadUrl() {
+				return this.define.comUploadUrlPound
+			},
+		},
+		methods: {
+			onSuccess(data, index, lists, name) {
+				if (data.code == 200) {
+					this.fileList.push({
+						name: lists[index].file.name,
+						fileId: data.data.name,
+						url: data.data.url
+					})
+					this.$emit('input', this.fileList)
+					this.$emit('change', this.fileList)
+				} else {
+					lists.splice(index, 1)
+					this.$u.toast(data.msg)
+				}
+			},
+			handleError(res, index, lists, name) {
+				lists.splice(index, 1)
+			},
+			deleteItem(index) {
+				uni.showModal({
+					title: '提示',
+					content: '您确定要删除此项吗？',
+					success: res => {
+						if (res.confirm) {
+							this.$refs.uUpload.remove(index);
+							this.fileList.splice(index, 1)
+							this.$emit('input', this.fileList)
+							this.$emit('change', this.fileList)
+							uni.showToast({
+								title: '移除成功',
+								icon: 'none'
+							});
+						}
+					}
+				});
+			},
+			onListChange(lists) {
+				this.lists = lists;
+			},
+			doPreviewImage(url) {
+				const images = this.fileList.map(item => this.baseURL + item.url);
+				uni.previewImage({
+					urls: images,
+					current: url,
+					success: () => {},
+					fail: () => {
+						uni.showToast({
+							title: '预览图片失败',
+							icon: 'none'
+						});
+					}
+				});
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.upload-v {
+		width: 100%;
+
+		.tipText {
+			color: #606266;
+			word-break: break-all;
+			line-height: 48rpx;
+			text-align: right;
+		}
+
+		.jnpf-upload {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			align-items: center;
+			justify-content: flex-end;
+
+			/deep/.u-upload {
+				.u-list-item {
+					margin: 0 !important;
+				}
+			}
+
+			.u-preview-wrap {
+				width: 150rpx;
+				height: 150rpx;
+				border: 1px solid #ebecee;
+				overflow: hidden;
+				margin: 10rpx;
+				background: rgb(244, 245, 246);
+				position: relative;
+				border-radius: 10rpx;
+				/* #ifndef APP-NVUE */
+				display: flex;
+				/* #endif */
+				align-items: center;
+				justify-content: center;
+
+				.u-preview-image {
+					display: block;
+					width: 100%;
+					height: 100%;
+					border-radius: 10rpx;
+
+				}
+
+				.u-delete-icon {
+					position: absolute;
+					top: 10rpx;
+					right: 10rpx;
+					z-index: 10;
+					background-color: $u-type-error;
+					border-radius: 100rpx;
+					width: 44rpx;
+					height: 44rpx;
+					/* #ifndef APP-NVUE */
+					display: flex;
+					/* #endif */
+					align-items: center;
+					justify-content: center;
+				}
+
+				.u-icon {
+					/* #ifndef APP-NVUE */
+					display: flex;
+					/* #endif */
+					align-items: center;
+					justify-content: center;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/jnpf-app/manifest.json b/jnpf-app/manifest.json
index 1f3e45fe..e3fe1072 100644
--- a/jnpf-app/manifest.json
+++ b/jnpf-app/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "管家平台",
+    "name" : "管家平台2期",
     "appid" : "__UNI__FA01CC1",
     "description" : "专注信息化平台、软件开发、app开发",
     "versionName" : "3.4.76",
diff --git a/jnpf-app/pages/index/portal.vue b/jnpf-app/pages/index/portal.vue
index 854368cf..9bd5741c 100644
--- a/jnpf-app/pages/index/portal.vue
+++ b/jnpf-app/pages/index/portal.vue
@@ -1,207 +1,237 @@
 <template>
 	<view class="u-page u-page-home">
-			<view class="sty-statistics-top-b">
-				<u-row gutter="16">
-					<u-col span="12" text-align="center">
-						<view class="sty-statistics-top-item">
-							<view><span>济钢城市矿产再生资源智慧管家平台</span></view>
-						</view>
-					</u-col>
-				</u-row>
-			</view>
-			<view class="sty-statistics-top">
-				<u-row gutter="16">
-					<u-col span="12" text-align="center" class="line-right">
-						<view class="sty-statistics-top-item">
-						<view><span class="fsizeA">{{homeInfo.avgPurchasePrice}}</span></view>
-							<view><span class="fsizeA">磅单采购数</span></view>
-						</view>
-					</u-col>
+		<view class="sty-statistics-top-b">
+			<u-row gutter="16">
+				<u-col span="12" text-align="center">
+					<view class="sty-statistics-top-item">
+						<view><span>济钢城市矿产再生资源智慧管家平台</span></view>
+					</view>
+				</u-col>
+			</u-row>
+		</view>
+		<view class="sty-statistics-top">
+			<u-row gutter="16">
+				<u-col span="12" text-align="center" class="line-right">
+					<view class="sty-statistics-top-item">
+					<view><span class="fsizeA">{{homeInfo.avgPurchasePrice}}</span></view>
+						<view><span class="fsizeA">磅单采购数</span></view>
+					</view>
+				</u-col>
+				
+			</u-row>
+		</view>
+		
+		<view class="sty-statistics-top">
+			<u-row gutter="16">
+				<u-col span="12" text-align="center" class="line-right">
+					<view class="sty-statistics-top-item">
+						<view><span class="fsizeA">{{homeInfo.todayPurchasePrice}}</span></view>
+						<view><span class="fsizeA">今日采购量</span></view>
+					</view>
+				</u-col>
+				
+			</u-row>
+		</view>
+		
+		<view class="sty-statistics-top">
+			<u-row gutter="16">
+				
+				
+				<u-col span="12" text-align="center">
+					<view class="sty-statistics-top-item">
+					<view><span class="fsizeA">{{homeInfo.salesVolumeToday}}</span></view>
+						<view><span class="fsizeA">今日销售量</span></view>
+					</view>
+				</u-col>
+			</u-row>
+		</view>
+		
+		
+		
+		<!-- <view class="sty-msg">
+			<u-notice-bar :duration="5000" mode="horizontal" :is-circular="false" @click="goMsg" :list="list">
+			</u-notice-bar>
+		</view> -->
+		<view class="sty-statistics">
+			<u-row gutter="22" justify="space-between">
+				<u-col span="12" gutter="0">
+					<u-row gutter="22" justify="space-between">
+						
+						<u-col span="6">
+							<view class="sty-item sty-item-b">
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											<u-icon name="car" color="#ffffff" size="80"></u-icon>
+										</view>
+									</u-col>
+								</u-row>
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											今日付款:{{homeInfo.todayPay}}元
+										</view>
+										
+									</u-col>
+								</u-row>
+							</view>
+						</u-col>
+						
+						<u-col span="6">
+							<view class="sty-item sty-item-d">
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											<u-icon name="home" color="#ffffff" size="80"></u-icon>
+										</view>
+									</u-col>
+								</u-row>
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											今日回款:{{homeInfo.todayPayment}}元
+										</view>
+									</u-col>
+								</u-row>
+							</view>
+						</u-col>
+						
+						
 					
-				</u-row>
-			</view>
-			
-			<view class="sty-statistics-top">
-				<u-row gutter="16">
-					<u-col span="12" text-align="center" class="line-right">
-						<view class="sty-statistics-top-item">
-							<view><span class="fsizeA">{{homeInfo.todayPurchasePrice}}</span></view>
-							<view><span class="fsizeA">今日采购量</span></view>
-						</view>
-					</u-col>
 					
-				</u-row>
-			</view>
-			
-			<view class="sty-statistics-top">
-				<u-row gutter="16">
+					</u-row>
+				</u-col>
+			</u-row>
+			<u-row gutter="22" justify="space-between">
+				<u-col span="12" gutter="0">
+					<u-row gutter="22" justify="space-between">
+						
+						<u-col span="6">
+							<view class="sty-item sty-item-a">
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											<u-icon name="red-packet" color="#ffffff" size="80"></u-icon>
+										</view>
+									</u-col>
+								</u-row>
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+												待支付:{{homeInfo.unpaid}}元
+										</view>
+									</u-col>
+								</u-row>
+							</view>
+						</u-col>
+						
+						<u-col span="6">
+							<view class="sty-item sty-item-c">
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											<u-icon name="rmb" color="#ffffff" size="80"></u-icon>
+										</view>
+									</u-col>
+								</u-row>
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											待回款:{{homeInfo.moneyCollected}}元
+										</view>
+									</u-col>
+								</u-row>
+							</view>
+						</u-col>
+						
 					
 					
-					<u-col span="12" text-align="center">
-						<view class="sty-statistics-top-item">
-						<view><span class="fsizeA">{{homeInfo.salesVolumeToday}}</span></view>
-							<view><span class="fsizeA">今日销售量</span></view>
-						</view>
-					</u-col>
-				</u-row>
-			</view>
-			
-			
+					</u-row>
+				</u-col>
+			</u-row>
+		</view>
 			
-			<!-- <view class="sty-msg">
-				<u-notice-bar :duration="5000" mode="horizontal" :is-circular="false" @click="goMsg" :list="list">
-				</u-notice-bar>
-			</view> -->
-			<view class="sty-statistics">
-				<u-row gutter="22" justify="space-between">
-					<u-col span="12" gutter="0">
-						<u-row gutter="22" justify="space-between">
-							
-							<u-col span="6">
-								<view class="sty-item sty-item-b">
-									<u-row>
-										<u-col span="12" text-align="center">
-											<view>
-												<u-icon name="car" color="#ffffff" size="80"></u-icon>
-											</view>
-										</u-col>
-									</u-row>
-									<u-row>
-										<u-col span="12" text-align="center">
-											<view>
-												今日付款:{{homeInfo.todayPay}}元
-											</view>
-											
-										</u-col>
-									</u-row>
+		<view class="menhu-v">
+			<!-- #ifndef MP -->
+			<template>
+				<template v-if="userInfo.appPortalId">
+					<mescroll-body ref="mescrollRef" @down="downCallback" :down="downOption"  @up="upCallback"
+						:up="upOption" :bottombar="false" style="min-height: 100%" @init="mescrollInit">
+						<!-- 常规门户 -->
+						<view class="portal-v" v-if="authConfig.type==0">
+							<template v-if="formData.length">
+								<view class="portal-box" v-for="(item,index) in formData" :key="index">
+									<portalItem :item='item' ref="portalItem" :key="key" :protalData="formData"
+										v-if="item.show" />
 								</view>
-							</u-col>
-							
-							<u-col span="6">
-								<view class="sty-item sty-item-d">
-									<u-row>
-										<u-col span="12" text-align="center">
-											<view>
-												<u-icon name="home" color="#ffffff" size="80"></u-icon>
-											</view>
-										</u-col>
-									</u-row>
-									<u-row>
-										<u-col span="12" text-align="center">
-											<view>
-												今日回款:{{homeInfo.todayPayment}}元
-											</view>
-										</u-col>
-									</u-row>
-								</view>
-							</u-col>
+							</template>
+							<!-- <u-row>
+								<u-col span="6">
+									<view class="sty-item sty-item-c">
+										<u-row>
+											<u-col span="12" text-align="center">
+												<view>
+													<u-icon name="rmb" color="#ffffff" size="80"></u-icon>
+												</view>
+											</u-col>
+										</u-row>
+										<u-row>
+											<u-col span="12" text-align="center">
+												<view>
+													采购收货凭证
+												</view>
+											</u-col>
+										</u-row>
+									</view>
+								</u-col>
+								
 							
 							
-						
-						
-						</u-row>
-					</u-col>
-				</u-row>
-				<u-row gutter="22" justify="space-between">
-					<u-col span="12" gutter="0">
-						<u-row gutter="22" justify="space-between">
+							</u-row> -->
 							
-							<u-col span="6">
-								<view class="sty-item sty-item-a">
-									<u-row>
-										<u-col span="12" text-align="center">
-											<view>
-												<u-icon name="red-packet" color="#ffffff" size="80"></u-icon>
-											</view>
-										</u-col>
-									</u-row>
-									<u-row>
-										<u-col span="12" text-align="center">
-											<view>
-													待支付:{{homeInfo.unpaid}}元
-											</view>
-										</u-col>
-									</u-row>
-								</view>
-							</u-col>
-							
-							<u-col span="6">
-								<view class="sty-item sty-item-c">
-									<u-row>
-										<u-col span="12" text-align="center">
-											<view>
-												<u-icon name="rmb" color="#ffffff" size="80"></u-icon>
-											</view>
-										</u-col>
-									</u-row>
-									<u-row>
-										<u-col span="12" text-align="center">
-											<view>
-												待回款:{{homeInfo.moneyCollected}}元
-											</view>
-										</u-col>
-									</u-row>
-								</view>
-							</u-col>
-							
-						
-						
-						</u-row>
-					</u-col>
-				</u-row>
-			</view>
+						</view>
+					</mescroll-body>
+				</template>
 			
-				<template>
-				<view class="menhu-v">
-					<!-- #ifndef MP -->
-					<template>
-						<template v-if="userInfo.appPortalId">
-							<mescroll-body ref="mescrollRef" @down="downCallback" :down="downOption"  @up="upCallback"
-								:up="upOption" :bottombar="false" style="min-height: 100%" @init="mescrollInit">
-								<!-- 常规门户 -->
-								<view class="portal-v" v-if="authConfig.type==0">
-									<template v-if="formData.length">
-										<view class="portal-box" v-for="(item,index) in formData" :key="index">
-											<portalItem :item='item' ref="portalItem" :key="key" :protalData="formData"
-												v-if="item.show" />
-										</view>
-									</template>
-									</u-row>
-									<u-col span="6">
-											<view class="sty-item sty-item-c">
-												<u-row>
-													<u-col span="12" text-align="center">
-														<view>
-															<u-icon name="rmb" color="#ffffff" size="80"></u-icon>
-														</view>
-													</u-col>
-												</u-row>
-												<u-row>
-													<u-col span="12" text-align="center">
-														<view>
-															采购收货凭证
-														</view>
-													</u-col>
-												</u-row>
-											</view>
-										</u-col>
-										
-									
-									
-									</u-row>
-									
-								</view>
-							</mescroll-body>
-						</template>
-					
-					</template>
-					<!-- #endif -->
-				
-					
-				</view>
 			</template>
+			<!-- #endif -->
+		
 			
 		</view>
+		
+		
+		<view class="sty-statistics" @click="openPage('/pages/scm/form/purchaseReceiptVoucher/index')">
+			<u-row gutter="22" justify="space-between">
+				<u-col span="12" gutter="0">
+					<u-row gutter="22" justify="space-between">
+						
+						<u-col span="6">
+							<view class="sty-item sty-item-b">
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											<u-icon name="car" color="#ffffff" size="80"></u-icon>
+										</view>
+									</u-col>
+								</u-row>
+								<u-row>
+									<u-col span="12" text-align="center">
+										<view>
+											采购收货凭证
+										</view>
+										
+									</u-col>
+								</u-row>
+							</view>
+						</u-col>
+						
+						<u-col span="6">
+						</u-col>
+					</u-row>
+				</u-col>
+			</u-row>
+		</view>
+	</view>
 
 </template>
 
@@ -309,6 +339,12 @@
 			// #endif
 		},
 		methods: {
+			openPage(path) {
+				if (!path) return;
+				uni.navigateTo({
+					url: path,
+				});
+			},
 			getHomeInfo() {
 				request({
 					url: '/api/scm/BusinessEnterpriseRelational/getHomePage',
diff --git a/jnpf-app/pages/scm/form/purchaseReceiptVoucher/index.vue b/jnpf-app/pages/scm/form/purchaseReceiptVoucher/index.vue
index 855345a7..a50ad44a 100644
--- a/jnpf-app/pages/scm/form/purchaseReceiptVoucher/index.vue
+++ b/jnpf-app/pages/scm/form/purchaseReceiptVoucher/index.vue
@@ -1,386 +1,356 @@
 <template>
-    <view class="jnpf-wrap jnpf-wrap-form" v-if="!loading">
-        <u-form :model="dataForm" :rules="rules" ref="dataForm" :errorType="['toast']"
-                label-position="left" label-align="right" :label-width="labelwidth" class="jnpf-form">
-            <view class="u-p-l-20 u-p-r-20 ">
-                <u-form-item>
-                    <jnpf-group 
- value="基础信息" content="基础信息" contentPosition="left" >
-                </jnpf-group>
-                </u-form-item>
-            </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-    label="凭证编号"  prop="voucherCode" >
-                <u-input v-model="dataForm.voucherCode" disabled 
-                        @change="changeData('voucherCode',-1)"
- input-align='right'  placeholder="系统自动生成" :style='{"width":"100%"}' readonly>
-            </u-input>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="凭证类型"  prop="voucherType" >
-                <jnpf-select v-model="dataForm.voucherType"
-                        @change="changeData('voucherType',-1)"
- clearable  placeholder="请选择"  :props="voucherTypeProps" :options="voucherTypeOptions" :style='{"width":"100%"}'>
-            </jnpf-select>
-            </u-form-item>
-        </view>
+	<view class="jnpf-wrap jnpf-wrap-form" v-if="!loading">
+		<u-form :model="dataForm" :rules="rules" ref="dataForm" :errorType="['toast']" label-position="left"
+			label-align="right" :label-width="labelwidth" class="jnpf-form">
+			<view class="u-p-l-20 u-p-r-20 ">
+				<u-form-item>
+					<jnpf-group value="基础信息" content="基础信息" contentPosition="left">
+					</jnpf-group>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item label="凭证编号" prop="voucherCode">
+					<u-input v-model="dataForm.voucherCode" disabled @change="changeData('voucherCode',-1)"
+						input-align='right' placeholder="系统自动生成" :style='{"width":"100%"}' readonly>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item required label="凭证类型" prop="voucherType">
+					<jnpf-select v-model="dataForm.voucherType" @change="changeData('voucherType',-1)" clearable
+						placeholder="请选择" :props="voucherTypeProps" :options="voucherTypeOptions"
+						:style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
 
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="制单时间"  prop="preparationTime" >
-                <jnpf-date-time v-model="dataForm.preparationTime"
-                        @change="changeData('preparationTime',-1)"
- :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  format="yyyy-MM-dd"  clearable  placeholder="请选择" type="date" :style='{"width":"100%"}'>
-            </jnpf-date-time>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-    label="三级供应商"  prop="associateThirdSuppliers" >
-                <jnpf-popup-select v-model="dataForm.associateThirdSuppliers"
-                        @change="changeData('associateThirdSuppliers',-1)"
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.associateThirdSuppliers"  clearable  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='name'  vModel='associateThirdSuppliers'   :columnOptions="associateThirdSuppliersColumnOptions" interfaceId="523899951990705477"  :pageSize="20"  placeholder="请选择" type="popup" :style='{"width":"100%"}'>
-            </jnpf-popup-select>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="配送方式"  prop="deliveryType" >
-                <jnpf-select v-model="dataForm.deliveryType"
-                        @change="changeData('deliveryType',-1)"
- clearable  placeholder="请选择"  :props="deliveryTypeProps" :options="deliveryTypeOptions" :style='{"width":"100%"}'>
-            </jnpf-select>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="采购合同编号"  prop="purchaseContractNo" >
-                <u-input v-model="dataForm.purchaseContractNo"
-                        @change="changeData('purchaseContractNo',-1)"
- input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-            </u-input>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-    label="销售合同编号"  prop="saleContractNo" >
-                <u-input v-model="dataForm.saleContractNo"
-                        @change="changeData('saleContractNo',-1)"
- input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-            </u-input>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-    label="采购额"  prop="purchaseAmount" >
-                <u-input v-model="dataForm.purchaseAmount"
-                        @change="changeData('purchaseAmount',-1)"
- input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-            </u-input>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-    label="销售额"  prop="saleAmount" >
-                <u-input v-model="dataForm.saleAmount"
-                        @change="changeData('saleAmount',-1)"
- input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-            </u-input>
-            </u-form-item>
-        </view>
-            <view class="u-p-l-20 u-p-r-20 ">
-                <u-form-item>
-                    <jnpf-group 
- value="凭证信息" content="凭证信息" contentPosition="left" >
-                </jnpf-group>
-                </u-form-item>
-            </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="凭证图片"  prop="voucherPictures" >
-                <jnpf-upload v-model="dataForm.voucherPictures"
-                        @change="changeData('voucherPictures',-1)"
- sizeUnit="MB"  :fileSize="10"  :limit="1"  pathType="defaultPath"  :isAccount="0"  :value="dataForm.voucherPictures">
-            </jnpf-upload>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-    label="磅单编号"  prop="poundCode" >
-                <u-input v-model="dataForm.poundCode"
-                        @change="changeData('poundCode',-1)"
- input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-            </u-input>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="车牌号"  prop="vehicleName" >
-                <u-input v-model="dataForm.vehicleName"
-                        @change="vehicleChange(dataForm.vehicleName)"
- input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-            </u-input>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="发货单位"  prop="supplierId" >
-                <jnpf-popup-select v-model="dataForm.supplierId"
-                        @change="changeData('supplierId',-1)"
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.supplierId"  hasPage  clearable  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='name'  vModel='supplierId'   :columnOptions="supplierIdColumnOptions" interfaceId="530001731111617029"  :pageSize="20"  placeholder="请选择" type="popup" :style='{"width":"100%"}'>
-            </jnpf-popup-select>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="收货单位"  prop="customerId" >
-                <jnpf-popup-select v-model="dataForm.customerId"
-                        @change="changeData('customerId',-1)"
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.customerId"  hasPage  clearable  propsValue="f_id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='f_full_name'  vModel='customerId'   :columnOptions="customerIdColumnOptions" interfaceId="522729853024209157"  :pageSize="20"  placeholder="请选择" type="popup" :style='{"width":"100%"}'>
-            </jnpf-popup-select>
-            </u-form-item>
-        </view>
-            <view class="jnpf-table">
-                <view class="jnpf-table-item" v-for="(item,i) in dataForm.voucherproductList" :key="i">
-                    <view class="jnpf-table-item-title u-flex u-row-between">
-                        <text class="jnpf-table-item-title-num">({{i+1}})</text>
-                            <view class="jnpf-table-item-title-action" v-if="dataForm.voucherproductList.length>0" @click="delvoucherproductList(i)">删除</view>
-                    </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="商品名称" >
-                <jnpf-popup-select v-model="dataForm.voucherproductList[i].productId"
-                        @change="changeData('voucherproduct-productId',i)"
- :rowIndex="i"  :formData="dataForm"  :templateJson="interfaceRes.voucherproductproductId"  clearable  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='name'  :vModel="'productId'+i"   :columnOptions="voucherproductproductIdColumnOptions" interfaceId="529919666429100229"  :pageSize="20"  placeholder="请选择" type="popup" :style='{"width":"100%"}'>
-            </jnpf-popup-select>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-    label="规格" >
-                <u-input v-model="dataForm.voucherproductList[i].spec"
-                        @change="changeData('voucherproduct-spec',i)"
- input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-            </u-input>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="单位" >
-                <u-input v-model="dataForm.voucherproductList[i].unit"
-                        @change="changeData('voucherproduct-unit',i)"
- input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-            </u-input>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="毛重" >
-                <jnpf-number-box v-model="dataForm.voucherproductList[i].grossWeight"
-                        @change="changeData('voucherproduct-grossWeight',i)"
- :precision="4"  :controls="true"  placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherproductList[i])">
-            </jnpf-number-box>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="皮重" >
-                <jnpf-number-box v-model="dataForm.voucherproductList[i].tareWeight"
-                        @change="changeData('voucherproduct-tareWeight',i)"
- :precision="4"  :controls="true"  placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherproductList[i])">
-            </jnpf-number-box>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="扣重" >
-                <jnpf-number-box v-model="dataForm.voucherproductList[i].buckleWeight"
-                        @change="changeData('voucherproduct-buckleWeight',i)"
- :precision="4"  :controls="true"  placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherproductList[i])">
-            </jnpf-number-box>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="结算量" >
-                <jnpf-number-box v-model="dataForm.voucherproductList[i].netWeight"
-                        @change="changeData('voucherproduct-netWeight',i)"
- :precision="4"  :controls="true"  placeholder="数字文本" :step="1">
-            </jnpf-number-box>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="净重" >
-                <jnpf-number-box v-model="dataForm.voucherproductList[i].clearWeight"
-                        @change="changeData('voucherproduct-clearWeight',i)"
- :precision="4"  :controls="true"  placeholder="数字文本" :step="1">
-            </jnpf-number-box>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-    label="备注" >
-                <u-input v-model="dataForm.voucherproductList[i].remark"
-                        @change="changeData('voucherproduct-remark',i)"
- input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-            </u-input>
-            </u-form-item>
-        </view>
-                </view>
-                    <view class="jnpf-table-addBtn" @click="addvoucherproductList" >
-                        <u-icon name="plus" color="#2979ff"></u-icon>
-                        <span>{{dataForm.voucherproductList.length==0?"添加":"添加"}}</span>
-                    </view>
-            </view>
-            <view class="u-p-l-20 u-p-r-20 ">
-                <u-form-item>
-                    <jnpf-group 
- value="运输信息" content="运输信息" contentPosition="left" >
-                </jnpf-group>
-                </u-form-item>
-            </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="运输方式"  prop="modeTransport" >
-                <jnpf-select v-model="dataForm.modeTransport"
-                        @change="changeData('modeTransport',-1)"
- clearable  placeholder="请选择"  :props="modeTransportProps" :options="modeTransportOptions" :style='{"width":"100%"}'>
-            </jnpf-select>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="承运方式"  prop="transportationMethod" >
-                <jnpf-select v-model="dataForm.transportationMethod"
-                        @change="changeData('transportationMethod',-1)"
- clearable  placeholder="请选择"  :props="transportationMethodProps" :options="transportationMethodOptions" :style='{"width":"100%"}'>
-            </jnpf-select>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-    label="承运商"  prop="carrier" >
-                <u-input v-model="dataForm.carrier"
-                        @change="changeData('carrier',-1)"
- input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-            </u-input>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="起运地"  prop="placeDispatch" >
-                <jnpf-city-select v-model="dataForm.placeDispatch"
-                        @change="changeData('placeDispatch',-1)"
- selectType="all"  clearable  placeholder="请选择" :level="2"  :style='{"width":"100%"}'>
-            </jnpf-city-select>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="到达地"  prop="destination" >
-                <jnpf-city-select v-model="dataForm.destination"
-                        @change="changeData('destination',-1)"
- selectType="all"  clearable  placeholder="请选择" :level="2"  :style='{"width":"100%"}'>
-            </jnpf-city-select>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="运费"  prop="freight" >
-                <u-input v-model="dataForm.freight"
-                        @change="changeData('freight',-1)"
- input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-            </u-input>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="车辆信息"  prop="vehiclePictures" >
-                <jnpf-upload v-model="dataForm.vehiclePictures"
-                        @change="changeData('vehiclePictures',-1)"
- sizeUnit="MB"  :fileSize="10"  :limit="9"  pathType="defaultPath"  :isAccount="0"  :value="dataForm.vehiclePictures">
-            </jnpf-upload>
-            </u-form-item>
-        </view>
-            <view class="jnpf-table">
-                <view class="jnpf-table-item" v-for="(item,i) in dataForm.vouchervehicleList" :key="i">
-                    <view class="jnpf-table-item-title u-flex u-row-between">
-                        <text class="jnpf-table-item-title-num">({{i+1}})</text>
-                            <view class="jnpf-table-item-title-action" v-if="dataForm.vouchervehicleList.length>0" @click="delvouchervehicleList(i)">删除</view>
-                    </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-  required    label="车牌号" >
-<!--                <jnpf-popup-select v-model="dataForm.vouchervehicleList[i].vehicleId"
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item required label="制单时间" prop="preparationTime">
+					<jnpf-date-time v-model="dataForm.preparationTime" @change="changeData('preparationTime',-1)"
+						:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" format="yyyy-MM-dd"
+						clearable placeholder="请选择" type="date" :style='{"width":"100%"}'>
+					</jnpf-date-time>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item label="三级供应商" prop="associateThirdSuppliers">
+					<jnpf-popup-select v-model="dataForm.associateThirdSuppliers"
+						@change="changeData('associateThirdSuppliers',-1)" :rowIndex="null" :formData="dataForm"
+						:templateJson="interfaceRes.associateThirdSuppliers" clearable propsValue="id"
+						popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
+						vModel='associateThirdSuppliers' :columnOptions="associateThirdSuppliersColumnOptions"
+						interfaceId="523899951990705477" :pageSize="20" placeholder="请选择" type="popup"
+						:style='{"width":"100%"}'>
+					</jnpf-popup-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item required label="配送方式" prop="deliveryType">
+					<jnpf-select v-model="dataForm.deliveryType" @change="changeData('deliveryType',-1)" clearable
+						placeholder="请选择" :props="deliveryTypeProps" :options="deliveryTypeOptions"
+						:style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item required label="采购合同编号" prop="purchaseContractNo">
+					<u-input v-model="dataForm.purchaseContractNo" @change="changeData('purchaseContractNo',-1)"
+						input-align='right' clearable placeholder="请输入" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item label="销售合同编号" prop="saleContractNo">
+					<u-input v-model="dataForm.saleContractNo" @change="changeData('saleContractNo',-1)"
+						input-align='right' clearable placeholder="请输入" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item label="采购额" prop="purchaseAmount">
+					<u-input v-model="dataForm.purchaseAmount" @change="changeData('purchaseAmount',-1)"
+						input-align='right' clearable placeholder="请输入" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item label="销售额" prop="saleAmount">
+					<u-input v-model="dataForm.saleAmount" @change="changeData('saleAmount',-1)" input-align='right'
+						clearable placeholder="请输入" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 ">
+				<u-form-item>
+					<jnpf-group value="凭证信息" content="凭证信息" contentPosition="left">
+					</jnpf-group>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item required label="凭证图片" prop="voucherPictures">
+					<jnpf-upload-pound v-model="dataForm.voucherPictures" @change="changeData('voucherPictures',-1)"
+						sizeUnit="MB" :fileSize="10" :limit="1" pathType="defaultPath" :isAccount="0"
+						:value="dataForm.voucherPictures">
+					</jnpf-upload-pound>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item label="磅单编号" prop="poundCode">
+					<u-input v-model="dataForm.poundCode" @change="changeData('poundCode',-1)" input-align='right'
+						clearable placeholder="请输入" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item required label="车牌号" prop="vehicleName">
+					<u-input v-model="dataForm.vehicleName" @change="vehicleChange(dataForm.vehicleName)"
+						input-align='right' clearable placeholder="请输入" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item required label="发货单位" prop="supplierId">
+					<jnpf-popup-select v-model="dataForm.supplierId" @change="changeData('supplierId',-1)"
+						:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.supplierId" hasPage clearable
+						propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
+						vModel='supplierId' :columnOptions="supplierIdColumnOptions" interfaceId="530001731111617029"
+						:pageSize="20" placeholder="请选择" type="popup" :style='{"width":"100%"}'>
+					</jnpf-popup-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item required label="收货单位" prop="customerId">
+					<jnpf-popup-select v-model="dataForm.customerId" @change="changeData('customerId',-1)"
+						:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.customerId" hasPage clearable
+						propsValue="f_id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+						relationField='f_full_name' vModel='customerId' :columnOptions="customerIdColumnOptions"
+						interfaceId="522729853024209157" :pageSize="20" placeholder="请选择" type="popup"
+						:style='{"width":"100%"}'>
+					</jnpf-popup-select>
+				</u-form-item>
+			</view>
+			<view class="jnpf-table">
+				<view class="jnpf-table-item" v-for="(item,i) in dataForm.voucherproductList" :key="i">
+					<view class="jnpf-table-item-title u-flex u-row-between">
+						<text class="jnpf-table-item-title-num">({{i+1}})</text>
+						<view class="jnpf-table-item-title-action" v-if="dataForm.voucherproductList.length>0"
+							@click="delvoucherproductList(i)">删除</view>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item required label="商品名称">
+							<jnpf-popup-select v-model="dataForm.voucherproductList[i].productId"
+								@change="changeData('voucherproduct-productId',i)" :rowIndex="i" :formData="dataForm"
+								:templateJson="interfaceRes.voucherproductproductId" clearable propsValue="id"
+								popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
+								:vModel="'productId'+i" :columnOptions="voucherproductproductIdColumnOptions"
+								interfaceId="529919666429100229" :pageSize="20" placeholder="请选择" type="popup"
+								:style='{"width":"100%"}'>
+							</jnpf-popup-select>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item label="规格">
+							<u-input v-model="dataForm.voucherproductList[i].spec"
+								@change="changeData('voucherproduct-spec',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item required label="单位">
+							<u-input v-model="dataForm.voucherproductList[i].unit"
+								@change="changeData('voucherproduct-unit',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item required label="毛重">
+							<jnpf-number-box v-model="dataForm.voucherproductList[i].grossWeight"
+								@change="changeData('voucherproduct-grossWeight',i)" :precision="4" :controls="true"
+								placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherproductList[i])">
+							</jnpf-number-box>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item required label="皮重">
+							<jnpf-number-box v-model="dataForm.voucherproductList[i].tareWeight"
+								@change="changeData('voucherproduct-tareWeight',i)" :precision="4" :controls="true"
+								placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherproductList[i])">
+							</jnpf-number-box>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item required label="扣重">
+							<jnpf-number-box v-model="dataForm.voucherproductList[i].buckleWeight"
+								@change="changeData('voucherproduct-buckleWeight',i)" :precision="4" :controls="true"
+								placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherproductList[i])">
+							</jnpf-number-box>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item required label="结算量">
+							<jnpf-number-box v-model="dataForm.voucherproductList[i].netWeight"
+								@change="changeData('voucherproduct-netWeight',i)" :precision="4" :controls="true"
+								placeholder="数字文本" :step="1">
+							</jnpf-number-box>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item required label="净重">
+							<jnpf-number-box v-model="dataForm.voucherproductList[i].clearWeight"
+								@change="changeData('voucherproduct-clearWeight',i)" :precision="4" :controls="true"
+								placeholder="数字文本" :step="1">
+							</jnpf-number-box>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item label="备注">
+							<u-input v-model="dataForm.voucherproductList[i].remark"
+								@change="changeData('voucherproduct-remark',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+				</view>
+				<view class="jnpf-table-addBtn" @click="addvoucherproductList">
+					<u-icon name="plus" color="#2979ff"></u-icon>
+					<span>{{dataForm.voucherproductList.length==0?"添加":"添加"}}</span>
+				</view>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 ">
+				<u-form-item>
+					<jnpf-group value="运输信息" content="运输信息" contentPosition="left">
+					</jnpf-group>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item required label="运输方式" prop="modeTransport">
+					<jnpf-select v-model="dataForm.modeTransport" @change="changeData('modeTransport',-1)" clearable
+						placeholder="请选择" :props="modeTransportProps" :options="modeTransportOptions"
+						:style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item required label="承运方式" prop="transportationMethod">
+					<jnpf-select v-model="dataForm.transportationMethod" @change="changeData('transportationMethod',-1)"
+						clearable placeholder="请选择" :props="transportationMethodProps"
+						:options="transportationMethodOptions" :style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item label="承运商" prop="carrier">
+					<u-input v-model="dataForm.carrier" @change="changeData('carrier',-1)" input-align='right' clearable
+						placeholder="请输入" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item required label="起运地" prop="placeDispatch">
+					<jnpf-city-select v-model="dataForm.placeDispatch" @change="changeData('placeDispatch',-1)"
+						selectType="all" clearable placeholder="请选择" :level="2" :style='{"width":"100%"}'>
+					</jnpf-city-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item required label="到达地" prop="destination">
+					<jnpf-city-select v-model="dataForm.destination" @change="changeData('destination',-1)"
+						selectType="all" clearable placeholder="请选择" :level="2" :style='{"width":"100%"}'>
+					</jnpf-city-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item required label="运费" prop="freight">
+					<u-input v-model="dataForm.freight" @change="changeData('freight',-1)" input-align='right' clearable
+						placeholder="请输入" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item required label="车辆信息" prop="vehiclePictures">
+					<jnpf-upload v-model="dataForm.vehiclePictures" @change="changeData('vehiclePictures',-1)"
+						sizeUnit="MB" :fileSize="10" :limit="9" pathType="defaultPath" :isAccount="0"
+						:value="dataForm.vehiclePictures">
+					</jnpf-upload>
+				</u-form-item>
+			</view>
+			<view class="jnpf-table">
+				<view class="jnpf-table-item" v-for="(item,i) in dataForm.vouchervehicleList" :key="i">
+					<view class="jnpf-table-item-title u-flex u-row-between">
+						<text class="jnpf-table-item-title-num">({{i+1}})</text>
+						<view class="jnpf-table-item-title-action" v-if="dataForm.vouchervehicleList.length>0"
+							@click="delvouchervehicleList(i)">删除</view>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item required label="车牌号">
+							<!--                <jnpf-popup-select v-model="dataForm.vouchervehicleList[i].vehicleId"
                         @change="changeData('vouchervehicle-vehicleId',i)"
  :rowIndex="i"  :formData="dataForm"  :templateJson="interfaceRes.vouchervehiclevehicleId"  clearable  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='vehicle_number'  :vModel="'vehicleId'+i"   :columnOptions="vouchervehiclevehicleIdColumnOptions" interfaceId="529920852288864453"  :pageSize="20"  placeholder="请选择" type="popup" :style='{"width":"100%"}'>
             </jnpf-popup-select> -->
-			<u-input v-model="dataForm.vouchervehicleList[i].vehicleNumber"
-			                       @change="changeData('vouchervehicle-driverName',i)"
-			input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-			           </u-input>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-    label="驾驶员名称" >
-                <u-input v-model="dataForm.vouchervehicleList[i].driverName"
-                        @change="changeData('vouchervehicle-driverName',i)"
- input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-            </u-input>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-    label="联系电话" >
-                <u-input v-model="dataForm.vouchervehicleList[i].telephone"
-                        @change="changeData('vouchervehicle-telephone',i)"
- input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-            </u-input>
-            </u-form-item>
-        </view>
-        <view class="u-p-l-20 u-p-r-20 form-item-box">
-            <u-form-item 
-    label="承运商" >
-                <u-input v-model="dataForm.vouchervehicleList[i].carrier"
-                        @change="changeData('vouchervehicle-carrier',i)"
- input-align='right'  clearable  placeholder="请输入" :style='{"width":"100%"}'>
-            </u-input>
-            </u-form-item>
-        </view>
-                </view>
-                    <view class="jnpf-table-addBtn" @click="addvouchervehicleList" >
-                        <u-icon name="plus" color="#2979ff"></u-icon>
-                        <span>{{dataForm.vouchervehicleList.length==0?"添加":"添加"}}</span>
-                    </view>
-            </view>
-        </u-form>
-				<view class="buttom-actions" v-if="jurisdictionType != 'btn_detail'" >
-					<u-button class="buttom-btn" :loading="btnLoading" @click="showAction = true" v-if="actionList.length>0">
-						更多<u-icon name="arrow-down" size="24"></u-icon>
-					</u-button>
-					<u-button class="buttom-btn" type="primary" @click="submitForm" :loading="btnLoading">确定</u-button>
-					<u-button class="buttom-btn" @click="resetForm">取消</u-button>
+							<u-input v-model="dataForm.vouchervehicleList[i].vehicleNumber"
+								@change="changeData('vouchervehicle-driverName',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item label="驾驶员名称">
+							<u-input v-model="dataForm.vouchervehicleList[i].driverName"
+								@change="changeData('vouchervehicle-driverName',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item label="联系电话">
+							<u-input v-model="dataForm.vouchervehicleList[i].telephone"
+								@change="changeData('vouchervehicle-telephone',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item label="承运商">
+							<u-input v-model="dataForm.vouchervehicleList[i].carrier"
+								@change="changeData('vouchervehicle-carrier',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
 				</view>
-				<u-action-sheet @click="handleAction" :list="actionList" :tips="{ text: '更多操作' , color: '#000' , fontSize: 30 }" v-model="showAction">
-				</u-action-sheet>
-		<u-modal v-model="show" :content="content" width='70%' border-radius="16" :content-style="{fontSize: '28rpx',padding: '20rpx',lineHeight: '44rpx',textAlign: 'left'}"
-				 :titleStyle="{padding: '20rpx'}" :confirm-style="{height: '80rpx',lineHeight: '80rpx'}" :title="title" confirm-text="确定">
+				<view class="jnpf-table-addBtn" @click="addvouchervehicleList">
+					<u-icon name="plus" color="#2979ff"></u-icon>
+					<span>{{dataForm.vouchervehicleList.length==0?"添加":"添加"}}</span>
+				</view>
+			</view>
+		</u-form>
+		<view class="buttom-actions" v-if="jurisdictionType != 'btn_detail'">
+			<u-button class="buttom-btn" :loading="btnLoading" @click="showAction = true" v-if="actionList.length>0">
+				更多<u-icon name="arrow-down" size="24"></u-icon>
+			</u-button>
+			<u-button class="buttom-btn" type="primary" @click="submitForm" :loading="btnLoading">确定</u-button>
+			<u-button class="buttom-btn" @click="resetForm">取消</u-button>
+		</view>
+		<u-action-sheet @click="handleAction" :list="actionList" :tips="{ text: '更多操作' , color: '#000' , fontSize: 30 }"
+			v-model="showAction">
+		</u-action-sheet>
+		<u-modal v-model="show" :content="content" width='70%' border-radius="16"
+			:content-style="{fontSize: '28rpx',padding: '20rpx',lineHeight: '44rpx',textAlign: 'left'}"
+			:titleStyle="{padding: '20rpx'}" :confirm-style="{height: '80rpx',lineHeight: '80rpx'}" :title="title"
+			confirm-text="确定">
 		</u-modal>
-    </view>
+	</view>
 </template>
 
 <script>
-    import {
-        getDictionaryDataSelector,
+	import {
+		getDictionaryDataSelector,
 		getDataInterfaceRes,
 		getDefaultCurrentValueUserId,
 		getDefaultCurrentValueDepartmentId
-    } from '@/api/common'
+	} from '@/api/common'
 	import {
 		getDateDay,
 		getLaterData,
@@ -388,352 +358,370 @@
 		getBeforeTime,
 		getLaterTime
 	} from '@/components/index.js'
-    import request from '@/utils/request'
-    export default {
-        data(){
-            return{
+	import request from '@/utils/request'
+	export default {
+		data() {
+			return {
 				idList: [],
-				index:0,
+				index: 0,
 				actionList: [],
 				actionListLength: false,
 				showAction: false,
-                btnLoading: false,
+				btnLoading: false,
 				loading: false,
-                text: '提示：测试文本',
-                tableKey:'',
-				dataForm:{
-					id:"",
-					voucherCode : '',
-					voucherType : "",
-					preparationTime : "",
-					associateThirdSuppliers : "",
-					deliveryType : "",
-					purchaseContractNo : '',
-					saleContractNo : '',
-					purchaseAmount : '',
-					saleAmount : '',
-					voucherPictures : [],
-					poundCode : '',
-					vehicleName : '',
-					supplierId : "",
-					customerId : "",
-					modeTransport : "",
-					transportationMethod : "",
-					carrier : '',
-					placeDispatch : [],
-					destination : [],
-					freight : '',
-					vehiclePictures : [],
-					voucherStatus : "4",
-					documentType : "1",
-					voucherproductList:[],
-					vouchervehicleList:[],
+				text: '提示：测试文本',
+				tableKey: '',
+				dataForm: {
+					id: "",
+					voucherCode: '',
+					voucherType: "",
+					preparationTime: "",
+					associateThirdSuppliers: "",
+					deliveryType: "",
+					purchaseContractNo: '',
+					saleContractNo: '',
+					purchaseAmount: '',
+					saleAmount: '',
+					voucherPictures: [],
+					poundCode: '',
+					vehicleName: '',
+					supplierId: "",
+					customerId: "",
+					modeTransport: "",
+					transportationMethod: "",
+					carrier: '',
+					placeDispatch: [],
+					destination: [],
+					freight: '',
+					vehiclePictures: [],
+					voucherStatus: "4",
+					documentType: "1",
+					voucherproductList: [],
+					vouchervehicleList: [],
+				},
+				rules: {
+					voucherType: [{
+						required: true,
+						message: '凭证类型请选择',
+					}, ],
+					preparationTime: [{
+						required: true,
+						message: '制单时间请选择',
+					}, ],
+					deliveryType: [{
+						required: true,
+						message: '配送方式请选择',
+					}, ],
+					purchaseContractNo: [{
+						required: true,
+						message: '采购合同编号请输入',
+					}, ],
+					voucherPictures: [{
+						required: true,
+						message: '凭证图片请至少选择一个',
+						type: 'array',
+					}, ],
+					vehicleName: [{
+						required: true,
+						message: '车牌号请输入',
+					}, ],
+					supplierId: [{
+						required: true,
+						message: '发货单位请选择',
+					}, ],
+					customerId: [{
+						required: true,
+						message: '收货单位请选择',
+					}, ],
+					modeTransport: [{
+						required: true,
+						message: '运输方式请选择',
+					}, ],
+					transportationMethod: [{
+						required: true,
+						message: '承运方式请选择',
+					}, ],
+					placeDispatch: [{
+						required: true,
+						message: '起运地请至少选择一个',
+						type: 'array',
+					}, ],
+					destination: [{
+						required: true,
+						message: '到达地请至少选择一个',
+						type: 'array',
+					}, ],
+					freight: [{
+						required: true,
+						message: '运费请输入',
+					}, ],
+					vehiclePictures: [{
+						required: true,
+						message: '车辆信息请至少选择一个',
+						type: 'array',
+					}, ],
+				},
+				voucherTypeOptions: [{
+					"fullName": "磅单",
+					"id": "1"
+				}, {
+					"fullName": "收据",
+					"id": "2"
+				}, {
+					"fullName": "其他",
+					"id": "3"
+				}],
+				voucherTypeProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				associateThirdSuppliersColumnOptions: [{
+						"label": "供应商编码",
+						"value": "code"
+					},
+					{
+						"label": "供应商名称",
+						"value": "name"
+					},
+				],
+				deliveryTypeOptions: [{
+					"fullName": "仓配",
+					"id": "1"
+				}, {
+					"fullName": "直送",
+					"id": "2"
+				}],
+				deliveryTypeProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				supplierIdColumnOptions: [{
+						"label": "供应商名称",
+						"value": "name"
+					},
+					{
+						"label": "国家",
+						"value": "country"
+					},
+					{
+						"label": "地址",
+						"value": "address"
+					},
+					{
+						"label": "电话",
+						"value": "phone"
+					},
+				],
+				customerIdColumnOptions: [{
+						"label": "机构编码",
+						"value": "f_en_code"
+					},
+					{
+						"label": "机构名称",
+						"value": "f_full_name"
+					},
+				],
+				modeTransportOptions: [{
+					"fullName": "公路",
+					"id": "1"
+				}, {
+					"fullName": "铁路",
+					"id": "2"
+				}, {
+					"fullName": "轮船",
+					"id": "3"
+				}, {
+					"fullName": "空运",
+					"id": "4"
+				}, {
+					"fullName": "无",
+					"id": "5"
+				}],
+				modeTransportProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
 				},
-				rules:{
-            voucherType: [
-            {
-            required: true,
-            message: '凭证类型请选择',
-            },
-        ],
-            preparationTime: [
-            {
-            required: true,
-            message: '制单时间请选择',
-            },
-        ],
-            deliveryType: [
-            {
-            required: true,
-            message: '配送方式请选择',
-            },
-        ],
-            purchaseContractNo: [
-            {
-            required: true,
-            message: '采购合同编号请输入',
-            },
-        ],
-            voucherPictures: [
-            {
-            required: true,
-            message: '凭证图片请至少选择一个',
-                type:'array',
-            },
-        ],
-            vehicleName: [
-            {
-            required: true,
-            message: '车牌号请输入',
-            },
-        ],
-            supplierId: [
-            {
-            required: true,
-            message: '发货单位请选择',
-            },
-        ],
-            customerId: [
-            {
-            required: true,
-            message: '收货单位请选择',
-            },
-        ],
-            modeTransport: [
-            {
-            required: true,
-            message: '运输方式请选择',
-            },
-        ],
-            transportationMethod: [
-            {
-            required: true,
-            message: '承运方式请选择',
-            },
-        ],
-            placeDispatch: [
-            {
-            required: true,
-            message: '起运地请至少选择一个',
-                type:'array',
-            },
-        ],
-            destination: [
-            {
-            required: true,
-            message: '到达地请至少选择一个',
-                type:'array',
-            },
-        ],
-            freight: [
-            {
-            required: true,
-            message: '运费请输入',
-            },
-        ],
-            vehiclePictures: [
-            {
-            required: true,
-            message: '车辆信息请至少选择一个',
-                type:'array',
-            },
-        ],
+				transportationMethodOptions: [{
+					"fullName": "仓库承运(DC)",
+					"id": "1"
+				}, {
+					"fullName": "承运商",
+					"id": "2"
+				}, {
+					"fullName": "供应商",
+					"id": "3"
+				}, {
+					"fullName": "自提",
+					"id": "4"
+				}],
+				transportationMethodProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
 				},
-            voucherTypeOptions:[{"fullName":"磅单","id":"1"},{"fullName":"收据","id":"2"},{"fullName":"其他","id":"3"}],
-        voucherTypeProps:{"label":"fullName","value":"id","multiple":false,"children":""},
-        associateThirdSuppliersColumnOptions:[
-        {
-        "label":"供应商编码",
-        "value":"code"
-        },
-        {
-        "label":"供应商名称",
-        "value":"name"
-        },
-    ],
-            deliveryTypeOptions:[{"fullName":"仓配","id":"1"},{"fullName":"直送","id":"2"}],
-        deliveryTypeProps:{"label":"fullName","value":"id","multiple":false,"children":""},
-        supplierIdColumnOptions:[
-        {
-        "label":"供应商名称",
-        "value":"name"
-        },
-        {
-        "label":"国家",
-        "value":"country"
-        },
-        {
-        "label":"地址",
-        "value":"address"
-        },
-        {
-        "label":"电话",
-        "value":"phone"
-        },
-    ],
-        customerIdColumnOptions:[
-        {
-        "label":"机构编码",
-        "value":"f_en_code"
-        },
-        {
-        "label":"机构名称",
-        "value":"f_full_name"
-        },
-    ],
-            modeTransportOptions:[{"fullName":"公路","id":"1"},{"fullName":"铁路","id":"2"},{"fullName":"轮船","id":"3"},{"fullName":"空运","id":"4"},{"fullName":"无","id":"5"}],
-        modeTransportProps:{"label":"fullName","value":"id","multiple":false,"children":""},
-            transportationMethodOptions:[{"fullName":"仓库承运(DC)","id":"1"},{"fullName":"承运商","id":"2"},{"fullName":"供应商","id":"3"},{"fullName":"自提","id":"4"}],
-        transportationMethodProps:{"label":"fullName","value":"id","multiple":false,"children":""},
-            voucherStatusOptions:[{"fullName":"待提交","id":"1"},{"fullName":"待审核","id":"2"},{"fullName":"待质检","id":"3"},{"fullName":"已完成","id":"4"},{"fullName":"已关闭","id":"5"}],
-        voucherStatusProps:{"label":"fullName","value":"id","multiple":false,"children":""},
-            documentTypeOptions:[{"fullName":"收货凭证","id":"1"},{"fullName":"发货凭证","id":"2"}],
-        documentTypeProps:{"label":"fullName","value":"id","multiple":false,"children":""},
-        voucherproductproductIdColumnOptions:[
-        {
-        "label":"商品编码",
-        "value":"code"
-        },
-        {
-        "label":"商品名称",
-        "value":"name"
-        },
-        {
-        "label":"规格",
-        "value":"spec"
-        },
-    ],
-        vouchervehiclevehicleIdColumnOptions:[
-        {
-        "label":"车牌号",
-        "value":"vehicle_number"
-        },
-        {
-        "label":"驾驶员",
-        "value":"name"
-        },
-        {
-        "label":"电话",
-        "value":"mobile"
-        },
-    ],
-                labelwidth:100*1.5,
-                menuId:'',
-				jurisdictionType:'',
-                ruleList:{
-					voucherproductList:{
-						'productId' : '商品名称不能为空',
-						'unit' : '单位不能为空',
+				voucherStatusOptions: [{
+					"fullName": "待提交",
+					"id": "1"
+				}, {
+					"fullName": "待审核",
+					"id": "2"
+				}, {
+					"fullName": "待质检",
+					"id": "3"
+				}, {
+					"fullName": "已完成",
+					"id": "4"
+				}, {
+					"fullName": "已关闭",
+					"id": "5"
+				}],
+				voucherStatusProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				documentTypeOptions: [{
+					"fullName": "收货凭证",
+					"id": "1"
+				}, {
+					"fullName": "发货凭证",
+					"id": "2"
+				}],
+				documentTypeProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				voucherproductproductIdColumnOptions: [{
+						"label": "商品编码",
+						"value": "code"
+					},
+					{
+						"label": "商品名称",
+						"value": "name"
+					},
+					{
+						"label": "规格",
+						"value": "spec"
+					},
+				],
+				vouchervehiclevehicleIdColumnOptions: [{
+						"label": "车牌号",
+						"value": "vehicle_number"
+					},
+					{
+						"label": "驾驶员",
+						"value": "name"
+					},
+					{
+						"label": "电话",
+						"value": "mobile"
+					},
+				],
+				labelwidth: 100 * 1.5,
+				menuId: '',
+				jurisdictionType: '',
+				ruleList: {
+					voucherproductList: {
+						'productId': '商品名称不能为空',
+						'unit': '单位不能为空',
 					},
-					vouchervehicleList:{
-						'vehicleNumber' : '车牌号不能为空',
+					vouchervehicleList: {
+						'vehicleNumber': '车牌号不能为空',
 					},
-                },
-				interfaceRes:{
-        voucherCode:[
-    ],
-        voucherType:[
-    ],
-        preparationTime:[
-    ],
-        associateThirdSuppliers:[
-    ],
-        deliveryType:[
-    ],
-        purchaseContractNo:[
-    ],
-        saleContractNo:[
-    ],
-        purchaseAmount:[
-    ],
-        saleAmount:[
-    ],
-        voucherPictures:[
-    ],
-        poundCode:[
-    ],
-        vehicleName:[
-    ],
-        supplierId:[
-    ],
-        customerId:[
-    ],
-        modeTransport:[
-    ],
-        transportationMethod:[
-    ],
-        carrier:[
-    ],
-        placeDispatch:[
-    ],
-        destination:[
-    ],
-        freight:[
-    ],
-        vehiclePictures:[
-    ],
-        voucherStatus:[
-    ],
-        documentType:[
-    ],
-        voucherproductproductId:[
-    ],
-        voucherproductspec:[
-    ],
-        voucherproductunit:[
-    ],
-        voucherproductgrossWeight:[
-    ],
-        voucherproducttareWeight:[
-    ],
-        voucherproductbuckleWeight:[
-    ],
-        voucherproductnetWeight:[
-    ],
-        voucherproductclearWeight:[
-    ],
-        voucherproductremark:[
-    ],
-        vouchervehiclevehicleId:[
-    ],
-        vouchervehicledriverName:[
-    ],
-        vouchervehicletelephone:[
-    ],
-        vouchervehiclecarrier:[
-    ],
 				},
-				regList:{
-					voucherproductList:{
-						productId: [
-						],
-						spec: [
-						],
-						unit: [
-						],
-						grossWeight: [
-						],
-						tareWeight: [
-						],
-						buckleWeight: [
-						],
-						netWeight: [
-						],
-						clearWeight: [
-						],
-						remark: [
-						],
+				interfaceRes: {
+					voucherCode: [],
+					voucherType: [],
+					preparationTime: [],
+					associateThirdSuppliers: [],
+					deliveryType: [],
+					purchaseContractNo: [],
+					saleContractNo: [],
+					purchaseAmount: [],
+					saleAmount: [],
+					voucherPictures: [],
+					poundCode: [],
+					vehicleName: [],
+					supplierId: [],
+					customerId: [],
+					modeTransport: [],
+					transportationMethod: [],
+					carrier: [],
+					placeDispatch: [],
+					destination: [],
+					freight: [],
+					vehiclePictures: [],
+					voucherStatus: [],
+					documentType: [],
+					voucherproductproductId: [],
+					voucherproductspec: [],
+					voucherproductunit: [],
+					voucherproductgrossWeight: [],
+					voucherproducttareWeight: [],
+					voucherproductbuckleWeight: [],
+					voucherproductnetWeight: [],
+					voucherproductclearWeight: [],
+					voucherproductremark: [],
+					vouchervehiclevehicleId: [],
+					vouchervehicledriverName: [],
+					vouchervehicletelephone: [],
+					vouchervehiclecarrier: [],
+				},
+				regList: {
+					voucherproductList: {
+						productId: [],
+						spec: [],
+						unit: [],
+						grossWeight: [],
+						tareWeight: [],
+						buckleWeight: [],
+						netWeight: [],
+						clearWeight: [],
+						remark: [],
 					},
-					vouchervehicleList:{
-						vehicleId: [
-						],
-						driverName: [
-						],
-						telephone: [
-						],
-						carrier: [
-						],
+					vouchervehicleList: {
+						vehicleId: [],
+						driverName: [],
+						telephone: [],
+						carrier: [],
 					},
 				},
-				ableAll:{
+				ableAll: {},
+				childIndex: -1,
+				dataValue: {},
+				isEdit: false,
+				userInfo: {},
+				formatType: {
+					"yyyy": "yyyy",
+					"yyyy-MM": "yyyy-mm",
+					"yyyy-MM-dd": "yyyy-mm-dd",
+					"yyyy-MM-dd HH:mm": "yyyy-mm-dd hh:MM",
+					"yyyy-MM-dd HH:mm:ss": "yyyy-mm-dd hh:MM:ss",
+					"HH:mm:ss": "hh:MM:ss",
+					"HH:mm": "hh:MM"
 				},
-				childIndex:-1,
-				dataValue:{},
-				isEdit:false,
-				userInfo:{},
-				formatType:{"yyyy":"yyyy","yyyy-MM":"yyyy-mm","yyyy-MM-dd":"yyyy-mm-dd","yyyy-MM-dd HH:mm":"yyyy-mm-dd hh:MM","yyyy-MM-dd HH:mm:ss":"yyyy-mm-dd hh:MM:ss","HH:mm:ss":"hh:MM:ss","HH:mm":"hh:MM"},
-				content:'',
-				title:'',
-				show:false,
-            }
-        },
-        onLoad(option) {
-        	uni.$on('linkPageConfirm', (subVal) => {
-        		if(this.tableKey){
-					for(let i=0;i<subVal.length;i++){
+				content: '',
+				title: '',
+				show: false,
+			}
+		},
+		onLoad(option) {
+			uni.$on('linkPageConfirm', (subVal) => {
+				if (this.tableKey) {
+					for (let i = 0; i < subVal.length; i++) {
 						let t = subVal[i]
-						if(this['get'+this.tableKey]){
-							this['get'+this.tableKey](t)
+						if (this['get' + this.tableKey]) {
+							this['get' + this.tableKey](t)
 						}
 					}
 					this.childIndex = -1
@@ -741,32 +729,32 @@
 				}
 			})
 			this.jurisdictionType = option.jurisdictionType
-        	this.menuId=option.menuId
+			this.menuId = option.menuId
 			this.userInfo = uni.getStorageSync('userInfo') || {}
-            this.dataForm.id = option.id || 0
+			this.dataForm.id = option.id || 0
 			let _title = ""
-			if(option.jurisdictionType =='btn_edit'){
-				 _title = "编辑"
+			if (option.jurisdictionType == 'btn_edit') {
+				_title = "编辑"
 			}
-			if(option.jurisdictionType =='btn_detail'){
+			if (option.jurisdictionType == 'btn_detail') {
 				_title = "详情"
 			}
-			if(option.jurisdictionType =='btn_add'){
+			if (option.jurisdictionType == 'btn_add') {
 				_title = "新增"
 			}
-			if(_title){
+			if (_title) {
 				uni.setNavigationBarTitle({
 					title: _title
 				})
 			}
-            this.selfInit()
+			this.selfInit()
 			this.initDefaultData()
-            this.dataAll()
-            this.initData()
+			this.dataAll()
+			this.initData()
 			this.dataValue = JSON.parse(JSON.stringify(this.dataForm))
-			this.idList = option.idList?option.idList.split(","):[]
-			for(let i=0;i<this.idList.length;i++){
-				if(this.idList[i]==option.id){
+			this.idList = option.idList ? option.idList.split(",") : []
+			for (let i = 0; i < this.idList.length; i++) {
+				if (this.idList[i] == option.id) {
 					this.index = i;
 				}
 			}
@@ -776,54 +764,55 @@
 					id: 'save_add'
 				})
 			} else {
-				let upper={
+				let upper = {
 					text: '上一条',
 					id: 'upper',
-					disabled: this.index==0?true:false
+					disabled: this.index == 0 ? true : false
 				}
 				this.actionList.push(upper)
-				let lower={
+				let lower = {
 					text: '下一条',
 					id: 'lower',
-					disabled: this.index==this.idList.length-1?true:false
+					disabled: this.index == this.idList.length - 1 ? true : false
 				}
 				this.actionList.push(lower)
-				this.actionList.push( {
+				this.actionList.push({
 					text: '确定并继续',
 					id: 'save_proceed'
 				})
 				this.collapse()
 			}
-        },
-        onReady() {
-			this.$nextTick(()=>{
-				setTimeout(()=>{
+		},
+		onReady() {
+			this.$nextTick(() => {
+				setTimeout(() => {
 					this.$refs.dataForm.setRules(this.rules);
-				},100)
+				}, 100)
 			})
-        },
-        watch:{
-        	dataForm: {
+		},
+		watch: {
+			dataForm: {
 				handler(val, oldVal) {
 					this.voucherproduct()
 					this.vouchervehicle()
 				},
 				deep: true
 			}
-        },
-        methods:{
+		},
+		methods: {
 			//子表车牌号赋值
-			vehicleChange(val){
+			vehicleChange(val) {
 				this.dataForm.vouchervehicleList = []
 				let item = {
-					vehicleName : val
+					vehicleName: val
 				}
 				this.dataForm.vouchervehicleList.push(item)
 			},
 			//编辑其他重量，更新净重
 			UpdateWeight(row) {
-			  row.netWeight = this.jnpf.floatSub(this.jnpf.floatSub(parseFloat(row.grossWeight), parseFloat(row.tareWeight)), parseFloat(row.buckleWeight)) //毛-皮-扣 = 净
-			  row.clearWeight = row.netWeight
+				row.netWeight = this.jnpf.floatSub(this.jnpf.floatSub(parseFloat(row.grossWeight), parseFloat(row
+					.tareWeight)), parseFloat(row.buckleWeight)) //毛-皮-扣 = 净
+				row.clearWeight = row.netWeight
 			},
 			handleAction(index) {
 				if (this.actionList[index].id === 'save_add' || this.actionList[index].id === 'save_proceed') {
@@ -845,7 +834,7 @@
 				this.dataForm.id = this.idList[this.index]
 				this.initData()
 			},
-			 changeData(model, index) {
+			changeData(model, index) {
 				this.isEdit = false
 				this.childIndex = index
 				let modelAll = model.split("-");
@@ -859,7 +848,7 @@
 						for (let i = 0; i < faceReList.length; i++) {
 							if (faceReList[i].relationField == model) {
 								let options = 'get' + key + 'Options';
-								if(this[options]){
+								if (this[options]) {
 									this[options]()
 								}
 								this.changeData(key, index)
@@ -868,8 +857,8 @@
 					}
 				}
 			},
-			changeDataFormData(type, data, model,index,defaultValue ,edit) {
-				if(!edit) {
+			changeDataFormData(type, data, model, index, defaultValue, edit) {
+				if (!edit) {
 					if (type == 2) {
 						for (let i = 0; i < this.dataForm[data].length; i++) {
 							if (index == -1) {
@@ -883,12 +872,12 @@
 					}
 				}
 			},
-			clickIcon(label,tipLabel) {
+			clickIcon(label, tipLabel) {
 				this.content = tipLabel
 				this.title = label
 				this.show = true
 			},
-        	exist() {
+			exist() {
 				let title = [];
 				let _ruleList = this.ruleList
 				for (let k in _ruleList) {
@@ -908,8 +897,8 @@
 				let _regList = this.regList
 				for (let k in _regList) {
 					let childData = this.dataForm[k]
-					for(let n in _regList[k]){
-						for(let i=0;i<_regList[k][n].length;i++){
+					for (let n in _regList[k]) {
+						for (let i = 0; i < _regList[k][n].length; i++) {
 							const element = _regList[k][n][i]
 							if (element.pattern) {
 								element.pattern = element.pattern.toString()
@@ -920,7 +909,7 @@
 								element.pattern = reg
 							}
 							childData.forEach((item, index) => {
-								if(item[n] && !element.pattern.test(item[n])){
+								if (item[n] && !element.pattern.test(item[n])) {
 									title.push(element.message)
 								}
 							})
@@ -931,80 +920,80 @@
 					return title[0]
 				}
 			},
-			resetForm(){
+			resetForm() {
 				uni.navigateBack()
 			},
-			dataAll(){
+			dataAll() {
 				this.collapse()
 			},
 			dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-			  let timeDataValue = null;
-			  let timeValue = Number(timeValueData)
-			  if (timeRule) {
-				if (timeType == 1) {
-				  timeDataValue = timeValueData?timeValue:null
-				} else if (timeType == 2) {
-				  timeDataValue = dataValue
-				} else if (timeType == 3) {
-				  timeDataValue = new Date().getTime()
-				} else if (timeType == 4) {
-				  let previousDate = '';
-				  if (timeTarget == 1 || timeTarget == 2) {
-					previousDate = getDateDay(timeTarget, timeType, timeValue)
-					timeDataValue = new Date(previousDate).getTime()
-				  } else if (timeTarget == 3) {
-					previousDate = getBeforeData(timeValue)
-					timeDataValue = new Date(previousDate).getTime()
-				  } else {
-					timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-				  }
-				} else if (timeType == 5) {
-				  let previousDate = '';
-				  if (timeTarget == 1 || timeTarget == 2) {
-					previousDate = getDateDay(timeTarget, timeType, timeValue)
-					timeDataValue = new Date(previousDate).getTime()
-				  } else if (timeTarget == 3) {
-					previousDate = getLaterData(timeValue)
-					timeDataValue = new Date(previousDate).getTime()
-				  } else {
-					timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-				  }
+				let timeDataValue = null;
+				let timeValue = Number(timeValueData)
+				if (timeRule) {
+					if (timeType == 1) {
+						timeDataValue = timeValueData ? timeValue : null
+					} else if (timeType == 2) {
+						timeDataValue = dataValue
+					} else if (timeType == 3) {
+						timeDataValue = new Date().getTime()
+					} else if (timeType == 4) {
+						let previousDate = '';
+						if (timeTarget == 1 || timeTarget == 2) {
+							previousDate = getDateDay(timeTarget, timeType, timeValue)
+							timeDataValue = new Date(previousDate).getTime()
+						} else if (timeTarget == 3) {
+							previousDate = getBeforeData(timeValue)
+							timeDataValue = new Date(previousDate).getTime()
+						} else {
+							timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+						}
+					} else if (timeType == 5) {
+						let previousDate = '';
+						if (timeTarget == 1 || timeTarget == 2) {
+							previousDate = getDateDay(timeTarget, timeType, timeValue)
+							timeDataValue = new Date(previousDate).getTime()
+						} else if (timeTarget == 3) {
+							previousDate = getLaterData(timeValue)
+							timeDataValue = new Date(previousDate).getTime()
+						} else {
+							timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+						}
+					}
 				}
-			  }
-			  return timeDataValue;
+				return timeDataValue;
 			},
 			time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-			  let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-			  let timeDataValue = null
-			  if (timeRule) {
-				if (timeType == 1 && timeValue) {
-				  timeDataValue = timeValue || '00:00:00'
-				  if (timeDataValue.split(':').length == 3) {
-					timeDataValue = timeDataValue
-				  } else {
-					timeDataValue = timeDataValue + ':00'
-				  }
-				} else if (timeType == 2) {
-				  timeDataValue = dataValue
-				} else if (timeType == 3) {
-				  timeDataValue = this.jnpf.toDate(new Date(), format)
-				} else if (timeType == 4) {
-				  let previousDate = '';
-				  previousDate = getBeforeTime(timeTarget, timeValue)
-				  timeDataValue = this.jnpf.toDate(previousDate, format)
-				} else if (timeType == 5) {
-				  let previousDate = '';
-				  previousDate = getLaterTime(timeTarget, timeValue)
-				  timeDataValue = this.jnpf.toDate(previousDate, format)
+				let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+				let timeDataValue = null
+				if (timeRule) {
+					if (timeType == 1 && timeValue) {
+						timeDataValue = timeValue || '00:00:00'
+						if (timeDataValue.split(':').length == 3) {
+							timeDataValue = timeDataValue
+						} else {
+							timeDataValue = timeDataValue + ':00'
+						}
+					} else if (timeType == 2) {
+						timeDataValue = dataValue
+					} else if (timeType == 3) {
+						timeDataValue = this.jnpf.toDate(new Date(), format)
+					} else if (timeType == 4) {
+						let previousDate = '';
+						previousDate = getBeforeTime(timeTarget, timeValue)
+						timeDataValue = this.jnpf.toDate(previousDate, format)
+					} else if (timeType == 5) {
+						let previousDate = '';
+						previousDate = getLaterTime(timeTarget, timeValue)
+						timeDataValue = this.jnpf.toDate(previousDate, format)
+					}
 				}
-			  }
-			  return timeDataValue;
+				return timeDataValue;
 			},
-			voucherproduct(){
+			voucherproduct() {
 				let table = this.dataForm.voucherproductList
-				let summaryField =[]
-				let summaryFieldName ={}
-				let data ={}
+				let summaryField = []
+				let summaryFieldName = {}
+				let data = {}
 				let thousandsField = []
 				for (let i in summaryField) {
 					let map = {}
@@ -1012,22 +1001,24 @@
 					for (let j = 0; j < table.length; j++) {
 						let summary = table[j][summaryField[i]];
 						if (summary) {
-							let data = isNaN(summary) ? 0 :	Number(summary)
+							let data = isNaN(summary) ? 0 : Number(summary)
 							val += data
 						}
 					}
 					map.id = summaryField[i];
 					map.name = summaryFieldName[summaryField[i]];
-					map.val = (thousandsField.includes(summaryField[i]))? Number(val).toLocaleString('zh', {maximumFractionDigits: '2'}):  val;
-					data[summaryField[i]]=map;
+					map.val = (thousandsField.includes(summaryField[i])) ? Number(val).toLocaleString('zh', {
+						maximumFractionDigits: '2'
+					}) : val;
+					data[summaryField[i]] = map;
 				}
 				return data;
 			},
-			vouchervehicle(){
+			vouchervehicle() {
 				let table = this.dataForm.vouchervehicleList
-				let summaryField =[]
-				let summaryFieldName ={}
-				let data ={}
+				let summaryField = []
+				let summaryFieldName = {}
+				let data = {}
 				let thousandsField = []
 				for (let i in summaryField) {
 					let map = {}
@@ -1035,202 +1026,209 @@
 					for (let j = 0; j < table.length; j++) {
 						let summary = table[j][summaryField[i]];
 						if (summary) {
-							let data = isNaN(summary) ? 0 :	Number(summary)
+							let data = isNaN(summary) ? 0 : Number(summary)
 							val += data
 						}
 					}
 					map.id = summaryField[i];
 					map.name = summaryFieldName[summaryField[i]];
-					map.val = (thousandsField.includes(summaryField[i]))? Number(val).toLocaleString('zh', {maximumFractionDigits: '2'}):  val;
-					data[summaryField[i]]=map;
+					map.val = (thousandsField.includes(summaryField[i])) ? Number(val).toLocaleString('zh', {
+						maximumFractionDigits: '2'
+					}) : val;
+					data[summaryField[i]] = map;
 				}
 				return data;
 			},
-            initData(){
-				this.$nextTick(function(){
+			initData() {
+				this.$nextTick(function() {
 					if (this.dataForm.id) {
 						this.loading = true
 						request({
-							url: '/api/scm/Voucher/'+this.dataForm.id,
+							url: '/api/scm/Voucher/' + this.dataForm.id,
 							method: 'get',
 						}).then(res => {
 							this.dataInfo(res.data)
 							this.loading = false
 						})
-					}else {
+					} else {
 						this.initDefaultData()
 					}
 				})
-            },
-			beforeSubmit(){
-				const _data =this.dataList()
+			},
+			beforeSubmit() {
+				const _data = this.dataList()
 				return _data
 			},
-            submitForm(type){
-                var _data = this.dataList()
-                this.$refs.dataForm.validate(valid => {
-                    if (!valid) return
-                    if (!!this.exist()) return this.$u.toast(
+			submitForm(type) {
+				var _data = this.dataList()
+				this.$refs.dataForm.validate(valid => {
+					if (!valid) return
+					if (!!this.exist()) return this.$u.toast(
 						this.exist()
 					)
-                    this.btnLoading = true
-                    if (this.dataForm.id) {
-                        request({
-                            url: '/api/scm/Voucher/' + this.dataForm.id,
-                            method: 'put',
-                            data: _data,
-                        }).then(res => {
-                            uni.showToast({
-                                title: res.msg,
-                                complete: () => {
-                                    setTimeout(() => {
-										if(type!=1){
+					this.btnLoading = true
+					if (this.dataForm.id) {
+						request({
+							url: '/api/scm/Voucher/' + this.dataForm.id,
+							method: 'put',
+							data: _data,
+						}).then(res => {
+							uni.showToast({
+								title: res.msg,
+								complete: () => {
+									setTimeout(() => {
+										if (type != 1) {
 											uni.$emit('refresh')
 											uni.navigateBack()
 										}
-                                        this.btnLoading = false
-                                    }, 1500)
-                                }
-                            })
-                        }).catch(() => {
+										this.btnLoading = false
+									}, 1500)
+								}
+							})
+						}).catch(() => {
 							this.btnLoading = false
 						})
-                    }else {
-                        request({
-                            url: '/api/scm/Voucher',
-                            method: 'post',
-                            data: _data,
-                        }).then(res => {
-                            uni.showToast({
-                                title: res.msg,
-                                complete: () => {
-                                    setTimeout(() => {
-										if(type==1){
-											this.dataForm = JSON.parse(JSON.stringify(this.dataValue))
+					} else {
+						request({
+							url: '/api/scm/Voucher',
+							method: 'post',
+							data: _data,
+						}).then(res => {
+							uni.showToast({
+								title: res.msg,
+								complete: () => {
+									setTimeout(() => {
+										if (type == 1) {
+											this.dataForm = JSON.parse(JSON.stringify(
+												this.dataValue))
 											this.initDefaultData()
-										}else{
+										} else {
 											uni.$emit('refresh')
 											uni.navigateBack()
 										}
 										this.btnLoading = false
-                                    }, 1500)
-                                }
-                            })
-                        }).catch(() => {
+									}, 1500)
+								}
+							})
+						}).catch(() => {
 							this.btnLoading = false
 						})
-                    }
-                });
-            },
+					}
+				});
+			},
 			initDefaultData() {
-            this.dataForm.preparationTime = new Date().getTime()
+				this.dataForm.preparationTime = new Date().getTime()
+			},
+			selfInit() {
+				this.$store.commit('base/UPDATE_RELATION_DATA', {})
 			},
-            selfInit() {
-                this.$store.commit('base/UPDATE_RELATION_DATA', {})
-            },
-			selfGetInfo(dataForm){
+			selfGetInfo(dataForm) {
 				this.dataForm.id = this.dataForm.id
 				this.dataInfo(dataForm)
 			},
-            addvoucherproductList(){
-				let value={}
-            	this.tableKey = 'voucherproductList';
+			addvoucherproductList() {
+				let value = {}
+				this.tableKey = 'voucherproductList';
 				this.getvoucherproductList(value)
 				this.childIndex = -1
 				this.collapse()
-            },
-            delvoucherproductList(index) {
-                var that = this
-                uni.showModal({
-                    title: '提示',
-                    content: '确认删除该条信息吗？',
-                    success: function(res) {
-                    if (res.confirm) {
-                        that.dataForm.voucherproductList.splice(index, 1);
-                        that.collapse()
-                    }
-                  }
-                })
-            },
-			getvoucherproductList(value){
+			},
+			delvoucherproductList(index) {
+				var that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认删除该条信息吗？',
+					success: function(res) {
+						if (res.confirm) {
+							that.dataForm.voucherproductList.splice(index, 1);
+							that.collapse()
+						}
+					}
+				})
+			},
+			getvoucherproductList(value) {
 				let item = {
-							productId : "",
-							spec : '',
-							unit : '',
-							grossWeight : 0,
-							tareWeight : 0,
-							buckleWeight : 0,
-							netWeight : 0,
-							clearWeight : 0,
-							remark : '',
+					productId: "",
+					spec: '',
+					unit: '',
+					grossWeight: 0,
+					tareWeight: 0,
+					buckleWeight: 0,
+					netWeight: 0,
+					clearWeight: 0,
+					remark: '',
+				}
+				let result = {
+					...item,
+					...value
 				}
-				let result = {...item,...value}
 				this.dataForm.voucherproductList.push(result)
-				this.childIndex=this.dataForm.voucherproductList.length-1
+				this.childIndex = this.dataForm.voucherproductList.length - 1
 				this.isEdit = true
 				this.isEdit = false
 			},
-            addvouchervehicleList(){
-				let value={}
-            	this.tableKey = 'vouchervehicleList';
+			addvouchervehicleList() {
+				let value = {}
+				this.tableKey = 'vouchervehicleList';
 				this.getvouchervehicleList(value)
 				this.childIndex = -1
 				this.collapse()
-            },
-            delvouchervehicleList(index) {
-                var that = this
-                uni.showModal({
-                    title: '提示',
-                    content: '确认删除该条信息吗？',
-                    success: function(res) {
-                    if (res.confirm) {
-                        that.dataForm.vouchervehicleList.splice(index, 1);
-                        that.collapse()
-                    }
-                  }
-                })
-            },
-			getvouchervehicleList(value){
+			},
+			delvouchervehicleList(index) {
+				var that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认删除该条信息吗？',
+					success: function(res) {
+						if (res.confirm) {
+							that.dataForm.vouchervehicleList.splice(index, 1);
+							that.collapse()
+						}
+					}
+				})
+			},
+			getvouchervehicleList(value) {
 				let item = {
-							vehicleId : "",
-							driverName : '',
-							telephone : '',
-							carrier : '',
+					vehicleId: "",
+					driverName: '',
+					telephone: '',
+					carrier: '',
+				}
+				let result = {
+					...item,
+					...value
 				}
-				let result = {...item,...value}
 				this.dataForm.vouchervehicleList.push(result)
-				this.childIndex=this.dataForm.vouchervehicleList.length-1
+				this.childIndex = this.dataForm.vouchervehicleList.length - 1
 				this.isEdit = true
 				this.isEdit = false
 			},
-			dataList(){
+			dataList() {
 				var _data = this.dataForm;
 				return _data;
 			},
-			dataInfo(dataAll){
-				let _dataAll =dataAll
-				this.dataForm=_dataAll
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				this.dataForm = _dataAll
 				this.isEdit = true
 				this.dataAll()
-				for(let i=0;i<_dataAll.voucherproductList.length;i++){
+				for (let i = 0; i < _dataAll.voucherproductList.length; i++) {
 					this.childIndex = i
 				}
-				for(let i=0;i<_dataAll.vouchervehicleList.length;i++){
+				for (let i = 0; i < _dataAll.vouchervehicleList.length; i++) {
 					this.childIndex = i
 				}
-				this.childIndex=-1
+				this.childIndex = -1
 				this.collapse()
 			},
-			collapse(){
-				setTimeout(()=> {
-				}, 1000);
+			collapse() {
+				setTimeout(() => {}, 1000);
 			},
-        },
-    }
-
+		},
+	}
 </script>
 <style>
-	page{
+	page {
 		background-color: #f0f2f6;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/jnpf-app/utils/define.js b/jnpf-app/utils/define.js
index e8645e81..47831078 100644
--- a/jnpf-app/utils/define.js
+++ b/jnpf-app/utils/define.js
@@ -2,26 +2,28 @@
 /*JAVA app.java.jnpfsoft.com  NET dotnet.jnpfsoft.com*/
 // #ifndef MP
 const baseURL = process.env.NODE_ENV === "production" ?
-	"http://221.214.32.166:40000" : "http://221.214.32.166:40000" // 接口前缀
+	"http://127.0.0.1:50000" : "http://127.0.0.1:50000" // 接口前缀
 const define = {
 	copyright: "Copyright @ 2024 上海长江云息数字科技有限公司版权所有",
 	sysVersion: "V3.5",
 	baseURL: baseURL,
-	webSocketUrl: process.env.NODE_ENV === "production" ? "wss://221.214.32.166:40000/websocket" :
-		"ws://221.214.32.166:40000/api/message/websocket",
+	webSocketUrl: process.env.NODE_ENV === "production" ? "wss://127.0.0.1:50000/websocket" :
+		"ws://127.0.0.1:50000/api/message/websocket",
 	comUploadUrl: baseURL + '/api/file/Uploader/',
+	comUploadUrlPound: baseURL + '/api/scm/Voucher/Uploader/',
 	timeout: process.env.NODE_ENV === 'production' ? 1000000 : 1000000,
 	report: process.env.NODE_ENV === 'development' ? 'http://221.214.32.166:8200' : baseURL + '/Report'
 }
 // #endif
 
 // #ifdef MP
-const baseURL = "http://221.214.32.166:40000" // "https://app.java.jnpfsoft.com" 
+const baseURL = "http://127.0.0.1:50000" // "https://app.java.jnpfsoft.com" 
 const define = {
 	copyright: "Copyright @ 2024 上海长江云息数字科技有限公司版权所有",
 	sysVersion: "V3.5",
 	baseURL: baseURL,
-	webSocketUrl: "ws://221.214.32.166:40000/api/message/websocket", //"wss://app.java.jnpfsoft.com/api/message/websocket"
+	comUploadUrlPound: baseURL + '/api/scm/Voucher/Uploader/',
+	webSocketUrl: "ws://127.0.0.1:50000/api/message/websocket", //"wss://app.java.jnpfsoft.com/api/message/websocket"
 	comUploadUrl: baseURL + '/api/file/Uploader/',
 	timeout: process.env.NODE_ENV === 'production' ? 1000000 : 1000000,
 	report: baseURL + '/Report'