feats

src/app.config.js

@@ -8,6 +8,8 @@ export default defineAppConfig({
     'pages/issue/edit/index',
     'pages/org/issue/list/index',
     'pages/org/issue/detail/index',
+    'pages/apply/apply/index',
+    'pages/apply/verify/index',
     'pages/index3/index',
     'pages/index4/index',
     'pages/index5/index',

src/components/IssueCard/index.jsx

@@ -16,7 +16,7 @@ const colors = [
 
 export default (props) => {
 
-  const { detail, onClick } = props;
+  const { detail, onClick, color, stText } = props;
 
   const [
     content,
@@ -31,10 +31,10 @@ export default (props) => {
     return [
       (detail.content || '').replace('\r\n', '<br>').replace('\n', '<br>'),
       dayjs(detail.createDate).format('YYYY-MM-DD HH:mm'),
-      colors[bizStatus],
-      statusText,
+      colors[color ?? bizStatus],
+      stText || statusText,
     ];
-  }, [detail]);
+  }, [detail, color, stText]);
   
   return (
     <View className={style['issue-card-wrapper']} onClick={onClick}>

src/layouts/index.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import Taro from '@tarojs/taro';
 import { View, Image } from '@tarojs/components';
 import { useModel } from '@/store';
-import { Loading } from '@antmjs/vantui';
+import { Loading, Notify } from '@antmjs/vantui';
 import NavLoading from '@/components/NavLoading';
 import Auth from '@/components/Auth';
 import TabBar from './TabBar';
@@ -28,6 +28,7 @@ export default (props) => {
 
   return (
     <View className={laySty['page-wrapper']}>
+      <Notify id="vanNotify" />
       <NavLoading loading={loading} />
       <View className={conatinerClass} style={style}>
         {

src/pages/apply/apply/index.config.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '问题单申请'
+})

src/pages/org/issue/detail/components/ExpireApply.jsx → src/pages/apply/apply/index.jsx

@@ -1,18 +1,41 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
+import Page from '@/layouts/index';
 import { Cell, CellGroup, Field, Button } from '@antmjs/vantui';
 import DatePicker from '@/components/DatePicker';
 import { getDateStr } from '@/utils/date';
 import { postTaIssueApply } from '@/services/taissueapply';
 import { warn } from '@/utils/message';
+import Issue from '../components/Issue';
 
 const today = new Date();
 export default (props) => {
 
-  const { orgIssue } = props;
+  const router = Taro.useRouter();
+  const { issueId, applyType } = router.params;
 
   const [loading, setLoading] = React.useState(false);
+
+  React.useMemo(() => {
+    switch (applyType) {
+      case 'delay':
+        Taro.setNavigationBarTitle('申请延期');
+        break;
+      case 'reject':
+        Taro.setNavigationBarTitle('申请驳回');
+        break;
+      case 'verify':
+        Taro.setNavigationBarTitle('申请审核');
+        break;
+      case 'end':
+        Taro.setNavigationBarTitle('申请办结');
+        break;
+    }
+  }, [applyType]);
+
+  
+  const [submitting, setSubmitting] = React.useState(false);
   const [formData, setFormData] = React.useState({});
   const [showDatePicker, setShowDatePicker] = React.useState(false);
 
@@ -31,29 +54,34 @@ export default (props) => {
 
   const onSubmit = () => {
     try {
-      warn(!formData.content, '请选择延期时间');
-      warn(!formData.remark, '请填写延期理由');
+      if (applyType == 'delay') {
+        warn(!formData.content, '请选择延期时间');
+      }
+      warn(!formData.remark, '请填写申请说明');
     } catch (e) {
       return ;
     }
 
     const data = {
-      issueId: orgIssue.issueId,
-      applyType: 'delay',
+      issueId,
+      applyType,
       ...formData
     }
 
-    setLoading(true);
+    setSubmitting(true);
     postTaIssueApply(data).then(() => {
       Taro.navigateBack({delta: 1});
-      setLoading(false);
+      setSubmitting(false);
     }).catch(() => {
-      setLoading(false);
+      setSubmitting(false);
     })
   }
   
+  
   return (
-    <>
+    <Page loading={loading}>
+      <Issue issueId={issueId} onLoading={setLoading} />
+      
       <DatePicker
         type="date"
         minDate={today}
@@ -62,14 +90,19 @@ export default (props) => {
         onCancel={() => setShowDatePicker(false)}
         onChange={onDateChange}
       />
+
       <CellGroup style={{marginTop: '20px'}}>
-        <Cell
-          isLink
-          title="延期时间"
-          value={formData.content}
-          onClick={() => setShowDatePicker(true)}
-        />
-        <Cell title="延期理由" />
+        {
+          applyType == 'delay' && (
+            <Cell
+              isLink
+              title="延期时间"
+              value={formData.content}
+              onClick={() => setShowDatePicker(true)}
+            />
+          )
+        }
+        <Cell title="申请说明" />
         <Field
           type="textarea"
           autosize={{ minHeight: '120px' }}
@@ -78,8 +111,8 @@ export default (props) => {
         />
       </CellGroup>
       <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
-        <Button block type="primary" onClick={onSubmit}>申请延期</Button>
+        <Button block type="primary" loading={submitting} onClick={onSubmit}>提交申请</Button>
       </View>
-    </>
+    </Page>
   )
 }

src/pages/apply/components/Issue.jsx

@@ -0,0 +1,60 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Cell, CellGroup, Field, Button } from '@antmjs/vantui';
+import Uploader from '@/components/Uploader/index';
+import { getTaIssueById } from '@/services/taissue';
+
+const getDtStr = dt => !dt ? '' : dt.replace('T', ' ').substring(0, 16)
+export default (props) => {
+  const { issueId, onLoading } = props;
+
+  const [issue, setIssue] = React.useState({});
+
+  const setLoading = (val) => {
+    if (onLoading) {
+      onLoading(val);
+    }
+  }
+
+  React.useEffect(() => {
+    if (issueId) {
+      setLoading(true);
+      getTaIssueById(issueId).then((res) => {
+        setIssue(res);
+        setLoading(false);
+      }).catch(() => {
+        setLoading(false);
+      });
+    }
+  }, [issueId]);
+
+  return (
+    <>
+      <CellGroup>
+        <Cell title="上报时间" value={getDtStr(issue?.createDate)} />
+        <Cell title="办结时间" value={issue?.expireDate} />
+        <Cell title="交办次数" value={issue?.processNum || 1} />
+      </CellGroup>
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell title="抽检位置" value={issue?.locName} />
+        <Cell title="定 位 点" value={issue?.addr} />
+        <Cell title="问题详情" />        
+        <Field
+          readonly
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={issue?.content}
+        /> 
+        <Cell
+          renderTitle={
+            <Uploader
+              disabled
+              value={issue?.attachList}
+            />
+          }
+        />
+      </CellGroup>
+    </>
+  )
+}

src/pages/apply/detail/index.config.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '审批详情'
+})

src/pages/apply/detail/index.jsx

@@ -0,0 +1,92 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import Page from '@/layouts/index';
+import { Cell, CellGroup, Field, Radio, RadioGroup } from '@antmjs/vantui';
+import { getTaIssueApplyById } from '@/services/taissueapply';
+import Issue from '../components/Issue';
+
+// const today = new Date();
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { id, applyType, issueId } = router.params;
+
+  const [loading, setLoading] = React.useState(false);
+  const [applyInfo, setApplyInfo] = React.useState({});
+
+  React.useMemo(() => {
+    switch (applyType) {
+      case 'delay':
+        Taro.setNavigationBarTitle('延期申请');
+        break;
+      case 'reject':
+        Taro.setNavigationBarTitle('驳回申请');
+        break;
+      case 'verify':
+        Taro.setNavigationBarTitle('审核申请');
+        break;
+      case 'end':
+        Taro.setNavigationBarTitle('办结申请');
+        break;
+    }
+  }, [applyType]);
+  
+  React.useEffect(() => {
+    if (id) {
+      setLoading(true);
+      getTaIssueApplyById(id).then(res => {
+        setApplyInfo(res);
+        setLoading(false);
+      }).catch(() => {
+        setLoading(false);
+      });
+    }
+  }, [id]);
+  
+  return (
+    <Page loading={loading}>
+      <Issue issueId={issueId} />
+     
+      <CellGroup style={{marginTop: '20px'}}>
+        {
+          applyInfo.applyType == 'delay' && (
+            <Cell
+              title="延期日期"
+              value={applyInfo.content}
+            />
+          )
+        }
+        <Cell title="申请说明" />
+        <Field
+          readonly
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={applyInfo.remark}
+        />
+      </CellGroup>
+     
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell
+          title="审批结果"
+        >
+          <RadioGroup
+            readonly
+            direction="horizontal"
+            value={applyInfo.verifyStatus}
+          >
+            <Radio name="pass" checkedColor="var(--main-bg-color)">通过</Radio>
+            <Radio name="reject" checkedColor="red">驳回</Radio>
+          </RadioGroup>
+        </Cell>
+        <Cell title="审批说明" />
+        <Field
+          readonly
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={applyInfo.verifyDesc}
+        />
+      </CellGroup>
+    </Page>
+  )
+}

src/pages/apply/verify/index.config.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '问题单审批'
+})

src/pages/apply/verify/index.jsx

@@ -0,0 +1,129 @@
+import React from 'react';
+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 { putTaIssueApply, getTaIssueApplyById } from '@/services/taissueapply';
+import { warn } from '@/utils/message';
+import Issue from '../components/Issue';
+
+// const today = new Date();
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { id, applyType, issueId } = router.params;
+
+  const [loading, setLoading] = React.useState(false);
+  const [applyInfo, setApplyInfo] = React.useState({});
+
+  React.useMemo(() => {
+    switch (applyType) {
+      case 'delay':
+        Taro.setNavigationBarTitle('延期审批');
+        break;
+      case 'reject':
+        Taro.setNavigationBarTitle('驳回审批');
+        break;
+      case 'verify':
+        Taro.setNavigationBarTitle('审核审批');
+        break;
+      case 'end':
+        Taro.setNavigationBarTitle('办结审批');
+        break;
+    }
+  }, [applyType]);
+
+  
+  const [submitting, setSubmitting] = React.useState(false);
+  const [formData, setFormData] = React.useState({});
+
+  const setFieldValue = (key, value) => {
+    setFormData({
+      ...formData,
+      [key]: value,
+    })
+  }
+  
+  const onSubmit = () => {
+    try {
+      warn(!formData.verifyStatus, '请选择审批结果');
+      warn(!formData.verifyDesc, '请填写审批说明');
+    } catch (e) {
+      return ;
+    }
+
+    const data = {
+      ...applyInfo,
+      ...formData
+    }
+
+    setSubmitting(true);
+    putTaIssueApply(data.applyId, data).then(() => {
+      Taro.navigateBack({delta: 1});
+      setSubmitting(false);
+    }).catch(() => {
+      setSubmitting(false);
+    })
+  }
+  
+  React.useEffect(() => {
+    if (id) {
+      setLoading(true);
+      getTaIssueApplyById(id).then(res => {
+        setApplyInfo(res);
+        setLoading(false);
+      }).catch(() => {
+        setLoading(false);
+      });
+    }
+  }, [id]);
+  
+  return (
+    <Page loading={loading}>
+      <Issue issueId={issueId} />
+     
+      <CellGroup style={{marginTop: '20px'}}>
+        {
+          applyInfo.applyType == 'delay' && (
+            <Cell
+              title="延期日期"
+              value={applyInfo.content}
+            />
+          )
+        }
+        <Cell title="申请说明" />
+        <Field
+          readonly
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={applyInfo.remark}
+        />
+      </CellGroup>
+     
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell
+          title="审批结果"
+        >
+          <RadioGroup
+            direction="horizontal"
+            value={formData.verifyStatus}
+            onChange={(e) => setFieldValue('verifyStatus', e.detail)}
+          >
+            <Radio name="pass" checkedColor="var(--main-bg-color)">通过</Radio>
+            <Radio name="reject" checkedColor="red">驳回</Radio>
+          </RadioGroup>
+        </Cell>
+        <Cell title="审批说明" />
+        <Field
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={formData.verifyDesc}
+          onChange={(e) => setFieldValue('verifyDesc', e.detail)}
+        />
+      </CellGroup>
+      <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
+        <Button block type="primary" loading={submitting} onClick={onSubmit}>提交审批</Button>
+      </View>
+    </Page>
+  )
+}

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

