ccj 2 年之前
父節點
當前提交
b79a838c91
共有 3 個文件被更改,包括 31 次插入23 次删除
  1. 7 7
      public/static/printdry.html
  2. 1 1
      src/views/warehousenew/dryRecord.vue
  3. 23 15
      src/views/warehousenew/dryWarehousing.vue

+ 7 - 7
public/static/printdry.html

@@ -164,7 +164,7 @@
                   </tr>
                   </tr>
                   <tr class="row">
                   <tr class="row">
                       <td colspan="3" class="col col-bgc">收货单位</td>
                       <td colspan="3" class="col col-bgc">收货单位</td>
-                      <td class="col" colspan="5"></td>
+                      <td class="col" colspan="5">{{print_company_name}}</td>
                   </tr>
                   </tr>
                   <tr class="row">
                   <tr class="row">
                       <td class="col col-bgc">货名</td>
                       <td class="col col-bgc">货名</td>
@@ -203,13 +203,13 @@
                   </tr>
                   </tr>
                   <tr class="row">
                   <tr class="row">
                       <td class="col col-bgc">毛重(公斤)</td>
                       <td class="col col-bgc">毛重(公斤)</td>
-                      <td class="col">{{printData.grossWeight}}</td>
+                      <td class="col">{{printData.grossWeight*1000}}</td>
                       <td class="col col-bgc">皮重(公斤)</td>
                       <td class="col col-bgc">皮重(公斤)</td>
-                      <td class="col">{{printData.tare}}</td>
+                      <td class="col">{{printData.tare*1000}}</td>
                       <td class="col col-bgc">扣重(公斤)</td>
                       <td class="col col-bgc">扣重(公斤)</td>
                       <td style="width:50px;" class="col">0</td>
                       <td style="width:50px;" class="col">0</td>
                       <td class="col col-bgc">净重(公斤)</td>
                       <td class="col col-bgc">净重(公斤)</td>
-                      <td class="col">{{printData.netWeight}}</td>
+                      <td class="col">{{printData.netWeight*1000}}</td>
                       <!-- <td class="col " colspan="2"></td> -->
                       <!-- <td class="col " colspan="2"></td> -->
 
 
                   </tr>
                   </tr>
@@ -302,13 +302,13 @@
                 </tr>
                 </tr>
                 <tr class="row">
                 <tr class="row">
                     <td class="col col-bgc">毛重(公斤)</td>
                     <td class="col col-bgc">毛重(公斤)</td>
-                    <td class="col">{{printData.grossWeight}}</td>
+                    <td class="col">{{printData.grossWeight*1000}}</td>
                     <td class="col col-bgc">皮重(公斤)</td>
                     <td class="col col-bgc">皮重(公斤)</td>
-                    <td class="col">{{printData.tare}}</td>
+                    <td class="col">{{printData.tare*1000}}</td>
                     <td class="col col-bgc">扣重(公斤)</td>
                     <td class="col col-bgc">扣重(公斤)</td>
                     <td style="width:50px;" class="col">0</td>
                     <td style="width:50px;" class="col">0</td>
                     <td class="col col-bgc">净重(公斤)</td>
                     <td class="col col-bgc">净重(公斤)</td>
-                    <td class="col">{{printData.netWeight}}</td>
+                    <td class="col">{{printData.netWeight*1000}}</td>
                     <!-- <td class="col " colspan="2"></td> -->
                     <!-- <td class="col " colspan="2"></td> -->
 
 
                 </tr>
                 </tr>

+ 1 - 1
src/views/warehousenew/dryRecord.vue

@@ -456,7 +456,7 @@ export default {
         }else{
         }else{
           this.printData.extra2=false
           this.printData.extra2=false
         }
         }
-        localStorage.setItem('printdrydata',JSON.str(this.printData))
+        localStorage.setItem('printdrydata',JSON.stringify(this.printData))
             window.open(
             window.open(
               '../../../../../static/printdry.html?type=2&printTypeList=结算凭证'
               '../../../../../static/printdry.html?type=2&printTypeList=结算凭证'
             )
             )

+ 23 - 15
src/views/warehousenew/dryWarehousing.vue

