From 8552c06f1146006bf8d2a3ad4a85bb5307e5d4ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Thu, 6 Apr 2023 15:19:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scm/basicInformation/tradeupload/Form.vue |  15 +-
 .../basicInformation/tradeupload/Form4.vue    | 890 ++++++++++++++++++
 .../basicInformation/tradeupload/index.vue    |  21 +-
 3 files changed, 918 insertions(+), 8 deletions(-)
 create mode 100644 SC-web/src/views/scm/basicInformation/tradeupload/Form4.vue

diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
index 16d382e4..0f2d65c1 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
@@ -213,6 +213,7 @@
 		props: [],
 		data() {
 			return {
+			  controll: false,
 			  submitDisabled: false,
 				fileList: [],
 				uploadHeaders: {
@@ -453,10 +454,13 @@
 		mounted() {},
 		methods: {
 			imgChange(res) {
-				this.dataForm.customerId = res.data.customerId;
-				this.dataForm.customerName = res.data.customerName;
-				this.dataForm.salesId = res.data.salesId;
-				this.dataForm.salesName = res.data.salesName;
+			  debugger
+			  if (!this.controll){
+          this.dataForm.customerId = res.data.customerId;
+          this.dataForm.customerName = res.data.customerName;
+          this.dataForm.salesId = res.data.salesId;
+          this.dataForm.salesName = res.data.salesName;
+        }
 				this.dataForm.vehicleId = res.data.vehicleId;
 				this.dataForm.poundDate = res.data.poundDate;
 				this.dataForm.poundlistNo = res.data.poundlistNo;
@@ -556,6 +560,7 @@
 				}
 			},
 			init(id, isDetail) {
+        this.controll=false;
 				this.value = [];
 				this.dataForm.id = id || 0;
 				this.visible = true;
@@ -663,6 +668,7 @@
 							type: 'success',
 							duration: 1000,
 							onClose: () => {
+							  this.controll = true;
                 this.submitDisabled = false;
 								this.dataForm.id = '';
 								this.dataForm.tareWeight = 0; //皮重
@@ -687,6 +693,7 @@
 							type: 'success',
 							duration: 1000,
 							onClose: () => {
+							  this.controll = true;
                 this.submitDisabled = false;
 								this.dataForm.id = '';
 								this.dataForm.tareWeight = 0; //皮重
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form4.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form4.vue
new file mode 100644
index 00000000..72aa92f9
--- /dev/null
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form4.vue
@@ -0,0 +1,890 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+		:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1500px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
+				label-position="right">
+				<template v-if="!loading">
+					<el-col :span="12">
+						<el-form-item label="磅单上传" prop="poundPictures">
+							<JNPF-UploadImg2B v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1"
+								@change="imgChange" ref="poundUpload">
+
+							</JNPF-UploadImg2B>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="车辆图片" prop="vehiclePictures">
+							<JNPF-UploadImgB v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
+
+							</JNPF-UploadImgB>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="物料名称" prop="materialId">
+							<popupSelect v-model="dataForm.materialId" placeholder="请选择物料编码" clearable
+								field="materialId" interfaceId="381037852907038533"
+								:columnOptions="materialIdcolumnOptions" propsValue="id" relationField="item_name"
+								popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20">
+
+							</popupSelect>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="客户名称" prop="customerId">
+							<popupSelect v-model="dataForm.customerId" placeholder="请选择客户" clearable field="customerId"
+								interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions"
+								propsValue="id" relationField="supplier_nm" popupType="dialog" popupTitle="选择数据"
+								popupWidth="800px" hasPage :pageSize="20" @change="customerSelect">
+
+							</popupSelect>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="销售合同" prop="salesId">
+							<popupSelect v-model="dataForm.salesId" placeholder="请选择合同" clearable field="salesId"
+								interfaceId="396203872441416837" :columnOptions="salesIdcolumnOptions" propsValue="id"
+								relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
+								:bissId="dataForm.customerId" hasPage :pageSize="20">
+
+							</popupSelect>
+						</el-form-item>
+					</el-col>
+          <el-col :span="6">
+            <el-form-item label="采购合同" prop="purchaseId">
+              <popupSelect v-model="dataForm.purchaseId" placeholder="请选择合同" clearable field="purchaseId"
+                           interfaceId="397408984857931205" :columnOptions="salesIdcolumnOptions" propsValue="id"
+                           relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
+                           hasPage :pageSize="20"  disabled>
+
+              </popupSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="供应商" prop="supplierId">
+              <popupSelect v-model="dataForm.supplierId" placeholder="请选择客户" clearable field="supplierId"
+                           interfaceId="382494924156735557" :columnOptions="supplierIdcolumnOptions" propsValue="id"
+                           relationField="supplier_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage
+                           :pageSize="20" disabled>
+
+              </popupSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="采购价格" prop="purchasePrice" disabled="">
+              <el-input-number v-model="dataForm.purchasePrice" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
+            </el-form-item>
+          </el-col>
+					<el-col :span="6">
+						<el-form-item label="车牌号" prop="vehicleId">
+							<popupSelect v-model="dataForm.vehicleId" placeholder="请选择车辆" clearable field="vehicleId"
+								interfaceId="381432451370615173" :columnOptions="vehicleIdcolumnOptions" propsValue="id"
+								relationField="ticketno" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
+								@change="changePicture" hasPage :pageSize="20">
+
+							</popupSelect>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="销售价格" prop="salesPrice">
+							<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}' :precision="6" :min="0">
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="毛重" prop="grossWeight">
+							<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}'
+								@change="grossWeightChange" :precision="6" :min="0"></el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="皮重" prop="tareWeight">
+							<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}'
+								@change="grossWeightChange" :precision="6" :min="0"></el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="扣重" prop="buckleWeight">
+							<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}'
+								@change="grossWeightChange" :precision="6" :min="0"></el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="净重" prop="netWeight">
+							<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}' :precision="6" :min="0">
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="磅单日期" prop="poundDate">
+							<el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable
+								:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
+
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="磅单号" prop="poundlistNo">
+							<el-input v-model="dataForm.poundlistNo" placeholder="请输入" clearable
+								:style='{"width":"100%"}'>
+
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="单位 " prop="unit">
+							<el-select v-model="unit" placeholder="请选择" clearable :style='{"width":"100%"}'
+								@change="unitChange">
+								<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName"
+									:value="item.id" :disabled="item.disabled"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="运输类型" prop="transportType">
+							<el-select v-model="transportType" placeholder="请选择" clearable :style='{"width":"100%"}'
+								@change="transportTypeChange">
+								<el-option v-for="(item, index) in transportTypeOptions" :key="index"
+									:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="是否垫资" prop="advance">
+							<el-select v-model="advance" placeholder="请选择" clearable :style='{"width":"100%"}'
+								@change="advanceChange">
+								<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"
+									:value="item.id" :disabled="item.disabled"></el-option>
+
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="运费" prop="transportPrice">
+							<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}' :precision="6" :min="0">
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+
+
+					<el-col :span="6">
+						<el-form-item label="起始地" prop="originPlace">
+							<JNPF-Address v-model="dataForm.originPlace" placeholder="请选择省市区" clearable :level='2'>
+							</JNPF-Address>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="业务员1" prop="businessId">
+							<popupSelect v-model="dataForm.businessId" placeholder="请选择业务员1" clearable
+								field="businessId" interfaceId="ebcc44be142e43b795c0d769abd6d25a"
+								:columnOptions="businessIdcolumnOptions" propsValue="F_Id" relationField="F_RealName"
+								popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20"
+								:bissId="dataForm.businessId" disabled>
+
+							</popupSelect>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="业务员2" prop="naturalId">
+							<popupSelect v-model="dataForm.naturalId" placeholder="请选择业务员2" clearable field="naturalId"
+								interfaceId="395933800510599301" :columnOptions="naturalIdcolumnOptions" propsValue="id"
+								relationField="name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage
+								:pageSize="20">
+
+							</popupSelect>
+						</el-form-item>
+					</el-col>
+
+					<el-col :span="6">
+						<el-form-item label="收货价格" prop="collectPrice">
+							<el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}' :precision="6" :min="0">
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+
+					<el-col :span="6">
+						<el-form-item label="备注" prop="remark">
+							<el-input v-model="dataForm.remark" placeholder="请输入备注信息" clearable
+								:style='{"width":"100%"}'>
+
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</template>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false"> 取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> 确 定</el-button>
+<!--			<el-button type="primary" @click="continueUpload()" :disabled="submitDisabled"> 继续上传</el-button>-->
+		</span>
+	</el-dialog>
+</template>
+<script>
+	const units = {
+		KB: 1024,
+		MB: 1024 * 1024,
+		GB: 1024 * 1024 * 1024
+	}
+	import request from '@/utils/request'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			return {
+			  submitDisabled: false,
+				fileList: [],
+				uploadHeaders: {
+					Authorization: this.$store.getters.token
+				},
+				value: [],
+				type: 'annexpic',
+				disabled: false,
+				detailed: false,
+				showTip: false,
+				limit: 0,
+				accept: 'image/*',
+				sizeUnit: 'MB',
+				fileSize: 5,
+				unit: "0",
+				transportType: "0",
+				advance: "0",
+				action: this.define.APIURl + '/api/tradeupload/Tradeupload/UploaderPondList/annexpic',
+				imageUrl: '',
+				code: '100',
+				fileList: [],
+				visible: false,
+				loading: false,
+				isDetail: false,
+				dataForm: {
+					poundPictures: [],
+					materialId: "",
+					customerId: "",
+					salesId: "",
+					vehicleId: "",
+					vehiclePictures: [],
+					poundDate: '',
+					poundlistNo: '',
+					tareWeight: 0,
+					grossWeight: 0,
+					buckleWeight: 0,
+					collectPrice: 0,
+					netWeight: 0,
+					unit: "0",
+					transportType: "0",
+					advance: "0",
+					transportPrice: 0,
+					originPlace: [],
+					salesPrice: 0,
+					businessId: "",
+					naturalId: "",
+					remark: '',
+					creatorTime: "",
+				},
+				rules: {
+					materialId: [{
+						required: true,
+						message: '请选择物料编码',
+						trigger: 'change'
+					}, ],
+					customerId: [{
+						required: true,
+						message: '请选择客户',
+						trigger: 'change'
+					}, ],
+					salesId: [{
+						required: true,
+						message: '请选择合同',
+						trigger: 'change'
+					}, ],
+
+					vehicleId: [{
+						required: true,
+						message: '请选择车辆',
+						trigger: 'change'
+					}, ],
+					// vehiclePictures: [{
+					//   required: true,
+					//   message: '请至少选择一个',
+					//   trigger: 'click'
+					// }, ],
+					poundDate: [{
+						required: true,
+						message: '请选择',
+						trigger: 'change'
+					}, ],
+					poundlistNo: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+					tareWeight: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+					grossWeight: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+					buckleWeight: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+					netWeight: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+					salesPrice: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+					}, ],
+					businessId: [{
+						required: true,
+						message: '请选择业务员',
+						trigger: 'change'
+					}, ],
+				},
+				materialIdcolumnOptions: [{
+					"label": "物料编码",
+					"value": "item_code"
+				}, {
+					"label": "物料名称",
+					"value": "item_name"
+				}, {
+					"label": "单位",
+					"value": "primary_unit_of_measure"
+				}, {
+					"label": "默认入库区",
+					"value": "inareaname"
+				}, {
+					"label": "默认出库区",
+					"value": "outareaname"
+				}, ],
+				customerIdcolumnOptions: [{
+					"label": "客户编码",
+					"value": "supplier_cd"
+				}, {
+					"label": "客户名称",
+					"value": "supplier_nm"
+				}, {
+					"label": "地址",
+					"value": "address"
+				}, {
+					"label": "银行账号",
+					"value": "bank_account"
+				}, ],
+				salesIdcolumnOptions: [{
+					"label": "合同编码",
+					"value": "contract_code"
+				}, {
+					"label": "合同名称",
+					"value": "contract_name"
+				}, {
+					"label": "合同类型",
+					"value": "contract_type"
+				}, {
+					"label": "供应商/客户名称",
+					"value": "name"
+				}, ],
+				vehicleIdcolumnOptions: [{
+					"label": "车牌号",
+					"value": "ticketno"
+				}, {
+					"label": "司机",
+					"value": "drivername"
+				}, {
+					"label": "手机号",
+					"value": "contact"
+				}, ],
+				unitOptions: [{
+					"fullName": "吨",
+					"id": "0"
+				}, {
+					"fullName": "千克",
+					"id": "1"
+				}],
+				transportTypeOptions: [{
+					"fullName": "汽运",
+					"id": "0"
+				}, {
+					"fullName": "船运",
+					"id": "1"
+				}, {
+					"fullName": "火车",
+					"id": "2"
+				}],
+				advanceOptions: [{
+					"fullName": "否",
+					"id": "0"
+				}, {
+					"fullName": "是",
+					"id": "1"
+				}],
+				businessIdcolumnOptions: [{
+					"label": "人员名称",
+					"value": "F_RealName"
+				}, {
+					"label": "账号",
+					"value": "F_Account"
+				}, {
+					"label": "人员职位",
+					"value": "positionName"
+				}],
+				naturalIdcolumnOptions: [{
+					"label": "业务员2名称",
+					"value": "name"
+				}, {
+					"label": "业务员2手机号",
+					"value": "contact"
+				}, {
+					"label": "业务员2地址",
+					"value": "adress"
+				}, ],
+
+			}
+		},
+		computed: {},
+		watch: {
+			/* value: {
+			  immediate: true,
+			  handler(val) {
+			    this.fileList = val
+			    this.$nextTick(() => {
+			      if (!val.length) {
+			        this.$refs.elUpload && this.$refs.elUpload.uploadFiles.splice(0)
+			      } else {
+			        if (!this.$refs.elUpload) return
+			        this.$refs.elUpload.uploadFiles = val.map(o => ({
+			          ...o,
+			          uid: o.fileId
+			        }))
+			      }
+			    })
+			  }
+			} */
+		},
+		created() {},
+		mounted() {},
+		methods: {
+			imgChange(res) {
+				this.dataForm.customerId = res.data.customerId;
+				this.dataForm.customerName = res.data.customerName;
+				this.dataForm.salesId = res.data.salesId;
+				this.dataForm.salesName = res.data.salesName;
+				this.dataForm.vehicleId = res.data.vehicleId;
+				this.dataForm.poundDate = res.data.poundDate;
+				this.dataForm.poundlistNo = res.data.poundlistNo;
+				this.dataForm.tareWeight = res.data.tareWeight > 1000 ? (res.data.tareWeight / 1000).toFixed(6) : res.data
+					.tareWeight;
+				this.dataForm.grossWeight = res.data.grossWeight > 1000 ? (res.data.grossWeight / 1000).toFixed(6) : res
+					.data.grossWeight;
+				this.dataForm.buckleWeight = res.data.buckleWeight > 1000 ? (res.data.buckleWeight / 1000).toFixed(6) : res
+					.data.buckleWeight;
+				if (this.dataForm.netWeight && this.dataForm.netWeight > 0) {
+					this.dataForm.netWeight = res.data.netWeight > 1000 ? (res.data.netWeight / 1000).toFixed(6) : res.data
+						.netWeight;
+				} else {
+					this.dataForm.netWeight = res.data.grossWeight - res.data.tareWeight - res.data.buckleWeight;
+				}
+				if (res.data.vehiclePictures && res.data.vehiclePictures.length > 0) {
+					this.dataForm.vehiclePictures = JSON.parse(res.data.vehiclePictures);
+				}
+			},
+			grossWeightChange(e, f) {
+				//this.dataForm.netWeight = this.dataForm.grossWeight - this.dataForm.tareWeight - this.dataForm.buckleWeight;
+				this.dataForm.netWeight = this.jnpf.floatSub(this.jnpf.floatSub(parseFloat(this.dataForm.grossWeight),
+					parseFloat(this.dataForm.tareWeight)), parseFloat(this.dataForm.buckleWeight))
+			},
+			unitChange(e) {
+				this.dataForm.unit = e;
+			},
+			transportTypeChange(e) {
+				this.dataForm.transportType = e;
+			},
+			advanceChange(e) {
+				this.dataForm.advance = e;
+			},
+			customerSelect(e, d) {
+				const query = {
+					code: d.id
+				}
+				request({
+					url: '/api/example/ContractFile/getListByCustomer',
+					method: 'post',
+					data: query
+				}).then((res) => {
+					if (res.data.length > 0) {
+						//确定后 根据type 进行保存 不需要组件通讯
+						this.dataForm.salesId = res.data[0].id
+						this.dataForm.salesName = res.data[0].contractName
+					}
+				})
+			},
+			changePicture(a, b) {
+				this.dataForm.vehiclePictures = JSON.parse(b.vehiclephotos);
+			},
+			continueUpload() {
+				var tareWeight = this.dataForm.tareWeight; //皮重
+				var grossWeight = this.dataForm.grossWeight; //毛重
+				var buckleWeight = this.dataForm.buckleWeight; //扣重
+				var netWeight = this.dataForm.netWeight; //净重
+        this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0;
+        this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0;
+        this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0;
+				if (grossWeight != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))) {
+					this.$message({
+						message: '毛重必须等于皮重+扣重+净重',
+						type: 'warning',
+						duration: 1000
+					})
+					return
+				}
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						this.request3()
+					}
+				})
+			},
+			// poundAI(){
+			//   let formData = new FormData();
+			//   let file = this.dataForm.poundPictures
+			//   formData.append('file',file);
+			//   request({
+			//     url: '/api/tradeupload/Tradeupload/poundai',
+			//     method: 'post',
+			//     data: formData
+			//   }).then(res => {
+			//     this.dataInfo(res.data)
+			//     this.loading = false
+			//   });
+			// },
+			clearData(data) {
+				for (let key in data) {
+					if (data[key] instanceof Array) {
+						data[key] = [];
+					} else if (data[key] instanceof Object) {
+						this.clearData(data[key]);
+					} else {
+						data[key] = "";
+					}
+				}
+			},
+			init(id, isDetail) {
+				this.value = [];
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.dataForm.businessId = this.$store.state.user.userInfo.userId;
+							this.dataForm.businessName = this.$store.state.user.userInfo.userName;
+							this.dataForm.poundDate = new Date();
+							this.loading = false
+						});
+					} else {
+						this.clearData(this.dataForm)
+						this.dataForm.businessId = this.$store.state.user.userInfo.userId;
+						this.dataForm.businessName = this.$store.state.user.userInfo.userName;
+						this.dataForm.poundDate = new Date();
+					}
+				});
+				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+			},
+			// 表单提交
+			dataFormSubmit() {
+				var tareWeight = this.dataForm.tareWeight; //皮重
+				var grossWeight = this.dataForm.grossWeight; //毛重
+				var buckleWeight = this.dataForm.buckleWeight; //扣重
+				var netWeight = this.dataForm.netWeight; //净重
+				this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0;
+				this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0;
+				this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0;
+				if (grossWeight != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))) {
+					this.$message({
+						message: '毛重必须等于皮重+扣重+净重',
+						type: 'error',
+						duration: 1000
+					})
+					return
+				}
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						this.request2()
+					}
+				})
+			},
+			request2() {
+        this.submitDisabled = true;
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/tradeupload/Tradeupload',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+                this.submitDisabled = false;
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					}).catch(() => {
+            this.submitDisabled = false
+          })
+				} else {
+					request({
+						url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+                this.submitDisabled = false;
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					}).catch(() => {
+            this.submitDisabled = false
+          })
+				}
+			},
+			request3() {
+        this.submitDisabled = true;
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/tradeupload/Tradeupload',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+                this.submitDisabled = false;
+								this.dataForm.id = '';
+								this.dataForm.tareWeight = 0; //皮重
+								this.dataForm.grossWeight = 0; //毛重
+								this.dataForm.buckleWeight = 0; //扣重
+								this.dataForm.netWeight = 0; //净重
+								this.dataForm.poundlistNo = '';
+                this.$refs.poundUpload.handleRemove(0);
+							}
+						})
+					}).catch(() => {
+            this.submitDisabled = false
+          })
+				} else {
+					request({
+						url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+                this.submitDisabled = false;
+								this.dataForm.id = '';
+								this.dataForm.tareWeight = 0; //皮重
+								this.dataForm.grossWeight = 0; //毛重
+								this.dataForm.buckleWeight = 0; //扣重
+								this.dataForm.netWeight = 0; //净重
+								this.dataForm.poundlistNo = '';
+                this.$refs.poundUpload.handleRemove(0);
+							}
+						})
+					}).catch(() => {
+            this.submitDisabled = false
+          })
+				}
+			},
+			request() {
+        this.submitDisabled = true;
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/tradeupload/Tradeupload',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+                this.submitDisabled = false;
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				} else {
+					request({
+						url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+                this.submitDisabled = false;
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					})
+				}
+			},
+			dataList() {
+				var _data = JSON.parse(JSON.stringify(this.dataForm));
+				_data.poundPictures = JSON.stringify(_data.poundPictures)
+				_data.vehiclePictures = JSON.stringify(_data.vehiclePictures)
+				_data.originPlace = JSON.stringify(_data.originPlace)
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				_dataAll.poundPictures = JSON.parse(_dataAll.poundPictures)
+				_dataAll.vehiclePictures = JSON.parse(_dataAll.vehiclePictures)
+				if (_dataAll.originPlace.length > 0) {
+					_dataAll.originPlace = JSON.parse(_dataAll.originPlace)
+				} else {
+					_dataAll.originPlace = []
+				}
+				this.value = _dataAll.poundPictures;
+				this.dataForm = _dataAll
+			},
+			beforeUpload(file) {
+				const unitNum = units[this.sizeUnit];
+				if (!this.fileSize) return true
+				let isRightSize = file.size / unitNum < this.fileSize
+				if (!isRightSize) {
+					this.$message.error(`图片大小超过${this.fileSize}${this.sizeUnit}`)
+					return isRightSize;
+				}
+				let isAccept = new RegExp('image/*').test(file.type)
+				if (!isAccept) {
+					this.$message.error(`请上传图片`)
+					return isAccept;
+				}
+				return isRightSize && isAccept;
+			},
+			/* handleAvatarSuccess(res, file) {
+			  this.imageUrl = URL.createObjectURL(file.raw);
+			  this.dataForm.customerId = res.data.customerId;
+			  this.dataForm.customerName = res.data.customerName;
+			  this.dataForm.salesId = res.data.salesId;
+			  this.dataForm.salesName = res.data.salesName;
+			  this.dataForm.vehicleId = res.data.vehicleId;
+			  this.dataForm.poundDate = res.data.poundDate;
+			  this.dataForm.poundlistNo = res.data.poundlistNo;
+			  this.dataForm.tareWeight = res.data.tareWeight;
+			  this.dataForm.grossWeight = res.data.grossWeight;
+			  this.dataForm.buckleWeight = res.data.buckleWeight;
+			  this.dataForm.netWeight = res.data.netWeight;
+			  this.dataForm.vehiclePictures = JSON.parse(res.data.vehiclePictures);
+			}, */
+			handleSuccess(res, file, fileList) {
+				if (res.code == 200) {
+					this.fileList.push({
+						name: file.name,
+						fileId: res.data.vo.name,
+						url: res.data.vo.url
+					})
+					this.dataForm.customerId = res.data.customerId;
+					this.dataForm.customerName = res.data.customerName;
+					this.dataForm.salesId = res.data.salesId;
+					this.dataForm.salesName = res.data.salesName;
+					this.dataForm.vehicleId = res.data.vehicleId;
+					this.dataForm.poundDate = res.data.poundDate;
+					this.dataForm.poundlistNo = res.data.poundlistNo;
+					this.dataForm.tareWeight = res.data.tareWeight;
+					this.dataForm.grossWeight = res.data.grossWeight;
+					this.dataForm.buckleWeight = res.data.buckleWeight;
+					this.dataForm.netWeight = res.data.netWeight;
+					this.dataForm.vehiclePictures = JSON.parse(res.data.vehiclePictures);
+					this.dataForm.poundPictures = this.fileList;
+					if (res.data.grossWeight >= 1000) {
+						this.dataForm.unit = '1';
+						this.unit = '1';
+					}
+					/* this.$emit('input', this.fileList)
+					this.$emit('change', this.fileList) */
+				} else {
+					this.$refs.elUpload.uploadFiles.splice(fileList.length - 1, 1)
+					fileList.filter(o => o.uid != file.uid)
+					this.$emit('input', this.fileList)
+					this.$emit('change', this.fileList)
+					this.$message({
+						message: res.msg,
+						type: 'error',
+						duration: 2500
+					})
+				}
+			},
+			handleExceed(files, fileList) {
+				this.$message.warning(`当前限制最多可以上传${this.limit}张图片`)
+			},
+			handlePictureCardPreview(index) {
+				this.$refs['image' + index][0].clickHandler()
+			},
+			handleRemove(index) {
+				this.fileList.splice(index, 1)
+				this.$refs.elUpload.uploadFiles.splice(index, 1)
+				this.$emit("input", this.fileList)
+				this.$emit('change', this.fileList)
+			},
+			getImgList(list) {
+				const newList = list.map(o => this.define.comUrl + o.url)
+				return newList
+			}
+		},
+	}
+</script>
+<style lang="scss" scoped>
+	>>>.el-upload-list--picture-card .el-upload-list__item {
+		width: 120px;
+		height: 120px;
+	}
+
+	>>>.el-upload--picture-card {
+		width: 120px;
+		height: 120px;
+		line-height: 120px;
+	}
+
+	.upload-btn {
+		display: inline-block;
+	}
+</style>
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
index 7e05c183..ba0375da 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
@@ -161,7 +161,7 @@
                          @click="addOrUpdateHandle2(scope.row.id)" v-has="'btn_addOrUpdateHandle2'">审核
               </el-button>
                <el-button type="text"
