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

Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-supplychain

master
Enzo 5 years ago
parent
ede107382f fac83cabed
commit
1195b32235
15 changed files with 63 additions and 28 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. 13
      canteen/components/lf-previewImage/lf-previewImage.vue
  2. 5
      canteen/pages/classification/material.vue
  3. 5
      canteen/pages/classification/supplier.vue
  4. 6
      canteen/pages/classification/warehouse.vue
  5. 2
      canteen/pages/delivery/order.vue
  6. 1
      canteen/pages/index/index.vue
  7. 2
      canteen/pages/purchase/order.vue
  8. 13
      supplier/components/lf-previewImage/lf-previewImage.vue
  9. 12
      supplier/components/wyb-table/wyb-table.vue
  10. 8
      supplier/pages/gonghuo/detail.vue
  11. 2
      supplier/pages/gonghuo/order.vue
  12. 1
      supplier/pages/index/index.vue
  13. 15
      supplier/pages/offer/index.vue
  14. 4
      supplier/pages/order/detail.vue
  15. 2
      supplier/pages/order/index.vue

13
canteen/components/lf-previewImage/lf-previewImage.vue
View File

@ -92,7 +92,6 @@
created(){
// TODO PC端屏蔽遮罩滚动穿透
// TODO PC端滚轮放大缩小
// TODO 放大缩小百分比显示
// TODO 双击时会被关掉
},
methods: {
@ -117,8 +116,12 @@
},
// movable 缩放事件
scale(event){
let scale = event.detail.scale;
this.$msg(scale); // TODO 轻提示层级不够，没有被显示出来
let scale = parseInt(event.detail.scale * 100) +'%';
uni.showToast({
title: scale,
icon: 'none',
position: 'bottom'
})
},
// 鼠标滚动缩放事件，目前会触发浏览器页面滚动事件，暂时先不要这个功能
mousewheel(event){
@ -227,4 +230,8 @@
}
}
}
// 轻提示框样式
/deep/.uni-sample-toast{
z-index: 1002;
}
</style>

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

@ -64,7 +64,12 @@
})
return;
}
// #ifdef H5
this.checked_list = prevPage.$data.material_list;
// #endif
// #ifdef MP-WEIXIN
this.checked_list = prevPage.data.material_list;
// #endif
this.getData();
},
methods: {

5
canteen/pages/classification/supplier.vue
View File

@ -60,7 +60,12 @@
})
return;
}
// #ifdef H5
this.checked_list = prevPage.$data.material_list;
// #endif
// #ifdef MP-WEIXIN
this.checked_list = prevPage.data.material_list;
// #endif
if(this.show_count <= 1){
this.getData();

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

@ -58,8 +58,12 @@
})
return;
}
// #ifdef H5
this.checked_list = prevPage.$data.warehouse_list;
console.log('onload',this.checked_list )
// #endif
// #ifdef MP-WEIXIN
this.checked_list = prevPage.data.warehouse_list;
// #endif
this.getData();
},
methods: {

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

@ -27,7 +27,7 @@
</view>
<view class="lf-row-between item">
<view class="lf-color-gray">订单状态</view>
<view :class="stateClass(item.state)">{{ item.state }}</view>
<view :class="[stateClass(item.state)]">{{ item.state }}</view>
</view>
</view>
<view class="loading-more">

1
canteen/pages/index/index.vue
View File

@ -38,7 +38,6 @@
}
},
onShow() {
// todo 优化：显示订单角标
this.getHomeData();
},
onReady() {

2
canteen/pages/purchase/order.vue
View File

@ -43,7 +43,7 @@
</view>
<view class="lf-row-between item" v-if="item.state">
<view class="lf-color-gray">订单状态</view>
<view :class="stateClass(item.state)">{{ item.state }}</view>
<view :class="[stateClass(item.state)]">{{ item.state }}</view>
</view>
</view>
<view class="loading-more">

13
supplier/components/lf-previewImage/lf-previewImage.vue
View File

@ -92,7 +92,6 @@
created(){
// TODO PC端屏蔽遮罩滚动穿透
// TODO PC端滚轮放大缩小
// TODO 放大缩小百分比显示
// TODO 双击时会被关掉
},
methods: {
@ -117,8 +116,12 @@
},
// movable 缩放事件
scale(event){
let scale = event.detail.scale;
this.$msg(scale); // TODO 轻提示层级不够，没有被显示出来
let scale = parseInt(event.detail.scale * 100) +'%';
uni.showToast({
title: scale,
icon: 'none',
position: 'bottom'
})
},
// 鼠标滚动缩放事件，目前会触发浏览器页面滚动事件，暂时先不要这个功能
mousewheel(event){
@ -227,4 +230,8 @@
}
}
}
// 轻提示框样式
/deep/.uni-sample-toast{
z-index: 1002;
}
</style>

12
supplier/components/wyb-table/wyb-table.vue
View File

