添加删除按钮

common/style/layout.css

@@ -97,13 +97,13 @@ uni-toast .uni-toast {
 	background-color: #e1e1e1;
 }
 .confirm-button{
-	min-width: 65px;
+	min-width: 60px;
 	height: 30px;
 	line-height: 30px;
 	color: #fff;
 	padding: 0;
 	font-size: 13px;
-	margin-left: 10px;
+	margin-left: 6px;
 	margin-right: 0;
 	white-space: nowrap;
 	background: center / 100% 100% url(./static/images/button.png) no-repeat;
@@ -572,7 +572,7 @@ uni-toast .uni-toast {
 	border-radius: 12px
 }
 .pop_label {
-	font-size: 14px;
+	font-size: 12px;
 	line-height: 14px;
 	color: #fff;
 }
@@ -587,6 +587,11 @@ uni-toast .uni-toast {
 .uni-select__selector-empty {
 	color: #fff
 }
+.uni-select__selector-empty, .uni-select__selector-item {
+	font-size: 13px !important;
+	line-height: 14px !important;
+	padding: 10.5px 10px !important;
+}
 .uni-select__selector-item:hover {
 	background-color: #3F6ACA !important;
 }

pages/home/home.vue

@@ -84,9 +84,9 @@
 			toPage (e) {
 				let url = ''
 				if (e.ywlx === 'DB') {
-					url = '/pages/management/alloc-maintenance_new'
+					url = '/pages/management/alloc-maintenance_new?type=' + e.ywlx
 				} else if (e.ywlx === 'SH') {
-					url = '/pages/management/receive-confirm_new'
+					url = '/pages/management/receive-confirm_new?type=' + e.ywlx
 				} else {
 					if (e.djlx === 'LLCKD') {
 						url = '/pages/management/in-storage_LLCKD?id=' + e.djlx + '&name=' + e.name + '&type=' + e.ywlx

pages/management/alloc-maintenance_new.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="content">
 		<nav-bar title="调拨维护"></nav-bar>
-		<view class="sticky search-confirm-wrap">
+		<view class="sticky search-confirm-wrap" style="z-index: 11;">
 			<view class="zd-row">
 				<view class="zd-col-15 zd-row jcflexstart">
-					<view class="zd-col-10"><search-box placeholder="输入查询条件" v-model="val1" /></view>
+					<view class="zd-col-10"><search-box placeholder="关键字" v-model="val1" /></view>
 					<view class="zd-col-7 select_wraper mgl10">
 						<zxz-uni-data-select placeholder="选择调出组织信息" v-model="value2" filterable :localdata="range1"></zxz-uni-data-select>
 					</view>
@@ -15,6 +15,7 @@
 				<view class="zd-col-9 zd-row jcflexend">
 					<button class="confirm-button" @tap="toSearch">查询</button>
 					<button class="confirm-button" :disabled="disabled1" @tap="_easOutInBillSync">同步</button>
+					<button class="confirm-button" :class="{'confirm-button_disabled': checkData.length === 0}" :disabled="disabled1" @tap="_easOutInBillDelete">删除</button>
 				</view>
 			</view>
 		</view>
@@ -22,7 +23,8 @@
 			<view class="zdrow-wrap">
 				<view class="zd-row sticky zd-th-wraper">
 					<view class="zd-col-1 zd-th"><text>序号</text></view>
-					<view class="zd-col-4 zd-th"><text class="fontcol1">调拨单号</text></view>
+					<view class="zd-col-1 zd-th"><text>选择</text></view>
+					<view class="zd-col-3 zd-th"><text class="fontcol1">调拨单号</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>调出库存<br>组织编码</text></view>
@@ -37,7 +39,10 @@
 				<view class="zd-td-wraper" v-for="(e, i) in dataList" :key="e.id">
 					<view class="zd-row" @tap="loadSubData(e)">
 						<view class="zd-col-1 zd-td"><text>{{i+1}}</text></view>
-						<view class="zd-col-4 zd-td fontcol1"><text>{{e.djbh}}</text></view>
+						<view class="zd-col-1 zd-td" @tap.stop="toCheckbox(e)">
+							<view class="zd-checkbox" :class="{'zd-checkbox_active': e.checked}"></view>
+						</view>
+						<view class="zd-col-3 zd-td fontcol1"><text>{{e.djbh}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.cjsj}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.dckcbm}}</text></view>
@@ -210,7 +215,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, viewAssignDtl, updateAssignDtl} from '@/utils/getData2.js'
+	import {getWarehouseInfo, getOrganizationInfo, allocationPage, allocationBillDetail, allocationBillConfirm, allocationBillDetailUpdate, easOutInBillSync, inWarehouseAssignLocation, addAssignDtl, inWarehouseCommit, viewAssignDtl, updateAssignDtl, easOutInBillDelete} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -221,6 +226,7 @@
 		},
 		data() {
 			return {
+				crType: '',
 				val1: '', // 模糊查询
 				value1: '', // 选择调入组织信息
 				value2: '', // 选择调出组织信息
@@ -232,6 +238,7 @@
 				},
 				currentPage1: 1,
 				dataList: [], // 一级表格数据
+				checkData: [], // 一级表格多选数组
 				popData: [], // 副表格点击物料编码弹出弹窗
 				popdisabled: false,
 				popObj: {}, // 弹窗当前主表格内容
@@ -247,7 +254,8 @@
 				subCheckData: [] // 二级表格多选数组
 			}
 		},
