|
@@ -76,7 +76,7 @@
|
|
>
|
|
>
|
|
</template>
|
|
</template>
|
|
</BaseHeaderLayout>
|
|
</BaseHeaderLayout>
|
|
-
|
|
|
|
|
|
+
|
|
<el-table :data="tableData.records" style="width: 100%; margin-top: 10px">
|
|
<el-table :data="tableData.records" style="width: 100%; margin-top: 10px">
|
|
<el-table-column type="index" />
|
|
<el-table-column type="index" />
|
|
<el-table-column prop="contractNo" label="合同编号" width="80">
|
|
<el-table-column prop="contractNo" label="合同编号" width="80">
|
|
@@ -92,7 +92,7 @@
|
|
<el-table-column prop="seller" label="卖方"> </el-table-column>
|
|
<el-table-column prop="seller" label="卖方"> </el-table-column>
|
|
<el-table-column prop="imperfectGrain" label="已完成(吨)">
|
|
<el-table-column prop="imperfectGrain" label="已完成(吨)">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="status" label="状态">
|
|
|
|
|
|
+ <el-table-column prop="status" label="状态">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-popover
|
|
<el-popover
|
|
placement="left"
|
|
placement="left"
|
|
@@ -128,7 +128,7 @@
|
|
|
|
|
|
<el-table-column prop="addressUrl" label="附件">
|
|
<el-table-column prop="addressUrl" label="附件">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i>
|
|
|
|
|
|
+ <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
|
@@ -149,7 +149,15 @@
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</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"
|
|
v-model="accessoryTFs"
|
|
@@ -166,9 +174,9 @@
|
|
:vesselId="deptBudgetList.addressUrl"
|
|
:vesselId="deptBudgetList.addressUrl"
|
|
:size-limit="size"
|
|
:size-limit="size"
|
|
@uploadSuccess="uploadSuccess"
|
|
@uploadSuccess="uploadSuccess"
|
|
- accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
|
|
|
|
|
|
+ accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
|
|
|
|
+ />
|
|
</WinseaContentModal>
|
|
</WinseaContentModal>
|
|
-
|
|
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
<script>
|
|
<script>
|
|
@@ -186,7 +194,7 @@ import WsUpload from '@/components/WsUpload'
|
|
import { dayjs, fmoney, EventBus } from 'base-core-lib'
|
|
import { dayjs, fmoney, EventBus } from 'base-core-lib'
|
|
export default {
|
|
export default {
|
|
name: 'viewSpareMoney',
|
|
name: 'viewSpareMoney',
|
|
- components:{
|
|
|
|
|
|
+ components: {
|
|
WsUpload,
|
|
WsUpload,
|
|
Pagination,
|
|
Pagination,
|
|
},
|
|
},
|
|
@@ -212,39 +220,38 @@ export default {
|
|
// 年
|
|
// 年
|
|
year: '',
|
|
year: '',
|
|
// 提交类型
|
|
// 提交类型
|
|
-
|
|
|
|
-
|
|
|
|
- contractType:1,
|
|
|
|
- currentPage:1,
|
|
|
|
- pageSize:10,
|
|
|
|
- searchType:1,
|
|
|
|
- searchKeyWord:'',
|
|
|
|
- startDate:null,
|
|
|
|
- endDate: null,
|
|
|
|
- appendixIdsAdd: '',
|
|
|
|
|
|
|
|
contractType: 1,
|
|
contractType: 1,
|
|
currentPage: 1,
|
|
currentPage: 1,
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
searchType: 1,
|
|
searchType: 1,
|
|
- searchKeyWord:'',
|
|
|
|
|
|
+ searchKeyWord: '',
|
|
|
|
+ startDate: null,
|
|
|
|
+ endDate: null,
|
|
|
|
+ appendixIdsAdd: '',
|
|
|
|
+
|
|
|
|
+ contractType: 1,
|
|
|
|
+ currentPage: 1,
|
|
|
|
+ pageSize: 10,
|
|
|
|
+ searchType: 1,
|
|
|
|
+ searchKeyWord: '',
|
|
startDate: null,
|
|
startDate: null,
|
|
endDate: null,
|
|
endDate: null,
|
|
- historyList:{},
|
|
|
|
|
|
+ historyList: {},
|
|
submitType: true,
|
|
submitType: true,
|
|
contractForm: {},
|
|
contractForm: {},
|
|
categoryIndex: 0,
|
|
categoryIndex: 0,
|
|
rulesVendor: {},
|
|
rulesVendor: {},
|
|
|
|
|
|
-
|
|
|
|
|
|
+ deptCircularPage: {},
|
|
accessoryTFs: false,
|
|
accessoryTFs: false,
|
|
// pickerBeginDateBefore: {},
|
|
// pickerBeginDateBefore: {},
|
|
tableData: [],
|
|
tableData: [],
|
|
taskTypeList: [
|
|
taskTypeList: [
|
|
- { value: '未完成' ,type:1},
|
|
|
|
- { value: '已完成' ,type:2},
|
|
|
|
- { value: '待回款' ,type:3},
|
|
|
|
- { value: '全部合同',type:'' },
|
|
|
|
|
|
+ { value: '未完成', type: 1 },
|
|
|
|
+ { value: '已完成', type: 2 },
|
|
|
|
+ { value: '待回款', type: 3 },
|
|
|
|
+ { value: '全部合同', type: '' },
|
|
],
|
|
],
|
|
deptBudgetList: {
|
|
deptBudgetList: {
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
compId: sessionStorage.getItem('ws-pf_compId'),
|
|
@@ -267,9 +274,8 @@ export default {
|
|
},
|
|
},
|
|
searchTypeText: '未完成',
|
|
searchTypeText: '未完成',
|
|
}
|
|
}
|
|
-
|
|
|
|
},
|
|
},
|
|
-
|
|
|
|
|
|
+
|
|
activated() {
|
|
activated() {
|
|
this.deletecontract()
|
|
this.deletecontract()
|
|
this.getList()
|
|
this.getList()
|
|
@@ -327,27 +333,26 @@ export default {
|
|
this.contractList = response
|
|
this.contractList = response
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- // 上传附件
|
|
|
|
|
|
+ // 上传附件
|
|
uploadSuccess(data, files, url) {
|
|
uploadSuccess(data, files, url) {
|
|
console.log(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
|
|
|
|
- selecttaskType(e) {
|
|
|
|
|
|
+ // this.deptBudgetList.
|
|
|
|
+ // this.formData.append('files', files)
|
|
|
|
+ // this.feedbackObj.uploadNameAttachment = data.appendixName
|
|
|
|
+ // this.feedbackObj.pathUploadAttachment = data.appendixPath
|
|
|
|
+ // // this.newAppendixs = files
|
|
|
|
+ // this.onChangeFlag = true
|
|
|
|
+ selecttaskType(e) {
|
|
for (var i = 0; i < this.taskTypeList.length; i++) {
|
|
for (var i = 0; i < this.taskTypeList.length; i++) {
|
|
if (this.taskTypeList[i].value == e) {
|
|
if (this.taskTypeList[i].value == e) {
|
|
this.searchType = this.taskTypeList[i].type
|
|
this.searchType = this.taskTypeList[i].type
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- find() {
|
|
|
|
- console.log(this)
|
|
|
|
|
|
+ find() {
|
|
|
|
+ console.log(this)
|
|
this.getList()
|
|
this.getList()
|
|
},
|
|
},
|
|
editClick(row) {
|
|
editClick(row) {
|
|
@@ -356,13 +361,11 @@ export default {
|
|
status = '执行中'
|
|
status = '执行中'
|
|
} else if (row.status == '执行中') {
|
|
} else if (row.status == '执行中') {
|
|
status = '已完成'
|
|
status = '已完成'
|
|
-
|
|
|
|
}
|
|
}
|
|
this.$confirm(`是否将状态改为${status}`, '提示', {
|
|
this.$confirm(`是否将状态改为${status}`, '提示', {
|
|
confirmButtonText: '确定',
|
|
confirmButtonText: '确定',
|
|
cancelButtonText: '取消',
|
|
cancelButtonText: '取消',
|
|
type: 'warning',
|
|
type: 'warning',
|
|
-
|
|
|
|
})
|
|
})
|
|
.then(() => {
|
|
.then(() => {
|
|
editstatus({ id: row.id })
|
|
editstatus({ id: row.id })
|
|
@@ -396,23 +399,20 @@ export default {
|
|
}
|
|
}
|
|
this.appendixIdss = row.receiveAttachmentPath
|
|
this.appendixIdss = row.receiveAttachmentPath
|
|
},
|
|
},
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+
|
|
// 关闭 dialog时 处理文件url 初始化upload组件
|
|
// 关闭 dialog时 处理文件url 初始化upload组件
|
|
handleExamine(row) {
|
|
handleExamine(row) {
|
|
console.log(row)
|
|
console.log(row)
|
|
this.$router.push({
|
|
this.$router.push({
|
|
-
|
|
|
|
name: 'salesContractExamine',
|
|
name: 'salesContractExamine',
|
|
params: { id: row.id },
|
|
params: { id: row.id },
|
|
- })
|
|
|
|
|
|
+ })
|
|
},
|
|
},
|
|
handleAdd() {
|
|
handleAdd() {
|
|
this.$router.push({ path: 'salesContractAdd' })
|
|
this.$router.push({ path: 'salesContractAdd' })
|
|
},
|
|
},
|
|
|
|
|
|
-
|
|
|
|
- deletecontract(){},
|
|
|
|
|
|
+ deletecontract() {},
|
|
filtlistQuery() {},
|
|
filtlistQuery() {},
|
|
searchDialog() {},
|
|
searchDialog() {},
|
|
vesselIdSelected() {},
|
|
vesselIdSelected() {},
|
|
@@ -437,19 +437,17 @@ export default {
|
|
},
|
|
},
|
|
},
|
|
},
|
|
|
|
|
|
- handleDelete(row){
|
|
|
|
- var handleDelete = ''
|
|
|
|
|
|
+ handleDelete(row) {
|
|
|
|
+ var handleDelete = ''
|
|
if (row.handleDelete == '待执行' || row.handleDelete == '已完成') {
|
|
if (row.handleDelete == '待执行' || row.handleDelete == '已完成') {
|
|
- handleDelete = '执行中'
|
|
|
|
|
|
+ handleDelete = '执行中'
|
|
} else if (row.handleDelete == '执行中') {
|
|
} else if (row.handleDelete == '执行中') {
|
|
handleDelete = '已完成'
|
|
handleDelete = '已完成'
|
|
-
|
|
|
|
}
|
|
}
|
|
this.$confirm(`合同删除后不可恢复,是否继续删除?`, '提示', {
|
|
this.$confirm(`合同删除后不可恢复,是否继续删除?`, '提示', {
|
|
confirmButtonText: '确定',
|
|
confirmButtonText: '确定',
|
|
cancelButtonText: '取消',
|
|
cancelButtonText: '取消',
|
|
type: 'warning',
|
|
type: 'warning',
|
|
-
|
|
|
|
})
|
|
})
|
|
.then(() => {
|
|
.then(() => {
|
|
deletecontract({ id: row.id })
|
|
deletecontract({ id: row.id })
|
|
@@ -468,11 +466,16 @@ export default {
|
|
.catch(() => {
|
|
.catch(() => {
|
|
return false
|
|
return false
|
|
})
|
|
})
|
|
- }
|
|
|
|
|
|
+ },
|
|
},
|
|
},
|
|
}
|
|
}
|
|
</script>
|
|
</script>
|
|
<style lang="scss" scoped>
|
|
<style lang="scss" scoped>
|
|
|
|
+.el-pagination {
|
|
|
|
+ padding: 10px 15px;
|
|
|
|
+ margin-bottom: 0;
|
|
|
|
+ text-align: right;
|
|
|
|
+}
|
|
.typeselect {
|
|
.typeselect {
|
|
width: 500px;
|
|
width: 500px;
|
|
}
|
|
}
|