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

相关优化

master
Enzo 5 years ago
parent
aea143f2de
commit
8b69927de7
7 changed files with 58 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      canteen/common/http.interceptor.js
  2. 1
      canteen/pages/classification/warehouse.vue
  3. 47
      canteen/pages/delivery/apply.vue
  4. 18
      canteen/pages/delivery/detail.vue
  5. 4
      canteen/pages/delivery/order.vue
  6. 4
      supplier/pages/order/detail.vue
  7. 2
      supplier/pages/order/index.vue

2
canteen/common/http.interceptor.js
View File

@ -34,7 +34,7 @@ const install = (Vue, vm) => {
} else if (res.code == 9999) {
vm.$redirectToLogin('登录超时, 请重新登录');
return false;
}else {
} else {
vm.$msg(res.msg);
return false;
}

1
canteen/pages/classification/warehouse.vue
View File

@ -16,6 +16,7 @@
<view style="min-height: 40rpx; max-height: max-content; width: 440rpx;">
<view class="lf-font-28 lf-color-black">{{ item.material_name }}·{{ item.spec_name }}</view>
<view class="lf-font-24 lf-color-555 lf-m-t-10">批次号：{{ item.batch_sn }}</view>
<view class="lf-font-24 lf-color-555 lf-m-t-10">入库时间：{{ item.in_warehouse_time }}</view>
</view>
<u-icon name="checkmark-circle-fill" size="40" color="#11D189" v-if="item.checked"></u-icon>
</label>

47
canteen/pages/delivery/apply.vue
View File

@ -166,21 +166,46 @@
// 保存，出库
save(_t){
console.log("dddddd", this.contents)
// return
if(this.contents.length <= 0) {
return this.$msg('您未选择物资')
}
let list = this.contents.map(item => {
return {
m_id: item.material_id,
m_spec_id: item.spec_id,
purchase_id: item.purchase_id,
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
var list = []
for(var i;i< this.contents.length;i++) {
console.log('出库数量')
return
if(Number(this.contents[i].delivery_number.value) > this.contents[i].stock) {
this.$msg('库存数不足'+this.contents[i].stock)
return
}
});
list.push({
m_id: this.contents[i].material_id,
m_spec_id: this.contents[i].spec_id,
purchase_id: this.contents[i].purchase_id,
out_number: Number(this.contents[i].delivery_number.value) || 1,
warehouse_id: this.contents[i].order_id || 0,
tax_price: this.contents[i].tax_price || '', // TODO 添加物资页面未返回价格，默认空
non_tax_price: this.contents[i].non_tax_price || '',
m_unit_id: this.contents[i].m_unit_id || 0
})
}
// let list = this.contents.map(item => {
// if(Number(item.delivery_number.value) > item.stock) {
// this.$msg('库存数不足'+item.stock)
// return
// }
// return {
// m_id: item.material_id,
// m_spec_id: item.spec_id,
// purchase_id: item.purchase_id,
// 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
// }
// });
console.log('==========',list)
let _api = this.API.API_CANTEEN_WAREHOUSEOUT;

18
canteen/pages/delivery/detail.vue
View File

@ -1,9 +1,9 @@
<template>
<view v-if="$isRight(order)">
<view class="head">
<view class="lf-row-between lf-color-gray list">
<view>采购单 {{order.sheet[0].purchase.p_sn}}</view>
</view>
<view class="head" style="padding: 0 16px 0 0;">
<!-- <view class="lf-row-between lf-color-gray list">
<view>采购单 </view>
</view> -->
<view class="list">
<lf-stepbar :list="stepList" themeColor="#11D189"></lf-stepbar>
</view>
@ -14,6 +14,14 @@
<view>申请人</view>
<view class="lf-font-bold">{{order.sheet[0].purchase.contact_name}}</view>
</view>
<view class="lf-row-between list">
<view>采购单</view>
<view class="lf-font-bold">{{order.sheet[0].purchase.p_sn}}</view>
</view>
<view class="lf-row-between list">
<view>批次号</view>
<view class="lf-font-bold">{{order.batch_sn}}</view>
</view>
<view class="lf-row-between list" @click="call(order.sheet[0].purchase.contact_phone)">
<view>联系电话</view>
<view class="lf-font-bold" style="color: rgb(17, 209, 137);">{{order.sheet[0].purchase.contact_phone}}</view>
@ -161,7 +169,7 @@
height: auto;
.list{
padding: 30rpx 0;
border-bottom: 1rpx solid #e5e5e5;
// border-bottom: 1rpx solid #e5e5e5;
font-size: 28rpx;
color: #555555;
&:last-child{

4
canteen/pages/delivery/order.vue
View File

@ -14,7 +14,7 @@
@refresherrefresh="onRefresherrefresh">
<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-gray">出库名称</view>
<view class="lf-color-black">{{ item.o_name }}</view>
</view>
<view class="lf-row-between item">
@ -23,7 +23,7 @@
</view>
<view class="lf-row-between item">
<view class="lf-color-gray">商品种类</view>
<view class="lf-color-black">{{ item.sheet_count }}类</view>
<view class="lf-color-black">{{ item.cate_number }}类</view>
</view>
<view class="lf-row-between item">
<view class="lf-color-gray">订单状态</view>

4
supplier/pages/order/detail.vue
View File

@ -23,6 +23,10 @@
</view>
<view class="lf-row-between list">
<view>创建时间</view>
<view class="lf-color-black">{{ order.created_at }}</view>
</view>
<view class="lf-row-between list">
<view>过期时间</view>
<view class="lf-color-black">{{ order.deadline_text }}</view>
</view>
</view>

2
supplier/pages/order/index.vue
View File

@ -27,7 +27,7 @@
</view>
<view class="lf-row-between item">
<view class="lf-color-gray">创建时间</view>
<view class="lf-color-black">{{ item.deadline_text }}</view>
<view class="lf-color-black">{{ item.created_at }}</view>
</view>
</view>
<view class="loading-more">

Write Preview
Loading…
Cancel
Save