feats

src/app.config.js

@@ -9,7 +9,7 @@ export default defineAppConfig({
     'pages/org/issue/list/index',
     'pages/org/issue/detail/index',
     'pages/apply/list/index',
-    'pages/apply/apply/index',
+    // 'pages/apply/apply/index',
     'pages/apply/verify/index',
     'pages/apply/detail/index',
     'pages/message/list/index',

src/components/Uploader/style.modules.less

@@ -1,13 +1,19 @@
 
 .uploader-wrapper {
   display: inline-block;
+
   .uploader-box {
-    display: flex;
+    display: grid;
+    grid-template-columns: repeat(3, 28vw);
+    column-gap: 4vw;
+    row-gap: 2vw;
 
     & > view {
       flex: none;
-      width: 160px;
-      height: 160px;
+      width: 28vw;
+      height: 28vw;
+      margin-right: 20px;
+      margin-bottom: 20px;
       position: relative;
 
       image {
@@ -19,10 +25,6 @@
         width: 100%;
         height: 100%;
       }
-
-      & + view {
-        margin-left: 20px;
-      }
     }
 
     .uploader-add {

src/pages/apply/apply/index.jsx

@@ -7,6 +7,7 @@ import DatePicker from '@/components/DatePicker';
 import { getDateStr } from '@/utils/date';
 import { postTaIssueApply } from '@/services/taissueapply';
 import { warn } from '@/utils/message';
+import { PROCESS_APPLY_DELAY } from '@/utils/biz';
 import Issue from '../components/Issue';
 import useTitle from '../useTitle';
 
@@ -38,7 +39,7 @@ export default (props) => {
 
   const onSubmit = () => {
     try {
-      if (applyType == 'delay') {
+      if (applyType == PROCESS_APPLY_DELAY) {
         warn(!formData.content, '请选择延期时间');
       }
       warn(!formData.remark, '请填写申请说明');
@@ -77,7 +78,7 @@ export default (props) => {
 
       <CellGroup style={{marginTop: '20px'}}>
         {
-          applyType == 'delay' && (
+          applyType == PROCESS_APPLY_DELAY && (
             <Cell
               isLink
               title="延期时间"

src/pages/apply/detail/index.jsx

@@ -5,6 +5,7 @@ import Page from '@/layouts/index';
 import { Cell, CellGroup, Field, Radio, RadioGroup } from '@antmjs/vantui';
 import { getTaIssueApplyById } from '@/services/taissueapply';
 import { getDtStr } from '@/utils/date';
+import { PROCESS_APPLY_DELAY } from '@/utils/biz';
 import Issue from '../components/Issue';
 import useTitle from '../useTitle';
 
@@ -35,7 +36,7 @@ export default (props) => {
      
       <CellGroup style={{marginTop: '20px'}}>
         {
-          applyInfo.applyType == 'delay' && (
+          applyInfo.applyType == PROCESS_APPLY_DELAY && (
             <Cell
               title="延期日期"
               value={applyInfo.content}

src/pages/apply/list/index.jsx

@@ -52,7 +52,7 @@ export default (props) => {
             request={getTaIssueApply}
             params={{applyType, sourceType: 'inspector'}}
             renderItem={(item) => (
-              <Card key={item.issueId} applyInfo={item} stText={title} onClick={() => onClick(item)} />
+              <Card key={item.applyId} applyInfo={item} stText={title} onClick={() => onClick(item)} />
             )}
           />
         </Tab>
@@ -61,7 +61,7 @@ export default (props) => {
             request={getTaIssueApply}
             params={{applyType, sourceType: 'feedback'}}
             renderItem={(item) => (
-              <Card key={item.issueId} applyInfo={item} stText={title} onClick={() => onClick(item)} />
+              <Card key={item.applyId} applyInfo={item} stText={title} onClick={() => onClick(item)} />
             )}
           />
         </Tab>

src/pages/apply/verify/index.jsx

@@ -3,10 +3,13 @@ import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
 import Page from '@/layouts/index';
 import { Cell, CellGroup, Field, Button, Radio, RadioGroup } from '@antmjs/vantui';
+import Uploader from '@/components/Uploader/index';
 import { putTaIssueApply, getTaIssueApplyById } from '@/services/taissueapply';
 import { warn } from '@/utils/message';
+import { APPLY_PASS, APPLY_REJECT, PROCESS_APPLY_DELAY } from '@/utils/biz';
 import Issue from '../components/Issue';
 import useTitle from '../useTitle';
+import { getTaOrgIssueByIssueId } from '@/services/taorgissue';
 
 // const today = new Date();
 export default (props) => {
@@ -16,6 +19,7 @@ export default (props) => {
 
   const [loading, setLoading] = React.useState(false);
   const [applyInfo, setApplyInfo] = React.useState({});
+  const [orgIssue, setOrgIssue] = React.useState({});
   
   const [submitting, setSubmitting] = React.useState(false);
   const [formData, setFormData] = React.useState({});
@@ -56,6 +60,11 @@ export default (props) => {
       setLoading(true);
       getTaIssueApplyById(id).then(res => {
         setApplyInfo(res);
+
+        getTaOrgIssueByIssueId(res.issueId, res.orgId).then(r => {
+          setOrgIssue(r);
+        });
+
         setLoading(false);
       }).catch(() => {
         setLoading(false);
@@ -67,21 +76,41 @@ export default (props) => {
     <Page loading={loading}>
       <Issue issueId={issueId} />
      
-      <CellGroup style={{marginTop: '20px'}}>
-        {
-          applyInfo.applyType == 'delay' && (
+     {
+        applyInfo.applyType == PROCESS_APPLY_DELAY && (
+          <CellGroup style={{marginTop: '20px'}}>
             <Cell
               title="延期日期"
               value={applyInfo.content}
             />
-          )
-        }
-        <Cell title="申请说明" />
+            <Cell title="申请说明" />
+            <Field
+              readonly
+              type="textarea"
+              autosize={{ minHeight: '120px' }}
+              value={applyInfo.remark}
+            />
+          </CellGroup>
+        )
+     }
+     
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell title="整改结果" />
         <Field
           readonly
           type="textarea"
           autosize={{ minHeight: '120px' }}
-          value={applyInfo.remark}
+          value={orgIssue.result}
+        />
+
+        <Cell title="整改照片" border={false} />
+        <Cell
+          renderTitle={
+            <Uploader
+              disabled
+              value={orgIssue.attachList}
+            />
+          }
         />
       </CellGroup>
      
@@ -94,8 +123,8 @@ export default (props) => {
             value={formData.verifyStatus}
             onChange={(e) => setFieldValue('verifyStatus', e.detail)}
           >
-            <Radio name="pass" checkedColor="var(--main-bg-color)">通过</Radio>
-            <Radio name="reject" checkedColor="red">驳回</Radio>
+            <Radio name={APPLY_PASS} checkedColor="var(--main-bg-color)">通过</Radio>
+            <Radio name={APPLY_REJECT} checkedColor="red">驳回</Radio>
           </RadioGroup>
         </Cell>
         <Cell title="审批说明" />
@@ -107,7 +136,7 @@ export default (props) => {
         />
       </CellGroup>
       <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
-        <Button block type="primary" loading={submitting} onClick={onSubmit}>提交审批</Button>
+        <Button block type="primary" loading={submitting} onClick={onSubmit}>审 批</Button>
       </View>
     </Page>
   )

src/pages/org/issue/detail/components/Apply.jsx

@@ -5,6 +5,7 @@ import { Cell, CellGroup, Field, Button, Popup } from '@antmjs/vantui';
 import DatePicker from '@/components/DatePicker';
 import { getDateStr } from '@/utils/date';
 import { postTaIssueApply } from '@/services/taissueapply';
+import { putTaOrgIssue } from '@/services/taorgissue';
 import { warn } from '@/utils/message';
 import {
   PROCESS_APPLY_DELAY,
@@ -20,9 +21,11 @@ export default (props) => {
 
   const [show, setShow] = React.useState(false);
   const [submitting, setSubmitting] = React.useState(false);
-  const [formData, setFormData] = React.useState({});
   const [showDatePicker, setShowDatePicker] = React.useState(false);
 
+  // 申请表记录
+  const [formData, setFormData] = React.useState({});
+
   const setFieldValue = (key, value) => {
     setFormData({
       ...formData,
@@ -53,19 +56,10 @@ export default (props) => {
   const onSubmit = () => {
     try {
       warn(!orgIssue || !orgIssue.issueId, '未找到问题单');
+      warn(!orgIssue.attachList || !orgIssue.attachList.length, '请上传照片');
+      warn(!orgIssue.result, '请填写整改结果');
 
-      if (applyType == PROCESS_APPLY_VERIFY || applyType == PROCESS_APPLY_END) {
-        warn(!orgIssue.attachList || !orgIssue.attachList.length, '请上传照片');
-        warn(!orgIssue.result, '请填写整改结果');
-      }
-
-      if (applyType === PROCESS_APPLY_DELAY) {
-        warn(!formData.content, '请选择延期时间');
-      }
-
-      if (applyType == PROCESS_APPLY_DELAY || applyType == PROCESS_APPLY_REJECT) {
-        warn(!formData.remark, '请填写理由说明');
-      }
+      warn(applyType == PROCESS_APPLY_DELAY && !formData.content, '请设置延期时间');
     } catch (e) {
       return ;
     }
@@ -76,10 +70,16 @@ export default (props) => {
       ...formData
     }
 
+    // 先保存数据
     setSubmitting(true);
-    postTaIssueApply(data).then(() => {
-      Taro.navigateBack({delta: 1});
-      setSubmitting(false);
+    putTaOrgIssue(orgIssue.orgIssueId, orgIssue).then(() => {
+      // 再调用申请接口
+      postTaIssueApply(data).then(() => {
+        Taro.navigateBack({delta: 1});
+        setSubmitting(false);
+      }).catch(() => {
+        setSubmitting(false);
+      })
     }).catch(() => {
       setSubmitting(false);
     })
@@ -98,7 +98,7 @@ export default (props) => {
       <Popup position="bottom" show={show} onClose={() => setShow(false)}>
         <CellGroup>
           {
-            applyType == 'delay' && (
+            applyType == PROCESS_APPLY_DELAY && (
               <Cell
                 isLink
                 title="延期时间"

src/pages/org/issue/detail/index.jsx

@@ -6,17 +6,19 @@ import Page from '@/layouts/index';
 import Uploader from '@/components/Uploader/index';
 import { getTaIssueById } from '@/services/taissue';
 import { getTaOrgIssueByIssueId } from '@/services/taorgissue';
-import { PROCESS_APPLY_END, PROCESS_START, PROCESS_END, PROCESS_APPLY_VERIFY, PROCESS_APPLY_DELAY, PROCESS_APPLY_REJECT } from '@/utils/biz';
-
+import {
+  getIssueStatus,
+  PROCESS_APPLY_END,
+  PROCESS_END,
+  PROCESS_APPLY_VERIFY,
+  PROCESS_APPLY_DELAY,
+  PROCESS_APPLY_REJECT,
+  PROCESS_ASSIGNED,
+  APPLY_READY,
+} from '@/utils/biz';
 import IssueInfo from '../../components/issue-info';
 import Apply from './components/Apply';
 
-const status = {
-  delay: '延期申请中',
-  reject: '驳回申请中',
-  end: '办结申请中',
-}
-
 export default (props) => {
 
   const router = Taro.useRouter();
@@ -35,10 +37,10 @@ export default (props) => {
     if (!orgIssue.issueId) return [];
 
     return [
-      issue?.applyId,
-      status[issue.applyType],
-      orgIssue.processStatus == PROCESS_START,
-      orgIssue.processStatus != PROCESS_END && orgIssue.processStatus != PROCESS_APPLY_END ,
+      orgIssue?.processStatus == APPLY_READY || orgIssue?.processNode == PROCESS_END,
+      issue ? getIssueStatus(issue).label : '',
+      orgIssue.processNode == PROCESS_ASSIGNED,
+      orgIssue.processNode != PROCESS_END && orgIssue.processNode != PROCESS_APPLY_END ,
     ]
 
   }, [issue, orgIssue]);
@@ -82,18 +84,18 @@ export default (props) => {
 
         <Cell
           renderTitle={
-            <Uploader disabled={readOnly} value={orgIssue.attachList} onChange={e => setFormData('attachList',e)} />
+            <Uploader
+              disabled={readOnly}
+              value={orgIssue.attachList}
+              onChange={e => setFormData('attachList',e)}
+            />
           }
         />
       </CellGroup>
-
-      {
-        readOnly && (
-          <CellGroup style={{marginTop: '20px'}}>
-            <Cell title="状态" value={statusTxt} />
-          </CellGroup>
-        )
-      }
+      
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell title="状态" value={statusTxt} />
+      </CellGroup>
 
       {
         !readOnly && (
@@ -101,7 +103,6 @@ export default (props) => {
             <View>
               {
                 showApplyEnd &&
-                  // <Button block type="primary">保存修改</Button> :
                   <Apply block type="primary" applyType={PROCESS_APPLY_END} orgIssue={orgIssue}>申请办结</Apply>
               }
             </View>

src/services/taorgissue.js

@@ -17,7 +17,7 @@ export const getTaOrgIssueById = (id) => request(`/api/taOrgIssue/${id}`);
 /*
  * 通过ISSUE_ID查询单条数据
  */
-export const getTaOrgIssueByIssueId = (issueId) => request(`/api/taIssue/${issueId}/orgIssue`);
+export const getTaOrgIssueByIssueId = (issueId, orgId) => request(`/api/taIssue/${issueId}/orgIssue?orgId=${orgId}`);
 
 /*
  * 更新数据

src/utils/biz.js

@@ -30,7 +30,6 @@ export const APPLY_REJECT = "reject";
 
 
 export function getIssueStatus(taIssue) {
-  console.log('------taIssue-----', taIssue)
   if (taIssue.processStatus === APPLY_REJECT) {
     return {
       value: 4,
@@ -71,8 +70,13 @@ export function getIssueStatus(taIssue) {
       } else if (taIssue.processNode === PROCESS_APPLY_END) {
         return {
           value: 1,
-          label: '办结申请',
+          label: '消单申请',
         };
+      } else {
+        // return {
+        //   value: 1,
+        //   label: '待处理',
+        // };
       }
     } else if (taIssue.processStatus === APPLY_PASS) {
       if (taIssue.processNode === PROCESS_APPLY_REJECT) {
@@ -93,7 +97,7 @@ export function getIssueStatus(taIssue) {
       } else if (taIssue.processNode === PROCESS_APPLY_END) {
         return {
           value: 1,
-          label: '办结申请通过',
+          label: '消单申请通过',
         };
       }
     } else {
@@ -115,7 +119,7 @@ export function getIssueStatus(taIssue) {
       } else if (taIssue.processNode === PROCESS_APPLY_END) {
         return {
           value: 1,
-          label: '办结申请驳回',
+          label: '消单申请驳回',
         };
       }
     }