Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -42,10 +42,10 @@
           </el-table-column>
           <el-table-column prop="goodsName" label="货名"> </el-table-column>
           <el-table-column
-            prop="grossWeight;"
+            prop="grossWeight"
             label="毛重（吨）"
           ></el-table-column>
-          <el-table-column prop=" tare" label="皮重（吨）"> </el-table-column>
+          <el-table-column prop="tare" label="皮重（吨）"> </el-table-column>
           <el-table-column
             prop="netWeight"
             label="净重（吨）"
@@ -210,13 +210,30 @@ export default {
     edits(row) {
       console.log(row)
       if (row.inOutFlag == 2) {
+        this.$store.dispatch('app/setdeptBudgetList', row)
         this.$router.push({
           path: 'warehouseManagementPerfectput',
           query: {
-            warehouseName: row.warehouseName,
-            binNumber: row.binNumber,
-            baseId: row.warehouseId,
-            positionId: row.binNumberId,
+             id:row.id,
+             agent:row.agent,
+             baseId: row.baseId,
+             binNumber: row.binNumber,
+             carNo:row.carNo,
+             compId:row.compId,
+             contractNo:row.contractNo,
+             goodsName:row.goodsName,
+             goodsNameKey:row.goodsNameKey,
+             grade:row.grade,
+             grossWeight:row.grossWeight,
+             inOutDate:row.inOutDate,
+             inOutFlag:row.inOutFlag,
+             inOutType:row.inOutType,
+             inOutTypeKey:row.inOutTypeKey,
+             netWeight:row.netWeight,
+             positionId: row.positionId,
+             statusFlag:row.statusFlag,
+             tare:row.tare,
+             warehouseName: row.warehouseName,  
           },
         })
       } else if(row.inOutFlag==1){
@@ -225,8 +242,9 @@ export default {
         this.$router.push({
           path: 'warehouseManagementPerfectDelivery',
           query: {
-            agent:row.agent,
-            baseId: row.baseId,
+             id:row.id,
+             agent:row.agent,
+             baseId: row.baseId,
              binNumber: row.binNumber,
              carNo:row.carNo,
              compId:row.compId,
@@ -243,7 +261,7 @@ export default {
              positionId: row.positionId,
              statusFlag:row.statusFlag,
              tare:row.tare,
-            warehouseName: row.warehouseName,  
+             warehouseName: row.warehouseName,  
           }
           })
       }

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -126,7 +126,7 @@
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
-          <!-- 入库类型 -->
+          <!-- 出库类型 -->
           <ws-form-item label="出库类型" span="1">
             <ws-select
               v-model="dataList.inOutType"
@@ -179,7 +179,7 @@
       />
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
-        <!--自检员-->
+        <!--质检员-->
         <ws-form-item label="质检员" span="1" prop="qualityInspector">
           <ws-input
             v-model="dataList.warehouseInOutDetail.qualityInspector"
@@ -340,6 +340,17 @@ export default {
       },
       contractList: [],
       dataList: {
+        id:'',
+        grossWeight:'',
+        contractNo:'',
+        tare:'',
+        netWeight:'',
+        grade:'',
+        agent:'',
+        carNo:'',
+        inOutDate:'',
+        inOutType:'',
+        goodsName:'',
         warehouseInOutDetail: {},
       },
       historyList: [],
@@ -352,34 +363,32 @@ export default {
       accessoryTFs: false,
     }
   },
-  mounted() {
+  activated() {
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
     this.getList()
-    console.log(this.deptBudgetList,1111)
+    this.dataList.id=this.$route.query.id
+    this.dataList.grossWeight=this.$route.query.grossWeight
+    this.dataList.contractNo = this.$route.query.contractNo
+    this.dataList.baseId = this.$route.query.baseId
+    this.dataList.positionId = this.$route.query.positionId
+    this.dataList.warehouseName = this.$route.query.warehouseName
+    this.dataList.binNumber = this.$route.query.binNumber
+    this.dataList.tare = this.$route.query.tare
+    this.dataList.netWeight = this.$route.query.netWeight
+    this.dataList.grade = this.$route.query.grade
+    this.dataList.agent = this.$route.query.agent
+    this.dataList.carNo = this.$route.query.carNo
+    this.dataList.inOutDate = this.$route.query.inOutDate
+    this.dataList.contractNo = this.$route.query.contractNo
+    this.dataList.inOutType = this.$route.query.inOutType
+    this.dataList.compId = this.$route.query.compId
+    this.dataList.goodsName = this.$route.query.goodsName
+    this.dataList.goodsNameKey = Number(this.$route.goodsNameKey)
+    this.dataList.inOutFlag = this.$route.inOutFlag
+    this.dataList.inOutTypeKey = Number(this.$route.inOutTypeKey)
+    this.dataList.statusFlag = this.$route.statusFlag
     console.log(this.dataList)
-    console.log(get)
-    // dataList.contractNo = this.$route.query.contractNo
-    // this.dataList.contractNo = this.deptBudgetList.contractNo
-    // this.deptBudgetList.baseId = this.$route.query.baseId
-    // this.deptBudgetList.positionId = this.$route.query.positionId
-    // this.deptBudgetList.warehouseName = this.$route.query.warehouseName
-    // this.deptBudgetList.binNumber = this.$route.query.binNumber
-    // this.deptBudgetList.goodsName = this.$route.query.goodsName
-    // this.deptBudgetList.grossWeight = this.$route.query.grossWeight
-    // this.deptBudgetList.tare = this.$route.query.tare
-    // this.deptBudgetList.netWeight = this.$route.query.netWeight
-    // this.deptBudgetList.grade = this.$route.query.grade
-    // this.deptBudgetList.agent = this.$route.query.agent
-    // this.deptBudgetList.carNo = this.$route.query.carNo
-    // this.deptBudgetList.inOutDate = this.$route.query.inOutDate
-    // this.deptBudgetList.contractNo = this.$route.query.contractNo
-    // this.deptBudgetList.inOutType = this.$route.query.inOutType
-    // this.deptBudgetList.compId = this.$route.query.compId
-    // this.deptBudgetList.goodsNameKey = Number(this.$route.goodsNameKey)
-    // this.deptBudgetList.inOutFlag = this.$route.inOutFlag
-    // this.deptBudgetList.inOutTypeKey = Number(this.$route.inOutTypeKey)
-    // this.deptBudgetList.statusFlag = this.$route.statusFlag
   },
   methods: {
     //返回按钮
@@ -394,14 +403,14 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
+          this.$refs.dataList.validate((valid) => {
             if (valid) {
-              this.deptBudgetList.compId = sessionStorage.getItem(
+              this.dataList.compId = sessionStorage.getItem(
                 'ws-pf_compId'
               )
-              this.deptBudgetList.inOutFlag = 1
-              this.deptBudgetList.statusFlag = 1
-              addstorageputList(this.deptBudgetList)
+              this.dataList.inOutFlag = 1
+              this.dataList.statusFlag = 1
+              addstorageputList(this.dataList)
                 .toPromise()
                 .then((response) => {
                   this.$message.success('暂存成功')
@@ -419,7 +428,7 @@ export default {
     },
     //提交按钮
     submit() {
-      console.log(this.deptBudgetList)
+      console.log(this.dataList)
       // if (
       //   this.deptBudgetList.warehouseInOutDetail.qualityInspector.length < 2 ||
       //   this.deptBudgetList.warehouseInOutDetail.qualityInspector > 10
@@ -441,12 +450,12 @@ export default {
       //   return
       // }
 
-      this.$refs.deptBudgetList.validate((valid) => {
+      this.$refs.dataList.validate((valid) => {
         if (valid) {
-          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
-          this.deptBudgetList.inOutFlag = 1
-          this.deptBudgetList.statusFlag = 3
-          addstorageputList(this.deptBudgetList)
+          this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.dataList.inOutFlag = 1
+          this.dataList.statusFlag = 3
+          addstorageputList(this.dataList)
             .toPromise()
             .then((response) => {
               this.$message.success('添加成功')
@@ -460,11 +469,11 @@ export default {
     },
     //暂存按钮
     returnWarehouse() {
-      this.$refs.deptBudgetList.validate((valid) => {
+      this.$refs.dataList.validate((valid) => {
         if (valid) {
-          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
-          this.deptBudgetList.statusFlag = 1
-          addstorageputList(this.deptBudgetList)
+          this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.dataList.statusFlag = 1
+          addstorageputList(this.dataList)
             .toPromise()
             .then((response) => {
               this.$message.success('添加成功')
@@ -477,37 +486,37 @@ export default {
       })
     },
     tarechange(e) {
-      if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
-        this.deptBudgetList.netWeight = Number(
-          this.deptBudgetList.grossWeight - this.deptBudgetList.tare
+      if (this.dataList.grossWeight && this.dataList.tare) {
+        this.dataList.netWeight = Number(
+          this.dataList.grossWeight - this.dataList.tare
         )
       }
     },
     grossWeightchange(e) {
-      if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
-        this.deptBudgetList.netWeight = Number(
-          this.deptBudgetList.grossWeight - this.deptBudgetList.tare
+      if (this.dataList.grossWeight && this.dataList.tare) {
+        this.dataList.netWeight = Number(
+          this.dataList.grossWeight - this.dataList.tare
         )
       }
     },
     selectgoodsName(e) {
       for (var i = 0; i < this.goodnameList.length; i++) {
         if (this.goodnameList[i].constValue == e) {
-          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+          this.dataList.goodsNameKey = this.goodnameList[i].constKey
         }
       }
     },
     selectpackingMethod(e) {
       for (var i = 0; i < this.packtypeList.length; i++) {
         if (this.packtypeList[i].constValue == e) {
-          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+          this.dataList.packingMethodKey = this.packtypeList[i].constKey
         }
       }
     },
     selectstorageType(e) {
       for (var i = 0; i < this.storageType.length; i++) {
         if (this.storageType[i].constValue == e) {
-          this.deptBudgetList.inOutTypeKey = this.storageType[i].constKey
+          this.dataList.inOutTypeKey = this.storageType[i].constKey
         }
       }
     },
@@ -538,7 +547,7 @@ export default {
           this.gradeList = response
         })
       // 类型
-      pullDown({ constId: 'CON5' })
+      pullDown({ constId: 'CON6' })
         .toPromise()
         .then((response) => {
           this.storageType = response

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -22,7 +22,7 @@
       </el-col>
     </el-row>
 
-    <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
+    <ws-form ref="dataList" :model="dataList" :rules="rules">
       <div class="basicInformation">
         <h2>
           {{ deptBudgetList1.warehouseName }}库
@@ -33,7 +33,7 @@
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
             <ws-select
-              v-model="deptBudgetList.goodsName"
+              v-model="dataList.goodsName"
               placeholder=""
               class="typeselect"
               @change="selectgoodsName"
@@ -50,7 +50,7 @@
           <ws-form-item label="毛重（吨）" span="1" prop="grossWeight">
             <ws-input
               @input="grossWeightchange"
-              v-model="deptBudgetList.grossWeight"
+              v-model="dataList.grossWeight"
               placeholder="请输入毛重"
               maxlength="20"
               size="small"
@@ -66,7 +66,7 @@
           >
             <ws-input
               @input="tarechange"
-              v-model="deptBudgetList.tare"
+              v-model="dataList.tare"
               placeholder="请输入皮重"
               maxlength="100"
               size="small"
@@ -76,7 +76,7 @@
           <!--净重（吨）-->
           <ws-form-item label="净重（吨）" span="1" prop="netWeight">
             <ws-input
-              v-model.number="deptBudgetList.netWeight"
+              v-model.number="dataList.netWeight"
               placeholder="不可编辑，自动计算"
               type="number"
               maxlength="120"
@@ -86,7 +86,7 @@
           <!-- 品级 -->
           <ws-form-item label="品级" span="1" class="readonly">
             <ws-select
-              v-model="deptBudgetList.grade"
+              v-model="dataList.grade"
               placeholder=""
               class="typeselect"
               @change="selectpackingMethod"
@@ -103,30 +103,30 @@
           <!--经办人-->
           <ws-form-item label="经办人" span="1" prop="agent">
             <ws-input
-              v-model="deptBudgetList.agent"
+              v-model="dataList.agent"
               placeholder="请输入出库经办人姓名"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
-          <!--出库日期-->
+          <!--入库日期-->
           <ws-form-item
-            label="出库日期"
+            label="入库日期"
             span="1"
             prop="inOutDate"
             class="deliverydate"
           >
             <ws-date-picker
-              v-model="deptBudgetList.inOutDate"
+              v-model="dataList.inOutDate"
               type="date"
               placeholder="请选择出库日期"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
           <!-- 入库类型 -->
-          <ws-form-item label="出库类型" span="1">
+          <ws-form-item label="入库类型" span="1">
             <ws-select
-              v-model="deptBudgetList.inOutType"
+              v-model="dataList.inOutType"
               placeholder=""
               class="typeselect"
               @change="selectstorageType"
@@ -143,7 +143,7 @@
           <!--车牌号-->
           <ws-form-item label="车牌号" span="1" prop="sourceGoods">
             <ws-input
-              v-model="deptBudgetList.carNo"
+              v-model="dataList.carNo"
               placeholder="请输入车牌号"
               maxlength="20"
               size="small"
@@ -153,7 +153,7 @@
           <!--合同编号-->
           <ws-form-item label="合同编号" span="1" prop="contractNo">
             <ws-input
-              v-model="deptBudgetList.contractNo"
+              v-model="dataList.contractNo"
               placeholder="请输入合同编号"
               maxlength="100"
               size="small"
@@ -168,7 +168,7 @@
         oss-key="mainPlan"
         :comp-id="compId"
         :appendix-ids="appendixIdsAdd"
-        :vesselId="deptBudgetList.addressUrl"
+        :vesselId="dataList.addressUrl"
         :size-limit="size"
         @uploadSuccess="uploadSuccess"
         @onChange="onChange"
@@ -179,7 +179,7 @@
         <!--自检员-->
         <ws-form-item label="质检员" span="1" prop="qualityInspector">
           <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
+            v-model="dataList.warehouseInOutDetail.qualityInspector"
             placeholder="请输入质检员姓名"
             maxlength="120"
             size="small"
@@ -192,7 +192,7 @@
           <!--水分（%）<=-->
           <ws-form-item label="水分（%）<=" span="1" prop="waterContent">
             <ws-input
-              v-model="deptBudgetList.warehouseInOutDetail.waterContent"
+              v-model="dataList.warehouseInOutDetail.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
@@ -201,7 +201,7 @@
           <!--杂质（%）<=-->
           <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
             <ws-input
-              v-model="deptBudgetList.warehouseInOutDetail.impurity"
+              v-model="dataList.warehouseInOutDetail.impurity"
               placeholder="请输入杂质占比"
               maxlength="120"
               size="small"
@@ -210,7 +210,7 @@
           <!--容重（克/升）>=-->
           <ws-form-item label="容重（克/升）>=" span="1" prop="bulkDensity">
             <ws-input
-              v-model="deptBudgetList.warehouseInOutDetail.bulkDensity"
+              v-model="dataList.warehouseInOutDetail.bulkDensity"
               placeholder="请输入容重"
               maxlength="120"
               size="small"
@@ -219,7 +219,7 @@
           <!--霉变粒（%）<=-->
           <ws-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
             <ws-input
-              v-model="deptBudgetList.warehouseInOutDetail.mildewGrain"
+              v-model="dataList.warehouseInOutDetail.mildewGrain"
               placeholder="请输入霉变粒占比"
               maxlength="120"
               size="small"
@@ -228,7 +228,7 @@
           <!--热损伤（%）<=-->
           <ws-form-item label="热损伤（%）<=" span="1" prop="jiaorenli">
             <ws-input
-              v-model="deptBudgetList.warehouseInOutDetail.jiaorenli"
+              v-model="dataList.warehouseInOutDetail.jiaorenli"
               placeholder="请输入热损伤占比"
               maxlength="120"
               size="small"
@@ -237,7 +237,7 @@
           <!--不完整粒（%）<=-->
           <ws-form-item label="不完整粒（%）<=" span="1" prop="imperfectGrain">
             <ws-input
-              v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
+              v-model="dataList.warehouseInOutDetail.imperfectGrain"
               placeholder="请输入不完整粒占比"
               maxlength="120"
               size="small"
@@ -268,6 +268,7 @@
 import { pullDown, addstorageputList } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
+import { mapActions, mapGetters, mapState } from 'vuex'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'
@@ -285,6 +286,11 @@ export default {
       this.showType = val
     },
   },
+  computed:{
+    ...mapGetters([
+      'deptBudgetList',
+    ]),
+  },
   data() {
     return {
       //弹出框
@@ -334,7 +340,18 @@ export default {
         month: dayjs().format('MM'),
       },
       contractList: [],
-      deptBudgetList: {
+      dataList: {
+        id:'',
+        grossWeight:'',
+        contractNo:'',
+        tare:'',
+        netWeight:'',
+        grade:'',
+        agent:'',
+        carNo:'',
+        inOutDate:'',
+        inOutType:'',
+        goodsName:'',
         warehouseInOutDetail: {},
       },
       historyList: [],
@@ -346,28 +363,37 @@ export default {
       accessoryTFs: false,
     }
   },
-  mounted() {
-    console.log(this.$route.query)
-    this.deptBudgetList.baseId = this.$route.query.baseId
-    this.deptBudgetList.positionId = this.$route.query.positionId
+   activated() {
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
     this.getList()
-    this.deptBudgetList.goodsName= this.$route.query.goodsName
-    this.deptBudgetList.grossWeight = this.$route.query.grossWeight
-    this.deptBudgetList.tare = this.$route.query.tare
-    this.deptBudgetList.netWeight = this.$route.query.netWeight
-    this.deptBudgetList.grade = this.$route.query.grade
-    this.deptBudgetList.agent = this.$route.query.agent
-    this.deptBudgetList.carNo = this.$route.query.carNo
-    this.deptBudgetList.inOutDate = this.$route.query.inOutDate
-    this.deptBudgetList.contractNo = this.$route.query.contractNo
-    this.deptBudgetList.inOutType = this.$route.query.inOutType
+    this.dataList.id=this.$route.query.id
+    this.dataList.grossWeight=this.$route.query.grossWeight
+    this.dataList.contractNo = this.$route.query.contractNo
+    this.dataList.baseId = this.$route.query.baseId
+    this.dataList.positionId = this.$route.query.positionId
+    this.dataList.warehouseName = this.$route.query.warehouseName
+    this.dataList.binNumber = this.$route.query.binNumber
+    this.dataList.tare = this.$route.query.tare
+    this.dataList.netWeight = this.$route.query.netWeight
+    this.dataList.grade = this.$route.query.grade
+    this.dataList.agent = this.$route.query.agent
+    this.dataList.carNo = this.$route.query.carNo
+    this.dataList.inOutDate = this.$route.query.inOutDate
+    this.dataList.contractNo = this.$route.query.contractNo
+    this.dataList.inOutType = this.$route.query.inOutType
+    this.dataList.compId = this.$route.query.compId
+    this.dataList.goodsName = this.$route.query.goodsName
+    this.dataList.goodsNameKey = Number(this.$route.goodsNameKey)
+    this.dataList.inOutFlag = this.$route.inOutFlag
+    this.dataList.inOutTypeKey = Number(this.$route.inOutTypeKey)
+    this.dataList.statusFlag = this.$route.statusFlag
+    console.log(this.dataList)
   },
   methods: {
     //返回按钮
     revert() {
-      this.$router.push({ path: 'warehouseManagementNoComplete' })
+      this.$router.go(-1)
     },
     //暂存按钮
     temporaryStorage() {
@@ -377,14 +403,14 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
+          this.$refs.dataList.validate((valid) => {
             if (valid) {
-              this.deptBudgetList.compId = sessionStorage.getItem(
+              this.dataList.compId = sessionStorage.getItem(
                 'ws-pf_compId'
               )
-              this.deptBudgetList.inOutFlag = 1
-              this.deptBudgetList.statusFlag = 1
-              addstorageputList(this.deptBudgetList)
+              this.dataList.inOutFlag = 1
+              this.dataList.statusFlag = 1
+              addstorageputList(this.dataList)
                 .toPromise()
                 .then((response) => {
                   this.$message.success('暂存成功')
@@ -409,14 +435,14 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
+          this.$refs.dataList.validate((valid) => {
             if (valid) {
-              this.deptBudgetList.compId = sessionStorage.getItem(
+              this.dataList.compId = sessionStorage.getItem(
                 'ws-pf_compId'
               )
-              this.deptBudgetList.inOutFlag = 1
-              this.deptBudgetList.statusFlag = 3
-              addstorageputList(this.deptBudgetList)
+              this.dataList.inOutFlag = 1
+              this.dataList.statusFlag = 3
+              addstorageputList(this.dataList)
                 .toPromise()
                 .then((response) => {
                   this.$message.success('添加成功')
@@ -434,11 +460,11 @@ export default {
     },
     //暂存按钮
     returnWarehouse() {
-      this.$refs.deptBudgetList.validate((valid) => {
+      this.$refs.dataList.validate((valid) => {
         if (valid) {
-          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
-          this.deptBudgetList.statusFlag = 1
-          addstorageputList(this.deptBudgetList)
+          this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.dataList.statusFlag = 1
+          addstorageputList(this.dataList)
             .toPromise()
             .then((response) => {
               this.$message.success('添加成功')
@@ -451,37 +477,37 @@ export default {
       })
     },
     tarechange(e) {
-      if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
-        this.deptBudgetList.netWeight = Number(
-          this.deptBudgetList.grossWeight - this.deptBudgetList.tare
+      if (this.dataList.grossWeight && this.dataList.tare) {
+        this.dataList.netWeight = Number(
+          this.dataList.grossWeight - this.dataList.tare
         )
       }
     },
     grossWeightchange(e) {
-      if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
-        this.deptBudgetList.netWeight = Number(
-          this.deptBudgetList.grossWeight - this.deptBudgetList.tare
+      if (this.dataList.grossWeight && this.dataList.tare) {
+        this.dataList.netWeight = Number(
+          this.dataList.grossWeight - this.dataList.tare
         )
       }
     },
     selectgoodsName(e) {
       for (var i = 0; i < this.goodnameList.length; i++) {
         if (this.goodnameList[i].constValue == e) {
-          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+          this.dataList.goodsNameKey = this.goodnameList[i].constKey
         }
       }
     },
     selectpackingMethod(e) {
       for (var i = 0; i < this.packtypeList.length; i++) {
         if (this.packtypeList[i].constValue == e) {
-          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+          this.dataList.packingMethodKey = this.packtypeList[i].constKey
         }
       }
     },
     selectstorageType(e) {
       for (var i = 0; i < this.storageType.length; i++) {
         if (this.storageType[i].constValue == e) {
-          this.deptBudgetList.inOutTypeKey = this.storageType[i].constKey
+          this.dataList.inOutTypeKey = this.storageType[i].constKey
         }
       }
     },