From 60fe45241676cd6e7d5ea95bdbc95e775b398ddc Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 3 Mar 2025 11:03:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E8=B0=83=E4=BB=A4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/component/dispatchList.vue | 10 ++++----
 src/views/order/component/quickCreate.vue  | 28 +++++++++++++---------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/views/order/component/dispatchList.vue b/src/views/order/component/dispatchList.vue
index cd3df0d..192832a 100644
--- a/src/views/order/component/dispatchList.vue
+++ b/src/views/order/component/dispatchList.vue
@@ -140,11 +140,11 @@ export default {
             op: "eq",
             value: ""
           },
-          // {
-          //   key: "status",
-          //   op: "eq",
-          //   value: 1
-          // }
+          {
+            key: "status",
+            op: "eq",
+            value: 1
+          }
         ]
       },
       total: 0,
diff --git a/src/views/order/component/quickCreate.vue b/src/views/order/component/quickCreate.vue
index 09f07eb..d979947 100644
--- a/src/views/order/component/quickCreate.vue
+++ b/src/views/order/component/quickCreate.vue
@@ -102,13 +102,16 @@ export default {
           align: 'center',
           key: 'start_time',
           render: (h,{ row }) => {
-            return h('DatePicker',{
+            return h('el-date-picker',{
+              style: {
+                width: '100%'
+              },
               props: {
                 value: row.start_time,
                 type: 'datetime',
-                size: 'small',
+                size: 'mini',
                 transfer: true,
-                format: "yyyy-MM-dd HH:mm:ss"
+                'value-format': "yyyy-MM-dd HH:mm:ss"
               },
               on: {
                 ['on-change']:e => row.start_time = e
@@ -122,13 +125,16 @@ export default {
           align: 'center',
           key: 'end_time',
           render: (h,{ row }) => {
-            return h('DatePicker',{
+            return h('el-date-picker',{
+              style: {
+                width: '100%'
+              },
               props: {
                 value: row.end_time,
                 type: 'datetime',
-                size: 'small',
+                size: 'mini',
                 transfer: true,
-                format: "yyyy-MM-dd HH:mm:ss"
+                'value-format': "yyyy-MM-dd HH:mm:ss"
               },
               on: {
                 ['on-change']:e => row.end_time = e
@@ -254,7 +260,7 @@ export default {
       data: [],
       showModal: false,
       bindValue: '',
-      bindDate: new Date()
+      bindDate: this.$moment().format('YYYY-MM-DD'),
     }
   },
   methods: {
@@ -302,11 +308,12 @@ export default {
       group.forEach((item,index) => {
         let dataArr = item.split(/\s+/);
         if (dataArr.length === 8 && this.equipments.find(i => i.name === dataArr[0]) && (this.isTimeFormat(dataArr[1]) && this.isTimeFormat(dataArr[2]))) {
+          console.log(33,  this.bindDate,`${this.bindDate} ${dataArr[1]}`)
           this.data.push({
             no: uid,
             equipment_id: this.equipments.find(i => i.name === dataArr[0])?.id,
-            start_time: `${this.bindDate} ${dataArr[1]}`,
-            end_time: `${this.bindDate} ${dataArr[2]}`,
+            start_time: this.$moment(`${this.bindDate} ${dataArr[1]}`).format('YYYY-MM-DD HH:mm:ss'),
+            end_time: this.$moment(`${this.bindDate} ${dataArr[2]}`).format('YYYY-MM-DD HH:mm:ss'),
             content: dataArr[3] ?? '',
             kaiqishuliang: dataArr[4] ?? 0,
             kaiqishuliang1: dataArr[5] ?? 0,
@@ -316,6 +323,7 @@ export default {
             status: 1
           })
         }
+        console.log(this.data)
       })
       // this.$prompt('请输入内容','快速调令', {
       //   confirmButtonText: '确定',
@@ -356,8 +364,6 @@ export default {
         return save({
           table_name: 'transfers',
           ...form,
-          start_time: form.start_time,
-          end_time: form.end_time,
         },false)
       })
       let loadingInstance = this.$loading({