Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <router-view />
+    <router-view v-if="isRouterAlive"/>
     <ws-common-loading v-if="isLoadding"></ws-common-loading>
     <!-- <rookie-training v-if="roles && roles.length"></rookie-training> -->
   </div>

src/layout/index/top/index.vue

@@ -252,6 +252,7 @@
     name: 'top',
     data() {
       return {
+        index:0,
         //status1:已初检未称毛重状态 status2:已初检且已称毛重状态  status3:已复检且已称毛重  status4:已复检且已称皮重状态
         //status5:已确认质检且已称皮重且未结算状态  status6:已结算状态
         btnStatus: {
@@ -625,38 +626,39 @@
         console.log('当前已失去焦点状态')
         this.isOpenCodeGun = false
       },
-      goToPage(type) {
+      goToPage(type) {debugger
         var _saomadata = {}
         _saomadata.cangid = this.cangid
         _saomadata.id = this.toPageData.qualityInspectionManagement.id
         _saomadata.warehouseName = this.toPageData.qualityInspectionManagement.warehouseName
-       _saomadata.managementType = this.toPageData.qualityInspectionManagement.managementType//贸易入库1 收购入库3
+       _saomadata.managementType = this.toPageData.qualityInspectionManagement.serviceManagementType//贸易入库1 收购入库3
          this.barCode = ''
         let _url = ''
         if (type === 1) {
            _saomadata.type = 1
-           localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
+           localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
           this.$router.push({
           	name: 'inspectionManagementNew'
           })
         } else if (type === 2) {
            _saomadata.type = 2
-           localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
+           localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
             this.$router.push({
           	name: 'inspectionManagementNew'
           })
         } else if (type === 3) {
            _saomadata.type = 3
-           localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
-            this.$router.push({
-          	name: 'inspectionManagementNew'
-          })
+           localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
+          //   this.$router.push({
+          // 	name: 'inspectionManagementNew'
+          // })
+          this.$router.push({ path: 'inspectionManagement',query: {  id:this.index++ }})
         } else if (type === 4) {
            _saomadata.typeNo = 1
            _saomadata.monitorUrl1 = this.toPageData.warehouseBaseInfo.monitorUrl1
            _saomadata.monitorUrl2 = this.toPageData.warehouseBaseInfo.monitorUrl2
            _saomadata.allowEdit = this.toPageData.warehouseBaseInfo.allowEdit
-            localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
+            localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
              this.$router.push({
             name: 'newWeighingManagement'
           })
@@ -674,7 +676,7 @@
            _saomadata.monitorUrl1 = this.toPageData.warehouseBaseInfo.monitorUrl1
            _saomadata.monitorUrl2 = this.toPageData.warehouseBaseInfo.monitorUrl2
            _saomadata.allowEdit = this.toPageData.warehouseBaseInfo.allowEdit
-            localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
+            localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
            this.$router.push({
             name: 'newWeighingManagement',
           })

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -74,7 +74,7 @@
                   </el-select>
                 </ws-form-item>
                  <ws-form-item  label="类型" span="1" prop="type">
-                  <ws-select v-model="deptBudgetList.type" disabled>
+                  <ws-select v-model="deptBudgetList.type" >
                     <ws-option v-for="item in typeList" :key="'leixin'+item" :label="item" :value="item" />
                   </ws-select>
                 </ws-form-item>
@@ -157,7 +157,12 @@
                   <ws-input v-model="deptBudgetList.contractNo" placeholder="自动获取，不可编辑" maxlength="100" disabled size="small" />
                 </ws-form-item>
                 <ws-form-item v-if='serviceManagementType==1' label="成本（元/吨）" span="1" prop="cost">
-                  <ws-input v-model="deptBudgetList.cost" placeholder="自动获取，不可编辑" maxlength="100" disabled size="small" />
+                  <ws-input v-model="deptBudgetList.cost" placeholder="自动获取，不可编辑" maxlength="100" size="small" />
+                  <img width="17" height="18" style="
+                      vertical-align: text-top;
+                      position: relative;
+                      top: -1px;
+                    " src="../../../public/img/edit.png" @click="editClick(1)" alt="" />
                 </ws-form-item>
                 <ws-form-item v-if='serviceManagementType==1' label="提示" span="1" prop="tips">
                   <ws-input v-model="deptBudgetList.tips" placeholder="自动获取，不可编辑" maxlength="100" disabled size="small" />
@@ -174,7 +179,7 @@
                 </ws-form-item>
                 
                 <ws-form-item v-if='statusTypetext=="初检"&&serviceManagementType==1' label="运费(元/吨)" span="1" prop="freight">
-                  <ws-input :disabled="disabledfright" v-model="deptBudgetList.freight" placeholder="请输入运费" size="small" type="number" @mousewheel.native.prevent />
+                  <ws-input  v-model="deptBudgetList.freight" placeholder="请输入运费" size="small" type="number" @mousewheel.native.prevent />
                   <img width="17" height="18" style="
                       vertical-align: text-top;
                       position: relative;
@@ -396,7 +401,38 @@
     components: {
       inspectInfoPrint
     },
-    watch: {},
+    watch: {
+    '$route' (to, from) {
+      console.log(this)
+          this.selectWarehouse()
+       var _saomaData = JSON.parse(localStorage.getItem('saoma_data'))
+       if(_saomaData){//缓存中有值，证明扫码进来的
+         this.warehouseName = _saomaData.warehouseName
+         this.warehouseNameChange(this.warehouseName)
+          let ids={}
+         ids.id = _saomaData.id
+         this.listclick(ids)
+          if(_saomaData.type == 1){
+         this.statusTypetext = '初检'
+       }else if(_saomaData.type == 2){
+         this.statusTypetext = '确认'
+       }else if(_saomaData.type == 3){
+         this.statusTypetext = '复检'
+       }
+       this.serviceManagementType = _saomaData.managementType
+         localStorage.removeItem('saoma_data');//第一次进来结束后清除缓存
+       }else{
+          let _WarehouseName = localStorage.getItem('houseSelfCollect_house1')
+          _WarehouseName = JSON.parse(_WarehouseName)
+          if (_WarehouseName) {
+            this.warehouseNameChange(_WarehouseName.value)
+          }
+       }
+      // 对路由变化作出响应...
+      // this.routerParms.id=to.query.id
+      // this.reload()
+    },
+},
     data() {
       return {
         //分页
@@ -439,10 +475,9 @@
           grossWeight: 0,
           tare: 0,
           grade:'',
-          inOutDate: '',
+          inOutDate: new Date(),
           netWeight:0,
           pureWeight:0,
-          deductionWeight:0,
           waterContent:'',
           reWaterContent:'',
           reGrade:'',
@@ -471,6 +506,7 @@
         disabled2:false,
         disabled1:false,
         disabledfright:true,
+        disabledcost:true,
         recheck:false,
         storageType:[],
         multiSelector1:[],
@@ -495,6 +531,7 @@
         outContractNo:[],
         carNumberList:[],
         warehouseTradeCount:0,
+        warehouseTradeCount1:0,
         options1:[],
         editcar:false,
         isGetCost:'',
@@ -525,7 +562,7 @@
         // searchKeyWord:''
       }
     },
-    activated(){
+    activated(){debugger
        this.selectWarehouse()
        var _saomaData = JSON.parse(localStorage.getItem('saoma_data'))
        if(_saomaData){//缓存中有值，证明扫码进来的
@@ -551,7 +588,9 @@
           }
        }
     },
-    
+    mounted (){
+      debugger
+    },
     methods: {
       binNumberChange(e){
         for (let i = 0; i < this.positionInfos.length; i++) {
@@ -591,11 +630,11 @@
           this.goodsdisabled=false
         }
       },
-       printSmall() {
-        window.open('../../../static/inspectionnew.html?type=1&dataList=' + JSON.stringify(this.deptBudgetList))
+      printSmall() {
+        window.open('../../../static/inspection.html?type=1&dataList=' + JSON.stringify(this.deptBudgetList))
       },
       printBig() {
-        window.open('../../../static/inspectionnew.html?type=2&dataList=' + JSON.stringify(this.deptBudgetList))
+        window.open('../../../static/inspection.html?type=2&dataList=' + JSON.stringify(this.deptBudgetList))
       },
       record(){
         this.$router.push({path: 'inspectionManagementrecord' })
@@ -820,7 +859,7 @@
                     grossWeight: 0,
                     tare: 0,
                     grade:'',
-                    inOutDate: '',
+                    inOutDate: new Date(),
                     netWeight:0,
                     pureWeight:0,
                     deductionWeight:0,
@@ -906,7 +945,7 @@
                 grossWeight: 0,
                 tare: 0,
                 grade:'',
-                inOutDate: '',
+                inOutDate: new Date(),
                 netWeight:0,
                 pureWeight:0,
                 deductionWeight:0,
@@ -1075,10 +1114,9 @@
           grossWeight: 0,
           tare: 0,
           grade:'',
-          inOutDate: '',
+          inOutDate: new Date(),
           netWeight:0,
           pureWeight:0,
-          deductionWeight:0,
           waterContent:'',
           reWaterContent:'',
           reGrade:'',
@@ -1098,6 +1136,8 @@
           boxNoOther:'',
           titleNo:'',
           titleNoOther:'',
+          inOutType:'',
+          inOutTypeKey:1
         }
         if(this.serviceManagementType==3){
           var count=''
@@ -1177,10 +1217,9 @@
                         grossWeight: 0,
                         tare: 0,
                         grade:'',
-                        inOutDate: '',
+                        inOutDate: new Date(),
                         netWeight:0,
                         pureWeight:0,
-                        deductionWeight:0,
                         waterContent:'',
                         reWaterContent:'',
                         reGrade:'',
@@ -1200,6 +1239,8 @@
                         boxNoOther:'',
                         titleNo:'',
                         titleNoOther:'',
+                        inOutType:'',
+                        inOutTypeKey:1
                       }
                       if(this.serviceManagementType==3){
                         var count=''
@@ -1313,6 +1354,7 @@
             })
             return
           }
+          this.deptBudgetList.dryGrainPrice = parseFloat(this.deptBudgetList.cost/1000).toFixed(3)
           if (
             this.deptBudgetList.cost < 0 ||
             this.deptBudgetList.cost > 20000 ||
@@ -1889,6 +1931,9 @@
                       }
                       if(this.serviceManagementType==3){
                         this.warehouseCount+=1
+                      }else{
+                        this.warehouseTradeCount=Number(this.warehouseTradeCount)+1
+                        this.warehouseTradeCount1=Number(this.warehouseTradeCount1)+1
                       }
                       
                       this.$message.success('添加成功')
@@ -1970,7 +2015,7 @@
                           grossWeight: 0,
                           tare: 0,
                           grade:'',
-                          inOutDate: '',
+                          inOutDate: new Date(),
                           netWeight:0,
                           pureWeight:0,
                           deductionWeight:0,
@@ -2042,10 +2087,9 @@
                         grossWeight: 0,
                         tare: 0,
                         grade:'',
-                        inOutDate: '',
+                        inOutDate: new Date(),
                         netWeight:0,
                         pureWeight:0,
-                        deductionWeight:0,
                         waterContent:'',
                         reWaterContent:'',
                         reGrade:'',
@@ -2111,6 +2155,9 @@
         }else if(status==2){
           this.disabledfright=!this.disabledfright
         }
+        else if(status==1){
+          this.disabledcost=!this.disabledcost
+        }
       },
       selectWarehouse() {
         selectWarehouseSelf({
@@ -2128,6 +2175,7 @@
                 this.warehouseCount = response[i].count
                 console.log(response[i].tradeCount)
                 this.warehouseTradeCount = response[i].tradeCount
+                this.warehouseTradeCount1 = response[i].tradeCount
                 this.allowEdit = response[i].allowEdit
                 this.cangid = _wareHouse.warehouseId
                 this.warehouseName = response[i].warehouseName
@@ -2148,17 +2196,21 @@
                   this.warehouseName = response[i].warehouseName
                   this.warehouseCount = response[i].count
                   this.warehouseTradeCount = response[i].tradeCount
+                  this.warehouseTradeCount1 = response[i].tradeCount
                   this.warehouseNo = response[i].commonWarehouseNo
                   this.allowEdit = response[i].allowEdit
+                this.positionInfos=response[i].positionInfos
                 }
                 if (this.warehouseList.length > 0 && !this.cangid) {
                   this.warehouseName = this.warehouseList[0].value
                   this.warehouseCount = this.warehouseList[0].count
                   this.warehouseTradeCount = this.warehouseList[0].tradeCount
+                  this.warehouseTradeCount1 = this.warehouseList[0].tradeCount
                   this.warehouseNo = this.warehouseList[0].No
                   this.cangid = this.warehouseList[0].warehouseId
                   this.allowEdit = this.warehouseList[0].allowEdit
                   this.WAREHOUSE[1].payname = this.warehouseList[0].value
+                  this.positionInfos=response[0].positionInfos
                 }
               }
             }
@@ -2234,8 +2286,8 @@
             if (this.outContractNo[i].inOutType == '采购入库') {
               this.customerName=this.outContractNo[i].buyer
               this.customerPhone=this.outContractNo[i].buyerPhone
-              console.log(this.warehouseTradeCount)
-              this.warehouseTradeCount = '000' + Number(this.warehouseTradeCount + 1)
+              this.warehouseTradeCount=this.warehouseTradeCount1
+              this.warehouseTradeCount = '000' + (Number(this.warehouseTradeCount) + 1)
               this.deptBudgetList.qualityNo='CGRK'+this.getTime()+this.warehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
               if (!this.outContractNo[i].unitContractPrice) {
                 this.deptBudgetList.tips = '卖方' + this.outContractNo[i].seller
@@ -2245,7 +2297,7 @@
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库入库') {
               this.customerName=localStorage.getItem('ws-pf_compName')
-                this.warehouseTradeCount = '000' + Number(this.warehouseTradeCount + 1)
+                this.warehouseTradeCount = '000' + (Number(this.warehouseTradeCount) + 1)
               this.deptBudgetList.qualityNo='YKRK'+this.getTime()+this.warehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
               this.deptBudgetList.goodsName = data.goodsName
               this.deptBudgetList.goodsNameKey = data.goodsNameKey
@@ -2315,6 +2367,8 @@
           if (this.warehouseList[i].value == e) {
             this.warehouseName = this.warehouseList[i].value
             this.warehouseCount = this.warehouseList[i].count
+             this.warehouseTradeCount = this.warehouseList[i].tradeCount
+             this.warehouseTradeCount1 = this.warehouseList[i].tradeCount
             this.warehouseNo = this.warehouseList[i].No
             this.cangid = this.warehouseList[i].warehouseId
             this.allowEdit = this.warehouseList[i].allowEdit
@@ -2361,7 +2415,7 @@
           grossWeight: 0,
           tare: 0,
           grade:'',
-          inOutDate: '',
+          inOutDate: new Date(),
           netWeight:0,
           pureWeight:0,
           deductionWeight:0,

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -448,7 +448,10 @@
             this.allowEdit = _saomaData.allowEdit
             this.id = _saomaData.id
             this.tpyeNo = _saomaData.typeNo
-            this.inWarehouseType = _saomaData.managementType
+            if(_saomaData.managementType){
+                this.inWarehouseType = _saomaData.managementType
+            }
+            
             localStorage.removeItem('saoma_data'); //第一次进来结束后清除缓存
           } else if (localStorage.getItem('houseSelfCollect_house1')) {
             this.warehouseName = JSON.parse(localStorage.getItem('houseSelfCollect_house1')).value
@@ -1391,8 +1394,6 @@
                       }
                     }
                   }
-                  this.isShowPrintType = true
-                  this.getList()
 
                   //贸易入库需要再走入库接口
                   if (this.inWarehouseType == 1) {
@@ -1401,25 +1402,50 @@
                       id: this.weighingList.warehouseInOutId
                     }).toPromise().then((response) => {
                       that.inOutDate = response
-                      warehousing.statusFlag = 3
-                      warehousing.grossWeight /= 1000
-                      warehousing.tare /= 1000
-                      warehousing.netWeight /= 1000
-                      warehousing.pureWeight = 1000
-                      warehousing.deductionAmount = Number(warehousing.deductionAmount) * 1000
-                      warehousing.deductionWeight /= 1000
-                      warehousing.inOutFlag = 2
-                      console.log(that.weighingList)
-                      warehousing.inOutTypeKey = that.weighingList.inOutTypeKey
-                      warehousing.inOutType = that.weighingList.inOutType
-                      warehousing.deductionAmount = that.weighingList.deductionAmount
-                      warehousing.id = warehousing.warehouseInOutId
-                        warehousing.warehouseInOutDetail.id = warehousing.inOutDetailId
-                      // delete that.inOutDate.status
-                      that.inOutDate = Object.assign(that.inOutDate, warehousing)
+                      that.$set(that.inOutDate,'statusFlag',3)
+                     that.$set(that.inOutDate,'grossWeight',warehousing.grossWeight /1000)
+                      that.$set(that.inOutDate,'tare',warehousing.tare /1000)
+                      that.$set(that.inOutDate,'netWeight',warehousing.netWeight /1000)
+                      // that.$set(that.inOutDate,'pureWeight',warehousing.pureWeight /1000)
+                      that.$set(that.inOutDate,'deductionAmount',Number(warehousing.deductionAmount) * 1000)
+                      that.$set(that.inOutDate,'deductionWeight',warehousing.deductionWeight /1000)
+                      that.$set(that.inOutDate,'inOutFlag',2)
+                     // that.inOutDate = response
+                      // that.$set(that.inOutDate)
+                      // .statusFlag = 3
+                      // that.inOutDate.grossWeight=warehousing.grossWeight /1000
+                      // that.inOutDate.tare=warehousing.tare /1000
+                      // that.inOutDate.netWeight=warehousing.netWeight /1000
+                      // that.inOutDate.pureWeight=warehousing.pureWeight /1000
+                      // that.inOutDate.deductionAmount= Number(warehousing.deductionAmount) * 1000
+                      // that.inOutDate.deductionWeight=warehousing.deductionWeight /1000
+                      // that.inOutDate.inOutFlag = 2
+                      console.log(that.inOutDate)
+                      
+                      // warehousing.statusFlag = 3
+                      // warehousing.grossWeight /= 1000
+                      // warehousing.tare /= 1000
+                      // warehousing.netWeight /= 1000
+                      // warehousing.pureWeight = 1000
+                      // warehousing.deductionAmount = Number(warehousing.deductionAmount) * 1000
+                      // warehousing.deductionWeight /= 1000
+                      // warehousing.inOutFlag = 2
+                      // console.log(that.weighingList)
+                      // warehousing.inOutTypeKey = that.weighingList.inOutTypeKey
+                      // warehousing.inOutType = that.weighingList.inOutType
+                      // warehousing.deductionAmount = that.weighingList.deductionAmount
+                      // warehousing.id = warehousing.warehouseInOutId
+                      // // delete that.inOutDate.status
+                      // that.inOutDate = Object.assign(that.inOutDate, warehousing)
                       addstorageputList(that.inOutDate).toPromise().then((response) => {})
+                      this.isShowPrintType = true
+                      this.getList()
                     })
                   }
+                  else{
+                    this.isShowPrintType = true
+                    this.getList()
+                  }
                 })
                 .catch((response) => {})
             }

