Почетна Преглед Помоћ
Регистрација Пријавите се
gdc
/
yiliangyiyun-pc
1
0
Креирај огранак 0
Датотеке Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

前端 sdy

zhongtianhaoyuan пре 3 година
родитељ
0f016b0e63
комит
6734947429
10 измењених фајлова са 71 додато и 175 уклоњено
Један поглед Покажи статистику Diff
  1. 2 71
      public/static/tradeServicesPrint.html
  2. 1 1
      src/api/V2/tradeServicesManagement/index.js
  3. 0 2
      src/model/tradeServicesManagement/index.js
  4. 8 2
      src/views/tradeServicesManagement/approveWarehouseReceipt.vue
  5. 16 41
      src/views/tradeServicesManagement/inOutRecord.vue
  6. 8 2
      src/views/tradeServicesManagement/reviewWarehouseReceipt.vue
  7. 10 18
      src/views/tradeServicesManagement/warehouseReceiptAdd.vue
  8. 7 12
      src/views/tradeServicesManagement/warehouseReceiptEdit.vue
  9. 18 25
      src/views/tradeServicesManagement/warehouseReceiptRegulation.vue
  10. 1 1
      src/views/tranManagement/tranManagementVehicleDispatching.vue

+ 2 - 71
public/static/tradeServicesPrint.html
Прегледај датотеку 

@@ -179,7 +179,7 @@
 
   <body>
 
   <body>
 
     <div id="app">
 
     <div id="app">
 
       <div v-for="(item,index) in printData" :key="index">
 
       <div v-for="(item,index) in printData" :key="index">
 
-        <div v-if="item.printType == '打印磅单'" class="center">
 
+        <div class="center">
 
             <div class="title">磅码单</div>
 
             <div class="title">磅码单</div>
 
             <div class="title">{{item.code}}</div>
 
             <div class="title">{{item.code}}</div>
 
             <table class="table">
 
             <table class="table">
 
@@ -220,8 +220,7 @@
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
       <div v-for="(item,index) in printData1" :key="index">
 
       <div v-for="(item,index) in printData1" :key="index">
 
-
 
-      <div  v-if="item.printType == '打印结算单'" class="center">
 
+      <div class="center">
 
         <div class="title">中天昊元粮食贸易有限公司结算凭证</div>
 
         <div class="title">中天昊元粮食贸易有限公司结算凭证</div>
 
         <!-- {{customerInfo}} -->
 
         <!-- {{customerInfo}} -->
 
         <div class="header">
 
         <div class="header">
 
@@ -444,74 +443,6 @@
 
         this.printData1 = JSON.parse(sessionStorage.getItem('inOutRecord_printJSD'))
 
         this.printData1 = JSON.parse(sessionStorage.getItem('inOutRecord_printJSD'))
 
         console.log("磅单",this.printData)
 
         console.log("磅单",this.printData)
 
         console.log("结算单",this.printData1)
 
         console.log("结算单",this.printData1)
 
-
 
-        // if (!_data) {
 
-        //   this.selectPrint = true;
 
-        //   this.printData1 = JSON.parse(sessionStorage.getItem('selectPrint_selectPrintList'))
 
-        // } else {
 
-        //   this.printData = JSON.parse(_data)
 
-        //   console.log("打印磅单",this.printData)
 
-        //   this.selectPrint = false;
 
-        // }
 
-
 
-        // let _type = decodeURIComponent(this.getQueryVariable('type'))
 
-        // this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
 
-        // let _data1 = decodeURIComponent(this.getQueryVariable('customerList'))
 
-        // if (!_data1) {
 
-        //   this.customerList1 = JSON.parse(localStorage.getItem('selectPrint_selectCustomerList'))
 
-        // } else {
 
-        //   this.customerList = JSON.parse(_data1)
 
-        // }
 
-        // var cwprint = localStorage.getItem('cwprint')
 
-        // if (cwprint == "true") {
 
