Bladeren bron

feat(assistant): 在资质等级描述中添加部门名称显示

feat(item): 添加流程状态和开机指令查询及表单字段
huoyi 1 week geleden
bovenliggende
commit
27d10b4867
2 gewijzigde bestanden met toevoegingen van 39 en 5 verwijderingen
  1. 4 3
      src/views/assistant/components/dutyOrganization.vue
  2. 35 2
      src/views/item/record/index.vue

+ 4 - 3
src/views/assistant/components/dutyOrganization.vue

@@ -175,9 +175,10 @@ const qualificationPieDescriptionPart1 = computed(() => {
175
 
175
 
176
   // 3. 计算占比
176
   // 3. 计算占比
177
   const highestPercentage = totalCount > 0 ? ((highestLevel.count / totalCount) * 100).toFixed(2) : '0.0'
177
   const highestPercentage = totalCount > 0 ? ((highestLevel.count / totalCount) * 100).toFixed(2) : '0.0'
178
-
178
+  let deptName = attendanceData.value && attendanceData.value.length > 0 ? attendanceData.value[attendanceData.value.length -
179
+    1]?.deptName : ''
179
   // 4. 生成第一部分描述文字
180
   // 4. 生成第一部分描述文字
180
-  return `全站资质等级以"${highestLevel.levelName || '一级'}"为主(占比为${highestPercentage}%)`
181
+  return `${deptName}资质等级以"${highestLevel.levelName || '一级'}"为主(占比为${highestPercentage}%)`
181
 })
182
 })
182
 
183
 
183
 // 计算属性:动态生成资质等级分布描述第二部分(句号后)
184
 // 计算属性:动态生成资质等级分布描述第二部分(句号后)
