添加一期修改功能

locale/en.json

@@ -106,6 +106,7 @@
 	"filter.remark": "Remark",
 	"filter.document-type": "Document type",
 	"filter.keywords": "Keywords",
+	"filter.warehouse-area": "Warehouse area",
 	"grid.number": "No.",
 	"grid.select": "Select",
 	"grid.work-order-number": "Work order number",

locale/id.json

@@ -92,6 +92,7 @@
 	"grid.number": "Nomor",
 	"grid.select": "Pilihan",
 	"filter.keywords": "Kata kunci",
+	"filter.warehouse-area": "Daerah gudang",
 	"filter.point": "Posisi titik",
 	"filter.mother-roll": "Mother roll",
 	"filter.state": "Keadaan",

locale/zh-Hans.json

@@ -106,6 +106,7 @@
 	"filter.remark": "备注",
 	"filter.document-type": "单据类型",
 	"filter.keywords": "关键字",
+	"filter.warehouse-area": "库区",
 	"grid.number": "序号",
 	"grid.select": "选择",
 	"grid.work-order-number": "工单号",

manifest.json

@@ -16,6 +16,9 @@
             "autoclose" : true,
             "delay" : 0
         },
+		"compatible" : {
+		    "ignoreVersion" : true
+		},
         /* 模块配置 */
         "modules" : {},
         /* 应用发布信息 */

pages/ProductManage/EmptyPipeInStore.vue

@@ -133,7 +133,7 @@
 					})
 					return
 				}
-				let res = await taskQuerydevice([{device_code: this.index2}])
+				let res = await taskQuerydevice([{product_area: this.index1, device_code: this.index2}])
 				let data = res.data[0]
 				this.qty = data.qty
 				this._queryPaperMaterial(data.material_code)

pages/WarehouseManage/InStoreConfirm.vue

@@ -32,6 +32,12 @@
 						<view class="filter_input_wraper_inn_text">{{$t('filter.virtual-library')}}</view>
 					</view>
 				</view>
+				<view v-show="isV === '1'" class="filter_item">
+					<view class="filter_label">{{$t('filter.warehouse-area')}}</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -59,7 +65,7 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1 || dataList.length === 0}" :disabled="disabled" @tap="_stConfirm">{{$t('button.storage-confirm')}}</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || dataList.length === 0 || (isV === '1' && index1 === '')}" :disabled="disabled" @tap="_stConfirm">{{$t('button.storage-confirm')}}</button>
 			<!-- <button class="submit-button" :class="{'btn-disabled': dataList.length === 0}" :disabled="disabled1" @tap="_stPrint">补码</button> -->
 			<button class="submit-button" @tap="_boxQuery(val1)">{{$t('button.search')}}</button>
 		</view>
@@ -71,7 +77,7 @@
 	import SearchBox from '@/components/SearchBox.vue'
 	import SearchBoxMx from '@/components/SearchBoxMx.vue'
 	import permision from "@/utils/permission.js"
-	import {boxQuery, stConfirm, stPrint} from '@/utils/getData2.js'
+	import {boxQuery, stConfirm, stPrint, getStorSect} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -83,12 +89,17 @@
 				val1: '',
 				val2: '',
 				isV: '0',
+				options1: [],
+				index1: '',
 				dataList: [],
 				disabled: false,
 				disabled1: false,
 				focused: true
 			};
 		},
