dev01 1 yıl önce
ebeveyn
işleme
05545d504f
2 değiştirilmiş dosya ile 57 ekleme ve 96 silme
  1. 56 95
      src/pages/detail/index.jsx
  2. 1 1
      src/pages/detail/index.less

+ 56 - 95
src/pages/detail/index.jsx

@@ -131,10 +131,9 @@ class Detail extends Component {
             <View className="item">
               {
                 // 我的打卡
-                this.$instance.router.params.type == 0 &&
                 <View className="infor">
-                  {data.processStatus == 1 && <Image className="statusicon" src={Un} />}
-                  {data.processStatus == 2 && <Image className="statusicon" src={Ok} />}
+                  {this.$instance.router.params.type == 0 && data.processStatus == 1 && <Image className="statusicon" src={Un} />}
+                  {this.$instance.router.params.type == 0 && data.processStatus == 2 && <Image className="statusicon" src={Ok} />}
                   <View className="title">
                     <View className="aname">
                       {data.projectName}
@@ -192,6 +191,8 @@ class Detail extends Component {
                   </View>
 
                   {
+                    // 重新发起
+                    this.$instance.router.params.type == 0 &&
                     data.processStatus == 3 &&
                     <View className="option">
                       <AtButton
@@ -206,103 +207,63 @@ class Detail extends Component {
                       >
                         重新发起
                       </AtButton>
-                    </View>}
-                </View>
-              }
-              {
-                // 审核
-                this.$instance.router.params.type == 1 &&
-                <View className="infor">
-                  <View className="title">
-                    <View className="aname">
-                      {data.projectName}
-                    </View>
-                  </View>
-                  <View className="userName">
-                    <View className="uNtext">
-                      负责人:{data.adminName}
-                    </View>
-                  </View>
-                  <View className="userName">
-                    <View className="uNtext">
-                      研发人员:{data.name}
-                    </View>
-                  </View>
-                  <View className="userName">
-                    <View className="uNtext">
-                      打卡工时:{data.duration}
-                    </View>
-                  </View>
-                  <View className="userName">
-                    <View className="uNtext">
-                      附件:
-                      {attachmentUrl && attachmentUrl.length > 0 &&
-                        <ImagePicker
-                          files={attachmentUrl || []}
-                          showAddBtn={false}
-                        />}
-                    </View>
-                  </View>
-                  <View className="userName">
-                    <View className="uNtext">
-                      审核状态:
-                      <Text style={{ color: ["#000000", "#dbc037", "#6eb173", "red"][data.processStatus] }}>
-                        {["", "待审核", "审核通过", "审核驳回"][data.processStatus]}
-                      </Text>
-                      <Text className="logbt" onClick={() => { this.setState({ historicalIsOpened: true }) }}>查看审核日志</Text>
                     </View>
-                  </View>
-                  {data.processStatus == 1 && <View style={{ marginTop: "30px" }}>
-                    <AtTextarea
-                      value={this.state.opinion}
-                      onChange={(value) => {
-                        this.setState({
-                          opinion: value,
-                        });
-                      }}
-                      maxLength={100}
-                      placeholder="请填写审批意见"
-                    />
-                    <View className="operation">
-                      <AtButton
-                        type="secondary"
-                        circle
-                        loading={this.state.loading}
-                        onClick={() => {
-                          this.setState({
-                            isInquiryOpened: true,
-                            inquiryTitle: "提醒",
-                            inquiryContent: "您确定要驳回此申请吗?",
-                            inquiryFn: () => {
-                              this.agree(3);
-                            },
-                          });
-                        }}
-                      >
-                        驳回
-                      </AtButton>
-                      <AtButton
-                        type="primary"
-                        loading={this.state.loading}
-                        circle
-                        onClick={() => {
-                          if (this.state.loading) {
-                            return;
-                          }
+                  }
+                  {
+                    // 审核
+                    this.$instance.router.params.type == 1 &&
+                    data.processStatus == 1 && <View style={{ marginTop: "30px" }}>
+                      <AtTextarea
+                        value={this.state.opinion}
+                        onChange={(value) => {
                           this.setState({
-                            isInquiryOpened: true,
-                            inquiryTitle: "提醒",
-                            inquiryContent: "您确定要同意此申请吗?",
-                            inquiryFn: () => {
-                              this.agree(2);
-                            },
+                            opinion: value,
                           });
                         }}
-                      >
-                        同意
-                      </AtButton>
+                        maxLength={100}
+                        placeholder="请填写审批意见"
+                      />
+                      <View className="operation">
+                        <AtButton
+                          type="secondary"
+                          circle
+                          loading={this.state.loading}
+                          onClick={() => {
+                            this.setState({
+                              isInquiryOpened: true,
+                              inquiryTitle: "提醒",
+                              inquiryContent: "您确定要驳回此申请吗?",
+                              inquiryFn: () => {
+                                this.agree(3);
+                              },
+                            });
+                          }}
+                        >
+                          驳回
+                        </AtButton>
+                        <AtButton
+                          type="primary"
+                          loading={this.state.loading}
+                          circle
+                          onClick={() => {
+                            if (this.state.loading) {
+                              return;
+                            }
+                            this.setState({
+                              isInquiryOpened: true,
+                              inquiryTitle: "提醒",
+                              inquiryContent: "您确定要同意此申请吗?",
+                              inquiryFn: () => {
+                                this.agree(2);
+                              },
+                            });
+                          }}
+                        >
+                          同意
+                        </AtButton>
+                      </View>
                     </View>
-                  </View>}
+                  }
                 </View>
               }
             </View>

+ 1 - 1
src/pages/detail/index.less

@@ -156,7 +156,7 @@
 .statusicon {
   position: absolute;
   right: 0;
-  top: 100px;
+  top: 50px;
   width: 222px;
   height: 197px;
 }