前端

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -77,8 +77,8 @@
         <div class="content" v-for="(item,index) in priceList" :key="index">
           <div class="top">
             <div  class="left">
-              <div v-if="baseInfoForm.paramType == '2'"class="text">基准单价（元/公斤）</div>
-              <el-input v-if="baseInfoForm.paramType == '2'"type="number" @mousewheel.native.prevent v-model="item.basicUnitPrice" :disabled="!isEdit"></el-input>
+              <div v-if="baseInfoForm.paramType == '2' "class="text">基准单价（元/公斤）</div>
+              <el-input v-if="baseInfoForm.paramType == '2' "type="number" @mousewheel.native.prevent v-model="item.basicUnitPrice" :disabled="!isEdit"></el-input>
             </div>
             <el-button @click="delSetPrice(item,index)" :disabled="!isEdit">删除</el-button>
           </div>
@@ -951,11 +951,26 @@
             _obj = {
               waterMin: this.keepOneDecimal(_waterMax ),
               waterMax: this.keepOneDecimal(_waterMax + 0.09),
-              price1: this.keepTwoDecimal(priceList[0]),
-              price2: this.keepTwoDecimal(priceList[1]),
-              price3: this.keepTwoDecimal(priceList[2]),
-              priceOther: this.keepTwoDecimal(priceList[3]),
+              // price1: this.keepTwoDecimal(priceList[0]),
+              // price2: this.keepTwoDecimal(priceList[1]),
+              // price3: this.keepTwoDecimal(priceList[2]),
+              // priceOther: this.keepTwoDecimal(priceList[3]),
             }
+            for(let i= 0;i<priceList.length;i++){
+                  if(priceList[i].level=='一等'){
+                  _obj.price1 = this.keepTwoDecimal(priceList[i].val)
+                  }
+                  else if(priceList[i].level=='二等'){
+                      _obj.price2 = this.keepTwoDecimal(priceList[i].val)
+                  }
+                   else if(priceList[i].level=='三等'){
+                       _obj.price3 = this.keepTwoDecimal(priceList[i].val)
+                   }
+                   else{
+                    _obj.priceOther = this.keepTwoDecimal(priceList[i].val)
+                   }
+              }
+
             _list.unshift(_obj)
           }
           _obj = {}
@@ -976,11 +991,26 @@
             _obj = {
               waterMin: this.keepOneDecimal(_waterMin ),
               waterMax: this.keepOneDecimal(_waterMin + 0.09),
-              price1: this.keepTwoDecimal(priceList[0]),
-              price2: this.keepTwoDecimal(priceList[1]),
-              price3: this.keepTwoDecimal(priceList[2]),
-              priceOther: this.keepTwoDecimal(priceList[3]),
+              // price1: this.keepTwoDecimal(priceList[0]),
+              // price2: this.keepTwoDecimal(priceList[1]),
+              // price3: this.keepTwoDecimal(priceList[2]),
+              // priceOther: this.keepTwoDecimal(priceList[3]),
             }
+            for(let i= 0;i<priceList.length;i++){
+                  if(priceList[i].level=='一等'){
+                  _obj.price1 = this.keepTwoDecimal(priceList[i].val)
+                  }
+                  else if(priceList[i].level=='二等'){
+                      _obj.price2 = this.keepTwoDecimal(priceList[i].val)
+                  }
+                   else if(priceList[i].level=='三等'){
+                       _obj.price3 = this.keepTwoDecimal(priceList[i].val)
+                   }
+                   else{
+                    _obj.priceOther = this.keepTwoDecimal(priceList[i].val)
+                   }
+              }
+
             _list.push(_obj)
             console.log('_list', _list)
 
@@ -1005,11 +1035,25 @@
             _obj = {
               waterMin: this.keepOneDecimal(_waterMin ),
               waterMax: this.keepOneDecimal(_waterMin + 0.09),
-              price1: this.keepTwoDecimal(priceList[0]),
-              price2: this.keepTwoDecimal(priceList[1]),
-              price3: this.keepTwoDecimal(priceList[2]),
-              priceOther: this.keepTwoDecimal(priceList[3]),
+              // price1: this.keepTwoDecimal(priceList[0]),
+              // price2: this.keepTwoDecimal(priceList[1]),
+              // price3: this.keepTwoDecimal(priceList[2]),
+              // priceOther: this.keepTwoDecimal(priceList[3]),
             }
