更新sdy

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;
       }
@@ -150,14 +150,13 @@
         align-items: center;
       }
       .sfcard-content img {
-        /* height: 50vh; */
         width: 45%;
         height: 50vh;
       }
       .sfcard-title {
         font-size: 28px;
         text-align: center;
-        margin: 50px 0;
+        margin: 10px 0;
       }
       .avatar {
         margin-bottom: 120px;
@@ -171,14 +170,14 @@
     <div id="app">
       <div class="content" v-if="bigContent">
         <div class="sfcard" v-if="isShowPrintType1">
-          <div class="sfcard-title">身份证</div>
+          <div class="sfcard-title">{{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}}</div>
           <div class="sfcard-content">
             <img :src="imageUrl1" class="avatar" />
             <img :src="imageUrl2" class="avatar" />
           </div>
         </div>
         <div class="bankcard" v-if="isShowPrintType2">
-          <div class="sfcard-title">银行卡</div>
+          <div class="sfcard-title">{{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}</div>
           <div class="sfcard-content">
             <img :src="imageUrl3" class="avatar" />
             <img :src="imageUrl4" class="avatar" />
@@ -596,34 +595,35 @@
         let _data = decodeURIComponent(this.getQueryVariable('dataList'))
         this.printData = JSON.parse(_data)
         let _type = decodeURIComponent(this.getQueryVariable('type'))
-        if (sessionStorage.getItem('ws-pf_roleName') == '财务') {
-          this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
-          this.customerList = JSON.parse(decodeURIComponent(this.getQueryVariable('customerList')))
-          this.identity = this.customerList.cardAddressUrl.split(',')
-          this.bank = this.customerList.payeeAddressUrl.split(',')
-          this.imageUrl1 = this.identity[0]
-          this.imageUrl2 = this.identity[1]
-          this.imageUrl3 = this.bank[0]
-          this.imageUrl4 = this.bank[1]
-          let _lsit = this.showType.split(',')
-          for (let i = 0; i < _lsit.length; i++) {
-            switch (_lsit[i]) {
-              case '打印身份证（正反面）':
-                this.isShowPrintType1 = !this.isShowPrintType1
-                break
-              case '打印银行卡（正反面）':
-                this.isShowPrintType2 = !this.isShowPrintType2
-                break
-              case '打印结算凭证':
-                this.isShowPrintType3 = !this.isShowPrintType3
-              case '打印发票':
-                this.isShowPrintType4 = !this.isShowPrintType4
-                break
-            }
+        this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
+        this.customerList = JSON.parse(decodeURIComponent(this.getQueryVariable('customerList')))
+        this.identity = this.customerList.cardAddressUrl.split(',')
+        this.bank = this.customerList.payeeAddressUrl.split(',')
+        this.imageUrl1 = this.identity[0]
+        this.imageUrl2 = this.identity[1]
+        this.imageUrl3 = this.bank[0]
+        this.imageUrl4 = this.bank[1]
+        let _lsit = this.showType.split(',')
+        for (let i = 0; i < _lsit.length; i++) {
+          switch (_lsit[i]) {
+            case '打印身份证（正反面）':
+              this.isShowPrintType1 = !this.isShowPrintType1
+              break
+            case '打印银行卡（正反面）':
+              this.isShowPrintType2 = !this.isShowPrintType2
+              break
+            case '打印结算凭证':
+              this.isShowPrintType3 = !this.isShowPrintType3
+            case '打印发票':
+              this.isShowPrintType4 = !this.isShowPrintType4
+              break
           }
-        }else{
-          this.isShowPrintType3 = true
         }
+        // if (sessionStorage.getItem('ws-pf_roleName') == '财务') {
+         
+        // }else{
+        //   this.isShowPrintType3 = true
+        // }
         if (_type == 2) {
           this.bigContent = true
           this.smallContent = false

public/static/weightCheck.html

@@ -20,7 +20,7 @@
 
       .content {
         width: 1000px;
-        padding: 70px 20px 20px 20px;
+        padding: 30px 20px 20px 20px;
         font-size: 18px;
         position: absolute;
         top: 0;

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,6 +83,8 @@ export const API_GET_INSPECT_GETDRYGRAINPRICE = '/purchasePrice/dryGrainPrice'
 //付款权限查询
 export const API_GET_INSPECT_GETJURISDICTION = '/paymentManagement/selectTaskId'
 //财务开票
+<<<<<<< HEAD
 // export const API_GET_INVOICING = '/paymentManagement/readXmlManagement'
 //财务开票
-export const API_GET_INVOICING = '/paymentManagement/api/readXmlManagement'
+export const API_GET_INVOICING = '/paymentManagement/api/readXmlManagement'
+// export const API_POST_INVOICING ='/paymentManagement/api/readXmlManagement'

src/model/houseSelfCollect/index.js

@@ -43,7 +43,7 @@ import {
   API_GET_CUSTOMER_CODEJY,
   API_GET_INSPECT_GETDRYGRAINPRICE,
   API_GET_INSPECT_GETJURISDICTION,
-  API_GET_INVOICING
+  API_POST_INVOICING
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -132,4 +132,5 @@ export const getJurisdiction  = appRx.get(API_GET_INSPECT_GETJURISDICTION, error
 //财务开票get
 // export const invoicing  = appRx.get(API_GET_INVOICING, errorCatcher, errorHandle, filter)
 //财务开票post
-export const invoicing  = appRx.post(API_GET_INVOICING, errorCatcher, errorHandle, filter)
+export const invoicing  = appRx.post(API_GET_INVOICING, errorCatcher, errorHandle, filter)
+

src/router/index.js

@@ -215,7 +215,7 @@ router.beforeEach(async (to, from, next) => {
       }
     }
     renewalHead(data).toPromise().then(() => {
-      console.log(sessionStorage.getItem('paymentManagementReturn'))
+      console.log('paymentManagementReturn',sessionStorage.getItem('paymentManagementReturn'))
       if(to.name=='settlement'&&sessionStorage.getItem('paymentManagementReturn')=='true'){
         next(`/houseSelfCollect/paymentManagement`);
       }else{
@@ -228,6 +228,7 @@ router.beforeEach(async (to, from, next) => {
       next(`/login?redirect=${to.path}`);
     })
   } else {
+    data.routingUri = to.path
     next()
   }
 })

src/views/contractManagement/purchaseContractExamine.vue

@@ -251,7 +251,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
-        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
      </el-table>
     </ws-form>
     

src/views/contractManagement/salesContractAdd.vue

@@ -338,7 +338,7 @@
         :size-limit="size"
         @onChange="onChange" 
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" 
-        v-hasPermission="`contractManagement.salesContractsalesContractInfo.appl`"/>
+        v-hasPermission="`contractManagement.salesContract.salesContractInfo.appl`"/>
       </ws-form>
       <div v-if="dialogVisible" class="map">
         <map-drag @marker="marker" :isShowaddress="true" v-on:addressListen="getAddress" :type="type">

src/views/contractManagement/salesContractEdit.vue

@@ -342,7 +342,7 @@
           maxlength="200" />
         <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
           @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="
-            `contractManagement.salesContractsalesContractInfo.appl`"/>
+            `contractManagement.salesContract.salesContractInfo.appl`"/>
       </ws-form>
     </div>
     <div v-if="dialogVisible" class="map">

src/views/contractManagement/salesContractExamine.vue

@@ -356,7 +356,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
-        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
      </el-table>
       <div style="text-align: right; padding: 10px">
         <el-button

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

@@ -8,7 +8,7 @@ const customerFundManagementRouter = {
     alwaysShow: true, // will always show the root menu
     meta: {
       title: 'customerFundList',
-    //   module: 'customerManagement.customer.customerInfo',
+      module: 'customerMoneyManagement.customerMoney.view',
       icon: '-kehuzijin'
     },
     children: [
@@ -21,7 +21,7 @@ const customerFundManagementRouter = {
         meta: {
           title: 'customerFundList',
           shortcutEntrance: 'customerFundList',
-        //   module: 'customerManagement.customerFundManagement.customerInfo',
+          module: 'customerMoneyManagement.customerMoney.view',
           permissicon: [],
           keepAlive: true
         },
@@ -36,7 +36,7 @@ const customerFundManagementRouter = {
         meta: {
           title: 'customerFundEdit',
           shortcutEntrance: 'customerFundManagement',
-        //   module: 'customerFundManagement.buyContract.buyContractInfo.edit',
+          module: 'customerMoneyManagement.customerMoney.edit',
           permissicon: [],
           keepAlive: true
         },
@@ -51,7 +51,7 @@ const customerFundManagementRouter = {
         meta: {
           title: 'customerFundAdd',
           shortcutEntrance: 'customerFundManagement',
-        //   module: 'customerFundManagement.buyContract.buyContractInfo.add',
+          module: 'customerMoneyManagement.customerMoney.audit',
           permissicon: [],
           keepAlive: true
           // module: 'procurement.sparepart.applDetail'

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -10,7 +10,7 @@
       <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/views/houseSelfCollect/component/routers/route.js

@@ -120,7 +120,7 @@ const houseSelfCollectRouter = {
       meta: {
         title: 'settlement',
         shortcutEntrance: 'settlement',
-        module: 'acquisitionManagement.acquisitionPay.add',
+        module: 'acquisitionManagement.acquisitionPay.view',
         permissicon: [],
         keepAlive: true
       },

src/views/houseSelfCollect/inspectInfo.vue

@@ -13,7 +13,7 @@
     </el-row>
     <div class="substance">
       <ws-form>
-        <div style="width: 50%; margin: 0 auto">
+        <div style="width: 80%; margin: 0 auto">
           <div class="title">基本信息</div>
           <ws-info-table>
             <ws-form-item label="仓库" span="1" prop="warehouseName">
@@ -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" />
@@ -175,6 +175,7 @@
         },
         disabled: false,
         disabled1: false,
+        disabled2: false,
         types: '1',
         information: '添加初检',
         goodNameList: [],
@@ -192,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 = '添加初检'

src/views/houseSelfCollect/inspectionManagement.vue

@@ -268,6 +268,9 @@
 								this.warehouseCount = _wareHouse.count
 							} 
 						for (let i = 0; i < response.length; i++) {
+							if(_wareHouse && response[i].warehouseName==_wareHouse.value){
+								this.warehouseCount = response[i].count
+							}
 							this.warehouseList.push({
 								value: response[i].warehouseName,
 								id: response[i].id,

src/views/houseSelfCollect/paymentManagement.vue

@@ -126,6 +126,7 @@
         </template>
       </el-table-column>
       <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="300">
+
         <template scope="scope">
           <span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
             <el-button
@@ -137,7 +138,6 @@
               @click="settlement(1, scope.row)"
             >结算</el-button>
           </span>
-
           <el-button
             v-if="scope.row.approveStatus || scope.row.status == '已驳回'"
             @click="settlement(2, scope.row)"
@@ -156,7 +156,7 @@
               scope.row.approveStatus ||
               (scope.row.status != '待结算' && !scope.row.approveStatus)
             "
-            @click="print(scope.row)"
+            @click="print1(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.finace`"
           >财务打印</el-button>
           <el-button
@@ -333,15 +333,56 @@ export default {
   },
   methods: {
     invoicingClick(){
-      let data = JSON.stringify({
+      // let data = JSON.stringify({
+      //   paymentManagementList : this.modification
+      // })
+      // //开票
+      //   invoicing(data)
+      //   .toPromise()
+      //   .then(response => {
+      //     console.log(response)
+      //   })
+      let data = {
         paymentManagementList : this.modification
-      })
+      }
+      console.log('开票',data)
       //开票
-        invoicing(data)
-        .toPromise()
-        .then(response => {
-          console.log(response)
-        })
+      invoicing(data)
+      .toPromise()
+      .then(response => {
+        console.log(response)
+        //未完成，接口调通后替换假数据
+        response = {
+
+        }
+        response.data.imgList = [
+          {
+            name:'xml1',
+            src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
+          },
+            {
+            name:'xml2',
+            src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
+          },  {
+            name:'xml3',
+            src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
+          }
+         ]
+        this.invoicingImgList = response.data.imgList
+        if(response.data.imgList.length>0){
+          for(let i = 0;i<response.data.imgList;i++){
+          //创建标签下载文件
+            let a = document.createElement('a');
+            a.href = response.data.imgList[i].src;
+            let urlArr = a.href.split('.');
+            a.setAttribute('download',response.data.imgList[i].name+'.xml');
+            a.click();
+            a.remove();
+          }
+        }
+      })
+      .catch(() => {
+      })
     },
     selectType(val) {
       for (let i = 0; i < this.ruleForm.type.length; i++) {
@@ -498,7 +539,8 @@ export default {
         searchKeyWord: this.searchKeyWord,
         searchType: searchParam,
         warehouseName: this.warehouseName,
-        managementType: 1
+        managementType: 1,
+        compId: sessionStorage.getItem('ws-pf_compId')
       })
         .toPromise()
         .then(response => {
@@ -732,13 +774,12 @@ export default {
           })
       }
     },
+    print1(row) {
+      this.isShowPrintType = true
+      this.rowData = row
+    },
     print(row) {
-      console.log('打印数据', row)
-      if (sessionStorage.getItem('ws-pf_roleName') == '财务') {
-        this.isShowPrintType = true
-        this.rowData = row
-      } else {
-        getpaymentexamine({ id: row.id })
+      getpaymentexamine({ id: row.id })
           .toPromise()
           .then(response => {
             this.printData = response
@@ -755,7 +796,6 @@ export default {
               date.getDate() +
               '日'
           })
-      }
     },
     examine() {
       if (this.modification.length == 0) {

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() {
@@ -280,7 +282,7 @@
         getweighingList({
             compId: sessionStorage.getItem('ws-pf_compId'),
             currentPage: this.currentPage,
-            pageSize: this.pageSize,
+            pageSize: 100,
             searchKeyWord: '',
             warehouseName: sessionStorage.getItem('ck'),
             managementType: 1
@@ -450,7 +452,8 @@
             // var receData = HexConvert.ByteToString(value);
             // console.log("receData",receData);
             var flag = false;
-            if (this.warehouseName && this.warehouseName == '山东诸城迈饶库') {
+            var flag1 = false;
+            if (this.warehouseName && (this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {
@@ -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/weighing.vue

@@ -213,7 +213,7 @@
 				// else{
 				// 	this.weighingList.tare = parseInt(result) 
 				// }
-				if(this.warehouseName&&this.warehouseName == '山东诸城迈饶库'){
+				if(this.warehouseName&&(this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')){
 					for (var i = 0; i < value.length; i++) {
 						var tmp = String.fromCharCode(value[i])
 						if (tmp == '+') {

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/inOutWarehouseTaskEdit.vue

@@ -383,7 +383,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
-        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
      </el-table>
     </div>
     <!-- 提交 -->

src/views/taskManagement/tranManagementLook.vue

@@ -73,7 +73,17 @@
         :key="index"
         class="datafor"
       >
-        <div class="driver">运输阶段&nbsp;&nbsp;{{ index+1 }}&nbsp;&nbsp;({{ item.processNo }}-{{index +1}})</div>
+        <div class="driver">运输阶段&nbsp;&nbsp;{{ index+1 }}&nbsp;&nbsp;({{ item.processNo }}-{{index +1}})
+          <el-checkbox
+            class="endflag"
+            true-label="1"
+            disabled
+            false-label="0"
+            v-model="item.endFlag"
+            :label="1"
+            >粮款结算阶段</el-checkbox
+          >
+        </div>
         <!-- <div class="neifor"> -->
         <ws-info-table class="el-table">
           <!--运输方式-->

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

@@ -82,7 +82,7 @@
               @click="editClick(scope.row)" alt />
           </template>
         </el-table-column>
-        <el-table-column prop="establishDate" class="table_td" label="创建时间"></el-table-column>
+        <el-table-column prop="establishDate" class="table_td" label="创建时间" width="150"></el-table-column>
         <el-table-column prop="seller" label="操作" width="230">
           <template slot-scope="scope">
             <span class="corles" @click="nocomplete(scope.row)" v-hasPermission="

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -89,17 +89,17 @@
 						</el-select>
 					</el-form-item>
 					<!--容重(克/升)>=-->
-					<el-form-item label="容重(克/升)>=" span="1">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=" span="1">
 						<el-input disabled @input="bulkDensitychange" v-model="dataList.bulkDensity" placeholder="请输入容重"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
 					<!--水分（%）<=-->
-					<el-form-item label="水分（%）<=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
 						<el-input disabled @input="waterContentchange" v-model="dataList.waterContent"
 							placeholder="请输入水分占比" maxlength="120" size="small" class="huom" />
 					</el-form-item>
 					<!--单价(元/吨)-->
-					<el-form-item label="单价(元/吨)">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
 						<el-input disabled @input="unitPricechange" v-model="dataList.unitPrice" placeholder="请输入单价"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
@@ -192,19 +192,19 @@
 						</el-select>
 					</el-form-item>
 					<!--容重(克/升)>=-->
-					<el-form-item label="容重(克/升)>=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
 						<el-input @input="bulkDensitychange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.bulkDensity" placeholder="请输入容重" maxlength="120" size="small"
 							class="huom" />
 					</el-form-item>
 					<!--水分（%）<=-->
-					<el-form-item label="水分（%）<=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
 						<el-input @input="waterContentchange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.waterContent" placeholder="请输入水分占比" maxlength="120" size="small"
 							class="huom" />
 					</el-form-item>
 					<!--单价(元/吨)-->
-					<el-form-item label="单价(元/吨)">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
 						<el-input @input="unitPricechange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.unitPrice" placeholder="请输入单价" maxlength="120" size="small"
 							class="huom" />
@@ -300,19 +300,19 @@
 						</el-select>
 					</el-form-item>
 					<!--容重(克/升)>=-->
-					<el-form-item label="容重(克/升)>=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
 						<el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.bulkDensity" placeholder="请输入容重" maxlength="120" size="small"
 							class="huom" />
 					</el-form-item>
 					<!--水分（%）<=-->
-					<el-form-item label="水分（%）<=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
 						<el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.waterContent" placeholder="请输入水分占比" maxlength="120" size="small"
 							class="huom" />
 					</el-form-item>
 					<!--单价(元/吨)-->
-					<el-form-item label="单价(元/吨)">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
 						<el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.unitPrice" placeholder="请输入单价" maxlength="120" size="small"
 							class="huom" />
@@ -1069,86 +1069,6 @@
 						})
 						return
 					}
-					if (!this.dataList1.bulkDensity) {
-						this.$message({
-							message: '容重不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						this.dataList1.bulkDensity < 500 ||
-						this.dataList1.bulkDensity > 1000
-					) {
-						this.$message({
-							message: '容重输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
-						String(this.dataList1.bulkDensity).length -
-						(String(this.dataList1.bulkDensity).indexOf('.') + 1) >
-						0
-					) {
-						this.$message({
-							message: '容重需输入整数',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.waterContent) {
-						this.$message({
-							message: '水分不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						this.dataList1.waterContent < 0 ||
-						this.dataList1.waterContent > 40
-					) {
-						this.$message({
-							message: '水分输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						String(this.dataList1.waterContent).indexOf('.') != -1 &&
-						String(this.dataList1.waterContent).length -
-						(String(this.dataList1.waterContent).indexOf('.') + 1) >
-						1
-					) {
-						this.$message({
-							message: '水分输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.unitPrice) {
-						this.$message({
-							message: '单价不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						(this.dataList1.unitPrice &&
-							String(this.dataList1.unitPrice).indexOf('.') != -1 &&
-							String(this.dataList1.unitPrice).length -
-							(String(this.dataList1.unitPrice).indexOf('.') + 1) >
-							2) ||
-						this.dataList1.unitPrice > 100000 ||
-						this.dataList1.unitPrice < 1
-					) {
-						this.$message({
-							message: '单价输入错误',
-							type: 'warning'
-						})
-						return
-					}
 					if (!this.dataList.predictDate) {
 						this.$message({
 							message: '预计出库日期不能为空！',
@@ -1494,6 +1414,7 @@
 					this.inOutTaskNo = 'YKC' + random
 					this.inOutTaskNo1 = 'YKR' + random
           this.dataList.moveTaskNo = 'YKRW' + random
+		   this.dataList1.moveTaskNo = 'YKRW' + random
 				} else if (this.dataList.taskTypeKey == 4) {
 					var random = this.getdate() + this.MathRand()
 					this.inOutTaskNo = 'TCC' + random
@@ -1598,7 +1519,7 @@
 				//     this.deliveryType = response
 				//   })
 				//仓库名
-				debugger
+				// debugger
 				getwarehousename({
 						compId: this.compId,
 						warehouseType: 1
@@ -1775,7 +1696,6 @@
 		position: relative;
 		top: 50px;
 		width: 40%;
-		height: 2000px;
 		margin: 0 auto;
 		margin-right: 180px;
 	}

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -201,7 +201,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               v-model="dataList.bulkDensity"
@@ -212,7 +212,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
             <el-input
               @input="waterContentchange"
               v-model="dataList.waterContent"
@@ -223,7 +223,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
             <el-input
               @input="unitPricechange"
               v-model="dataList.unitPrice"
@@ -454,7 +454,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               :disabled="dataList.taskTypeKey == 3"
@@ -466,7 +466,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
             <el-input
               @input="waterContentchange"
               :disabled="dataList.taskTypeKey == 3"
@@ -478,7 +478,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
             <el-input
               @input="unitPricechange"
               :disabled="dataList.taskTypeKey == 3"
@@ -694,7 +694,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               disabled
               v-model="dataList.bulkDensity"
@@ -705,7 +705,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<="
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<="
             <el-input
               disabled
               v-model="dataList.waterContent"
@@ -716,7 +716,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
             <el-input
               disabled
               v-model="dataList.unitPrice"
@@ -804,7 +804,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="createTime" label="审核时间"></el-table-column>
-      <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+      <el-table-column prop="auditMind" label="审核意见"></el-table-column>
     </el-table>
     <WinseaContentModal
       v-model="outerVisible"

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -170,7 +170,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               v-model="dataList.bulkDensity"
@@ -181,7 +181,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
               @input="waterContentchange"
               v-model="dataList.waterContent"
@@ -192,7 +192,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
             <el-input
               @input="unitPricechange"
               v-model="dataList.unitPrice"
@@ -375,7 +375,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               :disabled="dataList.taskTypeKey == 3"
@@ -387,7 +387,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
               @input="waterContentchange"
               :disabled="dataList.taskTypeKey == 3"
@@ -399,7 +399,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
             <el-input
               @input="unitPricechange"
               :disabled="dataList.taskTypeKey == 3"
@@ -582,7 +582,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               :disabled="dataList.taskTypeKey == 3||dataList.taskTypeKey == 4"
               v-model="dataList.bulkDensity"
@@ -593,7 +593,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
               :disabled="dataList.taskTypeKey == 3||dataList.taskTypeKey == 4"
               v-model="dataList.waterContent"
@@ -604,7 +604,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
             <el-input
               :disabled="dataList.taskTypeKey == 3||dataList.taskTypeKey == 4"
               v-model="dataList.unitPrice"
@@ -1271,7 +1271,8 @@ export default {
           })
           return
         }
-        if (!this.dataList1.bulkDensity) {
+        if( this.dataList.taskTypeKey != 3||this.dataList1.taskTypeKey != 3){
+          if (!this.dataList1.bulkDensity) {
           this.$message({
             message: '容重不能为空！',
             type: 'warning'
@@ -1351,6 +1352,8 @@ export default {
           })
           return
         }
+        }
+        
         if (!this.dataList.predictDate) {
           this.$message({
             message: '预计出库日期不能为空！',

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

@@ -112,7 +112,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementVehicle',
         shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.vehicleDispatching',
+        module: 'tranManager.vehicleDispatching',
         permissicon: [],
         keepAlive: true
       },
@@ -187,7 +187,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementVehicleDispatching',
         shortcutEntrance: 'transportationTask',
-        module: 'transportationTask.transportation.vehicleDispatching.car',
+        module: 'tranManager.vehicleDispatching.car',
         permissicon: [],
         keepAlive: true
       },
@@ -202,7 +202,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementVehicleLook',
         shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.vehicleDispatching.view',
+        module: 'tranManager.vehicleDispatching.view',
         permissicon: [],
         keepAlive: true
       },

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -241,7 +241,7 @@
                 label="卸车日期:"
                 span="1"
                 prop="receiveDateEnd"
-                style="width: 275px"
+                style="width: 340px"
               >
                 <ws-date-picker
                   v-model="item.receiveDateEnd"
@@ -801,7 +801,7 @@ export default {
   left: 0;
 }
 .el-form {
-  padding: 0 10%;
+  padding: 0 5%;
 }
 .el-button--primary {
   background-color: #5878e8;

src/views/tranManagement/tranManagementVehicle.vue

@@ -149,10 +149,10 @@
         <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
             <div v-hasPermission="
-                'transportationTask.transportation.vehicleDispatching.view'
+                'tranManager.vehicleDispatching.view'
               " class="record" @click="nocomplete(scope.row)">查看</div>
             <div v-hasPermission="
-                'transportationTask.transportation.vehicleDispatching.car'
+                'tranManager.vehicleDispatching.car'
               " class="adjustment" @click="warehousing(scope.row)">派车</div>
           </template>
         </el-table-column>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -115,7 +115,7 @@
               <div v-if="deptBudgetList.priceStatus=='审核中'">
                 <el-button
               type="primary"
-              v-hasPermission="`tranManager.transportationInfo.exe`"
+              v-hasPermission="`tranManager.vehicleDispatching.price`"
               size="small"
               @click="examine()"
               >审核中</el-button

src/views/warehouse/warehouseManagementGross.vue

@@ -652,6 +652,9 @@ export default {
         addressUrl:'',
         warehouseInOutDetail: {},
         deductionAmount:0,
+        deductionWeight:0,
+        grossWeight:0,
+        tare:0
       },
       historyList: [],
       cost:'',
@@ -663,7 +666,8 @@ export default {
       accessoryTFs: false,
       allowEdit: true,
       param: 9600,
-      information:''
+      information:'',
+      result1 : '00'
     }
   },
   mounted() {
@@ -738,6 +742,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 +762,17 @@ export default {
           //   }
           // }
           console.log('value:',value);
-
-          if(this.warehouseName&&this.warehouseName == '山东诸城迈饶库'){
+          if(this.deptBudgetList.warehouseName&&(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 +785,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)
               }
             }
           }
@@ -881,7 +892,7 @@ export default {
       for (let i = 0; i < this.tranCarInfoList.length; i++) {
         if (this.tranCarInfoList[i].carNo == this.deptBudgetList.carNo) {
           this.deptBudgetList.tranCarNo=this.tranCarInfoList[i].tranCarNo
-          this.deptBudgetList.freight = this.tranCarInfoList[i].tranPrice
+          this.deptBudgetList.freight = Math.round(this.tranCarInfoList[i].tranPrice)
         }
       }
     },
@@ -1195,13 +1206,13 @@ export default {
       //   })
       //   return
       // }
-      if (!this.deptBudgetList.addressUrl) {
-        this.$message({
-          message: '附件不能为空',
-          type: 'warning',
-        })
-        return
-      }
+      // if (!this.deptBudgetList.addressUrl) {
+      //   this.$message({
+      //     message: '附件不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
       //自检员
       if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
         if (
@@ -1398,7 +1409,6 @@ export default {
         }
       }
       console.log(this.deptBudgetList, '入库对象')
-      this.deptBudgetList.id = this.$route.query.id
       this.$confirm(`确定提交入库信息`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -1412,15 +1422,36 @@ export default {
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.pcFlag = 1
               this.deptBudgetList.statusFlag = 3
-              his.deptBudgetList.grossWeight /= 1000
-                this.deptBudgetList.tare /= 1000
-                this.deptBudgetList.netWeight /= 1000
-                this.deptBudgetList.pureWeight /= 1000
-                this.deptBudgetList.deductionAmount *= 1000
-                this.deptBudgetList.deductionWeight /= 1000
+              this.deptBudgetList.grossWeight = (this.deptBudgetList.grossWeight/1000).toFixed(2)
+              this.deptBudgetList.tare = (this.deptBudgetList.tare/1000).toFixed(2)
+              this.deptBudgetList.netWeight = (this.deptBudgetList.netWeight/1000).toFixed(2)
+              if(!this.deptBudgetList.pureWeight){
+                this.deptBudgetList.pureWeight = 0
+              }
+              this.deptBudgetList.pureWeight = (this.deptBudgetList.pureWeight/1000).toFixed(2)
+              if(!this.deptBudgetList.deductionWeight){
+                this.deptBudgetList.deductionWeight = 0
+              }
+              if(!this.deptBudgetList.deductionAmount){
+                this.deptBudgetList.deductionAmount = 0
+              }
+              this.deptBudgetList.deductionWeight = (this.deptBudgetList.deductionWeight/1000).toFixed(2)
+              this.deptBudgetList.deductionAmount = Math.round(this.deptBudgetList.deductionAmount*1000)
+              
+              // this.deptBudgetList.grossWeight /= 1000
+              //   this.deptBudgetList.tare /= 1000
+              //   this.deptBudgetList.netWeight /= 1000
+              //   this.deptBudgetList.pureWeight /= 1000
+              //   this.deptBudgetList.deductionAmount *= 1000
+              //   this.deptBudgetList.deductionWeight /= 1000
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {
+                  // this.deptBudgetList.grossWeight = Math.round(this.dataList.grossWeight*1000)
+                  // this.deptBudgetList.tare = Math.round(this.dataList.tare*1000)
+                  // this.deptBudgetList.netWeight = Math.round(this.dataList.netWeight*1000)
+                  // this.deptBudgetList.pureWeight = Math.round(this.dataList.pureWeight*1000)
+                  // this.deptBudgetList.deductionWeight = Math.round(this.dataList.deductionWeight*1000)
                   this.$message.success('添加成功')
                   this.$router.push({ path: 'warehouseManagementList' })
                 })

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -594,7 +594,8 @@ export default {
       },
       accessoryTFs: false,
       param: 9600,
-      allowEdit:true
+      allowEdit:true,
+      result1:'00'
     }
   },
   activated() {
@@ -609,14 +610,14 @@ export default {
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
     this.getList()
     this.dataList.id = this.$route.query.id
-    this.dataList.grossWeight = this.$route.query.grossWeight*1000
+    this.dataList.grossWeight = Math.round(this.$route.query.grossWeight*1000)
     this.dataList.contractNo = this.$route.query.contractNo
     this.dataList.baseId = this.$route.query.baseId
     this.dataList.positionId = this.$route.query.positionId
     this.dataList.warehouseName = this.$route.query.warehouseName
     this.dataList.binNumber = this.$route.query.binNumber
-    this.dataList.tare = this.$route.query.tare*1000
-    this.dataList.netWeight = this.$route.query.netWeight*1000
+    this.dataList.tare = Math.round(this.$route.query.tare*1000)
+    this.dataList.netWeight = Math.round(this.$route.query.netWeight*1000)
     this.dataList.grade = this.$route.query.grade
     this.dataList.agent = this.$route.query.agent
     this.dataList.carNo = this.$route.query.carNo
@@ -639,9 +640,9 @@ export default {
     this.dataList.buckleWeightRatio=this.$route.query.buckleWeightRatio
     this.dataList.tidalGrainWater=this.$route.query.tidalGrainWater
     this.dataList.solidGrainWater=this.$route.query.solidGrainWater
-    this.dataList.pureWeight=this.$route.query.pureWeight*1000
+    this.dataList.pureWeight=Math.round(this.$route.query.pureWeight*1000)
     this.dataList.deductionAmount=this.$route.query.deductionAmount/1000
-    this.dataList.deductionWeight=this.$route.query.deductionWeight*1000
+    this.dataList.deductionWeight=Math.round(this.$route.query.deductionWeight*1000)
     this.dataList.inOutTypeFlag=1
     this.dataList.inOutTaskNo = this.$route.query.inOutTaskNo
     if(this.dataList.cost){
@@ -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.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.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)
@@ -1362,24 +1371,31 @@ export default {
         .then(() => {
           this.$refs.dataList.validate((valid) => {
             if (valid) {
+              debugger
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
               this.dataList.inOutFlag = 2
               this.dataList.statusFlag = 3
-              this.dataList.grossWeight /= 1000
-              this.dataList.tare /= 1000
-              this.dataList.netWeight /= 1000
-              this.dataList.pureWeight /= 1000
+              this.dataList.grossWeight = (this.dataList.grossWeight/1000).toFixed(2)
+              this.dataList.tare = (this.dataList.tare/1000).toFixed(2)
+              this.dataList.netWeight = (this.dataList.netWeight/1000).toFixed(2)
+              this.dataList.pureWeight = (this.dataList.pureWeight/1000).toFixed(2)
               if(!this.dataList.deductionWeight){
                 this.dataList.deductionWeight = 0
               }
               if(!this.dataList.deductionAmount){
                 this.dataList.deductionAmount = 0
               }
-              this.dataList.deductionWeight /= 1000
-              this.dataList.deductionAmount *= 1000
+              this.dataList.deductionWeight = (this.dataList.deductionWeight/1000).toFixed(2)
+              this.dataList.deductionAmount = Math.round(this.dataList.deductionAmount*1000)
+
               addstorageputList(this.dataList)
                 .toPromise()
                 .then((response) => {
+                  this.dataList.grossWeight = Math.round(this.dataList.grossWeight*1000)
+                  this.dataList.tare = Math.round(this.dataList.tare*1000)
+                  this.dataList.netWeight = Math.round(this.dataList.netWeight*1000)
+                  this.dataList.pureWeight = Math.round(this.dataList.pureWeight*1000)
+                  this.dataList.deductionWeight = Math.round(this.dataList.deductionWeight*1000)
                   this.$message.success('提交成功')
                   this.$confirm(`是否打印磅单`, {
                     cancelButtonText: '取消',
@@ -1394,8 +1410,9 @@ export default {
                         .then((response) => {
                             window.open( '../../../../static/weightCheckInOut.html?type=2&tableData=' +JSON.stringify(response))
                         })
-                      this.$router.push({ path: 'warehouseManagementList' })
+                      
                     })
+                    this.$router.push({ path: 'warehouseManagementList' })
                     .catch(() => {
                       return false
                     })

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -506,7 +506,8 @@ export default {
       },
       accessoryTFs: false,
       param: 9600,
-      allowEdit:true
+      allowEdit:true,
+      result1:'00'
     }
   },
   activated() {
@@ -520,14 +521,14 @@ export default {
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
     this.getList()
     this.dataList.id = this.$route.query.id
-    this.dataList.grossWeight = this.$route.query.grossWeight*1000
+    this.dataList.grossWeight = Math.round(this.$route.query.grossWeight*1000)
     this.dataList.contractNo = this.$route.query.contractNo
     this.dataList.baseId = this.$route.query.baseId
     this.dataList.positionId = this.$route.query.positionId
     this.dataList.warehouseName = this.$route.query.warehouseName
     this.dataList.binNumber = this.$route.query.binNumber
-    this.dataList.tare = this.$route.query.tare*1000
-    this.dataList.netWeight = this.$route.query.netWeight*1000
+    this.dataList.tare = Math.round(this.$route.query.tare*1000)
+    this.dataList.netWeight = Math.round(this.$route.query.netWeight*1000)
     this.dataList.grade = this.$route.query.grade
     this.dataList.agent = this.$route.query.agent
     this.dataList.carNo = this.$route.query.carNo
@@ -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.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.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/warehouseManagementRecord.vue

@@ -43,7 +43,7 @@
 					<img v-if="status == 3" width="18" height="18" src="../../../public/img/radio-check.png"
 						alt="" />入库记录
 				</div>
-				<el-table :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'">
+				<el-table show-summary :summary-method="getSummaries"   :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'">
 					<el-table-column type="expand">
 						<template #default="props">
 							<ws-form ref="deptBudgetList" :model="deptBudgetList">
@@ -133,7 +133,7 @@
 						<template slot-scope="scope">
 							<!-- <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
 								src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" /> -->
-          					<el-button @click="print(scope.row)"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
+          					<el-button @click="print(scope.row)" v-if="scope.row.inOutType != '收购入库'"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
 
 						</template>
 					</el-table-column>
@@ -144,7 +144,7 @@
 					</el-table-column>
 
 				</el-table>
-				<el-table :data="warehouseList.records" height="560" v-show="this.warehouseType== '2'">
+				<el-table show-summary :summary-method="getSummaries" :data="warehouseList.records" height="560" v-show="this.warehouseType== '2'">
 					<el-table-column type="expand">
 						<template #default="props">
 							<ws-form ref="deptBudgetList" :model="deptBudgetList">
@@ -354,6 +354,34 @@
 			this.showType = this.isShow
 		},
 		methods: {
+			//合计
+			getSummaries(param) {
+				const { columns, data } = param
+				const sums = []
+				columns.forEach((column, index) => {
+					if (index === 0) {
+						sums[index] = '合计'
+					} else if (
+						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)
+								if (!isNaN(value)) {
+									return prev + curr
+								} else {
+									return prev
+								}
+								}, 0)
+							sums[index] = sums[index].toFixed(3)
+						}
+					} else {
+						sums[index] = '--'
+					}
+				})
+				return sums
+			},
 			print(row){
 				getPrintInfo({
                         id: row.id

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 == '山东诸城迈饶库'||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)
               }
             }
           }
@@ -1212,7 +1223,7 @@ export default {
       }
       if (
         this.deptBudgetList.contractNo.length < 6 ||
-        this.deptBudgetList.contractNo.length > 20
+        this.deptBudgetList.contractNo.length > 50
       ) {
         this.$message({
           message: '合同编号输入有误！',

vue.config.js

@@ -141,10 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.107:8090/',
-        // target: 'http://192.168.1.115:8090/',
-        // target: 'http://192.168.1.107/:8090/',
-        // target: 'http://192.168.1.122:9100/',
+        target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',