前端 sdy

public/static/weightCheck.html

@@ -158,27 +158,27 @@
                 <td class="col col-bgc">类型</td>
                 <td class="col">{{item.type}}</td>
                 <td class="col col-bgc">容量（克/升）</td>
-                <td class="col">{{item.qualityInspectionManagement.bulkDensity}}</td>
+                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}</td>
                 <td class="col col-bgc">不完善粒（%）</td>
-                <td class="col">{{item.qualityInspectionManagement.imperfectGrain}}</td>
+                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}</td>
               </tr>
               <tr class="row">
                 <td class="col col-bgc">等级</td>
-                <td class="col">{{item.qualityInspectionManagement.grade}}</td>
+                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
                 <td class="col col-bgc">水分（%）</td>
-                <td class="col">{{item.qualityInspectionManagement.waterContent}}</td>
+                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}</td>
                 <td class="col col-bgc">热损伤（%）</td>
-                <td class="col">{{item.qualityInspectionManagement.jiaorenli}}</td>
+                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
                 <td class="col col-bgc">质检时间</td>
-                <td class="col">{{item.qualityInspectionManagement.qualityDate}}</td>
+                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.qualityDate:''}}</td>
               </tr>
               <tr class="row">
                 <td class="col col-bgc">杂质（%）</td>
-                <td class="col">{{item.qualityInspectionManagement.impurity}}</td>
+                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
                 <td class="col col-bgc">霉变粒（%）</td>
-                <td class="col">{{item.qualityInspectionManagement.mildewGrain}}</td>
+                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}</td>
                 <td class="col col-bgc">扣杂</td>
-                <td class="col">{{item.qualityInspectionManagement.buckleMiscellaneous}}</td>
+                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}</td>
                 <td class="col " colspan="2"></td>
               </tr>
               <tr class="row">
@@ -246,27 +246,27 @@
               <td class="col col-bgc">类型</td>
               <td class="col">{{tableData.type}}</td>
               <td class="col col-bgc">容量（克/升）</td>