@@ -27,7 +27,7 @@
                     </div>
                     </div>
                     <div class="confirmInfo">
                     <div class="confirmInfo">
                         <div class="car-type">车牌号</div>
                         <div class="car-type">车牌号</div>
-                        <div class="car-no">{{ weighingList.carNumber }}</div>
+                        <div class="car-no">{{ weighingList.carNo }}</div>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="bg-left titleup">
                 <div class="bg-left titleup">
@@ -181,12 +181,16 @@ export default {
             taskNolist: [],
             taskNolist: [],
             deliveryList: [],
             deliveryList: [],
             warehouseType: 1,
             warehouseType: 1,
-            weighingList: {},
+            weighingList: {
+                grossWeight: '',
+                tare: '',
+                netWeight: 0
+            },
             deptBudgetList: {},
             deptBudgetList: {},
             warehouseList: [],
             warehouseList: [],
             goodsNameList: [],
             goodsNameList: [],
             carList: [],
             carList: [],
-            index: '',
+            index: 1,
             monitorUrl1: '',
             monitorUrl1: '',
             monitorUrl2: '',
             monitorUrl2: '',
             deptBudgetTotal: 0,
             deptBudgetTotal: 0,
@@ -241,10 +245,10 @@ export default {
             for (let i = 0; i < this.carList.length; i++) {
             for (let i = 0; i < this.carList.length; i++) {
                 if (e == this.carList[i].id) {
                 if (e == this.carList[i].id) {
                     this.weighingList.carNo = this.carList[i].carNo
                     this.weighingList.carNo = this.carList[i].carNo
-                    this.weighingList.tare = this.carList[i].tare
-                    if (this.weighingList.grossWeight) {
-                        this.weighingList.netWeight = this.weighingList.grossWeight - this.weighingList.tare
-                    }
+                    // this.weighingList.tare = this.carList[i].tare
+                    // if (this.weighingList.grossWeight) {
+                    //     this.weighingList.netWeight = this.weighingList.grossWeight - this.weighingList.tare
+                    // }
                     break
                     break
                 }
                 }
             }
             }
@@ -276,12 +280,16 @@ export default {
             this.getList()
             this.getList()
         },
         },
         setVal(data) {
         setVal(data) {
+            debugger
+            data = 1000
             if (this.information == '毛重') {
             if (this.information == '毛重') {
                 this.weighingList.grossWeight = data
                 this.weighingList.grossWeight = data
                 this.weighingList.netWeight =
                 this.weighingList.netWeight =
                     Number(this.weighingList.grossWeight) - Number(this.weighingList.tare)
                     Number(this.weighingList.grossWeight) - Number(this.weighingList.tare)
             } else {
             } else {
                 this.weighingList.tare = data
                 this.weighingList.tare = data
+                this.weighingList.netWeight =
+                    Number(this.weighingList.grossWeight) - Number(this.weighingList.tare)
             }
             }
         },
         },
         openPort() {
         openPort() {
@@ -310,14 +318,14 @@ export default {
             }
             }
         },
         },
         submit() {
         submit() {
-            var allow = hasPermission('warehouseManagement.warehouse.warehouseInfo.hong')
-            if (!allow) {// 提交为外勤权限,错误提示“暂未获得权限”
-                this.$message({
-                    message: '暂未获得权限,不可保存检斤信息!',
-                    type: 'warning',
-                })
-                return
-            }
+            // var allow = hasPermission('warehouseManagement.warehouse.warehouseInfo.hong')
+            // if (!allow) {// 提交为外勤权限,错误提示“暂未获得权限”
+            //     this.$message({
+            //         message: '暂未获得权限,不可保存检斤信息!',
+            //         type: 'warning',
+            //     })
+            //     return
+            // }
             this.weighingList.compId = localStorage.getItem('ws-pf_compId')
             this.weighingList.compId = localStorage.getItem('ws-pf_compId')
             this.weighingList.weigher = localStorage.getItem('ws-pf_staffName')
             this.weighingList.weigher = localStorage.getItem('ws-pf_staffName')
             this.weighingList.warehouseName = this.warehouseName
             this.weighingList.warehouseName = this.warehouseName