+		created () {
+			this._getStorSect()
+		},
 		mounted () {
 			setTimeout(() => {
 				uni.hideKeyboard()
@@ -99,6 +110,15 @@
 			isVirtual () {
 				this.isV = this.isV === '0' ? '1' : '0'
 			},
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
+			},
+			/** 库区下拉框查询 */
+			async _getStorSect () {
+				let res = await getStorSect()
+				this.options1 = [...res.data]
+			},
 			/** 初始化查询 */
 			async _boxQuery (e) {
 				let res = await boxQuery(e, '2')
@@ -107,17 +127,18 @@
 			/** 确认 */
 			async _stConfirm () {
 				this.disabled = true
-				if (!this.val1 || this.dataList.length === 0) {
+				if (!this.val1 || this.dataList.length === 0 || (this.isV === '1' && this.index1 === '')) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await stConfirm(this.dataList, this.val2, '2', this.isV, '', this.val1)
+					let res = await stConfirm(this.dataList, this.val2, '2', this.isV, '', this.val1, this.index1)
 					this.disabled = false
 					// this._boxQuery(this.val1)
 					this.val1 = ''
 					this.val2 = ''
 					this.isV = '0'
+					this.index1 = ''
 					this.dataList = []
 					uni.showToast({
 						title: res.message,

pages/WarehouseManage/InStoreSplit.vue

@@ -32,6 +32,12 @@
 						<view class="filter_input_wraper_inn_text">{{$t('filter.virtual-library')}}</view>
 					</view>
 				</view>
+				<view v-show="isV === '1'" class="filter_item">
+					<view class="filter_label">{{$t('filter.warehouse-area')}}</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -59,7 +65,7 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1 || dataList.length === 0}" :disabled="disabled" @tap="_stConfirm">{{$t('button.storage-confirm')}}</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || dataList.length === 0 || (isV === '1' && index1 === '')}" :disabled="disabled" @tap="_stConfirm">{{$t('button.storage-confirm')}}</button>
 			<button class="submit-button" :class="{'btn-disabled': dataList.length === 0}" :disabled="disabled1" @tap="_stPrint">{{$t('button.complement')}}</button>
 			<button class="submit-button" @tap="_boxQuery(val1)">{{$t('button.search')}}</button>
 		</view>
@@ -70,7 +76,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import SearchBoxMx from '@/components/SearchBoxMx.vue'
-	import {boxQuery, stConfirm, stPrint} from '@/utils/getData2.js'
+	import {boxQuery, stConfirm, stPrint, getStorSect} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -82,12 +88,17 @@
 				val1: '',
 				val2: '',
 				isV: '0',
+				options1: [],
+				index1: '',
 				dataList: [],
 				disabled: false,
 				disabled1: false,
 				focused: true
 			};
 		},
+		created () {
+			this._getStorSect()
+		},
 		mounted () {
 			setTimeout(() => {
 				uni.hideKeyboard()
@@ -98,6 +109,15 @@
 			isVirtual () {
 				this.isV = this.isV === '0' ? '1' : '0'
 			},
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
+			},
+			/** 库区下拉框查询 */
+			async _getStorSect () {
+				let res = await getStorSect()
+				this.options1 = [...res.data]
+			},
 			/** 初始化查询 */
 			async _boxQuery (e) {
 				let res = await boxQuery(e, '4')
@@ -106,12 +126,12 @@
 			/** 确认 */
 			async _stConfirm () {
 				this.disabled = true
-				if (!this.val1 || this.dataList.length === 0) {
+				if (!this.val1 || this.dataList.length === 0 || (this.isV === '1' && this.index1 === '')) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await stConfirm(this.dataList, this.val2, '4', this.isV, '', this.val1)
+					let res = await stConfirm(this.dataList, this.val2, '4', this.isV, '', this.val1, this.index1)
 					this.disabled = false
 					// this._boxQuery(this.val1)
 					this.val1 = ''

pages/WarehouseManage/ReturngoodsInStore.vue

@@ -38,6 +38,12 @@
 						<input type="text" class="filter_input" v-model="val3">
 					</view>
 				</view> -->
+				<view v-show="isV === '1'" class="filter_item">
+					<view class="filter_label">{{$t('filter.warehouse-area')}}</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -65,7 +71,7 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1 || dataList.length === 0}" :disabled="disabled" @tap="_stConfirm">{{$t('button.storage-confirm')}}</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || dataList.length === 0 || (isV === '1' && index1 === '')}" :disabled="disabled" @tap="_stConfirm">{{$t('button.storage-confirm')}}</button>
 			<button class="submit-button" @tap="_boxQuery(val1)">{{$t('button.search')}}</button>
 		</view>
 	</view>
@@ -75,7 +81,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import SearchBoxMx from '@/components/SearchBoxMx.vue'
-	import {boxQuery, stConfirm} from '@/utils/getData2.js'
+	import {boxQuery, stConfirm, getStorSect} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -88,11 +94,16 @@
 				val2: '',
 				val3: '',
 				isV: '0',
+				options1: [],
+				index1: '',
 				dataList: [],
 				disabled: false,
 				focused: true
 			};
 		},
+		created () {
+			this._getStorSect()
+		},
 		mounted () {
 			setTimeout(() => {
 				uni.hideKeyboard()
@@ -103,6 +114,15 @@
 			isVirtual () {
 				this.isV = this.isV === '0' ? '1' : '0'
 			},
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
+			},
+			/** 库区下拉框查询 */
+			async _getStorSect () {
+				let res = await getStorSect()
+				this.options1 = [...res.data]
+			},
 			/** 初始化查询 */
 			async _boxQuery (e) {
 				console.log(11)
@@ -112,12 +132,12 @@
 			/** 确认 */
 			async _stConfirm () {
 				this.disabled = true
-				if (!this.val1 || this.dataList.length === 0) {
+				if (!this.val1 || this.dataList.length === 0 || (this.isV === '1' && this.index1 === '')) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await stConfirm(this.dataList, this.val2, '3', this.isV, this.val3, this.val1)
+					let res = await stConfirm(this.dataList, this.val2, '3', this.isV, this.val3, this.val1, this.index1)
 					this.disabled = false
 					// this._boxQuery(this.val1)
 					this.val1 = ''

pages/WarehouseManage/ScrapInStore.vue

@@ -32,6 +32,12 @@
 						<view class="filter_input_wraper_inn_text">{{$t('filter.virtual-library')}}</view>
 					</view>
 				</view>
+				<view v-show="isV === '1'" class="filter_item">
+					<view class="filter_label">{{$t('filter.warehouse-area')}}</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -59,7 +65,7 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1 || dataList.length === 0}" :disabled="disabled" @tap="_stConfirm">{{$t('button.storage-confirm')}}</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || dataList.length === 0 || (isV === '1' && index1 === '')}" :disabled="disabled" @tap="_stConfirm">{{$t('button.storage-confirm')}}</button>
 			<button class="submit-button" @tap="_boxQuery(val1)">{{$t('button.search')}}</button>
 		</view>
 	</view>
@@ -69,7 +75,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import SearchBoxMx from '@/components/SearchBoxMx.vue'
-	import {boxQuery, stConfirm} from '@/utils/getData2.js'
+	import {boxQuery, stConfirm, getStorSect} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -81,11 +87,16 @@
 				val1: '',
 				val2: '',
 				isV: '0',
+				options1: [],
+				index1: '',
 				dataList: [],
 				disabled: false,
 				focused: true
 			};
 		},
+		created () {
+			this._getStorSect()
+		},
 		mounted () {
 			setTimeout(() => {
 				uni.hideKeyboard()
@@ -96,6 +107,15 @@
 			isVirtual () {
 				this.isV = this.isV === '0' ? '1' : '0'
 			},
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
+			},
+			/** 库区下拉框查询 */
+			async _getStorSect () {
+				let res = await getStorSect()
+				this.options1 = [...res.data]
+			},
 			/** 初始化查询 */
 			async _boxQuery (e) {
 				let res = await boxQuery(e, '1')
@@ -104,12 +124,12 @@
 			/** 确认 */
 			async _stConfirm () {
 				this.disabled = true
-				if (!this.val1 || this.dataList.length === 0) {
+				if (!this.val1 || this.dataList.length === 0 || (this.isV === '1' && this.index1 === '')) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await stConfirm(this.dataList, this.val2, '1', this.isV, '', this.val1)
+					let res = await stConfirm(this.dataList, this.val2, '1', this.isV, '', this.val1, this.index1)
 					this.disabled = false
 					// this._boxQuery(this.val1)
 					this.val1 = ''

pages/login/login.vue

@@ -89,18 +89,18 @@
 				})
 				this.disabled = true
 				if (this.user === '') {
-					uni.showToast({
+					// uni.showToast({
-						title: '用户名不能为空',
+					// 	title: '用户名不能为空',
-						icon: 'none'
+					// 	icon: 'none'
-					})
+					// })
 					this.disabled = false
 					return
 				}
 				if (this.password === '') {
-					uni.showToast({
+					// uni.showToast({
-						title: '密码不能为空',
+					// 	title: '密码不能为空',
-						icon: 'none'
+					// 	icon: 'none'
-					})
+					// })
 					this.disabled = false
 					return
 				}
@@ -123,15 +123,17 @@
 			},
 			async _pdaUpdate () {
 				let res = await pdaUpdate()
-				if (res.versionName === this.version) {
+				// if (res.versionName === this.version) {
-					uni.showToast({
+				// 	uni.showToast({
-						title: '当前为最新版本',
+				// 		title: '当前为最新版本',
-						icon: 'none'
+				// 		icon: 'none'
-					})
+				// 	})
-				} else {
+				// } else {
-					this.grade = true
+				// 	this.grade = true
-					this.androidUrl = res.url
+				// 	this.androidUrl = res.url
-				}
+				// }
+				this.grade = true
+				this.androidUrl = res.url
 			},
 			closeUpdate () {
 				this.grade = false

utils/getData2.js

@@ -541,7 +541,7 @@ export const boxQuery = (no, option, code) => request({
 	}
 })
 // 1.2确认入库
-export const stConfirm = (box_jo, code, option, is, mcode, no) => request({
+export const stConfirm = (box_jo, code, option, is, mcode, no, sid) => request({
 	url:'api/pda/st/confirm',
 	data: {
 		box_jo: box_jo,
@@ -549,7 +549,8 @@ export const stConfirm = (box_jo, code, option, is, mcode, no) => request({
 		option: option,
 		is_virtual: is,
 		material_code: mcode,
-		box_no: no
+		box_no: no,
+		sect_id: sid
 	}
 })
 
@@ -563,6 +564,11 @@ export const stPrint = (box_jo) => request({
 		box_jo: box_jo
 	}
 })
+// 库区
+export const getStorSect = () => request({
+	url:'api/sectattr/getStorSect',
+	data: {}
+})
 
 /**
  * 客户标签打印