木箱库

locale/en-1.json

@@ -48,6 +48,7 @@
 	"filter.staginglocationA": "Staging location A",
 	"filter.staginglocationB": "Staging location B",
 	"filter.corespecifications": "Core specifications",
+	"filter.instorepoint": "Storage point",
 	"grid.bill-code": "Bill code",
 	"grid.bill-type": "Bill type",
 	"grid.warehouse-name": "Warehouse name",

locale/id-1.json

@@ -48,6 +48,7 @@
 	"filter.staginglocationA": "Temporary A",
 	"filter.staginglocationB": "Temporary B",
 	"filter.corespecifications": "Spesifikasi inti",
+	"filter.instorepoint": "titik penyimpanan",
 	"grid.bill-code": "Nomor dokumen",
 	"grid.bill-type": "Jenis dokumen",
 	"grid.warehouse-name": "Nama gudang",

locale/zh-Hans-1.json

@@ -48,6 +48,7 @@
 	"filter.axisposition": "轴上下位置",
 	"filter.rollposition": "卷左右位置",
 	"filter.corespecifications": "管芯规格",
+	"filter.instorepoint": "入库点",
 	"grid.bill-code": "单据号",
 	"grid.bill-type": "单据类型",
 	"grid.warehouse-name": "仓库名称",

pages.json

@@ -408,6 +408,30 @@
                 "navigationStyle": "custom"
             }
             
