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

# Conflicts:
#	src/views/houseSelfCollect/paymentManagement.vue

public/static/iconfont/demo_index.html

@@ -54,6 +54,24 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe615;</span>
+                <div class="name">kehuzijin</div>
+                <div class="code-name">&amp;#xe615;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe614;</span>
+                <div class="name">shougou</div>
+                <div class="code-name">&amp;#xe614;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe613;</span>
+                <div class="name">chukuguanli备份</div>
+                <div class="code-name">&amp;#xe613;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe612;</span>
                 <div class="name">gongzuotongzi</div>
@@ -192,9 +210,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1629941156348') format('woff2'),
-       url('iconfont.woff?t=1629941156348') format('woff'),
-       url('iconfont.ttf?t=1629941156348') format('truetype');
+  src: url('iconfont.woff2?t=1635728227466') format('woff2'),
+       url('iconfont.woff?t=1635728227466') format('woff'),
+       url('iconfont.ttf?t=1635728227466') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -220,6 +238,33 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-kehuzijin"></span>
+            <div class="name">
+              kehuzijin
+            </div>
+            <div class="code-name">.icon-kehuzijin
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-a-4-shougoubeifen"></span>
+            <div class="name">
+              shougou
+            </div>
+            <div class="code-name">.icon-a-4-shougoubeifen
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-chukuguanlibeifen"></span>
+            <div class="name">
+              chukuguanli备份
+            </div>
+            <div class="code-name">.icon-chukuguanlibeifen
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-a-tongzhibeifen2"></span>
             <div class="name">
@@ -427,6 +472,30 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-kehuzijin"></use>
+                </svg>
+                <div class="name">kehuzijin</div>
+                <div class="code-name">#icon-kehuzijin</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-a-4-shougoubeifen"></use>
+                </svg>
+                <div class="name">shougou</div>
+                <div class="code-name">#icon-a-4-shougoubeifen</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-chukuguanlibeifen"></use>
+                </svg>
+                <div class="name">chukuguanli备份</div>
+                <div class="code-name">#icon-chukuguanlibeifen</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-a-tongzhibeifen2"></use>

public/static/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2554236 */
-  src: url('iconfont.woff2?t=1629941156348') format('woff2'),
-       url('iconfont.woff?t=1629941156348') format('woff'),
-       url('iconfont.ttf?t=1629941156348') format('truetype');
+  src: url('iconfont.woff2?t=1635728227466') format('woff2'),
+       url('iconfont.woff?t=1635728227466') format('woff'),
+       url('iconfont.ttf?t=1635728227466') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-kehuzijin:before {
+  content: "\e615";
+}
+
+.icon-a-4-shougoubeifen:before {
+  content: "\e614";
+}
+
+.icon-chukuguanlibeifen:before {
+  content: "\e613";
+}
+
 .icon-a-tongzhibeifen2:before {
   content: "\e612";
 }

public/static/iconfont/iconfont.json

@@ -5,6 +5,27 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "25314150",
+      "name": "kehuzijin",
+      "font_class": "kehuzijin",
+      "unicode": "e615",
+      "unicode_decimal": 58901
+    },
+    {
+      "icon_id": "25314041",
+      "name": "shougou",
+      "font_class": "a-4-shougoubeifen",
+      "unicode": "e614",
+      "unicode_decimal": 58900
+    },
+    {
+      "icon_id": "25314040",
+      "name": "chukuguanli备份",
+      "font_class": "chukuguanlibeifen",
+      "unicode": "e613",
+      "unicode_decimal": 58899
+    },
     {
       "icon_id": "23871028",
       "name": "gongzuotongzi",

public/static/payprint.html

@@ -124,7 +124,7 @@
       }
       .header1 {
         font-size: 24px;
-        margin: 60px 60px 10px 60px;
+        margin: 30px 60px 10px 60px;
         display: flex;
         justify-content: center;
       }
