From a5180d05f368f6fec57f9df3373e025aa03d467d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=85=BE?= <3467447354@qq.com>
Date: Thu, 29 Aug 2024 15:31:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/etl/task/taskInfo.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/etl/task/taskInfo.vue b/src/views/etl/task/taskInfo.vue
index 46a5ab6..b15d200 100644
--- a/src/views/etl/task/taskInfo.vue
+++ b/src/views/etl/task/taskInfo.vue
@@ -57,6 +57,7 @@
 <script>
 import { Graph } from "@antv/x6";
 import {extractDataName} from "../../../api/etl/etl";
+import {selectHandleClick} from "../../../api/property/property";
 export default {
   name: "antvX6",
   data() {
@@ -97,9 +98,9 @@ export default {
     },
     getDatabaseMessage(){
         this.dialogVisible = true
-        extractDataName().then(response => {
-            this.tables = response.data
-        })
+      selectHandleClick().then(res =>{
+         this.tables = res.data
+      })
     },
     //todo 鼠标划过节点在显示连接桩
     nodeAddEvent() {

From d54e9908b902376d6f4bd818d4c9294004812e91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=85=BE?= <3467447354@qq.com>
Date: Thu, 29 Aug 2024 16:27:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/property/property.js    | 7 +++++++
 src/views/etl/task/taskInfo.vue | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/api/property/property.js b/src/api/property/property.js
index 79b8a66..5e9c77a 100644
--- a/src/api/property/property.js
+++ b/src/api/property/property.js
@@ -47,3 +47,10 @@ export function selectHandleClick(data) {
     data: data
   })
 }
+
+export function extractDataName() {
+  return request({
+    url: '/property/dataRunName/extractDataName',
+    method: 'post',
+  })
+}
diff --git a/src/views/etl/task/taskInfo.vue b/src/views/etl/task/taskInfo.vue
index b15d200..fca9c14 100644
--- a/src/views/etl/task/taskInfo.vue
+++ b/src/views/etl/task/taskInfo.vue
@@ -57,7 +57,7 @@
 <script>
 import { Graph } from "@antv/x6";
 import {extractDataName} from "../../../api/etl/etl";
-import {selectHandleClick} from "../../../api/property/property";
+
 export default {
   name: "antvX6",
   data() {
@@ -98,8 +98,8 @@ export default {
     },
     getDatabaseMessage(){
         this.dialogVisible = true
-      selectHandleClick().then(res =>{
-         this.tables = res.data
+      extractDataName().then(res => {
+        this.tables = res.data
       })
     },
     //todo 鼠标划过节点在显示连接桩

From 0d078797e5f25241e31432128b356cd60dab33f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=AC=A3=E6=82=A6?= <2289014031@qq.com>
Date: Thu, 29 Aug 2024 17:16:50 +0800
Subject: [PATCH 3/3] ok

---
 src/views/market/orders/index.vue | 72 +++++++++++++++++++++----------
 vue.config.js                     |  2 +-
 2 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/src/views/market/orders/index.vue b/src/views/market/orders/index.vue
index 98d63a6..27436ad 100644
--- a/src/views/market/orders/index.vue
+++ b/src/views/market/orders/index.vue
@@ -6,24 +6,30 @@
         <el-button style="float: right; padding: 3px 30px" type="text" @click="findShop">查询结果</el-button>
         <el-button style="float: right; padding: 3px 10px" type="text" @click="chong">重置</el-button>
       </div>
+
       <div class="text item">
         <el-form ref="form" :model="orders" label-width="100px">
           <el-form-item>
-            输入搜索：<el-input v-model="orders.productName" placeholder="商品名称" style="width: 180px;margin-right: 50px"></el-input>
-            订单编号：<el-input v-model="orders.ordersNum" placeholder="编号" style="width: 180px;margin-right: 50px"></el-input>
-            <el-col :span="8">
-              <el-date-picker v-model="orders.startDate" type="date" placeholder="选择开始时间"></el-date-picker>
-              <el-col :span="8">
-              <el-date-picker v-model="orders.endDate" type="date" placeholder="选择结束时间"></el-date-picker>
-            </el-col>
-            订单款项状态：<el-select v-model="orders.ordersState" placeholder="请选择状态" style="margin-right: 30px" clearable>
-            <el-option v-for="item in orders.ordersState" :label="item.label" :value="item.value" :key="item.value"></el-option>
-          </el-select>
-          </el-form-item>
+            输入搜索： <el-input v-model="orders.productName" placeholder="商品名称" style="width: 180px;margin-right: 50px"></el-input>
+            订单编号： <el-input v-model="orders.ordersNum" placeholder="编号" style="width: 180px;margin-right: 50px"></el-input>
+            订单款项状态：
+            <el-select v-model="orders.ordersState" placeholder="请选择状态" style="margin-right: 30px" clearable>
+              <el-option v-for="item in options"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+            <br/> <br/>
+            选择时间:
+            <el-date-picker v-model="orders.startDate" type="date" placeholder="开始时间" />
+            -----
+            <el-date-picker v-model="orders.endDate" type="date" placeholder="结束时间"/>
+           </el-form-item>
         </el-form>
       </div>
     </el-card>
-
+.
 
     <el-card class="box-card" style="width: 94%;transform: translateX(3%);margin-top: 10px">
       <div slot="header" class="clearfix">
@@ -127,10 +133,31 @@ export default {
       },
       arr:[],
       type:[],
+
       Cascader:{ expandTrigger:'hover',value:'id',label:'typeName',children:'parentPOS' },
       typeId:[],
       startDate: null,
       endDate: null,
+
+      options: [{
+        value: ' ',
+        label: '全选'
+      }, {
+        value: '0',
+        label: '待支付'
+      }, {
+        value: '1',
+        label: '已付款'
+      }, {
+        value: '2',
+        label: '未付款'
+      }, {
+        value: '3',
+        label: '售后中(申请退款) '
+      } ,{
+        value: '4',
+        label: '已退款 '
+      }]
     };
   },
   //计算属性 类似于data概念",
@@ -140,7 +167,6 @@ export default {
   //方法集合",
   methods: {
 
-    },
     // 删除
     handleDelete(orders){
       handleDelete(orders.id).then(
@@ -190,26 +216,28 @@ export default {
   },
     // 添加跳转路径
     add(){
-      this.$router.push('index')
+      this.$router.push('add')
     },
     // 多选框
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
     //商品列表
-  selectList(){
+    selectList() {
     selectList(this.orders).then(
-        res => {
-          console.log(res)
-          this.arr=res.data.list
-          this.orders.total=res.data.total
-        }
-      )
+      res => {
+        console.log(res)
+        this.arr = res.data.list
+        this.orders.total = res.data.total
+      }
+    )
+  }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {
     // this.diGui()
-    this.selectList()
+      this.selectList()
+      this.selected = this.options[0].value
   },
   //生命周期 - 挂载完成（可以访问DOM元素）",
   mounted() {
diff --git a/vue.config.js b/vue.config.js
index 24fa436..6ab44f3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://21.12.0.10/prod-api/`,
+        target: `http: //21.12.0.10/prod-api/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''