Leadfyy.co
/
uniapp-supplychain
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

对接采购单编辑，优化采购订单详情页面

master
邓平艺 5 years ago
parent
8cc4a885f0
commit
43bea8d595
3 changed files with 130 additions and 195 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      canteen/pages/classification/material.vue
  2. 53
      canteen/pages/purchase/detail.vue
  3. 134
      canteen/pages/purchase/launch.vue

2
canteen/pages/classification/material.vue
View File

@ -13,7 +13,7 @@
:style="{height: 'calc('+ windowHeight +'px - 222rpx)', width:is_search_ing?'100%':'550rpx'}"> :style="{height: 'calc('+ windowHeight +'px - 222rpx)', width:is_search_ing?'100%':'550rpx'}">
<view class="supplier-item" v-for="(item, index) in tab_list[current].list" :key="index"> <view class="supplier-item" v-for="(item, index) in tab_list[current].list" :key="index">
<label class="lf-row-between" @click="switchChecked(item)"> <label class="lf-row-between" @click="switchChecked(item)">
<view style="height: 40rpx;">{{ item.material_name }}</view>
<view style="min-height: 40rpx; max-height: max-content; width: 440rpx;">{{ item.material_name }}</view>
<u-icon name="checkmark-circle-fill" size="40" color="#11D189" v-if="item.checked"></u-icon> <u-icon name="checkmark-circle-fill" size="40" color="#11D189" v-if="item.checked"></u-icon>
</label> </label>
</view> </view>

53
canteen/pages/purchase/detail.vue
View File

