From 6acc1434f1fa008a40216376d90e0ab78cad741c Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 12 Sep 2024 14:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91=E6=98=9F?=
 =?UTF-8?q?=E6=98=9F=E6=9D=A1=E4=BB=B6=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../growingThroughLifeList.vue                | 44 ++++++++++++-------
 .../growingThroughLifeTask.vue                | 35 ++++++++++++---
 src/views/childView/productManage.vue         |  1 +
 vue.config.js                                 |  4 +-
 4 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/src/views/childView/growingThroughLife/growingThroughLifeList.vue b/src/views/childView/growingThroughLife/growingThroughLifeList.vue
index 0eb66b9..a1bfea0 100644
--- a/src/views/childView/growingThroughLife/growingThroughLifeList.vue
+++ b/src/views/childView/growingThroughLife/growingThroughLifeList.vue
@@ -12,8 +12,8 @@
                     <a-button class="default_button" size="large" @click="resetList()">Reset</a-button>
                 </div>
             </div>
-            <div class="list_table_content">
-                <a-table :columns="columns" :data-source="collectionList"  @change="changePage" :loading="tableLoading"
+            <div class="list_table_content" ref="tableParent">
+                <a-table :columns="columns" :data-source="collectionList" :scroll="{ y: tableHeight }" @change="changePage" :loading="tableLoading"
                     :pagination="{
                     showSizeChanger:true,
                     current: currentPage,
@@ -24,10 +24,9 @@
                     pageSizeOptions:['10','20','50'],
                 }">
                     <!-- <template v-slot:bodyCell="{column,record, index}" >
-                        <template v-if="column.dataIndex === 'operation'">
+                        <template v-if="column.key === 'ranking'">
                             <div class="operate_list">
-                                <div class="operate_item" @click="editLabel(record)">Edit</div>
-                                <div class="operate_item" @click="deleteLabel(record,index)">Delete</div>
+								{{ index+1 }}
                             </div>
                         </template>
                         