+            for(let i= 0;i<priceList.length;i++){
+              if(priceList[i].level=='一等'){
+              _obj.price1 = this.keepTwoDecimal(priceList[i].val)
+              }
+              else if(priceList[i].level=='二等'){
+                  _obj.price2 = this.keepTwoDecimal(priceList[i].val)
+              }
+                else if(priceList[i].level=='三等'){
+                    _obj.price3 = this.keepTwoDecimal(priceList[i].val)
+                }
+                else{
+                _obj.priceOther = this.keepTwoDecimal(priceList[i].val)
+                }
+              }
             _list.push(_obj)
             console.log('_list', _list)
 
@@ -1223,10 +1267,11 @@
         let _listResult = []
         for (let i = 0; i < this.right.length; i++) {
           let _list = this.right[i].priceList
-          let tmp = ''
+            let tmp = {}
           for (let k = 0; k < _list.length; k++) {
             if (_waterMax < _list[k].priceEnd && _waterMax >= _list[k].priceStart) {
-              tmp = parseFloat(_list[k].baseprice - _list[k].jfprice * (((_waterMax) - _list[k].priceStart) / 0.1))
+              tmp.level = this.left[i].level
+              tmp.val = parseFloat(_list[k].baseprice - _list[k].jfprice * (((_waterMax) - _list[k].priceStart) / 0.1))
             }
           }
           _listResult.push(tmp)
@@ -1238,10 +1283,11 @@
         let _listResult = []
         for (let i = 0; i < this.left.length; i++) {
           let _list = this.left[i].priceList
-          let tmp = ''
+          let tmp = {}
           for (let k = 0; k < _list.length; k++) {
             if (_waterMax >= _list[k].priceEnd && _waterMax < _list[k].priceStart) {
-              tmp = parseFloat(_list[k].baseprice + _list[k].jfprice * ((_list[k].priceStart - (_waterMax )) / 0.1))
+              tmp.level = this.left[i].level
+              tmp.val = parseFloat(_list[k].baseprice + _list[k].jfprice * ((_list[k].priceStart - (_waterMax )) / 0.1))
             }
           }
           _listResult.push(tmp)

src/views/houseSelfCollect/inspectionManagement.vue

@@ -190,7 +190,7 @@
 				for (let i = 0; i < this.warehouseList.length; i++) {
 					if (this.warehouseName == this.warehouseList[i].value) {
 						// console.log(this.warehouseList[i])
-						this.cangid = this.warehouseList[i].id
+						this.cangid = this.warehouseList[i].warehouseId
 					}
 				}
 				// console.log(this.cangid)
@@ -215,7 +215,7 @@
 						this.warehouseName = this.warehouseList[i].value
 						this.warehouseCount = this.warehouseList[i].count
 						this.warehouseNo = this.warehouseList[i].No
-						this.cangid = this.warehouseList[i].id
+						this.cangid = this.warehouseList[i].warehouseId
 						this.allowEdit = this.warehouseList[i].allowEdit
 						this.WAREHOUSE[1].payname = this.warehouseList[i].value
 						localStorage.setItem('houseSelfCollect_house1', JSON.stringify(this.warehouseList[i]))
@@ -284,7 +284,7 @@
 							}
 							this.warehouseList.push({
 								value: response[i].warehouseName,
-								id: response[i].id,
+								warehouseId: response[i].id,
 								count: response[i].count,
 								No: response[i].commonWarehouseNo,
 								allowEdit:response[i].allowEdit
@@ -300,7 +300,7 @@
 									this.warehouseName = this.warehouseList[0].value
 									this.warehouseCount = this.warehouseList[0].count
 									this.warehouseNo = this.warehouseList[0].No
-									this.cangid = this.warehouseList[0].id
+									this.cangid = this.warehouseList[0].warehouseId
 									this.allowEdit = this.warehouseList[0].allowEdit
 									this.WAREHOUSE[1].payname = this.warehouseList[0].value
 								}

src/views/houseSelfCollect/paymentManagement.vue

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

src/views/houseSelfCollect/weighingManagement.vue

@@ -437,7 +437,8 @@
             allowEdit: this.allowEdit,
             cangid: this.cangid,
             warehouseName: this.warehouseName,
-            paramType: row.qualityInspectionManagement.paramType
+            paramType: row.qualityInspectionManagement.paramType,
+            customerNumberCard:row.customerNumberCard
           },
         })
       },

