From 31c934ffa51796508fb4d16ad2b135636a085905 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 12 十二月 2024 10:59:57 +0800
Subject: [PATCH] 1、计划与非计划管理页面查询区域日期选择器改为日期范围选择器 2、新增零件加工管理页面及完成相关功能

---
 src/views/mdc/base/modules/MdcUnplannedCloseManagement/MdcUnplannedCloseList.vue |   39 ++++++++++++++++++++++++---------------
 1 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/views/mdc/base/modules/MdcUnplannedCloseManagement/MdcUnplannedCloseList.vue b/src/views/mdc/base/modules/MdcUnplannedCloseManagement/MdcUnplannedCloseList.vue
index 5d6ea0a..0626f74 100644
--- a/src/views/mdc/base/modules/MdcUnplannedCloseManagement/MdcUnplannedCloseList.vue
+++ b/src/views/mdc/base/modules/MdcUnplannedCloseManagement/MdcUnplannedCloseList.vue
@@ -17,8 +17,7 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="鏃ユ湡">
-              <a-date-picker v-model="queryParam.theDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-                             style="width: 100%"></a-date-picker>
+              <a-range-picker v-model="dates" style="width: 100%" @change="dateParamChange"></a-range-picker>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -35,8 +34,8 @@
     <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
-      <a-button type="primary" icon="download" @click="importTemplate('璁″垝鍋滄満妯℃澘')">瀵煎叆妯℃澘</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('璁″垝鍋滄満绠＄悊')">瀵煎嚭</a-button>
+      <a-button type="primary" icon="download" @click="importTemplate('闈炶鍒掑仠鏈烘ā鏉�')">瀵煎叆妯℃澘</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('闈炶鍒掑仠鏈虹鐞�')">瀵煎嚭</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
                 @change="handleImportExcel">
         <a-button type="primary" icon="import">瀵煎叆</a-button>
@@ -70,7 +69,6 @@
         :pagination="ipagination"
         :loading="loading"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
         @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
@@ -100,22 +98,21 @@
 </template>
 
 <script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
+  import moment from 'moment'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import MdcUnplannedCloseModal from './MdcUnplannedCloseModal'
 
   export default {
     name: 'MdcUnplannedCloseList',
-    mixins: [JeecgListMixin, mixinDevice],
+    mixins: [JeecgListMixin],
     components: {
       MdcUnplannedCloseModal
     },
     props: { nodeTree: '', Type: '', nodePeople: '' },
     data() {
       return {
-        description: 'mdcPlanClose绠＄悊椤甸潰',
+        description: 'mdcUnplannedClose绠＄悊椤甸潰',
+        disableMixinCreated: true,
         /* 鍒嗛〉鍙傛暟 */
         ipagination: {
           current: 1,
@@ -128,6 +125,7 @@
           showSizeChanger: true,
           total: 0
         },
+        dates: [moment().subtract(1, 'day'), moment()],
         queryParam: {
           closeType: 2
         },
@@ -231,20 +229,26 @@
       }
     },
     methods: {
+      dateParamChange(v1, v2) {
+        this.queryParam.startTime = v2[0]
+        this.queryParam.endTime = v2[1]
+        this.dates = [v1[0], v1[1]]
+      },
       importTemplate(fileName) {
         var a = document.createElement('a')
-        a.href = '/static/璁″垝鍋滄満绠＄悊.xls'
-        a.download = '璁″垝鍋滄満绠＄悊.xls'
+        a.href = '/static/闈炶鍒掑仠鏈虹鐞�.xls'
+        a.download = '闈炶鍒掑仠鏈虹鐞�.xls'
         a.style.display = 'none'
         document.body.appendChild(a)
         a.click()
         a.remove()
       },
-      initDictConfig() {
-      },
       searchReset() {
+        this.dates = [moment().subtract(1, 'day'), moment()]
         this.queryParam = {
-          closeType: 2
+          closeType: 2,
+          startTime: this.dates[0].format('YYYY-MM-DD'),
+          endTime: this.dates[1].format('YYYY-MM-DD')
         }
         this.loadData(1)
       },
@@ -257,6 +261,11 @@
         this.scrollY = boxHeight - tableHeadHeight - 50
       }
     },
+    created() {
+      this.queryParam.startTime = this.dates[0].format('YYYY-MM-DD')
+      this.queryParam.endTime = this.dates[1].format('YYYY-MM-DD')
+      this.loadData()
+    },
     mounted() {
       window.addEventListener('resize', this.handleWindowResize)
       this.handleWindowResize()

--
Gitblit v1.9.3