no message

2024-12-10 17:22:13 +08:00
parent b27e2746be
commit 89ae3ece8d
2 changed files with 66 additions and 7 deletions
--- a/pages/management/alloc-maintenance_new.vue
+++ b/pages/management/alloc-maintenance_new.vue
@@ -92,7 +92,7 @@
 												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
 											</view>
 										</td>
-										<td>{{el.wlbm}}</td>
+										<td class="underline fontcol1" @tap="showPop(4, e, el)">{{el.wlbm}}</td>
 										<td>{{el.wlmc}}</td>
 										<td>{{el.gzh}}</td>
 										<td>{{el.jldw}}</td>
@@ -130,16 +130,16 @@
 		</view>
 		<view class="footer"></view>
 		<grid-detail :show="delShow" :data="detailObj" @closeDetail="delShow=false"></grid-detail>
-		<view class="pop-wraper" :class="{'popshow': show, 'pophide': !show, 'pop-wraper_1': type === 3}">
+		<view class="pop-wraper" :class="{'popshow': show, 'pophide': !show, 'pop-wraper_1': type === 3 || type === 4}">
 			<view v-if="type === 1" class="allwidth pop-title">修改调出仓库</view>
 			<view v-if="type === 2" class="allwidth pop-title">修改调入仓库</view>
-			<view v-if="type === 3" class="allwidth pop-title">分配明细</view>
+			<view v-if="type === 3 || type === 4" class="allwidth pop-title">分配明细</view>
 			<view v-if="type === 1 || type === 2" class="zd-row jcenter kwcode_wraper">
 				<view class="zd-col-10 select_wraper">
 					<zxz-uni-data-select placeholder="选择仓库名称" v-model="value" filterable :localdata="range"></zxz-uni-data-select>
 				</view>
 			</view>
-			<view v-if="type === 3" class="pop-grid-wraper">
+			<view v-if="type === 3 || type === 4" class="pop-grid-wraper">
 				<view class="zd-row sticky zd-sec-th-wraper zd-pop-th-wraper">
 					<view class="zd-col-2 zd-sec-th"><text>序号</text></view>
 					<view class="zd-col-4 zd-sec-th"><text>物料编号</text></view>
@@ -151,7 +151,7 @@
 					<view class="zd-col-3 zd-sec-th"><text>分录序号</text></view>
 					<view class="zd-col-4 zd-sec-th"><text>备注</text></view>
 				</view>
-				<view class="zd-row zd-td-wraper" v-for="(ele, t) in popData" :key="ele.id">
+				<view v-if="type === 3" class="zd-row zd-td-wraper" v-for="(ele, t) in popData" :key="ele.id">
 					<view class="zd-col-2 zd-sec-td zd-pop-td"><text>{{t+1}}</text></view>
 					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.wlbm}}</text></view>
 					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.wlmc}}</text></view>
@@ -168,12 +168,32 @@
 					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.flxh}}</text></view>
 					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.bz}}</text></view>
 				</view>
+				<view v-if="type === 4" class="zd-row zd-td-wraper" v-for="(ele, t) in popData" :key="ele.id">
+					<view class="zd-col-2 zd-sec-td zd-pop-td"><text>{{t+1}}</text></view>
+					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.wlbm}}</text></view>
+					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.wlmc}}</text></view>
+					<view v-if="ele.status" class="zd-col-9 zd-sec-td zd-pop-td"><text>{{ele.kwbm}}</text></view>
+					<view v-else class="zd-col-9 zd-sec-td zd-pop-td">
+						<scan-input
+						v-model="ele.kwbm"
+						/>
+					</view>
+					<view v-if="ele.status" class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.fpsl}}</text></view>
+					<view v-else class="zd-col-3 zd-sec-td zd-pop-td">
+						<input type="number" class="pop-input" v-model="ele.fpsl">
+					</view>
+					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.kcsl}}</text></view>
+					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.djbh}}</text></view>
+					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.flxh}}</text></view>
+					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.bz}}</text></view>
+				</view>
 			</view>
 			<view class="mgb20 zd-row jcenter">
 				<view class="zd-col-10 zd-row">
 					<button class="confirm-button confirm-button_cancle mgl0" @tap="show = false">取消</button>
 					<button v-if="type === 1 || type === 2" class="confirm-button mgl0" @tap="SetStorConfirm">确定</button>
 					<button v-show="type === 3" class="confirm-button mgl0" :class="{'confirm-button_disabled': popData.length === 0}" :disabled="popdisabled" @tap="_addAssignDtl">确定</button>
+					<button v-show="type === 4" class="confirm-button mgl0" :class="{'confirm-button_disabled': popData.length === 0}" :disabled="popdisabled" @tap="_updateAssignDtl">确定</button>
 				</view>
 			</view>
 		</view>
@@ -190,7 +210,7 @@
 	import ScanInput from '@/components/ScanInput.vue'
 	import Pagination from '@/components/Pagination.vue'
 	import GridDetail from '@/components/GridDetail.vue'
-	import {getWarehouseInfo, getOrganizationInfo, allocationPage, allocationBillDetail, allocationBillConfirm, allocationBillDetailUpdate, easOutInBillSync, inWarehouseAssignLocation, addAssignDtl, inWarehouseCommit} from '@/utils/getData2.js'
+	import {getWarehouseInfo, getOrganizationInfo, allocationPage, allocationBillDetail, allocationBillConfirm, allocationBillDetailUpdate, easOutInBillSync, inWarehouseAssignLocation, addAssignDtl, inWarehouseCommit, viewAssignDtl, updateAssignDtl} from '@/utils/mork2.js'
 	export default {
 		components: {
 			NavBar,
@@ -415,6 +435,23 @@
 				} else if (type === 3 && e.subOneChecked) { // 库位分配
 					this.popObj = e
 					this._inWarehouseAssignLocation(e)
+				} else if (type === 4) {
+					this._viewAssignDtl(e, obj)
+				}
+			},
+			// 点击二级表格行中的物料编号，弹窗加载表格
+			async _viewAssignDtl (e, obj) {
+				let res = await viewAssignDtl(obj)
+				if (res.code ===1) {
+					this.popData = [...res.result]
+					this.sortArr(this.popData)
+					this.popObj = e
+					this.show = true
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
 				}
 			},
 			// 副表格修改仓库弹窗->确定
@@ -474,6 +511,28 @@
 				  }
 				})
 			},
+			// 点击二级表格行中的物料编号，弹窗加载表格 -> 点击确定按钮
+			async _updateAssignDtl () {
+				this.popdisabled = true
+				if (this.popData.length === 0) {
+					this.popdisabled = false
+					return
+				}
+			  try {
+				let res = await updateAssignDtl(this.popData, 'ALLO')
+				if (res.code === 1) {
+					this.show = false
+					this._allocationPage(this.popObj)
+				}
+				uni.showToast({
+					title: res.desc,
+					icon: 'none'
+				})
+				this.popdisabled = false
+			  } catch (e) {
+				this.popdisabled = false
+			  }
+			},
 			// 分配库位弹窗表格
 			async _inWarehouseAssignLocation (e) {
 				let arr = e.subData.filter(ele => ele.checked === true)
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -2353,7 +2353,7 @@ export const allocationBillDetail = () => {
 	    "result": [
 	        {
 	            "id": "0201",
-	            "material_code": "btAAAAW8Wd5QCrde",
+	            "wlbm": "btAAAAW8Wd5QCrde",
 				"sl": "1",
 				"dcckbm": '100',
 				"dcckmc": 'aaa',