+        }
+        ,{
+            "path" : "pages/SecondPhase/kmxk/EmptyBoxIntoStore",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/kmxk/EmptyBoxSave",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/kmxk/PointSave",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
         }
         ,{
             "path" : "pages/SecondPhase/PackRelation",

pages/SecondPhase/kmxk/EmptyBoxIntoStore.vue

@@ -0,0 +1,91 @@
+<template>
+	<view class="zd_container">
+		<!-- <nav-bar title="空木箱入库"></nav-bar> -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item is-required">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.instorepoint')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val3" />
+					</view>
+				</view>
+				<view class="filter_item is-required">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.box-code')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<link-scan ref="scanChild" @getScanlist="getScanlist"/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val2 || !val3}" :disabled="disabled" @tap="handleConfirm">{{$t('button.confirm')}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import LinkScan from '@/components/LinkScan.vue'
+	import { confirmAction } from '@/utils/utils.js'
+	import {boxIn} from '@/utils/getData4.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			LinkScan
+		},
+		data() {
+			return {
+				title: '',
+				val2: '',
+				val3: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			getScanlist (e) {
+				this.val2 = e.join()
+			},
+			async handleConfirm() {
+				if (!this.val2 || !this.val3) {
+					return
+				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._boxIn()
+				}
+			},
+			async _boxIn () {
+				this.disabled = true
+				try {
+					let res = await boxIn(this.val3, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.val2 = ''
+					this.val3 = ''
+					this.$refs.scanChild.toDel()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val2 = ''
+				this.val3 = ''
+				this.$refs.scanChild.toDel()
+			}
+		}
+	}
+</script>

pages/SecondPhase/kmxk/EmptyBoxSave.vue

@@ -0,0 +1,94 @@
+<template>
+	<view class="zd_container">
+		<!-- <nav-bar title="空木箱入库"></nav-bar> -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item is-required">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.box-code')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val3" />
+					</view>
+				</view>
+				<view class="filter_item is-required">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('grid.wooden-box-weight')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<!-- <input type="number" class="filter_input" v-model="val2"> -->
+						<NumberInput
+						v-model="val2"
+						input-class="filter_input"
+						mode="decimal"
+						:decimalLength="3"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val2 || !val3}" :disabled="disabled" @tap="handleConfirm">{{$t('button.confirm')}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import NumberInput from '@/components/NumberInput.vue'
+	import { confirmAction } from '@/utils/utils.js'
+	import {updateWeight} from '@/utils/getData4.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			NumberInput
+		},
+		data() {
+			return {
+				title: '',
+				val2: '',
+				val3: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			async handleConfirm() {
+				if (!this.val2 || !this.val3) {
+					return
+				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._updateWeight()
+				}
+			},
+			async _updateWeight () {
+				this.disabled = true
+				try {
+					let res = await updateWeight(this.val3, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.val2 = ''
+					this.val3 = ''
+					this.$refs.scanChild.toDel()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val2 = ''
+				this.val3 = ''
+				this.$refs.scanChild.toDel()
+			}
+		}
+	}
+</script>

pages/SecondPhase/kmxk/PointSave.vue

@@ -0,0 +1,113 @@
+<template>
+	<view class="zd_container">
+		<!-- <nav-bar title="点位维护"></nav-bar> -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item is-required">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.point')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val3" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">{{$t('grid.wooden-box-specs')}}</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item is-required">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.box-code')}}</span>
+					</view>
+					<view class="filter_input_wraper">
+						<link-scan ref="scanChild" @getScanlist="getScanlist"/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val2 || !val3}" :disabled="disabled" @tap="handleConfirm">{{$t('button.confirm')}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import LinkScan from '@/components/LinkScan.vue'
+	import { confirmAction } from '@/utils/utils.js'
+	import {getBoxSpecInfo} from '@/utils/getData4.js'
+	import {updatePoint} from '@/utils/getData4.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			LinkScan
+		},
+		data() {
+			return {
+				title: '',
+				val2: '',
+				val3: '',
+				options: [],
+				index: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._getBoxSpecInfo()
+		},
+		methods: {
+			getScanlist (e) {
+				this.val2 = e.join()
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			/** 下拉框查询 */
+			async _getBoxSpecInfo () {
+				let res = await getBoxSpecInfo()
+				this.options = [...res.data]
+			},
+			async handleConfirm() {
+				if (!this.val2 || !this.val3) {
+					return
+				}
+				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				if (isConfirmed) {
+					this._updatePoint()
+				}
+			},
+			async _updatePoint () {
+				this.disabled = true
+				try {
+					let res = await updatePoint(this.val3, this.index, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.val2 = ''
+					this.val3 = ''
+					this.index = ''
+					this.$refs.scanChild.toDel()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val2 = ''
+				this.val3 = ''
+				this.index = ''
+				this.$refs.scanChild.toDel()
+			}
+		}
+	}
+</script>

pages/home/home.vue

@@ -69,8 +69,8 @@
 		},
 		methods: {
 			async _authority () {
-				let res = await authority()
+				// let res = await authority()
-				// let res = await allAuthority()
+				let res = await allAuthority()
 				if (res.code === '1') {
 					this.menuList = [...res.result.rf_menu1.sonTree]
 				} else {

utils/getData4.js

@@ -45,3 +45,33 @@ export const feedinghandleConfirm = (obj) => request({
 		raw_jo: obj
 	}
 })
+// 木箱库-空木箱入库
+export const boxIn = (pcode, vcode) => request({
+	url:'api/boxStackInOut/boxIn',
+	data: {
+		point_code: pcode,
+		vehicle_code: vcode
+	}
+})
+// 木箱库-空木箱维护
+export const updateWeight = (pcode, weight) => request({
+	url:'api/boxStackInOut/updateWeight',
+	data: {
+		point_code: pcode,
+		weight: weight
+	}
+})
+// 木箱库-点位维护
+export const updatePoint = (pcode, mcode, vcode) => request({
+	url:'api/boxStackInOut/updatePoint',
+	data: {
+		point_code: pcode,
+		material_code: mcode,
+		vehicle_code: vcode
+	}
+})
+// 木箱库-查询木箱物料信息
+export const getBoxSpecInfo = (pcode, mcode, vcode) => request({
+	url:'api/boxStackInOut/getBoxSpecInfo',
+	data: {}
+})

utils/mork2.js

@@ -73,6 +73,11 @@ export const allAuthority = () => {
 			]},
 			{menu_id: '9', path: 'RF14', title: '空木箱出库', sonTree: [
 				{menu_id: '1', title: '空木箱出库', path: '/pages/SecondPhase/EmptyBoxOutStore'}
+			]},
+			{menu_id: '10', path: 'RF05', title: '空木箱库', sonTree: [
+				{menu_id: '1', title: '空木箱入库', path: '/pages/SecondPhase/kmxk/EmptyBoxIntoStore'},
+				{menu_id: '2', title: '空木箱维护', path: '/pages/SecondPhase/kmxk/EmptyBoxSave'},
+				{menu_id: '3', title: '点位维护', path: '/pages/SecondPhase/kmxk/PointSave'}
 			]}
 		]
 		}