|
|
@@ -22,10 +22,11 @@
|
|
|
</template>
|
|
|
<template slot="right">
|
|
|
<ws-select
|
|
|
- v-model="deptBudgetList.crtDutyId"
|
|
|
+ v-model="searchTypeText"
|
|
|
placeholder=""
|
|
|
class="typeselect"
|
|
|
@change="selecttaskType"
|
|
|
+ :value="searchType"
|
|
|
>
|
|
|
<ws-option
|
|
|
v-for="item in taskTypeList"
|
|
|
@@ -72,11 +73,12 @@
|
|
|
>
|
|
|
</template>
|
|
|
</BaseHeaderLayout>
|
|
|
- <el-table class="wenzi"
|
|
|
+ <el-table
|
|
|
+ class="wenzi"
|
|
|
:data="contractList.records"
|
|
|
style="width: 100%; margin-top: 10px"
|
|
|
>
|
|
|
- <el-table-column type="index" />
|
|
|
+ <el-table-column type="index" label="序号" />
|
|
|
<el-table-column prop="contractNo" label="合同编号" width="80">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="goodsName" label="货名" width="80">
|
|
|
@@ -92,8 +94,32 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="status" label="状态">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ scope.row.status }}</span>
|
|
|
- <i class="el-icon-edit" @click.stop="editClick(item, index)"></i>
|
|
|
+ <el-popover
|
|
|
+ placement="left"
|
|
|
+ :width="400"
|
|
|
+ trigger="click"
|
|
|
+ @show="history(scope.row)"
|
|
|
+ >
|
|
|
+ <template #reference>
|
|
|
+ <span>{{ scope.row.status }}</span>
|
|
|
+ </template>
|
|
|
+ <div>
|
|
|
+ <p>操作历史</p>
|
|
|
+ <div v-for="(item, index) in historyList">
|
|
|
+ <div class="vertical-circle"></div>
|
|
|
+ <div class="vertical-text">
|
|
|
+ {{ item.operateUser }}{{ item.dealMsg }}<br />{{
|
|
|
+ item.updateDate
|
|
|
+ }}
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ v-if="index != historyList.length - 1"
|
|
|
+ class="vertical-line"
|
|
|
+ ></div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </el-popover>
|
|
|
+ <i class="el-icon-edit" @click="editClick(scope.row)"></i>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="signingDate" label="签订日期"> </el-table-column>
|
|
|
@@ -121,6 +147,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
+
|
|
|
<!-- 附件弹框 -->
|
|
|
<!-- <WinseaContentModal
|
|
|
v-model="accessoryTFs"
|
|
|
@@ -145,9 +172,14 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import { getList, export1 } from '@/model/contarct/index'
|
|
|
+import {
|
|
|
+ getList,
|
|
|
+ export1,
|
|
|
+ editstatus,
|
|
|
+ billoperatehis,
|
|
|
+} from '@/model/contarct/index'
|
|
|
import { downloadFile } from '@/utils/batchDown'
|
|
|
-import { dayjs, fmoney } from 'base-core-lib'
|
|
|
+import { dayjs, fmoney, EventBus } from 'base-core-lib'
|
|
|
export default {
|
|
|
name: 'viewSpareMoney',
|
|
|
watch: {
|
|
|
@@ -174,7 +206,9 @@ export default {
|
|
|
currentPage: 1,
|
|
|
pageSize: 10,
|
|
|
searchType: 1,
|
|
|
+ searchTypeText: '未完成',
|
|
|
searchKeyWord: '',
|
|
|
+ contractType: 2,
|
|
|
startDate: null,
|
|
|
endDate: null,
|
|
|
// 提交类型
|
|
|
@@ -185,6 +219,7 @@ export default {
|
|
|
},
|
|
|
contractList: [],
|
|
|
deptBudgetList: {},
|
|
|
+ historyList: [],
|
|
|
pickerBeginDateBefore: {
|
|
|
disabledDate: (time) => {
|
|
|
return time.getTime() > Date.now()
|
|
|
@@ -192,14 +227,13 @@ export default {
|
|
|
},
|
|
|
accessoryTFs: false,
|
|
|
taskTypeList: [
|
|
|
- { value: '未完成（默认）', type: 1 },
|
|
|
+ { value: '未完成', type: 1 },
|
|
|
{ value: '已完成', type: 2 },
|
|
|
- { value: '待回款', type: 3 },
|
|
|
{ value: '全部合同', type: '' },
|
|
|
],
|
|
|
}
|
|
|
},
|
|
|
- created() {
|
|
|
+ mounted() {
|
|
|
//cg.viewBudget
|
|
|
//cg.viewSpareMoney
|
|
|
// this.getVesselData();
|
|
|
@@ -210,6 +244,7 @@ export default {
|
|
|
getList() {
|
|
|
getList({
|
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
+ contractType: this.contractType,
|
|
|
currentPage: this.currentPage,
|
|
|
pageSize: this.pageSize,
|
|
|
searchType: this.searchType,
|
|
|
@@ -223,6 +258,36 @@ export default {
|
|
|
this.contractList = response
|
|
|
})
|
|
|
},
|
|
|
+ editClick(row) {
|
|
|
+ var status = ''
|
|
|
+ if (row.status == '待执行' || row.status == '已完成') {
|
|
|
+ status = '执行中'
|
|
|
+ } else if (row.status == '执行中') {
|
|
|
+ status = '已完成'
|
|
|
+ }
|
|
|
+ this.$confirm(`是否将状态改为${status}`, '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning',
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ editstatus({ id: row.id })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.$notify.success({
|
|
|
+ title: '成功',
|
|
|
+ message: '状态修改成功',
|
|
|
+ })
|
|
|
+ this.getList()
|
|
|
+ })
|
|
|
+ .catch((response) => {
|
|
|
+ // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
|
|
|
+ })
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ return false
|
|
|
+ })
|
|
|
+ },
|
|
|
selecttaskType(e) {
|
|
|
for (var i = 0; i < this.taskTypeList.length; i++) {
|
|
|
if (this.taskTypeList[i].value == e) {
|
|
|
@@ -245,7 +310,11 @@ export default {
|
|
|
this.appendixIdss = row.receiveAttachmentPath
|
|
|
},
|
|
|
handleExamine(row) {
|
|
|
- this.$router.push({ path: 'purchaseContractExamine' })
|
|
|
+ console.log(row)
|
|
|
+ this.$router.push({
|
|
|
+ name: 'purchaseContractExamine',
|
|
|
+ params: { id: row.id },
|
|
|
+ })
|
|
|
},
|
|
|
handleAdd() {
|
|
|
this.$router.push({ path: 'purchaseContractAdd' })
|
|
|
@@ -257,11 +326,22 @@ export default {
|
|
|
handleCloe() {
|
|
|
this.dialogViewSpareMoney = false
|
|
|
},
|
|
|
- find() {},
|
|
|
+ history(row) {
|
|
|
+ console.log(row)
|
|
|
+ billoperatehis({ id: row.id })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ this.historyList = response
|
|
|
+ })
|
|
|
+ },
|
|
|
+ find() {
|
|
|
+ this.getList()
|
|
|
+ },
|
|
|
async exportlist() {
|
|
|
const { data } = await export1(
|
|
|
{
|
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
+ contractType: this.contractType,
|
|
|
currentPage: this.currentPage,
|
|
|
pageSize: this.pageSize,
|
|
|
searchType: this.searchType,
|
|
|
@@ -284,8 +364,32 @@ export default {
|
|
|
}
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
+.vertical-line {
|
|
|
+ height: 100px;
|
|
|
+ border-left: 2px solid;
|
|
|
+ margin-left: 4px;
|
|
|
+ // border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
|
|
|
+ // border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
|
|
|
+ // border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
|
|
|
+}
|
|
|
|
|
|
-/deep/.cell{
|
|
|
+.vertical-circle {
|
|
|
+ float: left;
|
|
|
+ width: 10px;
|
|
|
+ height: 10px;
|
|
|
+ border: 2px solid white;
|
|
|
+ background-color: #08b8e6;
|
|
|
+ -webkit-border-radius: 100px;
|
|
|
+}
|
|
|
+.vertical-circle:first-child {
|
|
|
+ color: red;
|
|
|
+}
|
|
|
+.vertical-text {
|
|
|
+ float: left;
|
|
|
+ margin-top: -7px;
|
|
|
+}
|
|
|
+/deep/.el-table .el-table__header .cell,
|
|
|
+/deep/.el-table .el-table__body .cell {
|
|
|
text-align: center;
|
|
|
}
|
|
|
.typeselect {
|
|
|
@@ -320,7 +424,6 @@ export default {
|
|
|
margin: 10px 20px;
|
|
|
cursor: pointer;
|
|
|
font-size: 14px;
|
|
|
-
|
|
|
p {
|
|
|
margin: 8px 0px;
|
|
|
span {
|
gjy