@@ -0,0 +1,114 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+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 { warn } from '@/utils/message';
+
+const today = new Date();
+export default (props) => {
+
+  const { orgIssue, applyType, ...leftProps } = 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 setFieldValue = (key, value) => {
+    setFormData({
+      ...formData,
+      [key]: value,
+    })
+  }
+
+  const onDateClick = () => {
+    setShow(false);
+    setShowDatePicker(true);
+  }
+  
+  const onDateChange = (dt) => {
+    const date = getDateStr(dt);
+    setFieldValue('content', date);
+    setShowDatePicker(false);
+    setShow(true);
+  }
+
+  const onClick = () => {
+    if (applyType == 'org-verify' || applyType == 'end') {
+      onSubmit();
+    } else {
+      setShow(true);
+    }
+  }
+
+  const onSubmit = () => {
+    try {
+      warn(!orgIssue || !orgIssue.issueId, '未找打问题单');
+      if (applyType === 'delay') {
+        warn(!formData.content, '请选择延期时间');
+      }
+
+      if (applyType == 'delay' || applyType == 'reject') {
+        warn(!formData.remark, '请填写理由说明');
+      }
+    } catch (e) {
+      return ;
+    }
+
+    const data = {
+      applyType,
+      issueId: orgIssue.issueId,
+      ...formData
+    }
+
+    setSubmitting(true);
+    postTaIssueApply(data).then(() => {
+      Taro.navigateBack({delta: 1});
+      setSubmitting(false);
+    }).catch(() => {
+      setSubmitting(false);
+    })
+  }
+  
+  return (
+    <>
+      <DatePicker
+        type="date"
+        minDate={today}
+        show={showDatePicker}
+        value={formData.content}
+        onCancel={() => setShowDatePicker(false)}
+        onChange={onDateChange}
+      />
+      <Popup position="bottom" show={show} onClose={() => setShow(false)}>
+        <CellGroup>
+          {
+            applyType == 'delay' && (
+              <Cell
+                isLink
+                title="延期时间"
+                value={formData.content}
+                onClick={onDateClick}
+              />
+            )
+          }
+          <Cell title="理由说明" />
+          <Field
+            type="textarea"
+            autosize={{ minHeight: '120px' }}
+            value={formData.remark}
+            onChange={e => setFieldValue('remark', e.detail)}
+          />
+          <View style={{display: 'flex'}}>
+            <Button block plain type="default" onClick={() => setShow(false)}>取消</Button>
+            <Button block plain type="primary" loading={submitting} onClick={onSubmit}>确定</Button>
+          </View>
+        </CellGroup>
+      </Popup>
+      <Button {...leftProps} onClick={onClick}>{props.children}</Button>
+    </>
+  )
+}

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

