完成：黄家明项目的开发并存档

src/hjm/query.tsx

@@ -115,7 +115,7 @@ const Query = () => {
         title: '请上传车辆图片',
         icon: 'error'
       });
-      // return false
+      return false
     }
     if (!FormData.gpsNo) {
       Taro.showToast({
@@ -130,7 +130,7 @@ const Query = () => {
       ...FormData,
       status: 1
     }).then(() => {
-      Taro.showToast({title: `绑定成功`, icon: 'success'})
+      Taro.showToast({title: `安装成功`, icon: 'success'})
       setTimeout(() => {
         return Taro.navigateBack()
       }, 1000)
@@ -311,7 +311,7 @@ const Query = () => {
   const onClaimVehicle = () => {
     updateHjmCar({
       ...FormData,
-      status: 2,
+      claim: 1,
       driverId: Taro.getStorageSync('UserId'),
       driverName: Taro.getStorageSync('RealName')
     }).then(() => {
@@ -361,6 +361,7 @@ const Query = () => {
       return false
     }
 
+
     // 4.查询角色
     const role = await listUserRole({userId: Taro.getStorageSync('UserId')})
     const roleCode = role[0].roleCode;
@@ -394,9 +395,15 @@ const Query = () => {
             }
           }
         }
-
-        // 1.符合条件则由安装人员安装车辆，否则提示无权限
-        console.log(roleCode,'roleCode..')
+        // 1.已认领则展示车辆
+        if (carInfo.status == 2) {
+          setClaimVehicle(false)
+          Taro.setNavigationBarTitle({
+            title: '车辆信息'
+          })
+          return false
+        }
+        // 2.符合条件则由安装人员安装车辆，否则提示无权限
         if (carInfo.status == 0 && roleCode != 'Installer') {
           Taro.setNavigationBarTitle({
             title: '安装设备'
@@ -408,24 +415,29 @@ const Query = () => {
           setDisabled(true)
           return false
         }
-        // 2.如果已安装，则判断是否已认领车辆
+        // 3.如果已安装，则判断是否已认领车辆
         if (carInfo.status == 1 && roleCode == 'kuaidiyuan') {
           // 2.1先查询名下有多少辆车
           const carCount = await pageHjmCar({driverId: Taro.getStorageSync('UserId')})
-          if (carCount?.count && carCount?.count == 0) {
+          if (carCount?.count == 0) {
             // 2.2无车辆则认领
             setClaimVehicle(true)
             Taro.setNavigationBarTitle({
               title: '认领车辆'
             })
-          } else {
-            // 2.3存在车辆则展示车辆信息
-            setClaimVehicle(false)
-            Taro.setNavigationBarTitle({
-              title: '车辆信息'
-            })
           }
+          return false
         }
+        // if(carInfo.status == 1 && Taro.getStorageSync('UserId') != carInfo.driverId){
+        //   Taro.showToast({
+        //     title: '暂无权限',
+        //     icon: 'error'
+        //   })
+        //   setTimeout(() => {
+        //     Taro.navigateBack()
+        //   },2000)
+        //   return false
+        // }
       }
     }
 
@@ -448,6 +460,8 @@ const Query = () => {
     })
   }, [])
 
+  // @ts-ignore
+  // @ts-ignore
   return (
     <>
       {/* 未安装 */}
@@ -539,10 +553,11 @@ const Query = () => {
                     onChange={(value) => setFormData({...FormData, gpsNo: value})}
                   />
                   <div
-                    className="right"
+                    className="right p-1"
                     style={{display: 'flex', alignItems: 'center'}}
+                    onClick={saveGpsNo}
                   >
-                    <Scan onClick={saveGpsNo}/>
+                    <Scan />
                   </div>
                 </div>
               </Form.Item>
@@ -637,7 +652,6 @@ const Query = () => {
                   )}
                 </div>
               </Form.Item>
-
               <Form.Item
                 label={'操作员'}
                 name="driver"
@@ -648,10 +662,7 @@ const Query = () => {
             </Form>
           </div>
         </div>
-      ) : ''}
-
-      {/* 已安装 */}
-      {FormData?.status != 0 ? (
+      ) : (
         <div className={'car-info w-full bg-white'}>
           {/* 显示多张图片 */}
           <div style={{
@@ -705,6 +716,9 @@ const Query = () => {
             <Cell className={'car-info-item-content'}>
               电子围栏：{FormData.fenceName}
             </Cell>
+            <Cell className={'car-info-item-content'}>
+              安装状态：{FormData.status == 2 ? '已绑定' : '未绑定'}
+            </Cell>
             <Cell className={'car-info-item-content'}>
               操作员：{FormData.status == 2 ? FormData.driver : '-'}
             </Cell>
@@ -754,7 +768,7 @@ const Query = () => {
             }
           </div>
         </div>
-      ) : ''}
+      )}
     </>
   )
 }