-		onLoad () {
+		onLoad (options) {
+			this.crType = options.type
 			this.toSearch()
 			setTimeout(() => {
 				this._getWarehouseInfo()
@@ -319,6 +327,12 @@
 				this.currentPage1 = page
 				this._allocationPage()
 			},
+			// 一级表格多选
+			toCheckbox (e) {
+				e.checked = !e.checked
+				let arr = this.dataList.filter(el => el.checked === true)
+				this.checkData = arr.map(el => {return el.djid})
+			},
 			// 点击一级表格一行加载二级表格
 			loadSubData (e) {
 				if (e.subData.length > 0) {
@@ -596,6 +610,31 @@
 				} catch (e) {
 					console.log(e)
 				} 
+			},
+			// 点击删除按钮
+			async _easOutInBillDelete () {
+				this.disabled1 = true
+				if (!this.checkData.length) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await easOutInBillDelete('ALLO', this.checkData)
+					if (res.code === 1) {
+						this.disabled1 = false
+						this.checkData = []
+						this.subCheckData = []
+						this._allocationPage()
+					} else {
+						this.disabled1 = false
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
+					}
+				} catch (e) {
+					this.disabled1 = false
+				}
 			}
 		}
 	}

pages/management/in-storage_LLCKD.vue

@@ -1,24 +1,25 @@
 <template>
 	<view class="content">
 		<nav-bar :title="title"></nav-bar>
-		<view class="sticky search-confirm-wrap">
+		<view class="sticky search-confirm-wrap" style="z-index: 11;">
 			<view class="zd-row">
 				<view class="zd-col-13 zd-row jcflexstart">
-					<view :class="crType === 'OUT' ? 'zd-col-10' : 'zd-col-16'"><search-box placeholder="输入查询条件" v-model="val1" /></view>
+					<view :class="crType === 'OUT' ? 'zd-col-8' : 'zd-col-16'"><search-box placeholder="关键字" v-model="val1" /></view>
-					<view v-if="crType === 'OUT'" class="zd-col-6 select_wraper mgl10">
+					<view v-if="crType === 'OUT'" class="zd-col-8 select_wraper mgl10">
 						<zxz-uni-data-select placeholder="选择仓管员" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
 					</view>
 					<view class="zd-col-8 mgl10 zd-row jcflexstart">
 						<view class="pop_label mgr1">全部数据</view>
 						<view class="relative">
 							<switch :checked="isChecked" color="#007de7"/>