-                         @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">编辑
+                         @click="addOrUpdateHandle3(scope.row.id)" v-has="'btn_edit'">编辑
               </el-button>
               <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)" v-has="'btn_remove'">删除
               </el-button>
@@ -178,6 +178,7 @@
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
     <JNPF-Form2 v-if="formVisible2" ref="JNPFForm2" @refresh="refresh2"/>
     <JNPF-Form3 v-if="formVisible3" ref="JNPFForm3" @refresh="refresh3"/>
+    <JNPF-Form4 v-if="formVisible4" ref="JNPFForm4" @refresh="refresh4"/>
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
   </div>
@@ -189,13 +190,14 @@
   import JNPFForm from './Form'
   import JNPFForm2 from './Form2'
   import JNPFForm3 from './Form3'
+  import JNPFForm4 from './Form4'
 
   import ExportBox from './ExportBox'
   import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
   import Detail from './Detail'
 
   export default {
-    components: { JNPFForm, JNPFForm2, JNPFForm3, ExportBox, Detail },
+    components: { JNPFForm, JNPFForm2, JNPFForm3, JNPFForm4, ExportBox, Detail },
     data() {
       return {
         showAll: false,
@@ -221,6 +223,7 @@
         formVisible: false,
         formVisible2: false,
         formVisible3: false,
+        formVisible4: false,
         exportBoxVisible: false,
         columnList: [
           { prop: 'creatorTime', label: '磅单日期' },
@@ -367,6 +370,12 @@
           this.$refs.JNPFForm2.init(id, isDetail)
         })
       },
+      addOrUpdateHandle3(id, isDetail) {
+        this.formVisible4 = true
+        this.$nextTick(() => {
+          this.$refs.JNPFForm4.init(id, isDetail)
+        })
+      },
       exportData() {
         this.exportBoxVisible = true
         this.$nextTick(() => {
@@ -404,7 +413,11 @@
         if (isrRefresh) this.reset()
       },
       refresh3(isrRefresh) {
-        this.formVisible2 = false
+        this.formVisible3 = false
+        if (isrRefresh) this.reset()
+      },
+      refresh4(isrRefresh) {
+        this.formVisible4 = false
         if (isrRefresh) this.reset()
       },
       reset() {
@@ -413,7 +426,7 @@
         // }
         this.search()
       },
-      reset() {
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }