gjy 3 лет назад
Родитель
Сommit
bb0ce4146c

+ 0 - 1
public/static/outWeightPrint.html

@@ -217,7 +217,6 @@
                     <div class="autograph">客户签名:</div>
                     <div class="autograph">司机签名:</div>
                 </div>
-                <div class="bottom-row3">扫一扫</div>
             </div>
         </div>
         <div class="small-content" v-if="smallContent">

+ 2 - 0
src/components/balanceAlert.vue

@@ -77,6 +77,7 @@ export default {
         }
         // 监听来自串行设备的数据
         while (true) {
+          
           const { value, done } = await this.reader.read()
           // console.log('value',value);
           if (done) {
@@ -149,6 +150,7 @@ export default {
                 result += tmp
               }
             }
+            debugger
             if (this.information.indexOf('毛重') > -1) {
               if (parseInt(result) || parseInt(result) == 0) {
                 this.grossWeightVal = parseInt(result)

+ 8 - 8
src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -410,7 +410,7 @@
         customerName:'',
         customerPhone:'',
         deptBudgetList:{
-          type: '潮粮',
+          type: '',
           freight: 0,
           cost: '',
           addressUrl: '',
@@ -791,7 +791,7 @@
                   // this.inspect = [] 
                   this.isShowPrint = false
                   this.deptBudgetList={
-                    type: '潮粮',
+                    type: '',
                     freight: 0,
                     cost: '',
                     addressUrl: '',
@@ -877,7 +877,7 @@
                 type: 'success',
               })
               this.deptBudgetList={
-                type: '潮粮',
+                type: '',
                 freight: 0,
                 cost: '',
                 addressUrl: '',
@@ -1046,7 +1046,7 @@
       add(){
         this.outType=''
         this.deptBudgetList={
-          type: '潮粮',
+          type: '',
           freight: 0,
           cost: '',
           addressUrl: '',
@@ -1148,7 +1148,7 @@
                       if(response == 'OK'){
                       this.$message.success('提交成功')
                       this.deptBudgetList={
-                        type: '潮粮',
+                        type: '',
                         freight: 0,
                         cost: '',
                         addressUrl: '',
@@ -1941,7 +1941,7 @@
                         }
                         this.$message.success('修改成功')
                         this.deptBudgetList={
-                          type: '潮粮',
+                          type: '',
                           freight: 0,
                           cost: '',
                           addressUrl: '',
@@ -2012,7 +2012,7 @@
                       }
                       this.$message.success('修改成功')
                       this.deptBudgetList={
-                        type: '潮粮',
+                        type: '',
                         freight: 0,
                         cost: '',
                         addressUrl: '',
@@ -2332,7 +2332,7 @@
               this.taskNolist = response
             })
             this.deptBudgetList={
-          type: '潮粮',
+          type: '',
           freight: 0,
           cost: '',
           addressUrl: '',

+ 7 - 1
src/views/houseSelfCollect/newWeighingManagement.vue

@@ -376,6 +376,9 @@
         inOutDate: {},
         idPrint:'',
         ewCustomerOptions: [{
+            value: '中央储备粮宾县直属库有限公司',
+            label: '中央储备粮宾县直属库有限公司'
+          },{
             value: '黑龙江利润元粮食贸易有限公司',
             label: '黑龙江利润元粮食贸易有限公司'
           }, {
@@ -476,6 +479,8 @@
             this.monitorUrl1 = this.warehouseList[0].monitorUrl1
             this.monitorUrl2 = this.warehouseList[0].monitorUrl2
           }
+          
+          this.deptBudgetList.warehouseName = this.warehouseName
           if (this.allowEdit == 0) {
             this.disabled = true
           } else if (this.allowEdit == 1) {
@@ -589,6 +594,7 @@
         this.getList()
       },
       setVal(data) {
+        debugger
         if (this.information == '毛重') {
           this.weighingList.grossWeight = data
         } else {
@@ -648,7 +654,7 @@
           getweighingList({
             compId: localStorage.getItem('ws-pf_compId'),
             currentPage: this.currentPage,
-            pageSize: 9999,
+            pageSize: 99,
             searchKeyWord: '',
             warehouseName: this.warehouseName,
             managementType: 1,

+ 3 - 0
src/views/houseSelfCollect/weightCheckRecord.vue

@@ -171,6 +171,9 @@
         title:'',
         modification:[],
         ewCustomerOptions: [{
+            value: '中央储备粮宾县直属库有限公司',
+            label: '中央储备粮宾县直属库有限公司'
+          },{
             value: '黑龙江利润元粮食贸易有限公司',
             label: '黑龙江利润元粮食贸易有限公司'
           }, {

+ 1 - 1
src/views/outboundManagement/weighingManagementNew.vue

@@ -1392,7 +1392,7 @@
                 'YKCK' +
                 this.getTime() +
                 this.warehouseNo +
-                this.warehouseCount.substring(this.warehouseCount.length - 4)
+                num.substring(num.length - 4,num.length)
               this.weighingList.buyer = this.outContractNo[i].receiveWarehouse
               this.weighingList.seller = this.outContractNo[i].sendWarehouse
               this.weighingList.goodsName = data.goodsName