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

public/static/inspection.html

@@ -52,10 +52,12 @@
        
       } 
       img,.left {
-        width: 120px;
-        height: 120px;
+        width: 110px;
+        height: 110px;
         /* margin-right: 118px; */
-        position: absolute
+        position: absolute;
+          right: 20px;
+          top: 12px;
       }
 
       .config {
@@ -74,7 +76,8 @@
 
       .number {
         text-align: right;
-        margin-bottom: 10px;
+        /* margin-bottom: 10px; */
+        margin: 10px 0;
       }
 
       .small-row {
@@ -121,11 +124,12 @@
     <div id="app">
       <div class="content" v-if="bigContent">
         <div>
-            <div class="left">
-          <img :src="tableData.codeUrl " alt="">
-        </div>
+      
         <div class="title">{{tableData.compName}}</div>
         <div class="title">粮食质检单</div>
+        <div class="left">
+          <img :src="tableData.codeUrl " alt="">
+        </div>
         </div>
       
         <div class="number">{{tableData.qualityNo}}</div>
@@ -165,7 +169,6 @@
             <td class="col">{{tableData.jiaorenli}}</td>
             <td v-if="tableData.confirm == '1'" class="col col-bgc">单价（元/公斤）</td>
             <td v-else class="col col-bgc">待定单价（元/公斤）</td>
-            <td class="col">{{tableData.tidalGrainPrice}}</td>
             <td class="col " v-if="tableData.type == '潮粮'">
               {{tableData.tidalGrainPrice}}
             </td>

public/static/payprint.html

@@ -52,7 +52,8 @@
         width: 80px;
         height: 80px;
         position: absolute;
-
+        right: 20px;
+        top: 3px;
       }
 
       .config {
@@ -72,6 +73,11 @@
         text-align: right;
         margin-bottom: 10px;
       }
+      .number1 {
+    text-align: right;
+    margin-bottom: 10px;
+    margin-top: 60px;
+}
 
       .small-row {
         display: flex;
@@ -409,11 +415,15 @@
               </div>
             </div>
             <div v-if="isShowPrintType4" class="part2">
-              <div class="leftimg">
+              <div style="height: 120px;">
+             
+                  <div class="title">入库检斤单</div>
+                  <div class="leftimg">
                     <img :src="printData1[index].weighingManagement.codeUrl" alt="">
                   </div>
-              <div class="title">入库检斤单</div>
-              <div class="number">{{printData1[index].weighingManagement.number}}</div>
+                  <div class="number1">{{printData1[index].weighingManagement.number}}</div>
+                </div>
+             
               <table class="table">
                 <tr class="row">
                   <td class="col col-bgc">客户姓名</td>
@@ -546,12 +556,9 @@
                 <img :src="customerList1[index].imgURl.imageUrl4" class="avatar" />
               </div>
             </div>
-
-
           </div>
         </div>
       </div>
-
       <div class="content" v-else>
         <div class="part5" v-if="isShowPrintType5">
           <div class="header1">
@@ -736,11 +743,14 @@
         </div>
 
         <div v-if="isShowPrintType4" class="part2">
+          <div>
+        
+          <div class="title">入库检斤单</div>
           <div class="leftimg">
             <img :src="tableData.codeUrl" alt="">
           </div>
-          <div class="title">入库检斤单</div>
-          <div class="number">{{tableData.number}}</div>
+          <div class="number1">{{tableData.number}}</div>
+        </div>
           <table class="table">
             <tr class="row">
               <td class="col col-bgc">客户姓名</td>

public/static/weightCheck.html

@@ -53,8 +53,9 @@
       img,.left{
         width: 120px;
         height: 120px;
-        /* margin-right: 118px; */
         position: absolute;
+        right: 20px;
+        top: -15px;
       }
 
       .config {
@@ -74,12 +75,13 @@
         text-align: center;
         font-size: 36px;
         font-weight: 500;
+        position: relative;
       }
 
       .number {
         text-align: right;
         margin-bottom: 10px;
-        margin-top: 20px;
+        margin-top: 30px;
       }
 
       .small-row {
@@ -131,11 +133,11 @@
       <div v-if="selectPrint">
         <div v-for="(item,index) in tableData1" :key="index">
           <div class="content" :class="pageType=='A5'?'a5-content':''">
+            <div class="title">{{item.compName}}</div>
+            <div class="title">入库检斤单</div>
             <div class="left">
               <img :src="item.codeUrl" alt="">
             </div>
-            <div class="title">{{item.compName}}</div>
-            <div class="title">入库检斤单</div>
             <div class="number">{{item.number}}</div>
             <table class="table">
               <tr class="row">
@@ -222,11 +224,12 @@
       </div>
       <div v-else>
         <div class="content" v-if="bigContent">
-         <div class="left">
-              <img :src="tableData.codeUrl" alt="">
-            </div>
+        
           <div class="title">{{tableData.compName}}</div>
           <div class="title">入库检斤单</div>
+          <div class="left">
+            <img :src="tableData.codeUrl" alt="">
+          </div>
           <div class="number">{{tableData.number}}</div>
           <table class="table">
             <tr class="row">

public/static/weightCheckOut.html

@@ -60,9 +60,11 @@
         margin-top: 10px;
         margin-right: 240px;
       }
-      .autograph{
-    margin-top: 10px;
-     }
+
+      .autograph {
+        margin-top: 10px;
+      }
+
       .bottom-row3 {
         margin: 10px 0;
       }
@@ -115,7 +117,8 @@
       .small-img {
         margin-right: 0;
       }
-      .sign{
+
+      .sign {
         margin-right: 100px;
       }
     </style>
@@ -124,22 +127,19 @@
     <div id="app">
       <div class="content" v-if="true">
         <div class="title">出库检斤单</div>
+        <div>{{tableData.updateDate}}</div>
         <table class="table">
           <tr class="row">
             <td class="col col-bgc">送货单位</td>
             <td class="col" colspan="4">{{tableData.seller}}</td>
-            <td class="col col-bgc">车牌号</td>
-            <td class="col" colspan="1">{{tableData.carNo}}</td>
             <td class="col col-bgc">货名</td>
-            <td class="col" colspan="1">{{tableData.goodsName}}</td>
+            <td class="col" colspan="4">{{tableData.goodsName}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">收货单位</td>
             <td class="col" colspan="4">{{tableData.buyer}}</td>
-            <td class="col col-bgc">类型</td>
-            <td class="col"colspan="1">{{tableData.type}}</td>
-            <td class="col col-bgc">检斤时间</td>
-            <td class="col" colspan="1">{{tableData.updateDate}}</td>
+            <td class="col col-bgc">检斤员</td>
+            <td class="col" colspan="4">{{tableData.backOffice}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">毛重（吨）</td>
@@ -149,11 +149,27 @@
             <td class="col col-bgc">净重（吨）</td>
             <td class="col" colspan="2">{{tableData.netWeight}}</td>
           </tr>
+          <tr class="row">
+            <td class="col col-bgc">运输方式</td>
+            <td class="col" colspan="2">{{tableData.outType}}</td>
+            <td class="col col-bgc" v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"'>车牌号</td>
+            <td class="col col-bgc" v-if='tableData.outType=="火运"'>车号</td>
+            <td class="col col-bgc" v-if='tableData.outType=="散船"'>船名</td>
+            <td class="col" colspan="2"
+              v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"||tableData.outType=="火运"'>{{tableData.carNo}}
+            </td>
+            <td class="col" colspan="2" v-if='tableData.outType=="散船"'>{{tableData.shipName}}</td>
+            <td class="col col-bgc" v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"'>箱号</td>
+            <td class="col col-bgc" v-if='tableData.outType=="火运"'>车厢号</td>
+            <td class="col col-bgc" v-if='tableData.outType=="散船"'>船次</td>
+            <td class="col" colspan="2" v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"'>
+              {{tableData.boxNo}},{{tableData.boxNoOther}}</td>
+            <td class="col" colspan="2" v-if='tableData.outType=="火运"'>
+              {{tableData.wingNumber}},{{tableData.wingNumberOther}}</td>
+            <td class="col" colspan="2" v-if='tableData.outType=="散船"'>{{tableData.shipNumber}}</td>
+          </tr>
         </table>
         <div class="bottom">
-          <div class="bottom-row1">
-            <div>检斤员：{{tableData.backOffice}}</div>
-          </div>
           <div class="bottom-row2">
             <div class="config">收货单位签名或盖章：</div>
             <div class="autograph">客户签名：</div>
@@ -213,11 +229,11 @@
           this.smallContent = true
           this.bigContent = false
         }
-        console.log(_data,"sddsd")
+        console.log(_data, "sddsd")
         this.tableData = JSON.parse(_data)
         console.log(this.tableData)
         document.title = "粮食检斤单"
-        window.print()
+        //window.print()
         window.onafterprint = function(event) {
           window.history.back(-1)
         };

src/layout/index/top/index.vue

@@ -342,7 +342,7 @@
     },
     methods: {
       ...mapActions('common', ['setLocalVessels']),
-      payCode() {debugger
+      payCode() {
         console.log("input", this.barCode)
         this.btnStatus = {
           status1: false,
@@ -396,7 +396,6 @@
         await getQRCodeData(tmp)
           .toPromise()
           .then((response) => {
-            debugger
             this.toPageData = response
             // 处理按钮显示状态
             // this.btnStatus 

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -1643,19 +1643,16 @@
 
   .bottom-btn {
     display: flex;
-
-    .left {
-      color: red;
-    }
-
     margin: 20px 0;
     justify-content: space-around;
     align-items: center;
+    .right{
+      width: 300px;
+      display: flex;
+    }
   }
   .white-bgc{
     background: white!important;
   }
-  #aaa::selection{
-    // background: red;
-  }
+
 </style>

src/views/houseSelfCollect/inspectInfo.vue

@@ -164,7 +164,7 @@
         </div>
       </ws-form>
     </div>
-    <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单" @close="closeDialog"
+    <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单" @opened='opendBtn' @close="closeDialog"
       :close-on-click-modal="false">
       <inspectInfoPrint :printData="inspect" ref="saveImg"></inspectInfoPrint>
       <div style="text-align:center">
@@ -362,7 +362,39 @@
                     // this.isName = false;
                 }
             },
-
+      opendBtn(){
+           html2canvas(this.$refs.saveImg.$el).then(canvas => {
+          let dataURL = canvas.toDataURL('image/png');
+          this.imgUrl = dataURL;
+          if (this.imgUrl !== '') {
+            let b = this.dataURLtoFile(this.imgUrl, 'printImg')
+            let formdata = new FormData();
+            formdata.append('file', b);
+            axios({
+              method: 'post',
+              url: 'https://www.zthymaoyi.com/upload/admin',
+              data: formdata
+            }).then((response) => {
+              //编辑接口
+              this.inspect.pictureAddress = response.data.url
+              console.log(this.types)
+              if (this.types == 3) {
+                this.inspect.flag = 0
+              } else if (this.types == 4) {
+                this.inspect.flag = 1
+              }
+              getinspectEdit(this.inspect)
+                .toPromise()
+                .then((response) => {
+                  this.types = ''
+                  // this.inspect = [] 
+              
+                })
+            })
+          }
+        })
+      },
+      
       closeDialog() {
         html2canvas(this.$refs.saveImg.$el).then(canvas => {
           let dataURL = canvas.toDataURL('image/png');

src/views/houseSelfCollect/settlement.vue

@@ -400,6 +400,7 @@
       :visible.sync="isShowPrint"
       :title="printData.compName+'结算凭证'"
        @close="closeDialog"
+       @opened = 'opendBtn'
        :modal-append-to-body = "false"
     >
       <paymentPrint :printData="printData" ref="saveImg"></paymentPrint>
@@ -455,6 +456,29 @@ export default {
     inputFocus(event){
       event.currentTarget.select()
     },
+    opendBtn(){
+            html2canvas(this.$refs.saveImg.$el).then((canvas) => {
+        let dataURL = canvas.toDataURL('image/png')
+        this.imgUrl = dataURL
+        if (this.imgUrl !== '' ) {
+          let b = this.dataURLtoFile(this.imgUrl, 'printImage')
+          let formdata = new FormData()
+          formdata.append('file', b)
+          axios({
+            method: 'post',
+            url: 'https://www.zthymaoyi.com/upload/admin',
+            data: formdata,
+          }).then((response) => {
+            //编辑接口
+            this.paymentList.pictureAddress = response.data.url
+            settlementEdit(this.paymentList)
+              .toPromise()
+              .then((response) => {})
+
+          })
+        }
+      })
+    },
     closeDialog(){
       html2canvas(this.$refs.saveImg.$el).then((canvas) => {
         let dataURL = canvas.toDataURL('image/png')

src/views/houseSelfCollect/weightCheck.vue

@@ -164,7 +164,7 @@
       </div>
 
     </div>
-    <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食检斤单" @close="closeDialog"
+    <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食检斤单" @opened = 'opendBtn' @close="closeDialog"
       :close-on-click-modal="false">
       <weightCheckPrint :tableData="inspect" ref="saveImg"></weightCheckPrint>
       <div style="text-align:center">
@@ -774,6 +774,28 @@
       printBig() {
         window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.inspect))
       },
+      opendBtn(){
+            html2canvas(this.$refs.saveImg.$el).then((canvas) => {
+          let dataURL = canvas.toDataURL('image/png')
+          this.imgUrl = dataURL
+          if (this.imgUrl !== '') {
+            let b = this.dataURLtoFile(this.imgUrl, 'printImage')
+            let formdata = new FormData()
+            formdata.append('file', b)
+            axios({
+              method: 'post',
+              url: 'https://www.zthymaoyi.com/upload/admin',
+              data: formdata,
+            }).then((response) => {
+              //编辑接口
+              this.weighingList.pictureAddress = response.data.url
+              tare(this.weighingList)
+                .toPromise()
+                .then((response) => {})
+            })
+          }
+        })
+      },
       closeDialog() {
         html2canvas(this.$refs.saveImg.$el).then((canvas) => {
           let dataURL = canvas.toDataURL('image/png')

src/views/tradeServicesManagement/approveWarehouseReceipt.vue

@@ -562,7 +562,7 @@ export default {
       if (!this.adoptText || this.adoptText.length > 50) {
         this.$message.error('审核意见不能为空且不能超出50字')
       } else {
-        this.deptBudgetList.amountToRepaid = this.deptBudgetList.amountDue
+        this.deptBudgetList.amountToRepaid = this.deptBudgetList.amountDue//设置待还金额
 		WarehouseReceiptUpdate(this.deptBudgetList)
         .toPromise()
         .then((response) => {

src/views/tradeServicesManagement/inOutRecord.vue

@@ -79,9 +79,12 @@
       <el-table-column prop="grossWeight" label="毛重（吨）"> 
         <template slot-scope="scope">{{scope.grossWeight}}</template>
       </el-table-column>
-      <el-table-column prop="tare" label="皮重（吨）">  </el-table-column>
-      <el-table-column prop="weight" label="扣重（吨）"> </el-table-column>
-      <el-table-column prop="netWeight" label="净重（吨）"> </el-table-column>
+      <el-table-column prop="tare" label="皮重（吨）"> 
+         </el-table-column>
+      <el-table-column prop="weight" label="扣重（吨）">
+      </el-table-column>
+      <el-table-column prop="netWeight" label="净重（吨）">
+       </el-table-column>
       <el-table-column prop="inOutType" label="类型"> </el-table-column>
       <el-table-column prop="addressUrl" label="磅单">
         <template scope="scope">
@@ -485,23 +488,21 @@ export default {
         .then((res) => {
           for (let i = 0; i < res.records.length; i++) {
             if (res.records[i].grossWeight) {
-              res.records[i].grossWeight *= 1000
+              res.records[i].grossWeight = Number(res.records[i].grossWeight * 1000).toFixed(3)
             }
             if (res.records[i].tare) {
-              res.records[i].tare *= 1000
+              res.records[i].tare = Number(res.records[i].tare * 1000).toFixed(3)
             }
             if (res.records[i].netWeight) {
-              res.records[i].netWeight *= 1000
+              res.records[i].netWeight = Number(res.records[i].netWeight*1000).toFixed(3)
+              
             }
             if (
               res.records[i].grossWeight &&
               res.records[i].tare &&
               res.records[i].netWeight
             ) {
-              res.records[i].weight =
-                res.records[i].grossWeight -
-                res.records[i].tare -
-                res.records[i].netWeight
+              res.records[i].weight = Number(res.records[i].grossWeight - res.records[i].tare -  res.records[i].netWeight).toFixed(3)
             } else {
               res.records[i].weight = null
             }

src/views/tradeServicesManagement/repayment.vue

@@ -183,8 +183,7 @@
       },
       //成功付款截图
       handleAvatarSuccess(e){
-         this.$refs.upload
-          .handleSaveBill()
+         this.$refs.upload.handleSaveBill()
           .then(async response => {
               this.stillMoney.repaymentScreenshot = response
           })
@@ -220,6 +219,7 @@
         this.$message.error("请上传附件！")
         return
       }
+      console.log("图片",this.stillMoney.repaymentScreenshot)
         this.$confirm('确定提交付款信息？', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -233,8 +233,9 @@
             repaymentSubmit(this.stillMoney).toPromise()
             .then((response) => {
               this.$message.success("还款成功！")
-              this.paymentForm = false
-              this.stillMoney = {}
+               this.stillMoney = {}
+               this.stillMoney.repaymentScreenshot = ""
+               this.paymentForm = false
               this.getList()
           })
           }).catch(() =>{
@@ -266,6 +267,7 @@
 				this.$router.go(-1)
 			},
 			payment() {
+        console.log(this.stillMoney.repaymentScreenshot)
 				this.paymentForm = true
 			},
 		},

src/views/tradeServicesManagement/warehouseReceiptAdd.vue

@@ -94,7 +94,7 @@
         </el-select>
       </el-form-item>
       <div>
-        <el-button @click='inoutput' type="primary">出入库记录</el-button>
+        <el-button @click='inoutput' type="primary" :disabled="!deptBudgetList.goodsName">出入库记录</el-button>
         <el-button @click='submit' type="primary">提交审核</el-button>
       </div>
       <!-- </ws-info-table> -->
@@ -122,14 +122,7 @@
     data() {
       return {
         deptBudgetList: {
-          warehouseName: '',
-          warehouseNo: '',
-          compId: '',
-          renown: '',
-          grade: '',
-          bank: '',
-          three: '',
-          goodsName:"",
+          grade:"二等"
         },
         size: 10,
         compId: '',
@@ -394,10 +387,10 @@
           this.$message.error('银行不能为空！');
           return false
         }
-        if (!this.deptBudgetList.three) {
-          this.$message.error('第三方不能为空！')
-          return false
-        }
+        // if (!this.deptBudgetList.three) {
+        //   this.$message.error('第三方不能为空！')
+        //   return false
+        // }
         return true
       },
       submit() {

src/views/tradeServicesManagement/warehouseReceiptEdit.vue

@@ -175,7 +175,7 @@
         </el-select>
       </el-form-item>
       <div>
-        <el-button @click="inoutput" type="primary">出入库记录</el-button>
+        <el-button @click="inoutput" type="primary" :disabled="!deptBudgetList.goodsName">出入库记录</el-button>
         <el-button @click="submit" type="primary">重新提交</el-button>
       </div>
       <div class="title1">审核记录</div>
@@ -486,10 +486,10 @@ export default {
           this.$message.error('银行不能为空！');
           return false
         }
-        if (!this.deptBudgetList.three) {
-          this.$message.error('第三方不能为空！')
-          return false
-        }
+        // if (!this.deptBudgetList.three) {
+        //   this.$message.error('第三方不能为空！')
+        //   return false
+        // }
         return true
       },
   },

src/views/tradeServicesManagement/warehouseReceiptLook.vue

@@ -259,8 +259,8 @@
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="审核结果">
           <template scope="scope">
-            <span v-if="scope.row.approved" >通过</span>
-            <span v-if="!scope.row.approved" >驳回</span>
+            <span v-if="scope.row.approved" style="color:#50CAD4">通过</span>
+            <span v-if="!scope.row.approved" style="color:#FF9F24">驳回</span>
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>

src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -58,6 +58,8 @@
             <el-button size="mini" v-hasPermission=" `tradeServicesManagement.tradeService.view`" @click="lookBtnClick(scope.row, 2)">
               查看</el-button>
             <el-button v-if="scope.row.taskId && scope.row.approveStatus=='待决策人审核'" size="mini" @click="toExamineBtnClick(scope.row, 2)">
+              审核</el-button>
+                <el-button v-if="scope.row.taskId && scope.row.approveStatus=='待第三方审核'" size="mini" @click="toExamineBtnClick(scope.row, 2)">
               审核</el-button>
             <el-button v-if="scope.row.taskId && scope.row.approveStatus=='待银行审批'" size="mini" @click="approveBtnClick(scope.row, 2)">
               审批</el-button>

src/views/warehouse/warehouseManagementTare.vue

@@ -990,14 +990,14 @@ export default {
         if (
           this.outContractNo[i].contractNo == this.deptBudgetList.contractNo
         ) {
-          this.weightbills.buyer=this.outContractNo[i].buyer
-          this.weightbills.seller=localStorage.getItem('ws-pf_compName')
           this.weightbills.goodsName=this.outContractNo[i].goodsName
           this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
           this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
           this.deptBudgetList.grade = this.outContractNo[i].grade
           this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
           if (this.outContractNo[i].inOutType == '销售出库') {
+          this.weightbills.buyer=this.outContractNo[i].buyer
+          this.weightbills.seller=localStorage.getItem('ws-pf_compName')
             if(!this.outContractNo[i].unitContractPrice){
               this.deptBudgetList.tips =
               '买方' +
@@ -1012,6 +1012,9 @@ export default {
             }
             this.deptBudgetList.inOutTypeKey = 1
           } else if (this.outContractNo[i].inOutType == '移库出库') {
+            
+          this.weightbills.buyer=this.outContractNo[i].receiveWarehouse
+          this.weightbills.seller=this.outContractNo[i].sendWarehouse
             this.deptBudgetList.goodsName = data.goodsName
             this.deptBudgetList.goodsNameKey = data.goodsNameKey
             this.deptBudgetList.grade = data.grade
@@ -1901,7 +1904,6 @@ export default {
               localStorage.getItem('ws-pf_staffName')
             this.deptBudgetList.inOutFlag = 1
             this.deptBudgetList.statusFlag = 3
-            
             addstorageputList(this.deptBudgetList)
               .toPromise()
               .then((response) => {
@@ -1911,12 +1913,21 @@ export default {
                 this.$message.success('添加成功')
                 if(status){
                     this.weightbills.carNo=this.deptBudgetList.carNo
+                    this.weightbills.boxNo=this.deptBudgetList.boxNo
+                    this.weightbills.boxNoOther=this.deptBudgetList.boxNoOther
+                    this.weightbills.wingNumber=this.deptBudgetList.wingNumber
+                    this.weightbills.wingNumberOther=this.deptBudgetList.wingNumberOther
+                    this.weightbills.shipName=this.deptBudgetList.shipName
+                    this.weightbills.shipNumber=this.deptBudgetList.shipNumber
                     this.weightbills.type=this.deptBudgetList.type
                     this.weightbills.grossWeight=this.deptBudgetList.grossWeight
                     this.weightbills.tare=this.deptBudgetList.tare
                     this.weightbills.netWeight=this.deptBudgetList.netWeight
+                    this.weightbills.outType=this.deptBudgetList.outType
+                    this.weightbills.backOffice=this.deptBudgetList.outType
+
                     var date=new Date()
-                    this.weightbills.updateDate=date.getFullYear()+'-'+(date.getMonth()+1)+'-'+date.getDate()+' '+date.getHours()+date.getMinutes()+date.getSeconds()
+                    this.weightbills.updateDate=date.getFullYear()+'-'+(date.getMonth()+1)+'-'+date.getDate()+' '+date.getHours()+':'+date.getMinutes()+':'+date.getSeconds()
                     window.open( '../../../../static/weightCheckOut.html?type=2&tableData=' +encodeURIComponent(JSON.stringify(this.weightbills)))
                 }
                 this.$router.push({