App.vue

@@ -8,7 +8,7 @@ export default {
 		uni.setStorageSync('downloadApkParams', null);
 		console.log('onLaunch')
 		// 检测客户端更新
-		this.$store.dispatch('update/update', 0)
+		// this.$store.dispatch('update/update', 0)
 	},
 	onShow() {
 		// #ifdef APP-PLUS

components/good-item/good-item.vue

@@ -93,7 +93,7 @@
 		}
 		.good-cont {
 			display: grid;
-			grid-template-columns: 20% 40% 40%;
+			grid-template-columns: 25% 45% 30%;
 			margin-top: 16rpx;
 			padding: 0 24rpx;
 			&-item {

components/leo-tree/tree-node.vue

@@ -3,9 +3,10 @@
     <view
       class="head"
       @click.stop="changeShow"
-      style="padding-left: 20rpx"
+			style="padding-left: 10rpx"
       :class="{ active: isItemActive(item) }"
     >
+		<!--  -->
       <text class="txt">{{ item[defaultProps.label] }}</text>
       <view
         class="left-icon"
@@ -22,7 +23,7 @@
         <view
           class="head"
           @click.stop="toggleNode(index)"
-          :style="{ paddingLeft: (node._level + 1) * 20 + 20 + 'rpx' }"
+          :style="{ paddingLeft: (node._level + 1) * 10 + 20 + 'rpx' }"
           :class="{ active: isItemActive(node) }"
         >
           <text class="txt">{{ node[defaultProps.label] }}</text>
@@ -214,7 +215,7 @@ export default {
     line-height: 60rpx;
     min-height: 60rpx;
     position: relative;
-    padding-right: 50rpx;
+    // padding-right: 50rpx;
     &.active {
       background-color: #fff;
     }

components/task-item/task-item.vue

@@ -11,7 +11,7 @@
 				<view v-else>
 					<view class="tips tips-red" v-if="item.status == 1">待拣货</view>
 					<view class="tips tips-greed" v-if="item.status == 2">已拣货</view>
-					<view class="tips tips-greed" v-if="item.status == 4">拣货中</view>
+					<view class="tips tips-yellow" v-if="item.status == 4">拣货中</view>
 				</view>
 			</view>
 			<view class="task-line" v-if="type == 'caigou'">
@@ -24,7 +24,7 @@
 			</view>
 			<view class="task-line">
 				<view>单据日期：</view>
-				<view>{{item.operTime}}</view>
+				<view>{{item.createTime}}</view>
 			</view>
 			<view class="task-line">
 				<view class="task-line2">
@@ -33,7 +33,7 @@
 				</view>
 				<view class="task-line2">
 					<view>货物种类：</view>
-					<view class="task-num">{{item.goodsTypeCount || 0}}件</view>
+					<view class="task-num">{{item.goodsTypeCount || 0}}种</view>
 				</view>
 			</view>
 		</view>

env.js

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

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "pdaApp",
+    "name" : "pdaApp-test",
     "appid" : "__UNI__7E491C0",
     "description" : "pdaApp",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
+    "versionName" : "1.0.2",
+    "versionCode" : 102,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/inventory-inquiry/index.vue

@@ -12,7 +12,7 @@
       <view class="head-box">
         <view class="search-box">
           <u-search
-            placeholder="请输入单据编号"
+            placeholder="输入关键字进行货物的模糊查询"
             shape="square"
             :showAction="false"
             @search="handleSearch"
@@ -351,7 +351,7 @@ export default {
       .goods-cont {
         display: flex;
         .goods-cont-left {
-          width: 160rpx;
+          width: 190rpx;
           background-color: #f0f6fb;
           .type-item {
             width: 100%;

pages/inventory-task/components/check-item.vue

@@ -212,6 +212,7 @@ export default {
       background: #0256ff;
       font-size: 32rpx;
       border-radius: 8rpx;
+			margin-right: 20rpx;
     }
   }
 }

pages/inventory-task/index.vue

@@ -36,8 +36,9 @@
             @btnClick="handleBtnClick"
           ></check-item>
         </view>
+				<u-empty mode="data" text="暂无内容" marginTop="60" icon="https://xiangli-erp.oss-cn-hangzhou.aliyuncs.com/APP/no-notifcations.png" v-if="list.length == 0"></u-empty>
         <!-- 加载更多 -->
-        <u-loadmore :status="loadStatus" @loadmore="onLoadMore" />
+        <u-loadmore v-if="list.length > 0" :status="loadStatus" @loadmore="onLoadMore" />
       </view>
     </view>
 

pages/picking-task/delivery.vue

@@ -321,7 +321,7 @@
 				uni.navigateBack()
 			},
 			// 扫码确认
-			scanConfirm() {
+			scanConfirm(val) {
 				this.goodsList[this.scanIndex].materialNumber += Number(val)
 				this.scanedShow = false
 			},

pages/purchase/detail.vue

@@ -106,13 +106,13 @@
 			<!-- 货物清单 -->
 			<view class="cargo-list">
 				<view class="cargo-list-title">
-					<view>出库货物清单</view>
+					<view>入库货物清单</view>
 					<view class="cargo-list-title-tips">（轻触货物查看详情）</view>
 				</view>
 				<block v-for="(item,i) in goodsList" :key="i">
 					<good-item :item="item" @toDetail="toDetail">
 						<view class="num-box">
-							<view class="num-box-text">已确认出库数量</view>
+							<view class="num-box-text">已确认入库数量</view>
 							<u-number-box v-model="item.actualQuantityInStorage" disabled>
 								<view slot="minus" class="minus">
 									<u-icon name="minus" color="#DADADA" size="12"></u-icon>