需求修改

pages/home/home.vue

@@ -33,7 +33,8 @@
 		data() {
 			return {
 				intervalId: null,
-				interTime: this.$store.getters.setTime,
+				// interTime: this.$store.getters.setTime,
+				interTime: 60000,
 				userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).person_name : '',
 				menuList: []
 			};

pages/login/login.vue

@@ -43,12 +43,12 @@
 									<input type="text" placeholder="域名地址" v-model.trim="baseUrl" class="inputStyle">
 								</view>
 							</view>
-							<view class="zd-row mgb20">
+							<!-- <view class="zd-row mgb20">
 								<view class="zd-col-7 login_label">刷新时间(s)</view>
 								<view class="zd-col-17">
 									<input type="number" placeholder="刷新时间" v-model.trim="setTime" class="inputStyle">
 								</view>
-							</view>
+							</view> -->
 						</view>
 						<view class="zd-row mgt20 mgb20">
 							<button class="primary-button" :disabled="disabled" @tap="toConfig">配&nbsp;&nbsp;置</button>

pages/management/alloc-maintenance.vue

@@ -8,9 +8,6 @@
 					<view class="zd-col-8 select_wraper mgl10">
 						<zxz-uni-data-select placeholder="请选择组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
 					</view>
-					<view class="zd-col-8 select_wraper mgl10">
-						<zxz-uni-data-select placeholder="请选择仓管员" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
-					</view>
 				</view>
 				<button class="confirm-button" @tap="toSearch">查询</button>
 			</view>
@@ -24,11 +21,12 @@
 					<view class="zd-col-2 zd-th"><text>业务日期</text></view>
 					<view class="zd-col-2 zd-th"><text>调入组织</text></view>
 					<view class="zd-col-2 zd-th"><text>调出组织</text></view>
-					<view class="zd-col-3 zd-th"><text>调入仓库</text></view>
-					<view class="zd-col-3 zd-th"><text>调出仓库</text></view>
+					<view class="zd-col-2 zd-th"><text>调入仓库</text></view>
+					<view class="zd-col-2 zd-th"><text>调出仓库</text></view>
 					<view class="zd-col-2 zd-th"><text>状态</text></view>
-					<view class="zd-col-2 zd-th nowrap"><text>计划调入日期</text></view>
+					<view class="zd-col-2 zd-th"><text>计划调入日期</text></view>
 					<view class="zd-col-3 zd-th"><text>备注</text></view>
+					<view class="zd-col-2 zd-th"><text>审核结果</text></view>
 					<view class="zd-col-2 zd-th">更多</view>
 				</view>
 				<view class="zd-td-wraper" v-for="(e, i) in dataList1" :key="e.id">
@@ -38,11 +36,12 @@
 						<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.drkcmc}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.dckcmc}}</text></view>
-						<view class="zd-col-3 zd-td"><text>{{e.drckmc}}</text></view>
-						<view class="zd-col-3 zd-td"><text>{{e.dcckmc}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.drckmc}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.dcckmc}}</text></view>
 						<view class="zd-col-2 zd-td"><text class="fontbg1">{{e.djzt}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.jhdrrq}}</text></view>
+						<view class="zd-col-2 zd-td nowrap"><text>{{e.jhdrrq}}</text></view>
 						<view class="zd-col-3 zd-td"><text>{{e.flbz}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.shjg}}</text></view>
 						<view class="zd-col-2 zd-td" @tap.stop="getDetails(3,e)">
 							<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
 						</view>
@@ -57,7 +56,6 @@
 										<th v-if="pkObj.djzt !== '审核后'">选择</th>
 										<th><text class="fontcol1">物料编码</text></th>
 										<th>物料名称</th>
-										<th>规格型号</th>
 										<th>计里单位</th>
 										<th>库存类型</th>
 										<th>库存状态</th>
@@ -84,12 +82,13 @@
 										</td>
 										<td><view class="fontcol1">{{el.wlbm}}</view></td>
 										<td>{{el.wlmc}}</td>
-										<td>{{el.ggxh}}</td>
 										<td>{{el.jldw}}</td>
 										<td>{{el.kclx}}</td>
 										<td>{{el.kczt}}</td>
