更新

common/store/modules/user.js

@@ -29,7 +29,8 @@ const state = {
 	imgUrl: '', //服务器图片baseUrl
 	videoHistory: uni.getStorageSync("videoHistory") || [], //查找视频历史记录
 	helpHistory: uni.getStorageSync("helpHistory") || [], //查找帮助历史记录
-	pageParams: {}
+	pageParams: {},
+	cangName: uni.getStorageSync('cangName') || '-',//暂时的仓库字段
 }
 // getters 可以获取 computer 进行动态刷新
 const getters = {
@@ -45,7 +46,8 @@ const getters = {
 	imgUrl: imgURL => state.imgUrl,
 	videoHistory: videoHistory => state.videoHistory,
 	helpHistory: helpHistory => state.helpHistory,
-	pageParams: pageParams => state.pageParams
+	pageParams: pageParams => state.pageParams,
+	cangName: cangName=>state.cangName
 }
 // actions 异步数据  接口
 const actions = {
@@ -246,6 +248,11 @@ const mutations = {
 	setPageParams(state, payload) {
 		state.pageParams = payload;
 	},
+	// 缓存仓库
+	setcangName(state,payload) {
+		state.cangName = payload;
+		uni.setStorageSync('cangName',payload)
+	}
 }
 
 

components/upload-file/upload-file.vue

@@ -260,7 +260,7 @@ export default {
 		showTip() {
 			return this.isShowTip && (this.fileType || this.fileSize)
 		},
-		...mapGetters('auth', ['authList', 'onceIn'])
+		// ...mapGetters('auth', ['authList', 'onceIn'])
 	},
 	mounted() {
 		// #ifdef APP
@@ -284,7 +284,7 @@ export default {
 			console.log('权限已授权，可执行自己的代码逻辑了')
 			this.authList[this.permissionID] = true
 			const list = { ...this.authList }
-			this.$store.commit('auth/edit', { data: list, index: 'authList' })
+			// this.$store.commit('auth/edit', { data: list, index: 'authList' })
 			if (!this.authList['CAMERA']) {
 				this.openAuth('CAMERA')
 			}

components/upload-image/upload-image.vue

@@ -164,7 +164,7 @@ export default {
 		showTip() {
 			return this.isShowTip && (this.fileType || this.fileSize)
 		},
-		...mapGetters('auth', ['onceIn']),
+		// ...mapGetters('auth', ['onceIn']),
 	},
 	mounted() {
 		// #ifdef APP
@@ -188,7 +188,7 @@ export default {
 			console.log('权限已授权，可执行自己的代码逻辑了')
 			this.authList[this.permissionID] = true
 			const list = {...this.authList}
-			this.$store.commit('auth/edit', {data: list, index: 'authList'})
+			// this.$store.commit('auth/edit', {data: list, index: 'authList'})
 			if (!this.authList['CAMERA']) {
 				this.openAuth('CAMERA')
 			}

env.js

@@ -1,7 +1,7 @@
 /**
  *  全局配置文件
  */
-export const BASE_URL = process.env.NODE_ENV === "development" ? 'http://192.168.168.38:8080' : 'https://erp.xianglitech.com.cn/prod-api'
+export const BASE_URL = process.env.NODE_ENV === "development" ? 'http://192.168.2.112:8080' : 'https://erp.xianglitech.com.cn/prod-api'
 // https://erp.xianglitech.com.cn/prod-api
 // https://test-erp.xianglitech.com.cn/stage-api
 

pages/goods/detail.vue

@@ -102,13 +102,13 @@
 						<!-- <view class="crk-item-line">出库仓库：我的仓库-暂无</view> -->
 						<view class="crk-item-line">货物规格：{{item.materialStandard}}</view>
 						<view class="crk-item-line">{{currentCrkId == 'out' ?'出库':'入库'}}时间：{{item.warehousingTime || '-'}}</view>
-						<view class="crk-item-line">{{currentCrkId == 'out' ?'出库':'入库'}}数量：{{item.actualQuantityInStorage || 0}}{{item.commodityUnit || ''}}</view>
+						<view class="crk-item-line">{{currentCrkId == 'out' ?'出库':'入库'}}数量：{{(item.actualQuantityInStorage * 1).toFixed(0) || 0}}{{item.commodityUnit || ''}}</view>
 						<view class="img-box">
 							<u-image v-if="currentCrkId == 0" src="@/static/image/yck-img.png" width="132rpx" height="132rpx"></u-image>
 							<u-image v-if="currentCrkId == 1" src="@/static/image/yrk-img.png" width="132rpx" height="132rpx"></u-image>
 						</view>
 					</view>
-					<u-empty mode="data" v-if="cukList.length == 0"></u-empty>
+					<u-empty mode="data" text="暂无内容" marginTop="60" icon="https://xiangli-erp.oss-cn-hangzhou.aliyuncs.com/APP/no-notifcations.png" v-if="cukList.length == 0"></u-empty>
 					<u-divider text="仅展示最近10条记录" v-if="cukList.length > 0" :dashed="true"></u-divider>
 					<view style="height: 40rpx;"></view>
 				</scroll-view>

pages/index/index.vue

@@ -113,6 +113,7 @@
 			toUpdate() {
 				const params = this.$store.state.downloadApkParams
 				const url = this.$BASE_URL + '/pda/downloadApk'
+				console.log(url,'url')
 				downloadApkWithJsonPost(url, params)
 			},
 			meunClick() {

pages/inventory-inquiry/index.vue

@@ -76,8 +76,11 @@
               <block v-for="(item, i) in goodsList" :key="i">
                 <good-item :item="item"></good-item>
               </block>
+							<block v-if="goodsList.length == 0">
+								<u-empty mode="data" text="暂无内容" marginTop="60" icon="https://xiangli-erp.oss-cn-hangzhou.aliyuncs.com/APP/no-notifcations.png"></u-empty>
+							</block>
               <!-- 加载更多 -->
-              <u-loadmore :status="loadStatus" @loadmore="onLoadMore" />
+              <u-loadmore v-if="goodsList.length > 0" :status="loadStatus" @loadmore="onLoadMore" />
             </scroll-view>
           </view>
         </view>

pages/picking-task/delivery.vue

@@ -10,7 +10,7 @@
 						<text>发出仓库</text>
 					</view>
 					<view class="info-line-value">
-						我的仓库-暂无
+						{{cangName}}
 					</view>
 				</view>
 				<view class="info-line">
@@ -133,6 +133,7 @@
 	import scanedPop from '@/components/scaned-pop/scaned-pop.vue'
 	import goodsPop from '@/components/goods-pop/goods-pop.vue'
 	import {orderDetail, orderInfo, orderSubmit} from '@/common/request/apis/purchase'
+	import {mapGetters} from 'vuex'
 	export default {
 		components: {
 			goodItem,
@@ -175,6 +176,7 @@
 			this.getOrderInfo(e.id)
 		},
 		computed: {
+			...mapGetters(['cangName']),
 			speciesNum() {
 				let num = 0
 				if(this.goodsList.length == 0 || !this.goodsList) {

pages/picking-task/detail.vue

@@ -18,7 +18,7 @@
 						<text>发出仓库</text>
 					</view>
 					<view class="info-line-value">
-						我的仓库-暂无
+						{{cangName}}
 					</view>
 				</view>
 				<view class="info-line">
@@ -50,7 +50,7 @@
 						<text>制单人</text>
 					</view>
 					<view class="info-line-value">
-						刘双强-暂无
+						{{orderInfo.createName || '-'}}
 					</view>
 				</view>
 				<view class="info-line">
@@ -66,7 +66,7 @@
 						<text>出库人</text>
 					</view>
 					<view class="info-line-value">
-						刘双美-暂无
+						{{orderInfo.operName || '-'}}
 					</view>
 				</view>
 				<view class="info-line">
@@ -126,6 +126,7 @@
 <script>
 	import goodItem from '@/components/good-item/good-item.vue'
 	import {orderDetail, orderInfo} from '@/common/request/apis/purchase'
+	import {mapGetters} from 'vuex'
 	export default {
 		components: {
 			goodItem,
@@ -143,6 +144,9 @@
 			this.getOrderInfo(e.id)
 			this.getOrderDetail(e.id)
 		},
+		computed:{
+			...mapGetters(['cangName'])
+		},
 		methods:{
 		getOrderInfo(id) {
 			orderInfo(id)
@@ -184,7 +188,7 @@
 			manualClick() {
 				this.goodsShow = true
 			},
-			toDetail() {
+			toDetail(val) {
 				uni.navigateTo({
 					url:`/pages/goods/detail?id=${val.id}&name=${val.materialName}&materialId=${val.materialId}`
 				})

pages/picking-task/index.vue

@@ -33,7 +33,7 @@
 					<task-item :item="item" @toStorage="toStorage" @toDetail="toDetail"></task-item>
 				</block>
 				<u-loadmore v-if="taskList.length > 0" :status="status" />
-				<u-empty mode="data" v-if="taskList.length == 0"></u-empty>
+				<u-empty mode="data" text="暂无内容" marginTop="60" icon="https://xiangli-erp.oss-cn-hangzhou.aliyuncs.com/APP/no-notifcations.png" v-if="taskList.length == 0"></u-empty>
 			</view>
 		</view>
 		<!-- 中心仓弹窗 -->
@@ -136,6 +136,7 @@
 					if(res.code == 200) {
 						this.stashColumns = [res.data]
 						this.cangName = res.data[0].label
+						this.$store.commit('setcangName', this.cangName)
 					}
 				})
 			},
@@ -186,6 +187,7 @@
 			pickerConfirm(val) {
 				this.cangName = val.value[0].label
 				this.stashShow = false
+				this.$store.commit('setcangName', this.cangName)
 			},
 			statusConfirm(val) {
 				this.type1 = val.value[0].label
@@ -235,6 +237,7 @@
 				this.toOrderStartHandle(val.id)
 			},
 			toDetail(val) {
+				console.log(val,'val')
 				uni.navigateTo({
 					url:`/pages/picking-task/detail?id=${val.id}`
 				})

pages/purchase/detail.vue

@@ -18,7 +18,7 @@
 						<text>收入仓库</text>
 					</view>
 					<view class="info-line-value">
-						我的仓库-暂无
+						{{cangName}}
 					</view>
 				</view>
 				<view class="info-line">
@@ -58,7 +58,7 @@
 						<text>制单人</text>
 					</view>
 					<view class="info-line-value">
-						刘双强-暂无
+						{{orderInfo.createName || '-'}}
 					</view>
 				</view>
 				<view class="info-line">
@@ -74,7 +74,7 @@
 						<text>入库人</text>
 					</view>
 					<view class="info-line-value">
-						刘双美-暂无
+						{{orderInfo.operName || '-'}}
 					</view>
 				</view>
 				<view class="info-line">
@@ -134,6 +134,7 @@
 <script>
 	import goodItem from '@/components/good-item/good-item.vue'
 	import {orderDetail, orderInfo} from '@/common/request/apis/purchase'
+	import {mapGetters} from 'vuex'
 	export default {
 		components: {
 			goodItem,
@@ -152,6 +153,9 @@
 			this.getOrderInfo(e.id)
 			this.getOrderDetail(e.id)
 		},
+		computed:{
+			...mapGetters(['cangName']),
+		},
 		methods:{
 			getOrderInfo(id) {
 				orderInfo(id)

pages/purchase/index.vue

@@ -33,7 +33,7 @@
 					<task-item :item="item" @toStorage="toStorage" @toDetail="toDetail" type="caigou"></task-item>
 				</block>
 				<u-loadmore v-if="taskList.length > 0" :status="status" />
-				<u-empty mode="data" v-if="taskList.length == 0"></u-empty>
+				<u-empty mode="data" text="暂无内容" marginTop="60" icon="https://xiangli-erp.oss-cn-hangzhou.aliyuncs.com/APP/no-notifcations.png" v-if="taskList.length == 0"></u-empty>
 			</view>
 		</view>
 		<!-- 中心仓弹窗 -->
@@ -135,6 +135,7 @@
 					if(res.code == 200) {
 						this.stashColumns = [res.data]
 						this.cangName = res.data[0].label
+						this.$store.commit('setcangName', this.cangName)
 					}
 				})
 			},
@@ -196,6 +197,7 @@
 			pickerConfirm(val) {
 				this.cangName = val.value[0].label
 				this.stashShow = false
+				this.$store.commit('setcangName', this.cangName)
 			},
 			statusConfirm(val) {
 				this.type1 = val.value[0].label

pages/purchase/put-storage.vue

@@ -10,7 +10,7 @@
 						<text>收入仓库</text>
 					</view>
 					<view class="info-line-value">
-						鹏越中心仓-暂无
+						{{cangName}}
 					</view>
 				</view>
 				<view class="info-line">
@@ -135,6 +135,7 @@
 	import scanedPop from '@/components/scaned-pop/scaned-pop.vue'
 	import goodsPop from '@/components/goods-pop/goods-pop.vue'
 	import {orderDetail, orderInfo, orderSubmit} from '@/common/request/apis/purchase'
+	import {mapGetters} from 'vuex'
 	export default {
 		components: {
 			goodItem,
@@ -194,6 +195,7 @@
 			uni.$off('scanFinish')
 		},
 		computed: {
+			...mapGetters(['cangName']),
 			speciesNum() {
 				let num = 0
 				if(this.goodsList.length == 0 || !this.goodsList) {