From b582f5c73bcd83ac4aeb598bf6d11f49633cf219 Mon Sep 17 00:00:00 2001
From: monanxiao <monanxiao@qq.com>
Date: Fri, 25 Oct 2024 17:58:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=90=8E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/order.js           |  2 +-
 src/views/goods/index.vue          |  3 +--
 src/views/order/index.vue          | 42 +++++++++++++++++++++++++++---
 src/views/scheduling/timeFrame.vue | 19 --------------
 4 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/src/api/modules/order.js b/src/api/modules/order.js
index 6dae9d3..4e7c03c 100644
--- a/src/api/modules/order.js
+++ b/src/api/modules/order.js
@@ -15,5 +15,5 @@ export function getOrderList(query) {
 export function exportOrder(query) {
 
     const urlParams = new URLSearchParams(query);
-    return `http://repair.cpolar.top/order/list/export?${urlParams.toString()}`;
+    return `https://api.cqcxj.cn/order/list/export?${urlParams.toString()}`;
 }
\ No newline at end of file
diff --git a/src/views/goods/index.vue b/src/views/goods/index.vue
index e5c164f..af09c61 100644
--- a/src/views/goods/index.vue
+++ b/src/views/goods/index.vue
@@ -112,7 +112,6 @@
 
             <el-image
                 :src="itemImg.url"
-                :preview-src-list="[itemImg.url]"
                 style="width:150px; height: 80px;margin-right: 5px;"
                 :style="{
                   boxShadow: `var(light)`,
@@ -127,7 +126,7 @@
           <el-image
               style="width: 300px; height: 200px"
             :src="scope.row.details"
-            :preview-src-list="[scope.row.details]"
+
           />
         </template>
 
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index a8ecef2..16c6ff5 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -429,7 +429,6 @@ const formSearch = ref({
   username: '',
   surveyorsName: '',
   repairerName: '',
-  date: '',
   month: '',
   year: '',
   day: '',
@@ -580,7 +579,7 @@ const excelDown = async () => {
         'Content-Type': 'application/json'
       }
     });
-
+      
     const blob = await response.blob();
     const downloadUrl = window.URL.createObjectURL(blob);
     const a = document.createElement('a');
@@ -602,22 +601,49 @@ const generateRandomNumber = () => {
 const  downloadFile = () => {
 
   let params = {...formSearch.value}
+  
   if(params.status !== ' ')
   {
     params.status = parseInt(params.status, 10);
+  }else{
+    delete params.status;
+  }
+  
+  if(params.year !== '')
+  {
+    let {
+      year
+    } = {...formatDate(params.year)};
+
+    params.year = year;
+  }else{
+    delete params.year;
   }
 
-  if(params.date !== '')
+  if(params.month !== '')
+  {
+    let {
+      month
+    } = {...formatDate(params.month)};
+
+    params.month = month;
+  }else{
+    delete params.month;
+  }
+  
+  if(params.day !== '')
   {
     let {
       year,
       month,
       day
-    } = {...formatDate(params.date)};
+    } = {...formatDate(params.day)};
 
     params.year = year;
     params.month = month;
     params.day = day;
+  }else{
+    delete params.day;
   }
 
   return exportOrder(params);
@@ -630,6 +656,8 @@ const onSearchSubmit = ()=> {
   if(params.status !== ' ')
   {
     params.status = parseInt(params.status, 10);
+  }else{
+    delete params.status;
   }
 
   if(params.year !== '')
@@ -639,6 +667,8 @@ const onSearchSubmit = ()=> {
     } = {...formatDate(params.year)};
 
     params.year = year;
+  }else{
+    delete params.year;
   }
 
   if(params.month !== '')
@@ -648,6 +678,8 @@ const onSearchSubmit = ()=> {
     } = {...formatDate(params.month)};
 
     params.month = month;
+  }else{
+    delete params.month;
   }
 
   if(params.day !== '')
@@ -661,6 +693,8 @@ const onSearchSubmit = ()=> {
     params.year = year;
     params.month = month;
     params.day = day;
+  }else{
+    delete params.day;
   }
 
   getOrderList(params).then((res) => {
diff --git a/src/views/scheduling/timeFrame.vue b/src/views/scheduling/timeFrame.vue
index 8865651..9fac3bd 100644
--- a/src/views/scheduling/timeFrame.vue
+++ b/src/views/scheduling/timeFrame.vue
@@ -40,14 +40,6 @@
             />
           </el-form-item>
 
-          <el-form-item label="状态">
-            <el-switch
-                v-model="formData.flag"
-                inline-prompt
-                active-text="启用"
-                inactive-text="禁用"
-            />
-          </el-form-item>
 
           <div style="display: flex;justify-content: center;margin-top: 50px">
             <el-button  @click="handleCancel">取消</el-button>
@@ -82,17 +74,6 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="状态" align="center">
-        <template #default="scope">
-          <el-switch
-              v-model="scope.row.flag"
-              inline-prompt
-              active-text="启用"
-              inactive-text="禁用"
-              @change="upStatus(scope.row)"
-          />
-        </template>
-      </el-table-column>
 
       <el-table-column label="操作" width="280px" align="center">
         <template v-slot:default="scope">