Merge remote-tracking branch 'origin/master'

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

@@ -450,13 +450,14 @@ export default {
       this.queryParam.searchEndTime = null
       if (no != null) {
         this.queryParam.no = no
+      this.$refs.table.refresh(true)
       } else {
         // 等 a-select 同步清空后，再恢复默认部门，避免标签删不掉
         this.$nextTick(() => {
           this.queryParam.deptIdList = [this.$store.getters.userInfo.deptId]
+      this.$refs.table.refresh(true)
         })
       }
-      this.$refs.table.refresh(true)
     },
     doExport() {
       const parameter = {

src/views/repair/application-form/modules/DetailRepair.vue

@@ -135,7 +135,7 @@
           <a-divider v-if="dispatchList != null" orientation="left">派工记录</a-divider>
           <detail-list v-for="(item, index) in dispatchList" title="" :key="index" :col="3">
             <detail-list-item term="派工人">{{ item.operatorName }}</detail-list-item>
-            <detail-list-item term="派工时间">{{ item.time }}</detail-list-item>
+            <detail-list-item term="派工时间">{{ BaseTool.Date.formatter(item.time, 'YYYY-MM-DD HH:mm:ss') }}</detail-list-item>
             <detail-list-item term="派工备注">{{ item.remark }}</detail-list-item>
             <detail-list-item v-if="item.approverName" term="派工对象">{{ item.username }}</detail-list-item>
           </detail-list>
@@ -143,14 +143,14 @@
           <a-divider v-if="transferList != null" orientation="left">转派记录</a-divider>
           <detail-list v-for="(item, index) in transferList" title="" :key="index" :col="4">
             <detail-list-item term="转派人">{{ item.operatorName }}</detail-list-item>
-            <detail-list-item term="转派时间">{{ item.time }}</detail-list-item>
+            <detail-list-item term="转派时间">{{ BaseTool.Date.formatter(item.time, 'YYYY-MM-DD HH:mm:ss') }}</detail-list-item>
             <detail-list-item term="转派备注">{{ item.remark }}</detail-list-item>
             <detail-list-item term="转派对象">{{ item.username }}</detail-list-item>
             <detail-list-item term="审批状态" v-if="item.type === 'transfer'">
               <badge :text="getTransferStatusText(item.status)" :status="getTransferBadgeStatus(item.status)" />
             </detail-list-item>
             <detail-list-item v-if="item.approverName" term="审批人">{{ item.approverName }}</detail-list-item>
-            <detail-list-item v-if="item.approveTime" term="审批时间">{{ item.approveTime }}</detail-list-item>
+            <detail-list-item v-if="item.approveTime" term="审批时间">{{ BaseTool.Date.formatter(item.approveTime, 'YYYY-MM-DD HH:mm:ss') }}</detail-list-item>
             <detail-list-item v-if="item.approveRemark" term="审批意见">{{ item.approveRemark }}</detail-list-item>
           </detail-list>
           <div v-if="transferList == null || transferList.length === 0" style="margin-bottom: 16px; color: #999;">暂无转派记录</div>