-							<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 75px; height: 26px;left: 0;"></text>
+							<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 55px; height: 26px;left: 0;"></text>
 						</view>
 					</view>
 				</view>
 				<view class="zd-col-11 zd-row jcflexend">
 					<button class="confirm-button" @tap="toSearch">查询</button>
 					<button class="confirm-button" :disabled="disabled1" @tap="_easOutInBillSync">同步</button>
+					<button class="confirm-button" :class="{'confirm-button_disabled': checkData.length === 0}" :disabled="disabled1" @tap="_easOutInBillDelete">删除</button>
 					<button v-if="id !== 'CGRKD'" class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="showPop(2, '', '')">库位分配</button>
 					<button v-if="id !== 'CGRKD'" class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="inWarehouseSure">库存提交</button>
 					<button class="confirm-button" :class="{'confirm-button_disabled': checkData.length === 0}" :disabled="disabled1" @tap="_easOutInBillUpdate">单据审核</button>
@@ -205,8 +206,8 @@
 	import Pagination from '@/components/Pagination.vue'
 	import GridDetail from '@/components/GridDetail.vue'
 	import UpTop from '@/components/upTop.vue'
-	import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync} from '@/utils/getData2.js'
+	import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync, easOutInBillDelete} from '@/utils/getData2.js'
-	// import {updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync} from '@/utils/getData2.js'
+	// import {updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync, easOutInBillDelete} from '@/utils/getData2.js'
 	// import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation} from '@/utils/mork2.js'
 	export default {
 		components: {
@@ -610,6 +611,32 @@
 				} catch (e) {
 					this.disabled1 = false
 				}
+			},
+			// 点击删除按钮
+			async _easOutInBillDelete () {
+				this.disabled1 = true
+				if (!this.checkData.length) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let type = this.id === 'CGRKD' ? 'SRMINOUT' : 'EASINOUT'
+					let res = await easOutInBillDelete(type, this.checkData)
+					if (res.code === 1) {
+						this.disabled1 = false
+						this.checkData = []
+						this.subCheckData = []
+						this._easOutInBillPage()
+					} else {
+						this.disabled1 = false
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
+					}
+				} catch (e) {
+					this.disabled1 = false
+				}
 			}
 		}
 	}
@@ -642,15 +669,15 @@
 	/deep/ .uni-select__selector-item
 		color #fff
 /deep/ uni-switch .uni-switch-input
-	width 70px
+	width 55px
 	height 26px
 	border-color: #8e99a4;
 	background-color: #8e99a4;
 	&:before
-		width 70px
+		width 55px
 		height 26px
 /deep/ uni-switch .uni-switch-input.uni-switch-input-checked:after
-	transform translateX(44px)
+	transform translateX(28px)
 /deep/ uni-switch .uni-switch-input:before
 	background-color: #8e99a4;
 	height 26px

pages/management/in-storage_new.vue

@@ -1,20 +1,21 @@
 <template>
 	<view class="content">
 		<nav-bar :title="title"></nav-bar>
-		<view class="sticky search-confirm-wrap">
+		<view class="sticky search-confirm-wrap" style="z-index: 11;">
 			<view class="zd-row">
-				<view class="zd-col-13 zd-row jcflexstart">
+				<view class="zd-col-12 zd-row jcflexstart">
-					<view :class="crType === 'OUT' ? 'zd-col-10' : 'zd-col-16'"><search-box placeholder="输入查询条件" v-model="val1" /></view>
+					<view :class="crType === 'OUT' ? 'zd-col-8' : 'zd-col-16'"><search-box placeholder="关键字" v-model="val1" /></view>
-					<view class="select_wraper mgl10":class="crType === 'OUT' ? 'zd-col-8' : 'zd-col-16'">
+					<view class="select_wraper mgl10":class="crType === 'OUT' ? 'zd-col-10' : 'zd-col-16'">
 						<zxz-uni-data-select placeholder="选择仓库" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
 					</view>
 					<view v-if="crType === 'OUT'" class="zd-col-6 select_wraper mgl10">
 						<zxz-uni-data-select placeholder="选择仓管员" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
 					</view>
 				</view>