-        //   if (this.selectPrint) {
 
-        //     for (let i = 0; i < this.customerList1.length; i++) {
 
-        //       let _url1 = this.customerList1[i].cardAddressUrl.split(',')
 
-        //       let _url2 = this.customerList1[i].payeeAddressUrl.split(',')
 
-        //       this.customerList1[i].imgURl = {
 
-        //         imageUrl1: _url1[0],
 
-        //         imageUrl2: _url1[1],
 
-        //         imageUrl3: _url2[0],
 
-        //         imageUrl4: _url2[0]
 
-        //       }
 
-        //     }
 
-
 
-        //   } else {
 
-        //     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 (_type == 2) {
 
-        //   this.bigContent = true
 
-        //   this.smallContent = false
 
-        // } else {
 
-        //   this.smallContent = true
 
-        //   this.bigContent = false
 
-        // }
 
-
 
         // document.title = this.printData.compName + '结算凭证'
 
         // document.title = this.printData.compName + '结算凭证'
 
         window.print()
 
         window.print()
 
         window.onafterprint = function(event) {
 
         window.onafterprint = function(event) {

+ 1 - 1
src/api/V2/tradeServicesManagement/index.js
Прегледај датотеку 

@@ -13,7 +13,7 @@ export const API_POST_WAREHOUSE_EDIT = '/warehouseBaseInfo/getWarehouse'
 
 // 获取业务编号
 
 // 获取业务编号
 
 export const API_GET_BILLNO = '/tradeWarehouseReceiptAppl/getBillNo'
 
 export const API_GET_BILLNO = '/tradeWarehouseReceiptAppl/getBillNo'
 
 // 列表页删除
 
 // 列表页删除
 
-export const API_POST_DELETETRANEINFO = '/tradeWarehouseReceiptAppl/deleteTrageInfo'
 
+export const API_POST_DELETETRANEINFO = '/tradeWarehouseReceiptAppl/api/deleteTrageInfo'
 
 
 
 // 出入库记录
 
 // 出入库记录
 
 export const API_GET_RECORD = 'warehouseInOutInfo/selectInfo'
 
 export const API_GET_RECORD = 'warehouseInOutInfo/selectInfo'

+ 0 - 2
src/model/tradeServicesManagement/index.js
Прегледај датотеку 

@@ -19,8 +19,6 @@ import {
 
     API_POST_REPAYMENT_SUBMIT,
 
     API_POST_REPAYMENT_SUBMIT,
 
     API_GET_WAREHOUSERECEIPT_BANKLIST
 
     API_GET_WAREHOUSERECEIPT_BANKLIST
 
 } from '@/api/V2/tradeServicesManagement'
 
 } from '@/api/V2/tradeServicesManagement'
 
-
 
-
 
 // 列表
 
 // 列表
 
 export const getList = appRx.get(API_GET_TRADESERVICES_LIST, errorCatcher, errorHandle, filter)
 
 export const getList = appRx.get(API_GET_TRADESERVICES_LIST, errorCatcher, errorHandle, filter)
 
 export const getMapInfo = appRx.get(API_GET_MAPINFO, errorCatcher, errorHandle, filter)
 
 export const getMapInfo = appRx.get(API_GET_MAPINFO, errorCatcher, errorHandle, filter)

+ 8 - 2
src/views/tradeServicesManagement/approveWarehouseReceipt.vue
Прегледај датотеку 

@@ -317,8 +317,8 @@
 
         </el-table-column>
 
         </el-table-column>
 
         <el-table-column prop="inOutTaskNo" label="审核结果">
 
         <el-table-column prop="inOutTaskNo" label="审核结果">
 
           <template scope="scope">
 
           <template scope="scope">
 
-            <span v-if="scope.row.approved">通过</span>
 
-            <span v-if="!scope.row.approved">驳回</span>
 
+            <span v-if="scope.row.approved" class="examine1">通过</span>
 
+            <span v-if="!scope.row.approved" class="examine2">驳回</span>
 
           </template>
 
           </template>
 
         </el-table-column>
 
         </el-table-column>
 
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
 
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
 
@@ -785,4 +785,10 @@ export default {
 
     margin-left: 10px;
 
     margin-left: 10px;
 
 	}
 
 	}
 
 }
 
 }
 