@@ -194,11 +194,11 @@
             <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
           </div>
           <div class="header-top">
-            <div>单位：公斤、元</div>
+            <div>单位：公斤/元</div>
             <div>No.</div>
           </div>
           <div class="header-top">
-            <div>开票日期：{{printData.currentTime}}</div>
+            <div>开票日期：{{printData.createDate}}</div>
             <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
             <div class="number">{{dealNo(printData.paymentNo)}}</div>
           </div>

src/api/V2/houseSelfCollect/index.js

@@ -27,7 +27,7 @@ export const API_POST_CUSTOMER_EDIT = '/identityAuthenticationInfo/api/editIdent
 //客户获取验证码
 export const API_GET_CUSTOMER_CODE = '/commonUser/sendVerifyCode'
 //客户验证码校验
-export const API_GET_CUSTOMER_CODEJY = '/commonUser/loginVerifyCode'
+export const API_GET_CUSTOMER_CODEJY = '/commonUser/checkVerifyCode'
 //质检添加
 export const API_POST_INSPECT_ADD = '/qualityInspectionManagement/api/addQualityInspection'
 //质检仓位下拉
@@ -83,4 +83,4 @@ export const API_GET_INSPECT_GETDRYGRAINPRICE = '/purchasePrice/dryGrainPrice'
 //付款权限查询
 export const API_GET_INSPECT_GETJURISDICTION = '/paymentManagement/selectTaskId'
 //财务开票
-export const API_POST_INVOICING = '/paymentManagement/readXmlManagement'
+export const API_GET_INVOICING = '/paymentManagement/readXmlManagement'

src/components/mapdrag/mapdrag.vue

