Merge branch 'dev' of https://gitea.anxinyun.cn/free-sun/Highways4Good into dev

weapp/src/packages/patrol/index.jsx

@@ -1443,53 +1443,36 @@ const Index = () => {
           {
             isSuperAdmin && (wait === 'wait' || kind === 'handle') && <View className='appoint'>
               {
-                handleState === '待处理' ? // 管理员指派
-                  <>
-                    <RadioGroup onChange={(e) => {
-                      setIsAppoint(e.detail.value === '指派' ? true : false)
-                    }}>
-                      <Radio value='指派' checked={isAppoint} color='#0080EE' className='radio'>指派</Radio>
-                      <Radio value='不处理' checked={!isAppoint} color='#0080EE' className='radio' style={{ marginLeft: 10 }}>不处理</Radio>
-                    </RadioGroup>
-                    {
-                      isAppoint && <>
-                        <View className='picker'>
-                          <Text>责任人：{appointUser !== null ? userList[appointUser]?.name : ''}</Text>
-                          <Picker
-                            mode='selector'
-                            range={userList}
-                            rangeKey='name'
-                            onChange={e => setAppointUser(Number(e.detail.value))}
-                          >
-                            <Image src={arrowIcon} className='arrow' />
-                          </Picker>
-                        </View>
-                        <Textarea
-                          placeholder='请输入处理意见'
-                          value={handleAdvice}
-                          onInput={e => setHandleAdvice(e.target.value)}
-                          disabled={isView && handleState !== '待处理'}
-                          maxlength={1024}
-                        />
-                      </>
-                    }
-                  </>
-                  : // 管理员查看
-                  <>
-                    {/* {
-                      handleState === '不处理' && <Text>
-                        处理结果：暂不进行处理
-                      </Text>
-                    } */}
-                    {/* {
-                      (handleState === '已指派' || handleState === '已处理') && <>
-                        <View>处理意见：</View>
-                        <View>{handleAdvice}</View>
-                        <View style={{ marginTop: 10 }}>责任人：</View>
-                        <View>{appointUser !== null ? allDepUsers.find(d => d.depId === userList[appointUser]?.departmentId)?.depName : ''}-{appointUser !== null ? userList[appointUser]?.name : ''}</View>
-                      </>
-                    } */}
-                  </>
+                handleState === '待处理' && <>
+                  <RadioGroup onChange={(e) => {
+                    setIsAppoint(e.detail.value === '指派' ? true : false)
+                  }}>
+                    <Radio value='指派' checked={isAppoint} color='#0080EE' className='radio'>指派</Radio>
+                    <Radio value='不处理' checked={!isAppoint} color='#0080EE' className='radio' style={{ marginLeft: 10 }}>不处理</Radio>
+                  </RadioGroup>
+                  {
+                    isAppoint && <>
+                      <View className='picker'>
+                        <Text>责任人：{appointUser !== null ? userList[appointUser]?.name : ''}</Text>
+                        <Picker
+                          mode='selector'
+                          range={userList}
+                          rangeKey='name'
+                          onChange={e => setAppointUser(Number(e.detail.value))}
+                        >
+                          <Image src={arrowIcon} className='arrow' />
+                        </Picker>
+                      </View>
+                      <Textarea
+                        placeholder='请输入处理意见'
+                        value={handleAdvice}
+                        onInput={e => setHandleAdvice(e.target.value)}
+                        disabled={isView && handleState !== '待处理'}
+                        maxlength={1024}
+                      />
+                    </>
+                  }
+                </>
               }
             </View>
           }
@@ -1510,7 +1493,11 @@ const Index = () => {
               {
                 (isSuperAdmin && (handleState === '已指派' || handleState === '已处理')) && <>
                   <View style={{ marginTop: 10 }}>责任人：</View>
-                  <View>{appointUser !== null ? allDepUsers.find(d => d.depId === userList[appointUser]?.departmentId)?.depName : ''}-{appointUser !== null ? userList[appointUser]?.name : ''}</View>
+                  <View>
+                    {appointUser !== null ? allDepUsers.find(d => d.depId === userList.find(u => u.id === appointUser)?.departmentId)?.depName : ''}
+                    -
+                    {appointUser !== null ? userList.find(u => u.id === appointUser)?.name : ''}
+                  </View>
                 </>
               }
             </View>