Browse Source

显示昵称

master
YF-yuan 3 years ago
parent
commit
b969ae458a
11 changed files with 218 additions and 9 deletions
  1. +6
    -0
      src/api/chain/coordinationManage/cooperateList.js
  2. +12
    -0
      src/api/second/coordinationManage/cooperateList.js
  3. +1
    -2
      src/views/chain/search.vue
  4. +1
    -1
      src/views/common/fragment/HeaderRight.vue
  5. +1
    -1
      src/views/common/layout/HeaderNav.vue
  6. +1
    -1
      src/views/second/coordinationManage/cooperateList/basicTarget.vue
  7. +1
    -1
      src/views/second/coordinationManage/cooperateList/constraint.vue
  8. +1
    -1
      src/views/second/coordinationManage/cooperateList/reward.vue
  9. +66
    -2
      src/views/second/taskSummary/basicTable.vue
  10. +64
    -0
      src/views/second/taskSummary/constraint.vue
  11. +64
    -0
      src/views/second/taskSummary/reward.vue

+ 6
- 0
src/api/chain/coordinationManage/cooperateList.js View File

import axios from "@/config/axios"
export default {
getDataList(params) {
return axios.get('/chainindustryapply/index', {params})
}
}

+ 12
- 0
src/api/second/coordinationManage/cooperateList.js View File

import axios from "@/config/axios"
export default {
getBasicDataList(params) {
return axios.get('/cooperateapply/getBasicTaskCheckApplyList', { params })
},
getRewardDataList(params) {
return axios.get('/cooperateapply/getSpecialPowerCheckApplyList', { params })
},
getConstraintDataList(params) {
return axios.get('/cooperateapply/getRigidityConstraintCheckApplyList', { params })
},
}

+ 1
- 2
src/views/chain/search.vue View File

> >
<el-button style="margin-left: 20px" size="small" type="warning" v-if="showExport" @click="emitExport">导出</el-button> <el-button style="margin-left: 20px" size="small" type="warning" v-if="showExport" @click="emitExport">导出</el-button>
</el-form> </el-form>
<!-- <div class="operating" v-if="showExport">
</div> -->
</div> </div>
</template> </template>



+ 1
- 1
src/views/common/fragment/HeaderRight.vue View File

<el-submenu index="user" popper-class="ele-menu-pop"> <el-submenu index="user" popper-class="ele-menu-pop">
<template slot="title"> <template slot="title">
<el-avatar :src="user.avatar"/> <el-avatar :src="user.avatar"/>
<span>{{ user.username || '' }}</span>
<span>{{ user.nickname || '' }}</span>
</template> </template>
<el-menu-item index="password" @click="showPassword"><i class="el-icon-key"></i><span>修改密码</span></el-menu-item> <el-menu-item index="password" @click="showPassword"><i class="el-icon-key"></i><span>修改密码</span></el-menu-item>
<el-divider/> <el-divider/>

+ 1
- 1
src/views/common/layout/HeaderNav.vue View File



