查询

common/style/layout.css

@@ -206,6 +206,10 @@ uni-button:after {
 	color: #fff;
 }
 
+/** 下拉框 */
+.uni-select__selector {
+	z-index: 300 !important;
+}
   
 /** 弹窗 */
 .msg_wrapper {

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "点对点",
-    "appid" : "__UNI__6B1D710",
+    "appid" : "__UNI__22404A1",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -72,5 +72,10 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "h5" : {
+        "router" : {
+            "base" : "./"
+        }
+    }
 }

pages/ProductManage/EmptyPipeInStore.vue

@@ -59,7 +59,7 @@
 		</view>
 		<view class="submit-bar">
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="_emptyConfirm">入库确认</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2 || !index}" @tap="_queryMaterialInfo">查询</button>
+			<button class="submit-button" @tap="_queryMaterialInfo">查询</button>
 		</view>
 	</view>
 </template>
@@ -88,6 +88,7 @@
 		},
 		created () {
 			this._queryProductArea()
+			this._queryMaterialInfo()
 		},
 		methods: {
 			/** 选择器 */
@@ -101,10 +102,11 @@
 			},
 			/** 初始化查询 */
 			async _queryMaterialInfo () {
-				if (!this.val1 || !this.val2 || !this.index) {
+				let area = ''
-					return
+				if (this.index !== '') {
+					area = this.options[this.index].value
 				}
-				let res = await queryMaterialInfo1(this.val1, this.val2, this.options[this.index].value)
+				let res = await queryMaterialInfo1(this.val1, this.val2, area)
 				this.dataList = [...res.rows]	
 			},
 			/** 确认 */

pages/ProductManage/ZjCasing.vue

@@ -77,7 +77,7 @@
 		</view>
 		<view class="submit-bar">
 			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || !val2}" :disabled="disabled" @tap="_casingConfirm">套轴确认</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !index}" @tap="_queryMaterialInfo">查询</button>
+			<button class="submit-button" @tap="_queryMaterialInfo">查询</button>
 		</view>
 	</view>
 </template>
@@ -105,6 +105,7 @@
 		},
 		created () {
 			this._queryProductArea()
+			this._queryMaterialInfo()
 		},
 		methods: {
 			/** 选择器 */
@@ -118,10 +119,11 @@
 			},
 			/** 初始化查询 */
 			async _queryMaterialInfo () {
-				if (!this.val1 || !this.index) {
+				let area = ''
-					return
+				if (this.index !== '') {
+					area = this.options[this.index].value
 				}
-				let res = await queryMaterialInfo2(this.val1, this.options[this.index].value)
+				let res = await queryMaterialInfo2(this.val1, area)
 				res.rows.map(el => {
 					this.$set(el, 'checked', false)
 				})

pages/ProductManage/ZjDelivery.vue

@@ -78,7 +78,7 @@
 		<view class="submit-bar">
 			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || checkArr.length > 1}" :disabled="disabled1" @tap="_needVehicle">呼叫载具</button>
 			<button class="submit-button" :class="{'btn-disabled': !checkArr.length}" :disabled="disabled2" @tap="_shippingConfirm">配送确认</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2 || !index}" @tap="_queryMaterialInfo">查询</button>
+			<button class="submit-button" @tap="_queryMaterialInfo">查询</button>
 		</view>
 	</view>
 </template>
@@ -107,6 +107,7 @@
 		},
 		created () {
 			this._queryProductArea()
+			this._queryMaterialInfo()
 		},
 		methods: {
 			/** 选择器 */
@@ -120,10 +121,11 @@
 			},
 			/** 初始化查询 */
 			async _queryMaterialInfo () {
-				if (!this.val1 || !this.index) {
+				let area = ''
-					return
+				if (this.index !== '') {
+					area = this.options[this.index].value
 				}
-				let res = await queryMaterialInfo3(this.val1, this.val2, this.options[this.index].value)
+				let res = await queryMaterialInfo3(this.val1, this.val2, area)
 				res.rows.map(el => {
 					this.$set(el, 'checked', false)
 				})

pages/ProductManage/ZjOutStore.vue

@@ -67,7 +67,7 @@
 		</view>
 		<view class="submit-bar">
 			<button class="submit-button" :class="{'btn-disabled': !checkArr.length}" :disabled="disabled" @tap="_outConfirm">子卷出站</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !index}" @tap="_queryMaterialInfo">查询</button>
+			<button class="submit-button" @tap="_queryMaterialInfo">查询</button>
 		</view>
 	</view>
 </template>
@@ -95,6 +95,7 @@
 		},
 		created () {
 			this._queryProductArea()
+			this._queryMaterialInfo()
 		},
 		methods: {
 			/** 选择器 */
@@ -108,10 +109,11 @@
 			},
 			/** 初始化查询 */
 			async _queryMaterialInfo () {
-				if (!this.val1 || !this.index) {
+				let area = ''
-					return
+				if (this.index !== '') {
+					area = this.options[this.index].value
 				}
-				let res = await queryMaterialInfo4(this.val1, this.options[this.index].value)
+				let res = await queryMaterialInfo4(this.val1, area)
 				res.rows.map(el => {
 					this.$set(el, 'checked', false)
 				})

pages/login/login.vue

@@ -46,9 +46,9 @@
 				})
 			},
 			async toLogin() {
-				uni.redirectTo({
+				// uni.redirectTo({
-					url: '/pages/home/home'
+				// 	url: '/pages/home/home'
-				})
+				// })
 				this.disabled = true
 				if (this.user === '') {
 					uni.showToast({

utils/getData2.js

@@ -9,33 +9,14 @@ export const queryProductArea = () => request({
 	data: {}
 })
 // 1.2空纸管库设备物料初始化查询
-// export const queryMaterialInfo1 = (code, mcode, area) => request({
+export const queryMaterialInfo1 = (code, mcode, area) => request({
-// 	url:'api/pda/empty/queryMaterialInfo',
+	url:'api/pda/empty/queryMaterialInfo',
-// 	data: {
+	data: {
-// 		point_code: code,
+		point_code: code,
-// 		material_code: mcode,
+		material_code: mcode,
-// 		product_area: area
+		product_area: area
-// 	}
-// })
-export const queryMaterialInfo1 = (code, area) => {
-	let res = {
-		rows: [
-			{point_code: 'fdfdfdfdffedfd1',material_code: 'dfdf2', checked: false},
-			{point_code: '1',material_code: '2', checked: false},
-			{point_code: '1',material_code: '2', checked: false},
-			{point_code: '1',material_code: '2', checked: false},
-			{point_code: '1',material_code: '2', checked: false},
-			{point_code: '1',material_code: '2', checked: false},
-			{point_code: '1',material_code: '2', checked: false},
-			{point_code: '1',material_code: '2', checked: false},
-			{point_code: '1',material_code: '2', checked: false},
-			{point_code: '1',material_code: '2', checked: false},
-			{point_code: '1',material_code: '2', checked: false},
-			{point_code: '1',material_code: '2', checked: false},
-		]
 	}
-	return res
+})
-}
 // 1.3入库确认
 export const emptyConfirm = (jo, qty, code) => request({
 	url:'api/pda/empty/confirm',