@ -1,6 +1,7 @@
<template> <template>
<view> <view>
<view class="head" v-if="$isRight(order)">
<block v-if="$isRight(order)">
<view class="head">
<view class="lf-row-between lf-color-gray list"> <view class="lf-row-between lf-color-gray list">
<view>采购单 {{ order.p_sn }}</view> <view>采购单 {{ order.p_sn }}</view>
</view> </view>
@ -14,24 +15,23 @@
</view> </view>
<self-line></self-line> <self-line></self-line>
<view class="lf-p-l-32 lf-p-r-32 lf-border-box lf-bg-white"> <view class="lf-p-l-32 lf-p-r-32 lf-border-box lf-bg-white">
<!-- <lf-ysteps :stepList="stepList" color="#11D189"></lf-ysteps> -->
<lf-stepbar :list="order.state_log" v-if="order.state_log"></lf-stepbar> <lf-stepbar :list="order.state_log" v-if="order.state_log"></lf-stepbar>
</view> </view>
<self-line></self-line> <self-line></self-line>
<view class="head"> <view class="head">
<view class="lf-row-between list"> <view class="lf-row-between list">
<view>车辆</view> <view>车辆</view>
<view class="lf-font-bold">{{order.car_license}}</view>
<view class="lf-font-bold">{{order.car_license || '-'}}</view>
</view> </view>
<view class="lf-row-between list"> <view class="lf-row-between list">
<view>司机</view> <view>司机</view>
<view class="lf-font-bold">{{order.deliver_man}}</view>
<view class="lf-font-bold">{{order.deliver_man || '-'}}</view>
</view> </view>
<view class="lf-row-between list"> <view class="lf-row-between list">
<view>联系电话</view> <view>联系电话</view>
<view class="lf-font-bold">{{order.deliver_phone}}</view>
<view class="lf-font-bold">{{order.deliver_phone || '-'}}</view>
</view> </view>
<view class="list">
<view class="list" v-if="order.voucher.length">
<view>证明材料-供应端</view> <view>证明材料-供应端</view>
<view class="lf-flex-wrap lf-m-t-10"> <view class="lf-flex-wrap lf-m-t-10">
<image :src="item.voucher_pic" @click="lookImage(index)" class="ms-img" v-for="(item, index) in order.voucher" :key="item.id"></image> <image :src="item.voucher_pic" @click="lookImage(index)" class="ms-img" v-for="(item, index) in order.voucher" :key="item.id"></image>
@ -47,20 +47,20 @@
<self-line></self-line> <self-line></self-line>
<view class="lf-m-t-30 lf-m-l-32"> <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> <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" width="max-content" height="350rpx"></wyb-table>
<wyb-table :first-line-fixed="true" contentBgColor="#ecfaf5" :headers="headers" :contents="contents" width="max-content" height="80vh"></wyb-table>
</view> </view>
<view style="height: 100rpx;"></view>
<view style="height: 140rpx;"></view>
<!-- 操作按钮 --> <!-- 操作按钮 -->
<view class="fixed-bottom" v-if="type != '备货中'">
<view class="fixed-bottom" v-if="type && type != '备货中'">
<view v-if="type == '待发单'" class="lf-row-flex-end"> <view v-if="type == '待发单'" class="lf-row-flex-end">
<button class="btn btn1" @click="$url('/pages/purchase/launch?p_sn='+ order.p_sn+'&enter_type=1')">编辑</button> <button class="btn btn1" @click="$url('/pages/purchase/launch?p_sn='+ order.p_sn+'&enter_type=1')">编辑</button>
<button class="btn btn2">立即发单</button>
<button class="btn btn2" @click="orderStateChange('待接单')">立即发单</button>
</view> </view>
<view v-else-if="type == '待接单'" class="lf-row-flex-end"> <view v-else-if="type == '待接单'" class="lf-row-flex-end">
<button class="btn btn2" style="background-color: #FF0000;" @click="orderStateChange('已撤销')">撤销订单</button> <button class="btn btn2" style="background-color: #FF0000;" @click="orderStateChange('已撤销')">撤销订单</button>
</view> </view>
<view v-else-if="type == '已发货'" class="lf-row-flex-end"> <view v-else-if="type == '已发货'" class="lf-row-flex-end">
<button class="btn btn1">退单</button>
<button class="btn btn1" @click="orderStateChange('已退单')">退单</button>
<button class="btn btn1 lf-m-l-20" @click="is_show_voucher = true">上传凭证</button> <button class="btn btn1 lf-m-l-20" @click="is_show_voucher = true">上传凭证</button>
<button class="btn btn2" @click="$url('/pages/purchase/receipt?p_sn='+ order.p_sn)">确认收货</button> <button class="btn btn2" @click="$url('/pages/purchase/receipt?p_sn='+ order.p_sn)">确认收货</button>
</view> </view>
@ -68,6 +68,9 @@
<button class="btn btn1" @click="$url('/pages/purchase/launch?p_sn='+ order.p_sn+'&enter_type=2')">复用采购单</button> <button class="btn btn1" @click="$url('/pages/purchase/launch?p_sn='+ order.p_sn+'&enter_type=2')">复用采购单</button>
<view class="lf-font-32" style="color: #11D189;">已完成</view> <view class="lf-font-32" style="color: #11D189;">已完成</view>
</view> </view>
<view v-else class="lf-row-flex-end">
<view class="lf-font-32">{{ type }}</view>
</view>
</view> </view>
<!-- 弹出层-上传凭证 --> <!-- 弹出层-上传凭证 -->
<u-popup v-model="is_show_voucher" mode="center" border-radius="20"> <u-popup v-model="is_show_voucher" mode="center" border-radius="20">
@ -91,6 +94,7 @@
</view> </view>
</view> </view>
</u-popup> </u-popup>
</block>
</view> </view>
</template> </template>
@ -136,20 +140,23 @@
contents: [], contents: [],
order: {}, order: {},
p_sn: '', p_sn: '',
type: 4,
type: '',
is_show_voucher: false, is_show_voucher: false,
voucher_list: [], voucher_list: [],
voucher_count: 6
voucher_count: 6,
show_count: 0
} }
}, },
onLoad(options){ onLoad(options){
// TODO 1、凭证上传流程变动：当采购单状态为已发货状态时，食堂可以上传凭证图片；
// TODO 2、食堂收货时，实到数、实收数默认填充采购数量；
// todo 上传凭证参考页面：/uniapp-supplychain/supplier/pages/gonghuo/detail
this.p_sn = options.p_sn || ''; this.p_sn = options.p_sn || '';
// TODO 显示车辆等信息，显示table信息
this.getData(); this.getData();
}, },
onShow(){
this.show_count++;
if(this.show_count > 1){
this.getData();
}
},
methods: { methods: {
// 预览图片 // 预览图片
lookPopupImage(current){ lookPopupImage(current){
@ -201,10 +208,7 @@
}) })
Promise.all(http_list).then(res => { Promise.all(http_list).then(res => {
console.log("上传完毕", res);
let images = res.map(item => item.path); let images = res.map(item => item.path);
console.log(images)
// todo 图片上传url给后端
that.$http(that.API.API_SUPPLIER_PURCHASEUPLOADVOUCHER, { that.$http(that.API.API_SUPPLIER_PURCHASEUPLOADVOUCHER, {
p_sn: that.p_sn, p_sn: that.p_sn,
images: images, images: images,
@ -228,9 +232,7 @@
getData(){ getData(){
this.$http(this.API.API_CANTEEN_PURCHASEDETAIL, { this.$http(this.API.API_CANTEEN_PURCHASEDETAIL, {
p_sn: this.p_sn p_sn: this.p_sn
// p_sn: '802316269455228606'
}).then(res => { }).then(res => {
console.log("xxx",res)
this.order = res.data.order; this.order = res.data.order;
let list = res.data.order.items || []; let list = res.data.order.items || [];
let contents = list.map(item => { let contents = list.map(item => {
@ -248,9 +250,8 @@
} }
}) })
this.contents = contents; this.contents = contents;
console.log(this.contents)
this.type = res.data.order.state this.type = res.data.order.state
})
}).catch(err => this.$toBack());
}, },
// 预览图片 // 预览图片
lookImage(index){ lookImage(index){
@ -262,14 +263,14 @@
}) })
}, 200); }, 200);
}, },
// 改变订单状态 TODO
// 改变订单状态
orderStateChange(state){ orderStateChange(state){
this.$http(this.API.API_CANTEEN_PURCHASEUPDATE, { this.$http(this.API.API_CANTEEN_PURCHASEUPDATE, {
p_sn: this.p_sn, p_sn: this.p_sn,
state: state state: state
}).then(res => { }).then(res => {
console.log("orderStateChange", res); console.log("orderStateChange", res);
this.$msg('操作成功').then(()=>{this.$toBack()});
this.$msg('操作成功').then(()=> this.getData());
}) })
} }
} }

