前端 贸易服务修改sdy

src/views/houseSelfCollect/paymentManagement.vue

@@ -828,9 +828,7 @@ export default {
           sums[index] = '合计'
         } else if (
           index === 10 ||
-          index === 11 ||
-          index === 12 ||
-          index === 13
+          index === 11 ||index === 15 || index === 16
         ) {
           const values = data.map((item) => Number(item[column.property]))
           if (!values.every((value) => isNaN(value))) {

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -66,7 +66,11 @@
         <el-table-column prop="weight" class="table_td" label="重量（吨）"></el-table-column>
         <el-table-column prop="predictDate" class="table_td" label="预计日期"></el-table-column>
         <el-table-column prop="publisher" class="table_td" label="发布者"></el-table-column>
-        <el-table-column prop="completedQuantity" class="table_td" label="已完成量"></el-table-column>
+        <el-table-column prop="completedQuantity" class="table_td" label="已完成量">
+          <template slot-scope="scope">
+            {{scope.row.completedQuantity == 0 ? 0:scope.row.completedQuantity.toFixed(3)}}
+          </template>
+        </el-table-column>
         <el-table-column prop="taskStatus" label="状态" width="90">
           <template slot-scope="scope">
             <template>

src/views/tradeServicesManagement/warehouseReceiptAdd.vue

@@ -179,7 +179,7 @@
         getbillno().toPromise().then((response) => {
           this.deptBudgetList.billNo = response
         })
-        this.getWarehouse()
+        // this.getWarehouse()
       },
       getcompList() {
         //获取公司名头
@@ -188,6 +188,7 @@
           .then((res) => {
             this.compOptionList = res
             this.deptBudgetList.renown = res[0].compName
+             this.changeCompOptionList(res[0].compId)
           })
           .catch((err) => {})
       },
@@ -199,21 +200,28 @@
           .then(response => {
             this.warehouseList = response
             this.deptBudgetList.warehouseName = response[0].warehouseName
-            this.deptBudgetList.warehouseAddress = response[0].warehousePrivate + response[0].warehouseCity +
-              response[0].warehouseArea + response[0].detailedAddress
-              if(response[0].goodsNameInfos){
-            this.goodsList = response[0].goodsNameInfos
-            this.deptBudgetList.nowWeight = response[0].goodsNameInfos.length != 0 ? response[0].goodsNameInfos[0].storage : ''
-            this.deptBudgetList.useWeight = response[0].goodsNameInfos[0].useStorage
-            this.deptBudgetList.goodsName = response[0].goodsNameInfos.length != 0 ? response[0].goodsNameInfos[0].goodsName : ''
-            this.deptBudgetList.goodsNameKey = response[0].goodsNameInfos.length != 0 ? response[0].goodsNameInfos[0].goodsNameKey : ''
-              }
+            this.deptBudgetList.warehouseAddress = response[0].warehousePrivate + response[0].warehouseCity + response[0].warehouseArea + response[0].detailedAddress
               if(response[0].positionInfos){
                  this.deptBudgetList.warehouseNoId = response[0].positionInfos.length != 0 ? response[0].positionInfos[0].id : ''
                  this.cwNumberList = response[0].positionInfos
                 this.deptBudgetList.warehouseNo = response[0].positionInfos.length != 0 ? response[0].positionInfos[0].binNumber : ''
                  this.deptBudgetList.baseId = response[0].positionInfos.length != 0 ? response[0].positionInfos[0].baseId : ''
               }
+              if(response[0].goodsNameInfos){
+                for(let i = 0 ; i < response[0].goodsNameInfos.length ; i++){
+                  if(response[0].goodsNameInfos[i].binNumber ==  this.deptBudgetList.warehouseNo ){
+                    this.goodsList.push(response[0].goodsNameInfos[i])
+                  }
+                }
+                console.log(this.goodsList)
+            // this.goodsList = response[0].goodsNameInfos
+            this.deptBudgetList.nowWeight = response[0].goodsNameInfos.length != 0 ? response[0].goodsNameInfos[0].storage : ''
+            this.deptBudgetList.useWeight = response[0].goodsNameInfos[0].useStorage
+            // this.deptBudgetList.goodsName = response[0].goodsNameInfos.length != 0 ? response[0].goodsNameInfos[0].goodsName : ''
+            this.deptBudgetList.goodsName = this.goodsList[0].goodsName
+            this.deptBudgetList.goodsNameKey = response[0].goodsNameInfos.length != 0 ? response[0].goodsNameInfos[0].goodsNameKey : ''
+              }
+              
             this.deptBudgetList.warehouseId = response[0].id
             if (!this.deptBudgetList.renown) this.deptBudgetList.renown = this.compOptionList[0].compName
             if (!this.deptBudgetList.renownId) this.deptBudgetList.renownId = this.compOptionList[0].compId
@@ -226,6 +234,8 @@
           if (_data[i].id == val) {
             this.deptBudgetList.goodsNameKey = _data[i].goodsNameKey
             this.deptBudgetList.goodsName = _data[i].goodsName
+             this.deptBudgetList.nowWeight = _data[i].storage
+             this.deptBudgetList.useWeight =  _data[i].useStorage
             return
           }
         }
@@ -240,6 +250,7 @@
       },
       //仓位号切换
       changeWarehouseNo(val) {
+        
         let _data = this.cwNumberList
         for (let i = 0; i < _data.length; i++) {
           if (_data[i].id == val) {
@@ -248,6 +259,21 @@
             this.deptBudgetList.baseId = _data.baseId
           }
         }
+        this.goodsList = []
+        for(let j = 0 ; j < this.warehouseList.length ; j++){
+          if(this.deptBudgetList.warehouseName == this.warehouseList[j].warehouseName){
+            for(let _num = 0 ; _num < this.warehouseList[j].goodsNameInfos.length; _num++ ){
+              if( this.deptBudgetList.warehouseNo == this.warehouseList[j].goodsNameInfos[_num].binNumber){
+                this.goodsList.push(this.warehouseList[j].goodsNameInfos[_num])
+              }
+            }
+          }
+        }
+        if(this.goodsList.length == 0){
+          this.deptBudgetList.goodsName = ""
+        }else{
+           this.deptBudgetList.goodsName = this.goodsList[0].goodsName
+        }
       },
       // 名头切换
       changeCompOptionList(val) {
@@ -271,7 +297,7 @@
             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.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].useStorage:''
             this.deptBudgetList.goodsName = _data[i].goodsNameInfos.length != 0 ? _data[i].goodsNameInfos[0].goodsName : ''
@@ -281,6 +307,7 @@
             this.deptBudgetList.baseId = _data[i].positionInfos.length != 0 ? _data[i].positionInfos[0].baseId : ''
           }
         }
