feats

src/pages/org/components/issue-info/index.jsx

@@ -0,0 +1,38 @@
+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';
+
+const getDtStr = dt => !dt ? '' : dt.replace('T', ' ').substring(0, 16)
+export default (props) => {
+  const { issue } = props;
+  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/org/issue/detail/components/ExpireApply.jsx

@@ -0,0 +1,85 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+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';
+
+const today = new Date();
+export default (props) => {
+
+  const { orgIssue } = props;
+
+  const [loading, setLoading] = React.useState(false);
+  const [formData, setFormData] = React.useState({});
+  const [showDatePicker, setShowDatePicker] = React.useState(false);
+
+  const setFieldValue = (key, value) => {
+    setFormData({
+      ...formData,
+      [key]: value,
+    })
+  }
+  
+  const onDateChange = (dt) => {
+    const date = getDateStr(dt);
+    setFieldValue('content', date);
+    setShowDatePicker(false);
+  }
+
+  const onSubmit = () => {
+    try {
+      warn(!formData.content, '请选择延期时间');
+      warn(!formData.remark, '请填写延期理由');
+    } catch (e) {
+      return ;
+    }
+
+    const data = {
+      issueId: orgIssue.issueId,
+      applyType: 'delay',
+      ...formData
+    }
+
+    setLoading(true);
+    postTaIssueApply(data).then(() => {
+      Taro.navigateBack({delta: 1});
+      setLoading(false);
+    }).catch(() => {
+      setLoading(false);
+    })
+  }
+  
+  return (
+    <>
+      <DatePicker
+        type="date"
+        minDate={today}
+        show={showDatePicker}
+        value={formData.content}
+        onCancel={() => setShowDatePicker(false)}
+        onChange={onDateChange}
+      />
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell
+          isLink
+          title="延期时间"
+          value={formData.content}
+          onClick={() => setShowDatePicker(true)}
+        />
+        <Cell title="延期理由" />
+        <Field
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={formData.remark}
+          onChange={e => setFieldValue('remark', e.detail)}
+        />
+      </CellGroup>
+      <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
+        <Button block type="primary" onClick={onSubmit}>申请延期</Button>
+      </View>
+    </>
+  )
+}

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

@@ -0,0 +1,32 @@
+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/Verify.jsx

@@ -0,0 +1,40 @@
+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

@@ -7,12 +7,15 @@ import Uploader from '@/components/Uploader/index';
 import { getTaIssueById } from '@/services/taissue';
 import { getTaOrgIssueByIssueId } from '@/services/taorgissue';
 
-const getDtStr = dt => !dt ? '' : dt.replace('T', ' ').substring(0, 16)
+import IssueInfo from '../../components/issue-info';
+import Verify from './components/Verify';
+import ExpireApply from './components/ExpireApply';
+import IssueEnd from './components/IssueEnd';
 
 export default (props) => {
 
   const router = Taro.useRouter();
-  const { id } = router.params;
+  const { id, act } = router.params;
 
   const [loading, setLoading] = React.useState(false);
   const [issue, setIssue] = React.useState();
@@ -41,56 +44,16 @@ export default (props) => {
   
   return (
     <Page loading={loading}>
-      <CellGroup>
-        <Cell title="上报时间" value={getDtStr(issue?.createDate)} />
-        <Cell title="办结时间" value={issue?.expireDate} /> 
-      </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>
-      <CellGroup style={{marginTop: '20px'}}>
-        <Cell title="整改结果" />        
-        <Field
-          readonly
-          type="textarea"
-          autosize={{ minHeight: '120px' }}
-          value={orgIssue?.result}
-          onChange={e => setFormData('result', e.detail)}
-        />
-        <Cell
-          renderTitle={
-            <Uploader
-              disabled
-              value={orgIssue?.attachList}
-              onChange={e => setFormData('attachList', e)}
-            />
-          }
-        />
-      </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>
+      <IssueInfo issue={issue} />
+      {
+        act == 'verify' && <Verify orgIssue={orgIssue} />
+      }
+      {
+        act == 'delay' && <ExpireApply orgIssue={orgIssue} />
+      }
+      {
+        act == 'end' && <IssueEnd orgIssue={orgIssue} />
+      }
     </Page>
   )
 }

src/services/taissueapply.js

@@ -0,0 +1,29 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getTaIssueApply = (params) => request('/api/taIssueApply', { params });
+
+/*
+ * 新增数据
+ */
+export const postTaIssueApply = (data) => request('/api/taIssueApply', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTaIssueApplyById = (id) => request(`/api/taIssueApply/${id}`);
+
+/**
+ * 更新数据
+ * @param {*} id
+ * @param {*} data
+ * @returns
+ */
+export const putTaIssueApply = (id, data) => request(`/api/taIssueApply/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTaIssueApply = (id) => request(`/api/taIssueApply/${id}`, { method: 'delete' });