feats

src/pages/check/components/LocTable.jsx

@@ -4,6 +4,7 @@ import { Table, Space, Button, Row, Col, Card } from 'antd';
 import { getTaCheckItem } from '@/service/tacheckitem';
 import QuList from './QuList';
 import LocForm from './LocForm';
+import styles from './style.module.less';
 
 export default (props) => {
   const { checkId } = props;
@@ -63,6 +64,13 @@ export default (props) => {
     setList(newList);
   }
 
+  const getRowClassName = (row) => {
+    return [
+      styles['yz-table-row'],
+      (row.itemId == curItem?.itemId) ? styles.active : false,
+    ].filter(Boolean).join(' ');
+  }
+
   React.useEffect(() => {
     if (checkId) {
       startLoading();
@@ -85,6 +93,7 @@ export default (props) => {
             columns={columns}
             dataSource={list}
             pagination={false}
+            rowClassName={getRowClassName}
             onRow={(row) => ({
               onClick: () => setCurItem(row),
             })}

src/pages/check/components/QuForm.jsx

@@ -4,7 +4,8 @@ import {
   ProFormText,
   ProFormSelect,
   ProFormDigit,
-  ProFormList
+  ProFormList,
+  ProFormDependency
 } from '@ant-design/pro-components';
 import { Form, Row, Col } from 'antd';
 import WangEditor from '@/components/Wangeditor';
@@ -127,7 +128,7 @@ export default (props) => {
             ]}
           />
         </Col>
-        <Col span={12}>
+        <Col span={6}>
           <ProFormSelect
             name="computeType"
             label="计分方式"
@@ -146,9 +147,7 @@ export default (props) => {
             ]}
           />
         </Col>
-      </Row>
-      <Row gutter={24}>
-        <Col span={12}>
+        <Col span={6}>
           <ProFormDigit
             name="maxScore"
             label="最 高 分"
@@ -162,19 +161,44 @@ export default (props) => {
             ]}
           />
         </Col>
+      </Row>
+      <Row gutter={24}>
         <Col span={12}>
-          <ProFormDigit
-            name="anScore"
-            label="单项计分"
-            min={0}
-            fieldProps={{ precision: 2 }}
-            rules={[
-              {
-                required: true,
-                message: '请设置单项计分',
-              },
-            ]}
-          />
+          <ProFormDependency name={['quType']}>
+            {
+              ({quType}) => (
+                quType != 'fill' ? null : (
+                  <ProFormDigit
+                    name="anScore"
+                    label="单项计分"
+                    min={0}
+                    fieldProps={{ precision: 2 }}
+                    rules={[
+                      {
+                        required: true,
+                        message: '请设置单项计分',
+                      },
+                    ]}
+                  />
+                )
+              )
+            }
+          </ProFormDependency>
+        </Col>
+        <Col span={12}>
+          <ProFormDependency name={['quType']}>
+            {
+              ({quType}) => (
+                quType != 'fill' ? null : (
+                  <ProFormText
+                    name="fillUnit"
+                    label="填空单位"
+                    placeholder="表示填空数字的单位"
+                  />
+                )
+              )
+            }
+          </ProFormDependency>
         </Col>
       </Row>
       {
@@ -201,36 +225,59 @@ export default (props) => {
           </Form.Item>
         )
       }
-      <ProFormList
-        name="answerList"
-        label="选项列表"
-        copyIconProps={false}
-      >
-        <Row gutter={24} style={{ width: '730px' }}>
-          <Col span={6}>
-            <ProFormText
-              name="answerCode"
-              label="选项"
-              help="类似 A, B, C, D"
-            />
-          </Col>
-          <Col span={6}>
-            <ProFormDigit
-              name="score"
-              label="计分"
-              min={0}
-              fieldProps={{ precision: 2 }}
-            />
-          </Col>
-          <Col span={12}>
-            <ProFormText
-              name="answer"
-              label="答案"
-              placeholder="具体选项内容"
-            />
-          </Col>
-        </Row>
-      </ProFormList>
+      
+      <ProFormDependency name={['quType']}>
+        {
+          ({quType}) => (
+            quType == 'fill' ? null : (
+              <ProFormList
+                name="answerList"
+                label="选项列表"
+                copyIconProps={false}
+              >
+                <Row gutter={24} style={{ width: '730px' }}>
+                  <Col span={6}>
+                    <ProFormText
+                      name="answerCode"
+                      label="选项"
+                      help="类似 A, B, C, D"
+                    />
+                  </Col>
+                  <Col span={6}>
+                    <ProFormDigit
+                      name="score"
+                      label="计分"
+                      help="计分"
+                      min={0}
+                      fieldProps={{ precision: 2 }}
+                    />
+                  </Col>
+                  <Col span={6}>
+                    <ProFormSelect
+                      name="reportIssue"
+                      label="上报问题"
+                      help="上报问题"
+                      placeholder="是否上报问题"
+                      valueEnum={{
+                        0: '不上报',
+                        1: '上报',
+                      }}
+                    />
+                  </Col>
+                  <Col span={6}>
+                    <ProFormText
+                      name="answer"
+                      label="答案"
+                      help="答案"
+                      placeholder="具体选项内容"
+                    />
+                  </Col>
+                </Row>
+              </ProFormList>
+            )
+          )
+        }
+      </ProFormDependency>
     </DrawerForm>
   )
 }

