From 801770456ae3750a44e0989b0025a98ccbad24e6 Mon Sep 17 00:00:00 2001
From: bob <bob.zhang@highdatas.com>
Date: 星期四, 13 八月 2020 17:13:53 +0800
Subject: [PATCH] 最新
---
src/components/square.vue | 44 ++++++++++----
src/components/popup/portion/substep.vue | 47 +++++++++------
src/components/finance/collectionStatistics.vue | 2
vue.config.js | 4
src/components/finance/actualPayment.vue | 4
src/views/Home.vue | 4 +
src/components/popup/newProject.vue | 3
src/views/list.vue | 53 ++++++++++++++---
8 files changed, 112 insertions(+), 49 deletions(-)
diff --git a/src/components/finance/actualPayment.vue b/src/components/finance/actualPayment.vue
index 177ad41..8ef8d13 100644
--- a/src/components/finance/actualPayment.vue
+++ b/src/components/finance/actualPayment.vue
@@ -52,8 +52,8 @@
:header-cell-style="{'width': '100%', 'text-align': 'center'}"
:row-class-name="tableRowClassName">
<el-table-column type="index" width="50"> </el-table-column>
- <el-table-column prop="name" label="椤圭洰鍚嶇О" width="120" show-overflow-tooltip>
- </el-table-column>
+ <el-table-column prop="code" label="椤圭洰鍙�" width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="name" label="椤圭洰鍚嶇О" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="status" label="褰撳墠鐘舵��" width="100" align="center" :formatter="status_">
</el-table-column>
<el-table-column prop="type" label="鐮旂┒绫诲瀷鍒嗙被" show-overflow-tooltip width="130">
diff --git a/src/components/finance/collectionStatistics.vue b/src/components/finance/collectionStatistics.vue
index 8b57fd7..679a3e7 100644
--- a/src/components/finance/collectionStatistics.vue
+++ b/src/components/finance/collectionStatistics.vue
@@ -50,6 +50,7 @@
:header-cell-style="{'width': '100%', 'text-align': 'center'}"
:row-class-name="tableRowClassName">
<!-- <el-table-column type="index" width="50"> </el-table-column> -->
+ <el-table-column prop="code" label="椤圭洰鍙�" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="name" label="椤圭洰鍚嶇О" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="status" label="褰撳墠鐘舵��" width="100" align="center" :formatter="status_"></el-table-column>
<el-table-column prop="type" label="鐮旂┒绫诲瀷鍒嗙被" show-overflow-tooltip width="130"></el-table-column>
@@ -90,6 +91,7 @@
:data="tableData2"
:header-cell-style="{'width': '100%', 'text-align': 'center', 'background-color': 'rgb(247, 248, 249)'}"
:row-class-name="tableRowClassName">
+ <el-table-column prop="code" label="椤圭洰鍙�" show-overflow-tooltip></el-table-column>
<el-table-column prop="name" label="椤圭洰鍚嶇О" show-overflow-tooltip></el-table-column>
<el-table-column prop="status" label="褰撳墠鐘舵��" width="100" align="center" :formatter="status_"></el-table-column>
<el-table-column prop="totalBudget" label="鍚堝悓閲戦" align="center"></el-table-column>
diff --git a/src/components/popup/newProject.vue b/src/components/popup/newProject.vue
index ec09335..cfbd6f7 100644
--- a/src/components/popup/newProject.vue
+++ b/src/components/popup/newProject.vue
@@ -648,8 +648,7 @@
{
schemeId: me.xmId,
datas: form_array
- }
- ).then(data_ => {
+ }).then(data_ => {
window.console.log(data_);
me.loading_nextStep = false;
if (data_.data.success) {
diff --git a/src/components/popup/portion/substep.vue b/src/components/popup/portion/substep.vue
index 6c40057..86248a5 100644
--- a/src/components/popup/portion/substep.vue
+++ b/src/components/popup/portion/substep.vue
@@ -1,4 +1,11 @@
<template>
+
+ <!--
+ 宸插畬鎴愮殑涓嶄慨鏀归渶灏嗘墍鏈夌殑
+ finish ? false : false
+ 鏀规垚
+ finish ? true : false
+ -->
<div class="class_substep">
<div style="float: left; width: 20%; height: 100%; border-right: 1px solid #333333; overflow: auto; padding-top: 5%; box-sizing: border-box;">
<el-tree
@@ -19,7 +26,7 @@
<div v-show="showData['title']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">绔嬮鏈嶅姟</h3>
<div>
- <el-form :disabled="form_['title'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['title']" ref="ref_title" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['title'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['title']" ref="ref_title" label-position='right' label-width="100px" class="demo-form-inline">
<!-- <el-row>
<el-col :span="22" class="z_grid-content3">
<el-form-item label="棰樼洰绫诲瀷" prop="titleType"
@@ -245,7 +252,7 @@
<div v-show="showData['scheme']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏂规寮�鍙戞湇鍔�</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['scheme'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['scheme']" ref="ref_scheme" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['scheme'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['scheme']" ref="ref_scheme" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -398,7 +405,7 @@
<div v-show="showData['search']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏂囩尞妫�绱�</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['search'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['search']" ref="ref_search" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['search'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['search']" ref="ref_search" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -551,7 +558,7 @@
<div v-show="showData['select']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏂囩尞鍒濈瓫</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['select'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['select']" ref="ref_select" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['select'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['select']" ref="ref_select" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -703,7 +710,7 @@
<div v-show="showData['get']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鍏ㄦ枃鑾峰彇</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['get'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['get']" ref="ref_get" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['get'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['get']" ref="ref_get" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -854,7 +861,7 @@
<div v-show="showData['find']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鍏ㄦ枃绛涙煡</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['find'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['find']" ref="ref_find" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['find'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['find']" ref="ref_find" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -1005,7 +1012,7 @@
<div v-show="showData['properties']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏁版嵁鎻愬彇</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['properties'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['properties']" ref="ref_properties" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['properties'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['properties']" ref="ref_properties" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -1156,7 +1163,7 @@
<div v-show="showData['risk']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">椋庨櫓鍋忓�氫俊鎭�</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['risk'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['risk']" ref="ref_risk" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['risk'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['risk']" ref="ref_risk" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -1232,7 +1239,7 @@
<div v-show="showData['target']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">缁撳眬鎸囨爣鏁版嵁</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['target'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['target']" ref="ref_target" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['target'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['target']" ref="ref_target" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -1308,7 +1315,7 @@
<div v-show="showData['analyse']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏁版嵁鍒嗘瀽</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['analyse'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['analyse']" ref="ref_analyse" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['analyse'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['analyse']" ref="ref_analyse" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -1458,7 +1465,7 @@
<div v-show="showData['arrange']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏁版嵁鏁寸悊涓庡綍鍏�</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['arrange'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['arrange']" ref="ref_arrange" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['arrange'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['arrange']" ref="ref_arrange" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -1609,7 +1616,7 @@
<div v-show="showData['meta']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">Meta 鍒嗘瀽</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['meta'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['meta']" ref="ref_meta" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['meta'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['meta']" ref="ref_meta" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -1760,7 +1767,7 @@
<div v-show="showData['grade']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">GRADE 璇佹嵁璐ㄩ噺璇勪环</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['grade'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['grade']" ref="ref_grade" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['grade'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['grade']" ref="ref_grade" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -1911,7 +1918,7 @@
<div v-show="showData['tsa']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">TSA 鍒嗘瀽</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['tsa'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['tsa']" ref="ref_tsa" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['tsa'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['tsa']" ref="ref_tsa" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -2063,7 +2070,7 @@
<div v-show="showData['compose']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏂囩鎾板啓</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['compose'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['compose']" ref="ref_compose" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['compose'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['compose']" ref="ref_compose" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -2214,7 +2221,7 @@
<div v-show="showData['translate']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">璇█缈昏瘧鍙婃鼎鑹�</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['translate'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['translate']" ref="ref_translate" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['translate'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['translate']" ref="ref_translate" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -2365,7 +2372,7 @@
<div v-show="showData['evaluation']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏂囩璇勪及</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['evaluation'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['evaluation']" ref="ref_evaluation" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['evaluation'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['evaluation']" ref="ref_evaluation" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -2517,7 +2524,7 @@
<div v-show="showData['recommend']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏉傚織鎺ㄨ崘</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['recommend'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['recommend']" ref="ref_recommend" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['recommend'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['recommend']" ref="ref_recommend" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -2668,7 +2675,7 @@
<div v-show="showData['format']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">鏂囩鏍煎紡淇敼</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['format'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['format']" ref="ref_format" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['format'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['format']" ref="ref_format" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -2819,7 +2826,7 @@
<div v-show="showData['Contribute']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">缃戜笂鎶曠</h3>
<div style="z-index: 1">
- <el-form :disabled="form_['Contribute'].finish ? true : false" :rules="rules_check" :show-message="false" :model="form_['Contribute']" ref="ref_Contribute" label-position='right' label-width="100px" class="demo-form-inline">
+ <el-form :disabled="form_['Contribute'].finish ? false : false" :rules="rules_check" :show-message="false" :model="form_['Contribute']" ref="ref_Contribute" label-position='right' label-width="100px" class="demo-form-inline">
<el-row>
<el-col :span="6" class="z_grid-content3">
<el-form-item label="鍚堝悓閲戦" prop="budget"
diff --git a/src/components/square.vue b/src/components/square.vue
index 71b4ef2..b764377 100644
--- a/src/components/square.vue
+++ b/src/components/square.vue
@@ -15,17 +15,27 @@
<el-button type="primary" @click="query_(true)">鏌ヨ</el-button>
<el-button type="info" @click="empty_">閲嶇疆</el-button>
</el-form-item>
+
+ <el-form-item label="鎺掑簭">
+ <el-select v-model="orderBy" size="mini" style="width: 100px;" @change="query_(true)" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in options_orderBy"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
</el-form>
</el-col>
<el-col :span="4" >
<el-button type="primary" @click="createNew">鍒涘缓</el-button>
-
</el-col>
</el-row>
<div ref="list_div" class="infinite-list-wrapper" style="overflow:auto; border-top: 1px solid #c3c5c7;">
- <div v-if="isRefresh" class="list" v-infinite-scroll="load" infinite-scroll-disabled="disabled">
+ <div v-if="isRefresh" class="list" v-infinite-scroll="load" infinite-scroll-disabled="disabled" infinite-scroll-distance="20">
<div v-for="one in dataList" :key="one.id" class="list-item">
<el-row>
<el-col :span="17"><div class="grid-content z_grid-content1 grid-content_text" @click="showItem(one)">{{one.title}}</div></el-col>
@@ -134,7 +144,7 @@
</span>
</el-dialog>
- <el-dialog v-if="dialogFormTitle" title="绔嬮璇勪及" :visible.sync="dialogFormTitle" append-to-body>
+ <el-dialog v-if="dialogFormTitle" title="绔嬮璇勪及" :visible.sync="dialogFormTitle" append-to-body width="850px">
<div class="transition-box class_substep class_form_z1" style="height: 400px; overflow-y: auto; text-align: left; margin: 0 10px;">
<div>
<el-form :show-message="false" :model="form_['title']" ref="ref_title" label-position='right' label-width="100px" class="demo-form-inline">
@@ -235,9 +245,7 @@
</el-form-item>
</el-col>
<el-col :span="6" class="z_grid-content3">
- <el-form-item label="浜や粯鐗�" prop="mustAttach"
- :rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
- >
+ <el-form-item label="浜や粯鐗�">
<el-switch v-model="form_['title'].mustAttach"></el-switch>
</el-form-item>
</el-col>
@@ -348,7 +356,7 @@
</div>
</el-dialog>
- <el-dialog v-if="dialogFormTitle2" title="绔嬮璇勪及" :visible.sync="dialogFormTitle2">
+ <el-dialog v-if="dialogFormTitle2" title="绔嬮璇勪及" :visible.sync="dialogFormTitle2" width="850px">
<div class="transition-box class_substep class_form_z1" style="height: 400px; overflow-y: auto; text-align: left; margin: 0 10px;">
<div>
<el-form :show-message="false" :model="form_['title']" ref="ref_title" label-position='right' label-width="100px" class="demo-form-inline">
@@ -448,9 +456,7 @@
</el-form-item>
</el-col>
<el-col :span="6" class="z_grid-content3">
- <el-form-item label="浜や粯鐗�" prop="mustAttach"
- :rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
- >
+ <el-form-item label="浜や粯鐗�">
<el-switch v-model="form_['title'].mustAttach"></el-switch>
</el-form-item>
</el-col>
@@ -653,6 +659,18 @@
label: "閽堝瀹㈡埛鏃㈠畾鐨勯鐩柟鍚�"
}
],
+ orderBy: "",
+ options_orderBy: [
+ {
+ value: "title",
+ label: "鎸夊悕绉�"
+ },
+ {
+ value: "",
+ label: "鎸夋椂闂�"
+ }
+ ],
+
titleInput_: "",
options_users: [],
@@ -673,8 +691,7 @@
attachment:"222"
},
formLabelWidth:"100px",
- dataList: [
- ],
+ dataList: [],
options_parttimeUser: [],
loading: false,
@@ -1214,6 +1231,9 @@
params.title = query.title;
//params.desc = query.desc;
}
+ if(this.orderBy) {
+ params.orderBy = this.orderBy;
+ }
this.$axios.post(url,
params
)
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 4752691..d566a4f 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -245,6 +245,10 @@
{'id': "111", 'title': "椤圭洰绠＄悊", 'path': "0_111"}, //杩斿洖鐨勬暟缁勫瓧娈�
{'id': "112", 'title': "浠诲姟绠＄悊", 'path': "0_112"},
{'id': "111_1", 'title': "淇℃伅骞垮満", 'path': 'square', 'parentId': "111"}, //
+
+ //{'id': "111_2", 'title': "椤圭洰鎬昏", 'path': 'list', 'parentId': "111"}, //
+ //{'id': "111_3", 'title': "椤圭洰鍒嗘瀽", 'path': 'Overview', 'parentId': "111"}, //
+
{'id': "112_1", 'title': "浠诲姟鍒楄〃", 'path': 'calendarTask', 'parentId': "112"}, //
{'id': "112_2", 'title': "浠诲姟鎬昏", 'path': 'taskOverview', 'parentId': "112"}, //
],
diff --git a/src/views/list.vue b/src/views/list.vue
index 6b3c9f1..5b7a84c 100644
--- a/src/views/list.vue
+++ b/src/views/list.vue
@@ -1,7 +1,7 @@
<template>
+ <!-- 宸插畬鎴愮殑涓嶄慨鏀归渶灏� finish1 鏀规垚 finish -->
<div>
<div align="left">
-
<div class="btn-line">
<!-- <el-button type="primary" @click="addProject">鏂板缓椤圭洰</el-button> -->
<el-button type="primary" v-if="editShow" @click="editProject">缂栬緫椤圭洰</el-button>
@@ -51,27 +51,28 @@
<el-table highlight-current-row
ref="data_table"
@current-change="tableChange"
+ @sort-change="sortChange"
v-loading="loading_table"
size="small"
:data="tableData"
:header-cell-style="{'width': '100%', 'text-align': 'center'}"
:row-class-name="tableRowClassName">
<el-table-column type="index" width="50"> </el-table-column>
- <el-table-column prop="code" label="椤圭洰鍙�" width="130">
+ <el-table-column prop="code" label="椤圭洰鍙�" width="130" sortable="custom">
</el-table-column>
- <el-table-column prop="name" label="椤圭洰鍚嶇О" width="120" show-overflow-tooltip>
+ <el-table-column prop="name" label="椤圭洰鍚嶇О" width="120" sortable="custom" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="status" label="褰撳墠鐘舵��" width="100" align="center" :formatter="status_">
+ <el-table-column prop="status" label="褰撳墠鐘舵��" width="100" sortable="custom" align="center" :formatter="status_">
</el-table-column>
- <el-table-column prop="totalCnt" label="鏈嶅姟椤圭洰鏁�" width="100" align="center">
+ <el-table-column prop="totalCnt" label="鏈嶅姟椤圭洰鏁�" width="120" align="center">
</el-table-column>
- <el-table-column prop="finishCnt" label="宸插畬鎴愰」鐩�" width="100" align="center">
+ <el-table-column prop="finishCnt" label="宸插畬鎴愰」鐩�" width="120" align="center">
</el-table-column>
- <el-table-column prop="delayCnt" label="寤舵湡椤圭洰" width="100" align="center">
+ <el-table-column prop="delayCnt" label="寤舵湡椤圭洰" width="100" align="center">
</el-table-column>
- <el-table-column prop="startTime" label="寮�濮嬫椂闂�" width="100" align="center" :formatter="dateFormat_">
+ <el-table-column prop="startTime" label="寮�濮嬫椂闂�" width="100" sortable="custom" align="center" :formatter="dateFormat_">
</el-table-column>
- <el-table-column prop="endTime" label="缁撴潫鏃堕棿" width="100" align="center" :formatter="dateFormat_" >
+ <el-table-column prop="endTime" label="缁撴潫鏃堕棿" width="100" sortable="custom" align="center" :formatter="dateFormat_" >
</el-table-column>
<el-table-column prop="desc" label="椤圭洰鎻忚堪" show-overflow-tooltip></el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="300">
@@ -197,6 +198,8 @@
"Randomised controlled trial (RCT)",
"Other"
],
+
+ orderBy: "",
}
},
mounted() { //缁勪欢閰嶇疆鍚庯紝椤甸潰鏄剧ず鍓嶃�傜敤浜庡姞杞芥暟鎹�
@@ -209,6 +212,29 @@
this.getData();
},
methods: {
+ sortChange(column, prop, order) {
+ this.orderBy = "";
+ if (column.prop && column.order) {
+ this.orderBy = this.toLine(column.prop);
+ if (column.order == "descending") {
+ this.orderBy += " desc";
+ }
+ }
+
+ this.query_();
+ },
+
+ // 涓嬪垝绾胯浆鎹㈤┘宄�
+ toHump(name) {
+ return name.replace(/\_(\w)/g, function(all, letter){
+ return letter.toUpperCase();
+ });
+ },
+ // 椹煎嘲杞崲涓嬪垝绾�
+ toLine(name) {
+ return name.replace(/([A-Z])/g,"_$1").toLowerCase();
+ },
+
download() {
if (!this.selected) {
this.$message({message:'璇烽�夋嫨涓嬭浇鏉＄洰', type: 'warning'});
@@ -346,6 +372,10 @@
params.type = query.type;
}
+ if(this.orderBy) {
+ params.orderBy = this.orderBy;
+ }
+
this.$axios.get(url, {
params
})
@@ -402,8 +432,9 @@
this.rowData = {};
},
editProject() {
- if(!this.selected || this.selected.status == "finish"){
-
+ //宸插畬鎴愮殑涓嶄慨鏀归渶灏� finish1 鏀规垚 finish
+ // if(!this.selected || this.selected.status == "finish"){
+ if(!this.selected || this.selected.status == "finish1"){
this.$message({message:'璇烽�変腑涓�鏉℃湭瀹屾垚鐨勯」鐩�', type: 'warning'});
}else {
this.rowData = {
diff --git a/vue.config.js b/vue.config.js
index af4341e..d28944c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,8 +4,8 @@
devServer: {
proxy: {
'/api/api': {
- target: 'http://srs.highdatas.com:8090',
- // target: 'http://192.168.31.233:8090',
+ // target: 'http://srs.highdatas.com:8090',
+ target: 'http://192.168.31.233:8090',
// target: 'http://ichwt2.natappfree.cc',
changeOrigin: true,
ws: true,
--
Gitblit v1.8.0