@@ -1,32 +0,0 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
-import { Cell, CellGroup, Field, Button } from '@antmjs/vantui';
-import Uploader from '@/components/Uploader/index';
-
-export default (props) => {
-
-  const { orgIssue } = props;
-  
-  return (
-    <>
-      <CellGroup style={{marginTop: '20px'}}>
-        <Cell title="整改结果" />        
-        <Field
-          readonly
-          type="textarea"
-          autosize={{ minHeight: '120px' }}
-          value={orgIssue?.result}
-        />
-        <Cell
-          renderTitle={
-            <Uploader
-              disabled
-              value={orgIssue?.attachList}
-            />
-          }
-        />
-      </CellGroup>
-    </>
-  )
-}

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

@@ -0,0 +1,34 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Button } from '@antmjs/vantui';
+import { putTaOrgIssue } from '@/services/taorgissue';
+import { warn } from '@/utils/message';
+
+export default (props) => {
+  const { orgIssue } = props;
+  
+  const [submitting, setSubmitting] = React.useState(false);
+  
+  const onSubmit = () => {
+    try {
+      warn(!orgIssue || !orgIssue.issueId, '未找打问题单');
+      warn(!orgIssue.result, '请填写整改结果');
+      warn(!orgIssue.attachList || !orgIssue.attachList, '请上传照片或视频');
+    } catch (e) {
+      return ;
+    }
+
+    setSubmitting(true);
+    putTaOrgIssue(orgIssue.orgIssueId, orgIssue).then(() => {
+      Taro.navigateBack({delta: 1});
+      setSubmitting(false);
+    }).catch(() => {
+      setSubmitting(false);
+    })
+  }
+
+  return (
+    <Button block type="primary" loading={submitting} onClick={onSubmit}>保存修改</Button>
+  )
+}

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

