change

manifest.json

@@ -2,8 +2,8 @@
     "name" : "华东医药",
     "appid" : "__UNI__F094DF8",
     "description" : "华东医药LMS手持系统",
-    "versionName" : "1.0.2",
+    "versionName" : "1.0.3",
-    "versionCode" : 102,
+    "versionCode" : 103,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

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
 			}
 		}

utils/getData3.js

@@ -7,9 +7,9 @@ import { RSAencrypt } from '@/utils/jsencrypt.js'
  * 公共分类
  */
 // 物料信息查询
-export const queryMaterInfo = (ccode, mcode) => request({
+export const queryMaterInfo = (ccode, cname, mcode) => request({
 	url:'api/pda/publicInterface/queryMaterInfo',
-	data: {class_code: ccode, material_code: mcode}
+	data: {class_code: ccode, class_name: cname, material_code: mcode}
 })
 // 查询区域下拉框
 export const queryRegionDropdown = (rcode) => request({
@@ -21,6 +21,12 @@ export const querySupp = (supcode) => request({
 	url:'api/pda/publicInterface/querySupp',
 	data: {supp_code: supcode}
 })
+// 【类别】下拉框查询
+export const queryClass = () => request({
+	url:'api/pda/publicInterface/queryClass',
+	data: {}
+})
+
 // 手持配置
 // 获取打印机ip下拉框
 export const getPrint = () => request({
@@ -155,9 +161,9 @@ export const confirmBagAssembly = (username, password, tqty, bagNo, mid, suppCod
 	data: {username: username, password: RSAencrypt(password), total_qty: tqty, bagNo: bagNo, materialId: mid, suppCode: suppCode, qty: qty, pcsn: pcsn, validity_period: vperiod}
 })
 // 物料组袋-打印
-export const printBag = (row, printId) => request({
+export const printBag = (username, row, printId) => request({
 	url:'api/print/printBag',
-	data: {row: row, print_id: printId}
+	data: {username: username, row: row, print_id: printId}
 })
 // 根据扫袋码查询组袋信息
 export const queryBagInfo = (bagNo) => request({
@@ -189,9 +195,9 @@ export const confirmBucketAssembly = (username, password, bcode, bweight, qty, p
 	data: {username: username, password: RSAencrypt(password), bucket_code: bcode, bucket_weight: bweight, qty: qty, pcsn: pcsn, material_id: mid}
 })
 // 物料组桶-打印
-export const printBucked = (row, printId) => request({
+export const printBucked = (username, row, printId) => request({
 	url:'api/print/printBucked',
-	data: {row: row, print_id: printId}
+	data: {username: username, row: row, print_id: printId}
 })
 // 根据扫桶码获取组桶信息
 export const queryBuckInfo = (bcode) => request({