Prechádzať zdrojové kódy

feat: 更新举一反三内容及责任部门的表单配置,调整状态默认值

sunqijun 2 mesiacov pred
rodič
commit
09cbe5e112

+ 43 - 21
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleAccountManagement/components/hiddenTroubleAccountManagementDetail.vue

@@ -45,27 +45,7 @@
           />
         </el-select>
       </template>
-      <template #drawLessonsDepartmentIds>
-        <el-select
-          v-model="drawLessonsDeptIdsArray"
-          placeholder="请选择举一反三责任部门,可多选"
-          clearable
-          filterable
-          multiple
-          collapse-tags
-          collapse-tags-tooltip
-          :disabled="isViewMode"
-          style="width: 100%"
-          @change="onDrawLessonsDeptsChange"
-        >
-          <el-option
-            v-for="d in deptOptions"
-            :key="d.id"
-            :label="d.deptName"
-            :value="d.id"
-          />
-        </el-select>
-      </template>
+
       <template #isDrawLessonsPush>
         <el-radio-group v-model="ruleFormData.isDrawLessonsPush" :disabled="isViewMode">
           <el-radio :value="0">否</el-radio>
@@ -93,6 +73,48 @@
         />
       </template>
     </BasicForm>
+    <el-form label-width="150px" v-if="ruleFormData.isDrawLessonsPush===1 && !isViewMode">
+        <el-form-item label="">
+            <el-input
+                v-model="ruleFormData.drawLessonsContent"
+                placeholder="请输入举一反三内容(选填)"
+                show-word-limit
+                style="width: 450px;"
+                :disabled="isViewMode"
+            />
+        </el-form-item>
+        <el-form-item label="举一反三责任部门:">
+            <el-select
+                v-model="drawLessonsDeptIdsArray"
+                placeholder="请选择举一反三责任部门,可多选"
+                clearable
+                filterable
+                multiple
+                collapse-tags
+                collapse-tags-tooltip
+                :disabled="isViewMode"
+                style="width: 450px;"
+                @change="onDrawLessonsDeptsChange"
+                >
+                <el-option
+                    v-for="d in deptOptions"
+                    :key="d.id"
+                    :label="d.deptName"
+                    :value="d.id"
+                />
+            </el-select>
+        </el-form-item>
+        <el-form-item label="举一反三截止日期:">
+            <el-date-picker
+                v-model="ruleFormData.drawLessonsDeadline"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择举一反三截止日期(选填)"
+                style="width: 450px;"
+                :disabled="isViewMode"
+            />
+        </el-form-item>
+    </el-form>
   </main>
   <footer class="safety-platform-container__footer">
     <el-button @click="router.back()">返回</el-button>

+ 30 - 29
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleAccountManagement/configs/form.ts

@@ -94,34 +94,34 @@ export const HIDDEN_DANGER_FORM_CONFIG: FormConfig[] = [
     label: '举一反三是否推送:',
     slot: 'isDrawLessonsPush',
   },
-  {
-    prop: 'drawLessonsContent',
-    label: '举一反三内容:',
-    component: 'ElInput',
-    componentProps: {
-      placeholder: '选填,推送举一反三时建议填写',
-    },
-  },
-  {
-    prop: 'drawLessonsDepartmentIds',
-    label: '举一反三责任部门:',
-    slot: 'drawLessonsDepartmentIds',
-    componentProps: {
-      placeholder: '请选择举一反三责任部门,可多选',
-      style: { width: '100%' },
-    },
-  },
-  {
-    prop: 'drawLessonsDeadline',
-    label: '举一反三时限:',
-    component: 'ElDatePicker',
-    componentProps: {
-      type: 'date',
-      placeholder: '请选择举一反三时限',
-      valueFormat: 'YYYY-MM-DD',
-      style: { width: '100%' },
-    },
-  },
+//   {
+//     prop: 'drawLessonsContent',
+//     label: '举一反三内容:',
+//     component: 'ElInput',
+//     componentProps: {
+//       placeholder: '选填,推送举一反三时建议填写',
+//     },
+//   },
+//   {
+//     prop: 'drawLessonsDepartmentIds',
+//     label: '举一反三责任部门:',
+//     slot: 'drawLessonsDepartmentIds',
+//     componentProps: {
+//       placeholder: '请选择举一反三责任部门,可多选',
+//       style: { width: '100%' },
+//     },
+//   },
+//   {
+//     prop: 'drawLessonsDeadline',
+//     label: '举一反三时限:',
+//     component: 'ElDatePicker',
+//     componentProps: {
+//       type: 'date',
+//       placeholder: '请选择举一反三时限',
+//       valueFormat: 'YYYY-MM-DD',
+//       style: { width: '100%' },
+//     },
+//   },
 ];
 
 /**
@@ -228,7 +228,8 @@ export const HIDDEN_DANGER_RECTIFY_FORM_CONFIG: FormConfig[] = [
   {
     prop: 'drawLessonsDepartmentIds',
     label: '举一反三责任部门:',
-    slot: 'drawLessonsDepartmentIds',
+    component: 'ElSelect',
+    // slot: 'drawLessonsDepartmentIds',
     componentProps: {
       placeholder: '请选择举一反三责任部门,可多选',
       style: { width: '100%' },

+ 1 - 1
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleCategoryManagement/configs/tables.ts

@@ -11,7 +11,7 @@ export const TABLE_OPTIONS = {
 export const INVENTORY_TABLE_COLUMNS: TableColumnProps[] = [
   {
     label: '编号',
-    prop: 'id',
+    type: 'index',
     align: 'center',
     width: '100px',
   },

+ 1 - 1
src/views/production-safety/safetyAssessment/pointDeduction/pointDeduction.vue

@@ -120,7 +120,7 @@
     pageSize: pagination.pageSize,
     queryParam: {
       deductionTitle: '', // 扣分标题
-      status: true, // 状态,默认启用
+      status: '', // 状态,默认启用
     },
   });