src/views/houseSelfCollect/weightCheck.vue

@@ -250,6 +250,7 @@
       this.warehouseName = this.$route.query.warehouseName
       this.weighingList.number = this.$route.query.number
       this.weighingList.binNumber = this.$route.query.binNumber
+      this.weighingList.customerNumberCard = this.$route.query.customerNumberCard
       this.weighingList.customer = this.$route.query.customer
       this.weighingList.storageNumber = this.$route.query.storageNumber
       this.weighingList.carNumber = this.$route.query.carNumber
@@ -719,7 +720,7 @@
               //毛检保存前进行校验
               getamount({
                   compId: localStorage.getItem('ws-pf_compId'),
-                  customerName: this.weighingList.customer,
+                  customerNumberCard:this.weighingList.customerNumberCard,
                   goodsName: this.weighingList.goodsName,
                 })
                 .toPromise()

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

@@ -528,6 +528,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.carId=this.tranCarInfoList[i].id
         }
       }
     },

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

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

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -566,6 +566,14 @@
           }
         }
       },
+      carChange(e) {
+        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.carId = this.tranCarInfoList[i].id
+          }
+        }
+      },
       //暂存按钮
       temporaryStorage() {
         this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {

src/views/warehouse/warehouseManagementRecord.vue

@@ -55,6 +55,25 @@
 				<el-date-picker  style="margin: 0 10px 0 0" class="dataClass" value-format='yyyy-MM-dd' v-model="value2" @change='datechange' type="daterange" align="right" range-separator="至"
 					start-placeholder="出入库日期起" end-placeholder="出入库日期止" >
 				</el-date-picker>
+		<ws-input
+          v-model="searchKeyWord"
+          placeholder="可按合同编号、车牌号查找"
+          clearable
+          maxlength="250"
+          type="input"
+		  class="input"
+        >
+        </ws-input>
+        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
+        <ws-button class="find" type="primary" @click="find()">
+          <img
+            width="16"
+            height="16"
+            style="vertical-align: text-top; position: relative; top: 0px"
+            src="../../../public/img/sousuo.png"
+            alt
+          />
+        </ws-button>
 				<el-table show-summary :summary-method="getSummaries" ref="tableData" :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'">
 					<el-table-column type="expand">
 						<template #default="props">
@@ -469,7 +488,7 @@
 			this.value2= [formatDate, nowData]  // 默认赋值一年时间
    		 },
 			print(row){
-				sessionStorage.removeItem("record_print")
+				sessionStorage.removeItem('record_print')
 				getPrintInfo({
                         id: row.id
                       })
@@ -483,6 +502,7 @@
 				this.$router.push({
 					path: 'warehouseManagementList'
 				})
+				this.searchKeyWord = ''
 			},
 			//
 			iossrecord() {
@@ -521,6 +541,9 @@
 			datechange(){
 				this.getList()
 			},
+			find() {
+      			this.getList()
+    		},
 			handleClose() {
 				this.accessoryTFs = false
 			},
@@ -572,6 +595,7 @@
 							startDate:startDate,
        					    endDate:endDate,
 							searchType: this.searchType,
+							searchKeyWord: this.searchKeyWord,
 							currentPage: this.currentPage,
 							pcFlag: this.pcFlag,
 							pageSize: this.pageSize
@@ -601,6 +625,7 @@
 							startDate:startDate,
        					    endDate:endDate,
 							searchType: this.searchType,
+							searchKeyWord: this.searchKeyWord,
 							currentPage: this.currentPage,
 							pageSize: this.pageSize,
 						})
@@ -1037,6 +1062,10 @@
 	.dataClass {
        width: 20% !important;
 	}
+	.input {
+		width: 20% !important;
+	}
+
 
 	/deep/.ws-info-table .el-form-item .el-form-item__label {
 		background-color: #f6f7fc;

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
@@ -555,6 +561,7 @@
         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.carId = this.tranCarInfoList[i].id
           }
         }
       },