From bc62a77b72f8a55c6d4541172c21d8430ee3649f Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 8 May 2024 14:07:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dexport=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/productComponent/addProduct.vue |  2 +-
 .../productComponent/editProduct.vue          |  4 ++--
 .../productComponent/productDetailModal.vue   |  2 +-
 src/views/HomeView.vue                        |  2 +-
 src/views/childView/exportExcil.vue           | 11 ++++++-----
 .../childView/exportExcil/userManage.vue      |  6 +++---
 src/views/childView/labelManage.vue           | 16 ++++++++--------
 src/views/childView/productDetail.vue         | 19 ++++++++++++++++++-
 src/views/childView/productManage.vue         | 10 +++++-----
 src/views/childView/storeManage.vue           |  6 +++---
 .../childView/systemSetting/roleManage.vue    |  4 ++--
 .../childView/systemSetting/userManage.vue    |  6 +++---
 12 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/src/component/productComponent/addProduct.vue b/src/component/productComponent/addProduct.vue
index 2af1bc0..c990067 100644
--- a/src/component/productComponent/addProduct.vue
+++ b/src/component/productComponent/addProduct.vue
@@ -28,7 +28,7 @@
                         </div>
                     </div>
                 </a-form-item>  
-                <a-form-item label="Label attributes" name="productLabel">
+                <a-form-item label="Fashion Attributes" name="productLabel">
                     <a-select v-model:value="formState.productLabel" mode="multiple" size="large"  optionFilterProp="label" :options="productLabelList" showArrow></a-select>
                 </a-form-item>
                  <!-- <a-form-item label="Price" name="price">
diff --git a/src/component/productComponent/editProduct.vue b/src/component/productComponent/editProduct.vue
index 18c2860..5d62ee7 100644
--- a/src/component/productComponent/editProduct.vue
+++ b/src/component/productComponent/editProduct.vue
@@ -5,7 +5,7 @@
             :destroyOnClose="true"
             v-model:visible="editProductModal" 
             :footer="null" 
-            title="Eidt Product"
+            title="Edit Product"
             width="900px"
             :maskClosable="false"
             :centered="true"
@@ -92,7 +92,7 @@
                 </div>
 
                 <div class="form_item_block">
-                    <div class="form_item_module_title">Label attributes</div>
+                    <div class="form_item_module_title">Fashion Attributes</div>
                     <a-form-item label="Select category" name="productCategory">
                         <a-select v-model:value="formState.productCategory" size="large" :options="productCategoryList" placeholder="Please select" @change="productCategoryChange" :getPopupContainer="(triggerNode) => getPopupContainer(triggerNode)" optionFilterProp="label"></a-select>
                     </a-form-item>
diff --git a/src/component/productComponent/productDetailModal.vue b/src/component/productComponent/productDetailModal.vue
index a1a32bf..3c8a3bc 100644
--- a/src/component/productComponent/productDetailModal.vue
+++ b/src/component/productComponent/productDetailModal.vue
@@ -58,7 +58,7 @@
                 <div class="detail_item_block">
                     <div class="detail_item_title_block">
                         <span class="icon iconfont icon-a-gengduocaidangongneng detail_icon"></span>
