feats

src/app.config.js

@@ -20,6 +20,8 @@ export default defineAppConfig({
     'pages/reporting/detail/index',
     'pages/reset-password/index',
     'pages/check/list/index',
+    'pages/check/loc/list/index',
+    'pages/check/loc/edit/index',
     'pages/check/edit/index',
   ],
   window: {

src/components/Pickerful/index.jsx

@@ -44,22 +44,24 @@ export default (props) => {
           onSearch={onSearch}
           clearable
         />
-        <ScrollView scrollY style={{ flex: 1 }}>
-          {
-            list.map(item => (
-              <Cell
-                key={item[keyValue]}
-                title={item[labelValue]}
-                renderRightIcon={
-                  checked && checked[keyValue] == item[keyValue] ?
-                  <Icon name="success" color="#1A7565" /> :
-                  null
-                }
-                onClick={() => setChecked(item)}
-              />
-            ))
-          }
-        </ScrollView>
+        <View style={{ flex: 1, overflow: 'hidden' }}>
+          <ScrollView scrollY style={{ height: '100%' }}>
+            {
+              list.map(item => (
+                <Cell
+                  key={item[keyValue]}
+                  title={item[labelValue]}
+                  renderRightIcon={
+                    checked && checked[keyValue] == item[keyValue] ?
+                    <Icon name="success" color="#1A7565" /> :
+                    null
+                  }
+                  onClick={() => setChecked(item)}
+                />
+              ))
+            }
+          </ScrollView>
+        </View>
         <View style={{ padding: '8px 2em' }}>
           <Button block type="primary" disabled={!checked} onClick={onClick}>确定</Button>
         </View>

src/components/Pickerful/style.module.less

@@ -1,8 +1,7 @@
 
 .pickerful-box {
   width: 90vw;
-  height: 100vh;
-  padding-bottom: env(safe-area-inset-bottom);
+  height: 100%;
   display: flex;
   flex-direction: column;
 

src/components/map/index.jsx

@@ -6,7 +6,7 @@ import iconPath from '@/assets/icons/marker.png';
 import style from './style.module.less';
 
 export default (props) => {
-  const { location } = props;
+  const { location, onLocChange } = props;
 
   const [currentPos, setCurPos] = React.useState();
   const [lngLat, setLngLat] = React.useState([,]);
@@ -39,6 +39,7 @@ export default (props) => {
   React.useEffect(() => {
     getLocation().then((res) => {
       setCurPos(res);
+      onLocChange([res.longitude, res.latitude].join(','))
     }).catch((err) => {
       Taro.showToast({
         title: '定位失败',

src/pages/check/list/components/Card.jsx

@@ -0,0 +1,51 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View, Text } from '@tarojs/components';
+import { Cell, Button } from '@antmjs/vantui';
+import style from './style.module.less';
+
+export default (props) => {
+  const { detail, onClick } = props;
+
+  const handleClick = (e) => {
+    if (onClick) {
+      onClick(e)
+    }
+  }
+  
+  return (
+    <View className={style['check-card-wrapper']}>
+      <Cell
+        renderTitle={(
+          <View className={style['check-card-title']}>
+            <View>{detail?.title}</View>
+            <View className={style['check-card-subtitle']}>
+              <View>{detail?.startDate}</View>
+              <View>{detail?.endDate}</View>
+            </View>
+          </View>
+        )}
+        renderLabel={(
+          <View className={style['check-card-actions']}>
+            <View>
+              <Button
+                plain
+                type="primary"
+                icon="location-o"
+                onClick={() => handleClick('loc')}
+              >实地测评</Button>
+            </View>
+            <View>
+              <Button
+                plain
+                type="primary"
+                icon="orders-o"
+                onClick={() => handleClick('survey')}
+              >调查问卷</Button>
+            </View>
+          </View>
+        )}
+      />
+    </View>
+  )
+}

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

@@ -0,0 +1,39 @@
+
+.check-card-wrapper {
+  width: calc(100% - var(--main-space) * 2);
+  margin: var(--main-space);
+  background: #FFFFFF;
+  box-shadow: 0px 18px 22px 1px rgba(0,0,0,0.06);
+  border-radius: 8px;
+  overflow: hidden;
+
+  .check-card-title {
+    font-size: 30px;
+    color: #333;
+
+    display: flex;
+
+    & > View {
+      flex: 1;
+    }
+
+    .check-card-subtitle {
+      flex: none;
+      font-size: 24px;
+      color: #757575;
+      margin-left: 1em;
+    }
+  }
+
+  .check-card-actions {
+    display: flex;
+    align-items: center;
+    width: 100%;
+
+    & > view {
+      flex: 1;
+      text-align: center;
+      font-size: 28px;
+    }
+  }
+}

src/pages/check/list/index.jsx

@@ -5,20 +5,29 @@ import { ROLE_INSPECTOR, ROLE_MANAGER } from '@/utils/user';
 import { View } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 import PowerList from '@/components/PowerList';
-import List from "../components/List";
-
+import { getTaCheck } from '@/services/tacheck';
+import Card from './components/Card';
 
+const queryParams = {isValid: true};
 export default (props) => {
+
+  const onClick = (typ, item) => {
+    if (typ == 'loc') {
+      Taro.navigateTo({
+        url: `/pages/check/loc/list/index?checkId=${item.checkId}`
+      })
+    }
+  }
+
   return (
     <Page roles={[ROLE_INSPECTOR]}>
-      <Tabs sticky>
-        <Tab title="实地测评">
-          <List />
-        </Tab>
-        <Tab title="问卷调查">
-
-        </Tab>
-      </Tabs>
+      <PowerList
+        request={getTaCheck}
+        params={queryParams}
+        renderItem={item => (
+          <Card key={item.checkId} detail={item} onClick={(e) => onClick(e, item)} />
+        )}
+      />
     </Page>
   )
 }

src/pages/check/loc/edit/components/FormTpl.jsx

@@ -0,0 +1,32 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View, ScrollView } from '@tarojs/components';
+
+const fullHeight = {
+  height: '100%',
+}
+
+const fmBdStyle = {
+  height: 'calc(100% - 80px)',
+}
+
+const fmActStyle = {
+  padding: 'var(--main-space)',
+  height: '80px',
+}
+
+export default (props) => {
+
+  const { action } = props;
+  
+  return (
+    <View style={fullHeight}>
+      <View style={fmBdStyle}>
+        <ScrollView scrollY style={fullHeight}>
+          {props.children}
+        </ScrollView>
+      </View>
+      <View style={fmActStyle}>{action}</View>
+    </View>
+  )
+}

src/pages/check/loc/edit/components/LocForm.jsx

@@ -0,0 +1,42 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { CellGroup, Cell, Field, Button } from '@antmjs/vantui';
+import Map from '@/components/map';
+import mapIcon from '@/assets/icons/marker.png';
+import FormTpl from './FormTpl';
+
+export default (props) => {
+
+  const { detail, onDetailChange, onClick } = props;
+  
+  const setFieldChange = (key, val) => {
+    onDetailChange({
+      ...detail,
+      [key]: val,
+    })
+  }
+  
+  return (
+    <FormTpl
+      action={(
+        <Button block type="primary" onClick={onClick}>下一步</Button>
+      )}
+    >
+      <Map onLocChange={e => setFieldChange('location', e)} />
+      <CellGroup>
+        <Cell
+          isLink
+          title="点位"
+          value={detail?.name}
+        />
+        <Field
+          placeholder="请输入地址"
+          value={detail?.addr}
+          leftIcon={mapIcon}
+          onChange={e => setFieldChange('addr', e.detail)}
+        />
+      </CellGroup>
+    </FormTpl>
+  )
+}

src/pages/check/loc/edit/index.config.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '实地测评'
+})

src/pages/check/loc/edit/index.jsx

@@ -0,0 +1,41 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import Page from '@/layouts/index';
+import { getTaCheckItemById, preCheck } from '@/services/tacheckitem';
+import { getTaCheckItemQu } from '@/services/tacheckitemqu';
+import LocForm from './components/LocForm';
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { id } = router.params;
+
+  const [loading, setLoading] = React.useState(false);
+  const [checkInfo, setCheckInfo] = React.useState();
+  const [quList, setQuList] = React.useState([]);
+
+  React.useEffect(() => {
+    setLoading(true);
+    preCheck(id).then(() => {
+      getTaCheckItemById(id).then(res => {
+        setCheckInfo(res);
+      });
+  
+      getTaCheckItemQu({pageSize: 200, itemId: id}).then(res => {
+        setLoading(false);
+        setQuList(res.records || []);
+      }).catch(() => {
+        setLoading(false);
+      });
+    }).catch(() => {
+      setLoading(false);
+    });
+  }, [id]);
+  
+  return (
+    <Page loading={loading}>
+      <LocForm />
+    </Page>
+  )
+}

src/pages/check/loc/list/index.config.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '实地测评'
+})

src/pages/check/loc/list/index.jsx

@@ -0,0 +1,37 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Cell } from '@antmjs/vantui';
+import Page from '@/layouts/index';
+import PowerList from '@/components/PowerList';
+import { getTaCheckItem } from '@/services/tacheckitem';
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { checkId } = router.params;
+
+  const params = React.useMemo(() => ({
+    checkId,
+    itemType: 'loc',
+    pageSize: 100,
+  }), [checkId]);
+
+  const onClick = (item) => {
+    Taro.navigateTo({
+      url: `/pages/check/loc/edit/index?id=${item.itemId}`
+    })
+  }
+  
+  return (
+    <Page>
+      <PowerList
+        request={getTaCheckItem}
+        params={params}
+        renderItem={item => (
+          <Cell key={item.itemId} title={item.name} onClick={() => onClick(item)} />
+        )}
+      />
+    </Page>
+  )
+}

src/pages/issue/components/Issue/index.jsx

@@ -108,7 +108,7 @@ export default (props) => {
     <View>
       <LocType
         show={showLocType}
-        value={formData.addr}
+        value={formData.locId}
         onCancel={() => setShowLocType(false)}
         onChange={onLocTypeChange}
       />

src/services/tacheck.js

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

src/services/tacheckitem.js

@@ -0,0 +1,31 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getTaCheckItem = (params) => request('/api/taCheckItem', { params });
+
+/*
+ * 新增数据
+ */
+export const postTaCheckItem = (data) => request('/api/taCheckItem', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTaCheckItemById = (id) => request(`/api/taCheckItem/${id}`);
+
+/**
+ * 更新数据
+ * @param {*} id
+ * @param {*} data
+ * @returns
+ */
+export const putTaCheckItem = (id, data) => request(`/api/taCheckItem/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTaCheckItem = (id) => request(`/api/taCheckItem/${id}`, { method: 'delete' });
+
+export const preCheck = (id) => request(`/api/taCheckItem/${id}/answer/pre-check`, { method: 'put' });

src/services/tacheckitemqu.js

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

src/utils/request.js

@@ -53,7 +53,7 @@ export default function request(api, options = {}) {
       }
 
       if (data.code === 1000) {
-        if (data.data.token) {
+        if (data.data?.token) {
           setToken(data.data.token);
         }