Browse Source

优化了一些问题

master
邓平艺 5 years ago
parent
commit
809664d9e4
  1. 4
      canteen/common/api.js
  2. 124
      canteen/pages/delivery/apply.vue
  3. 46
      canteen/pages/delivery/detail.vue
  4. 32
      canteen/pages/delivery/order.vue
  5. 26
      canteen/pages/purchase/detail.vue
  6. 2
      canteen/pages/purchase/launch.vue
  7. 14
      supplier/pages/gonghuo/detail.vue
  8. 2
      supplier/pages/offer/index.vue
  9. 4
      supplier/pages/order/detail.vue

4
canteen/common/api.js

@ -30,7 +30,9 @@ export const API_CONFIRM = '/api/canteen/purchaseConfirm'; // 食堂采购详情
export const API_BUYREUSE= '/api/canteen/purchaseReuse'; // 食堂采购复用订单
export const API_CANTEEN_PURCHASESAVE = '/api/canteen/purchaseSave'; // 采购单编辑时保存
export const API_EDITOUTORDER = '/api/canteen/warehouseSave'; // 编辑出库订单
export const API_CANTEEN_WAREHOUSEOUTREUSE = '/api/canteen/warehouseOutReuse'; // 出库单复用
export const API_EDITOUTORDER = '/api/canteen/warehouseSave'; // 出库申请编辑时保存
export const API_CANTEEN_WAREHOUSEUPDATE = '/api/canteen/warehouseUpdate'; // 出库单详情改变状态

124
canteen/pages/delivery/apply.vue

