Skip to content

GitLab

Commit 7c929836 authored by 李辉煌's avatar 李辉煌
Browse files

提交

parent 539b4989
Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 77 deletions
pages.json
View file @ 7c929836
......@@ -128,7 +128,7 @@
"path" : "pages/WarehousingNotice/WarehousingCheckList",
"style" :
{
"navigationBarTitleText": "入库通知提报",
"navigationBarTitleText": "入库通知审批",
"enablePullDownRefresh": true
}
......@@ -136,7 +136,7 @@
"path" : "pages/WarehousingNotice/WarehousingDetails",
"style" :
{
"navigationBarTitleText": "入库通知提报",
"navigationBarTitleText": "入库通知审批",
"enablePullDownRefresh": false
}
},
......@@ -429,6 +429,15 @@
}
}
,{
"path" : "pages/Utils/changePath",
"style" :
{
"navigationBarTitleText": "地址修改",
"enablePullDownRefresh": false
}
}
],
// "condition": { //模式配置，仅开发期间生效
......
pages/GoodsPage/PickGoodsPage.vue
View file @ 7c929836
......@@ -134,7 +134,7 @@
let value = this;
res.data.map(item => {
value.selectGoods.map(items => {
if (item.id == items.id) {
if (item.reserveNo == items.reserveNo) {
item.thisQty = items.thisQty;
}
})
......
pages/PickingCreatePage/PickingCheckListPage.vue
View file @ 7c929836
......@@ -2,9 +2,10 @@
<view class="container_goods">
<uni-search-bar @confirm="search" :focus="false" v-model="searchValue"></uni-search-bar>
<!-- 列表 -->
<view class="content subtitle_text_black">
<view class="content title_text_black">
<view v-for="(item,index) of data" :key="item.id" @click="list_click(item)">
<view class="line_date" v-if="index==0 || item.createTime != data[index-1].createTime">{{item.createTime}}</view>
<view style="width: 100%; height: 16rpx;background-color: #ececec;" v-if="index > 0 && item.createTime == data[index-1].createTime"></view>
<view class="line_date" style="font-size: 35rpx;padding: 10rpx;" v-if="index==0 || item.createTime != data[index-1].createTime">{{item.createTime}}</view>
<uni-row class="demo-uni-row">
<uni-col :span="8" class="good_item_show">
......@@ -20,7 +21,7 @@
<uni-row class="demo-uni-row">
<uni-col :span="16" class="good_item_show">
<view>{{item.inWarehouseName}}</view>
<view>{{item.outWarehouseName}}</view>
</uni-col>
<uni-col :span="8" class="good_item_show">
<view>{{item.orderTypeName}}</view>
......@@ -32,16 +33,16 @@
<view>{{item.fromOrderNo}}</view>
</uni-col>
<uni-col :span="16" class="good_item_show">
<view>{{item.vendorName}}</view>
<view>{{item.customerName}}</view>
</uni-col>
</uni-row>
<uni-row class="demo-uni-row-button">
<!-- 只有当状态为10的时候才可以点击 -->
<uni-col :span="5" :push="11" v-if="item.statusId == 10 || item.statusId == 15">
<uni-col :span="5" :push="11" v-if="item.statusId == 18 ">
<button type="primary" v-on:click.stop="audit(item,index)">审核</button>
</uni-col>
<uni-col :span="6" :push="(item.statusId == 10 || item.statusId == 15) ? 12: 17">
<uni-col :span="6" :push="(item.statusId == 18 ) ? 12: 17">
<button type="primary" @click="info(item)">订单跟踪</button>
</uni-col>
</uni-row>
......@@ -105,7 +106,13 @@
list_click(e){
console.log(e.id)
uni.navigateTo({
url: 'PickingDetailsPage?value='+e.id
url: 'PickingDetailsPage?value='+e.id,
events:{
refresh:()=>{
this.page =1;
this.getGoodsList();
}
}
})
},
//订单提报
......@@ -245,8 +252,8 @@
bottom: 0;
}
.good_item_show{
display: flex;
justify-content: center;
// display: flex;
// justify-content: center;
}
button{
font-size: 12px;
......
pages/PickingCreatePage/PickingDetailsPage.vue
View file @ 7c929836
......@@ -73,7 +73,7 @@
<view>{{item.unitName}}</view>
</uni-col>
<uni-col :span="8" class="good_item_show">
<text>{{thisQty}}</text>
<text>{{item.thisQty}}</text>
<!-- <uni-number-box v-model="item.thisQty" :min="0" :max="parseInt(item.qtyStock)">
</uni-number-box> -->
</uni-col>
......@@ -126,10 +126,10 @@
</view>
</uni-card>
<uni-row>
<uni-col :span="11" v-if="statusId == 10 || statusId == 15">
<uni-col :span="11" >
<button type="primary" @click="submit">审批</button>
</uni-col>
<uni-col :span="11" :offset="2" v-if="statusId == 18">
<uni-col :span="11" :offset="2" >
<button type="primary" @click="reBack">退回</button>
</uni-col>
</uni-row>
......@@ -186,8 +186,10 @@
reBack() {
// console.log(e.id)
this.$minApi.uniapp("/eidpws/wmsApp/appApi/out/rollBack", {
"id": e.id,
"id": this.id,
}).then(res => {
const eventChannel = this.getOpenerEventChannel()
eventChannel.emit('refresh');
uni.navigateBack({
})
......@@ -198,13 +200,15 @@
// 审核
submit() {
this.$minApi.uniappPost("/eidpws/wmsApp/appApi/out/audit", {
"id": e.id,
this.$minApi.uniapp("/eidpws/wmsApp/appApi/out/audit", {
"id": this.id,
}).then(res => {
// uni.showToast({
// title: res.data,
// icon: 'none'
// })
const eventChannel = this.getOpenerEventChannel()
eventChannel.emit('refresh');
uni.navigateBack()
}).catch(err => {
......@@ -385,7 +389,9 @@
display: flex;
}
.good_item_show {}
.good_item_show {
text-align: center;
}
.line {
width: 100%;
......
pages/PickingCreatePage/PickingListPage.vue
View file @ 7c929836
......@@ -2,9 +2,10 @@
<view class="container_goods">
<uni-search-bar @confirm="search" :focus="false" v-model="searchValue"></uni-search-bar>
<!-- 列表 -->
<view class="content subtitle_text_black" >
<view v-for="(item,index) of data" :key="item.id" @click="list_click(item)">
<view class="line_date" v-if="index==0 || item.createTime != data[index-1].createTime">{{item.createTime}}</view>
<view class="content title_text_black" >
<view v-for="(item,index) of data" :key="item.id" @click="list_click(item)" class="item_view_style">
<view style="width: 100%; height: 16rpx;background-color: #ececec;" v-if="index > 0 && item.createTime == data[index-1].createTime"></view>
<view class="line_date" style="font-size: 35rpx;padding: 10rpx;" v-if="index==0 || item.createTime != data[index-1].createTime">{{item.createTime}}</view>
<uni-row class="demo-uni-row">
<uni-col :span="8" class="good_item_show">
......@@ -13,7 +14,7 @@
<uni-col :span="8" class="good_item_show">
<view>{{item.statusName}}</view>
</uni-col>
<uni-col :span="8" class="good_item_show">
<uni-col :span="8" class="good_item_show good_item_time">
<view>{{item.expectDate}}</view>
</uni-col>
</uni-row>
......@@ -37,10 +38,6 @@
</uni-row>
<uni-row class="demo-uni-row-button">
</uni-row>
<uni-row class="demo-uni-row-button">
<!-- 只有当状态为10的时候才可以点击 -->
<!-- <uni-col :span="5" :push="11" v-if="item.statusId == 10 || item.statusId == 15"> -->
......@@ -52,7 +49,9 @@
</uni-col>
</uni-row>
<!-- <view class="line"></view> -->
</view>
<view v-show="isLoadMore">
<uni-load-more :status="loadStatus" v-show="isLoadMore"></uni-load-more>
</view>
......@@ -111,7 +110,13 @@
list_click(e){
console.log(e.id)
uni.navigateTo({
url:'PickingUpdatePage?value='+e.id
url:'PickingUpdatePage?value='+e.id,
events:{
refresh:()=>{
this.page = 1;
this.getGoodsList()
}
}
})
},
//订单提报
......@@ -212,6 +217,7 @@
<style scoped lang="scss">
@import '../../style_public/common.scss';
.container_goods {
width: 100%;
height: 100%;
......@@ -220,6 +226,8 @@
height: 100%;
}
.demo-uni-row-button{
margin-top: 10rpx;
margin-bottom: 10rpx;
}
.line_date {
......@@ -235,6 +243,10 @@
bottom: 0;
}
.good_item_show{
// display: flex;
// justify-content: center;
}
.good_item_time{
display: flex;
justify-content: center;
}
......
pages/PickingCreatePage/PickingUpdatePage.vue
View file @ 7c929836
......@@ -217,6 +217,8 @@
this.$minApi.uniapp("/eidpws/wmsApp/appApi/out/report", {
"id": this.id,
}).then(res => {
const eventChannel = this.getOpenerEventChannel()
eventChannel.emit('refresh');
uni.navigateBack({
})
......
pages/Utils/changePath.vue 0 → 100644
View file @ 7c929836
<template>
<view>
<view>
地址设置
<input v-model="data" style="border: #555555;padding: 20rpx;"/>
<button type="primary" @click="changlePath" style="margin-top: 100rpx;">确定修改</button>
</view>
</view>
</template>
<script>
import api from '../../utils/api.js'
export default {
data() {
return {
data:""
}
},
methods: {
changlePath(){
uni.setStorageSync("pathLoacal",this.data)
uni.navigateBack()
}
},
onLoad() {
let value = uni.getStorageSync("pathLoacal")
if(value!=''){
this.data = value
}else{
this.data = api.basePath
}
}
}
</script>
<style>
</style>
pages/WarehousingNotice/WarehouseingUpdatePage.vue
View file @ 7c929836
......@@ -135,7 +135,7 @@
<button class="button_click_class" type="primary" @click="submitVendor">保存物流信息</button>
</uni-col>
<uni-col :span="7" v-if="">
<uni-col :span="7" v-if="">
<button class="button_click_class" type="primary" @click="submit">保存订单</button>
</uni-col>
<uni-col :span="7">
......@@ -156,9 +156,9 @@
return {
//界面中的订单提报是在状态10 15 的时候显示
//界面中的保存订单是在状态小于等于18 的时候显示
// id 否 string 入库单号，如为空则为创建，不为空则修改
// arrivalTime 是 string 预计到货日期
// vendorId 是 string 供应商编码
......@@ -225,7 +225,8 @@
bindClick() {
let value = JSON.stringify(this.goodlist);
uni.navigateTo({
url: '../GoodsPage/GoodsPage??value=' + value +'&warehouseId='+this.inWarehouseId+'&vendorId='+this.vendorId+'&poNo='+this.fromOrderNo,
url: '../GoodsPage/GoodsPage??value=' + value + '&warehouseId=' + this.inWarehouseId +
'&vendorId=' + this.vendorId + '&poNo=' + this.fromOrderNo,
events: {
refreshGoods: (item) => {
this.goodlist = item;
......@@ -235,7 +236,6 @@
},
// 提交
submit() {
if (this.vendorId == '') {
uni.showToast({
title: '请选择供应商',
......@@ -381,11 +381,13 @@
},
//订单提报
orderReport() {
this.$minApi.uniapp("/eidpws/wmsApp/appApi/in/findInInform", {
"informNo": this.id,
this.$minApi.uniapp("/eidpws/wmsApp/appApi/in/report", {
"id": this.id,
}).then(res => {
const eventChannel = this.getOpenerEventChannel()
eventChannel.emit('refresh');
uni.navigateBack({
})
}).catch(err => {
......@@ -400,6 +402,11 @@
}).then(res => {
let data = res.data;
this.arrivalTime = data.arrivalTime;
// 这里面的id对于前端是没有用的 方便后台理解
for (var i = 0; i < data.asnPartSaveDtos.length; i++) {
data.asnPartSaveDtos[i].id=data.asnPartSaveDtos[i].fromDetailId
}
this.goodlist = data.asnPartSaveDtos;
this.netGoods = data.asnPartSaveDtos;
this.desc = data.desc;
......@@ -428,6 +435,7 @@
<style scoped lang="scss">
@import '../../style_public/common.scss';
.add_good_item {
display: flex;
width: 100px;
......@@ -463,8 +471,8 @@
.deletebutton {
font-size: 24rpx;
}
.button_click_class{
.button_click_class {
display: flex;
width: 100px;
height: 30px;
......@@ -475,7 +483,8 @@
font-size: 12px;
font-weight: bold;
}
.uni-row-button{
.uni-row-button {
display: flex;
justify-content: center;
}
......
pages/WarehousingNotice/WarehousingCheckList.vue
View file @ 7c929836
......@@ -2,9 +2,10 @@
<view class="container_goods">
<uni-search-bar @confirm="search" :focus="false" v-model="searchValue"></uni-search-bar>
<!-- 列表 -->
<view class="content subtitle_text_black">
<view class="content title_text_black">
<view v-for="(item,index) of data" :key="item.id" @click="list_click(item)">
<view class="line_date" v-if="index==0 || item.createTime != data[index-1].createTime">{{item.createTime}}</view>
<view style="width: 100%; height: 16rpx;background-color: #ececec;" v-if="index > 0 && item.createTime == data[index-1].createTime"></view>
<view class="line_date" style="font-size: 35rpx;padding: 10rpx;" v-if="index==0 || item.createTime != data[index-1].createTime">{{item.createTime}}</view>
<uni-row class="demo-uni-row">
<uni-col :span="8" class="good_item_show">
......@@ -38,10 +39,10 @@
<uni-row class="demo-uni-row-button">
<!-- 只有当状态为10的时候才可以点击 -->
<uni-col :span="5" :push="11" v-if="item.statusId == 10 || item.statusId == 15">
<button type="primary" v-on:click.stop="audit(item,index)">提报</button>
<uni-col :span="5" :push="11" v-if="item.statusId == 18 ">
<button type="primary" v-on:click.stop="audit(item,index)">审核</button>
</uni-col>
<uni-col :span="6" :push="(item.statusId == 10 || item.statusId == 15) ? 12: 17">
<uni-col :span="6" :push="(item.statusId == 18 ) ? 12: 17">
<button type="primary" @click="info(item)">订单跟踪</button>
</uni-col>
</uni-row>
......@@ -105,19 +106,24 @@
list_click(e){
console.log(e.id)
uni.navigateTo({
url: 'WarehousingDetails?value='+e.id
url: 'WarehousingDetails?value='+e.id,
events:{
refresh:()=>{
this.page =1;
this.getGoodsList();
}
}
})
},
//订单提报
audit(e,index) {
// console.log(e.id)
this.$minApi.uniapp("/eidpws/wmsApp/appApi/in/audit", {
"id": e.id,
}).then(res => {
//成功之后才可以修改界面的样式
// 修改之后需要刷新界面的显示
// 暂时还不确定会成为15
// this.data[index] = 15;
// 修改之后 刷新界面 其实应该成功更新状态就行了
this.page = 1;
this.getGoodsList()
}).catch(err => {
......@@ -151,7 +157,7 @@
// 否 integer 页数，未传入默认为10
this.$minApi.uniapp("/eidpws/wmsApp/appApi/out/findTemporarys", {
this.$minApi.uniapp("/eidpws/wmsApp/appApi/in/findInInformList", {
"query": this.searchValue,
"page": this.page,
"row": this.rows,
......@@ -184,6 +190,7 @@
})
}
},
created: function() {
this.getGoodsList();
},
......
pages/WarehousingNotice/WarehousingDetails.vue
View file @ 7c929836
......@@ -64,7 +64,7 @@
<uni-col :span="4" class="good_item_show">
<view>{{item.unitName}}</view>
</uni-col>
<uni-col :span="8" class="good_item_show">
<uni-col :span="8" class="good_item_show" style="text-align: center;color: red;">
<text>{{item.thisQty}}</text>
<!-- <uni-number-box v-model="item.thisQty" :min="0" :max="parseInt(item.qtyStock)">
</uni-number-box> -->
......@@ -130,10 +130,10 @@
</view>
</uni-card>
<uni-row>
<uni-col :span="11" v-if="statusId == 10 || statusId == 15">
<uni-col :span="11" >
<button type="primary" @click="submit">审批</button>
</uni-col>
<uni-col :span="11" :offset="2" v-if="statusId == 18">
<uni-col :span="11" :offset="2" >
<button type="primary" @click="reBack">退回</button>
</uni-col>
</uni-row>
......@@ -181,16 +181,15 @@
}
},
methods: {
//驳回
reBack() {
// console.log(e.id)
this.$minApi.uniapp("/eidpws/wmsApp/appApi/in/rollBack", {
"id": e.id,
"id": this.id,
}).then(res => {
uni.navigateBack({
})
const eventChannel = this.getOpenerEventChannel()
eventChannel.emit('refresh');
uni.navigateBack()
}).catch(err => {
})
......@@ -198,16 +197,18 @@
// 审核
submit() {
this.$minApi.uniappPost("/eidpws/wmsApp/appApi/in/audit", {
"id": e.id,
this.$minApi.uniapp("/eidpws/wmsApp/appApi/in/audit", {
"id": this.id,
}).then(res => {
// uni.showToast({
// title: res.data,
// icon: 'none'
// })
const eventChannel = this.getOpenerEventChannel()
eventChannel.emit('refresh');
uni.navigateBack()
}).catch(err => {
})
},
// 日期
......
pages/WarehousingNotice/WarehousingFilterPage.vue
View file @ 7c929836
......@@ -128,6 +128,7 @@
this.data.vendorName=option.vendorName;
this.data.inWarehouseId=option.inWarehouseId;
this.data.inWarehouseName=option.inWarehouseName;
this.data.createEmp=option.createEmp;
}
}
......
pages/WarehousingNotice/WarehousingLIst.vue
View file @ 7c929836
......@@ -2,10 +2,11 @@
<view class="container_goods">
<uni-search-bar @confirm="search" :focus="false" v-model="searchValue"></uni-search-bar>
<!-- 列表 -->
<view class="content subtitle_text_black">
<view class="content title_text_black">
<view v-for="(item,index) of data" :key="item.id" @click="list_click(item)">
<view class="line_date" v-if="index==0 || item.createTime != data[index-1].createTime">{{item.createTime}}</view>
<view style="width: 100%; height: 16rpx;background-color: #ececec;" v-if="index > 0 && item.createTime == data[index-1].createTime"></view>
<view class="line_date" style="font-size: 35rpx;padding: 10rpx;" v-if="index==0 || item.createTime != data[index-1].createTime">{{item.createTime}}</view>
<uni-row class="demo-uni-row">
<uni-col :span="8" class="good_item_show">
......@@ -108,21 +109,27 @@
list_click(e){
console.log(e.id)
uni.navigateTo({
url:'WarehouseingUpdatePage?value='+e.id
url:'WarehouseingUpdatePage?value='+e.id,
events:{
refresh:()=>{
this.page = 1;
this.getGoodsList()
}
}
})
},
//订单提报
orderReport(e,index) {
// console.log(e.id)
this.$minApi.uniapp("/eidpws/wmsApp/appApi/in/findInInform", {
"informNo": e.id,
this.$minApi.uniapp("/eidpws/wmsApp/appApi/in/report", {
"id": e.id,
}).then(res => {
//成功之后才可以修改界面的样式
// 修改之后需要刷新界面的显示
// 暂时还不确定会成为15
this.data[index] = 15;
// this.page = 1;
// this.getGoodsList()
// this.data[index] = 15;
this.page = 1;
this.getGoodsList()
}).catch(err => {
})
......
pages/index/login.vue
View file @ 7c929836
<template>
<view class="content">
<view class="title_class">欢迎来到泉化</view>
<view class="title_class" @longpress="changePath">欢迎来到泉化</view>
<view class="vertical_class">
<text>用户名</text>
<input placeholder="请输入用户名" v-model="username" class="input_user" />
......@@ -43,6 +43,12 @@
methods: {
changePath(){
uni.navigateTo({
url:'../Utils/changePath'
})
},
//获取加密盐
salt() {
// this.$minApi.uniapp({wd:'uni-app'}).then(res=>{
......
pages/poSearch/index.vue
View file @ 7c929836
......@@ -25,6 +25,7 @@
</view>
</template>
<script>
import _ from 'lodash'
export default {
data(){
return {
......
pages/repertorySearch/index.vue
View file @ 7c929836
......@@ -11,7 +11,7 @@
<view class="right_top">
<view>
<view>{{item.partName}}({{item.unitName}})</view>
<view>{{item.partNo}}</view>
<view style="margin-top: 16rpx;">{{item.partNo}}</view>
</view>
<!-- <view>套</view> -->
<view class="subtitle_text_red">{{item.qtySum}}</view>
......
pages/sign/signInfo.vue
View file @ 7c929836
......@@ -31,7 +31,7 @@
<view class="content_col_right">{{item.vendorId}}</view>
</view>
<view style="display: flex;flex-direction: row-reverse;margin: 10rpx 0;">
<uni-number-box v-model="item.qtySign" min="0" :max="item.qtyPlan"></uni-number-box>
<uni-number-box v-model="item.qtySign" :min=0 :max="item.qtyPlan"></uni-number-box>
</view>
</view>
<view class="line_grey" style="margin: 20rpx 0;"></view>
......
utils/MinRequest.js
View file @ 7c929836
......@@ -93,6 +93,12 @@ class MinRequest {
'sign': sign.toUpperCase()
};
// console.log(otherHeader);
let value = uni.getStorageSync("pathLoacal")
if(value!=''){
options.baseURL = value
}else{
options.baseURL = options.baseURL || this[config].baseURL
}
options.baseURL = options.baseURL || this[config].baseURL
options.dataType = options.dataType || this[config].dataType
options.url = MinRequest[isCompleteURL](options.url) ? options.url : (options.baseURL + options.url)
......@@ -117,7 +123,7 @@ class MinRequest {
options.sslVerify = false
// console.log(options.header);
console.log(options.data);
// console.log(options);
console.log(options);
options = {
...options,
...MinRequest[requestBefore](options)
......@@ -128,13 +134,14 @@ class MinRequest {
//使用的时候一定要解注释
console.log(res);
if (res.data.status == false) {
console.log(res.data.msg);
uni.showToast({
title: res.data.msg,
duration: 800,
icon: 'none'
})
}
if (res.statusCode == 200) {
reject(res.data.msg)
}else if (res.statusCode == 200) {
resolve(MinRequest[requestAfter](res))
} else {
reject(res.data.msg)
......
utils/api.js
View file @ 7c929836
......@@ -15,17 +15,27 @@ minRequest.interceptors.response((response) => {
// 设置默认配置
minRequest.setConfig((config) => {
config.baseURL = 'http://192.168.43.204:8080'
let value = uni.getStorageSync("pathLoacal")
if(value!=''){
config.baseURL = value
}else{
config.baseURL = basePath
}
return config
})
const basePath = 'http://192.168.43.204:8080'
//路径应该是要封装在路径文件里
const login = "/eidpws/system/user/login";
const salt = "/eidpws/system/user/salt/{userName}";
export default {
basePath,
apis: {
uniapp (url,data={},method='get') {
return minRequest.get(url, data)
......
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 to comment