@@ -273,7 +274,7 @@ const fetchDutyOrganizationData = async (queryParams) => {
273
     const { deptType = "", id } = selectedDept ? selectedDept : { deptType: "", id: "" }
274
     const { deptType = "", id } = selectedDept ? selectedDept : { deptType: "", id: "" }
274
 
275
 
275
     let calculateParams = {
276
     let calculateParams = {
276
-      ...(['TEAMS', 'DEPARTMENT','BRIGADE'].includes(deptType) ? { deptId: id } : {}),
277
+      ...(['TEAMS', 'DEPARTMENT', 'BRIGADE'].includes(deptType) ? { deptId: id } : {}),
277
       ...(deptType == 'USER' ? { userId: id } : {})
278
       ...(deptType == 'USER' ? { userId: id } : {})
278
     }
279
     }
279
     // 获取出勤人次分析数据
280
     // 获取出勤人次分析数据

+ 35 - 2
src/views/item/record/index.vue

@@ -23,6 +23,19 @@
23
         <el-input v-model="queryParams.inspectTeamName" placeholder="请输入查获班组" clearable @keyup.enter="handleQuery" />
23
         <el-input v-model="queryParams.inspectTeamName" placeholder="请输入查获班组" clearable @keyup.enter="handleQuery" />
24
       </el-form-item>
24
       </el-form-item>
25
 
25
 
26
+      <el-form-item label="流程状态" prop="processStatus">
27
+        <el-select v-model="queryParams.processStatus" placeholder="请选择流程状态" clearable style="width: 200px">
28
+          <el-option v-for="dict in process_status" :key="dict.value" :label="dict.label" :value="dict.value" />
29
+        </el-select>
30
+      </el-form-item>
31
+
32
+      <el-form-item label="开机指令" prop="powerOnInstruction">
33
+        <el-select v-model="queryParams.powerOnInstruction" placeholder="请选择开机指令" clearable style="width: 200px">
34
+          <el-option label="指令" :value="0" />
35
+          <el-option label="非指令" :value="1" />
36
+        </el-select>
37
+      </el-form-item>
38
+
26
       <!-- <el-form-item label="违禁类型" prop="forbiddenTypeText">
39
       <!-- <el-form-item label="违禁类型" prop="forbiddenTypeText">
27
         <el-input v-model="queryParams.forbiddenTypeText" placeholder="请输入违禁品类型" clearable @keyup.enter="handleQuery" />
40
         <el-input v-model="queryParams.forbiddenTypeText" placeholder="请输入违禁品类型" clearable @keyup.enter="handleQuery" />
28
       </el-form-item>
41
       </el-form-item>
@@ -76,7 +89,7 @@
76
           <span>{{ parseTime(scope.row.seizureTime, '{y}-{m}-{d}') }}</span>
89
           <span>{{ parseTime(scope.row.seizureTime, '{y}-{m}-{d}') }}</span>
77
         </template>
90
         </template>
78
       </el-table-column>
91
       </el-table-column>
79
-      <el-table-column label="安检位置" align="center" prop="regionalName" >
92
+      <el-table-column label="安检位置" align="center" prop="regionalName">
80
         <template #default="scope">
93
         <template #default="scope">
81
           <span>{{ `${scope.row.terminlName}/${scope.row.regionalName}/${scope.row.channelName}` }}</span>
94
           <span>{{ `${scope.row.terminlName}/${scope.row.regionalName}/${scope.row.channelName}` }}</span>
82
         </template>
95
         </template>
@@ -84,7 +97,7 @@
84
       <el-table-column label="安检岗位" align="center" prop="checkMethodDesc" />
97
       <el-table-column label="安检岗位" align="center" prop="checkMethodDesc" />
85
       <el-table-column label="查获班组" align="center" prop="inspectTeamName" />
98
       <el-table-column label="查获班组" align="center" prop="inspectTeamName" />
86
       <el-table-column label="上报班组" align="center" prop="attendanceTeamName" />
99
       <el-table-column label="上报班组" align="center" prop="attendanceTeamName" />
87
-      <el-table-column label="流程状态" align="center" prop="processStatus" >
100
+      <el-table-column label="流程状态" align="center" prop="processStatus">
88
         <template #default="scope">
101
         <template #default="scope">
89
           <dict-tag :options="process_status" :value="scope.row.processStatus" />
102
           <dict-tag :options="process_status" :value="scope.row.processStatus" />
90
         </template>
103
         </template>
@@ -146,6 +159,24 @@
146
             <el-option label="是" :value="1" />
159
             <el-option label="是" :value="1" />
147
           </el-select>
160
           </el-select>
148
         </el-form-item>
161
         </el-form-item>
162
+        <el-form-item label="是否常见违禁品" prop="commonContraband">
163
+          <el-select v-model="form.itemSeizureItemsList[0].commonContraband" placeholder="-">
164
+            <el-option label="否" :value="0" />
165
+            <el-option label="是" :value="1" />
166
+          </el-select>
167
+        </el-form-item>
168
+        <el-form-item label="违禁品描述" prop="contrabandDesc">
169
+          <el-input v-model="form.itemSeizureItemsList[0].contrabandDesc" placeholder="-" />
170
+        </el-form-item>
171
+        <el-form-item label="开机指令" prop="powerOnInstruction">
172
+          <el-select v-model="form.powerOnInstruction" placeholder="-">
173
+            <el-option label="指令" :value="0" />
174
+            <el-option label="非指令" :value="1" />
175
+          </el-select>
176
+        </el-form-item>
177
+        <el-form-item label="X光开机员" prop="xrayOperatorName">
178
+          <el-input v-model="form.xrayOperatorName" placeholder="-" />
179
+        </el-form-item>
149
         <!-- <el-form-item label="旅客姓名" prop="passengerName">
180
         <!-- <el-form-item label="旅客姓名" prop="passengerName">
150
           <el-input v-model="form.passengerName" placeholder="请输入旅客姓名" />
181
           <el-input v-model="form.passengerName" placeholder="请输入旅客姓名" />
151
         </el-form-item>
182
         </el-form-item>
@@ -205,6 +236,8 @@ const data = reactive({
205
     passengerFlight: null,
236
     passengerFlight: null,
206
     inspectTeamId: null,
237
     inspectTeamId: null,
207
     inspectTeamName: null,
238
     inspectTeamName: null,
239
+    powerOnInstruction: null,
240
+    processStatus: null,
208
     inspectDepartmentId: null,
241
     inspectDepartmentId: null,
209
     inspectDepartmentName: null,
242
     inspectDepartmentName: null,
210
     inspectStationId: null,
243
     inspectStationId: null,