-										<td><input class="td_input" type="number" v-model="el.sl"  @blur="_allocationBillUpdate(el)" /></td>
-										<td @tap.stop="checkWarehouse(2, '调入仓库', el)">
+										<td>
+											<input class="td_input" type="number" confirm-type="go" v-model="el.sl"  @blur="_allocationBillUpdate(el)" @confirm="_allocationBillUpdate(el)" />
+										</td>
+										<td @tap.stop="checkWarehouse(2, '修改调入仓库', el)">
 											<view class="zd-row td_change">
 												<uni-icons type="shop" size="16" color="#fff"></uni-icons>
 												<view class="mgl10">{{el.drckbm}}</view>
@@ -101,7 +100,7 @@
 												<scan-input v-model="el.drkwbm" @handleChange="_allocationBillUpdate(el)" />
 											</view>
 										</td>
-										<td @tap.stop="checkWarehouse(1, '调出仓库', el)">
+										<td @tap.stop="checkWarehouse(1, '修改调出仓库', el)">
 											<view class="zd-row td_change">
 												<uni-icons type="shop" size="16" color="#fff"></uni-icons>
 												<view class="mgl10">{{el.dcckbm}}</view>
@@ -125,8 +124,11 @@
 												<view class="mgl10">{{el.jhdcrq}}</view>
 											</view>
 										</td>
-										<td @tap.stop="checkWarehouse(5, '跟踪号', el)">
-											<view class="td_change"><view>{{el.gzh}}</view></view>
+										<td>
+											<view class="zd-row td_change" :class="{'td_change_focus': fstate}">
+												<input class="td_input_1" type="text" confirm-type="go" v-model="el.gzh" @focus="fstate = true"  @blur="fstate = false, _allocationBillUpdate(el)" @confirm="fstate = false,_allocationBillUpdate(el)" />
+												<uni-icons class="mgl10" type="search" size="20" color="#a2b6cc" @tap="checkWarehouse(5, '库存信息', el)"></uni-icons>
+											</view>
 										</td>
 										<td @tap.stop="getDetails(3,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></td>
 									</tr>
@@ -136,7 +138,6 @@
 										<td>{{j+1}}</td>
 										<td>{{el.wlbm}}</td>
 										<td>{{el.wlmc}}</td>
-										<td>{{el.ggxh}}</td>
 										<td>{{el.jldw}}</td>
 										<td>{{el.kclx}}</td>
 										<td>{{el.kczt}}</td>
@@ -177,7 +178,7 @@
 		<view class="footer"></view>
 		<grid-detail :show="delShow" :data="detailObj" @closeDetail="delShow=false"></grid-detail>
 		<view class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
-			<view class="allwidth pop-title">修改{{modalObj.title}}</view>
+			<view class="allwidth pop-title">{{modalObj.title}}</view>
 			<view v-if="modalObj.type === 1 || modalObj.type === 2" class="zd-row jcenter kwcode_wraper">
 				<view class="zd-col-12 select_wraper">
 					<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value" filterable :localdata="range"></zxz-uni-data-select>
@@ -200,7 +201,7 @@
 					<view class="zd-col-3 zd-sec-th"><text>库位</text></view>
 					<view class="zd-col-3 zd-sec-th"><text>跟踪号</text></view>
 				</view>
-				<view class="zd-row zd-td-wraper" v-for="(ele, t) in dataList3" :key="ele.id" @tap="toCheck3(ele)" :class="{'popChecked': ele.trackNo === iid}">
+				<view class="zd-row zd-td-wraper" v-for="(ele, t) in dataList3" :key="ele.id" @tap="toCheck3(ele)" :class="{'popChecked': ele.id === iid}">
 					<view class="zd-col-2 zd-sec-td zd-pop-td"><text>{{t+1}}</text></view>
 					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.materialName}}</text></view>
 					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.materialNo}}</text></view>
@@ -209,7 +210,7 @@
 					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.lot}}</text></view>
 					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.warehouseName}}</text></view>
 					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.locationName}}</text></view>
-					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.trackNo}}</text></view>
+					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.trackno}}</text></view>
 				</view>
 			</view>
 			<view class="mgb20 zd-row jcenter">
@@ -270,16 +271,15 @@
 				disabled: false,
 				value1: '',
 				range1: [],