-				<view class="zd-col-11 zd-row jcflexend">
+				<view class="zd-col-12 zd-row jcflexend">
 					<button class="confirm-button" @tap="toSearch">查询</button>
 					<button class="confirm-button" :disabled="disabled1" @tap="_easOutInBillSync">同步</button>
+					<button class="confirm-button" :class="{'confirm-button_disabled': checkData.length === 0}" :disabled="disabled1" @tap="_easOutInBillDelete">删除</button>
 					<button v-if="id !== 'CGRKD' && id !== 'EASCGRKD'" class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="showPop(2, '', '')">库位分配</button>
 					<button v-if="id !== 'CGRKD' && id !== 'EASCGRKD'" class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="inWarehouseSure">库存提交</button>
 					<button class="confirm-button" :class="{'confirm-button_disabled': checkData.length === 0}" :disabled="disabled1" @tap="_easOutInBillUpdate">单据审核</button>
@@ -199,8 +200,8 @@
 	import ScanInput from '@/components/ScanInput.vue'
 	import Pagination from '@/components/Pagination.vue'
 	import GridDetail from '@/components/GridDetail.vue'
-	import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync} from '@/utils/getData2.js'
+	import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync, easOutInBillDelete} from '@/utils/getData2.js'
-	// import {updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync} from '@/utils/getData2.js'
+	// import {updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync, easOutInBillDelete} from '@/utils/getData2.js'
 	// import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation} from '@/utils/mork2.js'
 	export default {
 		components: {
@@ -580,6 +581,32 @@
 				} catch (e) {
 					this.disabled1 = false
 				}
+			},
+			// 点击删除按钮
+			async _easOutInBillDelete () {
+				this.disabled1 = true
+				if (!this.checkData.length) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let type = this.id === 'CGRKD' ? 'SRMINOUT' : 'EASINOUT'
+					let res = await easOutInBillDelete(type, this.checkData)
+					if (res.code === 1) {
+						this.disabled1 = false
+						this.checkData = []
+						this.subCheckData = []
+						this._easOutInBillPage()
+					} else {
+						this.disabled1 = false
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
+					}
+				} catch (e) {
+					this.disabled1 = false
+				}
 			}
 		}
 	}

pages/management/receive-confirm_new.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="content">
 		<nav-bar title="收货确认"></nav-bar>
-		<view class="sticky search-confirm-wrap">
+		<view class="sticky search-confirm-wrap" style="z-index: 11;">
 			<view class="zd-row">
 				<view class="zd-col-14 zd-row jcflexstart">
-					<view class="zd-col-12"><search-box placeholder="请输入查询条件" v-model="val1" /></view>
+					<view class="zd-col-12"><search-box placeholder="关键字" v-model="val1" /></view>
 					<view class="zd-col-12 select_wraper mgl10">
 						<zxz-uni-data-select placeholder="请选择收货组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
 					</view>
@@ -12,6 +12,7 @@
 				<view class="zd-col-10 zd-row jcflexend">
 					<button class="confirm-button" @tap="toSearch">查询</button>
 					<button class="confirm-button" :disabled="disabled1" @tap="_easOutInBillSync">同步</button>
+					<button class="confirm-button" :class="{'confirm-button_disabled': checkData.length === 0}" :disabled="disabled1" @tap="_easOutInBillDelete">删除</button>
 				</view>
 			</view>
 		</view>
@@ -19,6 +20,7 @@
 			<view class="zdrow-wrap">
 				<view class="zd-row sticky zd-th-wraper">
 					<view class="zd-col-1 zd-th"><text>序号</text></view>
+					<view class="zd-col-1 zd-th"><text>选择</text></view>
 					<view class="zd-col-3 zd-th"><text class="fontcol1">送货单号</text></view>
 					<view class="zd-col-2 zd-th"><text>送货日期</text></view>
 					<view class="zd-col-2 zd-th"><text>提交时间</text></view>
@@ -27,12 +29,15 @@
 					<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-4 zd-th"><text>审核结果</text></view>