@@ -1,40 +0,0 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
-import { Cell, CellGroup, Field, Button } from '@antmjs/vantui';
-import Uploader from '@/components/Uploader/index';
-
-export default (props) => {
-
-  const { orgIssue } = props;
-  
-  return (
-    <>
-      <CellGroup style={{marginTop: '20px'}}>
-        <Cell title="整改结果" />        
-        <Field
-          readonly
-          type="textarea"
-          autosize={{ minHeight: '120px' }}
-          value={orgIssue?.result}
-        />
-        <Cell
-          renderTitle={
-            <Uploader
-              disabled
-              value={orgIssue?.attachList}
-            />
-          }
-        />
-      </CellGroup>
-      <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
-        <View>
-          <Button block type="primary">通过审核</Button>
-        </View>
-        <View style={{marginTop: '20px'}}>
-          <Button block type="default">重新整改</Button>
-        </View>
-      </View>
-    </>
-  )
-}

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

@@ -8,9 +8,7 @@ import { getTaIssueById } from '@/services/taissue';
 import { getTaOrgIssueByIssueId } from '@/services/taorgissue';
 
 import IssueInfo from '../../components/issue-info';
-import Verify from './components/Verify';
-import ExpireApply from './components/ExpireApply';
-import IssueEnd from './components/IssueEnd';
+import Apply from './components/Apply';
 
 export default (props) => {
 
@@ -19,7 +17,9 @@ export default (props) => {
 
   const [loading, setLoading] = React.useState(false);
   const [issue, setIssue] = React.useState();
-  const [orgIssue, setOrgIssue] = React.useState();
+  const [orgIssue, setOrgIssue] = React.useState({});
+
+  const showEditBtn = React.useMemo(() => !orgIssue.result, [orgIssue.issueId]);
 
   const setFormData = (key, value) => {
     setOrgIssue({
@@ -45,15 +45,57 @@ export default (props) => {
   return (
     <Page loading={loading}>
       <IssueInfo issue={issue} />
-      {
-        act == 'verify' && <Verify orgIssue={orgIssue} />
-      }
-      {
-        act == 'delay' && <ExpireApply orgIssue={orgIssue} />
-      }
-      {
-        act == 'end' && <IssueEnd orgIssue={orgIssue} />
-      }
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell title="整改结果" />
+        <Field
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={orgIssue.result}
+          onChange={e => setFormData('result', e.detail)}
+        />
+      </CellGroup>
+      <CellGroup style={{marginTop: '20px'}}>        
+        <Cell title="拍照或视频" border={false} />
+
+        <Cell
+          renderTitle={
+            <Uploader value={orgIssue.attachList} onChange={e => setFormData('attachList',e)} />
+          }
+        />
+      </CellGroup>
+      <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
+        <View>
+          {
+            showEditBtn ?
+              <Button block type="primary">保存修改</Button> :
+              <Apply block type="primary" applyType="end">申请办结</Apply>
+          }
+        </View>
+        {
+          !showEditBtn && (
+            <View style={{marginTop: '20px'}}>
+              <Apply block type="primary" applyType="org-verify">申请审核</Apply>
+            </View>
+          )
+        }
+        <View style={{marginTop: '20px', display: 'flex' }}>
+          <Apply
+            block
+            plain
+            hairline
+            type="info"
+            applyType="delay"
+          >申请延期</Apply>
+          <Apply
+            block
+            plain
+            hairline
+            type="danger"
+            applyType="reject"
+            style={{marginLeft: 'var(--main-space)'}}
+          >申请驳回</Apply>
+        </View>
+      </View>
     </Page>
   )
 }