From cb78b4fbcd31bbee7ed7882c7b5f6f660f20c511 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 20 十月 2025 09:56:19 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/components/business/OperaJkSketchLineListWindow.vue | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/admin/src/components/business/OperaJkSketchLineListWindow.vue b/admin/src/components/business/OperaJkSketchLineListWindow.vue
index 276d2a3..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"
@@ -22,8 +22,38 @@
</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>
@@ -75,7 +105,8 @@
// 琛ㄥ崟鏁版嵁
model: {
},
- dataList: []
+ dataList: [],
+ dataListNew: []
}
},
created () {
@@ -90,14 +121,26 @@
this.visible = true
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
})
},
+ loadListNew () {
+ this.api.allList({
+ sketchId: this.model.id,
+ type: 1
+ }).then(res => {
+ this.dataListNew = res
+ })
+ },
initDistance () {
var that = this
initOriginDistance({
--
Gitblit v1.9.3