feats

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

@@ -46,9 +46,19 @@ export default (props) => {
         {
           isPrev && <Button type="primary" block plain hairline style={{flex: 1}} onClick={onPrev}>上一题</Button>
         }
-        <Button type="primary" block style={{flex: 1, marginLeft: isPrev ? '1em' : 0 }} onClick={onNext}>
-          {isFinished ? '提交' : (value == -1 ? '开始测评' : '下一题')}
-        </Button>
+        {
+          value == -1 ? (
+            <Button type="primary" block style={{flex: 1, marginLeft: isPrev ? '1em' : 0 }} onClick={onNext}>
+              {readonly ? '查看测评' : '开始测评'}
+            </Button>
+          ) : (
+            !(readonly && isFinished) && (
+              <Button type="primary" block style={{flex: 1, marginLeft: isPrev ? '1em' : 0 }} onClick={onNext}>
+                {isFinished ? '提交' : '下一题'}
+              </Button>
+              )
+          )
+        }
       </View>
     </View>
   )

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

@@ -9,6 +9,8 @@ import mapIcon from '@/assets/icons/marker.png';
 export default (props) => {
   const { checkItemInfo, answer, readonly, onChange, onLoadingChange } = props;
 
+  const [loc, setLoc] = React.useState();
+
   const setLoading = (v) => {
     if (onLoadingChange) {
       onLoadingChange(v)
@@ -17,6 +19,7 @@ export default (props) => {
   
   const setFieldChange = (key, val) => {
     onChange({
+      location: loc,
       ...answer || {},
       [key]: val,
     })
@@ -39,7 +42,7 @@ export default (props) => {
   
   return (
     <View>
-      <Map location={answer?.location} onLocChange={e => !readonly && setFieldChange('location', e)} />
+      <Map location={answer?.location} onLocChange={setLoc} />
       <CellGroup>
         <Cell
           title="点位"

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

@@ -29,7 +29,9 @@ export default (props) => {
     if (quInfo?.quId) {
       setLoading(true);
       getTaCheckAnswerItem({ quId: quInfo.quId, isMine: true }).then(res => {
-        onChange(res && res.length ? res[0] : {});
+        if (res && res[0]) {
+          onChange(res[0]);
+        }
         setLoading(false);
       }).catch(() => {
         setLoading(false);

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

@@ -1,9 +1,9 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
+import { View, ScrollView } from '@tarojs/components';
 import { Notify } from '@antmjs/vantui';
 import Page from '@/layouts/index';
-import { getTaCheckItemById, preCheck, getTaCheckItemAnswer } from '@/services/tacheckitem';
+import { getTaCheckItemById, preCheck, getTaCheckItemAnswer, putTaCheckItemAnswer } from '@/services/tacheckitem';
 import { getTaCheckItemQu } from '@/services/tacheckitemqu';
 import VABC from '@/components/VABC';
 import { ROLE_INSPECTOR } from '@/utils/user';
@@ -47,6 +47,8 @@ export default (props) => {
   }
 
   const onAnswerItemChange = (answerItem, quInfo) => {
+    if (!answerItem) return;
+
     const an = {...(answer || {})}
     const answerItemList = an.answerItemList || []
 
@@ -86,7 +88,27 @@ export default (props) => {
 
   // 作答
   const onSubmit = () => {
+    if (readonly) return;
+
+    const finished = quList.filter(x => x.finished).length == quList.length;
+    if (!answer || !answer.answerItemList || !finished) {
+      Notify.show({
+        message: '请作答完成所有题目',
+        type: 'warning',
+      })
+      return;
+    }
 
+    setLoading(true);
+    putTaCheckItemAnswer(id, answer).then(() => {
+      setLoading(false);
+      const t = setTimeout(() => {
+        clearTimeout(t);
+        Taro.navigateBack({delta: 1});
+      }, 1000);      
+    }).catch(() => {
+      setLoading(false);
+    });
   }
 
   React.useEffect(() => {
@@ -143,39 +165,42 @@ export default (props) => {
           />
         )}
       >
-      {
-        index == -1 && (
-          <LocForm
-            readonly={readonly}
-            checkItemInfo={checkItemInfo}
-            answer={answer}
-            onChange={setAnswer}
-            onLoadingChange={setLoading}
-          />
-        )
-      }
-      {
-        quList.map((x, inx) => {
-          const answerItem = answer?.answerItemList?.filter(y => y.quId == x.quId)[0];
-
-          return (
-            index == inx && (
-              <Question
-                key={x.quId}
-                cursor={inx}
-                readonly={readonly}
-                quInfo={x}
-                answerItem={answerItem}
-                total={quList?.length}
-                onChange={e => onAnswerItemChange(e, x)}
-                onPrev={() => onIndexChange(null, -1)}
-                onNext={() => onIndexChange(null, 1)}
-                onLoadingChange={setLoading}
-              />
-            )
+        <ScrollView scrollY style={{height: '100%'}}>
+        {
+          index == -1 && (
+            <LocForm
+              readonly={readonly}
+              checkItemInfo={checkItemInfo}
+              answer={answer}
+              onChange={setAnswer}
+              onLoadingChange={setLoading}
+            />
           )
-        })
-      }
+        }
+        {
+          quList.map((x, inx) => {
+            const answerItem = answer?.answerItemList?.filter(y => y.quId == x.quId)[0];
+
+            return (
+              index == inx && (
+                <Question
+                  key={x.quId}
+                  cursor={inx}
+                  readonly={readonly}
+                  quInfo={x}
+                  answerItem={answerItem}
+                  total={quList?.length}
+                  onChange={e => onAnswerItemChange(e, x)}
+                  onPrev={() => onIndexChange(null, -1)}
+                  onNext={() => onIndexChange(null, 1)}
+                  onLoadingChange={setLoading}
+                />
+              )
+            )
+          })
+        }
+          
+        </ScrollView>
       </VABC>
     </Page>
   )

src/services/tacheckitem.js

@@ -34,3 +34,8 @@ export const preCheck = (id, opts = {}) => request(`/api/taCheckItem/${id}/answe
  * 获取当前答案
  */
 export const getTaCheckItemAnswer = (id) => request(`/api/taCheckItem/${id}/answer`);
+
+/*
+ * 获取当前答案
+ */
+export const putTaCheckItemAnswer = (id, data) => request(`/api/taCheckItem/${id}/answer`, { method: 'put', data });