From 2a32e53e45eef72bb37409b0694e4b5c2b1587af Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 23 十月 2025 15:12:26 +0800
Subject: [PATCH] 页面

---
 admin/src/components/business/OperaJkSketchLineListWindow.vue |   61 +++++++++++++++++++++++++++---
 1 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/admin/src/components/business/OperaJkSketchLineListWindow.vue b/admin/src/components/business/OperaJkSketchLineListWindow.vue
index 41d89d8..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"
@@ -17,13 +17,43 @@
       <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.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>
@@ -40,12 +70,13 @@
           </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>
@@ -55,6 +86,7 @@
       <el-button @click="visible=false">杩斿洖</el-button>
     </template>
     <OperaJkSketchCustomerWindow ref="operaJkSketchCustomerWindow"  />
+    <OperaJkSketchLineMapWindow ref="operaJkSketchLineMapWindow"  />
   </GlobalWindow>
 </template>
 
@@ -62,17 +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 () {
@@ -87,12 +121,24 @@
       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 () {
@@ -103,6 +149,7 @@
         if(res){
           that.model.originDistance = res.originDistance
           that.model.distance = res.distance
+          that.loadList()
         }
       })
     },

--
Gitblit v1.9.3