src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -178,7 +178,8 @@
   import {
     addOut,
     selectWarehouseSelf,
-    getinspectList
+    getinspectList,
+    getinspectLook
   } from '@/model/outboundManagement/index'
   import {
     packList
@@ -388,6 +389,7 @@
               data: formdata,
             }).then((response) => {
               //编辑接口
+              this.printData.pictureAddress = response.data.url
               this.inspect.pictureAddress = response.data.url
               addOut(this.inspect)
               .toPromise()
@@ -411,6 +413,7 @@
               data: formdata,
             }).then((response) => {
               //编辑接口
+              this.printData.pictureAddress = response.data.url
               this.inspect.pictureAddress = response.data.url
               addOut(this.inspect)
               .toPromise()
@@ -577,9 +580,23 @@
               .toPromise()
               .then((response) => {
                 this.$message.success('保存成功')
-                this.printData = this.inspect
-                this.isShowPrint = true
-                this.getList()
+                // this.printData = this.inspect
+                // conole.log(this.printData)
+                
+                // this.isShowPrint = true
+                // this.getList()
+                getinspectLook({
+                        id: response
+                      })
+                      .toPromise()
+                      .then((response2) => {
+                        this.printData = response2
+                        this.printData.contractManagement =this.inspect.contractManagement
+                        console.log(this.printData)
+                        this.isShowPrint = true
+                        this.getList()
+                      })
+                
               })
           })
           .catch(() => {

src/views/outboundManagement/outInspectRecord.vue

@@ -109,7 +109,10 @@
         this.getList()
       },
       print(row){
-           window.open('../../../static/outInspectionPrint.html?type=2&dataList=' + JSON.stringify(row))
+         row.type = 2
+        localStorage.setItem('out-Warehouse_print',JSON.stringify(row))
+        window.open('../../../static/outInspectionPrint.html')
+          //  window.open('../../../static/outInspectionPrint.html?type=2&dataList=' + JSON.stringify(row))
       },
       qualityInspection(row) {
         //查看

src/views/outboundManagement/weighingManagementNew.vue

@@ -363,18 +363,20 @@
         fleetNameList: [],
         carstatus: false,
         carjudge: false,
-        warehouseCount: 0,
+        warehouseCount: '',
         warehouseCount1: 0,
         warehouseNo: '',
         statusType: '3',
         warehouseType: 1,
         weighingList: {
+           grossWeight: 0,
+          tare: 0,
+          buckleMiscellaneous: 0,
+          netWeight: 0,
           weight: '',
           tips: '',
           // contractNo:'',
           // inOutTaskNo:'',
-          buckleMiscellaneous: 0,
-          netWeight: 0,
           receivableWeighingFee: '',
           warehouseInOutDetail: {
             grade: '',
@@ -390,6 +392,7 @@
             titleNo: '暂无',
             titleNoOther: '暂无',
           },
+          inOutDate:new Date()
         },
         carWeightInfo: {
           carNumber: '',
@@ -422,11 +425,14 @@
       this.isShowBalance = true
       this.openPort()
       this.getNowTime()
-      if (localStorage.getItem('houseSelfCollect_house1').allowEdit == 1) {
-        this.disabled = false
-      } else {
-        this.disabled = true
-      }
+	  if(localStorage.getItem('houseSelfCollect_house1')){
+		if (localStorage.getItem('houseSelfCollect_house1').allowEdit == 1) {
+			this.disabled = false
+		} else {
+			this.disabled = true
+		}
+	  }
+      
     },
     activated() {},
     methods: {
@@ -1227,7 +1233,7 @@
         for (let i = 0; i < this.warehouseList.length; i++) {
           if (this.warehouseList[i].value == e) {
             this.warehouseId = this.warehouseList[i].warehouseId
-            this.warehouseCount = this.warehouseList[i].count
+            // this.warehouseCount = this.warehouseList[i].ouCount
           }
         }
         for (let i = 0; i < this.warehouseList1.length; i++) {
@@ -1248,7 +1254,7 @@
               this.disabled = true
             }
             this.positionInfos = this.warehouseList1[i].positionInfos
-            this.warehouseCount = this.warehouseList1[i].count
+            this.warehouseCount = this.warehouseList1[i].outCount
             this.warehouseNo = this.warehouseList1[i].commonWarehouseNo
             this.warehouseType = this.warehouseList1[i].warehouseType
           }
@@ -1458,6 +1464,7 @@
       },
       contractNoChange(e) {
         this.warehouseCount = this.warehouseCount1
+		console.log(this.warehouseCount)
         for (let i = 0; i < this.taskNolist.length; i++) {
           if (this.taskNolist[i].inOutTaskNo == e) {
             var data = this.taskNolist[i]
@@ -1582,7 +1589,7 @@
                 this.warehouseId = this.warehouseList[0].warehouseId
                 this.positionInfos = response[0].positionInfos
                 this.warehouseCount = response[0].outCount
-                this.warehouseCount1 = response[i].outCount
+                this.warehouseCount1 = response[0].outCount
                 this.warehouseNo = response[0].commonWarehouseNo
                 this.warehouseType = response[0].warehouseType
                 if (response[0].allowEdit == 1) {
@@ -1590,10 +1597,12 @@
                 } else {
                   this.disabled = true
                 }
+				console.log()
               }
             }
             this.warehouseList1 = response
-
+            
+          this.deptBudgetList.warehouseName = this.warehouseName
             this.getList()
           })
       },