134
canteen/pages/purchase/launch.vue
View File

@ -1,18 +1,18 @@
<template> <template>
<view> <view>
<view class="head"> <view class="head">
<view class="list">
<view class="list" @click="addSupplier">
<view class="lf-row-between"> <view class="lf-row-between">
<view>供应商</view> <view>供应商</view>
<view class="lf-icon" @click="$url('/pages/classification/supplier')">
<view class="lf-icon">
<u-icon name="plus-circle" size="42"></u-icon> <u-icon name="plus-circle" size="42"></u-icon>
</view> </view>
</view> </view>
</view> </view>
<view class="list" v-if="show_material">
<view class="list" v-if="show_material" @click="$url('/pages/classification/material?type=1')">
<view class="lf-row-between"> <view class="lf-row-between">
<view>采购清单</view> <view>采购清单</view>
<view class="lf-icon" @click="$url('/pages/classification/material?type=1')">
<view class="lf-icon">
<u-icon name="plus-circle" size="42"></u-icon> <u-icon name="plus-circle" size="42"></u-icon>
</view> </view>
</view> </view>
@ -71,87 +71,21 @@
render_material_list: {}, // 渲染出来的物资列表 render_material_list: {}, // 渲染出来的物资列表
show_count: 0, // 页面显示次数 show_count: 0, // 页面显示次数
p_sn: '', // 订单号，如果有 p_sn: '', // 订单号，如果有
type: 0 // 类型
type: 0 // 类型, 1编辑, 2复用
} }
}, },
onLoad(options){ onLoad(options){
// TODO 采购单编辑时保存
// todo 采购单复用ok，还差 编辑 采购单保存
// 监听MaterialList被操作 // 监听MaterialList被操作
uni.$on('addMaterialList', res => { uni.$on('addMaterialList', res => {
this.material_list = res; this.material_list = res;
}) })
// /pages/purchase/launch?p_sn=P162771908650053&enter_type=2
if(options){ if(options){
this.p_sn = options.p_sn || ''; this.p_sn = options.p_sn || '';
this.type = options.enter_type || 0; this.type = options.enter_type || 0;
if(options.enter_type == 2){
if(options.enter_type == 1 || options.enter_type == 2){
this.copyMaterialList(); // 复用采购单 this.copyMaterialList(); // 复用采购单
} }
} }
var test = {
"2": {
address: "",
admin_uid: 2,
area_id: 0,
checked: true,
city_id: 0,
corporate_account: "",
corporate_account_name: "",
corporate_bank: "",
corporate_bank_sub: "",
corporate_name: "",
corporate_phone: "",
created_at: "2021-07-31 10:23:47",
created_uid: 1,
ctl_man: "张大拿",
ctl_phone: "13177889965",
deleted_at: null,
deleted_uid: 0,
id: 2,
license_number: "",
license_pic: "https://gxskyimg.lanzulive.com/",
logo: "admin_images/89897b012083b738b5792079368e73b9.jpeg",
material_list: {
"1": {
brand: "",
checked: true,
item_id: 1,
m_sn: "M162769768826400",
material_id: 1,
material_name: "上林丝苗米",
non_tax_price: "1.00",
purchase_limit: 1,
quality_level: "",
spec_id: 1,
spec_name: "-",
supplier_id: 2,
supplier_name: "食品类供应商001",
tax_price: "2.00"
}
},
private_account: "",
private_account_name: "",
private_bank: "",
private_bank_sub: "",
province_id: 0,
qualification_pic: "https://gxskyimg.lanzulive.com/",
remark: "",
s_cate_id: 1,
state: "启用",
subject_name: "",
subject_type: "公司",
supplier_name: "食品类供应商001",
updated_at: "2021-07-31 10:24:03",
updated_uid: 1
}
}
console.log("options", options);
}, },
onShow(){ onShow(){
this.show_count++; this.show_count++;
@ -203,7 +137,7 @@
// table 内容处理 // table 内容处理
let list_arr = []; let list_arr = [];
for(let j in material_list[i].material_list){ for(let j in material_list[i].material_list){
material_list[i].material_list[j].purchase_number = {edit: true, value: ''};
material_list[i].material_list[j].purchase_number = {edit: true, value: material_list[i].material_list[j].purchase_number || ''};
material_list[i].material_list[j].operation = {button: true, key: 'delete', value: '删除'}; material_list[i].material_list[j].operation = {button: true, key: 'delete', value: '删除'};
material_list[i].material_list[j].supplier_name = material_list[i].supplier_name; material_list[i].material_list[j].supplier_name = material_list[i].supplier_name;
material_list[i].material_list[j].tax_price = material_list[i].material_list[j].tax_price; material_list[i].material_list[j].tax_price = material_list[i].material_list[j].tax_price;
@ -225,32 +159,33 @@
let list = res.data || []; let list = res.data || [];
let material_list = {}; let material_list = {};
list.map(item => { list.map(item => {
let items = item.purchase[0].items;
let items = item.purchase[0]?.items || [];
let items_obj = {}; let items_obj = {};
items.map(i_item => { items.map(i_item => {
items_obj[i_item.quotation_item_id] = { items_obj[i_item.quotation_item_id] = {
brand: i_item.material.brand,
brand: i_item?.material?.brand || '',
checked: true, checked: true,
item_id: i_item.quotation_item_id, item_id: i_item.quotation_item_id,
m_sn: i_item.material.m_sn,
material_id: i_item.material.id,
material_name: i_item.material.m_name,
m_sn: i_item?.material?.m_sn || '',
material_id: i_item?.material?.id || 0,
material_name: i_item?.material?.m_name || '',
non_tax_price: i_item.non_tax_price, non_tax_price: i_item.non_tax_price,
purchase_limit: i_item.p_order_item.purchase_limit,
quality_level: i_item.material.quality_level,
spec_id: i_item.spec.id,
spec_name: i_item.spec.name,
purchase_limit: i_item?.p_order_item?.purchase_limit || '',
quality_level: i_item?.material?.quality_level || '',
spec_id: i_item?.spec?.id || 0,
spec_name: i_item?.spec?.name || '',
supplier_id: item.id, supplier_id: item.id,
supplier_name: item.supplier_name, supplier_name: item.supplier_name,
tax_price: i_item.tax_price
tax_price: i_item.tax_price,
purchase_number: i_item.purchase_number
}; };
}); });
item.material_list = items_obj; item.material_list = items_obj;
material_list[item.id] = item; material_list[item.id] = item;
this.date = item.purchase[0]?.deadline_text || '';
}) })
this.material_list = material_list; this.material_list = material_list;
this.transformList(); this.transformList();
console.log("yes", material_list);
}) })
}, },
// table-input值被改变 // table-input值被改变
@ -338,17 +273,6 @@
purchase_number: Number(item.purchase_number.value) || item.purchase_limit purchase_number: Number(item.purchase_number.value) || item.purchase_limit
} }
}); });
// 对象写法:
// let arr = [];
// for(let j in material){
// arr.push({
// m_id: material[j].material_id,
// m_spec_id: material[j].spec_id,
// tax_price: material[j].tax_price,
// non_tax_price: material[j].non_tax_price,
// purchase_number: material[j].purchase_number.value || 0
// });
// }
list.push({ list.push({
supplier_id: material_list[i].id, supplier_id: material_list[i].id,
material: arr material: arr
@ -356,7 +280,6 @@
} }
} }
console.log("list", list)
let deadline = this.date; let deadline = this.date;
if(!deadline){ if(!deadline){
this.$msg('请选择收货时间'); this.$msg('请选择收货时间');
@ -370,15 +293,26 @@
this.$msg('采购数量需大于起购数量'); this.$msg('采购数量需大于起购数量');
return; return;
} }
// let state = ['待发单', '待审核'][_t];
this.$http(this.API.API_CANTEEN_PURCHASEAPPLY, {
let _api = this.API.API_CANTEEN_PURCHASEAPPLY;
let _data = {
order: list, order: list,
state: _t, state: _t,
deadline: deadline deadline: deadline
}).then(res => {
console.log("save", res);
};
if(this.type == 1){
_api = this.API.API_CANTEEN_PURCHASESAVE;
_data.p_sn = this.p_sn;
}
this.$http(_api, _data).then(res => {
this.$msg('操作成功').then(()=>{this.$toBack()}); this.$msg('操作成功').then(()=>{this.$toBack()});
}) })
},
// 页面跳转添加供应商
addSupplier(){
if(this.type == 1){
return this.$msg('编辑时不可更换供应商');
}
this.$url('/pages/classification/supplier');
} }
} }
} }

Write Preview
Loading…
Cancel
Save