From 700c18aa4cc694128fcfd9f769e8039c5ed877e8 Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Sat, 25 Mar 2023 19:20:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scm/basicInformation/tradeupload/Form.vue | 1209 +++++++++--------
 1 file changed, 612 insertions(+), 597 deletions(-)

diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
index 875deb21..35c8dc9d 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
@@ -1,12 +1,13 @@
 <template>
-  <el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+  <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">
+              <JNPF-UploadImg2B v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1"
+                @change="imgChange">
 
               </JNPF-UploadImg2B>
             </el-form-item>
@@ -22,8 +23,7 @@
             <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">
+                relationField="item_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20">
 
               </popupSelect>
             </el-form-item>
@@ -32,8 +32,8 @@
             <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">
+                relationField="supplier_nm" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20"
+                @change="customerSelect">
 
               </popupSelect>
             </el-form-item>
@@ -42,8 +42,8 @@
             <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">
+                relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
+                :bissId="dataForm.customerId" hasPage :pageSize="20">
 
               </popupSelect>
             </el-form-item>
@@ -60,32 +60,35 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="销售价格" prop="salesPrice">
-              <el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
+              <el-input-number v-model="dataForm.salesPrice" :style='{ "width": "100%" }' :precision="6"></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"></el-input-number>
+              <el-input-number v-model="dataForm.grossWeight" :style='{ "width": "100%" }' @change="grossWeightChange"
+                :precision="6"></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"></el-input-number>
+              <el-input-number v-model="dataForm.tareWeight" :style='{ "width": "100%" }' @change="grossWeightChange"
+                :precision="6"></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"></el-input-number>
+              <el-input-number v-model="dataForm.buckleWeight" :style='{ "width": "100%" }' @change="grossWeightChange"
+                :precision="6"></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"></el-input-number>
+              <el-input-number v-model="dataForm.netWeight" :style='{ "width": "100%" }' :precision="6"></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%"}'
+              <el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable :style='{ "width": "100%" }'
                 type="date" format="yyyy-MM-dd" value-format="timestamp">
 
               </el-date-picker>
@@ -93,30 +96,31 @@
           </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 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-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>
+                  :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-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>
+                  :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-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>
 
@@ -125,23 +129,24 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="运费" prop="transportPrice">
-              <el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
+              <el-input-number v-model="dataForm.transportPrice" :style='{ "width": "100%" }'
+                :precision="6"></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 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">
+                interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="businessIdcolumnOptions" propsValue="F_Id"
+                relationField="F_RealName" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20"
+                :bissId="dataForm.businessId">
 
               </popupSelect>
             </el-form-item>
@@ -158,13 +163,13 @@
 
           <el-col :span="6">
             <el-form-item label="收货价格" prop="collectPrice">
-              <el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
+              <el-input-number v-model="dataForm.collectPrice" :style='{ "width": "100%" }' :precision="6"></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 v-model="dataForm.remark" placeholder="请输入备注信息" clearable :style='{ "width": "100%" }'>
 
               </el-input>
             </el-form-item>
@@ -180,549 +185,569 @@
   </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 {
-        fileList: [],
-        uploadHeaders: { Authorization: this.$store.getters.token },
-        value: [],
-        type: 'annexpic',
-        disabled: false,
-        detailed: false,
-        showTip: false,
-        limit: 0,
-        accept: 'image/*',
-        sizeUnit: 'MB',
-        fileSize: 5,
+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 {
+      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",
-        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'
-          }, ],
+        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"
-        }, ],
+        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);
       }
     },
-    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
-              }))
-            }
-          })
+    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
         }
-      } */
+      })
     },
-    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;
+    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;//净重
+      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()
         }
-        if(res.data.vehiclePictures && res.data.vehiclePictures.length > 0){
-          this.dataForm.vehiclePictures = JSON.parse(res.data.vehiclePictures);
+      })
+    },
+    // 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] = "";
         }
-      },
-      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
+      }
+    },
+    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() {
+      var _data = this.dataList()
+      if (!this.dataForm.id) {
         request({
-          url: '/api/example/ContractFile/getListByCustomer',
+          url: '/api/tradeupload/Tradeupload',
           method: 'post',
-          data: query
+          data: _data
         }).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;//净重
-        if(grossWeight != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))){
           this.$message({
-            message: '毛重必须等于皮重+扣重+净重',
-            type: 'warning',
-            duration: 1000
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refresh', true)
+            }
           })
-        	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))){
+      } else {
+        request({
+          url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
           this.$message({
-            message: '毛重必须等于皮重+扣重+净重',
-            type: 'error',
-            duration: 1000
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refresh', true)
+            }
           })
-        	return
-        }
-        this.$refs['elForm'].validate((valid) => {
-          if (valid) {
-            this.request2()
-          }
         })
-      },
-      request2() {
-        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.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.visible = false
-                this.$emit('refresh', true)
-              }
-            })
-          })
-        }
-      },
-      request3() {
-        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,
-            })
+      }
+    },
+    request3() {
+      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,
           })
-        } else {
-          request({
-            url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
-            method: 'PUT',
-            data: _data
-          }).then((res) => {
-            this.$message({
-              message: res.msg,
-              type: 'success',
-              duration: 1000,
-            })
+        })
+      } else {
+        request({
+          url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
           })
-        }
-        this.dataForm.vehicleId = null;
-        this.dataForm.vehiclePictures = null;
-        this.dataForm.poundDate = null;
-        this.dataForm.poundlistNo = null;
-        this.dataForm.tareWeight = null;
-        this.dataForm.grossWeight = null;
-        this.dataForm.buckleWeight = null;
-        this.dataForm.netWeight = null;
-      },
-      request() {
-        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.visible = false
-                this.$emit('refresh', true)
-              }
-            })
+        })
+      }
+      this.dataForm.vehicleId = null;
+      this.dataForm.vehiclePictures = null;
+      this.dataForm.poundDate = null;
+      this.dataForm.poundlistNo = null;
+      this.dataForm.tareWeight = null;
+      this.dataForm.grossWeight = null;
+      this.dataForm.buckleWeight = null;
+      this.dataForm.netWeight = null;
+    },
+    request() {
+      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.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.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.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);
+        })
+      }
+    },
+    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;
@@ -735,71 +760,61 @@
         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: 1500 })
+        this.dataForm.poundPictures = this.fileList;
+        if (res.data.grossWeight >= 1000) {
+          this.dataForm.unit = '1';
+          this.unit = '1';
         }
-      },
-      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('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)
-      },
-      getImgList(list) {
-        const newList = list.map(o => this.define.comUrl + o.url)
-        return newList
+        this.$message({ message: res.msg, type: 'error', duration: 1500 })
       }
     },
-  }
+    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 {
+<style>
+.el-upload-list--picture-card .el-upload-list__item {
   width: 120px;
   height: 120px;
 }
->>> .el-upload--picture-card {
+
+.el-upload--picture-card {
   width: 120px;
   height: 120px;
   line-height: 120px;
 }
+
 .upload-btn {
   display: inline-block;
+  overflow: hidden;
+  border: solid 1px green;
+}
+
+.el-upload-dragger {
+  width: 148px;
+  height: 148px;
+  background-color: greenyellow;
 }
 </style>