产权交易审核进度、项目详情字段优化

src/views/project/projectDetail.vue

@@ -133,7 +133,10 @@
             <van-col span="24"><span>授权情况</span>{{ detail.authorization }}</van-col>
           </van-row>
           <van-row>
-            <van-col span="24"><span>拟流转用途</span>{{ detail.contractPurpose }}</van-col>
+            <van-col span="24"><span>{{detail.projectNumber == '小微工程' ? '工程内容':'拟流转土地用途'}}</span>{{ detail.contractPurpose }}</van-col>
+          </van-row>
+          <van-row>
+            <van-col span="24"><span>{{detail.projectNumber == '小微工程' ? '承包范围':'其它需要披露的事项'}}</span>{{ detail.cracksEvents }}</van-col>
           </van-row>
           <van-row>
             <van-col span="24"><span>受让方条件</span>{{ detail.condition }}</van-col>

src/views/user/index.vue

@@ -7,7 +7,16 @@
           <img v-else src="../../assets/images/user_tx.png" style="width: 2rem;height: 2rem;border-radius: 50%;">
         </van-col>
         <van-col span="17">
-          <p>{{phone}}</p>
+          <p @click="openView = true">
+            {{phone}}
+            <span class="activitiStatus">
+              {{
+                activitiStatus == '1' ? '待审':
+                activitiStatus == '2' ? '驳回':
+                activitiStatus == '3' ? '通过':''
+              }}
+            </span>
+          </p>
           <p onclick="window.location='accountSetting'">账户设置</p>
         </van-col>
       </van-row>
@@ -21,6 +30,20 @@
     <van-button class="loginOut" round color="#007E72" @click="loginOut">
       退出登录
     </van-button>
+    <van-dialog v-model="openView" title="审核记录">
+      <div style="height: 50vh;overflow-y: scroll;padding: 0 5PX;">
+        <van-cell-group :title="'进度'+(index+1)" v-for="(item,index) in historyList">
+          <van-cell title="活动名称" v-model="item.activityName" :border="false" />
+          <van-cell title="办理人ID" v-model="item.assignee" :border="false" />
+          <van-cell title="办理人"   v-model="item.assigneeName" :border="false" />
+          <van-cell title="审批意见" v-model="item.comment" :border="false" />
+          <van-cell title="开始时间" v-model="item.startTime" :border="false" />
+          <van-cell title="结束时间" v-model="item.endTime" :border="false" />
+          <van-cell title="耗时" v-model="item.durationInMillis" :border="false" />
+        </van-cell-group>
+
+      </div>
+    </van-dialog>
   </div>
 </template>
 
@@ -28,6 +51,7 @@
 import { getMember , supplyList , deleteSupply} from "@/api/user/index";
 import { logout ,getInfo } from "@/api/login/index";
 import Cookies from "js-cookie";
+import request from "@/utils/request";
 
 export default {
   name: "user",
@@ -35,12 +59,40 @@ export default {
     return {
       phone:'',
       user:'',
+      activitiStatus:'',
+      instanceId:'',
+      historyList:[],
+      openView:false
     };
   },
   created() {
     this.getInfo();
   },
   methods: {
+    getHistoryList: function () {
+      this.loading = true;
+      var queryParams = {
+        processInstanceId: this.instanceId
+      };
+      return request({
+        url: "/activiti/process/listHistory",
+        method: "post",
+        data: queryParams,
+      })
+        .then((response) => {
+          this.historyList = response.rows;
+          this.historyList.forEach((row) => {
+            row.startTime = this.format(row.startTime, "yyyy-MM-dd HH:mm:ss");
+            row.endTime =  this.format(row.endTime, "yyyy-MM-dd HH:mm:ss");
+            row.durationInMillis = this.formatTotalDateSub(
+              row.durationInMillis / 1000
+            );
+          });
+          this.total = response.total;
+          this.loading = false;
+        })
+        .then(() => {});
+    },
     loginOut(){
       logout().then(response => {
         var keys = document.cookie.match(/[^ =;]+(?=\=)/g);
@@ -59,9 +111,52 @@ export default {
           console.log(response)
           Cookies.set('memberId',response.data.id)
           this.phone = response.data.phone;
+          this.activitiStatus = response.data.activitiStatus;
+          this.instanceId = response.data.instanceId;
+          this.getHistoryList()
         });
       });
     },
+    format(time, format) {
+      var t = new Date(time);
+      var tf = function (i) { return (i < 10 ? '0' : '') + i };
+      return format.replace(/yyyy|MM|dd|HH|mm|ss/g, function (a) {
+        switch (a) {
+          case 'yyyy':
+            return tf(t.getFullYear());
+            break;
+          case 'MM':
+            return tf(t.getMonth() + 1);
+            break;
+          case 'mm':
+            return tf(t.getMinutes());
+            break;
+          case 'dd':
+            return tf(t.getDate());
+            break;
+          case 'HH':
+            return tf(t.getHours());
+            break;
+          case 'ss':
+            return tf(t.getSeconds());
+            break;
+        }
+      })
+    },
+    /**
+     * 计算出相差天数
+     * @param secondSub
+     */
+    formatTotalDateSub (secondSub) {
+      var days = Math.floor(secondSub / (24 * 3600));     // 计算出小时数
+      var leave1 = secondSub % (24*3600) ;                // 计算天数后剩余的毫秒数
+      var hours = Math.floor(leave1 / 3600);              // 计算相差分钟数
+      var leave2 = leave1 % (3600);                       // 计算小时数后剩余的毫秒数
+      var minutes = Math.floor(leave2 / 60);              // 计算相差秒数
+      var leave3 = leave2 % 60;                           // 计算分钟数后剩余的毫秒数
+      var seconds = Math.round(leave3);
+      return days + "天" + hours + "时" + minutes + "分" + seconds + '秒';
+    },
   },
 };
 </script>
@@ -69,6 +164,16 @@ export default {
 <style scoped lang="scss">
 .app-container {
 
+}
+.activitiStatus{
+  color: #FEE1AA;
+  border: 1px solid #FEE1AA;
+  display: inline-block;
+  padding: 2px 10px;
+  border-radius: 5px;
+  margin-left: 10px;
+  cursor: pointer;
+  font-size: 16px;
 }
   .header{
     background-color: #007E72;
@@ -84,7 +189,7 @@ export default {
       text-align: center;
       padding: 10px;
       border-radius: 0.5rem;
-      margin-top: 0.2rem;
+      margin-top: 0.4rem;
       font-size: 12PX;
       background: #FEE1AA url("../../assets/images/seting.png") no-repeat left center;
       background-size: 0.5rem;