Commit add225d8 by LJM

bug

parent cec9f027
...@@ -270,9 +270,10 @@ ...@@ -270,9 +270,10 @@
.tt { .tt {
font-size: 16rpx; font-size: 16rpx;
color: #919399; color: #919399;
white-space: nowrap;
} }
.yy { .yy {
width: 95rpx; max-width: 55%;
font-size: 16rpx; font-size: 16rpx;
color: #484b59; color: #484b59;
white-space: nowrap; white-space: nowrap;
......
...@@ -57,9 +57,8 @@ ...@@ -57,9 +57,8 @@
flex-wrap: wrap; flex-wrap: wrap;
.box { .box {
position: relative; position: relative;
padding: 15rpx 17rpx 0 17rpx; padding: 15rpx 17rpx 17rpx 17rpx;
width: 345rpx; width: 345rpx;
height: 371rpx;
background: #ffffff; background: #ffffff;
box-shadow: 0px 3rpx 3rpx 0px rgba(198, 199, 204, 0.3); box-shadow: 0px 3rpx 3rpx 0px rgba(198, 199, 204, 0.3);
border-radius: 10rpx; border-radius: 10rpx;
......
{ {
"name" : "wmsApp", "name": "wmsApp",
"appid" : "__UNI__655E80D", "appid": "__UNI__655E80D",
"description" : "", "description": "",
"versionName" : "1.0.0", "versionName": "1.0.0",
"versionCode" : "100", "versionCode": "100",
"transformPx" : false, "transformPx": false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus": {
"usingComponents" : true, "usingComponents": true,
"nvueStyleCompiler" : "uni-app", "nvueStyleCompiler": "uni-app",
"compilerVersion" : 3, "compilerVersion": 3,
"splashscreen" : { "splashscreen": {
"alwaysShowBeforeRender" : true, "alwaysShowBeforeRender": true,
"waiting" : true, "waiting": true,
"autoclose" : true, "autoclose": true,
"delay" : 0 "delay": 0
}, },
/* 模块配置 */ /* 模块配置 */
"modules" : {}, "modules": {
"Camera": {},
"Barcode": {},
"Bluetooth": {}
},
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute": {
/* android打包配置 */ /* android打包配置 */
"android" : { "android": {
"permissions" : [ "permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
...@@ -41,79 +45,79 @@ ...@@ -41,79 +45,79 @@
] ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : { "ios": {
"dSYMs" : false "dSYMs": false
}, },
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : { "sdkConfigs": {
"ad" : {} "ad": {}
}, },
"icons" : { "icons": {
"android" : { "android": {
"hdpi" : "unpackage/res/icons/72x72.png", "hdpi": "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png", "xhdpi": "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png", "xxhdpi": "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png" "xxxhdpi": "unpackage/res/icons/192x192.png"
}, },
"ios" : { "ios": {
"appstore" : "unpackage/res/icons/1024x1024.png", "appstore": "unpackage/res/icons/1024x1024.png",
"ipad" : { "ipad": {
"app" : "unpackage/res/icons/76x76.png", "app": "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png", "app@2x": "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png", "notification": "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x": "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png", "proapp@2x": "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png", "settings": "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x": "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png", "spotlight": "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png" "spotlight@2x": "unpackage/res/icons/80x80.png"
}, },
"iphone" : { "iphone": {
"app@2x" : "unpackage/res/icons/120x120.png", "app@2x": "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png", "app@3x": "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x": "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png", "notification@3x": "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x": "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png", "settings@3x": "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png", "spotlight@2x": "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png" "spotlight@3x": "unpackage/res/icons/120x120.png"
} }
} }
} }
}, },
"nvueLaunchMode" : "" "nvueLaunchMode": ""
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp" : {}, "quickapp": {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin": {
"appid" : "wx060bcd34e30d0db2", "appid": "wx060bcd34e30d0db2",
"setting" : { "setting": {
"urlCheck" : false, "urlCheck": false,
"postcss" : true, "postcss": true,
"es6" : false, "es6": false,
"minified" : true "minified": true
}, },
"usingComponents" : true "usingComponents": true
}, },
"mp-alipay" : { "mp-alipay": {
"usingComponents" : true "usingComponents": true
}, },
"mp-baidu" : { "mp-baidu": {
"usingComponents" : true "usingComponents": true
}, },
"mp-toutiao" : { "mp-toutiao": {
"usingComponents" : true "usingComponents": true
}, },
"uniStatistics" : { "uniStatistics": {
"enable" : false "enable": false
}, },
"vueVersion" : "2", "vueVersion": "2",
"quickapp-webview" : { "quickapp-webview": {
"icon" : "wms", "icon": "wms",
"package" : "com.liexin.wms", "package": "com.liexin.wms",
"versionName" : "1.0", "versionName": "1.0",
"minPlatformVersion" : "1.0" "minPlatformVersion": "1.0"
}, },
"fallbackLocale" : "zh-Hans" "fallbackLocale": "zh-Hans"
} }
\ No newline at end of file
...@@ -29,7 +29,19 @@ ...@@ -29,7 +29,19 @@
}, { }, {
"path": "pages/arrivalRegister/registered", "path": "pages/arrivalRegister/registered",
"style": { "style": {
"navigationBarTitleText": "已登记" "navigationBarTitleText": "已登记",
"app-plus": {
"titleNView": {
"buttons": [{
"index": "0",
"text": "首页",
"fontSize": "15px",
"color": "#1969F9",
"float": "right",
"width": "100px"
}]
}
}
} }
}, { }, {
"path": "pages/tallyReceive/index", "path": "pages/tallyReceive/index",
...@@ -51,7 +63,19 @@ ...@@ -51,7 +63,19 @@
}, { }, {
"path": "pages/tallyReceive/record", "path": "pages/tallyReceive/record",
"style": { "style": {
"navigationBarTitleText": "理货记录" "navigationBarTitleText": "理货记录",
"app-plus": {
"titleNView": {
"buttons": [{
"index": "0",
"text": "首页",
"fontSize": "15px",
"color": "#1969F9",
"float": "right",
"width": "100px"
}]
}
}
} }
}, { }, {
"path": "pages/tallyReceive/operate", "path": "pages/tallyReceive/operate",
...@@ -112,7 +136,19 @@ ...@@ -112,7 +136,19 @@
}, { }, {
"path": "pages/putaway/record", "path": "pages/putaway/record",
"style": { "style": {
"navigationBarTitleText": "上架记录" "navigationBarTitleText": "上架记录",
"app-plus": {
"titleNView": {
"buttons": [{
"index": "0",
"text": "首页",
"fontSize": "15px",
"color": "#1969F9",
"float": "right",
"width": "100px"
}]
}
}
} }
}, { }, {
"path": "pages/putaway/single", "path": "pages/putaway/single",
...@@ -139,7 +175,19 @@ ...@@ -139,7 +175,19 @@
}, { }, {
"path": "pages/picking/me", "path": "pages/picking/me",
"style": { "style": {
"navigationBarTitleText": "我的拣货" "navigationBarTitleText": "我的拣货",
"app-plus": {
"titleNView": {
"buttons": [{
"index": "0",
"text": "首页",
"fontSize": "15px",
"color": "#1969F9",
"float": "right",
"width": "100px"
}]
}
}
} }
}, { }, {
"path": "pages/picking/sort", "path": "pages/picking/sort",
...@@ -205,7 +253,19 @@ ...@@ -205,7 +253,19 @@
}, { }, {
"path": "pages/stockRecheck/print", "path": "pages/stockRecheck/print",
"style": { "style": {
"navigationBarTitleText": "打快递单" "navigationBarTitleText": "打快递单",
"app-plus": {
"titleNView": {
"buttons": [{
"index": "0",
"text": "首页",
"fontSize": "15px",
"color": "#1969F9",
"float": "right",
"width": "100px"
}]
}
}
} }
}, { }, {
"path": "pages/transfer/index", "path": "pages/transfer/index",
...@@ -225,7 +285,19 @@ ...@@ -225,7 +285,19 @@
}, { }, {
"path": "pages/immediatelyStockIn/list", "path": "pages/immediatelyStockIn/list",
"style": { "style": {
"navigationBarTitleText": "库存列表" "navigationBarTitleText": "库存列表",
"app-plus": {
"titleNView": {
"buttons": [{
"index": "0",
"text": "首页",
"fontSize": "15px",
"color": "#1969F9",
"float": "right",
"width": "100px"
}]
}
}
} }
}, { }, {
"path": "pages/repairPrint/index", "path": "pages/repairPrint/index",
......
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<view class="row verCenter"> <view class="row verCenter">
<view class="bar row verCenter" style="flex: 0 0 40%;"> <view class="bar row verCenter" style="flex: 0 0 40%;">
<text class="tt">标准品牌:</text> <text class="tt">标准品牌:</text>
<text class="yy">{{ item.cccc }}</text> <text class="yy">{{ item.brand_name }}</text>
</view> </view>
<view class="bar row verCenter" style="flex: 0 0 30%;"> <view class="bar row verCenter" style="flex: 0 0 30%;">
<text class="tt">数量:</text> <text class="tt">数量:</text>
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
</view> </view>
<view class="pp">货品详情</view> <view class="pp">货品详情</view>
<view class="drawer-list"> <view class="drawer-list">
<scroll-view style="max-height: 755rpx" scroll-y="true"> <scroll-view style="max-height: 60vh" scroll-y="true">
<view class="box" v-for="(item, index) in detail.stock_in_items" :key="index"> <view class="box" v-for="(item, index) in detail.stock_in_items" :key="index">
<view class="row verCenter top"> <view class="row verCenter top">
<text class="t1">{{ index + 1 }}.</text> <text class="t1">{{ index + 1 }}.</text>
...@@ -164,8 +164,8 @@ export default { ...@@ -164,8 +164,8 @@ export default {
}, },
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index == 0) { if (e.index == 0) {
uni.navigateTo({ uni.reLaunch({
url: '/pages/arrivalRegister/registered' url: '/pages/index/index'
}); });
} }
}, },
......
...@@ -101,6 +101,13 @@ export default { ...@@ -101,6 +101,13 @@ export default {
} }
}; };
}, },
onNavigationBarButtonTap(e) {
if (e.index == 0) {
uni.reLaunch({
url: '/pages/index/index'
});
}
},
onLoad(options) { onLoad(options) {
this.formParams.goods_sn = options.goods_sn || ''; this.formParams.goods_sn = options.goods_sn || '';
this.formParams.goods_name = options.goods_name || ''; this.formParams.goods_name = options.goods_name || '';
......
...@@ -90,6 +90,13 @@ export default { ...@@ -90,6 +90,13 @@ export default {
} }
}; };
}, },
onNavigationBarButtonTap(e) {
if (e.index == 0) {
uni.reLaunch({
url: '/pages/index/index'
});
}
},
onShow() { onShow() {
this.getData(); this.getData();
}, },
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<view class="search-bar row bothSide verCenter"> <view class="search-bar row bothSide verCenter">
<view class="row verCenter"> <view class="row verCenter">
<text class="iconfont icon-juxing1"></text> <text class="iconfont icon-juxing1"></text>
<input class="uni-input" placeholder="请扫描或输入入库批次号" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_batch_sn" @input="handleInput" maxlength="15" /> <input class="uni-input" placeholder="请扫描入库标签" placeholder-style="color:#919399" focus v-model="searchParams.stock_in_batch_sn" @input="handleInput" maxlength="15" />
</view> </view>
<text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text> <text class="iconfont icon-a-juxing11" @click="clearInput()" v-if="input_flag"></text>
</view> </view>
......
...@@ -32,27 +32,23 @@ ...@@ -32,27 +32,23 @@
</view> </view>
</view> </view>
<view class="radio-wrap row verCenter" style="padding-bottom: 0;"> <view class="radio-wrap row verCenter" style="padding-bottom: 0;">
<radio-group name="radio1"> <radio-group name="radio1" @change="radioChange($event, 1)">
<label> <label>
<radio value="1" style="transform:scale(0.7)" :checked="filter_checkbox[0]" color="#1969f9" @click="toggle(0)" /> <radio value="1" style="transform:scale(0.7)" color="#1969f9" />
<text>采购入库</text> <text>采购入库</text>
</label> </label>
</radio-group>
<radio-group name="radio2">
<label> <label>
<radio value="4" style="transform:scale(0.7)" :checked="filter_checkbox[1]" color="#1969f9" @click="toggle(1)" /> <radio value="4" style="transform:scale(0.7)" color="#1969f9" />
<text>委托入库</text> <text>委托入库</text>
</label> </label>
</radio-group>
<radio-group name="radio3">
<label> <label>
<radio value="2" style="transform:scale(0.7)" :checked="filter_checkbox[2]" color="#1969f9" @click="toggle(2)" /> <radio value="2" style="transform:scale(0.7)" color="#1969f9" />
<text>退货入库</text> <text>退货入库</text>
</label> </label>
</radio-group> </radio-group>
</view> </view>
<view class="radio-wrap row verCenter"> <view class="radio-wrap row verCenter">
<radio-group name="radio" @change="radioChange"> <radio-group name="radio" @change="radioChange($event, 2)">
<label> <label>
<radio value="0" style="transform:scale(0.7)" checked="true" color="#1969f9" /> <radio value="0" style="transform:scale(0.7)" checked="true" color="#1969f9" />
<text>全部</text> <text>全部</text>
...@@ -89,7 +85,7 @@ ...@@ -89,7 +85,7 @@
</view> </view>
<view class="text-item row verCenter"> <view class="text-item row verCenter">
<text class="label">标准品牌:</text> <text class="label">标准品牌:</text>
<text class="tt">{{ item.goods_sn }}</text> <text class="tt">{{ item.brand_name }}</text>
</view> </view>
<view class="text-item row verCenter"> <view class="text-item row verCenter">
<text class="label">上架数量:</text> <text class="label">上架数量:</text>
...@@ -267,21 +263,31 @@ export default { ...@@ -267,21 +263,31 @@ export default {
filter_list: [], //筛选已选中的列表 filter_list: [], //筛选已选中的列表
filter_id: [], //过滤处理的id filter_id: [], //过滤处理的id
detail: {}, detail: {},
filter_checkbox: [true, true, true],
searchParams: { searchParams: {
stock_in_type: '1,4,2', stock_in_type: '',
search_type: 1, search_type: 1,
search_keyword: '', search_keyword: '',
shelf_status: 0 shelf_status: 0
} }
}; };
}, },
onNavigationBarButtonTap(e) {
if (e.index == 0) {
uni.reLaunch({
url: '/pages/index/index'
});
}
},
onShow() { onShow() {
this.getData(); this.getData();
}, },
methods: { methods: {
radioChange(e) { radioChange(e, type) {
this.searchParams.shelf_status = e.detail.value; if (type == 1) {
this.searchParams.stock_in_type = e.detail.value;
} else if (type == 2) {
this.searchParams.shelf_status = e.detail.value;
}
this.getData(); this.getData();
}, },
bindPickerChange: function(e) { bindPickerChange: function(e) {
...@@ -331,19 +337,6 @@ export default { ...@@ -331,19 +337,6 @@ export default {
this.filter_id = []; this.filter_id = [];
} }
}, },
toggle(index) {
var ids = [1, 4, 2];
this.$set(this.filter_checkbox, index, (this.filter_checkbox[index] = !this.filter_checkbox[index]));
let filter_arr = this.findIndex(this.filter_checkbox, true);
var filteredIds = filter_arr.map(function(i) {
return ids[i];
});
this.searchParams.stock_in_type = filteredIds.join(',');
this.getData();
},
/** /**
* 清空数据 * 清空数据
*/ */
......
...@@ -223,7 +223,9 @@ export default { ...@@ -223,7 +223,9 @@ export default {
this.detail = res.data; this.detail = res.data;
this.formParams.qty_on_shelf = res.data.pending_shelf_qty; this.formParams.qty_on_shelf = res.data.pending_shelf_qty;
this.formParams.tally_id = res.data.tally_id; this.formParams.tally_id = res.data.tally_id;
this.getWorkingRuleList(); if (res.data.stock_in_type != 2) {
this.getWorkingRuleList();
}
} }
}); });
}, },
......
...@@ -271,6 +271,13 @@ export default { ...@@ -271,6 +271,13 @@ export default {
} }
}; };
}, },
onNavigationBarButtonTap(e) {
if (e.index == 0) {
uni.reLaunch({
url: '/pages/index/index'
});
}
},
onShow() { onShow() {
this.getData(); this.getData();
}, },
......
...@@ -26,27 +26,23 @@ ...@@ -26,27 +26,23 @@
</view> </view>
</view> </view>
<view class="radio-wrap row verCenter" style="padding-bottom: 0;"> <view class="radio-wrap row verCenter" style="padding-bottom: 0;">
<radio-group name="radio1"> <radio-group name="radio1" @change="radioChange($event, 1)">
<label> <label>
<radio value="1" style="transform:scale(0.7)" :checked="filter_checkbox[0]" color="#1969f9" @click="toggle(0)" /> <radio value="1" style="transform:scale(0.7)" color="#1969f9" />
<text>采购入库</text> <text>采购入库</text>
</label> </label>
</radio-group>
<radio-group name="radio2">
<label> <label>
<radio value="4" style="transform:scale(0.7)" :checked="filter_checkbox[1]" color="#1969f9" @click="toggle(1)" /> <radio value="4" style="transform:scale(0.7)" color="#1969f9" />
<text>委托入库</text> <text>委托入库</text>
</label> </label>
</radio-group>
<radio-group name="radio3">
<label> <label>
<radio value="2" style="transform:scale(0.7)" :checked="filter_checkbox[2]" color="#1969f9" @click="toggle(2)" /> <radio value="2" style="transform:scale(0.7)" color="#1969f9" />
<text>退货入库</text> <text>退货入库</text>
</label> </label>
</radio-group> </radio-group>
</view> </view>
<view class="radio-wrap row verCenter"> <view class="radio-wrap row verCenter">
<radio-group name="radio" @change="radioChange"> <radio-group name="radio" @change="radioChange($event, 2)">
<label> <label>
<radio value="" style="transform:scale(0.7)" checked="true" color="#1969f9" /> <radio value="" style="transform:scale(0.7)" checked="true" color="#1969f9" />
<text>全部</text> <text>全部</text>
...@@ -137,7 +133,7 @@ ...@@ -137,7 +133,7 @@
</view> </view>
<view class="item row verCenter"> <view class="item row verCenter">
<text class="label">容 器:</text> <text class="label">容 器:</text>
<text class="tt">{{ detail.container_name }}</text> <text class="tt">{{ detail.container_sn }}</text>
</view> </view>
</view> </view>
<view class="bor"></view> <view class="bor"></view>
...@@ -239,7 +235,6 @@ export default { ...@@ -239,7 +235,6 @@ export default {
filter_id: [], //入库单列表的入库登记 filter_id: [], //入库单列表的入库登记
detail: {}, //详情的数据 detail: {}, //详情的数据
image_list: [], //图片列表 image_list: [], //图片列表
filter_checkbox: [true, true, true],
searchParams: { searchParams: {
stock_in_sn: '', //入库单号 stock_in_sn: '', //入库单号
tracking_no: '', //物流单号 tracking_no: '', //物流单号
...@@ -250,12 +245,23 @@ export default { ...@@ -250,12 +245,23 @@ export default {
} }
}; };
}, },
onNavigationBarButtonTap(e) {
if (e.index == 0) {
uni.reLaunch({
url: '/pages/index/index'
});
}
},
onShow() { onShow() {
this.getData(); this.getData();
}, },
methods: { methods: {
radioChange(e) { radioChange(e, type) {
this.searchParams.tally_status = e.detail.value; if (type == 1) {
this.searchParams.stock_tally_with_stock_in_stock_in_type_in = e.detail.value;
} else if (type == 2) {
this.searchParams.tally_status = e.detail.value;
}
this.getData(); this.getData();
}, },
bindPickerChange: function(e) { bindPickerChange: function(e) {
...@@ -312,19 +318,6 @@ export default { ...@@ -312,19 +318,6 @@ export default {
} }
this.getData(); this.getData();
}, },
toggle(index) {
var ids = [1, 4, 2];
this.$set(this.filter_checkbox, index, (this.filter_checkbox[index] = !this.filter_checkbox[index]));
let filter_arr = this.findIndex(this.filter_checkbox, true);
var filteredIds = filter_arr.map(function(i) {
return ids[i];
});
this.searchParams.stock_tally_with_stock_in_stock_in_type_in = filteredIds.join(',');
this.getData();
},
/** /**
* 单号搜索 * 单号搜索
* @param {Object} event * @param {Object} event
...@@ -397,7 +390,7 @@ export default { ...@@ -397,7 +390,7 @@ export default {
return false; return false;
} }
this.request(API.cancelTallyReceive, 'POST', { tally_id: this.filter_id.join(','), stock_in_id: stock_in_id.join(','), stock_in_item_id: stock_in_item_id.join(',') }, true).then(res => { this.request(API.submitTallyReceive, 'POST', { tally_id: this.filter_id.join(','), stock_in_id: stock_in_id.join(','), stock_in_item_id: stock_in_item_id.join(',') }, true).then(res => {
if (res.code === 0) { if (res.code === 0) {
uni.showToast({ uni.showToast({
title: '提交成功', title: '提交成功',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment