zhongtianhaoyuan 3 years ago
parent
commit
1a11466bbf

+ 0 - 1
public/static/payprint.html

@@ -54,7 +54,6 @@
         position: absolute;
         right: 20px;
         top: 3px;
-
       }
 
       .config {

+ 1 - 1
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) => {

+ 11 - 10
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
             }

+ 6 - 4
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
 			},
 		},

+ 1 - 8
src/views/tradeServicesManagement/warehouseReceiptAdd.vue

@@ -122,14 +122,7 @@
     data() {
       return {
         deptBudgetList: {
-          warehouseName: '',
-          warehouseNo: '',
-          compId: '',
-          renown: '',
-          grade: '',
-          bank: '',
-          three: '',
-          goodsName:"",
+          grade:"二等"
         },
         size: 10,
         compId: '',

+ 2 - 2
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>