Commit 6dd99586 authored by 杨帆's avatar 杨帆
Browse files

Merge branch 'dev-yf'' into 'develop' 

Dev yf'

See merge request !11
parents 82c13bd1 4ac88765

src/views/riskProject/add/taskList.vue

+22 −16
Original line number Diff line number Diff line
@@ -22,14 +22,18 @@ 
          <div>开始时间:</div>

          <div>

            {{

              timestampToTimes(messageList.startTime,'DT2') || messageList.startTime

              timestampToTimes(messageList.startTime, "DT2") ||

                messageList.startTime

            }}

          </div>

        </van-grid-item>

        <van-grid-item>

          <div>结束时间:</div>

          <div>

            {{ timestampToTimes(messageList.endTime,'DT2') || messageList.endTime }}

            {{

              timestampToTimes(messageList.endTime, "DT2") ||

                messageList.endTime

            }}

          </div>

        </van-grid-item>

      </van-grid>
@@ -143,7 +147,7 @@ 
              label="任务结束时间"

              :formatter="

                () => {

                  return timestampToTimes(form.endTime,'DT2')

                  return timestampToTimes(form.endTime, 'DT2');

                }

              "

              input-align="right"
@@ -222,15 +226,17 @@ 
                    </van-row>

                    <van-row>

                      <van-col span="7"

                        ><span class="field-title">审批结果：</span></van-col

                        ><span class="field-title">任务节点：</span></van-col

                      >

                      <van-col span="17">{{ item.taskName }}</van-col>

                    </van-row>

                    <van-row>

                    <van-row v-show="item.taskResult">

                      <van-col span="7"

                        ><span class="field-title">岗位：</span></van-col

                        ><span class="field-title">审批结果：</span></van-col

                      >

                      <van-col span="17">{{ item.taskResult }}</van-col>

                      <van-col span="17">{{

                        item.taskResult == 1 ? "审批通过" : "审批否决"

                      }}</van-col>

                    </van-row>

                    <!-- <van-row>

                    <van-col span="7"
@@ -341,7 +347,7 @@ 
      </div>

    </div>

    <div

      v-show="pathAuth == 'riskApprove' && status == 2"

      v-show="pathAuth == 'riskApprove0' && status == 2"

      style="display: flex;

        justify-content: space-around;

        background-color: #fff;
@@ -560,7 +566,7 @@ export default { 
    },

    //执行任务

    performTasks() {

      console.log( this.messageList,'LLLL')

      console.log(this.messageList, "LLLL");

      sessionStorage.setItem(

        "buildingId",

        this.messageList.riskBuildingListDtos[0].buildingId

src/views/riskProject/approve/index.vue

+6 −5
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
                    type="info"

                    size="mini"

                    @click="todetail(index, item)"

                    >{{ active == 2 ? "去处理" : "去审批" }}</van-button

                    >{{ active == 0 ? "去审批" : "查看详情" }}</van-button

                  >

                </van-row>

              </van-col>
@@ -121,7 +121,7 @@ export default { 
      buildingList: []

    };

  },

  created() {

  mounted() {

    this.postList(0);

  },

  methods: {
@@ -144,9 +144,9 @@ export default { 
        duration: 0

      });

      let url = `/risk/plan/approve/list?status=running`;

      if (name == 0) {

      if (this.active == 0) {

        url = `/risk/plan/approve/list?status=running`;

      } else if (name == 1) {

      } else if (this.active == 1) {

        url = `/risk/plan/approve/list?status=completed`;

      } else {

        url = `/risk/plan/approve/list?status=return`;
@@ -175,7 +175,8 @@ export default { 
          // buildingId: item.buildingId

        }

      });

      sessionStorage.setItem("pathAuth", "riskApprove");

      if (this.active == 0) sessionStorage.setItem("pathAuth", "riskApprove0");

      else sessionStorage.setItem("pathAuth", "riskApprove1");

      sessionStorage.setItem("planId", item.id);

      sessionStorage.setItem("buildingId", "");

    }