-              <td class="col">{{tableData.qualityInspectionManagement.bulkDensity}}</td>
+              <td class="col">{{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}</td>
               <td class="col col-bgc">不完善粒（%）</td>
-              <td class="col">{{tableData.qualityInspectionManagement.imperfectGrain}}</td>
+              <td class="col">{{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.imperfectGrain:''}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">等级</td>
-              <td class="col">{{tableData.qualityInspectionManagement.grade}}</td>
+              <td class="col">{{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.grade:''}}</td>
               <td class="col col-bgc">水分（%）</td>
-              <td class="col">{{tableData.qualityInspectionManagement.waterContent}}</td>
+              <td class="col">{{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.waterContent:''}}</td>
               <td class="col col-bgc">热损伤（%）</td>
-              <td class="col">{{tableData.qualityInspectionManagement.jiaorenli}}</td>
+              <td class="col">{{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.jiaorenli:''}}</td>
               <td class="col col-bgc">质检时间</td>
-              <td class="col">{{tableData.qualityInspectionManagement.qualityDate}}</td>
+              <td class="col">{{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.qualityDate:''}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">杂质（%）</td>
-              <td class="col">{{tableData.qualityInspectionManagement.impurity}}</td>
+              <td class="col">{{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.impurity:''}}</td>
               <td class="col col-bgc">霉变粒（%）</td>
-              <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
+              <td class="col">{{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.mildewGrain:''}}</td>
               <td class="col col-bgc">扣杂</td>
-              <td class="col">{{tableData.qualityInspectionManagement.buckleMiscellaneous}}</td>
+              <td class="col">{{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.buckleMiscellaneous:''}}</td>
               <td class="col " colspan="2"></td>
             </tr>
             <tr class="row">
@@ -421,7 +421,7 @@
         printSmall() {},
         printBig() {},
       },
-      mounted() {
+      mounted() {debugger
         let _data = decodeURIComponent(this.getQueryVariable("tableData"))
         let _type = decodeURIComponent(this.getQueryVariable("type"))
         this.pageType = decodeURIComponent(this.getQueryVariable("radioType"))

src/styles/media.scss

@@ -9,7 +9,7 @@
 .winseaview-contail {
   width: 100%;
   height: 100%;
-  background: #f0f2f5;
+background: #E8ECF6;
   background-size: 100%;
   background-repeat: no-repeat;
   .winseaview-logo {

src/views/home/index.vue

@@ -561,33 +561,21 @@ export default {
           console.log('value:',value);
 
           var result='';
-          //2。获取16进制字符串
-          // var receData = HexConvert.ByteToString(value);
-          // console.log("receData",receData);
           var flag = false;
-          for(var i=0;i<value.length;i++){
-              console.log('value[0]',value[0])
+          for (var i = value.length - 1; i >= 0; i--) {
             var tmp = String.fromCharCode(value[i])
-            if(value[0] != 49 && value[0] != 2){
-              break
-            }
-            if (tmp == String.fromCharCode(32) ) {
+            if (tmp == '=') {
               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 < 9 && tmp != '=') {
               result += tmp
             }
           }
+          
           setTimeout(1000)
           if(parseInt(result)){
             console.log('result:',result);
-            this.text = parseInt(result)*100
+            this.text = parseInt(result)
           }
           console.log('this.text:',this.text);
           

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -300,25 +300,25 @@
         this.identityLow = 'low'
         this.identity[1] = e.url
         this.imageUrl2 = e.url
-        getIdentity({
-            personImg: e.url
-          })
-          .toPromise()
-          .then((response) => {
-            if (response.recPerson ) {
-                this.$set( this.customerList,'customerName',response.recPerson)
-                this.$set( this.customerList,'payeeName',response.recPerson)
-            }
+        // getIdentity({
+        //     personImg: e.url
+        //   })
+        //   .toPromise()
+        //   .then((response) => {
+        //     if (response.recPerson ) {
+        //         this.$set( this.customerList,'customerName',response.recPerson)
+        //         this.$set( this.customerList,'payeeName',response.recPerson)
+        //     }
             
-            if (response.recPersonNo ) {
-              this.$set( this.customerList,'customerNumberCard',response.recPersonNo)
-               this.$set( this.customerList,'payeeNumberCard',response.recPersonNo)
-            }
+        //     if (response.recPersonNo ) {
+        //       this.$set( this.customerList,'customerNumberCard',response.recPersonNo)
+        //        this.$set( this.customerList,'payeeNumberCard',response.recPersonNo)
+        //     }
             
-            if (response.recPersonAddr ) {
-              this.$set( this.customerList,'compAddress',response.recPersonAddr)
-            }
-          })
+        //     if (response.recPersonAddr ) {
+        //       this.$set( this.customerList,'compAddress',response.recPersonAddr)
+        //     }
+        //   })
       },
       bankSuccess1(e) {
         this.bankUps = 'bankUp'
@@ -344,21 +344,21 @@
         this.bankLows = 'bankLow'
         this.bank[1] = e.url
         this.imageUrl4 = e.url
-        getBank({
-            bankImg: e.url
-          })
-          .toPromise()
-          .then((response) => {
-             if (response.bankNameZhihang) {
-              this.bankList = response.bankNameZhihang
-            }
-            if (response.bankNo) {
-              this.$set(this.customerList,'bankCard',response.bankNo)
-            }
-            if (response.bankName) {
-              this.$set(this.customerList,'bankDeposit',response.bankName)
-            }
-          })
+        // getBank({
+        //     bankImg: e.url
+        //   })
+        //   .toPromise()
+        //   .then((response) => {
+        //      if (response.bankNameZhihang) {
+        //       this.bankList = response.bankNameZhihang
+        //     }
+        //     if (response.bankNo) {
+        //       this.$set(this.customerList,'bankCard',response.bankNo)
+        //     }
+        //     if (response.bankName) {
+        //       this.$set(this.customerList,'bankDeposit',response.bankName)
+        //     }
+        //   })
       },
       commit() {
         if (!this.imageUrl1) {

src/views/houseSelfCollect/weighingManagement.vue

@@ -37,10 +37,10 @@
       <el-table-column prop="carNumber" label="车牌号"></el-table-column>
       <el-table-column prop="goodsName" label="货名"></el-table-column>
       <el-table-column prop="type" label="类型"></el-table-column>
-      <el-table-column prop="grossWeight" label="毛重（公斤）"></el-table-column>
-      <el-table-column prop="tare" label="皮重（公斤）"></el-table-column>
+      <el-table-column prop="grossWeight" label="毛重（公斤）" width="120"></el-table-column>
+      <el-table-column prop="tare" label="皮重（公斤）" width="120"></el-table-column>
       <el-table-column prop="buckleMiscellaneous" label="扣杂"></el-table-column>
-      <el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
+      <el-table-column prop="netWeight" label="净重（公斤）" width="120"></el-table-column>
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageNumber" label="囤位号"></el-table-column>
       <el-table-column prop="secretaryWeigher" label="司称员">

src/views/houseSelfCollect/weightCheck.vue

@@ -111,7 +111,7 @@
             </el-table>
             <div style="text-align: center">
               <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                :current-page="currentPage" page-size="100"
+                :current-page="currentPage" :page-size="pageSize"
                 layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
               </el-pagination>
             </div>
@@ -185,14 +185,12 @@
     data() {
       return {
         currentPage: 1,
-        pageSize: 10,
+        pageSize: 100,
         deptCircularPage: {},
         deptBudgetTotal: 0,
         pList: [],
         mList: [],
         index: 0,
-        currentPage: 1,
-        pageSize: 10,
         carList: [],
         carWeightInfo: {
           carNumber: '',
@@ -482,7 +480,28 @@
                   this.weighingList.tare = parseInt(result)
                 }
               }
-            } else {
+            }
+            else if (this.warehouseName && (this.warehouseName == '顺城粮库')) {
+              for (var i = value.length - 1; i >= 0; i--) {
+                var tmp = String.fromCharCode(value[i])
+                if (tmp == '=') {
+                  flag = true
+                }
+                if (flag && result.length < 9 && tmp != '=') {
+                  result += tmp
+                }
+              }
+              if (this.tpyeNo != 2) {
+                if (parseInt(result) || parseInt(result) == 0) {
+                  this.weighingList.grossWeight = parseInt(result)
+                }
+              } else {
+                if (parseInt(result) || parseInt(result) == 0) {
+                  this.weighingList.tare = parseInt(result)
+                }
+              }
+            }
+            else {
               for(var i=0;i<value.length;i++){
                 var tmp = String.fromCharCode(value[i])
                 
@@ -706,6 +725,7 @@
                           grossWeight(this.weighingList)
                           .toPromise()
                           .then((response) => {
+                            this.reader.cancel()
                             this.$notify.success({
                               title: '成功',
                               message: '保存成功',
@@ -732,6 +752,7 @@
               tare(this.weighingList)
                 .toPromise()
                 .then((response) => {
+                  this.reader.cancel()
                   this.$notify.success({
                     title: '成功',
                     message: '保存成功',

src/views/outboundManagement/weighing.vue

@@ -233,6 +233,26 @@
 						}
 					}
 				}
+				else if (this.warehouseName && (this.warehouseName == '顺城粮库')) {
+					for (var i = value.length - 1; i >= 0; i--) {
+						var tmp = String.fromCharCode(value[i])
+						if (tmp == '=') {
+							flag = true
+						}
+						if (flag && result.length < 9 && tmp != '=') {
+							result += tmp
+						}
+					}
+					if (this.tpyeNo != 2) {
+						if (parseInt(result) || parseInt(result) == 0) {
+							this.weighingList.grossWeight = parseInt(result)
+						}
+					} else {
+						if (parseInt(result) || parseInt(result) == 0) {
+							this.weighingList.tare = parseInt(result)
+						}
+					}
+				}
 				else{
 					for(var i=0;i<value.length;i++){
 						var tmp = String.fromCharCode(value[i])

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -1,8 +1,8 @@
 //现货销售出库报表
 <template>
-  <div class="container">
-    <el-scrollbar style="height: 100%">
-      <el-row>
+  <div class="">
+    <div style="height: 100%" class="content">
+      <el-row class="content1">
         <el-col style="padding-left: 15px" :span="16">
           <ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.carry`" @click="adopt()">备注
           </ws-button>
@@ -21,73 +21,85 @@
           </el-select>
         </el-col>
       </el-row>
-      <el-row v-if='orderList.deliverType==1'>
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane v-for='(item,index) in tranProcessInfo' :key='index'
-            :label="item.label" :name="item.name"></el-tab-pane>
-            <el-tab-pane
-            label="退库" name="退库"></el-tab-pane>
+      <el-row v-if='orderList.deliverType==1' class="content2">
+        <el-tabs v-model="activeName" @tab-click="handleClick" class="content2-tab">
+          <el-tab-pane v-for='(item,index) in tranProcessInfo' class="content2-pane" :key='index' :label="item.label"
+            :name="item.name"></el-tab-pane>
+          <el-tab-pane class="content2-pane" label="退库" name="退库"></el-tab-pane>
         </el-tabs>
+        <div class="content2-item">
+          <div v-if="contractNo != ''">
+            <div class="buyer" v-if="orderList.buyer">买方: {{ orderList.buyer }} </div>
+            <div v-else>买方: </div>
+          </div>
+          <div v-if="contractNo != ''" class="row2">
+            <span v-if="orderList.goodsName">货名: {{ orderList.goodsName }} </span>
+            <span v-else>货名: </span>
+            <span v-if="orderList.weight">合同重量: {{ orderList.weight }} 吨</span>
+            <span v-else>合同重量: 0 吨</span>
+            <span v-if="outboundVolume">出库量: {{ outboundVolume }} 吨</span>
+            <span v-else>出库量: 0 吨</span>
+            <span v-if="orderList.unitContractPrice">合同单价: {{ orderList.unitContractPrice }} 元/吨</span>
+            <span v-else>合同单价: 0 元/吨</span>
+            <span v-if="amountReceivable">应收: {{ amountReceivable }} 元</span>
+            <span v-else>应收: 0 元</span>
+            <span v-if="amountReceived">已收: {{ amountReceived }} 元
+              <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+                src="../../../public/img/fujian.png" @click="fujian1()" alt="" />
+            </span>
+            <span v-else>已收: 0 元</span>
+            <span v-if="uncollectedAmount">未收: {{ uncollectedAmount }} 元</span>
+            <span v-else>未收: 0 元</span>
+            <span v-if="orderList.deposit">定金: {{ orderList.deposit }} 元
+              <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+                src="../../../public/img/fujian.png" @click="fujian()" alt="" />
+            </span>
+            <span v-else>定金: 0 元</span>
+          </div>
+        </div>
+
       </el-row>
-      <div v-if="contractNo != ''">
-        <span v-if="orderList.buyer">买方: {{ orderList.buyer }} </span>
-        <span v-else>买方: </span>
-      </div>
-      <div v-if="contractNo != ''">
-        <span v-if="orderList.goodsName">货名: {{ orderList.goodsName }} </span>
-        <span v-else>货名: </span>
-        <span v-if="orderList.weight">合同重量: {{ orderList.weight }} 吨</span>
-        <span v-else>合同重量: 0 吨</span>
-        <span v-if="outboundVolume">出库量: {{ outboundVolume }} 吨</span>
-        <span v-else>出库量: 0 吨</span>
-        <span v-if="orderList.unitContractPrice">合同单价: {{ orderList.unitContractPrice }} 元/吨</span>
-        <span v-else>合同单价: 0 元/吨</span>
-        <span v-if="amountReceivable">应收: {{ amountReceivable.toFixed(2) }} 元</span>
-        <span v-else>应收: 0 元</span>
-        <span v-if="amountReceived">已收: {{ amountReceived.toFixed(2) }} 元
-          <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/fujian.png" @click="fujian1()" alt="" />
-        </span>
-        <span v-else>已收: 0 元</span>
-        <span v-if="uncollectedAmount">未收: {{ uncollectedAmount.toFixed(2) }} 元</span>
-        <span v-else>未收: 0 元</span>
-        <span v-if="orderList.deposit">定金: {{ orderList.deposit }} 元
-          <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/fujian.png" @click="fujian()" alt="" />
-        </span>
-        <span v-else>定金: 0 元</span>
-      </div>
+
       <!-- 自运 -->
-      <el-table class="wenzi" :data="saleList.records" :row-class-name="tableRowClassName" style="width: 100%; margin-top: 20px" ref="saleList" border
-        :summary-method="getSummaries" show-summary @selection-change="handleSelectionChange"
-        @row-click="handleRowClick" v-if="orderList.deliverType==1">
+      <el-table class="wenzi" :data="saleList.records" :row-class-name="tableRowClassName"
+        style="width: 100%; padding-top: 20px" ref="saleList" border :summary-method="getSummaries" show-summary
+        @selection-change="handleSelectionChange" @row-click="handleRowClick" v-if="orderList.deliverType==1">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column  v-if="this.tranType!='退库'" class="table_td" prop="processNo" label="运输任务阶段编号"></el-table-column>
+        <el-table-column v-if="this.tranType!='退库'" class="table_td" prop="processNo" label="运输任务阶段编号">
+        </el-table-column>
         <el-table-column class="table_td" prop="warehouseName" label="仓库" v-if="this.tranType=='退库'"></el-table-column>
         <el-table-column class="table_td" prop="carNo" label="车牌号" v-if="this.tranType=='汽运'||this.tranType=='退库'">
           <template slot-scope="scope">
-            <span >{{scope.row.carNo }}({{scope.row.tranCarNo}})</span>
+            <span>{{scope.row.carNo }}({{scope.row.tranCarNo}})</span>
           </template>
         </el-table-column>
         <el-table-column class="table_td" prop="binNumber" label="仓位号" v-if="this.tranType=='散船'"></el-table-column>
         <el-table-column class="table_td" prop="boxNo" label="车厢号" v-if="this.tranType=='火运'"></el-table-column>
-        <el-table-column class="table_td" prop="caseNo" label="箱号" v-if="this.tranType=='汽运'||this.tranType=='箱船'||this.tranType=='退库'"></el-table-column>
-        <el-table-column class="table_td" prop="titleNo" label="封号" v-if="this.tranType=='汽运'||this.tranType=='箱船'||this.tranType=='退库'"></el-table-column>
-        <el-table-column class="table_td" prop="createDate" label="卸车反馈日期" v-if="this.tranType=='汽运'||this.tranType=='火运'"></el-table-column>
-        <el-table-column class="table_td" prop="createDate" label="卸船反馈日期" v-if="this.tranType=='散船'||this.tranType=='箱船'"></el-table-column>
+        <el-table-column class="table_td" prop="caseNo" label="箱号"
+          v-if="this.tranType=='汽运'||this.tranType=='箱船'||this.tranType=='退库'"></el-table-column>
+        <el-table-column class="table_td" prop="titleNo" label="封号"
+          v-if="this.tranType=='汽运'||this.tranType=='箱船'||this.tranType=='退库'"></el-table-column>
+        <el-table-column class="table_td" prop="createDate" label="卸车反馈日期"
+          v-if="this.tranType=='汽运'||this.tranType=='火运'"></el-table-column>
+        <el-table-column class="table_td" prop="createDate" label="卸船反馈日期"
+          v-if="this.tranType=='散船'||this.tranType=='箱船'"></el-table-column>
         <el-table-column class="table_td" prop="returnDate" label="退库日期" v-if="this.tranType=='退库'"></el-table-column>
-        <el-table-column class="table_td" prop="feedbackPerson" label="卸车反馈人" v-if="this.tranType=='汽运'||this.tranType=='火运'"></el-table-column>
-        <el-table-column class="table_td" prop="feedbackPerson" label="卸船反馈人" v-if="this.tranType=='散船'||this.tranType=='箱船'"></el-table-column>
+        <el-table-column class="table_td" prop="feedbackPerson" label="卸车反馈人"
+          v-if="this.tranType=='汽运'||this.tranType=='火运'"></el-table-column>
+        <el-table-column class="table_td" prop="feedbackPerson" label="卸船反馈人"
+          v-if="this.tranType=='散船'||this.tranType=='箱船'"></el-table-column>
         <el-table-column class="table_td" prop="grossWeight" label="毛重（吨）" v-if="this.tranType=='退库'"></el-table-column>
         <el-table-column class="table_td" prop="tare" label="皮重（吨）" v-if="this.tranType=='退库'"></el-table-column>
         <el-table-column class="table_td" prop="netWeight" label="净重（吨）" v-if="tranType=='退库'">
           <template slot-scope="scope">
-            <span >-{{scope.row.netWeight }}</span>
+            <span>-{{scope.row.netWeight }}</span>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" prop="unloadingWeight" label="卸车净重（吨）" v-if="this.tranType=='汽运'||this.tranType=='火运'"></el-table-column>
-        <el-table-column v-else-if="this.tranType=='散船'||this.tranType=='箱船'" class="table_td" prop="unloadingWeight" label="卸船净重（吨）"></el-table-column>
+        <el-table-column class="table_td" prop="unloadingWeight" label="卸车净重（吨）"
+          v-if="this.tranType=='汽运'||this.tranType=='火运'"></el-table-column>
+        <el-table-column v-else-if="this.tranType=='散船'||this.tranType=='箱船'" class="table_td" prop="unloadingWeight"
+          label="卸船净重（吨）"></el-table-column>
         <el-table-column class="table_td" prop="settlementWeight" label="结算重量（吨）"></el-table-column>
         <el-table-column class="table_td" prop="amountIngReceivable" label="应收金额（元）"></el-table-column>
         <el-table-column class="table_td" prop="amountEdReceivable" label="已收金额（元）">
@@ -100,8 +112,9 @@
         </el-table-column>
       </el-table>
       <!-- 他运 -->
-      <el-table v-if='orderList.deliverType!=1' class="wenzi" :data="saleList.records" :row-class-name="tableRowClassName" style="width: 100%; margin-top: 20px" ref="saleList1"
-        border :summary-method="getSummaries" show-summary @selection-change="handleSelectionChange">
+      <el-table v-if='orderList.deliverType!=1' class="wenzi" :data="saleList.records"
+        :row-class-name="tableRowClassName" style="width: 100%; padding-top: 20px" ref="saleList1" border
+        :summary-method="getSummaries" show-summary @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column class="table_td" prop="warehouseName" label="仓库"></el-table-column>
@@ -133,8 +146,8 @@
             </div>
             <div style='display:inline-block;' v-if="scope.row.identification == 'false'">
               <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
-              style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
-              @click="whether(scope.row)" alt="" />
+                style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
+                @click="whether(scope.row)" alt="" />
             </div>
 
             <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
@@ -166,7 +179,7 @@
       <!-- 页数 -->
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
         :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
-    </el-scrollbar>
+    </div>
     <!-- 定金弹窗 -->
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
@@ -192,7 +205,7 @@
     <el-dialog width="25%" title="收款" :visible.sync="dialogFormVisible1" :append-to-body="true">
       <el-form :model="form">
         <el-form-item label="未收金额（元）" :label-width="formLabelWidth" prop="amountNotReceivable">
-          <span>{{ uncollectedAmount }}</span>
+          <span>{{ uncollectedAmount1 }}</span>
         </el-form-item>
         <el-form-item label="本次收款金额（元）" :label-width="formLabelWidth">
           <el-input v-model="money" autocomplete="off" placeholder="请输入本次收款金额" class="deal"></el-input>
@@ -278,7 +291,7 @@
 
     data() {
       return {
-        tranType:'',
+        tranType: '',
         clickType: '',
         activeName: '',
         dialogFormVisible1: false,
@@ -292,6 +305,7 @@
         allmoney1: 0,
         deptCircularPage: {},
         deptBudgetTotal: 0,
+        uncollectedAmount1: 0,
         stockSaleReceiptReportList: [],
         stockSaleReceiptReport: {
           stockSaleReceiptReportList: [],
@@ -327,15 +341,15 @@
         deposit: '0',
         depositUrl: [],
         saleList: [],
-        amountReceivable: '',
-        amountReceived: '',
-        uncollectedAmount: '',
-        outboundVolume: '',
+        amountReceivable: 0,
+        amountReceived: 0,
+        uncollectedAmount: 0,
+        outboundVolume: 0,
         collectionDate: '',
         collectionScreenshot: '',
         amountEdCollectionable: '',
         actualCollectionment: '',
-        tranProcessInfo:[],
+        tranProcessInfo: [],
         // collectDate: '',
         calculationCollectable: '',
         searchType: '',
@@ -367,23 +381,26 @@
       this.showType = this.isShow
     },
     methods: {
-      tableRowClassName({row, rowIndex}) {
-        console.log(row)
-        if (row.returnFlag==1) {
+      tableRowClassName({
+        row,
+        rowIndex
+      }) {
+        // console.log(row)
+        if (row.returnFlag == 1) {
           return 'warning-row';
         } else {
           return '';
         }
       },
-      handleRowClick(){},
+      handleRowClick() {},
       handleClick(tab, event) {
         console.log(tab);
-        this.activeName=tab.name
-        if(this.activeName=='退库'){
+        this.activeName = tab.name
+        if (this.activeName == '退库') {
           this.tranType = '退库'
-        }else{
+        } else {
           for (let i = 0; i < this.tranProcessInfo.length; i++) {
-            if(this.tranProcessInfo[i].name==this.activeName){
+            if (this.tranProcessInfo[i].name == this.activeName) {
               this.tranType = this.tranProcessInfo[i].tranType
             }
           }
@@ -395,20 +412,21 @@
       },
       //表头
       contractchange(e) {
-        this.currentPage=1
-        this.pageSize=10
+        this.currentPage = 1
+        this.pageSize = 10
         this.tranProcessInfo = []
-        console.log('type',this.activeName)
+        console.log('type', this.activeName)
         for (var i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
             this.orderList = this.contractNoList[i]
             for (let i = 0; i < this.orderList.tranTaskInfoList.length; i++) {
-              if(this.orderList.tranTaskInfoList[i].tranProcessInfo){
-                  this.tranProcessInfo.push({
-                    label:this.orderList.tranTaskInfoList[i].taskNo+'+('+this.orderList.tranTaskInfoList[i].tranProcessInfo.tranType+')',
-                    name:this.orderList.tranTaskInfoList[i].tranProcessInfo.processNo,
-                    tranType:this.orderList.tranTaskInfoList[i].tranProcessInfo.tranType
-                    })
+              if (this.orderList.tranTaskInfoList[i].tranProcessInfo) {
+                this.tranProcessInfo.push({
+                  label: this.orderList.tranTaskInfoList[i].taskNo + '(' + this.orderList.tranTaskInfoList[i]
+                    .tranProcessInfo.tranType + ')',
+                  name: this.orderList.tranTaskInfoList[i].tranProcessInfo.processNo,
+                  tranType: this.orderList.tranTaskInfoList[i].tranProcessInfo.tranType
+                })
               }
             }
             console.log(this.orderList.tranTaskInfoList)
@@ -545,19 +563,19 @@
         } = param
         const sums = []
         columns.forEach((column, index) => {
-          if(this.orderList.deliverType!=1){
+          if (this.orderList.deliverType != 1) {
             if (index === 0) {
               sums[index] = '合计'
             } else if (
               index === 8 ||
-              index === 9||
-              index === 10||
+              index === 9 ||
+              index === 10 ||
               index === 11
             ) {
               const values = data.map((item) => Number(item[column.property]))
               if (!values.every((value) => isNaN(value))) {
                 sums[index] = values.reduce((prev, curr) => {
-                  const value = Number(curr)
+                  const value = Number(curr).toFixed(2)
                   if (!isNaN(value)) {
                     return prev + curr
                   } else {
@@ -570,20 +588,20 @@
             } else {
               sums[index] = '--'
             }
-          }else{
-            if(this.tranType=='火运'||this.tranType=='散船'){
+          } else {
+            if (this.tranType == '火运' || this.tranType == '散船') {
               if (index === 0) {
                 sums[index] = '合计'
               } else if (
                 index === 8 ||
-                index === 9||
-                index === 10||
+                index === 9 ||
+                index === 10 ||
                 index === 7
               ) {
                 const values = data.map((item) => Number(item[column.property]))
                 if (!values.every((value) => isNaN(value))) {
                   sums[index] = values.reduce((prev, curr) => {
-                    const value = Number(curr)
+                    const value = Number(curr).toFixed(2)
                     if (!isNaN(value)) {
                       return prev + curr
                     } else {
@@ -596,19 +614,19 @@
               } else {
                 sums[index] = '--'
               }
-            }else if(this.tranType=='汽运'){
+            } else if (this.tranType == '汽运') {
               if (index === 0) {
                 sums[index] = '合计'
               } else if (
                 index === 11 ||
-                index === 9||
-                index === 10||
+                index === 9 ||
+                index === 10 ||
                 index === 12
               ) {
                 const values = data.map((item) => Number(item[column.property]))
                 if (!values.every((value) => isNaN(value))) {
                   sums[index] = values.reduce((prev, curr) => {
-                    const value = Number(curr)
+                    const value = Number(curr).toFixed(2)
                     if (!isNaN(value)) {
                       return prev + curr
                     } else {
@@ -621,19 +639,19 @@
               } else {
                 sums[index] = '--'
               }
-            }else if(this.tranType=='箱船'){
+            } else if (this.tranType == '箱船') {
               if (index === 0) {
                 sums[index] = '合计'
               } else if (
                 index === 11 ||
-                index === 9||
-                index === 10||
+                index === 9 ||
+                index === 10 ||
                 index === 8
               ) {
                 const values = data.map((item) => Number(item[column.property]))
                 if (!values.every((value) => isNaN(value))) {
                   sums[index] = values.reduce((prev, curr) => {
-                    const value = Number(curr)
+                    const value = Number(curr).toFixed(2)
                     if (!isNaN(value)) {
                       return prev + curr
                     } else {
@@ -650,9 +668,16 @@
           }
 
         })
-        console.log(sums[sums.length - 1],sums[sums.length - 2])
-          // sums[sums.length - 1] = sums[sums.length - 1].toFixed(2)
-          // sums[sums.length - 2] = sums[sums.length - 2].toFixed(2)
+        for (let i = 0; i < sums.length; i++) {
+          // console.log(typeof sums[i])
+          if (typeof sums[i] == 'number') {
+            sums[i] = sums[i].toFixed(2)
+          }
+
+        }
+        // console.log(sums)
+        // sums[sums.length - 1] = sums[sums.length - 1].toFixed(2)
+        // sums[sums.length - 2] = sums[sums.length - 2].toFixed(2)
         return sums
       },
       //定金
@@ -732,10 +757,23 @@
       },
       //收款
       handlecollect() {
-        this.amountEdReceivable = this.saleList.records[0].amountEdReceivable
-        this.amountNotReceivable = this.saleList.records[0].amountNotReceivable
-        this.stockSaleReceiptReportList = this.saleList.records
-        this.dialogFormVisible1 = true
+        if (this.modification.length > 0) {
+          this.uncollectedAmount1 = 0
+          for (let i = 0; i < this.modification.length; i++) {
+            this.uncollectedAmount1 += Number(this.modification[i].amountNotReceivable)
+          }
+          this.uncollectedAmount1 = this.uncollectedAmount1.toFixed(3)
+          this.amountEdReceivable = this.saleList.records[0].amountEdReceivable
+          this.amountNotReceivable = this.saleList.records[0].amountNotReceivable
+          this.stockSaleReceiptReportList = this.saleList.records
+          this.dialogFormVisible1 = true
+        } else {
+          this.$message({
+            message: '请至少选择一个条目',
+            type: 'warning',
+          })
+        }
+
       },
       collectment() {
         this.stockSaleReceiptReport.money = this.money
@@ -812,15 +850,15 @@
       getList(type) {
         // 1自运2他运
         let _data = {
-            compId: localStorage.getItem('ws-pf_compId'),
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            searchType: this.searchType,
-            contractNo: this.contractNo,
-          }
-          if(type==1){
-            _data.processNo = this.activeName
-          }
+          compId: localStorage.getItem('ws-pf_compId'),
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          contractNo: this.contractNo,
+        }
+        if (type == 1) {
+          _data.processNo = this.activeName
+        }
         getStockSaleReceiptList(_data)
           .toPromise()
           .then((response) => {
@@ -831,10 +869,18 @@
             let num = []
             for (var i = 0; i < response.records.length; i++) {
               response.records[i].identification = 'false'
-              this.amountReceivable += response.records[i].amountIngReceivable
-              this.amountReceived += response.records[i].amountEdReceivable
-              this.uncollectedAmount += response.records[i].amountNotReceivable
-              this.outboundVolume += response.records[i].settlementWeight
+              if (response.records[i].amountIngReceivable) {
+                this.amountReceivable += Number(response.records[i].amountIngReceivable.toFixed(2))
+              }
+              if (response.records[i].amountEdReceivable) {
+                this.amountReceived += Number(response.records[i].amountEdReceivable.toFixed(2))
+              }
+              if (response.records[i].amountNotReceivable) {
+                this.uncollectedAmount += Number(response.records[i].amountNotReceivable.toFixed(2))
+              }
+              if (response.records[i].settlementWeight) {
+                this.outboundVolume += Number(response.records[i].settlementWeight.toFixed(2))
+              }
               // this.addressUrlArray1.push(response.records[i].collectionScreenshot.split('$'))
               if (response.records[i].collectionScreenshot != null) {
                 num = response.records[i].collectionScreenshot.split('$')
@@ -949,6 +995,7 @@
   /deep/.el-table tr th.is-leaf:first-child {
     border-left: 1px solid #e9ecf7;
   }
+
   // .el-row{
   //     height: 150px;
   // }
@@ -964,10 +1011,12 @@
     height: 32px;
     margin-left: -20%;
   }
+
   .container {
     overflow: scroll;
     height: 93vh;
   }
+
   .button-container {
     display: flex;
     flex-wrap: nowrap;
@@ -1003,6 +1052,7 @@
       }
     }
   }
+
   .el-button--primary {
     background-color: #5878e8;
     border-color: #5878e8;
@@ -1024,11 +1074,13 @@
     width: 385px;
     margin-top: 10px;
   }
+
   .el-input--small {
     font-size: 13px;
     width: 390px;
     margin-left: 74%;
   }
+
   /deep/.el-table .el-table__header .cell,
   .el-table .el-table__body .cell {
     text-align: center;
@@ -1083,29 +1135,87 @@
     display: inline-flex;
     margin-left: -80%;
   }
-  /deep/.el-tabs__active-bar{
-    background:transparent;
+
+  /deep/.el-tabs__active-bar {
+    background: transparent;
   }
+
   /deep/.el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2),
   /deep/.el-tabs--bottom .el-tabs__item.is-top:nth-child(2),
   /deep/.el-tabs--top .el-tabs__item.is-bottom:nth-child(2),
-  /deep/.el-tabs--top .el-tabs__item.is-top:nth-child(2){
-    padding-left:20px;
+  /deep/.el-tabs--top .el-tabs__item.is-top:nth-child(2) {
+    padding-left: 20px;
   }
+
   /deep/.el-tabs--bottom .el-tabs__item.is-bottom:last-child,
   /deep/.el-tabs--bottom .el-tabs__item.is-top:last-child,
   /deep/.el-tabs--top .el-tabs__item.is-bottom:last-child,
-  /deep/.el-tabs--top .el-tabs__item.is-top:last-child{
-    padding-right:20px;
+  /deep/.el-tabs--top .el-tabs__item.is-top:last-child {
+    padding-right: 20px;
   }
-  /deep/.el-tabs{
-    border-top:1px solid #ccc;
+
+  /deep/.el-tabs {
+    // border-top:1px solid #ccc;
   }
-  /deep/.el-table .warning-row{
-    background:#FFEDEF;
+
+  /deep/.el-table .warning-row {
+    background: #FFEDEF;
     // border:1px solid #E05D6B !important;
   }
+
   /deep/.el-table .warning-row td {
-    border-bottom:1px solid #E05D6B !important;
-}
+    border-bottom: 1px solid #E05D6B !important;
+  }
+
+  /deep/.el-tabs__nav-scroll {
+    background-color: white;
+  }
+
+  /deep/.el-tabs__nav-wrap::after {
+    background: transparent;
+  }
+
+  /deep/.el-tabs__active-bar {
+
+    background: #5878E8;
+  }
+
+  .buyer {
+    font-size: 16px;
+    font-weight: 600;
+    color: #323233;
+    line-height: 24px;
+  }
+
+  .content {
+    box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+    background: #E8ECF6;
+  }
+
+  .content1 {
+    background-color: white;
+    border-radius: 5px;
+  }
+
+  .content2 {
+    margin-top: 10px;
+    border-radius: 5px;
+    background: #F0F3FE;
+  }
+
+  .content2-item {
+    padding: 10px;
+  }
+
+  .row2>span {
+    margin-right: 20px;
+  }
+
+  // /deep/.el-tabs__active-bar{
+  //       width: 270px!important;
+  //       transform: translateX(0px)!important;
+  // }
+  // /deep/.el-tabs__item{
+  //   padding: 0 55px!important;
+  // }
 </style>

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

@@ -97,7 +97,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementDriverAdd',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementDriverAdd',
+        module: 'tranManager.driverManagement.add',
         permissicon: [],
         keepAlive: true
       },
@@ -142,7 +142,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementDriverEdit',
         shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.driverManagement.edit',
+        module: 'tranManager.driverManagement.edit',
         permissicon: [],
         keepAlive: true
       },
@@ -157,7 +157,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementDriverLook',
         shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.driverManagement.edit',
+        module: 'tranManager.driverManagement.view',
         permissicon: [],
         keepAlive: true
       },
@@ -172,7 +172,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementDriverAdd',
         shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.driverManagement.add',
+        module: 'tranManager.driverManagement.add',
         permissicon: [],
         keepAlive: true
       },
@@ -434,7 +434,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementDriver',
         shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.driverManagement',
+        module: 'tranManager.driverManagement',
         permissicon: [],
         keepAlive: true
       }

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -687,6 +687,7 @@ export default {
               //   }
               // }
               var tranProcessInfo = {}
+              tranProcessInfo.flag='1'
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.infoId = this.deptBudgetList.infoId
               tranProcessInfo.processNo = this.deptBudgetList.processNo

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -643,6 +643,7 @@ export default {
               }
               console.log(this.tranCarInfoList, '12121212')
               var tranProcessInfo = {}
+              tranProcessInfo.flag='1'
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.infoId = this.deptBudgetList.infoId
               tranProcessInfo.tranCarInfoList = this.tranCarInfoList

src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -768,6 +768,7 @@ export default {
               //   this.tranCarInfoList[i].id = this.freightspace[i].id
               // }
               var tranProcessInfo = {}
+              tranProcessInfo.flag='1'
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.infoId = this.deptBudgetList.infoId
               tranProcessInfo.processNo = this.deptBudgetList.processNo

src/views/warehouse/warehouseManagementGross.vue

@@ -353,8 +353,8 @@
           warehouseInOutDetail: {},
           deductionAmount: 0,
           deductionWeight: 0,
-          grossWeight: "",
-          tare: "",
+          grossWeight: '',
+          tare: '',
         },
         historyList: [],
         cost: '',
@@ -461,7 +461,7 @@
             // }
             console.log('value:', value);
             if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '山东诸城迈饶库' || this
-                .deptBudgetList.warehouseName == '克东千红库' || this.warehouseName == '鲅鱼圈祥腾库')) {
+                .deptBudgetList.warehouseName == '克东千红库' || this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库')) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {
@@ -480,7 +480,28 @@
                   this.deptBudgetList.tare = parseInt(result)
                 }
               }
-            } else {
+            } 
+            else if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '顺城粮库')) {
+              for (var i = value.length - 1; i >= 0; i--) {
+                var tmp = String.fromCharCode(value[i])
+                if (tmp == '=') {
+                  flag = true
+                }
+                if (flag && result.length < 9 && tmp != '=') {
+                  result += tmp
+                }
+              }
+              if (this.information == '毛重检斤') {
+                if (parseInt(result) || parseInt(result) == 0) {
+                  this.deptBudgetList.grossWeight = parseInt(result)
+                }
+              } else {
+                if (parseInt(result) || parseInt(result) == 0) {
+                  this.deptBudgetList.tare = parseInt(result)
+                }
+              }
+            }
+            else {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
 

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -493,8 +493,8 @@
             // if(parseInt(result)){
             //     this.dataList.tare = parseInt(result)
             // }
-            if (this.deptBudgetList1.warehouseName && (this.deptBudgetList.warehouseName == '山东诸城迈饶库' || this
-                .deptBudgetList.warehouseName == '克东千红库' || this.warehouseName == '鲅鱼圈祥腾库')) {
+            if (this.deptBudgetList1.warehouseName && (this.deptBudgetList1.warehouseName == '山东诸城迈饶库' || this
+                .deptBudgetList1.warehouseName == '克东千红库' || this.deptBudgetList1.warehouseName == '鲅鱼圈祥腾库')) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {
@@ -507,7 +507,22 @@
               if (parseInt(result) || parseInt(result) == 0) {
                 this.dataList.tare = parseInt(result)
               }
-            } else {
+            }
+            else if (this.deptBudgetList1.warehouseName && (this.deptBudgetList1.warehouseName == '顺城粮库')) {
+              for (var i = value.length - 1; i >= 0; i--) {
+                var tmp = String.fromCharCode(value[i])
+                if (tmp == '=') {
+                  flag = true
+                }
+                if (flag && result.length < 9 && tmp != '=') {
+                  result += tmp
+                }
+              }
+              if (parseInt(result) || parseInt(result) == 0) {
+                this.dataList.tare = parseInt(result)
+              }
+            }
+            else {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
 

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -430,7 +430,7 @@
             //     this.dataList.grossWeight = parseInt(result)
             // }
             if (this.deptBudgetList1.warehouseName && (this.deptBudgetList.warehouseName == '山东诸城迈饶库' || this
-                .deptBudgetList.warehouseName == '克东千红库' || this.warehouseName == '鲅鱼圈祥腾库')) {
+                .deptBudgetList1.warehouseName == '克东千红库' || this.deptBudgetList1.warehouseName == '鲅鱼圈祥腾库')) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {
@@ -443,7 +443,22 @@
               if (parseInt(result) || parseInt(result) == 0) {
                 this.dataList.grossWeight = parseInt(result)
               }
-            } else {
+            }
+            else if (this.deptBudgetList1.warehouseName && (this.deptBudgetList1.warehouseName == '顺城粮库')) {
+              for (var i = value.length - 1; i >= 0; i--) {
+                var tmp = String.fromCharCode(value[i])
+                if (tmp == '=') {
+                  flag = true
+                }
+                if (flag && result.length < 9 && tmp != '=') {
+                  result += tmp
+                }
+              }
+              if (parseInt(result) || parseInt(result) == 0) {
+                this.dataList.grossWeight = parseInt(result)
+              }
+            }
+            else {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
 

src/views/warehouse/warehouseManagementTare.vue

@@ -390,7 +390,7 @@
             //   }
             // }
             if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '山东诸城迈饶库' || this
-                .deptBudgetList.warehouseName == '克东千红库' || this.warehouseName == '鲅鱼圈祥腾库')) {
+                .deptBudgetList.warehouseName == '克东千红库' || this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库')) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {
@@ -409,7 +409,28 @@
                   this.deptBudgetList.tare = parseInt(result)
                 }
               }
-            } else {
+            }
+            else if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '顺城粮库')) {
+              for (var i = value.length - 1; i >= 0; i--) {
+                var tmp = String.fromCharCode(value[i])
+                if (tmp == '=') {
+                  flag = true
+                }
+                if (flag && result.length < 9 && tmp != '=') {
+                  result += tmp
+                }
+              }
+              if (this.information == '毛重检斤') {
+                if (parseInt(result) || parseInt(result) == 0) {
+                  this.deptBudgetList.grossWeight = parseInt(result)
+                }
+              } else {
+                if (parseInt(result) || parseInt(result) == 0) {
+                  this.deptBudgetList.tare = parseInt(result)
+                }
+              }
+            }
+            else {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])