-                        <div>Label attributes</div>
+                        <div>Fashion Attributes</div>
                     </div>
                     <div class="detail_item_sec_title">类目</div>
                     <div class="detail_item_content">
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index f158f94..8c9b9fb 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -268,7 +268,7 @@ export default defineComponent({
             
             .menu_title{
                 font-size: 18px;
-                font-family: Adobe Heiti Std;
+                // font-family: Adobe Heiti Std;
                 font-weight: normal;
                 color: #808185;
             }
diff --git a/src/views/childView/exportExcil.vue b/src/views/childView/exportExcil.vue
index 9424a45..bcee81f 100644
--- a/src/views/childView/exportExcil.vue
+++ b/src/views/childView/exportExcil.vue
@@ -68,11 +68,11 @@ export default defineComponent({
         let tableLoading = ref(false)
         let columns = reactive([
             { title: 'Name', align:'center', ellipsis: true,  dataIndex: 'exportName', key: 'exportName', width:350 },
-            { title: 'Time', align:'center', ellipsis: true,  dataIndex: 'dataTime', key: 'dataTime', width:350},
+            { title: 'Data Time', align:'center', ellipsis: true,  dataIndex: 'dataTime', key: 'dataTime', width:350},
             // { title: 'Create Time', align:'center', ellipsis: true,  dataIndex: 'createTime', key: 'createTime'},
             { title: 'Type', align:'center', ellipsis: true,  dataIndex: 'span', key: 'span'},
             {
-                title: 'Operations',
+                title: 'Actions',
                 key: 'operation',
                 align:'center', 
                 fixed: 'right',
@@ -97,14 +97,13 @@ export default defineComponent({
         }
 
         let getExportList = () =>{
-
             let data = {
                 page:currentPage.value,
                 size:pageSize.value,
 				fileName:filter.name,
 				span:filter.type,
-				endTime:filter.date[1]?filter.date[1]:'',
-				startTime:filter.date[0]?filter.date[0]:'',
+				endTime:filter?.date?.[1]?filter.date[1]:'',
+				startTime:filter?.date?.[0]?filter.date[0]:'',
             }
             tableLoading.value = true
             Https.axiosPost(Https.httpUrls.miTuExportPage, data).then(
@@ -135,6 +134,8 @@ export default defineComponent({
         let resetList = () =>{
             currentPage.value = 1
             filter.name = ''
+            filter.type = ''
+            filter.date = []
             getExportList()
         }
 
diff --git a/src/views/childView/exportExcil/userManage.vue b/src/views/childView/exportExcil/userManage.vue
index 238d9f1..7b91287 100644
--- a/src/views/childView/exportExcil/userManage.vue
+++ b/src/views/childView/exportExcil/userManage.vue
@@ -12,7 +12,7 @@
                         <filterComponent :title="'User State'">
                             <a-select v-model:value="state" size="large" style="width:280px" placeholder="Please select" :options="userStateList" allowClear></a-select>
                         </filterComponent>
-                        <filterComponent :title="'Add Time'"><a-range-picker v-model:value="addTime" size="large" :placeholder="['Start Time', 'End Time']" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"/></filterComponent>
+                        <filterComponent :title="'Date'"><a-range-picker v-model:value="addTime" size="large" :placeholder="['Start Time', 'End Time']" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"/></filterComponent>
                     </div>
                 </div>
                 <div class="list_top_button_content">
@@ -176,7 +176,7 @@ export default defineComponent({
             { title: 'Activated', align:'center', ellipsis: true,  dataIndex: 'appUserName', key: 'appUserName' },
             { title: 'User State', align:'center', ellipsis: true,  dataIndex: 'stateName', key: 'stateName' },
             {
-                title: 'Operations',
+                title: 'Actions',
                 key: 'operation',
                 align:'center', 
                 fixed: 'right',
@@ -279,7 +279,7 @@ export default defineComponent({
 
         let editUser = (data:any,) =>{
             editUserModal.value = true
-            editUserTitle.value = 'Eidt user'
+            editUserTitle.value = 'Edit user'
             formState.value = {
                 id: data.id,
                 userName: data.userName,
diff --git a/src/views/childView/labelManage.vue b/src/views/childView/labelManage.vue
index e697098..cb07bd4 100644
--- a/src/views/childView/labelManage.vue
+++ b/src/views/childView/labelManage.vue
@@ -5,7 +5,7 @@
                 <div class="list_top_search_content">
                     <div class="search_content_left">
                         <filterComponent :title="'Label Name'"><a-input v-model:value="name" size="large" placeholder="Please input Label Name or Id" @keydown.enter="searchList"/></filterComponent>
-                        <filterComponent :title="'Label attributes'">
+                        <filterComponent :title="'Fashion Attributes'">
                             <a-select
                                 v-model:value="type"
                                 size="large"
@@ -15,7 +15,7 @@
                                 allowClear
                                 ></a-select>
                         </filterComponent>
-                        <filterComponent :title="'Add Time'"><a-range-picker v-model:value="addTime" size="large" :placeholder="['Start Time', 'End Time']" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"/></filterComponent>
+                        <filterComponent :title="'Date'"><a-range-picker v-model:value="addTime" size="large" :placeholder="['Start Time', 'End Time']" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"/></filterComponent>
                     </div>
                 </div>
                 <div class="list_top_button_content">
@@ -62,8 +62,8 @@
                 <a-form-item label="Label Name" name="name">
                     <a-input v-model:value="formState.name" size="large" placeholder="Please input label name" />
                 </a-form-item>
-                <a-form-item label="Label attributes" name="type">
-                    <a-select v-model:value="formState.type" size="large" :options="labelTypeList" placeholder="Please select label attributes"></a-select>
+                <a-form-item label="Fashion Attributes" name="type">
+                    <a-select v-model:value="formState.type" size="large" :options="labelTypeList" placeholder="Please select Fashion Attributes"></a-select>
                 </a-form-item>
                 <a-form-item label="Remarks" name="remarks">
                     <a-input v-model:value="formState.remarks" size="large" placeholder="Please input remarks"/>
@@ -108,7 +108,7 @@ export default defineComponent({
         }
         let columns = reactive([
             { title: 'Label Name', align:'center', ellipsis: true,  dataIndex: 'name', key: 'name' },
-            { title: 'Label attributes', align:'center', ellipsis: true,  dataIndex: 'type', key: 'type', customRender:(record:any)=>{
+            { title: 'Fashion Attributes', align:'center', ellipsis: true,  dataIndex: 'type', key: 'type', customRender:(record:any)=>{
                 let labelType = labelTypeData[record.text]
                 return labelType },
             },
@@ -120,7 +120,7 @@ export default defineComponent({
                 return time },
             },
             {
-                title: 'Operations',
+                title: 'Actions',
                 key: 'operation',
                 align:'center', 
                 fixed: 'right',
@@ -147,7 +147,7 @@ export default defineComponent({
                 { required: true, message: 'Please input label name', trigger: 'blur' },
             ],
             type: [
-                { required: true, message: 'Please select label attributes', trigger: 'blur' },
+                { required: true, message: 'Please select Fashion Attributes', trigger: 'blur' },
             ],
         })
 
@@ -174,7 +174,7 @@ export default defineComponent({
 
         let editLabel = (data:any,) =>{
             editLabelModal.value = true
-            editLabelTitle.value = 'Eidt Label'
+            editLabelTitle.value = 'Edit Label'
             formState.value = {
                 id: data.id,
                 name: data.name,
diff --git a/src/views/childView/productDetail.vue b/src/views/childView/productDetail.vue
index d576cf7..a89b344 100644
--- a/src/views/childView/productDetail.vue
+++ b/src/views/childView/productDetail.vue
@@ -50,9 +50,10 @@
                 <div class="detail_item_block">
                     <div class="detail_item_title_block">
                         <span class="icon iconfont icon-a-gengduocaidangongneng detail_icon"></span>
-                        <div>Label attributes</div>
+                        <div>Fashion Attributes</div>
                     </div>
                     <div class="detail_item_content">
+                        <div class="detail_item_sec_title red_muts">Category</div>
                         <div class="productCategory_block">{{formState.productCategory}}</div>
                     </div>
 
@@ -306,6 +307,7 @@ export default defineComponent({
                 font-weight: normal;
                 color: #030303;
                 margin-bottom: 10px;
+				
             }
 
             .detail_item_content{
@@ -335,6 +337,7 @@ export default defineComponent({
                 color: #030303;
                 height: 46px;
                 border: 1px solid #DFDFDF;
+				
             }
 
             .detail_item_sec_title{
@@ -344,6 +347,20 @@ export default defineComponent({
                 font-weight: normal;
                 color: #030303;
                 margin-bottom: 10px;
+				&.red_muts{
+					padding-left: 28px;
+				}
+				// &.red_muts::before{
+				// 	color: red;
+				// 	margin-right: 5px;
+				// 	display: inline-block;
+				// 	margin-right: 4px;
+				// 	color: #ff4d4f;
+				// 	font-size: 14px;
+				// 	font-family: SimSun, sans-serif;
+				// 	line-height: 1;
+				// 	content: '*';
+				// }
             }
 
             .sec_title_margin{
diff --git a/src/views/childView/productManage.vue b/src/views/childView/productManage.vue
index 86361ac..50c6896 100644
--- a/src/views/childView/productManage.vue
+++ b/src/views/childView/productManage.vue
@@ -13,10 +13,10 @@
                         <filterComponent :title="'On Sale State'">
                             <a-select v-model:value="onSaleState" size="large" style="width:280px" :options="onSaleStateList" placeholder="Please select" allowClear optionFilterProp="label" show-search></a-select>
                         </filterComponent>
-                        <filterComponent :title="'Label attributes'">
+                        <filterComponent :title="'Fashion Attributes'">
                             <a-select v-model:value="labelTypeMap" size="large" style="width:280px" :options="labelTypeList" placeholder="Please select" allowClear @change="labelTypeChange" optionFilterProp="label" show-search></a-select>
                         </filterComponent>
-                        <filterComponent :title="'Add Time'"><a-range-picker v-model:value="addTime" size="large" :placeholder="['Start Time', 'End Time']" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"/></filterComponent>
+                        <filterComponent :title="'Date'"><a-range-picker v-model:value="addTime" size="large" :placeholder="['Start Time', 'End Time']" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"/></filterComponent>
                         <filterComponent :title="'Store'">
                             <a-select v-model:value="storeIds" size="large" style="width:280px" :options="shopList" placeholder="Please select" allowClear optionFilterProp="label" show-search></a-select>
                         </filterComponent>
@@ -75,8 +75,8 @@
                         </template>
                         <template v-if="column.dataIndex === 'operation'">
                             <div class="operate_list">
+                                <div class="operate_item" @click="toProductDteail(record)"  v-if="operatePermission.DETAIL">Details</div>
                                 <div class="operate_item" @click="editProduct(record)"  v-if="operatePermission.EDIT">Edit</div>
-                                <div class="operate_item" @click="toProductDteail(record)"  v-if="operatePermission.DETAIL">Detail</div>
                                 <div class="operate_item" @click="deleteProduct(record,index)"  v-if="operatePermission.DELETE">Delete</div>
                             </div>
                         </template>
@@ -144,7 +144,7 @@ export default defineComponent({
             { title: 'Product Pic', align:'center', ellipsis: true,  dataIndex: 'pictureUrl', key: 'pictureUrl' },
             { title: 'Product Label', align:'center',  dataIndex: 'productLabel', key: 'productLabel'},
             { title: 'Category', align:'center', ellipsis: true,  dataIndex: 'labelItem', key: 'labelItem'},
-            { title: 'Label attributes', align:'center',  dataIndex: 'labelType', key: 'labelType'},
+            { title: 'Fashion Attributes', align:'center',  dataIndex: 'labelType', key: 'labelType'},
             { title: 'Shop', align:'center',  dataIndex: 'shop', key: 'shop' },
             { title: 'Inventory', align:'center', ellipsis: true,  dataIndex: 'total', key: 'total', sorter:()=>{},
                 sortOrder: sorted.columnKey === 'total' && sorted.order,
@@ -163,7 +163,7 @@ export default defineComponent({
             },
             { title: 'On Sale State', align:'center', ellipsis: true,  dataIndex: 'onSaleState', key: 'onSaleState' },
             {
-                title: 'Operations',
+                title: 'Actions',
                 key: 'operation',
                 align:'center', 
                 fixed: 'right',
diff --git a/src/views/childView/storeManage.vue b/src/views/childView/storeManage.vue
index 350f40a..8b76116 100644
--- a/src/views/childView/storeManage.vue
+++ b/src/views/childView/storeManage.vue
@@ -51,7 +51,7 @@
                 <a-form-item label="Store Name" name="name">
                     <a-input v-model:value="formState.name" size="large" placeholder="Please input store name"/>
                 </a-form-item>
-                <a-form-item label="Store Adress" name="address">
+                <a-form-item label="Adress" name="address">
                     <a-input v-model:value="formState.address" size="large" placeholder="Please select"/>
                 </a-form-item>
                 <a-form-item label="Remarks" name="remarks">
@@ -94,7 +94,7 @@ export default defineComponent({
                 return time },
             },
             {
-                title: 'Operations',
+                title: 'Actions',
                 key: 'operation',
                 align:'center', 
                 fixed: 'right',
@@ -149,7 +149,7 @@ export default defineComponent({
 
         let editStore = (data:any,) =>{
             editStoreModal.value = true
-            editStoreTitle.value = 'Eidt Store'
+            editStoreTitle.value = 'Edit Store'
             formState.value = {
                 id: data.id,
                 name: data.name,
diff --git a/src/views/childView/systemSetting/roleManage.vue b/src/views/childView/systemSetting/roleManage.vue
index 034d15d..caeec17 100644
--- a/src/views/childView/systemSetting/roleManage.vue
+++ b/src/views/childView/systemSetting/roleManage.vue
@@ -105,7 +105,7 @@ export default defineComponent({
             { title: 'Role Name', align:'center', ellipsis: true,  dataIndex: 'name', key: 'name', width:250 },
             { title: 'Role Permission', align:'center', ellipsis: true,  dataIndex: 'permission', key: 'permission'},
             {
-                title: 'Operations',
+                title: 'Actions',
                 key: 'operation',
                 align:'center', 
                 fixed: 'right',
@@ -160,7 +160,7 @@ export default defineComponent({
 
         let editRole = (data:any,) =>{
             editRoleModal.value = true
-            editRoleTitle.value = 'Eidt Role'
+            editRoleTitle.value = 'Edit Role'
             formState.value = {
                 id: data.id,
                 name: data.name,
diff --git a/src/views/childView/systemSetting/userManage.vue b/src/views/childView/systemSetting/userManage.vue
index 68db2a6..973b721 100644
--- a/src/views/childView/systemSetting/userManage.vue
+++ b/src/views/childView/systemSetting/userManage.vue
@@ -12,7 +12,7 @@
                         <filterComponent :title="'User State'">
                             <a-select v-model:value="state" size="large" style="width:280px" placeholder="Please select" :options="userStateList" allowClear></a-select>
                         </filterComponent>
-                        <filterComponent :title="'Add Time'"><a-range-picker v-model:value="addTime" size="large" :placeholder="['Start Time', 'End Time']" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"/></filterComponent>
+                        <filterComponent :title="'Date'"><a-range-picker v-model:value="addTime" size="large" :placeholder="['Start Time', 'End Time']" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"/></filterComponent>
                     </div>
                 </div>
                 <div class="list_top_button_content">
@@ -177,7 +177,7 @@ export default defineComponent({
             { title: 'Activated', align:'center', ellipsis: true,  dataIndex: 'appUserName', key: 'appUserName' },
             { title: 'User State', align:'center', ellipsis: true,  dataIndex: 'stateName', key: 'stateName' },
             {
-                title: 'Operations',
+                title: 'Actions',
                 key: 'operation',
                 align:'center', 
                 fixed: 'right',
@@ -259,7 +259,7 @@ export default defineComponent({
 
         let editUser = (data:any,) =>{
             editUserModal.value = true
-            editUserTitle.value = 'Eidt user'
+            editUserTitle.value = 'Edit user'
             formState.value = {
                 id: data.id,
                 userName: data.userName,