@@ -215,6 +215,7 @@ export default {
             that.marker.setPosition(e.poi.location)
             placeSearch.search() // 关键字查询查询
             geocoder.getAddress(e.poi.location, function (status, result) {
+              console.log(e.poi.location,"klokolkjolk")
               if (status === 'complete') {
                 var obj = {}
                 that.province = result.regeocode.addressComponent.province

src/model/houseSelfCollect/index.js

@@ -43,7 +43,7 @@ import {
   API_GET_CUSTOMER_CODEJY,
   API_GET_INSPECT_GETDRYGRAINPRICE,
   API_GET_INSPECT_GETJURISDICTION,
-  API_POST_INVOICING
+  API_GET_INVOICING
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -130,4 +130,4 @@ export const getDryGrainPrice = appRx.get(API_GET_INSPECT_GETDRYGRAINPRICE, erro
 //付款权限查询
 export const getJurisdiction  = appRx.get(API_GET_INSPECT_GETJURISDICTION, errorCatcher, errorHandle, filter)
 //财务开票
-export const invoicing  = appRx.post(API_POST_INVOICING, errorCatcher, errorHandle, filter)
+export const invoicing  = appRx.get(API_GET_INVOICING, errorCatcher, errorHandle, filter)

src/views/customerFundManagement/component/router/router.js

@@ -9,7 +9,7 @@ const customerFundManagementRouter = {
     meta: {
       title: 'customerFundList',
     //   module: 'customerManagement.customer.customerInfo',
-      icon: '-kehuguanli'
+      icon: '-kehuzijin'
     },
     children: [
         //客户资金管理列表

src/views/houseSelfCollect/component/routers/route.js

@@ -9,7 +9,7 @@ const houseSelfCollectRouter = {
   meta: {
     title: 'houseSelfCollect',
     module: 'acquisitionManagement',
-    icon: '-hetongguanli'
+    icon: '-a-4-shougoubeifen'
   },
   children: [
     // 客户管理

src/views/houseSelfCollect/inspectInfo.vue

@@ -62,7 +62,7 @@
                 disabled />
             </ws-form-item>
             <ws-form-item label="类型" span="1" prop="type">
-              <ws-select v-model="inspect.type" disabled @change="typeChange">
+              <ws-select v-model="inspect.type" :disabled="disabled2" @change="typeChange">
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
               </ws-select>
             </ws-form-item>
@@ -71,7 +71,7 @@
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="净重单价（元/公斤）" span="1" prop="tidalGrainPrice" v-if="inspect.type == '潮粮'">
-              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价" maxlength="10" size="small" disabled />
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价" maxlength="10" size="small" :disabled="disabled2" />
             </ws-form-item>
             <ws-form-item label="干粮单价（元/公斤）" span="1" prop="dryGrainPrice" v-if="inspect.type == '干粮'">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.dryGrainPrice" placeholder="请输入干粮单价" maxlength="10" size="small"  :disabled="disabled" />
@@ -163,6 +163,7 @@
     data() {
       return {
         isShowPrint: false,
+        customerList1:[],
         // warehouseList: {},
         inspect: {
           tidalGrainPrice: 0,
@@ -174,6 +175,7 @@
         },
         disabled: false,
         disabled1: false,
+        disabled2: false,
         types: '1',
         information: '添加初检',
         goodNameList: [],
@@ -191,11 +193,18 @@
         imgUrl:'',
         printData:{},
         num:0,
-        tipFlag:true
+        tipFlag:true,
+        allowEdit:0,
       }
     },
     activated() {
       this.types = this.$route.query.type
+      this.allowEdit = this.$route.query.allowEdit
+      if (this.allowEdit == 0) {
+        this.disabled2 = true
+      } else if (this.allowEdit == 1) {
+        this.disabled2 = false
+      }
       if(!this.types){
           this.types = 1
            this.information = '添加初检'
@@ -679,6 +688,12 @@
       customerChange(e) {
         let customers = e.split('(')
         this.inspect.customerName = customers[0]
+        for (let i = 0; i < this.customerList1.length; i++) {
+          console.log(this.customerList1[i].customerName,this.inspect.customerName)
+          if(this.customerList1[i].customerName==this.inspect.customerName){
+            this.inspect.customerNumberCard=this.customerList1[i].customerNumberCard
+          }
+        }
         this.inspect.customerPhone = customers[1].split(')')[0]
         if(this.inspect.goodsName && this.inspect.customerName){
           // //查看当前用户对应货名有未结算状态的送货
@@ -687,6 +702,7 @@
           compId: sessionStorage.getItem('ws-pf_compId'),
           customerName: this.inspect.customerName,
           goodsName: this.inspect.goodsName,
+          customerNumberCard:this.inspect.customerNumberCard
         })  .toPromise()
           .then((response) => {
                count = response
@@ -696,6 +712,7 @@
           compId: sessionStorage.getItem('ws-pf_compId'),
           customerName: this.inspect.customerName,
           goodsName: this.inspect.goodsName,
+          customerNumberCard:this.inspect.customerNumberCard
         })
           .toPromise()
           .then((response) => {
@@ -767,6 +784,7 @@
           compId: sessionStorage.getItem('ws-pf_compId'),
           customerName: this.inspect.customerName,
           goodsName: this.inspect.goodsName,
+          customerNumberCard:this.inspect.customerNumberCard
         })  .toPromise()
           .then((response) => {
                count = response
@@ -776,6 +794,7 @@
           compId: sessionStorage.getItem('ws-pf_compId'),
           customerName: this.inspect.customerName,
           goodsName: this.inspect.goodsName,
+          customerNumberCard:this.inspect.customerNumberCard
         })
           .toPromise()
           .then((response) => {
@@ -818,6 +837,7 @@
           })
           .toPromise()
           .then((response) => {
+            this.customerList1=response
             this.customerList = []
             let customer = response
             for (let i = 0; i < response.length; i++) {

src/views/houseSelfCollect/paymentManagement.vue

@@ -125,7 +125,7 @@
           <span v-else>{{ scope.row.status }}</span>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="200">
+      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="260">
         <template scope="scope">
           <span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
             <el-button
@@ -136,11 +136,7 @@
                   "
               @click="settlement(1, scope.row)"
             >结算</el-button>
-
-            <!-- <el-button
             
-              @click="settlement(1, scope.row)"
-            >结算</el-button> -->
           </span>
 
           <el-button
@@ -338,15 +334,16 @@ export default {
   },
   methods: {
     invoicingClick(){
-      let data = JSON.stringify(this.modification)
-      console.log("开票",this.modification)
+      let data = JSON.stringify({
+        paymentManagement :this.modification
+      })
+      console.log('开票',data)
       //开票
-        invoicing(data)
-        .toPromise()
-        .then(response => {
-          console.log(response)
-    
-        })
+      invoicing(data)
+      .toPromise()
+      .then(response => {
+        console.log(response)
+      })
     },
     selectType(val) {
       console.log(val)
@@ -505,7 +502,8 @@ export default {
         searchKeyWord: this.searchKeyWord,
         searchType: searchParam,
         warehouseName: this.warehouseName,
-        managementType: 1
+        managementType: 1,
+        compId: sessionStorage.getItem('ws-pf_compId')
       })
         .toPromise()
         .then(response => {

src/views/houseSelfCollect/weightCheck.vue

@@ -203,7 +203,7 @@
           tare: 0,
           buckleMiscellaneous: 0,
         },
-        tpyeNo: '',
+        tpyeNo: 1,
         disabled: true,
         relationId: '',
         warehouseId: '',
@@ -216,7 +216,9 @@
         monitorUrl2: '',
         cangid: '',
         paramType: '1',
-        warehouseName: ''
+        warehouseName: '',
+        result1: '00',
+        allowEdit:0
       }
     },
     activated() {
@@ -450,6 +452,7 @@
             // var receData = HexConvert.ByteToString(value);
             // console.log("receData",receData);
             var flag = false;
+            var flag1 = false;
             if (this.warehouseName && this.warehouseName == '山东诸城迈饶库') {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
@@ -470,31 +473,38 @@
                 }
               }
             } else {
-              for (var i = 0; i < value.length; i++) {
+              for(var i=0;i<value.length;i++){
                 var tmp = String.fromCharCode(value[i])
-                if (value[0] != 49 && value[0] != 2) {
-                  break
+                
+                if((value[0] != 49 && value[0] != 2)){
+                  if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                    flag1 = true
+                  }
+                  else{
+                    break
+                  }
                 }
-                if (tmp == String.fromCharCode(32)) {
+                if (tmp == String.fromCharCode(32) ) {
                   flag = true
                 }
-                if (flag && result.length < 7 && tmp != String.fromCharCode(32)) {
-                  // if(i-1 >=0 &&tmp == String.fromCharCode(48) && value[i-1] == 32){
-                  //   continue
-                  // }
-                  // if(i-2 >=0 &&tmp == String.fromCharCode(48) && value[i-2] == 32){
-                  //   continue
-                  // }
+                if (flag && result.length < 7 && tmp != String.fromCharCode(32)&&!(value[value.length-1] == 48&&value[value.length-2] == 48)) {
                   result += tmp
                 }
+                if (flag1 && tmp != String.fromCharCode(32)) {
+                  if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                    if(i == 0 ){
+                      this.result1 = tmp + '0'
+                    }
+                  }
+                }
               }
               if (this.tpyeNo != 2) {
                 if (parseInt(result) || parseInt(result) == 0) {
-                  this.weighingList.grossWeight = parseInt(result) * 100
+                  this.weighingList.grossWeight =  parseInt(result+this.result1)
                 }
               } else {
                 if (parseInt(result) || parseInt(result) == 0) {
-                  this.weighingList.tare = parseInt(result) * 100
+                  this.weighingList.tare =  parseInt(result+this.result1)
                 }
               }
             }

src/views/outboundManagement/component/route.js

@@ -9,7 +9,7 @@ const outboundManagementRouter = {
     meta: {
         title: 'outboundManagement',
         module: 'outbound',
-        icon: '-hetongguanli'
+        icon: '-chukuguanlibeifen'
     },
     children: [
         // 检斤管理

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -543,7 +543,7 @@
 				this.stockSaleReceiptReport.money = this.money
 				this.stockSaleReceiptReport.collectionDate = this.collectionDate
 				if (
-					this.money < 0 ||
+					this.money == 0 ||
 					(String(this.money).indexOf('.') != -1 &&
 						String(this.money).length - (String(this.money).indexOf('.') + 1) >
 						2)
@@ -570,13 +570,13 @@
 					})
 					return
 				}
-				if (this.money > this.uncollectedAmount) {
+				if (this.money >= 0&&this.money > this.uncollectedAmount) {
 					this.$message({
 						message: '收款金额不能大于未收金额！',
 						type: 'warning',
 					})
 					return
-				}
+			    }
 				this.$confirm(`确定提交收款信息？`, {
 					cancelButtonText: '取消',
 					confirmButtonText: '确定',

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -219,6 +219,7 @@
             @change="(val) => {engflagchange(val, index)}"
             class="endflag"
             true-label="1"
+            :disabled='disabled'
             false-label="0"
             v-model="item.endFlag"
             :label="1"
@@ -415,6 +416,7 @@ export default {
     let self = this
     return {
       checkList: [],
+      disabled:false,
       deptBudgetList: {
         taskNo: '',
         totalStorage: 0,
@@ -596,6 +598,20 @@ export default {
       this.deptBudgetList.tranProcessInfoList[0].weight = e
     },
     engflagchange(e, index) {
+      this.$confirm('选择结算阶段后不可修改，是否确定选择？', {
+          distinguishCancelAndClose: true,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消'
+        })
+          .then(() => {
+            this.$message({
+              type: 'success',
+              message: '选择成功'
+            });
+            this.disabled=true
+          })
+          .catch(action => {
+          });
       for(var i=0;i<this.deptBudgetList.tranProcessInfoList.length;i++){
         this.deptBudgetList.tranProcessInfoList[i].endFlag='0'
       }

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -219,6 +219,7 @@
           <el-checkbox
             @change="(val) => {engflagchange(val, index)}"
             class="endflag"
+            :disabled='disabled'
             true-label="1"
             false-label="0"
             v-model="item.endFlag"
@@ -400,6 +401,7 @@ import {
   xialaNo,
   examinetran,
   delhaulagestage,
+  
   getstaff
 } from '@/model/tasksport/index'
 import WsUpload from '@/components/WsUpload'
@@ -426,6 +428,7 @@ export default {
       radio: '1',
       carModelList: [],
       carLengthList: [],
+      disabled:false,
       warehouseType: '1',
       options_: regionData,
       heightData: '600px',
@@ -570,6 +573,20 @@ export default {
       }
     },
     engflagchange(e,index) {
+      this.$confirm('选择结算阶段后不可修改，是否确定选择？', {
+          distinguishCancelAndClose: true,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消'
+        })
+          .then(() => {
+            this.$message({
+              type: 'success',
+              message: '选择成功'
+            });
+            this.disabled=true
+          })
+          .catch(action => {
+          });
        for(var i=0;i<this.deptBudgetList.tranProcessInfoList.length;i++){
         this.deptBudgetList.tranProcessInfoList[i].endFlag='0'
       }
@@ -599,7 +616,13 @@ export default {
           //     this.endflag = '1'
           //   }
           // }
+        
           this.deptBudgetList = response
+          if(this.deptBudgetList.tranProcessInfoList.some( function( item, index, array ){ 
+    return item.endFlag==1
+})){
+  this.disabled=true
+}
           this.number = response.tranProcessInfoList.length + 1
           this.count = response.count + 1
           if (

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -66,6 +66,7 @@
         <el-table-column prop="weight" class="table_td" label="重量（吨）"></el-table-column>
         <el-table-column prop="predictDate" class="table_td" label="预计日期"></el-table-column>
         <el-table-column prop="publisher" class="table_td" label="发布者"></el-table-column>
+        <el-table-column prop="completedQuantity" class="table_td" label="已完成量"></el-table-column>
         <el-table-column prop="taskStatus" label="状态" width="90">
           <template slot-scope="scope">
             <template>

src/views/warehouse/warehouseManagementGross.vue

@@ -652,6 +652,8 @@ export default {
         addressUrl:'',
         warehouseInOutDetail: {},
         deductionAmount:0,
+        grossWeight:0,
+        tare:0
       },
       historyList: [],
       cost:'',
@@ -663,7 +665,8 @@ export default {
       accessoryTFs: false,
       allowEdit: true,
       param: 9600,
-      information:''
+      information:'',
+      result1 : '00'
     }
   },
   mounted() {
@@ -738,6 +741,7 @@ export default {
           // var receData = HexConvert.ByteToString(value);
           // console.log("receData",receData);
           var flag = false;
+          var flag1 = false;
           // for (var i = 0; i < value.length; i++) {
           //   var tmp = String.fromCharCode(value[i])
           //   if (tmp == '+') {
@@ -757,18 +761,17 @@ export default {
           //   }
           // }
           console.log('value:',value);
-
-          if(this.warehouseName&&this.warehouseName == '山东诸城迈饶库'){
+          if(this.deptBudgetList.warehouseName&&this.deptBudgetList.warehouseName == '山东诸城迈饶库'){
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {
-              flag = true
+                flag = true
               }
               if (flag && result.length < 6 && tmp != '+') {
-              result += tmp
+                result += tmp
               }
             }
-            if (this.information != '毛重检斤') {
+            if (this.information == '毛重检斤') {
               if(parseInt(result)|| parseInt(result) == 0){
                 this.deptBudgetList.grossWeight = parseInt(result)
               }
@@ -781,29 +784,36 @@ export default {
           else{
             for(var i=0;i<value.length;i++){
               var tmp = String.fromCharCode(value[i])
-              if(value[0] != 49 && value[0] != 2){
-              break
+              
+              if((value[0] != 49 && value[0] != 2)){
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  flag1 = true
+                }
+                else{
+                  break
+                }
               }
               if (tmp == String.fromCharCode(32) ) {
-              flag = true
+                flag = true
               }
-              if (flag && result.length < 7 && tmp != String.fromCharCode(32)) {
-              // if(i-1 >=0 &&tmp == String.fromCharCode(48) && value[i-1] == 32){
-              //   continue
-              // }
-              // if(i-2 >=0 &&tmp == String.fromCharCode(48) && value[i-2] == 32){
-              //   continue
-              // }
-              result += tmp
+              if (flag && result.length < 7 && tmp != String.fromCharCode(32)&&!(value[value.length-1] == 48&&value[value.length-2] == 48)) {
+                result += tmp
+              }
+              if (flag1 && tmp != String.fromCharCode(32)) {
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  if(i == 0 ){
+                    this.result1 = tmp + '0'
+                  }
+                }
               }
             }
-            if (this.information != '毛重检斤') {
+            if (this.information == '毛重检斤') {
               if(parseInt(result)|| parseInt(result) == 0){
-              this.deptBudgetList.grossWeight = parseInt(result)*100
+              this.deptBudgetList.grossWeight = parseInt(result+this.result1)
               }
             } else {
               if(parseInt(result)|| parseInt(result) == 0){
-              this.deptBudgetList.tare = parseInt(result)*100
+              this.deptBudgetList.tare = parseInt(result+this.result1)
               }
             }
           }

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -594,7 +594,8 @@ export default {
       },
       accessoryTFs: false,
       param: 9600,
-      allowEdit:true
+      allowEdit:true,
+      result1:'00'
     }
   },
   activated() {
@@ -688,6 +689,7 @@ export default {
           // var receData = HexConvert.ByteToString(value);
           // console.log("receData",receData);
           var flag = false;
+          var flag1 = false;
           // for (var i = 0; i < value.length; i++) {
           //   var tmp = String.fromCharCode(value[i])
           //   if (tmp == '+') {
@@ -700,7 +702,7 @@ export default {
           // if(parseInt(result)){
           //     this.dataList.tare = parseInt(result)
           // }
-          if(this.warehouseName&&this.warehouseName == '山东诸城迈饶库'){
+          if(this.deptBudgetList1.warehouseName&&this.deptBudgetList1.warehouseName == '山东诸城迈饶库'){
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {
@@ -717,24 +719,31 @@ export default {
           else{
             for(var i=0;i<value.length;i++){
               var tmp = String.fromCharCode(value[i])
-              if(value[0] != 49 && value[0] != 2){
-              break
+              
+              if((value[0] != 49 && value[0] != 2)){
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  flag1 = true
+                }
+                else{
+                  break
+                }
               }
               if (tmp == String.fromCharCode(32) ) {
-              flag = true
+                flag = true
               }
-              if (flag && result.length < 7 && tmp != String.fromCharCode(32)) {
-              // if(i-1 >=0 &&tmp == String.fromCharCode(48) && value[i-1] == 32){
-              //   continue
-              // }
-              // if(i-2 >=0 &&tmp == String.fromCharCode(48) && value[i-2] == 32){
-              //   continue
-              // }
-              result += tmp
+              if (flag && result.length < 7 && tmp != String.fromCharCode(32)&&!(value[value.length-1] == 48&&value[value.length-2] == 48)) {
+                result += tmp
+              }
+              if (flag1 && tmp != String.fromCharCode(32)) {
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  if(i == 0 ){
+                    this.result1 = tmp + '0'
+                  }
+                }
               }
             }
             if(parseInt(result)|| parseInt(result) == 0){
-              this.dataList.tare = parseInt(result)*100
+              this.dataList.tare = parseInt(result+this.result1)
             }
           }
           setTimeout(1000)

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -506,7 +506,8 @@ export default {
       },
       accessoryTFs: false,
       param: 9600,
-      allowEdit:true
+      allowEdit:true,
+      result1:'00'
     }
   },
   activated() {
@@ -581,6 +582,7 @@ export default {
           // var receData = HexConvert.ByteToString(value);
           // console.log("receData",receData);
           var flag = false;
+          var flag1 = false;
           // for (var i = 0; i < value.length; i++) {
           //   var tmp = String.fromCharCode(value[i])
           //   if (tmp == '+') {
@@ -593,7 +595,7 @@ export default {
           // if(parseInt(result)){
           //     this.dataList.grossWeight = parseInt(result)
           // }
-          if(this.warehouseName&&this.warehouseName == '山东诸城迈饶库'){
+          if(this.deptBudgetList1.warehouseName&&this.deptBudgetList1.warehouseName == '山东诸城迈饶库'){
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {
@@ -610,24 +612,31 @@ export default {
           else{
             for(var i=0;i<value.length;i++){
               var tmp = String.fromCharCode(value[i])
-              if(value[0] != 49 && value[0] != 2){
-              break
+              
+              if((value[0] != 49 && value[0] != 2)){
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  flag1 = true
+                }
+                else{
+                  break
+                }
               }
               if (tmp == String.fromCharCode(32) ) {
-              flag = true
+                flag = true
               }
-              if (flag && result.length < 7 && tmp != String.fromCharCode(32)) {
-              // if(i-1 >=0 &&tmp == String.fromCharCode(48) && value[i-1] == 32){
-              //   continue
-              // }
-              // if(i-2 >=0 &&tmp == String.fromCharCode(48) && value[i-2] == 32){
-              //   continue
-              // }
-              result += tmp
+              if (flag && result.length < 7 && tmp != String.fromCharCode(32)&&!(value[value.length-1] == 48&&value[value.length-2] == 48)) {
+                result += tmp
+              }
+              if (flag1 && tmp != String.fromCharCode(32)) {
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  if(i == 0 ){
+                    this.result1 = tmp + '0'
+                  }
+                }
               }
             }
             if(parseInt(result)|| parseInt(result) == 0){
-              this.dataList.grossWeight = parseInt(result)*100
+              this.dataList.grossWeight = parseInt(result+this.result1)
             }
           }
           setTimeout(1000)

src/views/warehouse/warehouseManagementTare.vue

@@ -471,6 +471,8 @@ export default {
         type:'干粮',
         addressUrl:'',
         warehouseInOutDetail: {},
+        grossWeight:0,
+        tare:0
       },
       historyList: [],
 
@@ -482,7 +484,8 @@ export default {
       accessoryTFs: false,
       allowEdit: true,
       param: 9600,
-      information:''
+      information:'',
+      result1:'00'
     }
   },
   mounted() {
@@ -539,6 +542,7 @@ export default {
           // var receData = HexConvert.ByteToString(value);
           // console.log("receData",receData);
           var flag = false;
+          var flag1 = false;
           // for (var i = 0; i < value.length; i++) {
           //   var tmp = String.fromCharCode(value[i])
           //   if (tmp == '+') {
@@ -557,7 +561,7 @@ export default {
           //     this.deptBudgetList.tare = parseInt(result)
           //   }
           // }
-          if(this.warehouseName&&this.warehouseName == '山东诸城迈饶库'){
+          if(this.deptBudgetList.warehouseName&&this.deptBudgetList.warehouseName == '山东诸城迈饶库'){
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {
@@ -567,7 +571,7 @@ export default {
               result += tmp
               }
             }
-            if (this.information != '毛重检斤') {
+            if (this.information == '毛重检斤') {
               if(parseInt(result)|| parseInt(result) == 0){
                 this.deptBudgetList.grossWeight = parseInt(result)
               }
@@ -580,29 +584,36 @@ export default {
           else{
             for(var i=0;i<value.length;i++){
               var tmp = String.fromCharCode(value[i])
-              if(value[0] != 49 && value[0] != 2){
-              break
+              
+              if((value[0] != 49 && value[0] != 2)){
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  flag1 = true
+                }
+                else{
+                  break
+                }
               }
               if (tmp == String.fromCharCode(32) ) {
-              flag = true
+                flag = true
               }
-              if (flag && result.length < 7 && tmp != String.fromCharCode(32)) {
-              // if(i-1 >=0 &&tmp == String.fromCharCode(48) && value[i-1] == 32){
-              //   continue
-              // }
-              // if(i-2 >=0 &&tmp == String.fromCharCode(48) && value[i-2] == 32){
-              //   continue
-              // }
-              result += tmp
+              if (flag && result.length < 7 && tmp != String.fromCharCode(32)&&!(value[value.length-1] == 48&&value[value.length-2] == 48)) {
+                result += tmp
+              }
+              if (flag1 && tmp != String.fromCharCode(32)) {
+                if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+                  if(i == 0 ){
+                    this.result1 = tmp + '0'
+                  }
+                }
               }
             }
-            if (this.information != '毛重检斤') {
-              if(parseInt(result) || parseInt(result) == 0){
-                this.deptBudgetList.grossWeight = parseInt(result)*100
+            if (this.information == '毛重检斤') {
+              if(parseInt(result)|| parseInt(result) == 0){
+              this.deptBudgetList.grossWeight = parseInt(result+this.result1)
               }
             } else {
               if(parseInt(result)|| parseInt(result) == 0){
-                this.deptBudgetList.tare = parseInt(result)*100
+              this.deptBudgetList.tare = parseInt(result+this.result1)
               }
             }
           }