|
|
@@ -92,7 +92,7 @@
|
|
|
<el-table-column prop="seller" label="卖方"> </el-table-column>
|
|
|
<el-table-column prop="imperfectGrain" label="已完成（吨）">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="status" label="状态">
|
|
|
+ <el-table-column prop="status" label="状态" >
|
|
|
<template slot-scope="scope">
|
|
|
<el-popover
|
|
|
placement="left"
|
|
|
@@ -111,13 +111,13 @@
|
|
|
<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>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</el-popover>
|
|
|
<i class="el-icon-edit" @click="editClick(scope.row)"></i>
|
|
|
@@ -148,28 +148,34 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
-
|
|
|
+ <el-pagination
|
|
|
+ @size-change="handleSizeChange"
|
|
|
+ @current-change="handleCurrentChange"
|
|
|
+ :current-page="currentPage"
|
|
|
+ :page-size="deptCircularPage.pageSize"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="deptBudgetTotal"
|
|
|
+ >
|
|
|
+ </el-pagination>
|
|
|
<!-- 附件弹框 -->
|
|
|
- <!-- <WinseaContentModal
|
|
|
+ <WinseaContentModal
|
|
|
v-model="accessoryTFs"
|
|
|
:title="$t('system.noticeCircular.information')"
|
|
|
@on-cancel="handleClose"
|
|
|
>
|
|
|
+ <p>查看附件</p>
|
|
|
<ws-upload
|
|
|
- ref="uploads"
|
|
|
- table-name="ism_circular_management_info "
|
|
|
- :vesselId="my_vesselId ? my_vesselId : ''"
|
|
|
- oss-key="circularLetter"
|
|
|
- :editable="false"
|
|
|
- :appendix-ids="appendixIdss"
|
|
|
+ ref="upload"
|
|
|
+ table-name="maintain_work_order"
|
|
|
+ oss-key="mainPlan"
|
|
|
:comp-id="compId"
|
|
|
+ :appendix-ids="appendixIdsAdd"
|
|
|
+ :vesselId="deptBudgetList.addressUrl"
|
|
|
+ :size-limit="size"
|
|
|
+ @uploadSuccess="uploadSuccess"
|
|
|
+ accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
|
|
|
/>
|
|
|
- <template slot="footer" class="dialog-footer">
|
|
|
- <ws-button @click="hiddenHistory">{{
|
|
|
- $t('crew.interviewManagement.button.cancel')
|
|
|
- }}</ws-button>
|
|
|
- </template>
|
|
|
- </WinseaContentModal> -->
|
|
|
+ </WinseaContentModal>
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
@@ -181,9 +187,15 @@ import {
|
|
|
deletecontract,
|
|
|
} from '@/model/contarct/index'
|
|
|
import { downloadFile } from '@/utils/batchDown'
|
|
|
+import Pagination from '@/components/Pagination'
|
|
|
+import WsUpload from '@/components/WsUpload'
|
|
|
import { dayjs, fmoney, EventBus } from 'base-core-lib'
|
|
|
export default {
|
|
|
name: 'viewSpareMoney',
|
|
|
+ components: {
|
|
|
+ WsUpload,
|
|
|
+ Pagination,
|
|
|
+ },
|
|
|
watch: {
|
|
|
vesselId(val) {
|
|
|
this.getList()
|
|
|
@@ -201,12 +213,15 @@ export default {
|
|
|
monetaryKey: null,
|
|
|
// 表格显示数据
|
|
|
tableDate: [],
|
|
|
+ size: 10,
|
|
|
// 是否显示
|
|
|
showType: true,
|
|
|
// 年
|
|
|
year: '',
|
|
|
+ deptBudgetTotal: 0,
|
|
|
currentPage: 1,
|
|
|
pageSize: 10,
|
|
|
+ appendixIdsAdd: '',
|
|
|
searchType: 1,
|
|
|
searchTypeText: '未完成',
|
|
|
searchKeyWord: '',
|
|
|
@@ -215,6 +230,7 @@ export default {
|
|
|
endDate: null,
|
|
|
// 提交类型
|
|
|
submitType: true,
|
|
|
+ deptCircularPage: {},
|
|
|
date: {
|
|
|
year: dayjs().format('YYYY'),
|
|
|
month: dayjs().format('MM'),
|
|
|
@@ -222,6 +238,7 @@ export default {
|
|
|
contractList: [],
|
|
|
deptBudgetList: {},
|
|
|
historyList: [],
|
|
|
+ compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
pickerBeginDateBefore: {
|
|
|
disabledDate: (time) => {
|
|
|
return time.getTime() > Date.now()
|
|
|
@@ -243,6 +260,17 @@ export default {
|
|
|
this.showType = this.isShow
|
|
|
},
|
|
|
methods: {
|
|
|
+ handleClose() {
|
|
|
+ this.accessoryTFs = false
|
|
|
+ },
|
|
|
+ handleSizeChange(val) {
|
|
|
+ console.log(`每页 ${val} 条`)
|
|
|
+ this.getList()
|
|
|
+ },
|
|
|
+ handleCurrentChange(val) {
|
|
|
+ console.log(`当前页: ${val}`)
|
|
|
+ this.getList()
|
|
|
+ },
|
|
|
getList() {
|
|
|
getList({
|
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
|
@@ -257,20 +285,36 @@ export default {
|
|
|
})
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
+ this.deptCircularPage.currentPage = response.current
|
|
|
+ this.deptCircularPage.pageSize = response.size
|
|
|
+ this.deptBudgetTotal = response.total
|
|
|
this.contractList = response
|
|
|
})
|
|
|
},
|
|
|
+ // 上传附件
|
|
|
+ uploadSuccess(data, files, url) {
|
|
|
+ console.log(data, files, url)
|
|
|
+
|
|
|
+ // this.deptBudgetList.
|
|
|
+ // this.formData.append('files', files)
|
|
|
+ // this.feedbackObj.uploadNameAttachment = data.appendixName
|
|
|
+ // this.feedbackObj.pathUploadAttachment = data.appendixPath
|
|
|
+ // // this.newAppendixs = files
|
|
|
+ // this.onChangeFlag = true
|
|
|
+ },
|
|
|
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 })
|
|
|
@@ -297,7 +341,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
- fujian() {
|
|
|
+ fujian(row) {
|
|
|
if (
|
|
|
row.receiveAttachmentPath === null ||
|
|
|
row.receiveAttachmentPath === ''
|
|
|
@@ -406,6 +450,14 @@ export default {
|
|
|
}
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
+.wrap {
|
|
|
+ width: 400px;
|
|
|
+ position: absolute;
|
|
|
+ top: 131px;
|
|
|
+ left: 794px;
|
|
|
+ transform-origin: right center;
|
|
|
+ z-index: 2005;
|
|
|
+}
|
|
|
.vertical-line {
|
|
|
height: 100px;
|
|
|
border-left: 2px solid;
|
|
|
@@ -414,7 +466,11 @@ export default {
|
|
|
// border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
|
|
|
// border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
|
|
|
}
|
|
|
-
|
|
|
+.el-pagination {
|
|
|
+ padding: 10px 15px;
|
|
|
+ margin-bottom: 0;
|
|
|
+ text-align: right;
|
|
|
+}
|
|
|
.vertical-circle {
|
|
|
float: left;
|
|
|
width: 10px;
|
zhongtianhaoyuan