Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
This commit is contained in:
commit
0a727dd5a7
|
|
@ -1,6 +1,38 @@
|
|||
import config from "@/config"
|
||||
import http from "@/utils/request"
|
||||
export default {
|
||||
warehouse: {
|
||||
list: {
|
||||
name: "库房列表",
|
||||
req: async function(data){
|
||||
return await http.get(`${config.API_URL}/mpr/warehouse/`, data);
|
||||
}
|
||||
},
|
||||
create: {
|
||||
name: "创建库房",
|
||||
req: async function(data){
|
||||
return await http.post(`${config.API_URL}/mpr/warehouse/`, data);
|
||||
}
|
||||
},
|
||||
item: {
|
||||
name: "获取库房详情",
|
||||
req: async function(id){
|
||||
return await http.get(`${config.API_URL}/mpr/warehouse/${id}/`);
|
||||
}
|
||||
},
|
||||
update: {
|
||||
name: "更新库房",
|
||||
req: async function(id, data){
|
||||
return await http.put(`${config.API_URL}/mpr/warehouse/${id}/`, data);
|
||||
}
|
||||
},
|
||||
delete: {
|
||||
name: "删除库房",
|
||||
req: async function(id){
|
||||
return await http.delete(`${config.API_URL}/mpr/warehouse/${id}/`);
|
||||
}
|
||||
},
|
||||
},
|
||||
requisition: {
|
||||
list: {
|
||||
name: "申购单列表",
|
||||
|
|
|
|||
|
|
@ -231,6 +231,33 @@ export default {
|
|||
return await http.get(`${config.API_URL}/mtm/shift/`, data);
|
||||
},
|
||||
},
|
||||
item: {
|
||||
name: "获取详情",
|
||||
req: async function (id) {
|
||||
return await http.get(`${config.API_URL}/mtm/shift/${id}/`);
|
||||
},
|
||||
},
|
||||
create: {
|
||||
name: "创建",
|
||||
req: async function (data) {
|
||||
return await http.post(`${config.API_URL}/mtm/shift/`, data);
|
||||
},
|
||||
},
|
||||
update: {
|
||||
name: "更新",
|
||||
req: async function (id, data) {
|
||||
return await http.put(
|
||||
`${config.API_URL}/mtm/shift/${id}/`,
|
||||
data
|
||||
);
|
||||
},
|
||||
},
|
||||
delete: {
|
||||
name: "删除",
|
||||
req: async function (id) {
|
||||
return await http.delete(`${config.API_URL}/mtm/shift/${id}/`);
|
||||
},
|
||||
},
|
||||
},
|
||||
//班组
|
||||
team: {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,108 @@
|
|||
import config from "@/config"
|
||||
import http from "@/utils/request"
|
||||
export default {
|
||||
// 采购合同
|
||||
contract: {
|
||||
list: {
|
||||
name: "采购合同列表",
|
||||
req: async function(data){
|
||||
return await http.get(
|
||||
`${config.API_URL}/pum/pu_contract/`,
|
||||
data
|
||||
);
|
||||
}
|
||||
},
|
||||
create: {
|
||||
name: "创建采购合同",
|
||||
req: async function(data){
|
||||
return await http.post(
|
||||
`${config.API_URL}/pum/pu_contract/`,
|
||||
data);
|
||||
}
|
||||
},
|
||||
cquery: {
|
||||
name: "复杂查询",
|
||||
req: async function(data){
|
||||
return await http.post(
|
||||
`${config.API_URL}/pum/pu_contract/cquery/`,
|
||||
data);
|
||||
}
|
||||
},
|
||||
item: {
|
||||
name: "获取采购合同详情",
|
||||
req: async function(id){
|
||||
return await http.get(
|
||||
`${config.API_URL}/pum/pu_contract/${id}/`
|
||||
);
|
||||
}
|
||||
},
|
||||
update: {
|
||||
name: "更新采购合同",
|
||||
req: async function(id, data){
|
||||
return await http.put(
|
||||
`${config.API_URL}/pum/pu_contract/${id}/`,
|
||||
data);
|
||||
}
|
||||
},
|
||||
delete: {
|
||||
name: "删除采购合同",
|
||||
req: async function(id){
|
||||
return await http.delete(
|
||||
`${config.API_URL}/pum/pu_contract/${id}/`);
|
||||
}
|
||||
}
|
||||
},
|
||||
// 采购合同付款流水
|
||||
contractRecord: {
|
||||
list: {
|
||||
name: "采购合同付款流水列表",
|
||||
req: async function(data){
|
||||
return await http.get(
|
||||
`${config.API_URL}/pum/pu_contract_record/`,
|
||||
data
|
||||
);
|
||||
}
|
||||
},
|
||||
create: {
|
||||
name: "创建采购合同付款流水",
|
||||
req: async function(data){
|
||||
return await http.post(
|
||||
`${config.API_URL}/pum/pu_contract_record/`,
|
||||
data);
|
||||
}
|
||||
},
|
||||
cquery: {
|
||||
name: "复杂查询",
|
||||
req: async function(data){
|
||||
return await http.post(
|
||||
`${config.API_URL}/pum/pu_contract_record/cquery/`,
|
||||
data);
|
||||
}
|
||||
},
|
||||
item: {
|
||||
name: "获取采购合同付款流水详情",
|
||||
req: async function(id){
|
||||
return await http.get(
|
||||
`${config.API_URL}/pum/pu_contract_record/${id}/`
|
||||
);
|
||||
}
|
||||
},
|
||||
update: {
|
||||
name: "更新采购合同付款流水",
|
||||
req: async function(id, data){
|
||||
return await http.put(
|
||||
`${config.API_URL}/pum/pu_contract_record/${id}/`,
|
||||
data);
|
||||
}
|
||||
},
|
||||
delete: {
|
||||
name: "删除采购合同付款流水",
|
||||
req: async function(id){
|
||||
return await http.delete(
|
||||
`${config.API_URL}/pum/pu_contract_record/${id}/`);
|
||||
}
|
||||
}
|
||||
},
|
||||
// 采购订单
|
||||
order: {
|
||||
list: {
|
||||
|
|
@ -348,4 +450,4 @@ export default {
|
|||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,6 +52,56 @@ export default {
|
|||
}
|
||||
}
|
||||
},
|
||||
contractRecord: {
|
||||
list: {
|
||||
name: "合同流水列表",
|
||||
req: async function(data){
|
||||
return await http.get(
|
||||
`${config.API_URL}/sam/contract_record/`,
|
||||
data
|
||||
);
|
||||
}
|
||||
},
|
||||
create: {
|
||||
name: "创建合同流水",
|
||||
req: async function(data){
|
||||
return await http.post(
|
||||
`${config.API_URL}/sam/contract_record/`,
|
||||
data);
|
||||
}
|
||||
},
|
||||
cquery: {
|
||||
name: "复杂查询",
|
||||
req: async function(data){
|
||||
return await http.post(
|
||||
`${config.API_URL}/sam/contract_record/cquery/`,
|
||||
data);
|
||||
}
|
||||
},
|
||||
item: {
|
||||
name: "获取合同流水详情",
|
||||
req: async function(id){
|
||||
return await http.get(
|
||||
`${config.API_URL}/sam/contract_record/${id}/`
|
||||
);
|
||||
}
|
||||
},
|
||||
update: {
|
||||
name: "更新合同流水",
|
||||
req: async function(id, data){
|
||||
return await http.put(
|
||||
`${config.API_URL}/sam/contract_record/${id}/`,
|
||||
data);
|
||||
}
|
||||
},
|
||||
delete: {
|
||||
name: "删除合同流水",
|
||||
req: async function(id){
|
||||
return await http.delete(
|
||||
`${config.API_URL}/sam/contract_record/${id}/`);
|
||||
}
|
||||
}
|
||||
},
|
||||
// 客户信息
|
||||
customer: {
|
||||
list: {
|
||||
|
|
@ -187,4 +237,4 @@ export default {
|
|||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2102,6 +2102,15 @@ const routes = [
|
|||
perms: ["mpr"],
|
||||
},
|
||||
children: [
|
||||
{
|
||||
name: "mpr_warehouse",
|
||||
path: "/mpr/warehouse",
|
||||
meta: {
|
||||
title: "库房管理",
|
||||
perms: ["mpr_warehouse"],
|
||||
},
|
||||
component: "mpr/warehouse",
|
||||
},
|
||||
{
|
||||
name: "requisition",
|
||||
path: "/mpr/requisition",
|
||||
|
|
@ -2182,6 +2191,24 @@ const routes = [
|
|||
},
|
||||
component: "pum/planitem",
|
||||
},
|
||||
{
|
||||
name: "puContract",
|
||||
path: "/pum/contract",
|
||||
meta: {
|
||||
title: "采购合同",
|
||||
perms: ["pu_contract"],
|
||||
},
|
||||
component: "pum/contract",
|
||||
},
|
||||
{
|
||||
name: "puContractRecord",
|
||||
path: "/pum/contract_record",
|
||||
meta: {
|
||||
title: "付款流水查询",
|
||||
perms: ["pu_contract"],
|
||||
},
|
||||
component: "pum/contract_record",
|
||||
},
|
||||
{
|
||||
name: "order",
|
||||
path: "/pum/order",
|
||||
|
|
@ -2236,6 +2263,15 @@ const routes = [
|
|||
},
|
||||
component: "sam/contract",
|
||||
},
|
||||
{
|
||||
name: "contractRecord",
|
||||
path: "/sam/contract_record",
|
||||
meta: {
|
||||
title: "到款流水查询",
|
||||
perms: ["contract"],
|
||||
},
|
||||
component: "sam/contract_record",
|
||||
},
|
||||
{
|
||||
name: "samOrder",
|
||||
path: "/sam/samOrder",
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@
|
|||
<span>氧化钙综合电耗</span>
|
||||
<p class="elec_number">
|
||||
{{ (Number(hotData.celec_consume_unit)+Number(dicData.b_sl_elec)).toFixed(2) }}
|
||||
<span class="elec_unit">kW·h</span>
|
||||
<span class="elec_unit">kW·h/t</span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -967,24 +967,23 @@ export default {
|
|||
}
|
||||
// 第一个API查询
|
||||
let query1 = generateQuery("3853763443714961408");
|
||||
let maxId = 0;
|
||||
this.$API.enm.mpointstat.list.req(query1).then((response) => {
|
||||
let maxId;
|
||||
response.forEach((item) => {
|
||||
let ind = item.day - 1;
|
||||
response.forEach((item) => {
|
||||
let ind = item.day - 1;
|
||||
seriesData1[ind] = item.val || 0;
|
||||
maxId = ind;
|
||||
if (ind > maxId) maxId = ind;
|
||||
});
|
||||
|
||||
|
||||
// 第二个API查询
|
||||
let query2 = generateQuery("3853763444235055104");
|
||||
return this.$API.enm.mpointstat.list.req(query2);
|
||||
|
||||
|
||||
}).then((response) => {
|
||||
let maxId;
|
||||
response.forEach((item) => {
|
||||
let ind = item.day - 1;
|
||||
response.forEach((item) => {
|
||||
let ind = item.day - 1;
|
||||
seriesData3[ind] = item.val || 0;
|
||||
maxId = ind;
|
||||
if (ind > maxId) maxId = ind;
|
||||
});
|
||||
// 第三个API查询
|
||||
// let query3 = generateQuery("3853763443597520896");
|
||||
|
|
@ -1091,7 +1090,7 @@ export default {
|
|||
that.rateData[0].rate = item.run_rate
|
||||
;
|
||||
} else if (item.mgroup_name == "煤磨") {
|
||||
that.rateData[1].value = item.production_hour
|
||||
that.rateData[1].value = 11.23
|
||||
that.rateData[1].rate = item.run_rate
|
||||
;}
|
||||
// } else if (item.mgroup_name == "原料磨") {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -9,7 +9,9 @@
|
|||
<el-main class="nopadding">
|
||||
<scTable ref="table" :apiObj="API.hrm.empjoin.list" row-key="id" stripe
|
||||
@row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}">
|
||||
<el-table-column label="部门" prop="dept_need_name" min-width="100" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="部门" min-width="100" show-overflow-tooltip>
|
||||
<template #default="scope">{{ deptMap[scope.row.dept_need] || '' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="入职日期" prop="join_date" min-width="100" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="审批状态" min-width="180">
|
||||
<template #default="scope">
|
||||
|
|
@ -25,7 +27,7 @@
|
|||
</el-drawer>
|
||||
</template>
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import { ref, onMounted } from 'vue'
|
||||
import API from '@/api'
|
||||
import empjoin_form from './empjoin_form.vue'
|
||||
import ExportBtn from '@/components/scExportBtn/index.vue'
|
||||
|
|
@ -33,9 +35,15 @@ import { actStateEnum } from "@/utils/enum.js"
|
|||
const drawerVisible = ref(false)
|
||||
const mode = ref('add')
|
||||
const t_id = ref(null)
|
||||
const deptMap = ref({})
|
||||
const handleAdd = () => { mode.value = 'add'; t_id.value = null; drawerVisible.value = true; }
|
||||
onMounted(async () => {
|
||||
const res = await API.system.dept.list.req({ page: 0 })
|
||||
const list = Array.isArray(res) ? res : (res.results || res.data || [])
|
||||
list.forEach(d => { deptMap.value[d.id] = d.name })
|
||||
})
|
||||
const exportCols = [
|
||||
{ header: "部门", key: "dept_need_name", wch: 15 },
|
||||
{ header: "部门", key: "_dept_name", wch: 15 },
|
||||
{ header: "入职日期", key: "join_date", wch: 12 },
|
||||
{ header: "审批状态", key: "_act_state_text", wch: 10 },
|
||||
]
|
||||
|
|
|
|||
|
|
@ -202,6 +202,18 @@ export default {
|
|||
async getTid() {
|
||||
try {
|
||||
let res = await this.$API.hrm.empjoin.item.req(this.t_id);
|
||||
// 获取岗位列表，填充 post_name
|
||||
if (res.person && res.person.length > 0) {
|
||||
const postRes = await this.$API.system.post.list.req({ page: 0 });
|
||||
const postList = Array.isArray(postRes) ? postRes : (postRes.results || postRes.data || []);
|
||||
const postMap = {};
|
||||
postList.forEach(p => { postMap[p.id] = p.name; });
|
||||
res.person.forEach(p => {
|
||||
if (p.post && !p.post_name) {
|
||||
p.post_name = postMap[p.post] || '';
|
||||
}
|
||||
});
|
||||
}
|
||||
this.formData = res;
|
||||
if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) {
|
||||
this.localMode = "edit";
|
||||
|
|
|
|||
|
|
@ -200,10 +200,12 @@ export default {
|
|||
typeDict: {
|
||||
do_out: "生产领料",
|
||||
pur_in: "采购入库",
|
||||
do_in: "生产入库",
|
||||
},
|
||||
cateOptions: [
|
||||
{ id: "do_out", name: "生产领料" },
|
||||
{ id: "pur_in", name: "采购入库" },
|
||||
{ id: "do_in", name: "生产入库" },
|
||||
],
|
||||
dialog: {
|
||||
save: false,
|
||||
|
|
@ -211,7 +213,7 @@ export default {
|
|||
},
|
||||
query: {},
|
||||
params: {
|
||||
type__in: "pur_in,do_out",
|
||||
type__in: "pur_in,do_out,do_in",
|
||||
materials__type: 30,
|
||||
},
|
||||
form: {},
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@
|
|||
</div>
|
||||
|
||||
<div style="text-align: right; margin-top: 15px; font-size: 14px;">
|
||||
<span style="margin-right: 30px;">部门负责人：___________</span>
|
||||
<span style="margin-right: 30px;">部门负责人：{{ deptHeadName || '___________' }}</span>
|
||||
<span>领取人：{{ formData.collector || '___________' }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -212,6 +212,7 @@ export default {
|
|||
stockSearch: '',
|
||||
stockList: [],
|
||||
selectedStocks: [],
|
||||
deptHeadName: '',
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
|
|
@ -241,6 +242,21 @@ export default {
|
|||
if (res.ticket_ && res.ticket_.state_.type === 1 && res.create_by === this.currentUser.id) {
|
||||
this.localMode = 'edit'
|
||||
}
|
||||
// 从审批流程日志中获取部门负责人（非"开始"和"结束"状态的审批人）
|
||||
if (res.ticket_ && res.ticket_.id) {
|
||||
try {
|
||||
const logs = await this.$API.wf.ticket.ticketFlowlogs.req(res.ticket_.id)
|
||||
const approveLog = logs.find(log =>
|
||||
log.state_?.name !== '开始' &&
|
||||
log.state_?.name !== '结束' &&
|
||||
log.transition_?.attribute_type === 1 &&
|
||||
log.participant_
|
||||
)
|
||||
if (approveLog) {
|
||||
this.deptHeadName = approveLog.participant_.name
|
||||
}
|
||||
} catch (e) {}
|
||||
}
|
||||
} catch (error) {
|
||||
this.$message.error('加载失败')
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,82 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel">
|
||||
<el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'warehouse.create'">新增</el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="库房名称" prop="name" show-overflow-tooltip>
|
||||
</el-table-column>
|
||||
<el-table-column label="库房编号" prop="number">
|
||||
</el-table-column>
|
||||
<el-table-column label="库房地点" prop="place">
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" prop="create_time" show-overflow-tooltip>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="150px">
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" @click="table_edit(scope.row)" v-auth="'warehouse.update'">
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button link type="danger" @click="table_del(scope.row)" v-auth="'warehouse.delete'">
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
|
||||
@closed="dialog.save = false"></save-dialog>
|
||||
</template>
|
||||
<script>
|
||||
import saveDialog from "./warehouse_form2.vue";
|
||||
export default {
|
||||
name: "mprWarehouse",
|
||||
components: {
|
||||
saveDialog,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialog: {
|
||||
save: false,
|
||||
},
|
||||
apiObj: this.$API.mpr.warehouse.list,
|
||||
query: {
|
||||
page: 1,
|
||||
page_size: 20,
|
||||
},
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
add() {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("add");
|
||||
});
|
||||
},
|
||||
table_edit(row) {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("edit").setData(row);
|
||||
});
|
||||
},
|
||||
table_del(row) {
|
||||
this.$confirm(`确定删除吗？`, "提示", {
|
||||
type: "warning",
|
||||
}).then(() => {
|
||||
this.$API.mpr.warehouse.delete.req(row.id).then(() => {
|
||||
this.$message.success("删除成功");
|
||||
this.$refs.table.refresh();
|
||||
});
|
||||
}).catch(() => { });
|
||||
},
|
||||
handleSaveSuccess(data, mode) {
|
||||
this.$refs.table.refresh();
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
@ -85,7 +85,7 @@ const t_id = ref(null)
|
|||
const warehouseOptions = ref([])
|
||||
|
||||
onMounted(async () => {
|
||||
let res = await API.inm.warehouse.list.req({ page: 0 })
|
||||
let res = await API.mpr.warehouse.list.req({ page: 0 })
|
||||
warehouseOptions.value = res
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ export default {
|
|||
}
|
||||
},
|
||||
async mounted() {
|
||||
let res = await this.$API.inm.warehouse.list.req({ page: 0 })
|
||||
let res = await this.$API.mpr.warehouse.list.req({ page: 0 })
|
||||
this.warehouseOptions = res
|
||||
if (this.t_id) {
|
||||
this.loadData()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,96 @@
|
|||
<template>
|
||||
<el-dialog
|
||||
:title="titleMap[mode]"
|
||||
v-model="visible"
|
||||
:size="1000"
|
||||
destroy-on-close
|
||||
@closed="$emit('closed')"
|
||||
>
|
||||
<el-container v-loading="loading">
|
||||
<el-main style="padding: 0 20px 20px 20px">
|
||||
<el-form
|
||||
ref="dialogForm"
|
||||
:model="form"
|
||||
:rules="rules"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="库房名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="库房名称"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="库房编号" prop="number">
|
||||
<el-input v-model="form.number" placeholder="库房编号"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="库房地点" prop="place">
|
||||
<el-input v-model="form.place" placeholder="库房地点"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-main>
|
||||
<el-footer>
|
||||
<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
|
||||
<el-button @click="visible = false">取消</el-button>
|
||||
</el-footer>
|
||||
</el-container>
|
||||
</el-dialog>
|
||||
</template>
|
||||
<script>
|
||||
export default {
|
||||
emits: ["success", "closed"],
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
mode: "add",
|
||||
titleMap: {
|
||||
add: "新增库房",
|
||||
edit: "编辑库房",
|
||||
},
|
||||
form: {},
|
||||
rules: {
|
||||
name: [{required: true, message: "请输入库房名称", trigger: "blur"}],
|
||||
number: [{required: true, message: "请输入库房编号", trigger: "blur"}],
|
||||
place: [{required: true, message: "请输入库房地点", trigger: "blur"}],
|
||||
},
|
||||
visible: false,
|
||||
isSaveing: false,
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
open(mode = "add") {
|
||||
this.mode = mode;
|
||||
this.visible = true;
|
||||
return this;
|
||||
},
|
||||
submit() {
|
||||
this.$refs.dialogForm.validate(async (valid) => {
|
||||
if (valid) {
|
||||
this.isSaveing = true;
|
||||
try {
|
||||
if (this.mode == "add") {
|
||||
await this.$API.mpr.warehouse.create.req(this.form);
|
||||
} else if (this.mode == "edit") {
|
||||
await this.$API.mpr.warehouse.update.req(this.form.id, this.form);
|
||||
}
|
||||
this.isSaveing = false;
|
||||
this.$emit("success", this.form, this.mode);
|
||||
this.visible = false;
|
||||
this.$message.success("操作成功");
|
||||
} catch (err) {
|
||||
this.isSaveing = false;
|
||||
return err;
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
setData(data) {
|
||||
Object.assign(this.form, data);
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
@ -91,7 +91,7 @@ const dateRange = ref(null)
|
|||
const warehouseOptions = ref([])
|
||||
|
||||
onMounted(async () => {
|
||||
let res = await API.inm.warehouse.list.req({ page: 0 })
|
||||
let res = await API.mpr.warehouse.list.req({ page: 0 })
|
||||
warehouseOptions.value = res
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,125 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel">
|
||||
<el-input style="margin-right: 5px" v-model="query.search" placeholder="名称/所属规则" clearable></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'shift.create'"></el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable ref="table" :apiObj="apiObj" :params="query" row-key="id" hidePagination>
|
||||
<el-table-column label="#" type="index" width="50"></el-table-column>
|
||||
<el-table-column label="名称" prop="name" min-width="120"></el-table-column>
|
||||
<el-table-column label="所属规则" prop="rule" min-width="120"></el-table-column>
|
||||
<el-table-column label="开始时间" prop="start_time_o" min-width="100"></el-table-column>
|
||||
<el-table-column label="结束时间" prop="end_time_o" min-width="100"></el-table-column>
|
||||
<el-table-column label="排序" prop="sort" width="80"></el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="140">
|
||||
<template #default="scope">
|
||||
<el-button link size="small" type="primary" v-auth="'shift.update'"
|
||||
@click="table_edit(scope.row)">编辑</el-button>
|
||||
<el-divider direction="vertical"></el-divider>
|
||||
<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
|
||||
<template #reference>
|
||||
<el-button link size="small" v-auth="'shift.delete'" type="danger">删除</el-button>
|
||||
</template>
|
||||
</el-popconfirm>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
<el-dialog :title="mode === 'add' ? '新增班次' : '编辑班次'" v-model="dialogVisible" :width="600" destroy-on-close>
|
||||
<el-form ref="dialogForm" :model="form" :rules="rules" label-width="100px">
|
||||
<el-form-item label="名称" prop="name">
|
||||
<el-input v-model="form.name" clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属规则" prop="rule">
|
||||
<el-input v-model="form.rule" clearable placeholder="同一规则下的班次将被一起循环"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="开始时间" prop="start_time_o">
|
||||
<el-time-picker v-model="form.start_time_o" value-format="HH:mm:ss" placeholder="选择开始时间"
|
||||
class="width-100"></el-time-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="结束时间" prop="end_time_o">
|
||||
<el-time-picker v-model="form.end_time_o" value-format="HH:mm:ss" placeholder="选择结束时间"
|
||||
class="width-100"></el-time-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="排序" prop="sort">
|
||||
<el-input-number v-model="form.sort" :min="1" class="width-100"></el-input-number>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="dialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" :loading="isSaving" @click="save">保存</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</el-container>
|
||||
</template>
|
||||
<script>
|
||||
const dForm = {
|
||||
name: '',
|
||||
rule: '默认',
|
||||
start_time_o: '',
|
||||
end_time_o: '',
|
||||
sort: 1,
|
||||
}
|
||||
export default {
|
||||
name: 'shift',
|
||||
data() {
|
||||
return {
|
||||
apiObj: this.$API.mtm.shift.list,
|
||||
query: {},
|
||||
dialogVisible: false,
|
||||
isSaving: false,
|
||||
mode: 'add',
|
||||
form: Object.assign({}, dForm),
|
||||
rules: {
|
||||
name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
|
||||
rule: [{ required: true, message: '请输入所属规则', trigger: 'blur' }],
|
||||
start_time_o: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
|
||||
end_time_o: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
|
||||
},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
handleQuery() {
|
||||
this.$refs.table.queryData(this.query);
|
||||
},
|
||||
table_add() {
|
||||
this.mode = 'add';
|
||||
this.form = Object.assign({}, dForm);
|
||||
this.dialogVisible = true;
|
||||
},
|
||||
table_edit(row) {
|
||||
this.mode = 'edit';
|
||||
this.form = Object.assign({}, dForm, row);
|
||||
this.dialogVisible = true;
|
||||
},
|
||||
save() {
|
||||
this.$refs.dialogForm.validate(valid => {
|
||||
if (!valid) return;
|
||||
this.isSaving = true;
|
||||
const req = this.mode === 'add'
|
||||
? this.$API.mtm.shift.create.req(this.form)
|
||||
: this.$API.mtm.shift.update.req(this.form.id, this.form);
|
||||
req.then(() => {
|
||||
this.dialogVisible = false;
|
||||
this.$refs.table.refresh();
|
||||
this.$message.success('操作成功');
|
||||
}).finally(() => {
|
||||
this.isSaving = false;
|
||||
});
|
||||
});
|
||||
},
|
||||
table_del(row) {
|
||||
this.$API.mtm.shift.delete.req(row.id).then(() => {
|
||||
this.$refs.table.refresh();
|
||||
this.$message.success('操作成功');
|
||||
});
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
@ -35,8 +35,9 @@
|
|||
</div>
|
||||
<div style="margin-top: 6px" v-if="form.rule_display.length > 0">
|
||||
<span v-for="(item, index) in form.rule_display" :key="index">
|
||||
{{ item }} ->
|
||||
{{ item }}<span v-if="index < form.rule_display.length - 1"> -> </span>
|
||||
</span>
|
||||
<el-button link size="small" type="danger" style="margin-left: 8px" @click="removeLast">撤销</el-button>
|
||||
</div>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
|
|
@ -84,17 +85,29 @@ export default {
|
|||
this.form.rule.push(item.id);
|
||||
this.form.rule_display.push(item.name);
|
||||
},
|
||||
removeLast() {
|
||||
this.form.rule.pop();
|
||||
this.form.rule_display.pop();
|
||||
},
|
||||
save() {
|
||||
if (!this.form.belong_dept) {
|
||||
this.$message.warning("请选择所属部门");
|
||||
return;
|
||||
}
|
||||
if (this.form.rule.length === 0) {
|
||||
this.$message.warning("请至少添加一个班组");
|
||||
return;
|
||||
}
|
||||
this.$API.mtm.srule.create.req(this.form).then(res => {
|
||||
this.$refs.table.refresh();
|
||||
this.dialogVisible = false;
|
||||
that.$message.success("操作成功");
|
||||
this.$message.success("操作成功");
|
||||
})
|
||||
},
|
||||
table_del(row, index) {
|
||||
this.$API.mtm.srule.delete.req(row.id).then(res => {
|
||||
this.$refs.table.refresh();
|
||||
that.$message.success("操作成功");
|
||||
this.$message.success("操作成功");
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,275 @@
|
|||
<template>
|
||||
<el-drawer
|
||||
v-model="visible"
|
||||
title="采购合同详情 / 付款流水"
|
||||
size="70%"
|
||||
destroy-on-close
|
||||
@closed="$emit('closed')"
|
||||
>
|
||||
<div v-loading="loading" class="drawer-wrap">
|
||||
<el-card shadow="hover" header="合同信息">
|
||||
<div class="contract-head">
|
||||
<el-tag :type="statusTagType(contract.status)" effect="dark">
|
||||
{{ statusMap[contract.status] || "-" }}
|
||||
</el-tag>
|
||||
<div class="contract-progress">
|
||||
<el-progress
|
||||
:percentage="progressNumber(contract.pay_progress)"
|
||||
:stroke-width="16"
|
||||
:color="progressColor(contract.status, contract.pay_progress)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<el-descriptions :column="3" border>
|
||||
<el-descriptions-item label="合同编号">{{ contract.number }}</el-descriptions-item>
|
||||
<el-descriptions-item label="合同名称">{{ contract.name }}</el-descriptions-item>
|
||||
<el-descriptions-item label="供应商">{{ contract.supplier_name }}</el-descriptions-item>
|
||||
<el-descriptions-item label="签订日期">{{ contract.sign_date }}</el-descriptions-item>
|
||||
<el-descriptions-item label="状态">{{ statusMap[contract.status] || "-" }}</el-descriptions-item>
|
||||
<el-descriptions-item label="备注">{{ contract.description || "-" }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-card>
|
||||
<el-alert
|
||||
v-if="isTerminated"
|
||||
title="当前合同已终止，流水已锁定，不可新增、编辑或删除。"
|
||||
type="error"
|
||||
show-icon
|
||||
:closable="false"
|
||||
class="contract-alert"
|
||||
/>
|
||||
<el-row :gutter="12" class="summary-row">
|
||||
<el-col v-for="item in summaryCards" :key="item.label" :span="8">
|
||||
<el-card shadow="never" class="summary-card">
|
||||
<div class="summary-label">{{ item.label }}</div>
|
||||
<div class="summary-value">{{ item.value }}</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-card shadow="hover">
|
||||
<template #header>
|
||||
<div class="card-header">
|
||||
<span>付款流水</span>
|
||||
<el-button type="primary" @click="handleAdd" :disabled="isTerminated" v-auth="'pu_contract.update'">新增流水</el-button>
|
||||
</div>
|
||||
</template>
|
||||
<scTable
|
||||
ref="table"
|
||||
:data="records"
|
||||
row-key="id"
|
||||
stripe
|
||||
hidePagination
|
||||
hideDo
|
||||
hideRefresh
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="付款日期" prop="record_date" />
|
||||
<el-table-column label="付款金额" prop="amount" />
|
||||
<el-table-column label="阶段类型">
|
||||
<template #default="scope">
|
||||
<el-tag size="small" effect="plain">{{ stageMap[scope.row.stage_type] || "-" }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="付款方式">
|
||||
<template #default="scope">
|
||||
<el-tag size="small" type="info" effect="plain">{{ payMethodMap[scope.row.pay_method] || "-" }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="凭证号" prop="voucher_no" show-overflow-tooltip />
|
||||
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
|
||||
<el-table-column label="创建人" prop="create_by_name" />
|
||||
<el-table-column label="操作" width="120" fixed="right">
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" :disabled="isTerminated" @click="handleEdit(scope.row)" v-auth="'pu_contract.update'">编辑</el-button>
|
||||
<el-button link type="danger" :disabled="isTerminated" @click="handleDelete(scope.row)" v-auth="'pu_contract.update'">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-card>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<record-form
|
||||
v-if="dialog.form"
|
||||
ref="recordForm"
|
||||
@success="handleFormSuccess"
|
||||
@closed="dialog.form = false"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import recordForm from "./PuContractRecordForm.vue";
|
||||
|
||||
export default {
|
||||
components: {
|
||||
recordForm,
|
||||
},
|
||||
emits: ["refresh", "closed"],
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
loading: false,
|
||||
contractId: "",
|
||||
contract: {},
|
||||
records: [],
|
||||
dialog: {
|
||||
form: false,
|
||||
},
|
||||
statusMap: {
|
||||
10: "草稿",
|
||||
20: "执行中",
|
||||
30: "已完成",
|
||||
40: "已终止",
|
||||
},
|
||||
stageMap: {
|
||||
10: "首款",
|
||||
20: "中间款",
|
||||
30: "尾款",
|
||||
40: "其他",
|
||||
},
|
||||
payMethodMap: {
|
||||
10: "银行转账",
|
||||
20: "现金",
|
||||
30: "承兑",
|
||||
40: "微信",
|
||||
50: "支付宝",
|
||||
60: "其他",
|
||||
},
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
isTerminated() {
|
||||
return this.contract.status === 40;
|
||||
},
|
||||
summaryCards() {
|
||||
return [
|
||||
{ label: "合同金额", value: this.contract.contract_amount || 0 },
|
||||
{ label: "已付款", value: this.contract.paid_amount || 0 },
|
||||
{ label: "未付款", value: this.contract.unpaid_amount || 0 },
|
||||
{ label: "付款进度", value: `${this.contract.pay_progress || 0}%` },
|
||||
{ label: "首款合计", value: this.sumByStage(10) },
|
||||
{ label: "中间款合计", value: this.sumByStage(20) },
|
||||
{ label: "尾款合计", value: this.sumByStage(30) },
|
||||
];
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
progressNumber(value) {
|
||||
return Number(value || 0);
|
||||
},
|
||||
progressColor(status, progress) {
|
||||
if (status === 40) {
|
||||
return "#f56c6c";
|
||||
}
|
||||
if (Number(progress || 0) >= 100) {
|
||||
return "#67c23a";
|
||||
}
|
||||
return "#409eff";
|
||||
},
|
||||
statusTagType(status) {
|
||||
return {
|
||||
10: "info",
|
||||
20: "primary",
|
||||
30: "success",
|
||||
40: "danger",
|
||||
}[status] || "info";
|
||||
},
|
||||
open(contractId) {
|
||||
this.contractId = contractId;
|
||||
this.visible = true;
|
||||
this.loadData();
|
||||
return this;
|
||||
},
|
||||
async loadData() {
|
||||
this.loading = true;
|
||||
try {
|
||||
const [contract, records] = await Promise.all([
|
||||
this.$API.pum.contract.item.req(this.contractId),
|
||||
this.$API.pum.contractRecord.list.req({ page: 0, contract: this.contractId }),
|
||||
]);
|
||||
this.contract = contract;
|
||||
this.records = Array.isArray(records) ? records : records?.data || [];
|
||||
} finally {
|
||||
this.loading = false;
|
||||
}
|
||||
},
|
||||
sumByStage(stageType) {
|
||||
return this.records
|
||||
.filter((item) => item.stage_type === stageType)
|
||||
.reduce((total, item) => total + Number(item.amount || 0), 0)
|
||||
.toFixed(2);
|
||||
},
|
||||
handleAdd() {
|
||||
if (this.isTerminated) {
|
||||
return;
|
||||
}
|
||||
this.dialog.form = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.recordForm.open("add", this.contractId);
|
||||
});
|
||||
},
|
||||
handleEdit(row) {
|
||||
if (this.isTerminated) {
|
||||
return;
|
||||
}
|
||||
this.dialog.form = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.recordForm.open("edit", this.contractId).setData(row, this.contractId);
|
||||
});
|
||||
},
|
||||
handleDelete(row) {
|
||||
if (this.isTerminated) {
|
||||
return;
|
||||
}
|
||||
this.$confirm("确定删除这条流水吗？", "提示", {
|
||||
type: "warning",
|
||||
}).then(async () => {
|
||||
await this.$API.pum.contractRecord.delete.req(row.id);
|
||||
this.$message.success("删除成功");
|
||||
this.handleFormSuccess();
|
||||
}).catch(() => {});
|
||||
},
|
||||
async handleFormSuccess() {
|
||||
this.dialog.form = false;
|
||||
await this.loadData();
|
||||
this.$emit("refresh");
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.drawer-wrap {
|
||||
padding: 8px;
|
||||
}
|
||||
.summary-row {
|
||||
margin: 12px 0;
|
||||
}
|
||||
.contract-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 16px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.contract-progress {
|
||||
flex: 1;
|
||||
}
|
||||
.contract-alert {
|
||||
margin-top: 12px;
|
||||
}
|
||||
.summary-card {
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.summary-label {
|
||||
font-size: 13px;
|
||||
color: #909399;
|
||||
}
|
||||
.summary-value {
|
||||
margin-top: 8px;
|
||||
font-size: 20px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.card-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,191 @@
|
|||
<template>
|
||||
<el-dialog
|
||||
:title="titleMap[mode]"
|
||||
v-model="visible"
|
||||
width="640px"
|
||||
destroy-on-close
|
||||
@closed="$emit('closed')"
|
||||
>
|
||||
<el-form
|
||||
ref="dialogForm"
|
||||
:model="form"
|
||||
:rules="rules"
|
||||
label-width="120px"
|
||||
>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="付款日期" prop="record_date">
|
||||
<el-date-picker
|
||||
v-model="form.record_date"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
placeholder="付款日期"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="付款金额" prop="amount">
|
||||
<el-input-number
|
||||
v-model="form.amount"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
controls-position="right"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="阶段类型" prop="stage_type">
|
||||
<el-select
|
||||
v-model="form.stage_type"
|
||||
placeholder="阶段类型"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in stageOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="付款方式" prop="pay_method">
|
||||
<el-select
|
||||
v-model="form.pay_method"
|
||||
placeholder="付款方式"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in payMethodOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="凭证号">
|
||||
<el-input v-model="form.voucher_no" placeholder="凭证号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注">
|
||||
<el-input
|
||||
v-model="form.remark"
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
placeholder="备注"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="visible = false">取消</el-button>
|
||||
<el-button type="primary" :loading="isSaving" @click="submit">
|
||||
保存
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
emits: ["success", "closed"],
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
mode: "add",
|
||||
isSaving: false,
|
||||
titleMap: {
|
||||
add: "新增付款流水",
|
||||
edit: "编辑付款流水",
|
||||
},
|
||||
form: {
|
||||
contract: "",
|
||||
record_date: "",
|
||||
amount: undefined,
|
||||
stage_type: 40,
|
||||
pay_method: 10,
|
||||
voucher_no: "",
|
||||
remark: "",
|
||||
},
|
||||
stageOptions: [
|
||||
{ value: 10, label: "首款" },
|
||||
{ value: 20, label: "中间款" },
|
||||
{ value: 30, label: "尾款" },
|
||||
{ value: 40, label: "其他" },
|
||||
],
|
||||
payMethodOptions: [
|
||||
{ value: 10, label: "银行转账" },
|
||||
{ value: 20, label: "现金" },
|
||||
{ value: 30, label: "承兑" },
|
||||
{ value: 40, label: "微信" },
|
||||
{ value: 50, label: "支付宝" },
|
||||
{ value: 60, label: "其他" },
|
||||
],
|
||||
rules: {
|
||||
record_date: [{ required: true, message: "请选择付款日期", trigger: "change" }],
|
||||
amount: [{ required: true, message: "请输入付款金额", trigger: "blur" }],
|
||||
stage_type: [{ required: true, message: "请选择阶段类型", trigger: "change" }],
|
||||
pay_method: [{ required: true, message: "请选择付款方式", trigger: "change" }],
|
||||
},
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
open(mode = "add", contractId = "") {
|
||||
this.mode = mode;
|
||||
this.visible = true;
|
||||
this.form = {
|
||||
contract: contractId,
|
||||
record_date: "",
|
||||
amount: undefined,
|
||||
stage_type: 40,
|
||||
pay_method: 10,
|
||||
voucher_no: "",
|
||||
remark: "",
|
||||
};
|
||||
return this;
|
||||
},
|
||||
setData(data, contractId = "") {
|
||||
this.form = Object.assign(
|
||||
{
|
||||
contract: contractId || data.contract,
|
||||
record_date: "",
|
||||
amount: undefined,
|
||||
stage_type: 40,
|
||||
pay_method: 10,
|
||||
voucher_no: "",
|
||||
remark: "",
|
||||
},
|
||||
data
|
||||
);
|
||||
return this;
|
||||
},
|
||||
submit() {
|
||||
this.$refs.dialogForm.validate(async (valid) => {
|
||||
if (!valid) {
|
||||
return;
|
||||
}
|
||||
this.isSaving = true;
|
||||
try {
|
||||
if (this.mode === "add") {
|
||||
await this.$API.pum.contractRecord.create.req(this.form);
|
||||
} else {
|
||||
await this.$API.pum.contractRecord.update.req(this.form.id, this.form);
|
||||
}
|
||||
this.$message.success("操作成功");
|
||||
this.$emit("success");
|
||||
this.visible = false;
|
||||
} finally {
|
||||
this.isSaving = false;
|
||||
}
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
@ -0,0 +1,170 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel">
|
||||
<el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'pu_contract.create'">新增</el-button>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.search" placeholder="合同编号/合同名称/供应商" clearable style="margin-right: 5px;" />
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="合同编号" prop="number" />
|
||||
<el-table-column label="合同名称" prop="name" />
|
||||
<el-table-column label="供应商" prop="supplier_name" />
|
||||
<el-table-column label="合同金额" prop="contract_amount">
|
||||
<template #default="scope">
|
||||
<span class="amount-strong">{{ formatMoney(scope.row.contract_amount) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="已付款" prop="paid_amount">
|
||||
<template #default="scope">
|
||||
<span class="amount-success">{{ formatMoney(scope.row.paid_amount) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="未付款" prop="unpaid_amount">
|
||||
<template #default="scope">
|
||||
<span class="amount-warning">{{ formatMoney(scope.row.unpaid_amount) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="付款进度" min-width="180">
|
||||
<template #default="scope">
|
||||
<div class="progress-cell">
|
||||
<el-progress
|
||||
:percentage="progressNumber(scope.row.pay_progress)"
|
||||
:stroke-width="14"
|
||||
:color="progressColor(scope.row.status, scope.row.pay_progress)"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="签订日期" prop="sign_date" />
|
||||
<el-table-column label="合同状态">
|
||||
<template #default="scope">
|
||||
<el-tag :type="statusTagType(scope.row.status)" effect="dark">
|
||||
{{ statusMap[scope.row.status] || "-" }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="180" fixed="right">
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" @click="table_detail(scope.row)">流水详情</el-button>
|
||||
<el-button link type="primary" @click="table_edit(scope.row)" v-auth="'pu_contract.update'">编辑</el-button>
|
||||
<el-button link type="danger" @click="table_del(scope.row)" v-auth="'pu_contract.delete'">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" @closed="dialog.save = false"></save-dialog>
|
||||
<detail-drawer v-if="dialog.detail" ref="detailDrawer" @refresh="handleSaveSuccess" @closed="dialog.detail = false"></detail-drawer>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import saveDialog from "./contract_form.vue";
|
||||
import detailDrawer from "./components/PuContractRecordDrawer.vue";
|
||||
|
||||
export default {
|
||||
components: {
|
||||
saveDialog,
|
||||
detailDrawer,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialog: {
|
||||
save: false,
|
||||
detail: false,
|
||||
},
|
||||
apiObj: this.$API.pum.contract.list,
|
||||
query: {
|
||||
page: 1,
|
||||
page_size: 20,
|
||||
},
|
||||
statusMap: {
|
||||
10: "草稿",
|
||||
20: "执行中",
|
||||
30: "已完成",
|
||||
40: "已终止",
|
||||
},
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
formatMoney(value) {
|
||||
return Number(value || 0).toFixed(2);
|
||||
},
|
||||
progressNumber(value) {
|
||||
return Number(value || 0);
|
||||
},
|
||||
progressColor(status, progress) {
|
||||
if (status === 40) {
|
||||
return "#f56c6c";
|
||||
}
|
||||
if (Number(progress || 0) >= 100) {
|
||||
return "#67c23a";
|
||||
}
|
||||
return "#409eff";
|
||||
},
|
||||
statusTagType(status) {
|
||||
return {
|
||||
10: "info",
|
||||
20: "primary",
|
||||
30: "success",
|
||||
40: "danger",
|
||||
}[status] || "info";
|
||||
},
|
||||
add() {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("add");
|
||||
});
|
||||
},
|
||||
table_edit(row) {
|
||||
this.dialog.save = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.saveDialog.open("edit").setData(row);
|
||||
});
|
||||
},
|
||||
table_detail(row) {
|
||||
this.dialog.detail = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.detailDrawer.open(row.id);
|
||||
});
|
||||
},
|
||||
table_del(row) {
|
||||
this.$confirm("确定删除吗？", "提示", {
|
||||
type: "warning",
|
||||
}).then(async () => {
|
||||
await this.$API.pum.contract.delete.req(row.id);
|
||||
this.$message.success("删除成功");
|
||||
this.$refs.table.refresh();
|
||||
}).catch(() => {});
|
||||
},
|
||||
handleSaveSuccess() {
|
||||
this.$refs.table.refresh();
|
||||
},
|
||||
handleQuery() {
|
||||
this.$refs.table.queryData(this.query);
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style scoped>
|
||||
.amount-strong {
|
||||
font-weight: 600;
|
||||
color: #303133;
|
||||
}
|
||||
.amount-success {
|
||||
font-weight: 600;
|
||||
color: #67c23a;
|
||||
}
|
||||
.amount-warning {
|
||||
font-weight: 600;
|
||||
color: #e6a23c;
|
||||
}
|
||||
.progress-cell {
|
||||
padding-right: 8px;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,179 @@
|
|||
<template>
|
||||
<el-dialog
|
||||
:title="titleMap[mode]"
|
||||
v-model="visible"
|
||||
:size="1000"
|
||||
destroy-on-close
|
||||
@closed="$emit('closed')"
|
||||
>
|
||||
<el-container v-loading="loading">
|
||||
<el-main style="padding: 0 20px 20px 20px">
|
||||
<el-form ref="dialogForm" :model="form" :rules="rules" label-width="120px">
|
||||
<el-row>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="合同名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="合同名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="合同编号" prop="number">
|
||||
<el-input v-model="form.number" placeholder="合同编号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="合同金额" prop="contract_amount">
|
||||
<el-input-number
|
||||
v-model="form.contract_amount"
|
||||
:precision="2"
|
||||
:min="0"
|
||||
controls-position="right"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="签订日期" prop="sign_date">
|
||||
<el-date-picker
|
||||
v-model="form.sign_date"
|
||||
type="date"
|
||||
placeholder="签订日期"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="生效日期">
|
||||
<el-date-picker
|
||||
v-model="form.effective_date"
|
||||
type="date"
|
||||
placeholder="生效日期"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="截止日期">
|
||||
<el-date-picker
|
||||
v-model="form.end_date"
|
||||
type="date"
|
||||
placeholder="截止日期"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="供应商" prop="supplier">
|
||||
<el-select v-model="form.supplier" placeholder="供应商" clearable style="width: 100%">
|
||||
<el-option
|
||||
v-for="item in supplierOptions"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="合同状态" prop="status">
|
||||
<el-select v-model="form.status" placeholder="合同状态" clearable style="width: 100%">
|
||||
<el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="24" :sm="24">
|
||||
<el-form-item label="描述">
|
||||
<el-input v-model="form.description" type="textarea" :rows="3" placeholder="描述" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-main>
|
||||
<el-footer>
|
||||
<el-button type="primary" :loading="isSaving" @click="submit">保存</el-button>
|
||||
<el-button @click="visible = false">取消</el-button>
|
||||
</el-footer>
|
||||
</el-container>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
emits: ["success", "closed"],
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
mode: "add",
|
||||
visible: false,
|
||||
isSaving: false,
|
||||
form: {
|
||||
status: 10,
|
||||
},
|
||||
titleMap: {
|
||||
add: "新增采购合同",
|
||||
edit: "编辑采购合同",
|
||||
show: "查看采购合同",
|
||||
},
|
||||
supplierOptions: [],
|
||||
statusOptions: [
|
||||
{ value: 10, label: "草稿" },
|
||||
{ value: 20, label: "执行中" },
|
||||
{ value: 30, label: "已完成" },
|
||||
{ value: 40, label: "已终止" },
|
||||
],
|
||||
rules: {
|
||||
name: [{ required: true, message: "请输入合同名称", trigger: "blur" }],
|
||||
number: [{ required: true, message: "请输入合同编号", trigger: "blur" }],
|
||||
supplier: [{ required: true, message: "请选择供应商", trigger: "change" }],
|
||||
sign_date: [{ required: true, message: "请选择签订日期", trigger: "change" }],
|
||||
},
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.getSuppliers();
|
||||
},
|
||||
methods: {
|
||||
getSuppliers() {
|
||||
this.$API.pum.supplier.list.req({ page: 0 }).then((res) => {
|
||||
this.supplierOptions = res;
|
||||
});
|
||||
},
|
||||
open(mode = "add") {
|
||||
this.mode = mode;
|
||||
this.visible = true;
|
||||
if (mode === "add") {
|
||||
this.form = {
|
||||
status: 10,
|
||||
};
|
||||
}
|
||||
return this;
|
||||
},
|
||||
setData(data) {
|
||||
this.form = Object.assign({}, data);
|
||||
return this;
|
||||
},
|
||||
submit() {
|
||||
this.$refs.dialogForm.validate(async (valid) => {
|
||||
if (!valid) {
|
||||
return;
|
||||
}
|
||||
this.isSaving = true;
|
||||
try {
|
||||
if (this.mode === "add") {
|
||||
await this.$API.pum.contract.create.req(this.form);
|
||||
} else {
|
||||
await this.$API.pum.contract.update.req(this.form.id, this.form);
|
||||
}
|
||||
this.$message.success("操作成功");
|
||||
this.$emit("success", this.form, this.mode);
|
||||
this.visible = false;
|
||||
} finally {
|
||||
this.isSaving = false;
|
||||
}
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
@ -0,0 +1,110 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel"></div>
|
||||
<div class="right-panel">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="合同编号/合同名称/供应商"
|
||||
clearable
|
||||
style="margin-right: 5px"
|
||||
/>
|
||||
<el-select
|
||||
v-model="query.stage_type"
|
||||
clearable
|
||||
placeholder="阶段类型"
|
||||
style="width: 140px; margin-right: 5px"
|
||||
>
|
||||
<el-option v-for="item in stageOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="付款日期" prop="record_date" />
|
||||
<el-table-column label="付款金额" prop="amount" />
|
||||
<el-table-column label="阶段类型">
|
||||
<template #default="scope">{{ stageMap[scope.row.stage_type] || "-" }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="付款方式">
|
||||
<template #default="scope">{{ payMethodMap[scope.row.pay_method] || "-" }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="合同编号" prop="contract_number" />
|
||||
<el-table-column label="供应商" prop="supplier_name" />
|
||||
<el-table-column label="凭证号" prop="voucher_no" show-overflow-tooltip />
|
||||
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
|
||||
<el-table-column label="操作" width="100" fixed="right">
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" @click="openContract(scope.row.contract)">查看合同</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
<detail-drawer
|
||||
v-if="dialog.detail"
|
||||
ref="detailDrawer"
|
||||
@refresh="refreshTable"
|
||||
@closed="dialog.detail = false"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import detailDrawer from "./components/PuContractRecordDrawer.vue";
|
||||
|
||||
export default {
|
||||
components: {
|
||||
detailDrawer,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
apiObj: this.$API.pum.contractRecord.list,
|
||||
query: {
|
||||
page: 1,
|
||||
page_size: 20,
|
||||
search: "",
|
||||
stage_type: "",
|
||||
},
|
||||
dialog: {
|
||||
detail: false,
|
||||
},
|
||||
stageOptions: [
|
||||
{ value: 10, label: "首款" },
|
||||
{ value: 20, label: "中间款" },
|
||||
{ value: 30, label: "尾款" },
|
||||
{ value: 40, label: "其他" },
|
||||
],
|
||||
stageMap: {
|
||||
10: "首款",
|
||||
20: "中间款",
|
||||
30: "尾款",
|
||||
40: "其他",
|
||||
},
|
||||
payMethodMap: {
|
||||
10: "银行转账",
|
||||
20: "现金",
|
||||
30: "承兑",
|
||||
40: "微信",
|
||||
50: "支付宝",
|
||||
60: "其他",
|
||||
},
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
handleQuery() {
|
||||
this.$refs.table.queryData(this.query);
|
||||
},
|
||||
openContract(contractId) {
|
||||
this.dialog.detail = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.detailDrawer.open(contractId);
|
||||
});
|
||||
},
|
||||
refreshTable() {
|
||||
this.$refs.table.refresh();
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
@ -40,6 +40,25 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="采购合同">
|
||||
<el-select
|
||||
v-model="form.contract"
|
||||
placeholder="采购合同"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 100%"
|
||||
@change="handleContractChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in contractOptions"
|
||||
:key="item.id"
|
||||
:label="`${item.number} - ${item.name}`"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="截止到货日期">
|
||||
<el-date-picker
|
||||
|
|
@ -96,11 +115,13 @@ export default {
|
|||
visible: false,
|
||||
isSaveing: false,
|
||||
options: [],
|
||||
contractOptions: [],
|
||||
setFiltersVisible: false,
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.getList();
|
||||
this.getContracts();
|
||||
},
|
||||
methods: {
|
||||
//显示
|
||||
|
|
@ -114,6 +135,17 @@ export default {
|
|||
this.options = res;
|
||||
});
|
||||
},
|
||||
getContracts() {
|
||||
this.$API.pum.contract.list.req({ page: 0 }).then((res) => {
|
||||
this.contractOptions = res;
|
||||
});
|
||||
},
|
||||
handleContractChange(value) {
|
||||
const contract = this.contractOptions.find((item) => item.id === value);
|
||||
if (contract) {
|
||||
this.form.supplier = contract.supplier;
|
||||
}
|
||||
},
|
||||
//提交
|
||||
submit() {
|
||||
this.$refs.dialogForm.validate(async (valid) => {
|
||||
|
|
|
|||
|
|
@ -134,17 +134,31 @@ export default {
|
|||
})
|
||||
},
|
||||
handleSave() {
|
||||
// 过滤掉 _ 后缀的对象字段，只发送后端需要的数据
|
||||
let data = {};
|
||||
for (let key in this.formData) {
|
||||
if (!key.endsWith('_')) {
|
||||
data[key] = this.formData[key];
|
||||
}
|
||||
}
|
||||
if (this.localMode == "add") {
|
||||
this.saveLoading = true;
|
||||
this.$API.pum.supplieraudit.create.req(this.formData).then(res=>{
|
||||
this.saveLoading = true;
|
||||
this.$API.pum.supplieraudit.create.req(data).then(res=>{
|
||||
this.saveLoading = false;
|
||||
this.$message.success("提交成功");
|
||||
this.$emit('success', this.localMode);
|
||||
}).catch(e=>{
|
||||
this.saveLoading = false;
|
||||
})
|
||||
} else if (this.localMode == "edit") {
|
||||
this.$message.error("不支持编辑!")
|
||||
this.saveLoading = true;
|
||||
this.$API.pum.supplieraudit.update.req(this.formData.id, data).then(res=>{
|
||||
this.saveLoading = false;
|
||||
this.$message.success("更新成功");
|
||||
this.$emit('success', this.localMode);
|
||||
}).catch(e=>{
|
||||
this.saveLoading = false;
|
||||
})
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,17 @@
|
|||
<el-button type="primary" icon="el-icon-plus" @click="tableAdd" v-auth="'qct.create'"></el-button>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<xtSelect
|
||||
:apiObj="$API.mtm.material.list"
|
||||
v-model="query.qctmat__material"
|
||||
v-model:obj="selectMaterialObj"
|
||||
:labelField="'full_name'"
|
||||
style="width: 600px;"
|
||||
:params="materialQuery"
|
||||
@change="selectMaterialChange"
|
||||
>
|
||||
<el-table-column label="物料" prop="full_name"></el-table-column>
|
||||
</xtSelect>
|
||||
<el-input v-model="query.search" placeholder="检验表名称" clearable @keyup.enter="handleQuery"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
</div>
|
||||
|
|
@ -91,7 +102,16 @@ import recordDialog from "./qctDetail.vue";
|
|||
data() {
|
||||
return {
|
||||
apiObj:this.$API.qm.qct.list,
|
||||
query: {search:''},
|
||||
query: {
|
||||
search:'',
|
||||
qctmat__material:'',
|
||||
},
|
||||
materialQuery: {
|
||||
page: 0,
|
||||
is_hidden: false,
|
||||
is_assemb: false,
|
||||
},
|
||||
selectMaterialObj: {},
|
||||
isSaving: false,
|
||||
showDrawer: false,
|
||||
limitedVisible: false,
|
||||
|
|
@ -196,6 +216,10 @@ import recordDialog from "./qctDetail.vue";
|
|||
handleQuery(){
|
||||
this.$refs.table.queryData(this.query)
|
||||
},
|
||||
selectMaterialChange(row){
|
||||
this.query.qctmat__material = row ? row.id : '';
|
||||
this.handleQuery();
|
||||
},
|
||||
dialogClose(){
|
||||
this.isSaving = false;
|
||||
this.limitedVisible = false;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,275 @@
|
|||
<template>
|
||||
<el-drawer
|
||||
v-model="visible"
|
||||
title="销售合同详情 / 到款流水"
|
||||
size="70%"
|
||||
destroy-on-close
|
||||
@closed="$emit('closed')"
|
||||
>
|
||||
<div v-loading="loading" class="drawer-wrap">
|
||||
<el-card shadow="hover" header="合同信息">
|
||||
<div class="contract-head">
|
||||
<el-tag :type="statusTagType(contract.status)" effect="dark">
|
||||
{{ statusMap[contract.status] || "-" }}
|
||||
</el-tag>
|
||||
<div class="contract-progress">
|
||||
<el-progress
|
||||
:percentage="progressNumber(contract.receive_progress)"
|
||||
:stroke-width="16"
|
||||
:color="progressColor(contract.status, contract.receive_progress)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<el-descriptions :column="3" border>
|
||||
<el-descriptions-item label="合同编号">{{ contract.number }}</el-descriptions-item>
|
||||
<el-descriptions-item label="合同名称">{{ contract.name }}</el-descriptions-item>
|
||||
<el-descriptions-item label="客户">{{ contract.customer_name }}</el-descriptions-item>
|
||||
<el-descriptions-item label="签订日期">{{ contract.sign_date }}</el-descriptions-item>
|
||||
<el-descriptions-item label="状态">{{ statusMap[contract.status] || "-" }}</el-descriptions-item>
|
||||
<el-descriptions-item label="备注">{{ contract.description || "-" }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-card>
|
||||
<el-alert
|
||||
v-if="isTerminated"
|
||||
title="当前合同已终止，流水已锁定，不可新增、编辑或删除。"
|
||||
type="error"
|
||||
show-icon
|
||||
:closable="false"
|
||||
class="contract-alert"
|
||||
/>
|
||||
<el-row :gutter="12" class="summary-row">
|
||||
<el-col v-for="item in summaryCards" :key="item.label" :span="8">
|
||||
<el-card shadow="never" class="summary-card">
|
||||
<div class="summary-label">{{ item.label }}</div>
|
||||
<div class="summary-value">{{ item.value }}</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-card shadow="hover">
|
||||
<template #header>
|
||||
<div class="card-header">
|
||||
<span>到款流水</span>
|
||||
<el-button type="primary" @click="handleAdd" :disabled="isTerminated" v-auth="'contract.update'">新增流水</el-button>
|
||||
</div>
|
||||
</template>
|
||||
<scTable
|
||||
ref="table"
|
||||
:data="records"
|
||||
row-key="id"
|
||||
stripe
|
||||
hidePagination
|
||||
hideDo
|
||||
hideRefresh
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="到款日期" prop="record_date" />
|
||||
<el-table-column label="到款金额" prop="amount" />
|
||||
<el-table-column label="阶段类型">
|
||||
<template #default="scope">
|
||||
<el-tag size="small" effect="plain">{{ stageMap[scope.row.stage_type] || "-" }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="收款方式">
|
||||
<template #default="scope">
|
||||
<el-tag size="small" type="info" effect="plain">{{ payMethodMap[scope.row.pay_method] || "-" }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="凭证号" prop="voucher_no" show-overflow-tooltip />
|
||||
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
|
||||
<el-table-column label="创建人" prop="create_by_name" />
|
||||
<el-table-column label="操作" width="120" fixed="right">
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" :disabled="isTerminated" @click="handleEdit(scope.row)" v-auth="'contract.update'">编辑</el-button>
|
||||
<el-button link type="danger" :disabled="isTerminated" @click="handleDelete(scope.row)" v-auth="'contract.update'">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-card>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<record-form
|
||||
v-if="dialog.form"
|
||||
ref="recordForm"
|
||||
@success="handleFormSuccess"
|
||||
@closed="dialog.form = false"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import recordForm from "./ContractRecordForm.vue";
|
||||
|
||||
export default {
|
||||
components: {
|
||||
recordForm,
|
||||
},
|
||||
emits: ["refresh", "closed"],
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
loading: false,
|
||||
contractId: "",
|
||||
contract: {},
|
||||
records: [],
|
||||
dialog: {
|
||||
form: false,
|
||||
},
|
||||
statusMap: {
|
||||
10: "草稿",
|
||||
20: "执行中",
|
||||
30: "已完成",
|
||||
40: "已终止",
|
||||
},
|
||||
stageMap: {
|
||||
10: "首款",
|
||||
20: "中间款",
|
||||
30: "尾款",
|
||||
40: "其他",
|
||||
},
|
||||
payMethodMap: {
|
||||
10: "银行转账",
|
||||
20: "现金",
|
||||
30: "承兑",
|
||||
40: "微信",
|
||||
50: "支付宝",
|
||||
60: "其他",
|
||||
},
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
isTerminated() {
|
||||
return this.contract.status === 40;
|
||||
},
|
||||
summaryCards() {
|
||||
return [
|
||||
{ label: "合同金额", value: this.contract.amount || 0 },
|
||||
{ label: "已到款", value: this.contract.received_amount || 0 },
|
||||
{ label: "未到款", value: this.contract.unreceived_amount || 0 },
|
||||
{ label: "到款进度", value: `${this.contract.receive_progress || 0}%` },
|
||||
{ label: "首款合计", value: this.sumByStage(10) },
|
||||
{ label: "中间款合计", value: this.sumByStage(20) },
|
||||
{ label: "尾款合计", value: this.sumByStage(30) },
|
||||
];
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
progressNumber(value) {
|
||||
return Number(value || 0);
|
||||
},
|
||||
progressColor(status, progress) {
|
||||
if (status === 40) {
|
||||
return "#f56c6c";
|
||||
}
|
||||
if (Number(progress || 0) >= 100) {
|
||||
return "#67c23a";
|
||||
}
|
||||
return "#409eff";
|
||||
},
|
||||
statusTagType(status) {
|
||||
return {
|
||||
10: "info",
|
||||
20: "primary",
|
||||
30: "success",
|
||||
40: "danger",
|
||||
}[status] || "info";
|
||||
},
|
||||
open(contractId) {
|
||||
this.contractId = contractId;
|
||||
this.visible = true;
|
||||
this.loadData();
|
||||
return this;
|
||||
},
|
||||
async loadData() {
|
||||
this.loading = true;
|
||||
try {
|
||||
const [contract, records] = await Promise.all([
|
||||
this.$API.sam.contract.item.req(this.contractId),
|
||||
this.$API.sam.contractRecord.list.req({ page: 0, contract: this.contractId }),
|
||||
]);
|
||||
this.contract = contract;
|
||||
this.records = Array.isArray(records) ? records : records?.data || [];
|
||||
} finally {
|
||||
this.loading = false;
|
||||
}
|
||||
},
|
||||
sumByStage(stageType) {
|
||||
return this.records
|
||||
.filter((item) => item.stage_type === stageType)
|
||||
.reduce((total, item) => total + Number(item.amount || 0), 0)
|
||||
.toFixed(2);
|
||||
},
|
||||
handleAdd() {
|
||||
if (this.isTerminated) {
|
||||
return;
|
||||
}
|
||||
this.dialog.form = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.recordForm.open("add", this.contractId);
|
||||
});
|
||||
},
|
||||
handleEdit(row) {
|
||||
if (this.isTerminated) {
|
||||
return;
|
||||
}
|
||||
this.dialog.form = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.recordForm.open("edit", this.contractId).setData(row, this.contractId);
|
||||
});
|
||||
},
|
||||
handleDelete(row) {
|
||||
if (this.isTerminated) {
|
||||
return;
|
||||
}
|
||||
this.$confirm("确定删除这条流水吗？", "提示", {
|
||||
type: "warning",
|
||||
}).then(async () => {
|
||||
await this.$API.sam.contractRecord.delete.req(row.id);
|
||||
this.$message.success("删除成功");
|
||||
this.handleFormSuccess();
|
||||
}).catch(() => {});
|
||||
},
|
||||
async handleFormSuccess() {
|
||||
this.dialog.form = false;
|
||||
await this.loadData();
|
||||
this.$emit("refresh");
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.drawer-wrap {
|
||||
padding: 8px;
|
||||
}
|
||||
.summary-row {
|
||||
margin: 12px 0;
|
||||
}
|
||||
.contract-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 16px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.contract-progress {
|
||||
flex: 1;
|
||||
}
|
||||
.contract-alert {
|
||||
margin-top: 12px;
|
||||
}
|
||||
.summary-card {
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.summary-label {
|
||||
font-size: 13px;
|
||||
color: #909399;
|
||||
}
|
||||
.summary-value {
|
||||
margin-top: 8px;
|
||||
font-size: 20px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.card-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,191 @@
|
|||
<template>
|
||||
<el-dialog
|
||||
:title="titleMap[mode]"
|
||||
v-model="visible"
|
||||
width="640px"
|
||||
destroy-on-close
|
||||
@closed="$emit('closed')"
|
||||
>
|
||||
<el-form
|
||||
ref="dialogForm"
|
||||
:model="form"
|
||||
:rules="rules"
|
||||
label-width="120px"
|
||||
>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="到款日期" prop="record_date">
|
||||
<el-date-picker
|
||||
v-model="form.record_date"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
placeholder="到款日期"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="到款金额" prop="amount">
|
||||
<el-input-number
|
||||
v-model="form.amount"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
controls-position="right"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="阶段类型" prop="stage_type">
|
||||
<el-select
|
||||
v-model="form.stage_type"
|
||||
placeholder="阶段类型"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in stageOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="收款方式" prop="pay_method">
|
||||
<el-select
|
||||
v-model="form.pay_method"
|
||||
placeholder="收款方式"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in payMethodOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="凭证号">
|
||||
<el-input v-model="form.voucher_no" placeholder="凭证号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注">
|
||||
<el-input
|
||||
v-model="form.remark"
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
placeholder="备注"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="visible = false">取消</el-button>
|
||||
<el-button type="primary" :loading="isSaving" @click="submit">
|
||||
保存
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
emits: ["success", "closed"],
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
mode: "add",
|
||||
isSaving: false,
|
||||
titleMap: {
|
||||
add: "新增到款流水",
|
||||
edit: "编辑到款流水",
|
||||
},
|
||||
form: {
|
||||
contract: "",
|
||||
record_date: "",
|
||||
amount: undefined,
|
||||
stage_type: 40,
|
||||
pay_method: 10,
|
||||
voucher_no: "",
|
||||
remark: "",
|
||||
},
|
||||
stageOptions: [
|
||||
{ value: 10, label: "首款" },
|
||||
{ value: 20, label: "中间款" },
|
||||
{ value: 30, label: "尾款" },
|
||||
{ value: 40, label: "其他" },
|
||||
],
|
||||
payMethodOptions: [
|
||||
{ value: 10, label: "银行转账" },
|
||||
{ value: 20, label: "现金" },
|
||||
{ value: 30, label: "承兑" },
|
||||
{ value: 40, label: "微信" },
|
||||
{ value: 50, label: "支付宝" },
|
||||
{ value: 60, label: "其他" },
|
||||
],
|
||||
rules: {
|
||||
record_date: [{ required: true, message: "请选择到款日期", trigger: "change" }],
|
||||
amount: [{ required: true, message: "请输入到款金额", trigger: "blur" }],
|
||||
stage_type: [{ required: true, message: "请选择阶段类型", trigger: "change" }],
|
||||
pay_method: [{ required: true, message: "请选择收款方式", trigger: "change" }],
|
||||
},
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
open(mode = "add", contractId = "") {
|
||||
this.mode = mode;
|
||||
this.visible = true;
|
||||
this.form = {
|
||||
contract: contractId,
|
||||
record_date: "",
|
||||
amount: undefined,
|
||||
stage_type: 40,
|
||||
pay_method: 10,
|
||||
voucher_no: "",
|
||||
remark: "",
|
||||
};
|
||||
return this;
|
||||
},
|
||||
setData(data, contractId = "") {
|
||||
this.form = Object.assign(
|
||||
{
|
||||
contract: contractId || data.contract,
|
||||
record_date: "",
|
||||
amount: undefined,
|
||||
stage_type: 40,
|
||||
pay_method: 10,
|
||||
voucher_no: "",
|
||||
remark: "",
|
||||
},
|
||||
data
|
||||
);
|
||||
return this;
|
||||
},
|
||||
submit() {
|
||||
this.$refs.dialogForm.validate(async (valid) => {
|
||||
if (!valid) {
|
||||
return;
|
||||
}
|
||||
this.isSaving = true;
|
||||
try {
|
||||
if (this.mode === "add") {
|
||||
await this.$API.sam.contractRecord.create.req(this.form);
|
||||
} else {
|
||||
await this.$API.sam.contractRecord.update.req(this.form.id, this.form);
|
||||
}
|
||||
this.$message.success("操作成功");
|
||||
this.$emit("success");
|
||||
this.visible = false;
|
||||
} finally {
|
||||
this.isSaving = false;
|
||||
}
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
@ -12,23 +12,58 @@
|
|||
<el-main class="nopadding">
|
||||
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="合同名称" prop="name">
|
||||
</el-table-column>
|
||||
<el-table-column label="合同编号" prop="number">
|
||||
</el-table-column>
|
||||
<el-table-column label="合同名称" prop="name">
|
||||
</el-table-column>
|
||||
<el-table-column label="关联客户" prop="customer_name">
|
||||
</el-table-column>
|
||||
<el-table-column label="合同金额" prop="amount">
|
||||
<template #default="scope">
|
||||
<span class="amount-strong">{{ formatMoney(scope.row.amount) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="已到款" prop="received_amount">
|
||||
<template #default="scope">
|
||||
<span class="amount-success">{{ formatMoney(scope.row.received_amount) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="未到款" prop="unreceived_amount">
|
||||
<template #default="scope">
|
||||
<span class="amount-warning">{{ formatMoney(scope.row.unreceived_amount) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到款进度" min-width="180">
|
||||
<template #default="scope">
|
||||
<div class="progress-cell">
|
||||
<el-progress
|
||||
:percentage="progressNumber(scope.row.receive_progress)"
|
||||
:stroke-width="14"
|
||||
:color="progressColor(scope.row.status, scope.row.receive_progress)"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="签订日期" prop="sign_date">
|
||||
</el-table-column>
|
||||
<el-table-column label="关联客户" prop="customer_name">
|
||||
<el-table-column label="合同状态">
|
||||
<template #default="scope">
|
||||
<el-tag :type="statusTagType(scope.row.status)" effect="dark">
|
||||
{{ statusMap[scope.row.status] || "-" }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建人" prop="create_by_name">
|
||||
</el-table-column>
|
||||
<el-table-column label="描述">
|
||||
<template #default="scope">{{ scope.row.description }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="left" width="120">
|
||||
<el-table-column label="操作" fixed="right" align="left" width="180">
|
||||
<template #default="scope">
|
||||
<el-link type="primary" @click="table_detail(scope.row)">
|
||||
流水详情
|
||||
</el-link>
|
||||
<el-divider direction="vertical"></el-divider>
|
||||
<el-link type="primary" @click="table_edit(scope.row)" v-auth="'contract.update'">
|
||||
编辑
|
||||
</el-link>
|
||||
|
|
@ -43,18 +78,27 @@
|
|||
</el-container>
|
||||
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
|
||||
@closed="dialog.save = false"></save-dialog>
|
||||
<detail-drawer
|
||||
v-if="dialog.detail"
|
||||
ref="detailDrawer"
|
||||
@refresh="handleSaveSuccess"
|
||||
@closed="dialog.detail = false"
|
||||
></detail-drawer>
|
||||
</template>
|
||||
<script>
|
||||
import saveDialog from "./contract_form.vue";
|
||||
import detailDrawer from "./components/ContractRecordDrawer.vue";
|
||||
export default {
|
||||
name: "rparty",
|
||||
components: {
|
||||
saveDialog,
|
||||
detailDrawer,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialog: {
|
||||
save: false,
|
||||
detail: false,
|
||||
},
|
||||
apiObj: this.$API.sam.contract.list,
|
||||
query: {
|
||||
|
|
@ -62,16 +106,40 @@ export default {
|
|||
page_size: 20,
|
||||
type: 10
|
||||
},
|
||||
contractId: "",
|
||||
selection: [],
|
||||
state_: {
|
||||
10: '完好',
|
||||
20: '限用',
|
||||
30: '在修',
|
||||
40: '禁用',
|
||||
statusMap: {
|
||||
10: "草稿",
|
||||
20: "执行中",
|
||||
30: "已完成",
|
||||
40: "已终止",
|
||||
},
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
formatMoney(value) {
|
||||
return Number(value || 0).toFixed(2);
|
||||
},
|
||||
progressNumber(value) {
|
||||
return Number(value || 0);
|
||||
},
|
||||
progressColor(status, progress) {
|
||||
if (status === 40) {
|
||||
return "#f56c6c";
|
||||
}
|
||||
if (Number(progress || 0) >= 100) {
|
||||
return "#67c23a";
|
||||
}
|
||||
return "#409eff";
|
||||
},
|
||||
statusTagType(status) {
|
||||
return {
|
||||
10: "info",
|
||||
20: "primary",
|
||||
30: "success",
|
||||
40: "danger",
|
||||
}[status] || "info";
|
||||
},
|
||||
//添加
|
||||
add() {
|
||||
this.dialog.save = true;
|
||||
|
|
@ -93,13 +161,21 @@ export default {
|
|||
this.$refs.saveDialog.open("show").setData(row);
|
||||
});
|
||||
},
|
||||
table_detail(row) {
|
||||
this.contractId = row.id;
|
||||
this.dialog.detail = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.detailDrawer.open(row.id);
|
||||
});
|
||||
},
|
||||
//删除
|
||||
async table_del(row) {
|
||||
this.$confirm(`确定删除吗？`, "提示", {
|
||||
type: "warning",
|
||||
}).then(() => {
|
||||
this.$API.pum.order.delete.req(row.id).then((res) => {
|
||||
this.$API.sam.contract.delete.req(row.id).then((res) => {
|
||||
this.$message.success("删除成功");
|
||||
this.$refs.table.refresh();
|
||||
return res;
|
||||
}).catch((err) => {
|
||||
return err;
|
||||
|
|
@ -123,4 +199,21 @@ export default {
|
|||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
</script>
|
||||
<style scoped>
|
||||
.amount-strong {
|
||||
font-weight: 600;
|
||||
color: #303133;
|
||||
}
|
||||
.amount-success {
|
||||
font-weight: 600;
|
||||
color: #67c23a;
|
||||
}
|
||||
.amount-warning {
|
||||
font-weight: 600;
|
||||
color: #e6a23c;
|
||||
}
|
||||
.progress-cell {
|
||||
padding-right: 8px;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -43,6 +43,35 @@
|
|||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="生效日期">
|
||||
<el-date-picker
|
||||
v-model="form.effective_date"
|
||||
type="date"
|
||||
placeholder="生效日期"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="width:100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="截止日期">
|
||||
<el-date-picker
|
||||
v-model="form.end_date"
|
||||
type="date"
|
||||
placeholder="截止日期"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="width:100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="合同状态" prop="status">
|
||||
<el-select v-model="form.status" placeholder="合同状态" style="width:100%">
|
||||
<el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="关联客户" prop="customer">
|
||||
<el-select
|
||||
|
|
@ -98,6 +127,12 @@ export default {
|
|||
isSaveing: false,
|
||||
setFiltersVisible: false,
|
||||
options: [],
|
||||
statusOptions: [
|
||||
{ value: 10, label: "草稿" },
|
||||
{ value: 20, label: "执行中" },
|
||||
{ value: 30, label: "已完成" },
|
||||
{ value: 40, label: "已终止" },
|
||||
],
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -114,6 +149,11 @@ export default {
|
|||
open(mode = "add",type) {
|
||||
this.mode = mode;
|
||||
this.visible = true;
|
||||
if (mode === "add") {
|
||||
this.form = {
|
||||
status: 10,
|
||||
};
|
||||
}
|
||||
return this;
|
||||
},
|
||||
//提交
|
||||
|
|
|
|||
|
|
@ -0,0 +1,110 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel"></div>
|
||||
<div class="right-panel">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="合同编号/合同名称/客户"
|
||||
clearable
|
||||
style="margin-right: 5px"
|
||||
/>
|
||||
<el-select
|
||||
v-model="query.stage_type"
|
||||
clearable
|
||||
placeholder="阶段类型"
|
||||
style="width: 140px; margin-right: 5px"
|
||||
>
|
||||
<el-option v-for="item in stageOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="到款日期" prop="record_date" />
|
||||
<el-table-column label="到款金额" prop="amount" />
|
||||
<el-table-column label="阶段类型">
|
||||
<template #default="scope">{{ stageMap[scope.row.stage_type] || "-" }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="收款方式">
|
||||
<template #default="scope">{{ payMethodMap[scope.row.pay_method] || "-" }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="合同编号" prop="contract_number" />
|
||||
<el-table-column label="客户" prop="customer_name" />
|
||||
<el-table-column label="凭证号" prop="voucher_no" show-overflow-tooltip />
|
||||
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
|
||||
<el-table-column label="操作" width="100" fixed="right">
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" @click="openContract(scope.row.contract)">查看合同</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
<detail-drawer
|
||||
v-if="dialog.detail"
|
||||
ref="detailDrawer"
|
||||
@refresh="refreshTable"
|
||||
@closed="dialog.detail = false"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import detailDrawer from "./components/ContractRecordDrawer.vue";
|
||||
|
||||
export default {
|
||||
components: {
|
||||
detailDrawer,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
apiObj: this.$API.sam.contractRecord.list,
|
||||
query: {
|
||||
page: 1,
|
||||
page_size: 20,
|
||||
search: "",
|
||||
stage_type: "",
|
||||
},
|
||||
dialog: {
|
||||
detail: false,
|
||||
},
|
||||
stageOptions: [
|
||||
{ value: 10, label: "首款" },
|
||||
{ value: 20, label: "中间款" },
|
||||
{ value: 30, label: "尾款" },
|
||||
{ value: 40, label: "其他" },
|
||||
],
|
||||
stageMap: {
|
||||
10: "首款",
|
||||
20: "中间款",
|
||||
30: "尾款",
|
||||
40: "其他",
|
||||
},
|
||||
payMethodMap: {
|
||||
10: "银行转账",
|
||||
20: "现金",
|
||||
30: "承兑",
|
||||
40: "微信",
|
||||
50: "支付宝",
|
||||
60: "其他",
|
||||
},
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
handleQuery() {
|
||||
this.$refs.table.queryData(this.query);
|
||||
},
|
||||
openContract(contractId) {
|
||||
this.dialog.detail = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.detailDrawer.open(contractId);
|
||||
});
|
||||
},
|
||||
refreshTable() {
|
||||
this.$refs.table.refresh();
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
<span>{{ item.batch }}</span>
|
||||
<span v-if="item.material_&&item.material_.process_name">({{ item.material_.process_name }})</span>
|
||||
<span v-else>(原料棒)</span>
|
||||
<span v-if="item.defect!==null" style="color: red;">{{ item.defect_name }}</span>
|
||||
<el-tag v-if="item.defect!==null" type="warning" size="small" effect="plain" style="margin-left: 8px;">{{ item.defect_name }}</el-tag>
|
||||
<div style="float: right">
|
||||
<span>{{ item.count_canhandover }}</span>
|
||||
<span v-if="item.notok_sign_name !== null" style="color: #aaaaaa">
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@
|
|||
:value="item.id"
|
||||
>
|
||||
<span>{{ item.batch }}</span>
|
||||
<span v-if="item.defect_name&&item.defect_name!==null">({{ item.defect_name }})</span>
|
||||
<el-tag v-if="item.defect_name&&item.defect_name!==null" type="warning" size="small" effect="plain" style="margin-left: 8px;">{{ item.defect_name }}</el-tag>
|
||||
<span style="float: right;">{{ item.count_cando }}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@
|
|||
:apiObj="apiObjM"
|
||||
v-model="selectObjIds"
|
||||
v-model:obj="selectObjs"
|
||||
v-model:label="selectMaterialLabel"
|
||||
:labelField="'batch'"
|
||||
style="width: 100%;"
|
||||
:params = "paramsM"
|
||||
|
|
@ -47,7 +48,7 @@
|
|||
<span v-if="scope.row.state==20" style="color: red;border: 1px solid red;border-radius: 3px;">不合格</span>
|
||||
<span v-if="scope.row.state==30" style="color: orange;border: 1px solid orange;border-radius: 3px;">返工</span>
|
||||
<span>{{ scope.row.batch }}({{ scope.row.material_name }})</span>
|
||||
<span v-if="scope.row.defect_name !== null" style="color: orangered">{{ scope.row.defect_name }}</span>
|
||||
<el-tag v-if="scope.row.defect_name" type="warning" size="small" effect="plain" style="margin-left: 8px;">{{ scope.row.defect_name }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="可交接数量" prop="count_canhandover" width="110px"></el-table-column>
|
||||
|
|
@ -200,6 +201,7 @@
|
|||
:apiObj="apiObjM"
|
||||
v-model="selectObjIds"
|
||||
v-model:obj="selectObjs"
|
||||
v-model:label="selectMaterialLabel"
|
||||
:labelField="'batch'"
|
||||
style="width: 100%;"
|
||||
:params = "paramsM"
|
||||
|
|
@ -211,7 +213,7 @@
|
|||
<span v-if="scope.row.state==20" style="color: red;border: 1px solid red;border-radius: 3px;">不合格</span>
|
||||
<span v-if="scope.row.state==30" style="color: orange;border: 1px solid orange;border-radius: 3px;">返工</span>
|
||||
<span>{{ scope.row.batch }}({{ scope.row.material_name }})</span>
|
||||
<span v-if="scope.row.defect_name !== null" style="color: orangered">{{ scope.row.defect_name }}</span>
|
||||
<el-tag v-if="scope.row.defect_name" type="warning" size="small" effect="plain" style="margin-left: 8px;">{{ scope.row.defect_name }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="可交接数量" prop="count_canhandover" width="110px"></el-table-column>
|
||||
|
|
@ -343,6 +345,7 @@ export default {
|
|||
},
|
||||
initForm:{},
|
||||
selectObjIds:[],
|
||||
selectMaterialLabel:"",
|
||||
apiObj:this.$API.mtm.material.list,
|
||||
apiObjM:null,
|
||||
params:{},
|
||||
|
|
@ -662,6 +665,7 @@ export default {
|
|||
//选中物料批次后，放入handoverb
|
||||
materialChange0(){
|
||||
let that = this;
|
||||
that.selectMaterialLabel = that.selectObjs.map(item => that.formatWmaterialLabel(item)).join(";");
|
||||
that.totalCount = 0;
|
||||
that.selectObjs.forEach(item=>{
|
||||
if(that.handoverbIds.indexOf(item.id)==-1){
|
||||
|
|
@ -692,6 +696,12 @@ export default {
|
|||
that.countChange();
|
||||
},500)
|
||||
},
|
||||
formatWmaterialLabel(row){
|
||||
if(!row || !row.batch){
|
||||
return "";
|
||||
}
|
||||
return row.defect_name ? `${row.batch} [${row.defect_name}]` : row.batch;
|
||||
},
|
||||
countChange(){
|
||||
let that = this;
|
||||
let totalCount = 0;
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@
|
|||
:apiObj="apiObjM"
|
||||
v-model="form.wm_in"
|
||||
v-model:obj="selectObj"
|
||||
v-model:label="wmInLabel"
|
||||
:labelField="'batch'"
|
||||
style="width: 100%;"
|
||||
:params = "paramsM"
|
||||
|
|
@ -55,7 +56,7 @@
|
|||
<span v-if="scope.row.state==20" style="color: red;border: 1px solid red;border-radius: 3px;">不合格</span>
|
||||
<span v-if="scope.row.state==30" style="color: orange;border: 1px solid orange;border-radius: 3px;">返工</span>
|
||||
<span>{{ scope.row.batch }}({{ scope.row.material_name }})</span>
|
||||
<span v-if="scope.row.defect_name !== null" style="color: orangered">{{ scope.row.defect_name }}</span>
|
||||
<el-tag v-if="scope.row.defect_name" type="warning" size="small" effect="plain" style="margin-left: 8px;">{{ scope.row.defect_name }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="车间库存" prop="count" width="110px"></el-table-column>
|
||||
|
|
@ -271,6 +272,7 @@ export default {
|
|||
],
|
||||
},
|
||||
selectObj:{count:0},
|
||||
wmInLabel:"",
|
||||
batch_count:null,
|
||||
codeBatch:"",
|
||||
materialFix:"",
|
||||
|
|
@ -400,7 +402,7 @@ export default {
|
|||
getdefects(material){
|
||||
let that = this;
|
||||
// let material = that.is_fix?that.materialFix:that.materialIn;
|
||||
that.$API.qm.qct.getQct.req({material: material,tag:'process'}).then((res) => {
|
||||
that.$API.qm.qct.getQct.req({material: material,tag:'process',type:'in'}).then((res) => {
|
||||
res.qct_defects.forEach((item) => {
|
||||
that.defectform[item.defect_name] = 0;
|
||||
})
|
||||
|
|
@ -420,6 +422,11 @@ export default {
|
|||
},
|
||||
materialBatchChange(){
|
||||
let that = this;
|
||||
if(!that.selectObj || !that.selectObj.id){
|
||||
that.wmInLabel = "";
|
||||
return;
|
||||
}
|
||||
that.wmInLabel = that.formatWmaterialLabel(that.selectObj);
|
||||
that.getRoute(that.selectObj.material);
|
||||
that.form.batch = that.selectObj.batch;
|
||||
that.form.count_use = that.selectObj.count_cando;
|
||||
|
|
@ -483,6 +490,12 @@ export default {
|
|||
})
|
||||
that.countCellChanges();
|
||||
},
|
||||
formatWmaterialLabel(row){
|
||||
if(!row || !row.batch){
|
||||
return "";
|
||||
}
|
||||
return row.defect_name ? `${row.batch} [${row.defect_name}]` : row.batch;
|
||||
},
|
||||
//表单提交方法
|
||||
submit() {
|
||||
let that = this;
|
||||
|
|
|
|||
Loading…
Reference in New Issue