@ -135,7 +135,7 @@
v-for="(header, hIndex) in headers"
@tap.stop="onContentItemTap(cIndex, hIndex)"
:key="contentItemKey(header, hIndex)"
:style="{
:style="[myAssign({
minWidth: (header.width || defaultColWidth) + 'rpx',
maxWidth: (header.width || defaultColWidth) + 'rpx',
textAlign: textAlign,
@ -149,8 +149,7 @@
borderRight: hIndex === headers.length - 1 || (!showVertBorder && hIndex !== 0) ? 'none' : '1px solid' + borderColor,
zIndex: hIndex === 0 ? 20 : 0,
left: enableCheck ? checkColWidth + 'rpx' : 0,
position: hIndex === 0 && firstLineFixed ? 'sticky' : 'static',
...content.searchStyle }">
position: hIndex === 0 && firstLineFixed ? 'sticky' : 'static'}, content.searchStyle)]">
<input class="lf-w-100" placeholder="请输入.."
:disabled="content.disabled || false"
v-if="isObject(autoContentItem(cIndex, hIndex), 'edit')"
@ -766,6 +765,7 @@
if (this.onload) {
this.contentsSort.forEach(item => {
this.$set(item, 'checked', false)
this.$set(item, 'searchStyle', {})
})
this.oContentsSort = this.contentsSort.slice()
this.onload = false
@ -792,6 +792,7 @@
})
// 处理匹配到item时滚动至第一个item
if(positionIndex != null){
// #ifdef H5
let tabView = document.querySelector('.wyb-table-scroll-view'); // 获取第一层大对象，table
let tabContent = tabView.querySelector('.wyb-table-content'); // 获取第二层，table的content部分
let contentLine = tabContent.querySelector('.wyb-table-content-line-'+ positionIndex); // 获取第三层，获取内容列
@ -799,6 +800,7 @@
let offsetHeight = contentLine.offsetHeight; // table行高度
let offsetTop = contentLine.offsetTop; // table行距离页面高度
tabView.scrollTop = offsetTop - tabViewTop - offsetHeight;
// #endif
}else if(val){
this.$msg('该关键字没有搜索到物资哦')
}
@ -823,6 +825,10 @@
}
},
methods: {
// 对象拼接
myAssign(a, b){
return Object.assign(a, b);
},
// 页面初次加载，判断是否自动滚动至input输入框所在的位置
autoScrollView(){
try{

8
supplier/pages/gonghuo/detail.vue
View File

@ -249,10 +249,10 @@
let list = order.items || [];
let contents = list.map(item => {
let obj = {
m_name: item.material?.m_name || '',
material_id: item.material?.id,
spec: item.spec?.name || '',
spec_id: item.spec?.id,
m_name: item?.material?.m_name || '',
material_id: item?.material?.id,
spec: item?.spec?.name || '',
spec_id: item?.spec?.id,
brand: item?.material?.brand || '',
quality_level: item?.material?.quality_level || '',
m_sn: item?.material?.m_sn || '',

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

@ -39,7 +39,7 @@
</view>
<view class="lf-row-between item" v-if="item.state">
<view class="lf-color-gray">订单状态</view>
<view :class="stateClass(item.state)">{{ item.state }}</view>
<view :class="[stateClass(item.state)]">{{ item.state }}</view>
</view>
</view>
<view class="loading-more">

1
supplier/pages/index/index.vue
View File

@ -39,7 +39,6 @@
}
},
onShow() {
// todo 优化：显示订单角标
this.getData();
},
onReady(){

15
supplier/pages/offer/index.vue
View File

@ -167,6 +167,9 @@
let info = uni.createSelectorQuery().select(".relation");
　　　 info.boundingClientRect(function(data) {
let num = app.globalData.customBarH;
// #ifdef MP-WEIXIN
num -= 60;
// #endif
num += data.height;
num += data.top;
that.node_top = num;
@ -226,7 +229,7 @@
return {
name: item?.material?.m_name || '',
material_id: item?.material?.id || 0,
spec: item.name,
spec: item.name || '',
spec_id: item.id,
brand: item?.material?.brand || '',
quality_level: item?.material?.quality_level || '',
@ -256,7 +259,7 @@
let obj = {
name: item?.material?.m_name || '',
material_id: item?.material?.id || 0,
spec: item.name,
spec: item.name || '',
spec_id: item.id,
brand: item?.material?.brand || '',
quality_level: item?.material?.quality_level || '',
@ -306,7 +309,7 @@
return {
name: item?.material?.m_name || '',
material_id: item?.material?.id || 0,
spec: item.name,
spec: item.name || '',
spec_id: item.id,
brand: item?.material?.brand || '',
quality_level: item?.material?.quality_level || '',
@ -358,8 +361,8 @@
onButtonClick(event){
if(event.content.key == 'delete'){
let contentIndex = event.contentIndex;
let name = event.lineData.name;
let spec = event.lineData.spec;
let name = event?.lineData?.name || '';
let spec = event?.lineData?.spec || '';
uni.showModal({
title: '温馨提示',
content: `确定删除 ${name}-${spec} 吗？`,
@ -466,7 +469,7 @@
<style>
page{
overflow: hidden;
overflow-x: hidden;
}
</style>
<style lang="scss" scoped="scoped">

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

@ -11,7 +11,7 @@
</view>
<view class="lf-row-between list">
<view>订单状态</view>
<view :class="stateClass(order.state)">{{ order.state }}</view>
<view :class="[stateClass(order.state)]">{{ order.state }}</view>
</view>
<view class="lf-row-between list">
<view>报价商</view>
@ -145,7 +145,7 @@
let obj = {
name: item.material?.m_name || '',
material_id: item.material?.id,
spec: item.spec?.name || '',
spec: item?.spec?.name || '',
spec_id: item.spec?.id,
brand: item?.material?.brand || '',
quality_level: item?.material?.quality_level || '',

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

@ -23,7 +23,7 @@
</view>
<view class="lf-row-between item">
<view class="lf-color-gray">订单状态</view>
<view :class="stateClass(item.state)">{{ item.state }}</view>
<view :class="[stateClass(item.state)]">{{ item.state }}</view>
</view>
<view class="lf-row-between item">
<view class="lf-color-gray">创建时间</view>

Write Preview
Loading…
Cancel
Save