+					<view class="zd-col-3 zd-th"><text>审核结果</text></view>
 					<view class="zd-col-2 zd-th">更多</view>
 				</view>
 				<view class="zd-td-wraper" v-for="(e, i) in dataList" :key="e.id">
 					<view class="zd-row" @tap="loadSubData(e)">
 						<view class="zd-col-1 zd-td"><text>{{i+1}}</text></view>
+						<view class="zd-col-1 zd-td" @tap.stop="toCheckbox(e)">
+							<view class="zd-checkbox" :class="{'zd-checkbox_active': e.checked}"></view>
+						</view>
 						<view class="zd-col-3 zd-td fontcol1"><text>{{e.djbh}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.tjsj}}</text></view>
@@ -41,7 +46,7 @@
 						<view class="zd-col-2 zd-td"><text>{{e.gysbm}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.gys}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.dhrq}}</text></view>
-						<view class="zd-col-4 zd-td"><text>{{e.shjg}}</text></view>
+						<view class="zd-col-3 zd-td"><text>{{e.shjg}}</text></view>
 						<view class="zd-col-2 zd-td" @tap.stop="getDetails(4,e)">
 							<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
 						</view>
@@ -216,7 +221,7 @@
 	import ScanInput from '@/components/ScanInput.vue'
 	import Pagination from '@/components/Pagination.vue'
 	import GridDetail from '@/components/GridDetail.vue'
-	import {getOrganizationInfo, getWarehouseInfo, receiptPage, receiptBillDetailPage, receiptBillDetailUpdate, receiptBillDetailSetStor, receiptBillConfirm, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, easOutInBillSync, inWarehouseCommit} from '@/utils/getData2.js'
+	import {getOrganizationInfo, getWarehouseInfo, receiptPage, receiptBillDetailPage, receiptBillDetailUpdate, receiptBillDetailSetStor, receiptBillConfirm, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, easOutInBillSync, inWarehouseCommit, easOutInBillDelete} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -227,6 +232,7 @@
 		},
 		data() {
 			return {
+				crType: '',
 				val1: '', // 模糊查询
 				value1: '', // 收货组织信息
 				range1: [],
@@ -237,6 +243,7 @@
 				},
 				currentPage1: 1,
 				dataList: [], // 一级表格数据
+				checkData: [], // 一级表格多选数组
 				val2: '',
 				popData: [], // 副表格点击物料编码弹出弹窗
 				popdisabled: false,
@@ -253,7 +260,8 @@
 				subCheckData: [] // 二级表格多选数组
 			}
 		},
-		onLoad () {
+		onLoad (options) {
+			this.crType = options.type
 			this.toSearch()
 			setTimeout(() => {
 				this._getWarehouseInfo()
@@ -327,6 +335,12 @@
 				this.currentPage1 = page
 				this._receiptPage()
 			},
+			// 一级表格多选
+			toCheckbox (e) {
+				e.checked = !e.checked
+				let arr = this.dataList.filter(el => el.checked === true)
+				this.checkData = arr.map(el => {return el.djid})
+			},
 			// 点击一级表格一行加载副表格
 			loadSubData (e) {
 				if (e.subData.length > 0) {
@@ -639,6 +653,31 @@
 				} catch (e) {
 					console.log(e)
 				} 
+			},
+			// 点击删除按钮
+			async _easOutInBillDelete () {
+				this.disabled1 = true
+				if (!this.checkData.length) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await easOutInBillDelete('RECE', this.checkData)
+					if (res.code === 1) {
+						this.disabled1 = false
+						this.checkData = []
+						this.subCheckData = []
+						this._receiptPage()
+					} else {
+						this.disabled1 = false
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
+					}
+				} catch (e) {
+					this.disabled1 = false
+				}
 			}
 		}
 	}

utils/getData2.js

@@ -313,4 +313,9 @@ export const stIvtCheckdtlBasedOnFinance = (arr) => request({
 export const easOutInBillSync = (type) => request({
 	url:'api/easOutInBill/sync',
 	data: {type: type}
+})
+// 删除
+export const easOutInBillDelete = (type, arr) => request({
+	url:'api/easOutInBill/delete',
+	data: {type: type, djids: arr}
 })