From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
admin/src/components/business/OperaJkSketchLineListWindow.vue | 89 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 11 deletions(-)
diff --git a/admin/src/components/business/OperaJkSketchLineListWindow.vue b/admin/src/components/business/OperaJkSketchLineListWindow.vue
index f5861cf..c1e0e32 100644
--- a/admin/src/components/business/OperaJkSketchLineListWindow.vue
+++ b/admin/src/components/business/OperaJkSketchLineListWindow.vue
@@ -1,7 +1,7 @@
<template>
<GlobalWindow
:title="title"
- width="85%"
+ width="100%"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="confirm"
@@ -14,9 +14,46 @@
<div style="flex: 1">瀹㈡埛鏁帮細{{model.orderNum ||'-'}}</div>
<div style="flex: 1">閫佽揣閲�(鏉�)锛歿{model.totalNum ||'-'}}</div>
</div>
+ <div style="display: flex;margin-top: 20px" class="orange">
+ <div style="flex: 1" >绾胯矾鍘熷鎬昏矾绋嬶細
+ <span v-if="(model.originDistance ||0) > 0 || (model.status||0) != 0" class="red" style="font-weight: bold"> {{((model.originDistance ||0)/1000).toFixed(2)}}</span>
+ <span v-if="(model.originDistance ||0) == 0 && (model.status||0) == 0" class="blue" style="font-weight: bold;cursor: pointer" @click="initDistance"> 鐐瑰嚮鑾峰彇 </span> 鍏噷锛�
+ <span v-if="model.status ==2">浼樺寲鍚庢�昏矾绋�:<span class="green" style="font-weight: bold"> {{((model.distance ||0)/1000).toFixed(2)}} </span> 鍏噷</span>
+ </div>
+ </div>
+ </div>
+ <div style="display: block;margin-bottom: 50px;" v-if="model && model.optStatus ===1">
+ <div style="display: block;font-size: 16px;font-weight: 600;margin-bottom: 10px;">浼樺寲绾胯矾鏄庣粏</div>
+ <div>
+ <el-table :data="dataListNew" stripe>
+ <el-table-column prop="dateInfo" label="閫佽揣鏃ユ湡" min-width="130px"></el-table-column>
+ <el-table-column prop="lineName" label="閫佽揣绾胯矾" min-width="130px"> </el-table-column>
+ <el-table-column prop="orderNum" label="瀹㈡埛鏁�(鎴�)" min-width="130px"></el-table-column>
+ <el-table-column prop="totalNum" label="閫佽揣閲�(鏉�)" min-width="130px"></el-table-column>
+ <el-table-column prop="carCode" label="杞︾墝鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="memberName" label="閫佽揣鍙告満" min-width="100px"></el-table-column>
+ <el-table-column prop="distance" label="褰撳墠璺▼(鍏噷)" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.distance "> {{((row.distance ||0)/1000).toFixed(2)}}</span>
+ <span v-else> - </span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ min-width="160"
+ align="center"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.operaJkSketchCustomerWindow.open('绾胯矾瀹㈡埛鏄庣粏鈥斺��', row)" icon="el-icon-view" >鏌ョ湅瀹㈡埛</el-button>
+ <el-button type="text" @click="$refs.operaJkSketchLineMapWindow.open('绾胯矾瀹㈡埛浜ら�氳矾绾库�斺��', row)" icon="el-icon-view" >浜ら�氳矾绾�</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
</div>
<div style="display: block">
- <div style="display: block;font-size: 16px;font-weight: 600;margin-bottom: 10px;">绾胯矾鏄庣粏</div>
+ <div style="display: block;font-size: 16px;font-weight: 600;margin-bottom: 10px;">鍘熷绾胯矾鏄庣粏</div>
<div>
<el-table :data="dataList" stripe>
<el-table-column prop="dateInfo" label="閫佽揣鏃ユ湡" min-width="130px"></el-table-column>
@@ -25,19 +62,21 @@
<el-table-column prop="totalNum" label="閫佽揣閲�(鏉�)" min-width="130px"></el-table-column>
<el-table-column prop="carCode" label="杞︾墝鍙�" min-width="100px"></el-table-column>
<el-table-column prop="memberName" label="閫佽揣鍙告満" min-width="100px"></el-table-column>
- <el-table-column prop="distance" label="鎬昏矾绋�(鍏噷)" min-width="100px">
+ <el-table-column prop="distance" label="褰撳墠璺▼(鍏噷)" min-width="100px">
<template slot-scope="{row}">
- {{((row.distance ||0)/1000).toFixed(2)}}
+ <span v-if="row.distance "> {{((row.distance ||0)/1000).toFixed(2)}}</span>
+ <span v-else> - </span>
</template>
</el-table-column>
<el-table-column
label="鎿嶄綔"
- min-width="120"
+ min-width="160"
align="center"
fixed="right"
>
<template slot-scope="{row}">
<el-button type="text" @click="$refs.operaJkSketchCustomerWindow.open('绾胯矾瀹㈡埛鏄庣粏鈥斺��', row)" icon="el-icon-view" >鏌ョ湅瀹㈡埛</el-button>
+ <el-button type="text" @click="$refs.operaJkSketchLineMapWindow.open('绾胯矾瀹㈡埛浜ら�氳矾绾库�斺��', row)" icon="el-icon-view" >浜ら�氳矾绾�</el-button>
</template>
</el-table-column>
</el-table>
@@ -47,6 +86,7 @@
<el-button @click="visible=false">杩斿洖</el-button>
</template>
<OperaJkSketchCustomerWindow ref="operaJkSketchCustomerWindow" />
+ <OperaJkSketchLineMapWindow ref="operaJkSketchLineMapWindow" />
</GlobalWindow>
</template>
@@ -54,16 +94,19 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import OperaJkSketchCustomerWindow from '@/components/business/OperaJkSketchCustomerWindow'
+import OperaJkSketchLineMapWindow from '@/components/business/OperaJkSketchLineMapWindow'
+import { initOriginDistance } from '@/api/business/jkSketch'
export default {
name: 'OperaJkSketchLineWindow',
extends: BaseOpera,
- components: { GlobalWindow, OperaJkSketchCustomerWindow},
+ components: { GlobalWindow, OperaJkSketchCustomerWindow ,OperaJkSketchLineMapWindow},
data () {
return {
// 琛ㄥ崟鏁版嵁
model: {
},
- dataList:[]
+ dataList: [],
+ dataListNew: []
}
},
created () {
@@ -72,21 +115,45 @@
'field.id': 'id'
})
},
- methods:{
+ methods: {
open (title, target) {
this.title = title
this.visible = true
- this.model= target
+ this.model = target
this.loadList()
+ if(this.model.optStatus === 1){
+ this.loadListNew()
+ }
},
loadList () {
this.api.allList({
- sketchId: this.model.id
+ sketchId: this.model.id,
+ type: 0
}).then(res => {
this.dataList = res
})
},
- viewCustomer(row){
+ loadListNew () {
+ this.api.allList({
+ sketchId: this.model.id,
+ type: 1
+ }).then(res => {
+ this.dataListNew = res
+ })
+ },
+ initDistance () {
+ var that = this
+ initOriginDistance({
+ id: this.model.id
+ }).then(res => {
+ if(res){
+ that.model.originDistance = res.originDistance
+ that.model.distance = res.distance
+ that.loadList()
+ }
+ })
+ },
+ viewCustomer (row) {
}
}
--
Gitblit v1.9.3