export default { export default {
name: "EleHeaderNav", name: "EleHeaderNav",
components: {EleSidebarItem},
components: {EleSidebarItem},
data() { data() {
return { return {
scroll: false, // 用于鼠标滚轮事件节流 scroll: false, // 用于鼠标滚轮事件节流

+ 1
- 1
src/views/second/coordinationManage/cooperateList/basicTarget.vue View File

<script> <script>
import search from "../../search"; import search from "../../search";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import api from "@/api/second/coordinationManage/approvalCooperation";
import api from "@/api/second/coordinationManage/cooperateList";
export default { export default {
components: { components: {
search, search,

+ 1
- 1
src/views/second/coordinationManage/cooperateList/constraint.vue View File

<script> <script>
import search from "../../search"; import search from "../../search";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import api from "@/api/second/coordinationManage/approvalCooperation";
import api from "@/api/second/coordinationManage/cooperateList";
export default { export default {
components: { components: {
search, search,

+ 1
- 1
src/views/second/coordinationManage/cooperateList/reward.vue View File

<script> <script>
import search from "../../search"; import search from "../../search";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import api from "@/api/second/coordinationManage/approvalCooperation";
import api from "@/api/second/coordinationManage/cooperateList";
export default { export default {
components: { components: {
search, search,

+ 66
- 2
src/views/second/taskSummary/basicTable.vue View File

align="center" align="center"
prop="points" prop="points"
></el-table-column> ></el-table-column>
<el-table-column label="扣分" width="80" align="center">
<template slot-scope="{ row, $index }">
<div @click="showText($index, true)" style="height: 100%">
<el-input
:ref="'input' + $index"
v-model="row.deptPoints"
v-if="row.focus"
@blur="
showText($index, false);
updatePoints(row, $index);
"
></el-input>
<span v-else>{{ row.deptPoints || 0 }}</span>
</div>
</template>
</el-table-column>
<el-table-column <el-table-column
label="区牵头单位" label="区牵头单位"
width="95" width="95"
(document.documentElement.clientHeight - 260 - 45) / 45 (document.documentElement.clientHeight - 260 - 45) / 45
), ),
}, },
preValue: null,
}; };
}, },
created() { created() {
}, },
}, },
methods: { methods: {
updatePoints(row, index) {
if (row.deptPoints == this.preValue) {
return;
}
if (
row.deptPoints < 0 ||
row.deptPoints > row.points ||
!row.deptPoints.trim()
) {
this.$message({
type: "warning",
message: "请输入数值0~" + row.points,
});
let data = this.dataList;
data[index].deptPoints = this.preValue;
this.dataList = data;
return;
}
editApi
.editItem({
itemId: row.id,
expectedPoints: row.deptPoints,
})
.then((res) => {
this.$message({ type: "success", message: "修改成功" });
})
.catch(() => {
this.$message.error("修改失败");
this.getDataList();
});
},
showText(index, bool) {
try {
let data = this.dataList;
// data[index].focus = bool;
// this.dataList = data;
this.$set(this.dataList[index], "focus", bool);
if (bool) {
this.preValue = data[index].deptPoints;
}
this.$nextTick(() => {
this.$refs["input" + index].focus();
});
} catch (e) {
console.log(e);
}
},
exportData(data) { exportData(data) {
this.loading = true; this.loading = true;
api api
if (res.data.code == 0) { if (res.data.code == 0) {
// window.open(res.data.data); // window.open(res.data.data);
// window.location.href=res.data.data; // window.location.href=res.data.data;
window.location.href=res.data.data
window.location.href = res.data.data;
this.$message({ this.$message({
type: "success", type: "success",
message: "导出成功", message: "导出成功",
} else { } else {
this.$message({ this.$message({
type: "error", type: "error",
message: res.data.msg
message: res.data.msg,
}); });
} }
}) })

+ 64
- 0
src/views/second/taskSummary/constraint.vue View File

align="center" align="center"
prop="points" prop="points"
></el-table-column> ></el-table-column>
<el-table-column label="扣分" width="80" align="center">
<template slot-scope="{ row, $index }">
<div @click="showText($index, true)" style="height: 100%">
<el-input
:ref="'input' + $index"
v-model="row.deptPoints"
v-if="row.focus"
@blur="
showText($index, false);
updatePoints(row, $index);
"
></el-input>
<span v-else>{{ row.deptPoints || 0 }}</span>
</div>
</template>
</el-table-column>
<el-table-column <el-table-column
label="区牵头单位" label="区牵头单位"
width="95" width="95"
(document.documentElement.clientHeight - 260 - 45) / 45 (document.documentElement.clientHeight - 260 - 45) / 45
), ),
}, },
preValue: null,
}; };
}, },
created() { created() {
}, },
}, },
methods: { methods: {
updatePoints(row, index) {
if (row.deptPoints == this.preValue) {
return;
}
if (
row.deptPoints < 0 ||
row.deptPoints > row.points ||
!row.deptPoints.trim()
) {
this.$message({
type: "warning",
message: "请输入数值0~" + row.points,
});
let data = this.dataList;
data[index].deptPoints = this.preValue;
this.dataList = data;
return;
}
editApi
.editItem({
itemId: row.id,
expectedPoints: row.deptPoints,
})
.then((res) => {
this.$message({ type: "success", message: "修改成功" });
})
.catch(() => {
this.$message.error("修改失败");
this.getDataList();
});
},
showText(index, bool) {
try {
let data = this.dataList;
// data[index].focus = bool;
// this.dataList = data;
this.$set(this.dataList[index], "focus", bool);
if (bool) {
this.preValue = data[index].deptPoints;
}
this.$nextTick(() => {
this.$refs["input" + index].focus();
});
} catch (e) {
console.log(e);
}
},
exportData(data) { exportData(data) {
this.loading = true; this.loading = true;
api api

+ 64
- 0
src/views/second/taskSummary/reward.vue View File

align="center" align="center"
prop="points" prop="points"
></el-table-column> ></el-table-column>
<el-table-column label="加分" width="80" align="center">
<template slot-scope="{ row, $index }">
<div @click="showText($index, true)" style="height: 100%">
<el-input
:ref="'input' + $index"
v-model="row.deptPoints"
v-if="row.focus"
@blur="
showText($index, false);
updatePoints(row, $index);
"
></el-input>
<span v-else>{{ row.deptPoints || 0 }}</span>
</div>
</template>
</el-table-column>
<el-table-column <el-table-column
label="区牵头单位" label="区牵头单位"
width="95" width="95"
(document.documentElement.clientHeight - 260 - 45) / 45 (document.documentElement.clientHeight - 260 - 45) / 45
), ),
}, },
preValue: null
}; };
}, },
created() { created() {
}, },
}, },
methods: { methods: {
updatePoints(row, index) {
if (row.deptPoints == this.preValue) {
return;
}
if (
row.deptPoints < 0 ||
row.deptPoints > row.points ||
!row.deptPoints.trim()
) {
this.$message({
type: "warning",
message: "请输入数值0~" + row.points,
});
let data = this.dataList;
data[index].deptPoints = this.preValue;
this.dataList = data;
return;
}
editApi
.editItem({
itemId: row.id,
expectedPoints: row.deptPoints,
})
.then((res) => {
this.$message({ type: "success", message: "修改成功" });
})
.catch(() => {
this.$message.error("修改失败");
this.getDataList();
});
},
showText(index, bool) {
try {
let data = this.dataList;
// data[index].focus = bool;
// this.dataList = data;
this.$set(this.dataList[index], "focus", bool);
if (bool) {
this.preValue = data[index].deptPoints;
}
this.$nextTick(() => {
this.$refs["input" + index].focus();
});
} catch (e) {
console.log(e);
}
},
exportData(data) { exportData(data) {
this.loading = true; this.loading = true;
api api

Loading…
Cancel
Save