src/pages/check/components/style.module.less

@@ -0,0 +1,12 @@
+
+.yz-table-row {
+  & > td:first-child {
+    border-left: 2px solid transparent;
+  }
+
+  &.active {
+    & > td:first-child {
+      border-left-color: #1677ff;
+    }
+  }
+}

src/pages/check/index.jsx

@@ -1,10 +1,10 @@
 import React from 'react';
 import Page from '@/components/Page';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, Link } from 'react-router-dom';
 import { queryTable } from "@/utils/request";
 import { ProTable } from "@ant-design/pro-components";
 import { Button, message, Popconfirm } from "antd";
-import { getTaCheck, deleteTaCheck, putTaCheck } from '@/service/tacheck';
+import { getTaCheck, deleteTaCheck, putTaCheck, calcScoreTaCheck } from '@/service/tacheck';
 
 const queryList = queryTable(getTaCheck);
 
@@ -25,10 +25,17 @@ export default (props) => {
     })
   }
 
+  const onCalc = (row) => {
+    calcScoreTaCheck(row.checkId).then(() => {
+      actionRef.current.reload();
+    });
+  }
+
   const columns = [
     {
       title: "测评名称",
       dataIndex: "title",
+      render: (_, row) => !row.title ? '-' : <Link to={`/check/edit?id=${row.checkId}`}>{row.title}</Link>,
     },
     {
       title: "测评日期",
@@ -49,6 +56,16 @@ export default (props) => {
       dataIndex: "endDate",
       hideInSearch: true,
     },
+    {
+      title: "实地测评得分",
+      dataIndex: "locScore",
+      hideInSearch: true,
+    },
+    {
+      title: "调查问卷得分",
+      dataIndex: "surveyScore",
+      hideInSearch: true,
+    },
     {
       title: "状态",
       dataIndex: "status",
@@ -67,7 +84,7 @@ export default (props) => {
     {
       title: "操作",
       valueType: "option",
-      width: 200,
+      width: 240,
       render: (_, record) => [
         <Button
           key={1}
@@ -79,16 +96,6 @@ export default (props) => {
         >
           {record.status === 1 ? "禁用" : "启用"}
         </Button>,
-        <Button
-          key={2}
-          style={{ padding: 0 }}
-          type="link"
-          onClick={() => {
-            navigate(`/check/edit?id=${record.checkId}`);
-          }}
-        >
-          编辑
-        </Button>,
         <Popconfirm
           key={3}
           title="您是否确认删除 ?"
@@ -97,10 +104,22 @@ export default (props) => {
           cancelText="取消"
         >
           {/* manualPush */}
-          <Button style={{ padding: 0 }} type="link">
+          <Button style={{ padding: 0 }} danger type="link">
             删除
           </Button>
         </Popconfirm>,
+        <Popconfirm
+          key={4}
+          title="系统计算可能需要1分钟的时间"
+          onConfirm={() => onCalc(record)}
+          okText="确定"
+          cancelText="取消"
+        >
+          {/* manualPush */}
+          <Button style={{ padding: 0 }} type="link">
+            计算分数
+          </Button>
+        </Popconfirm>,
       ],
     },
   ]

src/pages/issue/detail/components/ApplyInfo.jsx

@@ -5,6 +5,7 @@ import { getTaIssueApply } from '@/service/taissueapply';
 import { getSysOrg } from '@/service/sysorg';
 import { queryTable, queryDict } from '@/utils/request';
 import useBool from '@/utils/hooks/useBool';
+import { processEnum } from '@/utils/biz';
 
 const fetchOrg = queryDict(getSysOrg, { labelKey: 'orgId', valueKey: 'name' });
 const fetchData = queryTable(getTaIssueApply);
@@ -21,20 +22,7 @@ export default (props) => {
     {
       title: "申请类别",
       dataIndex: "applyType",
-      valueEnum: {
-        verify: {
-          text: '问题单审核',
-        },
-        reject: {
-          text: '驳回申请',
-        },
-        delay: {
-          text: '延期申请',
-        },
-        end: {
-          text: '销单申请',
-        },
-      }
+      valueEnum: processEnum
     },
     {
       title: "申请人",
@@ -53,6 +41,10 @@ export default (props) => {
       title: "审批结果",
       dataIndex: "verifyStatus",
       valueEnum: {
+        ready: {
+          text: '未审批',
+          status: 'Default',
+        },
         pass: {
           text: '通过',
           status: 'Success',

src/pages/issue/detail/components/BasicProfile.jsx

@@ -1,13 +1,15 @@
 import React from 'react';
-import { Card, Descriptions, Image } from 'antd';
+import { Card, Descriptions, Badge } from 'antd';
 import dayjs from 'dayjs';
 import useBool from '@/utils/hooks/useBool';
 import { getTaIssueById } from '@/service/taissue';
 import { getSysOrgById } from '@/service/sysorg';
+import { processStatus } from '@/utils/biz';
 import AttachList from './AttachList';
 
+const today = (new Date()).toJSON().substring(0, 10);
 const fmDate = dt => !dt ? '-' : dayjs(dt).format('YYYY-MM-DD');
-const getStatusLabel = status => ({start: '待交办', assigned: '处理中', end: '已办结'})[status];
+const getStatusLabel = val => (processStatus.filter(x => x.value == val)[0])?.label;
 
 export default (props) => {
 
@@ -16,6 +18,17 @@ export default (props) => {
   const [loading, startLoading, stopLoading] = useBool();
   const [detail, setDetail] = React.useState();
 
+  const [
+    isExpire,
+    status,
+  ] = React.useMemo(() => {
+    if (!detail) return [];
+    return [
+      detail.processNode != '03' && today >= detail.expireDate,
+      processStatus.filter(x => x.value == detail.processNode)[0],
+    ]
+  }, [detail]);
+
   React.useEffect(() => {
     if (issueId) {
       startLoading();
@@ -53,7 +66,11 @@ export default (props) => {
         <Descriptions.Item label="上报时间">{fmDate(detail?.createDate)}</Descriptions.Item>
         <Descriptions.Item label="上报人">{detail?.userName}</Descriptions.Item>
         <Descriptions.Item label="问题类型">{detail?.typeName}</Descriptions.Item>
-        <Descriptions.Item label="流程状态">{getStatusLabel(detail?.processNode)}</Descriptions.Item>
+        <Descriptions.Item label="流程状态">
+          {
+            isExpire ? <Badge status="error" text="已逾期" /> : <Badge status={status?.badge} text={status?.label} />
+          }
+        </Descriptions.Item>
         <Descriptions.Item label="截止日期">{fmDate(detail?.expireDate)}</Descriptions.Item>
         <Descriptions.Item label="责任单位" span={2}>{detail?.orgName}</Descriptions.Item>
         <Descriptions.Item label="问题描述" span={3}>

src/pages/issue/index.jsx

@@ -6,6 +6,7 @@ import { getTaIssue } from '@/service/taissue';
 import { getTdLocType } from '@/service/tdloctype';
 import { getSysOrg } from '@/service/sysorg';
 import { queryDict } from '@/utils/request';
+import { processEnum, processStatus } from '@/utils/biz';
 
 const queryOrg = queryDict(getSysOrg, { labelKey: 'name', valueKey: 'orgId' });
 const queryLocType = queryDict(getTdLocType, { labelKey: 'name', valueKey: 'typeId' });
@@ -50,46 +51,13 @@ export default (props) => {
       title: "流程状态",
       dataIndex: "bizStatus",
       valueType: 'select',
-      valueEnum: {
-        start: {
-          text: "待交办",
-          status: "Default",
-        },
-        assigned: {
-          text: "已交办",
-          status: "Processing",
-        },
-        end: {
-          text: "已办结",
-          status: "Success",
-        },
-        expired: {
-          text: "已逾期",
-          status: "Error",
-        },
-        reject: {
-          text: "已打回",
-          status: "Warning",
-        },
-      },
+      valueEnum: processEnum,
       render: (_, row) => {
-        if (row.processNode == 'end') {
-          return <Badge status="success" text="已办结" />;
+        if (row.processNode != '03' && today >= row.expireDate) {
+          return <Badge status="error" text="已逾期" />;
         } else {
-
-          if (today >= row.expireDate) {
-            return <Badge status="error" text="已逾期" />;
-          }
-
-          if ('reject' == row.processStatus) {
-            return <Badge status="warning" text="已打回" />;
-          }
-
-          if (row.processNode == 'assigned') {
-            return <Badge status="processing" text="已交办" />;
-          }
-
-          return <Badge status="default" text="待交办" />;
+          const st = processStatus.filter(x => x.value == row.processNode)[0];
+          return <Badge status={st?.badge} text={st?.label} />;
         }
       }
     },

src/service/tacheck.js

@@ -24,3 +24,8 @@ export const putTaCheck = (id, data) => request(`/api/taCheck/${id}`, { data, me
  * 通过主键删除数据
  */
 export const deleteTaCheck = (id) => request(`/api/taCheck/${id}`, { method: 'delete' });
+
+/*
+ * 计算分数
+ */
+export const calcScoreTaCheck = (id) => request(`/api/taCheck/${id}/score`, { method: 'put' });

src/utils/biz.js

@@ -0,0 +1,22 @@
+
+import { Badge } from 'antd';
+
+export const processStatus = [
+  { value: '01', label: "待交办", badge: 'default' },
+  { value: '02', label: "已交办", badge: 'processing' },
+  { value: '03', label: "已办结", badge: 'success' },
+  { value: 'expired', label: "已逾期", badge: 'error' },
+  { value: '0201', label: "驳回申请中", badge: 'processing' },
+  { value: '0202', label: "延期申请中", badge: 'processing' },
+  { value: '0203', label: "单位审核中", badge: 'processing' },
+  { value: '0204', label: "消单申请中", badge: 'processing' },
+]
+
+export const processEnum = processStatus.reduce((acc, it) => {
+  return {
+    ...acc,
+    [it.value]: {
+      text: it.label,
+    }
+  }
+}, {});