From 37dd5f570a06bded3563ec8ffad86c7625f50585 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 31 八月 2024 01:34:39 +0800
Subject: [PATCH] update 供应商和质检
---
sub_pages/partner/delivery/delivery-supplier-detail.vue | 5 ++
sub_pages/partner/delivery/delivery-detail.vue | 31 ++++++++++++---
sub_pages/partner/delivery/delivery.vue | 5 +-
pages.json | 2
sub_pages/supplier/order-manage/order-manage-settlement.vue | 19 ++++++---
sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue | 10 ++++-
6 files changed, 52 insertions(+), 20 deletions(-)
diff --git a/pages.json b/pages.json
index b47ee60..87acc7a 100644
--- a/pages.json
+++ b/pages.json
@@ -435,7 +435,7 @@
}
],
"globalStyle": {
- "navigationBarTextStyle": "black",
+ "navigationBarTextStyle": "black",
"navigationBarTitleText": "花满芫",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8",
diff --git a/sub_pages/partner/delivery/delivery-detail.vue b/sub_pages/partner/delivery/delivery-detail.vue
index 3fa0e5a..2dfefd8 100644
--- a/sub_pages/partner/delivery/delivery-detail.vue
+++ b/sub_pages/partner/delivery/delivery-detail.vue
@@ -16,7 +16,7 @@
id: '',
status: '',
pictureList: [],
- checkRemarks: '',
+ remarks: '',
deductAmount: 0,
},
check_status: [
@@ -162,8 +162,25 @@
this.$message.showToast('扣款金额需要大于等于0')
return
}
+ if (this.form.deductAmount) {
+ if ((parseInt(this.form.deductAmount * 100) / 100) != this.form.deductAmount) {
+ this.$message.showToast('扣款金额至多2位小数')
+ return
+ }
+ }
+ if (parseInt(this.form.deductAmount * 100) / 100 != this.form.deductAmount) {
+
+ }
if (isNaN(parseInt(this.form.num)) || this.form.num < 0) {
this.$message.showToast('数量需要大于等于0')
+ return
+ }
+ if (!this.form.pictureList || this.form.pictureList.length < 1) {
+ this.$message.showToast('未上传图片')
+ return
+ }
+ if (!this.form.targetLevel) {
+ this.$message.showToast('未选择降级等级')
return
}
}
@@ -188,7 +205,7 @@
if (code === 0) {
this.$refs.popup_form.close()
await this.$store.dispatch('sign_add', 'delivery')
-
+
await this.$message.showToast('操作成功')
this.init()
@@ -318,7 +335,7 @@
<view class="each-item">
<view class="label">价格</view>
<view class="value">￥{{ item.price || '-' }}</view>
-
+
</view>
<view class="each-item">
<view class="label">降级</view>
@@ -327,12 +344,12 @@
<view class="each-item">
<view class="label">缺货</view>
<view class="value">{{ item.lackNum || 0 }}</view>
-
+
</view>
<view class="each-item">
<view class="label">补货</view>
<view class="value">{{ item.replaceNum || 0 }}</view>
-
+
</view>
</view>
</view>
@@ -362,7 +379,7 @@
</view>
<view class="submit form">
<view class="form-item" v-if="form.status==='reduce'" style="height: unset;">
- <view class="form-item-label require" style="min-width: 120rpx;margin-right: 10rpx;">
+ <view class="form-item-label require" style="min-width: 140rpx;margin-right: 10rpx;">
降级等级
</view>
<view class="form-item-value flex ">
@@ -398,7 +415,7 @@
</view>
<view class="form-item"
v-if="form.status==='reduce'||form.status==='replace' || form.status==='lack'">
- <view class="form-item-label require">
+ <view class="form-item-label">
质检备注
</view>
<view class="form-item-value">
diff --git a/sub_pages/partner/delivery/delivery-supplier-detail.vue b/sub_pages/partner/delivery/delivery-supplier-detail.vue
index 827e0e0..21180c3 100644
--- a/sub_pages/partner/delivery/delivery-supplier-detail.vue
+++ b/sub_pages/partner/delivery/delivery-supplier-detail.vue
@@ -19,6 +19,9 @@
},
onLoad(options) {
this.query.supplierId = options.supplierId || ''
+ if(options.warehouseLocationCode){
+ this.query.warehouseLocationCode = options.warehouseLocationCode || ''
+ }
this.listApi = '/api/delivery/check/info/list'
@@ -88,7 +91,7 @@
<!-- 列表页面 -->
<view class="page-delivery">
<view class="p15" style="min-height: calc(100vh - 260rpx);">
- <view class="search-container m-t-12 flex">
+ <view class="search-container m-t-12 flex" v-if="!query.supplierId">
<view class="flex1 input">
<u-input placeholder="请输入供应商名称" v-model="query.supplierName">
<template slot="suffix">
diff --git a/sub_pages/partner/delivery/delivery.vue b/sub_pages/partner/delivery/delivery.vue
index 8471586..0cf2ab0 100644
--- a/sub_pages/partner/delivery/delivery.vue
+++ b/sub_pages/partner/delivery/delivery.vue
@@ -92,8 +92,9 @@
},
toDetail(item) {
uni.navigateTo({
- url: `/sub_pages/partner/delivery/delivery-supplier-detail?supplierId=${item.id}&range=` + (this
- .selecttoday ? 'today' : '')
+ url: `/sub_pages/partner/delivery/delivery-supplier-detail?warehouseLocationCode=${this.query.warehouseLocationCode||''}&supplierId=${item.id}&range=` +
+ (this
+ .selecttoday ? 'today' : '')
})
},
async compelete(item) {
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue b/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue
index 47c3886..3356cb1 100644
--- a/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue
+++ b/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue
@@ -13,6 +13,12 @@
async onLoad(options) {
this.orderItemId = options.orderItemId || ''
this.op = options.op || ''
+ this.opStr = options.opStr || ''
+ if (this.opStr) {
+ uni.setNavigationBarTitle({
+ title: opStr
+ })
+ }
await this.init()
@@ -56,7 +62,7 @@
<template>
<view class="delivery-detail-page bg-white p20">
<no-data v-if="!dto.id" style="width: 100%;"></no-data>
-
+
<view v-if="dto.id">
<view class="delivery-info p10 flex">
<view class="flex1">
@@ -70,7 +76,7 @@
<view class="name" v-if="dto.targetLevel">降级等级：{{ dto.targetLevelStr || dto.targetLevel || '-'}}
</view>
- <view class="name" v-if="dto.type">处理类型：{{ dto.type || '-'}}</view>
+ <!-- <view class="name" v-if="dto.type">处理类型：{{ dto.type || '-'}}</view> -->
<view class="name">处理数量：{{ dto.num || '-' }}</view>
<view class="name">扣款金额：{{ dto.deductAmount || '-'}}</view>
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement.vue b/sub_pages/supplier/order-manage/order-manage-settlement.vue
index be2c2cd..9b8293a 100644
--- a/sub_pages/supplier/order-manage/order-manage-settlement.vue
+++ b/sub_pages/supplier/order-manage/order-manage-settlement.vue
@@ -125,11 +125,15 @@
</view>
</view>
</view> -->
- <view class="component-buttons m-t-10" style="width: unset;">
- <view class="button-1 m-auto" @click.stop="toOpDetail('sale',item)">售后详情</view>
- <view class="button-1 m-auto" @click.stop="toOpDetail('reduce',item)">降级详情</view>
- <view class="button-1 m-auto" @click.stop="toOpDetail('lack',item)">缺货详情</view>
- <view class="button-1 m-auto" @click.stop="toOpDetail('replace',item)">补货详情</view>
+ <view class="component-buttons m-t-15" style="width: unset;">
+ <view class="button-1 m-l-a m-r-10" v-if="!(item.salesNum===0)" @click.stop="toOpDetail('sale','售后',item)">
+ 售后详情</view>
+ <view class="button-1 m-l-a m-r-10" v-if="item.checkNum"
+ @click.stop="toOpDetail('reduce','降级',item)">降级详情</view>
+ <view class="button-1 m-l-a m-r-10" v-if="item.lackNum" @click.stop="toOpDetail('lack','缺货',item)">
+ 缺货详情</view>
+ <view class="button-1 m-l-a m-r-10" v-if="item.replaceNum"
+ @click.stop="toOpDetail('replace','补货',item)">补货详情</view>
</view>
</view>
@@ -179,15 +183,16 @@
uni.stopPullDownRefresh()
},
methods: {
- toOpDetail(op, item) {
+ toOpDetail(op, title, item) {
if (op === 'sale') {
//去列表页面
uni.navigateTo({
url: '/pages/order/order-sale/order-sale?orderItemId=' + item.orderItemId
})
} else {
+ var opStr = ''
uni.navigateTo({
- url: `/sub_pages/supplier/order-manage/order-manage-settlement-op-detail?op=${op}&orderItemId=${item.orderItemId}`
+ url: `/sub_pages/supplier/order-manage/order-manage-settlement-op-detail?opStr=${opStr}&op=${op}&orderItemId=${item.orderItemId}`
})
}
--
Gitblit v1.9.3