bug 修改

pages.json

@@ -173,13 +173,6 @@
 				"enablePullDownRefresh": false
 			}
 		},
-		{
-			"path": "pages/packing/packingList",
-			"style": {
-				"navigationBarTitleText": "委外退料",
-				"enablePullDownRefresh": false
-			}
-		},
 		{
 			"path": "pages/posting/posting",
 			"style": {

pages/confirComplete/confirComplete.vue

@@ -2,6 +2,8 @@
 	<view class="page">
 		<StickyNavBar>
 			<NavBar title="完工入库扫描"></NavBar>
+			<FactorySelect v-model="warehouseCode" />
+
 			<view class="selectSheet">
 				<u-row >
 					<u-col span="12">
@@ -47,6 +49,8 @@ import ContentLoadingMore from '@/components/ContentLoadingMore/index.vue';
 import BottomBtn from '@/components/BottomBtn/index.vue';
 import { parseTime} from "@/utils/ruoyi";
 import scanningList from "./scanningList.vue"
+import FactorySelect from '@/components/FactorySelect/FactorySelect.vue'
+
 
 export default {
 	components: {
@@ -61,6 +65,7 @@ export default {
 			show: true,
 			nlpla: '',
 			wxparams: '',
+			warehouseCode: '',
 			btnArr: [
 				{
 					style: '',

pages/outsourcedReturn/outsourcedReturn.vue

@@ -2,6 +2,8 @@
 	<view class="page">
 		<StickyNavBar>
 			<NavBar title="委外退料"></NavBar>
+			<FactorySelect v-model="warehouseCode" />
+
 			<view class="btn">
 				<uni-easyinput
 					prefixIcon="search"
@@ -51,6 +53,7 @@ export default {
 			totalNum: 0,
 			show: true,
 			wxparams: '',
+			warehouseCode: '',
 			btnArr: [
 				{
 					style: '',

pages/produceReturn/produceReturnList.vue

@@ -14,8 +14,10 @@
 					</checkbox-group>
 				</view>
 			</view>
+			<FactorySelect v-model="warehouseCode" />
+
 			<view class="btn">
-				<uni-easyinput prefixIcon="search" class="topSearch" v-model="nlpla" focus placeholder="请扫描库位" @change="handleInputNlpla"></uni-easyinput>
+				<uni-easyinput prefixIcon="search" class="topSearch" v-model="nlpla" focus placeholder="请扫描库位"></uni-easyinput>
 				<uni-easyinput
 					prefixIcon="search"
 					:disabled="isDisabled"
@@ -65,6 +67,7 @@ export default {
 			show: true,
 			nlpla: '',
 			wxparams: '',
+			warehouseCode: '',
 			btnArr: [
 				{
 					style: '',

pages/purchaseStorage/purchaseStorage.vue

@@ -2,6 +2,7 @@
 	<view class="page">
 		<StickyNavBar>
 			<NavBar title="采购入库扫描"></NavBar>
+			<FactorySelect v-model="warehouseCode" @change="warehouseChange" />
 			<view class="btn">
 				<uni-easyinput prefixIcon="search" class="topSearch" v-model="nlpla" focus placeholder="请扫描库位" @change="handleInputNlpla"></uni-easyinput>
 				<uni-easyinput
@@ -38,13 +39,15 @@ import listItem from "./listItem.vue"
 import StickyNavBar from '@/components/StickyNavBar/index.vue';
 import ContentLoadingMore from '@/components/ContentLoadingMore/index.vue';
 import BottomBtn from '@/components/BottomBtn/index.vue';
+import FactorySelect from '@/components/FactorySelect/FactorySelect.vue'
 import { parseTime} from "@/utils/ruoyi";
 export default {
 	components: {
 		StickyNavBar,
 		ContentLoadingMore,
 		BottomBtn,
-		listItem
+		listItem,
+		FactorySelect
 	},
 	data() {
 		return {
@@ -53,6 +56,7 @@ export default {
 			show: true,
 			nlpla: '',
 			wxparams: '',
+			warehouseCode: '',
 			btnArr: [
 				{
 					style: '',
@@ -78,6 +82,9 @@ export default {
 		// this.getPlnr('100001240428000002|00100000000000019.500|10002442800001');
 	},
 	methods: {
+		warehouseChange(e) {
+			console.log(this.warehouseCode, '----');
+		},
 		deleGonds(detail) {
 			this.goodsList.forEach((ele,idx) => {
 				if(detail.PLNR === ele.PLNR){

pages/salesReturns/salesReturnsList.vue

@@ -2,6 +2,7 @@
 	<view>
 		<StickyNavBar>
 			<NavBar title="销售退货上架"></NavBar>
+			<FactorySelect v-model="warehouseCode" />
 			<view class="btn">
 				<uni-easyinput prefixIcon="search" class="topSearch" v-model="nlpla" focus placeholder="请扫描库位" @change="handleInputNlpla"></uni-easyinput>
 				<uni-easyinput
@@ -72,6 +73,7 @@
 import StickyNavBar from '@/components/StickyNavBar/index.vue';
 import ContentLoadingMore from '@/components/ContentLoadingMore/index.vue';
 import BottomBtn from '@/components/BottomBtn/index.vue';
+
 export default {
 	components: {
 		StickyNavBar,
@@ -85,6 +87,7 @@ export default {
 			show: true,
 			nlpla: '',
 			wxparams: '',
+			warehouseCode: '',
 			btnArr: [
 				{
 					style: '',

store/index.js

@@ -16,7 +16,7 @@ try{
 }
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
-let saveStateKeys = ['vuex_user', 'vuex_token', 'vuex_remember', 'vuex_locale','vuex_isAgent','vuex_workstation','vuex_task'];
+let saveStateKeys = ['vuex_user', 'vuex_user_factory','vuex_token', 'vuex_remember', 'vuex_locale','vuex_isAgent','vuex_workstation','vuex_task'];
 
 // 保存变量到本地存储中
 const saveLifeData = function(key, value){
@@ -41,6 +41,7 @@ const store = new Vuex.Store({
 		vuex_remember: lifeData.vuex_remember ? lifeData.vuex_remember : '',
 		vuex_locale: lifeData.vuex_locale ? lifeData.vuex_locale : '',
 		vuex_isAgent: lifeData.vuex_isAgent ? lifeData.vuex_isAgent : '',
+		vuex_user_factory: lifeData.vuex_user_factory || '1000',
 
 		// 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式
 		vuex_config: config,