前端 更新 sdy

src/api/V2/warehouse/index.js

@@ -86,6 +86,8 @@ export const API_POST_EXPORT = '/warehouseBaseInfo/export'
 export const API_POST_EXPORTOUT = '/warehouseBaseInfo/exportOut'
 //打印增量
 export const API_GET_PRINT = '/commonConstantFalse/getInfo'
+// 仓位号
+export const API_GET_WAREHOUSE_BINNUMBER = '/warehouseBaseInfo/getWarehouse'
 
 
 

src/model/warehouse/index.js

@@ -41,7 +41,8 @@ import {
     API_GET_RECEIPTTASKNO,
     API_POST_EXPORT,
     API_GET_PRINT,
-    API_POST_EXPORTOUT
+    API_POST_EXPORTOUT,
+    API_GET_WAREHOUSE_BINNUMBER
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
 // 列表
@@ -127,4 +128,6 @@ export const postExport = appRx.post(API_POST_EXPORT)
 export const postExportOut = appRx.post(API_POST_EXPORTOUT)
 //打印增量
 export const  printAdd = appRx.get(API_GET_PRINT,errorCatcher, errorHandle, filter)
+//仓位号
+export const  getbinnumber = appRx.get(API_GET_WAREHOUSE_BINNUMBER,errorCatcher, errorHandle, filter)
 

src/views/taskManagement/tranManagementLook.vue

@@ -67,7 +67,7 @@
         :key="index"
         class="datafor"
       >
-        <div class="driver">运输阶段&nbsp;&nbsp;{{ index+1 }}&nbsp;&nbsp;({{ item.processNo }}-{{index +1}})
+        <div class="driver">运输阶段&nbsp;&nbsp;{{ index+1 }}&nbsp;&nbsp;({{ item.processNo }})
           <el-checkbox
             class="endflag"
             true-label="1"

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -822,6 +822,7 @@ export default {
           {
             processNo: '',
             tranType: '汽运',
+            tranTypeKey: '1',
             deliveryDateStart: '',
             deliveryDateEnd: '',
             weight: '',
@@ -1114,6 +1115,7 @@ export default {
                         {
                           processNo: '',
                           tranType: '汽运',
+                          tranTypeKey: '1',
                           deliveryDateStart: '',
                           deliveryDateEnd: '',
                           weight: '',

src/views/warehouse/warehouseManagementList.vue

@@ -139,7 +139,7 @@
             </ws-button>
              <ws-button v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfo.in`
-          " class="putstorage" @click="nocomplete1(scope.row)">
+          " class="putstorage" @click="nocomplete1(scope.row,2)">
               皮检
             </ws-button>
             <!-- <ws-button v-hasPermission="
@@ -158,7 +158,7 @@
             </ws-button>
             <ws-button v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfo.out`
-          " class="deliverystorage" @click="nocomplete1(scope.row)">
+          " class="deliverystorage" @click="nocomplete1(scope.row,3)">
               毛检
             </ws-button>
             <!-- <ws-button v-hasPermission="
@@ -684,7 +684,7 @@ export default {
       }
     },
     //检斤待完成
-    nocomplete1(row) {
+    nocomplete1(row,status) {
       this.$router.push({
         path: 'warehouseManagementNoWeight',
         query: {
@@ -694,6 +694,7 @@ export default {
           binNumber: row.binNumber,
           warehouseType: this.warehouseType,
           createType: row.createType,
+          status:status
         },
       })
     },

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -37,6 +37,9 @@
             {{ this.$route.query.binNumber }}仓位
           </span>
           <span v-show="this.$route.query.warehouseType == 2">(临)</span>
+          <el-date-picker  style="margin: 0 10px 0 10px" 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>
         </h2>
         <el-table :data="improved.records">
           <el-table-column type="index" label="序号">
@@ -185,6 +188,7 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
+      value2:[],
       deletewarehouse: [],
       improved: [],
       row: [],
@@ -218,8 +222,10 @@ export default {
     // this.getVesselData();
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
     this.binNumber = this.$route.params.binNumber
+    this.status = this.$route.query.status
     this.deptBudgetList.warehouseType = this.$route.query.warehouseType
-    this.createType=this.$route.query.createType,
+    this.createType=this.$route.query.createType
+    this.getPassYearFormatDate()
     //接参
     this.getList(
       this.$route.query.baseId,
@@ -229,11 +235,46 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    datechange(){
+				this.getList()
+			},
     //返回按钮
     returnWarehouse() {
       this.$router.push({ path: 'warehouseManagementList' })
     },
-    
+    getPassYearFormatDate () {
+          var nowDate = new Date()
+          nowDate.setTime(nowDate.getTime()-24*60*60*1000*30)
+          var seperator1 = '-'
+          var year = nowDate.getFullYear()
+          var month = nowDate.getMonth() + 1
+          var strDate = nowDate.getDate()
+          if (month >= 1 && month <= 9) {
+            month = '0' + month
+          }
+          if (strDate >= 0 && strDate <= 9) {
+            strDate = '0' + strDate
+          }
+          var formatDate = year + seperator1 + month + seperator1 + strDate
+          this.getNowFormatDate(formatDate)
+        },
+		/* 获取现在时间，并接受过去时间的值 */
+        getNowFormatDate (formatDate) {
+			var date = new Date()
+			date.setTime(date.getTime()+24*60*60*1000)
+			var seperator1 = '-'
+			var year = date.getFullYear()
+			var month = date.getMonth() + 1
+			var strDate = date.getDate()
+			if (month >= 1 && month <= 9) {
+				month = '0' + month
+			}
+			if (strDate >= 0 && strDate <= 9) {
+				strDate = '0' + strDate
+			}
+			var nowData = year + seperator1 + month + seperator1 + strDate
+			this.value2= [formatDate, nowData]  // 默认赋值一年时间
+   		 },
     //编辑
     edits(row) {
       if (row.inOutFlag == 2) {
@@ -275,7 +316,7 @@ export default {
             pureWeight:row.pureWeight,
             deductionAmount:row.deductionAmount,
             deductionWeight:row.deductionWeight,
-            allowEdit:row.allowEdit
+            allowEdit:row.allowEdit,
 
           },
         })
@@ -295,6 +336,7 @@ export default {
             goodsName: row.goodsName,
             goodsNameKey: row.goodsNameKey,
             grade: row.grade,
+            status:'',
             grossWeight: row.grossWeight,
             inOutDate: row.inOutDate,
             inOutFlag: row.inOutFlag,
@@ -363,6 +405,12 @@ export default {
     },
     //收
     getList(id, id1, id2) {
+      var startDate=''
+					var endDate=''
+					if(this.value2){
+					startDate=this.value2[0]?this.value2[0]:''
+					endDate=this.value2[1]?this.value2[1]:''
+				}
       if (id2 == 1) {
         complete({
           // compId: localStorage.getItem('ws-pf_compId'),
@@ -370,6 +418,8 @@ export default {
           positionId: id1,
           pageSize: this.pageSize,
           currentPage: this.currentPage,
+          startDate:startDate,
+       					    endDate:endDate,
           // inOutDate:this.inOutDate
         })
           .toPromise()
@@ -383,6 +433,9 @@ export default {
           positionId: id1,
           pageSize: this.pageSize,
           currentPage: this.currentPage,
+          startDate:startDate,
+       					    endDate:endDate,
+          searchType:this.status
         })
           .toPromise()
           .then((response) => {
@@ -571,6 +624,10 @@ export default {
   color: #ffffff;
   line-height: 20px;
 }
+.dataClass {
+       width: 20% !important;
+       margin-left:10px;
+	}
 .main_css{
 height: calc(100vh - 120px);
 }

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -665,7 +665,7 @@
           }
         }
         for (var i = 0; i < this.outContractNo.length; i++) {
-          if (this.outContractNo[i].contractNo == e) {
+          if (this.outContractNo[i].contractNo == this.dataList.contractNo) {
             if (this.outContractNo[i].inOutType == '采购入库') {
               this.dataList.tips='卖方'+this.outContractNo[i].seller+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
               this.dataList.inOutTypeKey = 1

src/views/warehouse/warehouseManagementRecord.vue

@@ -15,10 +15,19 @@
 				<img style="position: relative; top: 2px" width="19" height="19" src="../../../public/img/cangku.png"
 					alt="" />
 				<span style="color: #323233">{{ deptBudgetList.warehouseName }}</span>
-				<span class="ware" v-show="warehouseType==1">{{binNumber}}仓位(容量{{capacity}}吨)</span>
+				<div class="ware" v-show="warehouseType==1">
+					<!-- {{binNumber}}仓位(容量{{capacity}}吨) -->
+					<el-select filterable clearable v-model="binNumber" placeholder="请选择仓位" class="typeselect"
+              @change="binNumberChange">
+			  <el-option  key="" label="全部仓位"
+                value="全部仓位" />
+              <el-option v-for="item in binnumberList" :key="item.binNumber" :label="item.binNumber"
+                :value="item.binNumber" />
+            </el-select>
+				</div>
 				<span v-show="warehouseType==2">(临)</span>
 			</h2>
-			<p style="
+			<p v-if='remark' style="
           margin-left: 42px;
           background: #f6f7fc;
           color: #afb5cb;
@@ -43,7 +52,7 @@
 					<img v-if="status == 3" width="18" height="18" src="../../../public/img/radio-check.png"
 						alt="" />入库记录
 				</div>
-				<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" unlink-panels range-separator="至"
+				<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>
 				<el-table show-summary :summary-method="getSummaries" ref="tableData" :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'">
@@ -88,6 +97,7 @@
 							<span v-else>{{ scope.$index + 1 }}</span>
 						</template>
 					</el-table-column>
+					<el-table-column prop="binNumber" label="仓位号" width="60px"> </el-table-column>
 					<el-table-column prop="goodsName" label="货名" width="60px"> </el-table-column>
 					<!-- <el-table-column prop="type" label="类型" width="60px"> </el-table-column> -->
 					<el-table-column prop="grossWeight" label="毛重（吨）" >
@@ -278,7 +288,8 @@
 	import {
 		addselectinfoList,
 		recordss,
-		getPrintInfo
+		getPrintInfo,
+		getbinnumber
 	} from '@/model/warehouse/index'
 	import {
 		downloadFile
@@ -309,6 +320,7 @@
 				//弹出框
 				dialogViewSpareMoney: false,
 				dialogApproveFormVisible: false,
+				binnumberList:[],
 				// 船舶类型
 				monetaryKey: null,
 				// 表格显示数据
@@ -377,6 +389,19 @@
 			})
 		},
 		methods: {
+			binNumberChange(e){
+				if(e=='全部仓位'){
+					this.deptBudgetList.positionId=''
+				}else{
+					for (let i = 0; i < this.binnumberList.length; i++) {
+						if(this.binnumberList[i].binNumber==e){
+							this.deptBudgetList.positionId=this.binnumberList[i].id
+						}
+					}
+				}
+				
+				this.getList()
+			},
 			//合计
 			getSummaries(param) {
 				const { columns, data } = param
@@ -529,6 +554,11 @@
 					endDate=this.value2[1]?this.value2[1]:''
 				}
 				if (this.warehouseType == 1) {
+					getbinnumber({id: this.deptBudgetList.baseId}).toPromise()
+						.then((response) => {
+							
+							this.binnumberList = response.warehousePositionInfoList
+						})
 					addselectinfoList({
 							compId: localStorage.getItem('ws-pf_compId'),
 							baseId: this.deptBudgetList.baseId,
@@ -704,11 +734,11 @@
 	.ware {
 		font-size: 12px;
 		color: rgb(255, 255, 255);
-		background: rgb(175, 181, 203);
 		padding: 3px;
 		position: relative;
 		top: -1px;
 		border-radius: 3px;
+		display: inline-block;
 		text-align: center;
 	}