From 4898564fb2510dcdbe10d01eaa94886512aebc77 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 20 十一月 2025 16:55:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/categoryJkLine.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/business/categoryJkLine.vue b/admin/src/views/business/categoryJkLine.vue
index d66b9e8..2509850 100644
--- a/admin/src/views/business/categoryJkLine.vue
+++ b/admin/src/views/business/categoryJkLine.vue
@@ -43,8 +43,8 @@
>
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="$refs.OperaCategoryJkLineWindow.open('缂栬緫涓荤嚎璺�',row)" v-permissions="['business:category:update']">缂栬緫</el-button>
- <el-button type="text" icon="el-icon-edit" @click="distanceDo(row)" v-if="row.status !=2 && row.customerDoneNum < row.customerNum " v-permissions="['business:category:update']">浜ら�氳鍒�</el-button>
- <el-button type="text" icon="el-icon-edit" @click="distanceDo(row)" v-if="row.status ==2 " v-permissions="['business:category:update']">閲嶆柊瑙勫垝</el-button>
+ <el-button type="text" icon="el-icon-edit" @click="distanceDo(row,0)" v-if="row.status !=2 && row.customerDoneNum < row.customerNum " v-permissions="['business:category:update']">浜ら�氳鍒�</el-button>
+ <el-button type="text" icon="el-icon-edit" @click="distanceDo(row,1)" v-if="row.status !=2 && row.customerDoneNum === row.customerNum" v-permissions="['business:category:update']">閲嶆柊瑙勫垝</el-button>
<el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:category:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -90,14 +90,14 @@
this.search()
},
methods: {
- distanceDo (row) {
+ distanceDo (row,force) {
var that = this
this.$confirm('纭畾杩涜璇ヤ富绾胯矾涓嬪鎴疯窛绂昏绠楀悧?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- distanceCustomer({ categoryId: row.id })
+ distanceCustomer({ categoryId: row.id,forceUpdate: force })
.then(res => {
this.$tip.apiSuccess('浜ら�氳鍒掍换鍔℃鍦ㄥ悗鍙版墽琛岋紝鍙兘闇�瑕佷竴娈垫椂闂达紝璇风瓑寰呬换鍔″畬鎴愬悗鏌ョ湅缁撴灉')
that.search()
--
Gitblit v1.9.3