change

pages/Material/dlx-move-store.vue

@@ -53,7 +53,6 @@
 					</table>
 				</view>
 			</view>
-			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
 		</view>
 		<view class="zd_content">
 			<view class="zd_wrapper">
@@ -154,7 +153,7 @@
 					let res = await getMoveDocumentInfo('1', this.val1, this.mdid)
 					if (res && res.data.length > 0) {
 						this.dataList = [...res.data]
-						this.mdid = ths.dataList[0].moveinvdtl_id
+						this.mdid = this.dataList[0].moveinvdtl_id
 						if (this.dataList.length && this.mdid) {
 							this._getMoveDocumentInfo2()
 						}

pages/Material/dlx-out-store.vue

@@ -49,7 +49,7 @@
 							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.iostorinv_id === pkId}" @tap="toCheck(e)">
 								<td>{{i+1}}</td>
 								<td>{{e.bill_code}}</td>
-								<td>{{e.bill_type}}</td>
+								<td>{{e.bill_type_name}}</td>
 								<td>{{e.struct_code}}</td>
 								<td>{{e.storagevehicle_code}}</td>
 								<td>{{e.material_code}}</td>
@@ -92,8 +92,15 @@
 				keyword: null,
 				date: currentDate,
 				dataList: [],
+				statusMap: {
+                    '1001': '领料出库',
+                    '1002': '质检出库',
+                    '1003': '退货出库',
+                    '1004': '烘干出库',
+                    '1009': '手工出库'
+                },
 				pkId: '',
-				pkObj: {}
+				pkObj: {},
 			};
 		},
 		computed: {
@@ -119,7 +126,10 @@
 				try {
 					let res = await getIoDisDocumentInfo(this.keyword, this.date, '1')
 					if (res && res.data.length > 0) {
-						this.dataList = [...res.data]
+						this.dataList = res.data.map(item => ({
+						...item,
+						bill_type_name: this.statusMap[item.bill_type] || ''
+						}))
 					} else {
 						this.dataList = []
 					}
@@ -135,7 +145,7 @@
 				if (this.pkId) {
 					this.$store.dispatch('setPublicObj', this.pkObj)
 					uni.navigateTo({
-						url: 'pages/Material/hw-out-store'
+						url: '/pages/Material/hw-out-store?title=货位出库'
 					})
 				}
 			}

pages/Material/dlx-pan-store.vue

@@ -37,7 +37,7 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.check_id === pkId}" @tap="toCheck(e)">
 								<td>{{i+1}}</td>
-								<td>{{e.check_result}}</td>
+								<td>{{e.check_result_name}}</td>
 								<td>{{e.struct_code}}</td>
 								<td>{{e.storagevehicle_code}}</td>
 								<td>{{e.material_code}}</td>
@@ -76,6 +76,11 @@
 				title: '',
 				keyword: '',
 				dataList: [],
+				statusMap: {
+                    '10': '生成',
+                    '20': '盘点中',
+                    '99': '完成'
+                },
 				pkId: '',
 				pkObj: {}
 			};
@@ -89,7 +94,10 @@
 				try {
 					let res = await getCheckDocumentInfo(this.keyword, '1')
 					if (res && res.data.length > 0) {
-						this.dataList = [...res.data]
+						this.dataList = res.data.map(item => ({
+						...item,
+						check_result_name: this.statusMap[item.check_result] || ''
+						}))
 					} else {
 						this.dataList = []
 					}
@@ -105,7 +113,7 @@
 				if (this.pkId) {
 					this.$store.dispatch('setPublicObj', this.pkObj)
 					uni.navigateTo({
-						url: 'pages/Material/hw-check'
+						url: '/pages/Material/hw-check?title=货位盘点'
 					})
 				}
 			}

pages/Material/kzj-inout-store.vue

@@ -45,7 +45,8 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryVehicleType, bindEmptyVehicle, unBindEmptyVehicle} from '@/utils/getData1.js'
+	import {bindEmptyVehicle, unBindEmptyVehicle} from '@/utils/getData1.js'
+	import {queryVehicleType} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -57,7 +58,7 @@
 				val1: '',
 				val2: '',
 				options: [],
-				index: '',
+				index: '2',
 				disabled: false
 			};
 		},

pages/Material/lx-in-store.vue

@@ -67,6 +67,7 @@
 								<td>{{e.material_spec}}</td>
 								<td>{{e.material_model}}</td>
 								<td>{{e.quality_time_day}}</td>
+								<td>{{e.execution_stand}}</td>
 								<td>{{['', '待检', '合格', '不合格'][Number(e.quality_type)]}}</td>
 								<td>{{e.bake_num}}</td>
 							</tr>

pages/Material/mater-in-store.vue

@@ -67,6 +67,7 @@
 								<td>{{e.material_spec}}</td>
 								<td>{{e.material_model}}</td>
 								<td>{{e.quality_time_day}}</td>
+								<td>{{e.execution_stand}}</td>
 								<td>{{['', '待检', '合格', '不合格'][Number(e.quality_type)]}}</td>
 								<td>{{e.bake_num}}</td>
 							</tr>
@@ -146,7 +147,9 @@
 				this.disabled = false
 			},
 			toAddMater () {
-				if (!this.dataList.length) return
+				if (!this.dataList.length){
+					return
+				}
 				this.$store.dispatch('setPublicArr', this.dataList)
 				let fobj = {
 					bill_type: this.index,
@@ -155,7 +158,7 @@
 				}
 				this.$store.dispatch('setPublicObj', fobj)
 				uni.navigateTo({
-					url: 'pages/Material/mater-save'
+					url: '/pages/Material/mater-save?title=物料维护'
 				})
 			},
 		}

pages/Material/xlx-in-store.vue

@@ -67,6 +67,7 @@
 								<td>{{e.material_spec}}</td>
 								<td>{{e.material_model}}</td>
 								<td>{{e.quality_time_day}}</td>
+								<td>{{e.execution_stand}}</td>
 								<td>{{['', '待检', '合格', '不合格'][Number(e.quality_type)]}}</td>
 								<td>{{e.bake_num}}</td>
 							</tr>