@ -1,9 +1,9 @@
<template>
<view>
<view class="lf-p-32 lf-p-t-30 lf-p-b-30 lf-w-100 lf-h-maxcontent lf-border-box">
<view class="list" @click="$url('/pages/classification/warehouse')">
<view class="lf-font-28 lf-color-black lf-row-between">
<view>出库清单</view>
<view class="lf-icon" @click="$url('/pages/classification/warehouse')">
<view class="lf-icon">
<u-icon name="plus-circle" size="42"></u-icon>
</view>
</view>
@ -12,19 +12,20 @@
<!-- 修饰条 -->
<self-line></self-line>
<!-- 物料table -->
<view class="lf-p-32 lf-p-t-30 lf-p-b-30 lf-w-100 lf-h-maxcontent lf-border-box">
<view class="list">
<view class="lf-font-32 lf-color-black lf-font-bold lf-m-b-20">物资明细</view>
<wyb-table :headers="headers" :contents="contents"
contentBgColor="#ecfaf5"
:first-line-fixed="true"
@onInputChange="onInputChange"
width="max-content" height="800rpx"
width="max-content" height="80vh"
v-if="contents.length"></wyb-table>
</view>
<!-- 操作按钮 -->
<view class="fixed-bottom lf-p-l-32 lf-p-r-32" style="justify-content: space-between;" v-if="enter_type == 1">
<view></view>
<button class="btn btn2" @click="editOrder()">立即申请</button>
<!-- <button class="btn btn2" @click="editOrder()">立即申请</button> -->
<button class="btn btn2" @click="save(1)">立即申请</button>
</view>
<view class="fixed-bottom" v-else>
<button class="btn btn1" @click="save(0)">临时保存</button>
@ -62,79 +63,90 @@
key: 'supplier_name'
},{
label: '批次',
key: 'purchase_id'
key: 'batch_sn'
},{
key: 'delivery_number',
label: '出库数量'
}],
contents: [],
warehouse_list: {},
enter_type: '',
enter_type: '', // 1 2
o_sn: ''
}
},
onLoad(e){
this.o_sn = e.o_sn
this.enter_type = e.enter_type
// warehouse_list
uni.$on('addWarehouseList', res => {
this.warehouse_list = res;
console.log(this.warehouse_list)
})
if(e){
this.o_sn = e.o_sn
this.enter_type = e.enter_type
if(e.enter_type == 1 || e.enter_type == 2){
this.getData();
}
}
},
onShow(){
this.transformList();
},
onShow(e){
if(this.enter_type == 1 || this.enter_type == 2) {
this.getData()
}else {
methods: {
transformList(){
let contents = [];
let warehouse_list = this.warehouse_list;
let warehouse_list = JSON.stringify(this.warehouse_list);
warehouse_list = JSON.parse(warehouse_list);
for(let i in warehouse_list){
warehouse_list[i].delivery_number = {edit: true, value: '1'}
warehouse_list[i].brand = i.brand
warehouse_list[i].quality_level = i.quality_level
warehouse_list[i].delivery_number = {edit: true, value: warehouse_list[i].delivery_number || 1};
contents.push(warehouse_list[i]);
}
this.contents = contents;
}
},
methods: {
console.log("show.warehouse_list...", this.warehouse_list)
console.log("transformList...", contents);
},
// &
getData(){
// TODO
// this.$http(this.API.API_CANTEEN_WAREHOUSEOUTREUSE, {
this.$http(this.API.API_CANTEEN_OUTDETAIL, {
o_sn: this.o_sn
}).then(res => {
// let list = res.data || [];
let list = res.data.sheet || [];
let contents = list.map(item => {
return {
material_name: item.material.m_name,
spec_name: item.spec.name,
brand: item.material.brand,
quality_level: item.material.quality_level,
m_sn: item.material.m_sn,
supplier_name: item.purchase.supplier.supplier_name,
let warehouse_list = {};
list.map(item => {
warehouse_list[item.id] = {
batch_sn: item?.purchase?.batch_sn || '',
brand: item?.material?.brand || '',
checked: true,
m_sn: item?.material?.m_sn || '',
material_id: item?.material?.id || 0,
material_name: item?.material?.m_name || '',
order_id: item.id,
purchase_id: item.purchase_id,
delivery_number: {edit: true, value: item.out_number},
order_id: item.material.id
}
quality_level: item?.material?.quality_level || '',
spec_id: item?.spec?.id || 0,
spec_name: item?.spec?.name || '',
supplier_name: item?.purchase?.supplier?.supplier_name || '',
delivery_number: item.out_number || 1
};
})
console.log(contents)
this.contents = contents;
this.warehouse_list = contents
this.warehouse_list = warehouse_list;
this.transformList();
})
},
//
// todo
editOrder() {
this.$http(this.API.API_EDITOUTORDER, {
data: list
}).then(res => {
console.log("save", res);
this.$msg('操作成功');
this.$msg('操作成功').then(() => this.$toBack());
})
},
// todo table
// table
onInputChange(event){
console.log("检测到table input被更改", event);
// this.contents[event.contentIndex][event.key].value = event.detailValue;
this.contents[event.contentIndex][event.key].value = event.detailValue;
},
//
save(_t){
@ -143,25 +155,29 @@
return this.$msg('您未选择物资')
}
let list = this.contents.map(item => {
console.log(item)
return {
m_id: item.material_id,
m_spec_id: item.spec_id,
tax_price: '',
non_tax_price: '',
purchase_id: item.purchase_id,
out_number: '' ,
state: '待确认'
out_number: Number(item.delivery_number.value) || 1,
warehouse_id: item.order_id || 0,
tax_price: item.tax_price || '', // TODO
non_tax_price: item.non_tax_price || '',
m_unit_id: item.m_unit_id || 0
}
});
this.contents = list;
console.log('==========',list)
// let state = ['', ''][_t]; //
this.$http(this.API.API_CANTEEN_WAREHOUSEOUT, {
data: list
let _api = this.API.API_CANTEEN_WAREHOUSEOUT;
if(this.enter_type == 1){
_api = this.API.API_EDITOUTORDER;
}
let state = ['待确认', '已确认'][_t]; //
this.$http(_api, {
data: list,
state: state
}).then(res => {
console.log("save", res);
this.$msg('操作成功');
this.$msg('操作成功').then(() => this.$toBack());
})
}
}
@ -178,6 +194,12 @@
align-items: center;
justify-content: center;
}
.list{
padding: 30rpx 32rpx;
width: 100%;
height: max-content;
box-sizing: border-box;
}
.fixed-bottom{
position: fixed;
bottom: 0rpx;

46
canteen/pages/delivery/detail.vue

@ -5,7 +5,6 @@
<view>采购单 {{order.sheet[0].purchase.p_sn}}</view>
</view>
<view class="list">
<!-- <lf-ysteps :stepList="stepList" color="#11D189"></lf-ysteps> -->
<lf-stepbar :list="stepList"></lf-stepbar>
</view>
</view>
@ -23,14 +22,14 @@
<self-line></self-line>
<view class="lf-m-t-30 lf-m-l-32">
<view class="lf-font-32 lf-color-black lf-font-bold lf-m-b-20">物资明细</view>
<wyb-table :first-line-fixed="true" contentBgColor="#ecfaf5" :headers="headers" :contents="contents" @onButtonClick="onButtonClick" width="100%" height="350rpx"></wyb-table>
<wyb-table :first-line-fixed="true" contentBgColor="#ecfaf5" :headers="headers" :contents="contents" width="100%" height="80vh"></wyb-table>
</view>
<view style="height: 100rpx;"></view>
<view style="height: 140rpx;"></view>
<!-- 操作按钮 -->
<view class="fixed-bottom">
<view v-if="type == '待确认'" class="lf-row-flex-end" style="justify-content: space-between;width: 100%;">
<button class="btn btn1" @click="$url('/pages/delivery/apply?o_sn='+ o_sn+'&enter_type=1')">编辑</button>
<button class="btn btn2">立即申请</button>
<button class="btn btn2" @click="orderStateChange('已确认')">立即申请</button>
</view>
<view v-else-if="type == '已出库'" class="lf-row-between" style="justify-content: space-between;width: 100%;">
<button class="btn btn1" @click="$url('/pages/delivery/apply?o_sn='+ o_sn+'&enter_type=2')">复用出库单</button>
@ -45,11 +44,10 @@
</template>
<script>
import lfYsteps from '@/components/lf-ysteps/lf-ysteps';
import wybTable from '@/components/wyb-table/wyb-table';
export default {
components: { lfYsteps, wybTable },
components: { wybTable },
data(){
return {
stepList: [],
@ -82,23 +80,35 @@
o_sn: '',
order: {},
type: 4,
show_count: 0
}
},
onLoad(options){
this.o_sn = options.id || '';
this.getData();
},
onShow(){
this.show_count++;
if(this.show_count > 1){
this.getData();
}
},
methods: {
getData(){
this.$http(this.API.API_CANTEEN_OUTDETAIL, {
o_sn: this.o_sn
}).then(res => {
this.order = res.data
this.order = res.data;
this.stepList = this.order.state_log.map((item, index) => {
item.isFinished = false;
if(index == this.order.state_log.length - 1){
if(item.action == '订单已完成' || item.action == '订单已退款'){
let actionState = [
'订单已完成',
'订单已退款',
'订单已撤销'
];
if(actionState.includes(item.action)){
item.isFinished = true;
}
}
@ -123,17 +133,15 @@
this.type = res.data.state
})
},
onButtonClick(event){
uni.showModal({
title: '温馨提示',
content: '您确定移除该项吗?',
success: result => {
if(result.confirm){
console.log("移除某一项", event);
let { contentIndex } = event;
this.contents.splice(contentIndex, 1);
}
}
//
orderStateChange(state){
this.$http(this.API.API_CANTEEN_WAREHOUSEUPDATE, {
w_sn: this.o_sn,
state: state
}).then(res => {
console.log("res", res);
this.$msg('操作成功');
this.getData();
})
}
}

32
canteen/pages/delivery/order.vue

@ -12,23 +12,22 @@
@scrolltolower="scrolltolower"
:refresher-triggered="tabItem.isRefresher"
@refresherrefresh="onRefresherrefresh">
<view class="card" v-for="(item, index) in tabItem.list" :key="item.id" @click="$url('/pages/delivery/detail?id='+ item.o_sn)">
<view class="card" v-for="(item, index) in tabItem.list" :key="index" @click="$url('/pages/delivery/detail?id='+ item.o_sn)">
<view class="lf-row-between item">
<view class="lf-color-gray">申请人</view>
<view class="lf-color-black">{{ item.o_name }}</view>
</view>
<view class="lf-row-between item">
<view class="lf-color-gray">申请时间</view>
<!-- todo 申请时间和种类 -->
<view class="lf-color-black">{{ item.o_sn }}</view>
<view class="lf-color-black">{{ item.created_at }}</view>
</view>
<view class="lf-row-between item">
<view class="lf-color-gray">商品种类</view>
<view class="lf-color-black">8</view>
<view class="lf-color-black">{{ item.sheet_count }}</view>
</view>
<view class="lf-row-between item">
<view class="lf-color-gray">订单状态</view>
<view class="quoted-price">{{ item.state }}</view>
<view :class="stateClass(item.state)">{{ item.state }}</view>
</view>
</view>
<view class="loading-more">
@ -72,12 +71,11 @@
}
},
computed: {
// TODO class
stateClass(){
return function(val){
let class_name = {
'等待接单': 'quoted-price',
'等待发货': 'wait',
'待确认': 'quoted-price',
'已确认': 'wait',
'已完成': 'passed',
'已退单': 'refuse'
}
@ -90,33 +88,21 @@
this.getData();
},
methods: {
// TODO
//
getData(options){
// if(this.current == 1) {
// this.stateText = ''
// }else if(this.current == 2) {
// this.stateText = ''
// }else {
// this.stateText = ''
// }
let item = this.tab_list[this.current];
this.$http(this.API.API_CANTEEN_WAREHOUSEOUTLIST,{
page: item.page,
pagesize: 10,
pagesize: this.page_size,
state: this.current
}).then(res => {
console.log("getData", res);
this.tab_list[this.current].list = res.data.list || [];
let list = res.data.list || [];
let isPage = res.data.hasmore;
item.isPage = isPage;
if(!isPage){
item.loading_class = false;
item.loading_text = '已加载全部数据~';
}
item.isPage = isPage;
uni.stopPullDownRefresh()
if(options && options.refresh){
item.isRefresher = false;
}

26
canteen/pages/purchase/detail.vue

@ -100,10 +100,9 @@
<script>
import { uploadFile } from '@/common/uploadFile.js'
import lfYsteps from '@/components/lf-ysteps/lf-ysteps';
import wybTable from '@/components/wyb-table/wyb-table';
export default {
components: { lfYsteps, wybTable },
components: { wybTable },
data(){
return {
headers: [{
@ -233,8 +232,23 @@
this.$http(this.API.API_CANTEEN_PURCHASEDETAIL, {
p_sn: this.p_sn
}).then(res => {
this.order = res.data.order;
let list = res.data.order.items || [];
let order = res.data.order;
order.state_log.forEach((item, index) => {
item.isFinished = false;
if(index == order.state_log.length - 1){
let actionState = [
'订单已完成',
'订单已退款',
'订单已撤销'
];
if(actionState.includes(item.action)){
item.isFinished = true;
}
}
})
this.order = order;
let list = order.items || [];
let contents = list.map(item => {
return {
name: item.material.m_name,
@ -242,7 +256,7 @@
brand: item.material.brand,
quality_level: item.material.quality_level,
m_sn: item.material.m_sn,
supplier_name: this.order.supplier.supplier_name,
supplier_name: order.supplier.supplier_name,
pre_tax_price: item.total_tax_amount,
after_tax_price: item.total_non_tax_amount,
purchase_limit: item.p_order_item.purchase_limit,
@ -250,7 +264,7 @@
}
})
this.contents = contents;
this.type = res.data.order.state
this.type = order.state;
}).catch(err => this.$toBack());
},
//

2
canteen/pages/purchase/launch.vue

@ -47,7 +47,7 @@
</view>
</view>
<!-- 操作按钮 -->
<view style="height: 100rpx;"></view>
<view style="height: 140rpx;"></view>
<view class="fixed-bottom">
<button class="btn btn1" @click="save(0)">临时保存</button>
<button class="btn btn2" @click="save(1)">保存并发单</button>

14
supplier/pages/gonghuo/detail.vue

@ -21,9 +21,9 @@
<self-line></self-line>
<view class="lf-m-t-30 lf-m-l-32">
<view class="lf-font-32 lf-color-black lf-font-bold lf-m-b-20">物资明细</view>
<wyb-table v-if="contents.length" :first-line-fixed="true" contentBgColor="#eef6fe" :headers="headers" :contents="contents" width="max-content" height="350rpx"></wyb-table>
<wyb-table v-if="contents.length" :first-line-fixed="true" contentBgColor="#eef6fe" :headers="headers" :contents="contents" width="max-content" height="80vh"></wyb-table>
</view>
<view style="height: 100rpx;"></view>
<view style="height: 140rpx;"></view>
<!-- 操作按钮 -->
<view class="fixed-bottom">
<view v-if="type == '待接单'" class="lf-row-flex-end">
@ -93,11 +93,10 @@
<script>
import { uploadFile } from '@/common/uploadFile.js'
import lfYsteps from '@/components/lf-ysteps/lf-ysteps';
import wybTable from '@/components/wyb-table/wyb-table';
export default {
components: { lfYsteps, wybTable },
components: { wybTable },
data(){
return {
stepList: [],
@ -158,7 +157,12 @@
this.stepList = order.state_log.map((item, index) => {
item.isFinished = false;
if(index == order.state_log.length - 1){
if(item.action == '订单已完成' || item.action == '订单已退款'){
let actionState = [
'订单已完成',
'订单已退款',
'订单已撤销'
]
if(actionState.includes(item.action)){
item.isFinished = true;
}
}

2
supplier/pages/offer/index.vue

@ -32,7 +32,7 @@
:headers="headers"
:contents="contents"
@onInputChange="onInputChange"
width="100%" height="800rpx"></wyb-table>
width="100%" height="80vh"></wyb-table>
</view>
<!-- 操作按钮 -->
<view class="fixed-bottom">

4
supplier/pages/order/detail.vue

@ -17,9 +17,9 @@
<self-line></self-line>
<view class="lf-m-t-30 lf-m-l-32 lf-m-r-32">
<view class="lf-font-32 lf-color-black lf-font-bold lf-m-b-20">报价明细</view>
<wyb-table :headers="headers" :contents="contents" :first-line-fixed="true" contentBgColor="#eef6fe" width="max-content" height="550rpx"></wyb-table>
<wyb-table :headers="headers" :contents="contents" :first-line-fixed="true" contentBgColor="#eef6fe" width="max-content" height="80vh"></wyb-table>
</view>
<view style="height: 100rpx;"></view>
<view style="height: 140rpx;"></view>
<!-- 操作按钮 -->
<view class="fixed-bottom" v-if="$isRight(order) && type != 0">
<view v-if="type == 1" class="lf-row-flex-end">

Loading…
Cancel
Save