页面优化

pages/hdyy/tygn/work-manage.vue

@@ -5,11 +5,11 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
-					<view class="zd-col-6">
+					<view class="zd-col-5">
 						<span class="filter_label">关键字</span>
 					</view>
-					<view class="zd-col-13">
+					<view class="zd-col-14">
-						<search-box v-model="keyword"/>
+						<input type="text" placeholder="载具编码、任务号、起点、终点" class="filter_input" v-model="keyword">
 					</view>
 					<button class="mini-btn" type="primary" @tap="_queryTask">查询</button>
 				</view>
@@ -65,7 +65,7 @@
 		data() {
 			return {
 				title: '',
-				keyword: '',
+				keyword: null,
 				dataList: [],
 				disabled1: false,
 				disabled2: false,
@@ -75,9 +75,11 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._queryTask()
 		},
 		methods: {
+			handleFocus () {
+				this.keyword = null
+			},
 			toJump (name) {
 				uni.navigateTo({
 					url: `/pages/hdyy/tygn/${name}`

pages/hdyy/wbc/wbc-transfer.vue

@@ -30,6 +30,15 @@
 						/>
 					</view>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-13">
+						<search-box v-model="materialData.material_code"/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="toJump('material?title=物料维护')">查询</button>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -82,6 +91,7 @@
 				num: null,
 				val1: '',
 				val2: '',
+				materialData: {},
 				allCheck: false,
 				checkedArr: [],
 				dataList: [],
@@ -92,7 +102,18 @@
 		onLoad (options) {
 			this.title = options.title
 		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.materialData = this.$store.getters.publicObj
+				this.$store.dispatch('setPublicObj', '')
+			}
+		},
 		methods: {
+			toJump (name) {
+				uni.navigateTo({
+					url: `/pages/hdyy/wbc/${name}`
+				})
+			},
 			toEmpty () {
 				this.val1 = ''
 				this.val2 = ''
@@ -139,7 +160,7 @@
 			},
 			async _queryTransferDtl () {
 				try {
-					let res = await queryTransferDtl(this.val1)
+					let res = await queryTransferDtl(this.val1, this.materialData.material_code)
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
 						this.dataList.forEach(e => {

pages/hdyy/zpgl/mater-zudai.vue

@@ -77,7 +77,7 @@
 						<span class="filter_label">计量单位</span>
 					</view>
 					<view class="zd-col-18">
-						<input type="text" class="filter_input" v-model="unit">
+						<input type="text" class="filter_input" v-model="unit" disabled>
 					</view>
 				</view>
 			</view>
@@ -258,7 +258,7 @@
 				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 8)
 				LODOP.ADD_PRINT_TEXT('31.64mm', '4.87mm', '87.95mm', '5.69mm', '物 料 名 称 Material Name: ' + row.material_name + '')
 				LODOP.ADD_PRINT_TEXT('37.17mm', '4.74mm', '42.44mm', '5.69mm', '物 料 批 号 及 代 码')
-				LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '')
+				LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '_' + row.material_code)
 				LODOP.ADD_PRINT_TEXT('46.78mm', '4.47mm', '27.09mm', '5.69mm', '有 效 期 至 口')
 				LODOP.ADD_PRINT_TEXT('46.78mm', '47.33mm', '27.62mm', '5.69mm', '复 验 期 至 口')
 				LODOP.ADD_PRINT_TEXT('51.01mm', '47.33mm', '21.54mm', '5.69mm', 'Expory Date')
@@ -344,7 +344,7 @@
 				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
 				LODOP.ADD_PRINT_TEXT('37.17mm', '4.74mm', '42.44mm', '5.69mm', '物 料 批 号 及 代 码')
 				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
-				LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '')
+				LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '_' + row.material_code)
 				LODOP.ADD_PRINT_TEXT('46.78mm', '4.47mm', '41.65mm', '5.69mm', '桶 号 Barrel No.: ')
 				LODOP.ADD_PRINT_TEXT('46.78mm', '48.13mm', '43.5mm', '5.69mm', '皮 重 Tare Weight: ')
 				LODOP.ADD_PRINT_TEXT('51.81mm', '48.13mm', '44.03mm', '5.69mm', '总 重 Total Weight: ')

pages/hdyy/zpgl/mater-zutong.vue

@@ -222,7 +222,7 @@
 				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
 				LODOP.ADD_PRINT_TEXT('37.17mm', '4.74mm', '42.44mm', '5.69mm', '物 料 批 号 及 代 码')
 				LODOP.SET_PRINT_STYLEA(0, 'FontSize', 10)
-				LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '')
+				LODOP.ADD_PRINT_TEXT('40.9mm', '4.74mm', '86.1mm', '5.69mm', 'Material Batch No. and Code: ' + row.pcsn + '_' + row.material_code)
 				LODOP.ADD_PRINT_TEXT('46.78mm', '4.47mm', '41.65mm', '5.69mm', '桶 号 Barrel No.: ' + row.bucket_code + '')
 				LODOP.ADD_PRINT_TEXT('46.78mm', '48.13mm', '43.5mm', '5.69mm', '皮 重 Tare Weight: ' + row.bucket_weight + '')
 				LODOP.ADD_PRINT_TEXT('51.81mm', '48.13mm', '44.03mm', '5.69mm', '总 重 Total Weight: ')

pages/home/home.vue

@@ -5,7 +5,7 @@
 			<view class="userInfo-wrap">
 				<view class="userInfo">
 					<text v-if="userName !== ''" class="p1">{{userName}}</text>
-					<text class="p2">欢迎进入华东医药WMS手持系统！</text>
+					<text class="p2">欢迎进入华东制药LMS手持系统！</text>
 				</view>
 				<view class="exit" @tap="Quit">
 					<view class="icon-exit"></view>

pages/login/login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="zd_content bg">
 		<view class="p1">欢迎来到</view>
-		<view class="p2">华东医药WMS手持系统！</view>
+		<view class="p2">华东制药LMS手持系统！</view>
 		<view class="input-box">
 			<input class="large-input" type="text" placeholder="请输入用户名" v-model="user">
 		</view>

utils/getData3.js

@@ -40,9 +40,9 @@ export const confirmStock = (pcode, rcode, mid, mcode, mname, pcsn, qty, unit, r
  * 外包材转运（外包材管理）
  */
 // 查询列表明细
-export const queryTransferDtl = (opoint) => request({
+export const queryTransferDtl = (opoint, mcode) => request({
 	url:'api/pda/packaging/queryTransferDtl',
-	data: {out_point: opoint}
+	data: {out_point: opoint, material_code: mcode}
 })
 
 // 确认转运