Merge remote-tracking branch 'origin/develop' into develop

src/api/project/safetyEducation.ts

@@ -5,6 +5,7 @@ enum Api {
     GetList = '/pro/educationTraining/page',
     UpdateProject = '/pro/educationTraining/update',
     DeleteProject = '/pro/educationTraining/del',
+    GetUserList = '/pro/sys/sysUser'
 }
 
 export const getListByPage = (params?: ProjectParams) =>
@@ -18,3 +19,6 @@ export const updateItem = (params?: any) =>
 
 export const deleteItem = (params?: any) =>
     defHttp.delete<ProjectModel>({ url: Api.DeleteProject, params });
+
+export const getUserList = (params?: ProjectParams) =>
+    defHttp.post<ProjectModel>({ url: Api.GetUserList, data: params });

src/components/yearModal.vue

@@ -101,7 +101,7 @@
               },
               {
                 label: '第三季度',
-                value: '第二季度',
+                value: '第三季度',
               },
               {
                 label: '第四季度',

src/views/biddingManagement/biddingManagement.data.ts

@@ -75,7 +75,7 @@ export const searchFormSchema: FormSchema[] = [
         },
         {
           label: '第三季度',
-          value: '第二季度',
+          value: '第三季度',
         },
         {
           label: '第四季度',

src/views/biddingManagement/biddingManagementEdit.vue

@@ -7,7 +7,7 @@
     headerSticky
   >
     <template #extra>
-      <a-button type="primary" danger> 删除 </a-button>
+<!--      <a-button type="primary" danger> 删除 </a-button>-->
       <a-button type="primary" v-if="!disabled" @click="handleSubmit"> 提交 </a-button>
       <a-button type="default" @click="router.back()"> 返回 </a-button>
     </template>

src/views/biddingPlan/biddingPlan.data.ts

@@ -75,7 +75,7 @@ export const searchFormSchema: FormSchema[] = [
         },
         {
           label: '第三季度',
-          value: '第二季度',
+          value: '第三季度',
         },
         {
           label: '第四季度',

src/views/biddingPlan/biddingPlanEdit.vue

@@ -7,7 +7,7 @@
     headerSticky
   >
     <template #extra>
-      <a-button type="primary" danger> 删除 </a-button>
+<!--      <a-button type="primary" danger> 删除 </a-button>-->
       <a-button type="primary" v-if="!disabled" @click="handleSubmit"> 提交 </a-button>
       <a-button type="default" @click="router.back()"> 返回 </a-button>
     </template>

src/views/biddingPlan/index.vue

@@ -9,7 +9,7 @@
           {{ index + 1 }}
         </template>
         <template v-if="column.key === 'tenderYear'">
-          {{ record.tenderYear + '年' + record.biddingQuarter + '季度' }}
+          {{ record.tenderYear + '年' + record.biddingQuarter }}
         </template>
         <template v-if="column.key === 'action'">
           <TableAction
@@ -22,7 +22,7 @@
                 },
               },
               {
-                label: '修改',
+                label: '编辑',
                 onClick: handleEdit.bind(null, record, 0),
                 ifShow: (_action) => {
                   return record.reviewStatus == null;
@@ -54,7 +54,7 @@
               },
             ]"
           />
-          
+
         </template>
       </template>
     </BasicTable>

src/views/potentialSafety/index.vue

@@ -82,7 +82,9 @@ function handleDelete(record: Recordable) {
   deleteItem({ id: record.id });
   reload();
 }
-
+function handleSuccess() {
+  reload();
+}
 function handleCreate() {
   openDrawer(true, {
     isUpdate: false,

src/views/potentialSafety/safetyDrawer.vue

@@ -37,8 +37,18 @@
     if (isUpdate.value) {
       detailId.value = data.record.id;
       getTitle.value = '编辑隐患管理';
+      const formEl = unref(formElRef);
+      if (!formEl) return;
+      await formEl.setProps({
+        disabled: false,
+      });
     } else {
       getTitle.value = '创建隐患管理';
+      const formEl = unref(formElRef);
+      if (!formEl) return;
+      await formEl.setProps({
+        disabled: false,
+      });
     }
     if (data.disabled == true) {
       getTitle.value = '查看隐患管理';

src/views/project/index.vue

@@ -7,7 +7,7 @@
           <img :class="`${prefixCls}__top-img`" src="../../assets/images/group.png" />
           <span
             ><p>{{ countData.counttotal }}</p
-            >人</span
+            >个</span
           >
         </div>
       </Col>
@@ -15,35 +15,35 @@
         <div class="title">自建</div>
         <span
           ><p>{{ countData.countbuildbyoneself }}</p
-          >人</span
+          >个</span
         >
       </Col>
       <Col :span="4" :class="`${prefixCls}__top-col`">
         <div class="title">委托建设</div>
         <span
           ><p>{{ countData.countbuildbyentrust }}</p
-          >人</span
+          >个</span
         >
       </Col>
       <Col :span="4" :class="`${prefixCls}__top-col`">
         <div class="title">代建</div>
         <span
           ><p>{{ countData.countbuildbyreplace }}</p
-          >人</span
+          >个</span
         >
       </Col>
       <Col :span="4" :class="`${prefixCls}__top-col`">
         <div class="title">承建</div>
         <span
           ><p>{{ countData.countbuildbyhold }}</p
-          >人</span
+          >个</span
         >
       </Col>
       <Col :span="4" :class="`${prefixCls}__top-col`">
         <div class="title">储备</div>
         <span
           ><p>{{ countData.countreserve }}</p
-          >人</span
+          >个</span
         >
       </Col>
     </Row>

src/views/project/project.data.ts

@@ -244,8 +244,8 @@ export const searchFormSchema: FormSchema[] = [
           value: '委托建设',
         },
         {
-          label: '代理',
-          value: '代理',
+          label: '代建',
+          value: '代建',
         },
         {
           label: '承建',

src/views/safetyEducation/educationDrawer.vue

 <template>
   <BasicDrawer
-      v-bind="$attrs"
-      @register="registerDrawer"
-      showFooter
-      :title="getTitle"
-      width="700px"
-      @ok="handleSubmit"
+    v-bind="$attrs"
+    @register="registerDrawer"
+    showFooter
+    :title="getTitle"
+    width="700px"
+    @ok="handleSubmit"
   >
     <BasicForm ref="formElRef" @register="registerForm">
       <!-- <template #menu="{ model, field }"> </template> -->
@@ -13,66 +13,76 @@
   </BasicDrawer>
 </template>
 <script lang="ts" setup>
-import { ref, unref } from 'vue';
-import { BasicForm, useForm, FormActionType } from '@/components/Form';
-import { formSchema } from './data';
-import { BasicDrawer, useDrawerInner } from '@/components/Drawer';
-import { addItem, updateItem } from '@/api/project/safetyEducation';
+  import { ref, unref } from 'vue';
+  import { BasicForm, useForm, FormActionType } from '@/components/Form';
+  import { formSchema } from './data';
+  import { BasicDrawer, useDrawerInner } from '@/components/Drawer';
+  import { addItem, updateItem } from '@/api/project/safetyEducation';
 
-const emit = defineEmits(['success', 'register']);
-const isUpdate = ref(true);
-const detailId = ref(0);
-const formElRef = ref<Nullable<FormActionType>>(null);
-const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
-  labelWidth: 90,
-  baseColProps: { span: 24 },
-  schemas: formSchema,
-  showActionButtonGroup: false,
-});
+  const emit = defineEmits(['success', 'register']);
+  const isUpdate = ref(true);
+  const detailId = ref(0);
+  const formElRef = ref<Nullable<FormActionType>>(null);
+  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+    labelWidth: 90,
+    baseColProps: { span: 24 },
+    schemas: formSchema,
+    showActionButtonGroup: false,
+  });
 
-const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-  resetFields();
-  setDrawerProps({ confirmLoading: false });
-  isUpdate.value = !!data?.isUpdate;
-  if (isUpdate.value) {
-    detailId.value = data.record.id;
-    getTitle.value = '编辑安全教育';
-  } else {
-    getTitle.value = '创建安全教育';
-  }
-  if (data.disabled == true) {
-    getTitle.value = '查看安全教育';
-    const formEl = unref(formElRef);
-    if (!formEl) return;
-    await formEl.setProps({
-      disabled: true,
-    });
-  }
-
-  if (unref(isUpdate)) {
-    setFieldsValue({
-      ...data.record,
-    });
-  }
-});
-
-const getTitle = ref('');
-async function handleSubmit() {
-  try {
-    const values = await validate();
-    setDrawerProps({ confirmLoading: true });
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    resetFields();
+    setDrawerProps({ confirmLoading: false });
+    isUpdate.value = !!data?.isUpdate;
     if (isUpdate.value) {
-      values.id = detailId.value;
+      detailId.value = data.record.id;
+      getTitle.value = '编辑安全教育';
+      const formEl = unref(formElRef);
+      if (!formEl) return;
+      await formEl.setProps({
+        disabled: false,
+      });
+    } else {
+      getTitle.value = '创建安全教育';
+      const formEl = unref(formElRef);
+      if (!formEl) return;
+      await formEl.setProps({
+        disabled: false,
+      });
+    }
+    if (data.disabled == true) {
+      getTitle.value = '查看安全教育';
+      const formEl = unref(formElRef);
+      if (!formEl) return;
+      await formEl.setProps({
+        disabled: true,
+      });
     }
-    // TODO custom api
-    console.log(values);
-    let res = isUpdate.value ? await updateItem(values) : await addItem(values);
-    console.log(res);
 
-    closeDrawer();
-    emit('success', res);
-  } finally {
-    setDrawerProps({ confirmLoading: false });
+    if (unref(isUpdate)) {
+      setFieldsValue({
+        ...data.record,
+      });
+    }
+  });
+
+  const getTitle = ref('');
+  async function handleSubmit() {
+    try {
+      const values = await validate();
+      setDrawerProps({ confirmLoading: true });
+      if (isUpdate.value) {
+        values.id = detailId.value;
+      }
+      // TODO custom api
+      console.log(values);
+      let res = isUpdate.value ? await updateItem(values) : await addItem(values);
+      console.log(res);
+
+      closeDrawer();
+      emit('success', res);
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
   }
-}
 </script>

src/views/safetyEducation/index.vue

@@ -88,6 +88,10 @@ function handleCreate() {
     isUpdate: false,
   });
 }
+
+function handleSuccess() {
+  reload();
+}
 </script>
 
 <style scoped lang="less"></style>