+        this.changeWarehouseNo(this.deptBudgetList.warehouseId)
       },
       inoutput() {
         this.$router.push({

src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -5,14 +5,14 @@
     <div class="bottom" :class="{active:isActive}">
       <div class="bottom-content">
         <div class="bottom-item" @click="startHacking">查看申请记录</div>
-        <div class="bottom-item"><i class="el-icon-d-arrow-right icon"></i></div>
+        <div class="bottom-item" @click="startHacking"><i class="el-icon-d-arrow-right icon"></i></div>
         <el-radio class="bottom-item" v-model="radio" label="1" @change="selectShowType">默认地图</el-radio>
       </div>
     </div>
     <div class="top">
       <div class="top-content">
         <div class="top-item" @click="startHacking1">查看地图</div>
-        <div class="top-item"><i class="el-icon-d-arrow-left icon"></i></div>
+        <div class="top-item" @click="startHacking1"><i class="el-icon-d-arrow-left icon"></i></div>
         <el-radio class="top-item" v-model="radio" label="2" @change="selectShowType">默认列表</el-radio>
       </div>
     </div>
@@ -107,7 +107,12 @@
         compId: '',
       }
     },
-    activated() {},
+    activated() {
+      // debugger
+      // let i = localStorage.getItem('warehouseReceiptRegulation_selectShowType')
+      // console.log(i)
+      // console.log(1212121121)
+    },
     beforeCreate() {
       document.querySelector('body').setAttribute('style', 'overflow:hidden;')
     },

src/views/warehouse/warehouseManagementGross.vue

@@ -396,6 +396,7 @@
           deductionWeight: 0,
           grossWeight: '',
           tare: '',
+          inOutDate:"",
         },
         historyList: [],
         cost: '',
@@ -429,6 +430,11 @@
       }
     },
     mounted() {
+        let date = new Date()
+        var year = date.getFullYear();
+        var month = date.getMonth() + 1;
+        var strDate = date.getDate()
+        this.deptBudgetList.inOutDate = ""+year+"-"+month+"-"+strDate
       this.information = this.$route.query.information
       if (this.$route.query.allowEdit == 1) {
         this.allowEdit = false

src/views/warehouse/warehouseManagementList.vue

@@ -464,7 +464,6 @@ export default {
         return
       }
       if(this.headerText == "导出记录"){
-        debugger
         if(this.parameter.radio == 3){
           const { 
            data 

src/views/warehouse/warehouseManagementTare.vue

@@ -348,7 +348,8 @@
           addressUrl: '',
           warehouseInOutDetail: {},
           grossWeight: '',
-          tare: ''
+          tare: '',
+          inOutDate:"",
         },
         historyList: [],
 
@@ -382,6 +383,11 @@
       }
     },
     mounted() {
+      let date = new Date()
+        var year = date.getFullYear();
+        var month = date.getMonth() + 1;
+        var strDate = date.getDate()
+        this.deptBudgetList.inOutDate = year+"-"+month+"-"+strDate
       this.information = this.$route.query.information
       if (this.$route.query.allowEdit == 1) {
         this.allowEdit = false