feat(repair): 添加报修时间筛选条件及优化相关组件布局格式

- 在多个报修相关表单中新增查询参数 searchStartTime 和 searchEndTime
- 在查询条件中支持按报修起止时间进行筛选
- 统一调整日期选择器 a-date-picker 的换行和自闭合标签格式
- 优化表格 s-table 标签属性格式和插槽代码排版
- 在 RepairCheckForm 和 TransferApproval 组件中格式化日期并刷新表格数据
- 修正 input 和 select 组件中空格及冒号位置提高代码一致性
- 清理无效空格并统一方法定义样式提升代码规范性

src/views/repair/application-form/RepairApplicationForm.vue

@@ -152,7 +152,9 @@ export default {
       // 查询参数
       queryParam: {
         filter: this.filter,
-        searchType: this.searchType
+        searchType: this.searchType,
+        searchStartTime: null,
+        searchEndTime: null
       },
       visible: true,
       // 表头

src/views/repair/application-form/RepairCheckForm.vue

@@ -6,36 +6,33 @@
           <a-row :gutter="48">
             <a-col :md="6" :sm="24">
               <a-form-item label="关键字">
-                <a-input v-model="queryParam.keyword" placeholder="请输入设备名称/设备新号"/>
+                <a-input v-model="queryParam.keyword" placeholder="请输入设备名称/设备新号" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="设备旧号">
-                <a-input v-model="queryParam.zbh" placeholder="请输入设备旧号"/>
+                <a-input v-model="queryParam.zbh" placeholder="请输入设备旧号" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="报修人">
-                <a-input v-model="queryParam.actualUser" placeholder="请输入报修人"/>
+                <a-input v-model="queryParam.actualUser" placeholder="请输入报修人" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="维修人">
-                <a-input v-model="queryParam.repairUserName" placeholder="请输入维修人"/>
+                <a-input v-model="queryParam.repairUserName" placeholder="请输入维修人" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="问题描述">
-                <a-input v-model="queryParam.content" placeholder="问题描述模糊查询"/>
+                <a-input v-model="queryParam.content" placeholder="问题描述模糊查询" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="状态">
                 <a-select v-model="queryParam.status" placeholder="请选择">
-                  <a-select-option
-                    v-for="(label,value) in statusMap"
-                    :key="value"
-                    :label="label"
+                  <a-select-option v-for="(label, value) in statusMap" :key="value" :label="label"
                     :value="parseInt(value)">{{ label }}
                   </a-select-option>
                 </a-select>
@@ -43,20 +40,14 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="报修开始日期">
-                <a-date-picker
-                  v-model="queryParam.searchStartTime"
-                  style="width: 100%"
-                  :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
-                />
+                <a-date-picker v-model="queryParam.searchStartTime" style="width: 100%"
+                  :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="报修结束日期">
-                <a-date-picker
-                  v-model="queryParam.searchEndTime"
-                  style="width: 100%"
-                  :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
-                />
+                <a-date-picker v-model="queryParam.searchEndTime" style="width: 100%"
+                  :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" />
               </a-form-item>
             </a-col>
             <a-col :md="8 || 24" :sm="24">
@@ -72,44 +63,35 @@
       <div class="table-operator">
       </div>
 
-      <s-table
-        ref="table"
-        size="default"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-        :alert="options.alert"
-        :scroll="{x: 1000, y: BaseTool.Constant.scrollY }"
-        :rowSelection="options.rowSelection"
-        showPagination="auto"
-      >
+      <s-table ref="table" size="default" rowKey="id" :columns="columns" :data="loadData" :alert="options.alert"
+        :scroll="{ x: 1000, y: BaseTool.Constant.scrollY }" :rowSelection="options.rowSelection" showPagination="auto">
         <span slot="action" slot-scope="record">
           <template>
             <a @click="handleView(record)">查看</a>
 
             <operation-button
               v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status && $auth('repair-application-forms-edit')"
-              @click="handleEdit(record)" >修改</operation-button>
+              @click="handleEdit(record)">修改</operation-button>
             <operation-button
               v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status && $auth('repair-application-forms-del')"
-              :type="2"
-              title="是否要删除该条数据？"
-              @confirm="batchDelete(record.id)">删除</operation-button>
+              :type="2" title="是否要删除该条数据？" @confirm="batchDelete(record.id)">删除</operation-button>
             <!--<operation-button
               v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status && $auth('repair-application-forms-dispatch')"
               @click="handleDispatching(record)" >派工</operation-button>-->
           </template>
         </span>
         <span slot="status" slot-scope="text">
-          <badge :text="BaseTool.Object.getField(statusMap,text)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[text]"/>
+          <badge :text="BaseTool.Object.getField(statusMap, text)"
+            :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[text]" />
         </span>
         <span slot="level" slot-scope="text">
-          <badge :text="BaseTool.Object.getField(levelMap,text)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[text]"/>
+          <badge :text="BaseTool.Object.getField(levelMap, text)"
+            :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[text]" />
         </span>
       </s-table>
     </div>
-    <base-form ref="baseModal" @ok="handleOk"/>
-    <detailCheck ref="detailCheckModal" @ok="handleOk"/>
+    <base-form ref="baseModal" @ok="handleOk" />
+    <detailCheck ref="detailCheckModal" @ok="handleOk" />
     <dispatch-base-form ref="dispatchBaseForm" @ok="handleOk" />
   </a-card>
 </template>
@@ -130,12 +112,14 @@ export default {
     DetailCheck,
     DispatchBaseForm
   },
-  data () {
+  data() {
     return {
       // 查询参数
       queryParam: {
         filter: 0,
-        searchType: 3
+        searchType: 3,
+        searchStartTime: '',
+        searchEndTime: ''
       },
       visible: true,
       // 表头
@@ -300,7 +284,7 @@ export default {
       optionAlertShow: false
     }
   },
-  created () {
+  created() {
     // 下拉框map
     this.sourceMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_SOURCE)
     this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_LEVEL)
@@ -315,7 +299,7 @@ export default {
     this.tableOption()
   },
   methods: {
-    tableOption () {
+    tableOption() {
       if (!this.optionAlertShow) {
         this.options = {
           alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
@@ -339,7 +323,7 @@ export default {
         this.optionAlertShow = false
       }
     },
-    batchDelete (id) {
+    batchDelete(id) {
       let ids = []
       if (this.BaseTool.String.isBlank(id)) {
         const length = this.selectedRows.length
@@ -357,35 +341,35 @@ export default {
         this.$refs.table.clearSelected()
       })
     },
-    handleEdit (record) {
+    handleEdit(record) {
       fetchRepairApplicationForm({ id: record.id }).then(res => {
         const modal = this.$refs.baseModal
         modal.base(res.data)
       })
     },
-    handleView (record) {
+    handleView(record) {
       fetchRepairApplicationForm({ id: record.id }).then(res => {
         this.visible = false
         const modal = this.$refs.detailCheckModal
         modal.base(res.data)
       })
     },
-    handleOk () {
+    handleOk() {
       this.visible = true
       this.queryParam.searchStartTime = this.queryParam.searchStartTime ? this.BaseTool.Date.formatter(this.queryParam.searchStartTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN) : null
       this.queryParam.searchEndTime = this.queryParam.searchEndTime ? this.BaseTool.Date.formatter(this.queryParam.searchEndTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN) : null
       this.$refs.table.refresh()
     },
-    onSelectChange (selectedRowKeys, selectedRows) {
+    onSelectChange(selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows
     },
-    resetSearchForm () {
+    resetSearchForm() {
       this.queryParam = {
       }
       this.$refs.table.refresh(true)
     },
-    doExport () {
+    doExport() {
       const parameter = {
         ...this.queryParam
       }
@@ -393,7 +377,7 @@ export default {
         this.BaseTool.UPLOAD.downLoadExportExcel(file)
       })
     },
-    handleDispatching (record) {
+    handleDispatching(record) {
       const modal = this.$refs.dispatchBaseForm
       modal.base(record)
     }

src/views/repair/application-form/RepairForm.vue

@@ -167,7 +167,9 @@ export default {
       queryParam: {
         filter: this.filter,
         searchType: this.searchType,
-        deptId: this.$store.getters.userInfo.deptId
+        deptId: this.$store.getters.userInfo.deptId,
+        searchStartTime: null,
+        searchEndTime: null
       },
       visible: true,
       // 表头

src/views/repair/application-form/TransferApproval.vue

@@ -5,25 +5,19 @@
         <a-row :gutter="48">
           <a-col :md="6" :sm="24">
             <a-form-item label="关键字">
-              <a-input v-model="queryParam.keyword" placeholder="设备名称/编号/问题描述"/>
+              <a-input v-model="queryParam.keyword" placeholder="设备名称/编号/问题描述" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="报修起始日期">
-              <a-date-picker
-                v-model="queryParam.searchStartTime"
-                style="width: 100%"
-                :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
-              />
+              <a-date-picker v-model="queryParam.searchStartTime" style="width: 100%"
+                :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="报修结束日期">
-              <a-date-picker
-                v-model="queryParam.searchEndTime"
-                style="width: 100%"
-                :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
-              />
+              <a-date-picker v-model="queryParam.searchEndTime" style="width: 100%"
+                :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN" />
             </a-form-item>
           </a-col>
           <a-col :md="8 || 24" :sm="24">
@@ -36,15 +30,8 @@
       </a-form>
     </div>
 
-    <s-table
-      ref="table"
-      size="default"
-      rowKey="id"
-      :columns="columns"
-      :data="loadData"
-      :scroll="{x: 1000, y: BaseTool.Constant.scrollY }"
-      showPagination="auto"
-    >
+    <s-table ref="table" size="default" rowKey="id" :columns="columns" :data="loadData"
+      :scroll="{ x: 1000, y: BaseTool.Constant.scrollY }" showPagination="auto">
       <span slot="action" slot-scope="record">
         <template>
           <a @click="handleView(record)">查看</a>
@@ -57,12 +44,13 @@
         </template>
       </span>
       <span slot="status" slot-scope="text">
-        <badge :text="BaseTool.Object.getField(statusMap,text)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[text]"/>
+        <badge :text="BaseTool.Object.getField(statusMap, text)"
+          :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[text]" />
       </span>
     </s-table>
 
-    <detail ref="detailModal" @ok="handleOk"/>
-    <transfer-approve-form ref="approveForm" @ok="handleOk"/>
+    <detail ref="detailModal" @ok="handleOk" />
+    <transfer-approve-form ref="approveForm" @ok="handleOk" />
   </a-card>
 </template>
 
@@ -80,10 +68,12 @@ export default {
     Detail,
     TransferApproveForm
   },
-  data () {
+  data() {
     return {
       queryParam: {
-        status: 8
+        status: 8,
+        searchStartTime: null,
+        searchEndTime: null
       },
       statusMap: {},
       columns: [
@@ -158,31 +148,33 @@ export default {
       }
     }
   },
-  created () {
+  created() {
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_STATUS)
   },
   methods: {
-    handleOk () {
+    handleOk() {
+      this.queryParam.searchStartTime = this.queryParam.searchStartTime ? this.BaseTool.Date.formatter(this.queryParam.searchStartTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN) : null
+      this.queryParam.searchEndTime = this.queryParam.searchEndTime ? this.BaseTool.Date.formatter(this.queryParam.searchEndTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN) : null
       this.$refs.table.refresh()
     },
-    resetSearchForm () {
+    resetSearchForm() {
       this.queryParam = { status: 8 }
       this.$refs.table.refresh()
     },
-    handleView (record) {
+    handleView(record) {
       fetchRepairApplicationForm({ id: record.id }).then(res => {
         const modal = this.$refs.detailModal
         modal.base(res.data)
       })
     },
-    handleApprove (record) {
+    handleApprove(record) {
       transferApprove({ id: record.id, repairDispatchRemark: '审批通过' })
         .then(() => {
           this.$message.success('转派审批通过')
           this.handleOk()
         })
     },
-    handleReject (record) {
+    handleReject(record) {
       const modal = this.$refs.approveForm
       modal.base(record, 'reject')
     }