+.examine1{
 
+    color: #50CAD4;
 
+  }
 
+   .examine2{
 
+    color: #FF9F24;
 
+  }
 
 </style>
 
 </style>

+ 16 - 41
src/views/tradeServicesManagement/inOutRecord.vue
Прегледај датотеку 

@@ -538,11 +538,15 @@ export default {
 
       console.log(this.ruleForm.type)
 
       console.log(this.ruleForm.type)
 
     },
 
     },
 
     typePrintClick(selection) {
 
     typePrintClick(selection) {
 
-
 
+      sessionStorage.removeItem('inOutRecord_printBD')
 
+      sessionStorage.removeItem('inOutRecord_printJSD')
 
+      this.printList = []
 
+      this.printList1 = []
 
+      this.count = 0
 
        for(let j = 0 ; j < this.ruleForm.type.length ; j++){
 
        for(let j = 0 ; j < this.ruleForm.type.length ; j++){
 
           if(this.ruleForm.type[j] == "打印磅单"){
 
           if(this.ruleForm.type[j] == "打印磅单"){
 
               for(let i = 0 ; i < selection.length ; i++){
 
               for(let i = 0 ; i < selection.length ; i++){
 
-                selection[i].printType = "打印磅单"
 
+                // selection[i].printType = "打印磅单"
 
               selection[i].code = this.getdate() + selection[i].commonWarehouseNo + this.verifyinit()
 
               selection[i].code = this.getdate() + selection[i].commonWarehouseNo + this.verifyinit()
 
                  this.printList.push(selection[i])
 
                  this.printList.push(selection[i])
 
               }
 
               }
 
@@ -557,44 +561,29 @@ export default {
 
             this.printSettlementSheet(selection)
 
             this.printSettlementSheet(selection)
 
           }
 
           }
 
         }
 
         }
 
-        
-        for(let num = 0 ; num < selection.length ; num++){
 
-          if(this.count == selection.length){
 
+        if(this.ruleForm.type.length == 1 && this.ruleForm.type[0] == "打印磅单"){
 
             sessionStorage.setItem('inOutRecord_printBD', JSON.stringify(this.printList))
 
             sessionStorage.setItem('inOutRecord_printBD', JSON.stringify(this.printList))
 
-            sessionStorage.setItem('inOutRecord_printJSD', JSON.stringify(this.printList1))
 
-              window.open('../../../../../static/tradeServicesPrint.html')
 
-          }
 
+             window.open('../../../../../static/tradeServicesPrint.html')
 
         }
 
         }
 
     },
 
     },
 
     async printSettlementSheet(list){
 
     async printSettlementSheet(list){
 
       for(let i = 0 ; i < list.length ; i++ ){
 
       for(let i = 0 ; i < list.length ; i++ ){
 
-        // if(list[i].paymentId){
 
            getpaymentexamine({ id: list[i].paymentId })
 
            getpaymentexamine({ id: list[i].paymentId })
 
                .toPromise()
 
                .toPromise()
 
                .then((res) => {
 
                .then((res) => {
 
-                 console.log(res)
 
-                 res.printType = "打印结算单"
 
+                //  res.printType = "打印结算单"
 
                 this.printList1.push(res)
 
                 this.printList1.push(res)
 
                 this.count++
 
                 this.count++
 
+                 if(this.count == list.length){
 
+                   sessionStorage.setItem('inOutRecord_printBD', JSON.stringify(this.printList))
 
+                    sessionStorage.setItem('inOutRecord_printJSD', JSON.stringify(this.printList1))
 
+                    console.log("磅单",this.printList)
 
+                    console.log("结算单",this.printList1)
 
+                   window.open('../../../../../static/tradeServicesPrint.html')
 
+                    }
 
                })
 
                })
 
-        // }
 
-        
       }
 
       }
 
     },
 
     },
 
-    // async tiaozhuan(){
 
-    //   for(let num = 0 ; num < selection.length ; num++){
 
-    //       if(this.count == selection.length){
 
-    //         console.log(this.count , selection.length)
 
-    //         console.log("bang单",this.printList)
 
-    //         console.log("结算单",this.printList1)
 
-    //         sessionStorage.setItem('inOutRecord_printBD', JSON.stringify(this.printList))
 
-    //         sessionStorage.setItem('inOutRecord_printJSD', JSON.stringify(this.printList1))
 
-    //           // window.open('../../../../../static/tradeServicesPrint.html')
 
-    //       }
 
-    //     }
 
-
 
-    // },
 
-
 
     handleSelectionChange(val) {
 
     handleSelectionChange(val) {
 
       this.selection = val
 
       this.selection = val
 
       console.log(val)
 
       console.log(val)
 
@@ -615,24 +604,10 @@ export default {
 
     handleLook(status, item) {
 
     handleLook(status, item) {
 
       if (status == 1) {
 
       if (status == 1) {
 
         this.tableData = item
 
         this.tableData = item
 
-        // getwarehousecount({
 
-        //   positionId:this.deptBudgetList.positionId,
 
-        //   // positionId: "6a46921d2f7a468d9c73663d6c28e294",
 
-        //   inOutFlag:item.inOutFlag
 
-        //   }).toPromise()
 
-        // .then((res) => {
 
-        // var count='000'+(res+1)
 
-        // count=count.substring(count.length-3)
 
         this.tableData.code =
 
         this.tableData.code =
 
           this.getdate() + item.commonWarehouseNo + this.verifyinit()
 
           this.getdate() + item.commonWarehouseNo + this.verifyinit()
 
         this.isCountShow = true
 
         this.isCountShow = true
 
-        // })
 
       } else {
 
       } else {
 
-        // getsettleaccout({id:item.id}).toPromise()
 
-        // .then((res) => {
 
-        //   this.printData=res
 
-        //   this.isShowPrint=true
 
-        // })
 
         getpaymentexamine({ id: item.paymentId })
 
         getpaymentexamine({ id: item.paymentId })
 
           .toPromise()
 
           .toPromise()
 
           .then((res) => {
 
           .then((res) => {

+ 8 - 2
src/views/tradeServicesManagement/reviewWarehouseReceipt.vue
Прегледај датотеку 

@@ -260,8 +260,8 @@
 
         </el-table-column>
 
         </el-table-column>
 
         <el-table-column prop="inOutTaskNo" label="审核结果">
 
         <el-table-column prop="inOutTaskNo" label="审核结果">
 
           <template scope="scope">
 
           <template scope="scope">
 
-            <span v-if="scope.row.approved">通过</span>
 
-            <span v-if="!scope.row.approved">驳回</span>
 
+            <span v-if="scope.row.approved" class="examine1">通过</span>
 
+            <span v-if="!scope.row.approved" class="examine2">驳回</span>
 
           </template>
 
           </template>
 
         </el-table-column>
 
         </el-table-column>
 
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
 
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
 
@@ -557,4 +557,10 @@ export default {
 
   font-weight: 600;
 
   font-weight: 600;
 
   margin: 20px 0;
 
   margin: 20px 0;
 
 }
 
 }
 
+.examine1{
 
+    color: #50CAD4;
 
+  }
 
+   .examine2{
 
+    color: #FF9F24;
 
+  }
 
 </style>
 
 </style>

+ 10 - 18
src/views/tradeServicesManagement/warehouseReceiptAdd.vue
Прегледај датотеку 

@@ -209,7 +209,7 @@
 
             this.goodsList = response[0].goodsNameInfos
 
             this.goodsList = response[0].goodsNameInfos
 
             this.deptBudgetList.nowWeight = response[0].goodsNameInfos.length != 0 ? response[0].goodsNameInfos[0]
 
             this.deptBudgetList.nowWeight = response[0].goodsNameInfos.length != 0 ? response[0].goodsNameInfos[0]
 
               .storage : ''
 
               .storage : ''
 
-            this.deptBudgetList.useWeight = response[0].goodsNameInfos[0].useWeight
 
+            this.deptBudgetList.useWeight = response[0].goodsNameInfos[0].useStorage
 
             // this.deptBudgetList.useWeight = '10'
 
             // this.deptBudgetList.useWeight = '10'
 
             this.deptBudgetList.goodsName = response[0].goodsNameInfos.length != 0 ? response[0].goodsNameInfos[0]
 
             this.deptBudgetList.goodsName = response[0].goodsNameInfos.length != 0 ? response[0].goodsNameInfos[0]
 
               .goodsName : ''
 
               .goodsName : ''
 
@@ -224,12 +224,12 @@
 
       },
 
       },
 
       //货名切换
 
       //货名切换
 
       changeGoodsName(val) {
 
       changeGoodsName(val) {
 
-        console.log(val)
 
         let _data = this.goodsList
 
         let _data = this.goodsList
 
         for (let i = 0; i < _data.length; i++) {
 
         for (let i = 0; i < _data.length; i++) {
 
           if (_data[i].id == val) {
 
           if (_data[i].id == val) {
 
             this.deptBudgetList.goodsNameKey = _data[i].goodsNameKey
 
             this.deptBudgetList.goodsNameKey = _data[i].goodsNameKey
 
             this.deptBudgetList.goodsName = _data[i].goodsName
 
             this.deptBudgetList.goodsName = _data[i].goodsName
 
+            return
 
           }
 
           }
 
         }
 
         }
 
       },
 
       },
 
@@ -272,24 +272,16 @@
 
           if (_data[i].id == val) {
 
           if (_data[i].id == val) {
 
             this.deptBudgetList.warehouseName = _data[i].warehouseName
 
             this.deptBudgetList.warehouseName = _data[i].warehouseName
 
             this.cwNumberList = _data[i].positionInfos.length != 0 ? _data[i].positionInfos : []
 
             this.cwNumberList = _data[i].positionInfos.length != 0 ? _data[i].positionInfos : []
 
-            this.deptBudgetList.warehouseNo = _data[i].positionInfos.length != 0 ? _data[i].positionInfos[0].binNumber :
 
-              ''
 
-            this.deptBudgetList.warehouseAddress = _data[i].warehousePrivate + _data[i].warehouseCity +
 
-              _data[i].warehouseArea + _data[i].detailedAddress
 
+            this.deptBudgetList.warehouseNo = _data[i].positionInfos.length != 0 ? _data[i].positionInfos[0].binNumber : ''
 
+            this.deptBudgetList.warehouseAddress = _data[i].warehousePrivate + _data[i].warehouseCity + _data[i].warehouseArea + _data[i].detailedAddress
 
             this.goodsList = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos : []
 
             this.goodsList = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos : []
 
-            this.deptBudgetList.nowWeight = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos[0].storage :
 
-              ''
 
-            this.deptBudgetList.useWeight =_data[i].goodsNameInfos.length!=0?_data[i].goodsNameInfos[0].useWeight:''
 
-            this.deptBudgetList.useWeight = '10'
 
-            this.deptBudgetList.goodsName = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos[0].goodsName :
 
-              ''
 
+            this.deptBudgetList.nowWeight = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos[0].storage : ''
 
+            this.deptBudgetList.useWeight =_data[i].goodsNameInfos.length!=0?_data[i].goodsNameInfos[0].useStorage:''
 
+            this.deptBudgetList.goodsName = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos[0].goodsName : ''
 
             this.deptBudgetList.warehouseId = _data[i].id
 
             this.deptBudgetList.warehouseId = _data[i].id
 
-            this.deptBudgetList.goodsNameKey = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos[0]
 
-              .goodsNameKey : ''
 
-              this.deptBudgetList.warehouseNoId = _data[i].positionInfos.length != 0 ? _data[i].positionInfos[0]
 
-                .id : ''
 
-                this.deptBudgetList.baseId = _data[i].positionInfos.length != 0 ? _data[i].positionInfos[0]
 
-                  .baseId : ''
 
+            this.deptBudgetList.goodsNameKey = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos[0].goodsNameKey : ''
 
+            this.deptBudgetList.warehouseNoId = _data[i].positionInfos.length != 0 ? _data[i].positionInfos[0].id : ''
 
+            this.deptBudgetList.baseId = _data[i].positionInfos.length != 0 ? _data[i].positionInfos[0].baseId : ''
 
           }
 
           }
 
         }
 
         }
 
       },
 
       },

+ 7 - 12
src/views/tradeServicesManagement/warehouseReceiptEdit.vue
Прегледај датотеку 

@@ -305,20 +305,15 @@ export default {
 
           if (_data[i].id == val) {
 
           if (_data[i].id == val) {
 
             this.deptBudgetList.warehouseName = _data[i].warehouseName
 
             this.deptBudgetList.warehouseName = _data[i].warehouseName
 
             this.cwNumberList = _data[i].positionInfos.length != 0 ? _data[i].positionInfos : []
 
             this.cwNumberList = _data[i].positionInfos.length != 0 ? _data[i].positionInfos : []
 
-            this.deptBudgetList.warehouseNo = _data[i].positionInfos.length != 0 ? _data[i].positionInfos[0].binNumber :
 
-              ''
 
-            this.deptBudgetList.warehouseAddress = _data[i].warehousePrivate + _data[i].warehouseCity +
 
-              _data[i].warehouseArea + _data[i].detailedAddress
 
+            this.deptBudgetList.warehouseNo = _data[i].positionInfos.length != 0 ? _data[i].positionInfos[0].binNumber : ''
 
+            this.deptBudgetList.warehouseAddress = _data[i].warehousePrivate + _data[i].warehouseCity + _data[i].warehouseArea + _data[i].detailedAddress
 
             this.goodsList = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos : []
 
             this.goodsList = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos : []
 
-            this.deptBudgetList.nowWeight = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos[0].storage :
 
-              ''
 
+            this.deptBudgetList.nowWeight = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos[0].storage : ''
 
+            this.deptBudgetList.useWeight =  _data[i].goodsNameInfos[0].useStorage
 
             this.deptBudgetList.warehouseId = _data[i].id
 
             this.deptBudgetList.warehouseId = _data[i].id
 
-            this.deptBudgetList.goodsNameKey = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos[0]
 
-              .goodsNameKey : ''
 
-              this.deptBudgetList.warehouseNoId = _data[i].positionInfos.length != 0 ? _data[i].positionInfos[0]
 
-                .id : ''
 
-                this.deptBudgetList.baseId = _data[i].positionInfos.length != 0 ? _data[i].positionInfos[0]
 
-                  .baseId : ''
 
+            this.deptBudgetList.goodsNameKey = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos[0].goodsNameKey : ''
 
+            this.deptBudgetList.warehouseNoId = _data[i].positionInfos.length != 0 ? _data[i].positionInfos[0].id : ''
 
+            this.deptBudgetList.baseId = _data[i].positionInfos.length != 0 ? _data[i].positionInfos[0].baseId : ''
 
           }
 
           }
 
         }
 
         }
 
       },
 
       },

+ 18 - 25
src/views/tradeServicesManagement/warehouseReceiptRegulation.vue
Прегледај датотеку 

@@ -18,17 +18,17 @@
 
     </div>
 
     </div>
 
     <div class="content2">
 
     <div class="content2">
 
       <div class="header">
 
       <div class="header">
 
-        <el-button type="" :type="searchType == 0 ? 'primary' : ''" @click="handlestatus(0)">全部</el-button>
 
-        <el-button type="" :type="searchType == 1 ? 'primary' : ''" @click="handlestatus(1)">待审核</el-button>
 
-        <el-button type="" :type="searchType == 2 ? 'primary' : ''" @click="handlestatus(2)">待审批</el-button>
 
-        <el-button type="" :type="searchType == 3 ? 'primary' : ''" @click="handlestatus(3)">待还</el-button>
 
-        <el-button type="" :type="searchType == 4 ? 'primary' : ''" @click="handlestatus(4)">已还</el-button>
 
+        <el-button :type="!searchType ? 'primary' : ''" @click="handlestatus()">全部</el-button>
 
+        <el-button :type="searchType == 1 ? 'primary' : ''" @click="handlestatus(1)">待审核</el-button>
 
+        <el-button :type="searchType == 2 ? 'primary' : ''" @click="handlestatus(2)">待审批</el-button>
 
+        <el-button :type="searchType == 3 ? 'primary' : ''" @click="handlestatus(3)">待还</el-button>
 
+        <el-button :type="searchType == 4 ? 'primary' : ''" @click="handlestatus(4)">已还</el-button>
 
         <el-input placeholder="可按业务编号、合同编号、仓库名查找" class="search-input" v-model="searchKeyWord"></el-input>
 
         <el-input placeholder="可按业务编号、合同编号、仓库名查找" class="search-input" v-model="searchKeyWord"></el-input>
 
         <el-button type="primary" @click='findList'>查找</el-button>
 
         <el-button type="primary" @click='findList'>查找</el-button>
 
         <el-button type="primary" v-hasPermission=" `tradeServicesManagement.tradeService.add`" class="add" @click="add">添加</el-button>
 
         <el-button type="primary" v-hasPermission=" `tradeServicesManagement.tradeService.add`" class="add" @click="add">添加</el-button>
 
       </div>
 
       </div>
 
       <el-table :data="tradeServicesList" style="width: 100%; margin-top: 20px" ref="tradeServicesList" border
 
       <el-table :data="tradeServicesList" style="width: 100%; margin-top: 20px" ref="tradeServicesList" border
 
-        height="calc(100% - 90px)">
 
+        height="calc(100% - 100px)">
 
         <el-table-column type="index" label="序号">
 
         <el-table-column type="index" label="序号">
 
           <template scope="scope">
 
           <template scope="scope">
 
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
 
@@ -40,19 +40,15 @@
 
         <el-table-column prop="warehouseName" label="仓库名"></el-table-column>
 
         <el-table-column prop="warehouseName" label="仓库名"></el-table-column>
 
         <el-table-column prop="warehouseNo" label="仓位号"></el-table-column>
 
         <el-table-column prop="warehouseNo" label="仓位号"></el-table-column>
 
         <el-table-column prop="goodsName" label="货名"></el-table-column>
 
         <el-table-column prop="goodsName" label="货名"></el-table-column>
 
-        <el-table-column prop="weight" label="重量（吨）"></el-table-column>
 
-        <el-table-column prop="unitPrice" label="单价（元/吨）"></el-table-column>
 
-        <el-table-column prop="totalValue" label="总价值（元）"></el-table-column>
 
-        <el-table-column prop="paymentAmount" label="发放金额（元）"></el-table-column>
 
-        <el-table-column prop="amountDue" label="应还金额（元）"></el-table-column>
 
-        <el-table-column prop="amountRepaid" label="已还金额（元）"></el-table-column>
 
-        <el-table-column prop="amountToRepaid" label="待还金额（元）"></el-table-column>
 
-        <el-table-column prop="status" label="状态">
 
-          <template slot-scope="scope">
 
-            <div>{{scope.row.status}}</div>
 
-          </template>
 
-        </el-table-column>
 
-        <el-table-column prop="address" label="操作" width="430">
 
+        <el-table-column prop="weight" label="重量（吨）" width="100"></el-table-column>
 
+        <el-table-column prop="unitPrice" label="单价（元/吨）" width="100"></el-table-column>
 
+        <el-table-column prop="totalValue" label="总价值（元）" width="100"></el-table-column>
 
+        <el-table-column prop="paymentAmount" label="发放金额（元）" width="150"></el-table-column>
 
+        <el-table-column prop="amountDue" label="应还金额（元）" width="150"></el-table-column>
 
+        <el-table-column prop="amountRepaid" label="已还金额（元）" width="150"></el-table-column>
 
+        <el-table-column prop="amountToRepaid" label="待还金额（元）" width="150"></el-table-column>
 
+        <el-table-column prop="status" label="状态"></el-table-column>
 
+        <el-table-column prop="address" label="操作" width="300">
 
           <template slot-scope="scope">
 
           <template slot-scope="scope">
 
             <el-button size="mini" v-hasPermission=" `tradeServicesManagement.tradeService.view`" @click="lookBtnClick(scope.row, 2)">
 
             <el-button size="mini" v-hasPermission=" `tradeServicesManagement.tradeService.view`" @click="lookBtnClick(scope.row, 2)">
 
               查看</el-button>
 
               查看</el-button>
 
@@ -101,7 +97,7 @@
 
         pageSize: 10,
 
         pageSize: 10,
 
         deptBudgetTotal: 0,
 
         deptBudgetTotal: 0,
 
         deptCircularPage: {},
 
         deptCircularPage: {},
 
-        searchType: '0',
 
+        searchType: '',
 
         warehouseList: [],
 
         warehouseList: [],
 
         compId: '',
 
         compId: '',
 
       }
 
       }
 