@@ -56,8 +55,11 @@ export default defineComponent({
         })
         let tableLoading = ref(false)
         let columns = reactive([
+            { title: 'Ranking', align:'center', ellipsis: true, dataIndex: 'ranking', key: 'ranking',sorter: {
+				compare: (a:any, b:any) => a.incentiveNum - b.incentiveNum,
+			}, },
             { title: 'Sales Name', align:'center', ellipsis: true,  dataIndex: 'salesmanName', key: 'salesmanName' },
-            { title: 'Target Value', align:'center', ellipsis: true,  dataIndex: 'incentiveNum', key: 'incentiveNum' },
+            { title: 'Target Value', align:'center', ellipsis: true,  dataIndex: 'incentiveNum', key: 'incentiveNum'},
             // { title: 'Add Time', align:'center', ellipsis: true,  dataIndex: 'createDate', key: 'createDate',customRender:(record:any)=>{
             //     let time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
             //     return time },
@@ -65,7 +67,7 @@ export default defineComponent({
         ])
         let collectionList = ref([])
         let currentPage = ref(1)
-        let pageSize = ref(10)
+        let pageSize = ref(50)
         let total = ref(1)
         let formRef = ref();
         let formState = ref({
@@ -74,11 +76,12 @@ export default defineComponent({
             type:[],
             remarks:'',
         });
-
+		let tableHeight = ref(0)
+		let tableParent:any = ref(null)
         let changePage = (e:any) =>{
-            currentPage.value = e.current
-            pageSize.value = e.pageSize
-            getLabelist()
+            // currentPage.value = e.current
+            // pageSize.value = e.pageSize
+            // getLabelist()
         }
         let getLabelist = () =>{
 			console.log(filter.addTime);
@@ -100,6 +103,9 @@ export default defineComponent({
                 (rv: any) => {
                     if (rv) {
                         tableLoading.value = false
+						rv.forEach((item:any,index:any) => {
+							item.ranking = index +1 
+						});
                         collectionList.value = rv
                         // total.value = rv.total
                     }
@@ -148,12 +154,15 @@ export default defineComponent({
         }
 
         onMounted(() => {
+			tableHeight.value = tableParent.value.clientHeight - 100
            getLabelist()
         })
         
   
         return {
             ...toRefs(filter),
+			tableHeight,
+			tableParent,
             tableLoading,
             columns,
             collectionList,
@@ -175,11 +184,16 @@ export default defineComponent({
 <style lang="less" scoped>
 .label_manage_page{
     padding-left: 28px;
-
+	.list_page_content{
+		display: flex;
+		flex-direction: column;
+		.list_table_content{
+			flex: 1;
+			overflow: hidden;
+		}
+	}
    .operate_list{
-       display: flex;
-       justify-content: space-between;
-
+		text-align: center;
        .operate_item{
             font-size: 14px;
             font-family: Roboto;
diff --git a/src/views/childView/growingThroughLife/growingThroughLifeTask.vue b/src/views/childView/growingThroughLife/growingThroughLifeTask.vue
index f55ed88..9d2c9f4 100644
--- a/src/views/childView/growingThroughLife/growingThroughLifeTask.vue
+++ b/src/views/childView/growingThroughLife/growingThroughLifeTask.vue
@@ -64,7 +64,7 @@
 				<a-row :gutter="[16,16]">
 					<a-col :span="12">
 						<a-form-item label="Task Name" name="taskName">
-							<a-input v-model:value="formState.taskName" size="large" placeholder="Please input task name" />
+							<a-input :disabled="true" v-model:value="formState.taskName" size="large" placeholder="Please input task name" />
 						</a-form-item>
 					</a-col>
 					<a-col :span="12">
@@ -73,6 +73,9 @@
 						</a-form-item>
 					</a-col>
 				</a-row>
+				<a-form-item label="Date" name="Date">
+					<a-range-picker v-model:value="formState.time" show-time size="large" style="width: 100%;" :placeholder="['Start Time', 'End Time']" format="YYYY-MM-DD hh:mm:ss" valueFormat="YYYY-MM-DD hh:mm:ss"/>
+				</a-form-item>
 				<a-form-item label="Description" name="description">
 					<a-textarea :disabled="true" style="max-height: 200px;" v-model:value="formState.description" />
 				</a-form-item>
@@ -94,7 +97,7 @@
 						</div>
 						<div class="taskConditionList-item">
 							<div>Condition Value:</div>
-							<a-input :disabled="true" v-model:value="item.conditionValue" size="large" placeholder="Please input total prices"/>
+							<a-input :disabled="!(isEdit.indexOf(item.id)>-1)" v-model:value="item.conditionValue" size="large" placeholder="Please input total prices"/>
 						</div>
 
 
@@ -133,6 +136,7 @@ import { message,Modal } from "ant-design-vue";
 import { WarningOutlined } from '@ant-design/icons-vue';
 import { Https } from "@/tool/https";
 import { formatTime, startTime, endTime } from "@/tool/util"
+import { Item } from "ant-design-vue/lib/menu";
 
 export default defineComponent({
     name:'taskManage',
@@ -143,6 +147,11 @@ export default defineComponent({
 			time:'',
             addTime:ref<Moment[]>([])
         })
+		let setTime = (startTime:any,endTime:any)=>{
+		    console.log(startTime,endTime);
+			return endTime
+		}
+		let isEdit = [3,4,5,7]
         let tableLoading = ref(false)
         let taskTypeList:any = ref([
             { value:'CUSTOM',task:'greater than'},
@@ -157,6 +166,16 @@ export default defineComponent({
                 // let time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
 				let time = record.text.split('T')[0]+' '+record.text.split('T')[1]
                 return time },
+            },
+			{ title: 'startTime', align:'center', ellipsis: true,  dataIndex: 'startTime', key: 'startTime',customRender:(record:any)=>{
+                // let time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
+				let time = record.text.split('T')[0]+' '+record.text.split('T')[1]
+                return time },
+            },
+			{ title: 'endTime', align:'center', ellipsis: true,  dataIndex: 'endTime', key: 'endTime',customRender:(record:any)=>{
+                // let time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
+				let time = record.text.split('T')[0]+' '+record.text.split('T')[1]
+                return time },
             },
             {
                 title: 'Actions',
@@ -181,11 +200,12 @@ export default defineComponent({
 			description:'',
 			taskConditionList:[],
 			targetValue:1,
+			time:[],
         });
         let rules = reactive({
-            taskName: [
-                { required: true, message: 'Please input task name', trigger: 'blur' },
-            ],
+            // taskName: [
+            //     { required: true, message: 'Please input task name', trigger: 'blur' },
+            // ],
 			targetValue: [
                 { required: true, message: 'Please enter the number of stars', trigger: 'blur' },
             ],
@@ -211,6 +231,7 @@ export default defineComponent({
 				taskName: '',
 				taskConditionList:[],
 				targetValue:0,
+				time:[],
             }
             editTaskModal.value = false
         }
@@ -229,6 +250,7 @@ export default defineComponent({
                 description: data.description,
 				targetValue:data.targetValue,
 				taskConditionList:data.taskConditionList,
+				time:[data.startTime.split('T')[0]+' '+data.startTime.split('T')[1],data.endTime.split('T')[0]+' '+data.endTime.split('T')[1]],
             }
         }
 
@@ -241,7 +263,6 @@ export default defineComponent({
 			Https.axiosPost(Https.httpUrls.salesIncentivesQueryPage, data).then(
                 (rv: any) => {
                     if (rv) {
-						console.log(rv);
                         tableLoading.value = false
                         collectionList.value = rv.content
                         total.value = rv.total
@@ -317,6 +338,8 @@ export default defineComponent({
   
         return {
             ...toRefs(filter),
+			isEdit,
+			setTime,
             tableLoading,
             taskTypeList,
             columns,
diff --git a/src/views/childView/productManage.vue b/src/views/childView/productManage.vue
index 71c3b38..db2cb27 100644
--- a/src/views/childView/productManage.vue
+++ b/src/views/childView/productManage.vue
@@ -157,6 +157,7 @@ export default defineComponent({
             { title: 'Inventory', align:'center', ellipsis: true,  dataIndex: 'total', key: 'total', sorter:()=>{},
                 sortOrder: sorted.columnKey === 'total' && sorted.order,
             },
+            { title: 'pluCode', align:'center',  dataIndex: 'pluCode', key: 'pluCode' },
             { title: 'price', align:'center', ellipsis: true,  dataIndex: 'price', key: 'price',customRender:(record:any)=>{
                 let newPrrice = '$' + record.text
                 return newPrrice }, 
diff --git a/vue.config.js b/vue.config.js
index b5906ed..a8e8456 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -9,8 +9,8 @@ module.exports = defineConfig({
     proxy: {
       "/api": {
         // target: 'http://18.167.251.121:5568', //后端接口地址
-        // target: 'http://192.168.1.9:5560/', //后端接口地址
-        target: 'http://18.167.251.121:10220/', //后端接口地址
+        target: 'http://192.168.1.9:5560/', //后端接口地址
+        // target: 'http://18.167.251.121:10220/', //后端接口地址
         changeOrigin: true, //是否允许跨越
       }
     },