-				value2: '',
-				range2: [],
 				dataList3: [],
-				iid: ''
+				iid: '',
+				iobj: {},
+				fstate: false
 			};
 		},
 		created () {
 			this._getWarehouseInfo()
 			this._getOrganizationInfo()
-			this._getUserInfo()
 		},
 		methods: {
 			// 仓库下拉框
@@ -306,17 +306,6 @@
 					this.toSearch()
 				}
 			},
-			// 仓管员下拉框
-			async _getUserInfo () {
-				let res = await getUserInfo()
-				if (res.code === 1) {
-					this.range2 = [...res.result]
-					this.range2.map(e => {
-						this.$set(e, 'text', e.cgymc)
-						this.$set(e, 'value', e.cgybm)
-					})
-				}
-			},
 			// 查询一级表格
 			toSearch () {
 				this.queryParams1 = {
@@ -330,7 +319,7 @@
 			},
 			// 一级表格接口
 			async _allocationPage () {
-				let res = await allocationPage(this.val1, this.value1,  this.value2, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
+				let res = await allocationPage(this.val1, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
 				if (res.code === 1) {
 					this.dataList1 = [...res.result]
 					this.totalCount1 = Number(res.totalElements)
@@ -409,6 +398,7 @@
 			},
 			// 二级表格详情修改接口
 			async _allocationBillUpdate (e) {
+				console.log(e)
 				try {
 					let res = await allocationBillUpdate(e)
 					uni.showToast({
@@ -420,15 +410,16 @@
 				}
 			},
 			// 根据跟踪号查询库存列表
-			async _allocationBillInventoryInfo (id) {
-				let res = await allocationBillInventoryInfo(id)
+			async _allocationBillInventoryInfo (obj) {
+				let res = await allocationBillInventoryInfo(obj)
 				if (res.code === 1) {
 					this.dataList3 = [...res.result]
 				}
 			},
 			// 跟踪号查询库存列表选中一行
 			toCheck3 (e) {
-				this.iid = e.trackNo === this.iid ? '' : e.trackNo 
+				this.iid = e.id === this.iid ? '' : e.id
+				this.iobj = e.id === this.iid ? e : {}
 			},
 			// 修改调出仓库弹窗
 			checkWarehouse (type, title, e) {
@@ -438,7 +429,9 @@
 				} else if (type === 2) {
 					this.value = e.drckbm
 				} else if (type === 5) {
-					this._allocationBillInventoryInfo(e.gzh)
+					let {gzh, dckcbm, dcckbm, dckwbm, pc, wlbm} = {...e}
+					let obj = {gzh, dckcbm, dcckbm, dckwbm, pc, wlbm}
+					this._allocationBillInventoryInfo(obj)
 				}
 				this.show = true
 			},
@@ -470,7 +463,7 @@
 				} else if (this.modalObj.type === 5) {
 					this.dataList2.map(e => {
 						if (e.flid === this.modalObj.id) {
-							e.gzh = this.iid
+							e.gzh = this.iobj.trackno
 							obj = e
 						}
 					})
@@ -558,10 +551,14 @@
 .mgr30
 	margin-right 30rpx
 .select_wraper
+	/deep/ .uni-select__input-box
+		height 30px
 	/deep/ .uni-select__selector
 		z-index 11
 	/deep/ .uni-select
 		height: 30px;
+		min-height: 30px;
+		line-height: 30px;
 		padding: 0 2px 0 12px;
 		border: 1px solid #4980bd;
 		background-color: rgba(45,88,184,0.1);

pages/management/in-storage.vue

@@ -23,9 +23,9 @@
 					<view class="zd-col-1 zd-th"><text>序号</text></view>
 					<view class="zd-col-1 zd-th"><text>选择</text></view>
 					<view class="zd-col-2 zd-th"><text class="fontcol1">{{crType === 'IN'? '入库单号':'出库单号'}}</text></view>
-					<view class="zd-col-2 zd-th"><text>来源部门</text></view>
-					<view class="zd-col-2 zd-th"><text>去向部门</text></view>
-					<view class="zd-col-2 zd-th"><text>仓库名称</text></view>
+					<view class="zd-col-2 zd-th nowrap"><text>来源部门</text></view>
+					<view class="zd-col-2 zd-th nowrap"><text>去向部门</text></view>
+					<view class="zd-col-2 zd-th nowrap"><text>仓库名称</text></view>
 					<view class="zd-col-2 zd-th"><text>状态</text></view>
 					<view class="zd-col-2 zd-th nowrap"><text>制单日期</text></view>
 					<view class="zd-col-2 zd-th nowrap"><text>制单人</text></view>
@@ -33,7 +33,7 @@
 					<view class="zd-col-2 zd-th nowrap"><text>操作日期</text></view>
 					<view class="zd-col-2 zd-th"><text>操作人</text></view>
 					<view v-if="crType === 'OUT'" class="zd-col-2 zd-th"><text>仓管员</text></view>
-					<view class="zd-col-2 zd-th">更多</view>
+					<view class="zd-th" :class="crType === 'OUT' ? 'zd-col-1' : 'zd-col-2'">更多</view>
 				</view>
 				<view class="zd-td-wraper" v-for="(e, i) in dataList1" :key="e.id">
 					<view class="zd-row" :class="{'zd-td-checked': pkId === e.id}" @tap="toCollapse(e)">
@@ -46,13 +46,13 @@
 						<view class="zd-col-2 zd-td"><text>{{e.zzmc}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.ckmc}}</text></view>
 						<view class="zd-col-2 zd-td"><text class="fontbg1">{{e.djzt}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.cjsj}}</text></view>
+						<view class="zd-col-2 zd-td nowrap"><text>{{e.cjsj}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.cjr}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.update_time}}</text></view>
+						<view class="zd-col-2 zd-td nowrap"><text>{{e.ywrq}}</text></view>
+						<view class="zd-col-2 zd-td nowrap"><text>{{e.update_time}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.update_name}}</text></view>
 						<view v-if="crType === 'OUT'" class="zd-col-2 zd-td"><text>{{e.cgymc}}</text></view>
-						<view class="zd-col-2 zd-td" @tap.stop="getDetails(1,e)">
+						<view class="zd-td" :class="crType === 'OUT' ? 'zd-col-1' : 'zd-col-2'" @tap.stop="getDetails(1,e)">
 							<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
 						</view>
 					</view>
@@ -184,7 +184,7 @@
 	import ScanInput from '@/components/ScanInput.vue'
 	import Pagination from '@/components/Pagination.vue'
 	import GridDetail from '@/components/GridDetail.vue'
-	// import {getWarehouseInfo, getUserInfo} from '@/utils/mork2.js'
+	// import {getWarehouseInfo, getUserInfo} from '@/utils/getData2.js'
 	import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo} from '@/utils/getData2.js'
 	export default {
 		components: {

pages/management/receive-confirm.vue

@@ -57,7 +57,6 @@
 										<th><text class="fontcol1">采购订单号</text></th>
 										<th>物料编码</th>
 										<th>物料名称</th>
-										<th>规格型号</th>
 										<th>单位</th>
 										<th>订单量</th>
 										<th>本次送货数量</th>
@@ -81,7 +80,6 @@
 										<td><view class="fontcol1">{{el.cgbh}}</view></td>
 										<td>{{el.wlbm}}</td>
 										<td>{{el.wlmc}}</td>
-										<td>{{el.ggxh}}</td>
 										<td>{{el.jldw}}</td>
 										<td>{{el.ddsl}}</td>
 										<td>{{el.bcshsl}}</td>
@@ -109,7 +107,6 @@
 										<td>{{el.cgbh}}</td>
 										<td>{{el.wlbm}}</td>
 										<td>{{el.wlmc}}</td>
-										<td>{{el.ggxh}}</td>
 										<td>{{el.jldw}}</td>
 										<td>{{el.ddsl}}</td>
 										<td>{{el.bcshsl}}</td>
@@ -423,10 +420,14 @@
 .mgr30
 	margin-right 30rpx
 .select_wraper
+	/deep/ .uni-select__input-box
+		height 30px
 	/deep/ .uni-select__selector
 		z-index 11
 	/deep/ .uni-select
 		height: 30px;
+		min-height: 30px;
+		line-height: 30px;
 		padding: 0 2px 0 12px;
 		border: 1px solid #4980bd;
 		background-color: rgba(45,88,184,0.1);