From 01901d3efc4649d95144a367d608cdcd2fe357b2 Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Wed, 30 Oct 2024 20:37:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=A1=BE=E9=97=AE=E4=BF=AE=E6=94=B9=E9=85=8D=E4=BB=B6=E5=94=AE?= =?UTF-8?q?=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockOperate/Components/WaresItem.vue | 35 +++++ .../tickets/Components/TicketWaresShow.vue | 137 ++++++++++++------ 2 files changed, 129 insertions(+), 43 deletions(-) diff --git a/src/views/repair/stockOperate/Components/WaresItem.vue b/src/views/repair/stockOperate/Components/WaresItem.vue index 5008948..5e77f93 100644 --- a/src/views/repair/stockOperate/Components/WaresItem.vue +++ b/src/views/repair/stockOperate/Components/WaresItem.vue @@ -419,6 +419,12 @@ export default { // 提交 async handleSubmit() { try { + const isNull = this.validateNull(); + if (!isNull) return; + const names = this.validateZero() + if (names){ + await this.$modal.confirm("确认配件：" + names + "的采购价格为0吗？") + } await this.createInit() await createRepairSo(this.formData) this.inStockDialog = false @@ -457,6 +463,35 @@ export default { } })] }, + validateNull(){ + const flag = this.partList.map(item => { + const price = item.newPrice + if (price === null || price === ""){ + this.$modal.msgError("配件：" + item.name + "采购价格为空") + return false + }else { + return true + } + }) + let count = 0 + flag.forEach(item => { + if (!item){ + count++ + } + }) + return count === 0 + }, + validateZero(){ + const flag = this.partList.map(item => { + const price = parseFloat(item.newPrice) + if (price === 0){ + return item.name + }else { + return "" + } + }) + return flag.filter(item => item !== "").join(",") + } } } diff --git a/src/views/repair/tickets/Components/TicketWaresShow.vue b/src/views/repair/tickets/Components/TicketWaresShow.vue index a65565d..02ad1d8 100644 --- a/src/views/repair/tickets/Components/TicketWaresShow.vue +++ b/src/views/repair/tickets/Components/TicketWaresShow.vue @@ -123,13 +123,16 @@
- + - + - + @@ -151,42 +154,53 @@ {{ scope.$index + 1 }} - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + +
+ + {{ scope.row.wares.price }} +
+
+ {{ scope.row.wares.price }} +
+ + + + + + +
{{ scope.row.itemDiscount === 1 ? "无折扣" : scope.row.itemDiscount }}
- +
-
+
通 过 驳 回
@@ -199,18 +213,19 @@ import {getTicketsById} from "@/api/repair/tickets/Tickets"; import {auditTicketWares} from "@/api/repair/tickets/TicketWares"; import {listTwItem, updateIsShow} from "@/api/repair/tickets/TWItem"; import DiscountInput from "@/views/repair/tickets/Components/DiscountInput.vue"; +import item from "@/layout/components/Sidebar/Item.vue"; export default { name: "TicketWaresShow", components: {DiscountInput}, - props:{ + props: { userRole: String, type: Boolean }, - data(){ - return{ - info:{}, - items:[], + data() { + return { + info: {}, + items: [], dialogVisible: false, queryParams: { twId: null, @@ -221,12 +236,12 @@ export default { loading: false, formData: {}, clickCellMap: {}, - editProp: [], + editProp: ['wares.price'], } }, - methods:{ - async open(row){ - if (row){ + methods: { + async open(row) { + if (row) { this.formData = row const res = await getTicketsById(row.ticketId) this.info = res.data @@ -236,7 +251,7 @@ export default { } this.dialogVisible = true }, - async getTwItem(){ + async getTwItem() { try { this.loading = true const res = await listTwItem(this.queryParams) @@ -247,29 +262,35 @@ export default { itemDiscount: 1, } })] - }finally { + } finally { this.loading = false } }, - handleQuery(){ + handleQuery() { this.getTwItem() }, - resetQuery(){ + resetQuery() { this.resetForm('queryForm') this.handleQuery() }, - async changeIsShow(row){ + async changeIsShow(row) { try { this.loading = true await updateIsShow({id: row.id, isShow: row.isShow}) await this.getTwItem() - }finally { + } finally { this.loading = false } }, // 审核 - async handleAudit(flag){ + async handleAudit(flag) { try { + const isNull = this.validateNull(); + if (!isNull) return; + const names = this.validateZero() + if (names){ + await this.$modal.confirm("确认配件：" + names + "的销售价格为0吗？") + } this.formData['status'] = flag ? "02" : '05' // 处理配件信息 this.formData.wares = [...this.items.map(item => { @@ -292,7 +313,7 @@ export default { this.dialogVisible = false this.$modal.msgSuccess("审核成功") this.$emit('success') - }catch { + } catch { } @@ -342,7 +363,7 @@ export default { }, /** 保存数据 */ save(row) { - if (row.itemDiscount <= 0 || row.itemDiscount > 10){ + if (row.itemDiscount <= 0 || row.itemDiscount > 10) { row.itemDiscount = 10 this.$modal.msgError("折扣只能是1-10") } @@ -353,6 +374,35 @@ export default { }) this.clickCellMap[id] = [] }, + validateNull(){ + const flag = this.items.map(item => { + const price = item.wares.price + if (price === null || price === ""){ + this.$modal.msgError("配件：" + item.waresName + "销售价格为空") + return false + }else { + return true + } + }) + let count = 0 + flag.forEach(item => { + if (!item){ + count++ + } + }) + return count === 0 + }, + validateZero(){ + const flag = this.items.map(item => { + const price = parseFloat(item.wares.price) + if (price === 0){ + return item.waresName + }else { + return "" + } + }) + return flag.filter(item => item !== "").join(",") + } } } @@ -361,6 +411,7 @@ export default { .box-card { margin-bottom: 10px; } + .item { .item__input { display: none; From f987ffa0a97128f6627706890282cc27a100c7cd Mon Sep 17 00:00:00 2001 From: 13405411873 <1994398261@qq.com> Date: Thu, 31 Oct 2024 11:50:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.prod | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.prod b/.env.prod index 4b5b164..521930e 100644 --- a/.env.prod +++ b/.env.prod @@ -28,6 +28,7 @@ VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab # 大屏设计器服务 VUE_APP_BIG_SCREEN_SERVER = 'http://127.0.0.1:3000' +VUE_APP_IMAGE_URL = 'http://122.51.230.86:9000/' #小程序推广码前缀 VUE_APP_REPAIR_PREX = 'https://www.lighting-it.cn/share?inviteId='