Merge branch 'master' into feature/tsjb-1.0

src/views/data/ComplaintCollection.vue

@@ -166,6 +166,13 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="录入时间">
+              <date-time-range-picker-ext
+                  v-model="query.createTimeList"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6"
                   v-if="    query.sourceTableList?.length === 1 &&    String(query.sourceTableList[0]) === '23'">
             <el-form-item label="信件状态">
@@ -262,7 +269,13 @@
           </template>
         </el-table-column>
 
-
+        <el-table-column
+            label="录入时间"
+            width="170"
+            prop="createTime"
+            :formatter="(_, __, v) => v ? timeFormat(v, 'yyyy-mm-dd hh:MM:ss') : '/'"
+            show-overflow-tooltip
+        />
         <el-table-column label="是否领导批示" width="130" v-if="false">
           <template #default="{ row }">
             {{ getDictLabel(dict.yesNo, row.leadApproval) }}

src/views/work/Query.vue

@@ -333,10 +333,10 @@
                                 placeholder="涉及人员"
                                 v-model="query.blameValue"
                                 clearable
-                                style="width: 190px"
+                                style="width: 150px"
                             />
                         </div>
-                        <div style="width: 200px">
+                        <div style="width: 120px">
                           <el-select
                               placeholder="处理结果"
                               v-model="query.handleResultCode"
@@ -352,6 +352,21 @@
                             />
                           </el-select>
                         </div>
+                      <div style="width: 145px">
+                        <el-select
+                            placeholder="审批超时"
+                            clearable
+                            collapse-tags
+                            collapse-tags-tooltip
+                            multiple
+                            v-model="query.approvalTimeoutStatus"
+                        >
+                          <el-option label="市局审批超时" value="city_timeout" />
+                          <el-option label="市局审批未超时" value="city_normal" />
+                          <el-option label="分局审批超时" value="branch_timeout" />
+                          <el-option label="分局审批未超时" value="branch_normal" />
+                        </el-select>
+                      </div>
                     </div>
                 </div>
                 <div class="form-row flex">
@@ -680,6 +695,24 @@
                       align="center"
                       show-overflow-tooltip
                   />
+<!--                    <el-table-column-->
+<!--                        label="二级审批时长"-->
+<!--                        width="120"-->
+<!--                        align="center"-->
+<!--                    >-->
+<!--                        <template #default="{ row }">-->
+<!--                            <span>{{ formatTimeText(row.secondApprovalTime) }}</span>-->
+<!--                        </template>-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column-->
+<!--                        label="市局审批时长"-->
+<!--                        width="120"-->
+<!--                        align="center"-->
+<!--                    >-->
+<!--                        <template #default="{ row }">-->
+<!--                            <span>{{ formatTimeText(row.firstApproveTime) }}</span>-->
+<!--                        </template>-->
+<!--                    </el-table-column>-->
                     <el-table-column label="操作" width="160">
                         <template #default="{ row }">
                             <div class="flex v-center">