change

pages/hdyy/wbc/material.vue

@@ -13,6 +13,14 @@
 					</view>
 					<button class="mini-btn" type="primary" @tap="_queryMaterInfo">查询</button>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">类别</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<uni-data-select v-model="index" :localdata="options"></uni-data-select>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -48,7 +56,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryMaterInfo} from '@/utils/getData3.js'
+	import {queryClass, queryMaterInfo} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -58,6 +66,8 @@
 			return {
 				title: '',
 				keyword: null,
+				options: [],
+				index: '',
 				dataList: [],
 				pkId: '',
 				pkObj: {}
@@ -65,15 +75,34 @@
 		},
 		onLoad (options) {
 			this.title = options.title
+			this._queryClass()
 			this._queryMaterInfo()
 		},
 		methods: {
 			handleFocus () {
 				this.keyword = null
 			},
+			async _queryClass () {
+				try {
+					let res = await queryClass()
+					if (res) {
+						this.options = res.data
+					} else {
+						this.options = []
+					}
+				} catch (e) {
+					this.options = []
+				}
+			},
+			selectChange (e) {
+				this.index = e
+				if (e) {
+					this._queryMaterInfo()
+				}
+			},
 			async _queryMaterInfo () {
 				try {
-					let res = await queryMaterInfo(this.keyword)
+					let res = await queryMaterInfo(this.keyword, this.index)
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
 					} else {

pages/hdyy/zpgl/mater-zudai.vue

@@ -190,6 +190,7 @@
 				disabled1: false,
 				pcsn: '',
 				flag: false,
+				uname: '',
 				dialogVisible: false,   // 控制弹窗显示/隐藏
 				reasons: {
 					full: false,          // 物料卡标签填满更换
@@ -227,6 +228,7 @@
 				try {
 					// 显示弹窗，等待用户输入
 					const { username, password } = await this.$refs.credentialPopup.show();
+					this.uname = username
 					// 调用原接口，传入账号密码
 					this._confirmBagAssembly(username, password);
 				} catch (error) {
@@ -363,7 +365,6 @@
 							icon: 'none'
 						})
 					}
-					this.val1 = ''
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
@@ -387,7 +388,7 @@
 				}
 				let row = Object.assign({}, this.materialData, {total_qty: this.totalQty, pcsn: this.pcsn, create_time: this.date, qty: this.num, bag_code: this.val1, validity_period: this.date})
 				try {
-					let res = await printBag(row, this.$store.getters.printUrl)
+					let res = await printBag(this.uname, row, this.$store.getters.printUrl)
 					if (res) {
 						// uni.showToast({
 						// 	title: res.message,
@@ -492,6 +493,7 @@
 					title: '操作成功',
 					icon: 'none'
 				})
+				this.val1 = ''
 				this.disabled1 = false
 			},
 			printTwo (row) {
@@ -574,6 +576,7 @@
 					title: '操作成功',
 					icon: 'none'
 				})
+				this.val1 = ''
 				this.disabled1 = false
 			}
 		}

pages/hdyy/zpgl/mater-zutong.vue

@@ -151,6 +151,7 @@
 				disabled1: false,
 				pcsn: '',
 				flag: false,
+				uname: '',
 				dialogVisible: false,   // 控制弹窗显示/隐藏
 				reasons: {
 					full: false,          // 物料卡标签填满更换
@@ -179,6 +180,7 @@
 				try {
 					// 显示弹窗，等待用户输入
 					const { username, password } = await this.$refs.credentialPopup.show();
+					this.uname = username
 					// 调用原接口，传入账号密码
 					this._confirmBucketAssembly(username, password);
 				} catch (error) {
@@ -299,7 +301,6 @@
 							icon: 'none'
 						})
 					}
-					this.val1 = ''
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
@@ -323,7 +324,7 @@
 				}
 				let row = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, create_time: this.date, qty: this.num, bucket_code: this.val1, bucket_weight: this.weight})
 				try {
-					let res = await printBucked(row, this.$store.getters.printUrl)
+					let res = await printBucked(this.uname, row, this.$store.getters.printUrl)
 					if (res) {
 						// uni.showToast({
 						// 	title: res.message,
@@ -416,6 +417,7 @@
 					title: '操作成功',
 					icon: 'none'
 				})
+				this.val1 = ''
 				this.disabled1 = false
 			}
 		}