页面优化

src/components/personalForms/entityInfo.vue

@@ -18,6 +18,9 @@
                     <el-option label="多层" value="多层"></el-option>
                     <el-option label="独栋别墅" value="独栋别墅"></el-option>
                     <el-option label="联排别墅" value="联排别墅"></el-option>
+                    <el-option label="叠拼别墅" value="叠拼别墅"></el-option>
+                    <el-option label="双拼别墅" value="双拼别墅"></el-option>
+                    <el-option label="成套住宅" value="成套住宅"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>

src/views/complex/index.vue

@@ -314,12 +314,12 @@
                 <parentTable v-loading="listLoading" :data="majorTodoList" stripe border :isBoard=450 style="width: 100%">
                   <el-table-column label="项目名称" align="center" width="200" show-overflow-tooltip>
                     <template slot-scope="{row}">
-                      <span>{{ row.productionName == null ? row.orderName : row.productionName }}</span>
+                      <span class="enableClick" @click="majorToDo(row)">{{ row.productionName == null ? row.orderName : row.productionName }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="订单号" align="center" width="150">
                     <template slot-scope="{row}">
-                      <span @contextmenu.prevent="$doCopy(row.orderId)">{{ row.orderId }}</span>
+                      <span class="enableClick" @click="majorToDo(row)" @contextmenu.prevent="$doCopy(row.orderId)">{{ row.orderId }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="价值意见书号" align="center" width="280" prop="statementNo">
@@ -390,12 +390,12 @@
                   style="width: 100%">
                   <el-table-column label="项目编号" align="center" width="140">
                     <template slot-scope="{row}">
-                      <span @contextmenu.prevent="$doCopy(row.orderId)">{{ row.orderId }}</span>
+                      <span class="enableClick" @click="personalToDo(row)" @contextmenu.prevent="$doCopy(row.orderId)">{{ row.orderId }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="坐落" align="center" width="200" show-overflow-tooltip>
                     <template slot-scope="{row}">
-                      <span>{{ row.location }}</span>
+                      <span class="enableClick" @click="personalToDo(row)">{{ row.location }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="当前节点" align="center" width="130">
@@ -526,7 +526,7 @@
                   :isBoard=450 style="width: 100%;">
                   <el-table-column label="项目编号" align="center" width="150">
                     <template slot-scope="{row}">
-                      <span @contextmenu.prevent="$doCopy(row.orderId)">{{ row.orderId }}</span>
+                      <span class="enableClick" @click="assetsToDo(row)" @contextmenu.prevent="$doCopy(row.orderId)">{{ row.orderId }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="分单类型" align="center" width="150">
@@ -546,7 +546,7 @@
                   </el-table-column>
                   <el-table-column label="项目名称" align="center" width="250">
                     <template slot-scope="{row}">
-                      <span>{{ row.reportName || row.statementName || row.name }}</span>
+                      <span class="enableClick" @click="assetsToDo(row)">{{ row.reportName || row.statementName || row.name }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="业务类型" align="center" width="150">
@@ -632,17 +632,17 @@
                   </el-table-column>
                   <el-table-column label="订单号" width="120" align="center">
                     <template slot-scope="{row}">
-                      <span>{{ row.majorSimple.orderId }}</span>
+                      <span class="enableClick" @click="majorCheck(row)">{{ row.majorSimple.orderId }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="项目名称" width="200" align="center" show-overflow-tooltip>
                     <template slot-scope="{row}">
-                      <span>{{ row.majorSimple.name ? row.majorSimple.name : row.majorSimple.orderName }}</span>
+                      <span class="enableClick" @click="majorCheck(row)">{{ row.majorSimple.name ? row.majorSimple.name : row.majorSimple.orderName }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="报告号" width="180" align="center">
                     <template slot-scope="{row}">
-                      <span>{{ row.majorSimple.reportNo ? row.majorSimple.reportNo : '--' }}</span>
+                      <span class="enableClick" @click="majorCheck(row)">{{ row.majorSimple.reportNo ? row.majorSimple.reportNo : '--' }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="申报人" align="center">
@@ -723,17 +723,17 @@
                   </el-table-column>
                   <el-table-column label="订单号" width="120" align="center">
                     <template slot-scope="{row}">
-                      <span>{{ row.assetsSimple.orderId }}</span>
+                      <span class="enableClick" @click="assetsDeclareCheck(row)">{{ row.assetsSimple.orderId }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="项目名称" width="200" align="center" show-overflow-tooltip>
                     <template slot-scope="{row}">
-                      <span>{{ row.assetsSimple.name ? row.assetsSimple.name : row.assetsSimple.orderName }}</span>
+                      <span class="enableClick" @click="assetsDeclareCheck(row)">{{ row.assetsSimple.name ? row.assetsSimple.name : row.assetsSimple.orderName }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="报告号" width="180" align="center">
                     <template slot-scope="{row}">
-                      <span>{{ row.assetsSimple.reportNo ? row.assetsSimple.reportNo : '--' }}</span>
+                      <span class="enableClick" @click="assetsDeclareCheck(row)">{{ row.assetsSimple.reportNo ? row.assetsSimple.reportNo : '--' }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="申报人" align="center">
@@ -995,13 +995,13 @@ export default {
         return;
       }
       if (reportNo && statementNo) {
-        this.$router.push(`/major/todo/detail?id=${row.businessId}&reportNo=${reportNo}&statementNo=${row.statementNo}&doWorkflow=${true}&currentNodeId=${row.currentNodeId}&currentNodeCode=${row.nodeCode}&back=${'/major/todo'}`)
+        this.$router.push(`/major/todo/detail?id=${row.businessId}&reportNo=${reportNo}&statementNo=${row.statementNo}&doWorkflow=${true}&currentNodeId=${row.currentNodeId}&currentNodeCode=${row.nodeCode}&back=${'/complex/index'}`)
       } else if (!reportNo && statementNo) {
-        this.$router.push(`/major/todo/detail?id=${row.businessId}&statementNo=${row.statementNo}&doWorkflow=${true}&currentNodeId=${row.currentNodeId}&currentNodeCode=${row.nodeCode}&back=${'/major/todo'}`)
+        this.$router.push(`/major/todo/detail?id=${row.businessId}&statementNo=${row.statementNo}&doWorkflow=${true}&currentNodeId=${row.currentNodeId}&currentNodeCode=${row.nodeCode}&back=${'/complex/index'}`)
       } else if (reportNo && !statementNo) {
-        this.$router.push(`/major/todo/detail?id=${row.businessId}&reportNo=${reportNo}&doWorkflow=${true}&currentNodeId=${row.currentNodeId}&currentNodeCode=${row.nodeCode}&back=${'/major/todo'}`)
+        this.$router.push(`/major/todo/detail?id=${row.businessId}&reportNo=${reportNo}&doWorkflow=${true}&currentNodeId=${row.currentNodeId}&currentNodeCode=${row.nodeCode}&back=${'/complex/index'}`)
       } else {
-        this.$router.push(`/major/todo/detail?id=${row.businessId}&doWorkflow=${true}&currentNodeId=${row.currentNodeId}&currentNodeCode=${row.nodeCode}&back=${'/major/todo'}`)
+        this.$router.push(`/major/todo/detail?id=${row.businessId}&doWorkflow=${true}&currentNodeId=${row.currentNodeId}&currentNodeCode=${row.nodeCode}&back=${'/complex/index'}`)
       }
       if (row.nodeCode==='STATEMENT_IN' || row.nodeCode==='STATEMENT_OUT' ||
           row.nodeCode==='REPORT_IN'|| row.nodeCode==='REPORT_OUT' ||
@@ -1027,7 +1027,7 @@ export default {
             this.$router.push(`/major/production/in?openDialog=${true}`)
           }
       else {
-        this.$router.push(`/personal/todo?id=${row.businessId}&currentNodeCode=${row.nodeCode}&orderId=${row.orderId}&doWorkflow=${true}&back=${'/personal/todo/list'}`)
+        this.$router.push(`/personal/todo?id=${row.businessId}&currentNodeCode=${row.nodeCode}&orderId=${row.orderId}&doWorkflow=${true}&back=${'/complex/index'}`)
       }
     },
     assetsToDo(row) {
@@ -1086,7 +1086,7 @@ export default {
           path: "/assets/orderDetail",
           query: {
             row: JSON.stringify(newRow),
-            back: '/assets/todoList',
+            back: '/complex/index',
             couldEdit: true,
             couldBack: true,
             disabledStatus: false,
@@ -1178,7 +1178,7 @@ export default {
       }
     },
     majorCheck(row) {
-      let backPath = '/administration/major/declare/check/list';
+      let backPath = '/complex/index';
       this.$router.push(`/administration/major/declare/check?businessId=${row.businessId}&businessType=${row.businessType}&doWorkflow=${true}&back=${backPath}`)
     },
     openMajorDeclare() {
@@ -1196,7 +1196,7 @@ export default {
       }
     },
     assetsDeclareCheck(row) {
-      let backPath = '/administration/assets/declare/check/list';
+      let backPath = '/complex/index';
       this.$router.push(`/administration/assets/declare/check?businessId=${row.businessId}&businessType=${row.businessType}&doWorkflow=${true}&back=${backPath}&couldEdit=${true}`)
     }
   },
@@ -1516,4 +1516,8 @@ option {
 .cleanInputIcon:hover {
   cursor: pointer
 }
+.enableClick:hover{
+    color:#1890ff;
+    cursor: pointer;
+ }
 </style>

src/views/personal/pendingList.vue

@@ -35,7 +35,7 @@
         </el-table-column>
         <el-table-column label="面积" align="center" width="130" v-if="!hiddenLabels.includes('acreage')" prop="acreage">
           <template slot-scope="{row}">
-            <span>{{ row.acreage? row.acreage: '-' }}</span>
+            <span>{{ row.acreage? row.acreage+'平': '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="单价" align="center" width="130" v-if="!hiddenLabels.includes('price')" prop="price">

src/views/personal/todoList.vue

@@ -37,7 +37,7 @@
         </el-table-column>
         <el-table-column label="面积" align="center" width="130" v-if="!hiddenLabels.includes('acreage')" prop="acreage">
           <template slot-scope="{row}">
-            <span>{{ row.acreage? row.acreage: '-' }}</span>
+            <span>{{ row.acreage? row.acreage+'平': '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="单价" align="center" width="130" v-if="!hiddenLabels.includes('price')" prop="price">