@@ -145,8 +141,6 @@
 
       },
 
       },
 
       handlestatus(status) {
 
       handlestatus(status) {
 
         this.searchType = status
 
         this.searchType = status
 
-        // this.currentPage:=1
 
-        // this.pageSize=10
 
         this.getList()
 
         this.getList()
 
       },
 
       },
 
       lookBtnClick(row, val2) {
 
       lookBtnClick(row, val2) {
 
@@ -189,7 +183,7 @@
 
           .then(() => {
 
           .then(() => {
 
             deleteTrageInfo({id:row.id}).toPromise().then((response) => {
 
             deleteTrageInfo({id:row.id}).toPromise().then((response) => {
 
              this.$message.success('删除成功')
 
              this.$message.success('删除成功')
 
-            // this.mapInfo = response.data.records
 
+             this.getList()
 
           })
 
           })
 
           })
 
           })
 
       },
 
       },
 
@@ -235,6 +229,7 @@
 
           .toPromise()
 
           .toPromise()
 
           .then((response) => {
 
           .then((response) => {
 
             this.tradeServicesList = response.records
 
             this.tradeServicesList = response.records
 
+            this.deptBudgetTotal = response.total
 
           })
 
           })
 
       },
 
       },
 
       selectShowType(e) {
 
       selectShowType(e) {
 
@@ -250,8 +245,6 @@
 
   }
 
   }
 
 </script>
 
 </script>
 
 <style lang="scss" scoped>
 
 <style lang="scss" scoped>
 
-  .container {}
 
-
 
   .icon {
 
   .icon {
 
     transform: rotate(90deg);
 
     transform: rotate(90deg);
 
     margin: 0 10px;
 
     margin: 0 10px;

+ 1 - 1
src/views/tranManagement/tranManagementVehicleDispatching.vue
Прегледај датотеку 

@@ -986,4 +986,4 @@ export default {
 
   height: 20px;
 
   height: 20px;
 
   line-height: 18px;
 
   line-height: 18px;
 
 }
 
 }
 
-</style>
 
+</style>