feats

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

@@ -46,10 +46,14 @@ export default (props) => {
     <View>
       <Map location={answer?.location} onLocChange={setLoc} />
       <CellGroup>
-        <Cell
-          title="点位"
-          value={checkItemInfo?.name}
-        />
+        {
+          checkType == 'loc' && (
+            <Cell
+              title="点位"
+              value={checkItemInfo?.name}
+            />
+          )
+        }
         <Field
           readonly={readonly}
           placeholder={checkType == 'loc' ? '请输入地址' : '请填写小区名称'}

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

@@ -81,29 +81,31 @@ export default (props) => {
           }
         </CellGroup>
       </RadioGroup>
-      <CellGroup style={{marginTop: '20px'}}>
-        <Cell title="测评标准" />
-        <Cell
-          renderTitle={
-            <RichText nodes={quInfo?.stand} />
-          }
-        />
-      </CellGroup>
       {
         checkType != 'survey' && (
-          <CellGroup style={{marginTop: '20px'}}>        
-            <Cell title="拍照或视频" border={false} />
-    
-            <Cell
-              renderTitle={
-                <Uploader
-                  disabled={readonly}
-                  value={answerItem?.attachList}
-                  onChange={e => setFieldChange('attachList',e)}
-                />
-              }
-            />
-          </CellGroup>
+          <>
+            <CellGroup style={{marginTop: '20px'}}>
+              <Cell title="测评标准" />
+              <Cell
+                renderTitle={
+                  <RichText nodes={quInfo?.stand} />
+                }
+              />
+            </CellGroup>
+            <CellGroup style={{marginTop: '20px'}}>        
+              <Cell title="拍照或视频" border={false} />
+      
+              <Cell
+                renderTitle={
+                  <Uploader
+                    disabled={readonly}
+                    value={answerItem?.attachList}
+                    onChange={e => setFieldChange('attachList',e)}
+                  />
+                }
+              />
+            </CellGroup>
+          </>
         )
       }
     </View>

src/pages/check/edit/index.jsx

@@ -13,6 +13,7 @@ import {
 import { getTaCheckItemQu } from '@/services/tacheckitemqu';
 import VABC from '@/components/VABC';
 import { ROLE_INSPECTOR } from '@/utils/user';
+import { warn } from '@/utils/message';
 import LocForm from './components/LocForm';
 import Question from './components/Question';
 import Footer from './components/Footer/index';
@@ -42,18 +43,12 @@ export default (props) => {
   const onIndexChange = (n) => {
     if (index == -1 && n != -1) {
       if (!readonly) {
-        if (!answer?.addr) {
-          Notify.show({
-            message: typ == 'loc' ? '请填写地址' : '请填写小区名称',
-            type: 'warning',
-          })
-          return;
-        }
-        if (!answer?.location) {
-          Notify.show({
-            message: '未能获取定位信息, 请重试',
-            type: 'warning',
-          })
+        try {
+          warn(!answer?.addr, typ == 'loc' ? '请填写地址' : '请填写小区名称');
+          warn(!answer?.location, '未能获取定位信息, 请重试');
+          warn(typ == 'survey' && !answer?.sex, '请选择性别');
+          warn(typ == 'survey' && !answer?.age, '请选择年龄段');
+        } catch (error) {
           return;
         }
       }
@@ -116,7 +111,7 @@ export default (props) => {
     }
 
     setLoading(true);
-    putTaCheckItemAnswer(id, answer).then(() => {
+    putTaCheckItemAnswer(checkItemInfo.itemId, answer).then(() => {
       setLoading(false);
       const t = setTimeout(() => {
         clearTimeout(t);