Skip to content

J
jiedao-app-operator-master
Commit 7d5d6d31 authored by chenwei's avatar chenwei
Browse files
Options

feat✨: 修复1/14日禅道问题

parent a379aec8
Show whitespace changes
Inline Side-by-side
Showing with 135 additions and 122 deletions
src/utils/dict.js
View file @ 7d5d6d31
......@@ -284,7 +284,8 @@ export const DICT_TYPE = {
INVOICEING_LINK: "invoicing_link", //开票环节
RECEIPT_GENERATE_PATH: "receipt_generate_path", //收款单生成路径
RECEIPT_LINK: "receipt_link", //应收款日志环节
ECW_INCOME_RELATION_SYMBOL: "income_relation_symbol" //银行收支明细查询关系符号
ECW_INCOME_RELATION_SYMBOL: "income_relation_symbol", //银行收支明细查询关系符号
LADING_BILL_STATUS_DATA: "lading_Bill_Status_Data"
}
/**
......
src/views/ecw/financial/batchGenerateReceipt/index.vue
View file @ 7d5d6d31
......@@ -48,7 +48,7 @@
<el-table-column :label="$t('费用明细')">
<template v-slot="{ row }">
<div>
<router-link :to="`/financial/orderItemCostDetails/${row.orderId}`" class="link-type">
<router-link :to="`/financial/orderItemCostDetails/${row.orderId}/${row.drawee}`" class="link-type">
{{ $t("费用明细") }}
</router-link>
</div>
......@@ -390,13 +390,13 @@ export default {
},
created() {
getWarehouseList().then((res) => {
this.loadOrderDataList()
this.warehouseList = res.data
})
getBankAccountPage({ pageNo: 1, pageSize: 1000 }).then((res) => {
this.bankData = res.data.list
})
this.queryParams.orderIds = this.$route.params.id.split(",")
this.loadOrderDataList()
},
methods: {
setWhetherToInvoice() {
......@@ -414,6 +414,17 @@ export default {
this.$modal.msgError(`请先选择需要批量处理的订单`)
return
}
const stringLabel = []
let multiple = this.multipleSelectedList.filter((item) => {
if (item.openInvoice == 0) {
stringLabel.push(item.tidanNo + "/" + item.orderNo)
}
return item.openInvoice == 0
})
if (multiple.length > 0) {
this.$modal.msgError(`订单/提单号:${stringLabel}状态为不开票，无需设置开票信息`)
return
}
this.openBatchInvoiceInfo = true //批量设置信息
this.$nextTick(() => {
this.$refs["singlEditForm"].clearValidate()
......@@ -430,19 +441,22 @@ export default {
if (this.singlEditForm.platformAccountId) {
this.changePlatformAccountId(this.singlEditForm.platformAccountId)
}
// element.taxPoint= this.singlEditForm.
// element.platformAccountId= this.singlEditForm.
// element.platformAccountName= this.singlEditForm.
// element.rateValidateDate= this.singlEditForm.
// element.remark= this.singlEditForm.
// element.element = this.singlEditForm.element
if (this.singlEditForm.openInvoice == 0) {
element.invoice = null
element.taxpayer = null
element.accountBank = null
element.accountName = null
element.projectName = null
element.taxRate = null
element.addressPhone = null
}
element = { ...element, ...this.singlEditForm }
}
this.$refs.multipleTable.toggleRowSelection(element, true)
return element
})
this.$nextTick(() => {
console.log("999")
this.list.forEach((element) => {
const current = currentSelectRow.filter((item) => item.orderId == element.orderId)
if (current.length > 0) {
......
src/views/ecw/financial/batchGenerateReceiptList/index.vue
View file @ 7d5d6d31
......@@ -99,7 +99,7 @@
<el-table-column :label="$t('应收汇总')">
<template slot-scope="{ row }">
<div v-for="item in row.receivableAmount">
{{ getCurrencySymbol(item.countryId) }}
{{ getCurrencySymbol(item.currencyId) }}
{{ item.amount }}
</div>
</template>
......
src/views/ecw/financial/voucher.vue
View file @ 7d5d6d31
......@@ -247,7 +247,7 @@
<div v-html="continueUploadModal.msg"></div>
<span slot="footer" class="dialog-footer-upload">
<el-button @click="continueUploadModal.show = false">{{ $t("取 消") }}</el-button>
<el-button type="primary" @click="continueUpload">{{ $t("确 定") }}</el-button>
<el-button type="primary" :disabled="!fileCopy" @click="continueUpload">{{ $t("确 定") }}</el-button>
</span>
</el-dialog>
</div>
......@@ -382,7 +382,9 @@ export default {
},
methods: {
continueUpload() {
this.$message.success(this.$t("正在提交，请稍后。"))
this.$refs.upload.handleStart(this.fileCopy.raw)
this.fileCopy = null
this.$refs.upload.submit()
},
handleShowFileUploadDialog() {
......@@ -410,6 +412,7 @@ export default {
// 文件上传成功处理
handleFileSuccess(response, file, fileList) {
this.upload.isUploading = false
this.continueUploadModal.show = false
// 错误
if (response.code == "1004520042") {
// this.$modal.msgError(response.msg)
......@@ -438,7 +441,7 @@ export default {
return
}
this.upload.open = false
this.fileCopy = null
this.$refs.upload.clearFiles()
// 拼接提示语
// let data = response.data
......@@ -459,7 +462,9 @@ export default {
},
// 提交上传文件
submitFileForm() {
if (!this.fileCopy) {
this.$refs.upload.submit()
}
},
//发票新增/编辑页面
goInvoiceOperate({ id, key }) {
......
src/views/system/myInternalMessage/index.vue
View file @ 7d5d6d31
<template>
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item :label="$t('来源')" prop="fromId">
<!-- <el-form-item :label="$t('来源')" prop="fromId">
<el-input v-model="queryParams.fromId" :placeholder="$t('请输入站内信来源')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>-->
<el-form-item :label="$t('发送时间')">
<el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
<el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item :label="$t('标题')" prop="title">
<el-input v-model="queryParams.title" :placeholder="$t('请输入标题')" clearable @keyup.enter.native="handleQuery"/>
<el-input v-model="queryParams.title" :placeholder="$t('请输入标题')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('消息类型')" prop="type">
<el-select v-model="queryParams.type" :placeholder="$t('请选择')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.INTERNAL_MESSAGE_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.INTERNAL_MESSAGE_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item :label="$t('状态')" prop="status">
<el-select v-model="queryParams.status" :placeholder="$t('请选择')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.INTERNAL_MESSAGE_READ_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.INTERNAL_MESSAGE_READ_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item :label="$t('创建时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t("搜索") }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
</el-form-item>
</el-form>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column :label="$t('编号')" align="center" prop="id" />
<!-- <el-table-column :label="$t('来源')" align="center" prop="fromId" />-->
<!-- <el-table-column :label="$t('来源')" align="center" prop="fromId" />-->
<el-table-column :label="$t('发送时间')" align="center" prop="sendTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.sendTime) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('标题')" align="center" prop="title" />
<!-- <el-table-column :label="$t('内容')" align="center" prop="content" />-->
<!-- <el-table-column :label="$t('内容')" align="center" prop="content" />-->
<el-table-column :label="$t('消息类型')" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.INTERNAL_MESSAGE_TYPE" :value="scope.row.type" />
......@@ -65,46 +59,43 @@
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="viewMessage(scope.row)">{{ $t('查看') }}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="deleteFn(scope.row)">{{ $t('删除') }}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="viewMessage(scope.row)">{{ $t("查看") }}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="deleteFn(scope.row)">{{ $t("删除") }}</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
@pagination="getList"/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" @pagination="getList" />
<el-dialog
:title="$t('站内信')"
:visible.sync="dialogVisible"
width="50%">
<el-dialog :title="$t('站内信')" :visible.sync="dialogVisible" width="50%">
<div class="from">
<div class="from-item">
<div class="label">{{ $t('标题：') }}</div>
<div class="content">{{publicObj.title}}</div>
<div class="label">{{ $t("标题：") }}</div>
<div class="content">{{ publicObj.title }}</div>
</div>
<div class="from-item">
<div class="label">{{ $t('消息分类：') }}</div>
<div class="content">{{type[publicObj.type]}}</div>
<div class="label">{{ $t("消息分类：") }}</div>
<dict-tag :type="DICT_TYPE.INTERNAL_MESSAGE_TYPE" :value="publicObj.type" />
<!-- <div class="content">{{type[publicObj.type]}}</div> -->
</div>
<div class="from-item">
<div class="label">{{ $t('创建时间') }}</div>
<div class="content">{{parseTime(publicObj.createTime)}}</div>
<div class="label">{{ $t("创建时间") }}</div>
<div class="content">{{ parseTime(publicObj.createTime) }}</div>
</div>
<div class="from-item">
<div class="label">{{ $t('消息内容：') }}</div>
<div class="content">{{publicObj.content}}</div>
<div class="label">{{ $t("消息内容：") }}</div>
<div class="content">{{ publicObj.content }}</div>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">{{ $t('关 闭') }}</el-button>
<el-button @click="dialogVisible = false">{{ $t("关 闭") }}</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import { getMyInternalMessagePage ,getRedInternalMessage, deleteInternalMessage} from "@/api/system/internalMessage";
import { getMyInternalMessagePage, getRedInternalMessage, deleteInternalMessage } from "@/api/system/internalMessage"
export default {
name: "MyInternalMessage",
data() {
......@@ -133,41 +124,41 @@ export default {
title: null,
content: null,
type: null,
status: this.$route.query.status?this.$route.query.status:null,
status: this.$route.query.status ? this.$route.query.status : null
},
// 表单参数
form: {},
dialogVisible:false,
publicObj:{},
dialogVisible: false,
publicObj: {},
type: {
1:this.$t('订单消息'),
2:this.$t('出货消息'),
3:this.$t('提醒消息'),
},
};
1: this.$t("订单消息"),
2: this.$t("出货消息"),
3: this.$t("提醒消息")
}
}
},
computed:{
computed: {
notMessage() {
return this.$store.state.user.notMessage;
return this.$store.state.user.notMessage
}
},
created() {
this.getList();
this.getList()
},
methods: {
/** 查询列表 */
getList() {
this.loading = true;
this.loading = true
// 处理查询参数
let params = {...this.queryParams};
this.addBeginAndEndTime(params, this.dateRangeSendTime, 'sendTime');
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
let params = { ...this.queryParams }
this.addBeginAndEndTime(params, this.dateRangeSendTime, "sendTime")
this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime")
// 执行查询
getMyInternalMessagePage(params).then(response => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
});
getMyInternalMessagePage(params).then((response) => {
this.list = response.data.list
this.total = response.data.total
this.loading = false
})
},
/** 表单重置 */
reset() {
......@@ -177,71 +168,73 @@ export default {
sendTime: undefined,
title: undefined,
content: undefined,
type: undefined,
};
this.resetForm("form");
type: undefined
}
this.resetForm("form")
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
this.queryParams.pageNo = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.dateRangeSendTime = [];
this.dateRangeCreateTime = [];
this.resetForm("queryForm");
this.handleQuery();
this.dateRangeSendTime = []
this.dateRangeCreateTime = []
this.resetForm("queryForm")
this.handleQuery()
},
viewMessage(row){
this.publicObj = row;
this.dialogVisible = true;
if(row.status == 0)this.setNotMessage(row.id)
viewMessage(row) {
this.publicObj = row
this.dialogVisible = true
if (row.status == 0) this.setNotMessage(row.id)
},
setNotMessage(id){
getRedInternalMessage({messageId:id}).then(r =>{
setNotMessage(id) {
getRedInternalMessage({ messageId: id }).then((r) => {
console.log(r)
if(r.code === 0){
if (r.code === 0) {
this.getList()
let num = Number(this.notMessage);
this.$store.commit('NOt_MESSAGE',--num);
let num = Number(this.notMessage)
this.$store.commit("NOt_MESSAGE", --num)
}
})
},
deleteFn(row){
this.$confirm(`是否要删除编号为“${row.id}”的站内信?`, this.$t('提示'), {
confirmButtonText: this.$t('确定'),
cancelButtonText: this.$t('取消'),
type: 'warning'
}).then(() => {
deleteInternalMessage(row.id).then(r => {
if(r.code === 0){
deleteFn(row) {
this.$confirm(`是否要删除编号为“${row.id}”的站内信?`, this.$t("提示"), {
confirmButtonText: this.$t("确定"),
cancelButtonText: this.$t("取消"),
type: "warning"
})
.then(() => {
deleteInternalMessage(row.id).then((r) => {
if (r.code === 0) {
this.$message({
type: 'success',
message: '删除成功!'
});
this.getList();
type: "success",
message: "删除成功!"
})
this.getList()
}
})
}).catch(() => {
})
.catch(() => {
this.$message({
type: 'info',
message: this.$t('已取消删除')
});
});
type: "info",
message: this.$t("已取消删除")
})
})
}
}
};
}
</script>
<style lang="scss" scoped>
.from{
.from-item{
.from {
.from-item {
display: flex;
margin: 10px 0;
.label{
width:80px;
.label {
width: 80px;
}
.content{
.content {
flex: 1;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment