root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：合同台账功能优化

Browse Source
This commit is contained in:
liuxy
2024-09-14 14:31:50 +08:00
parent cbec03671b
commit 9ccc7715fd
5 changed files with 140 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mes/qd/src/views/wms/statistics/ledgerQuery/ReceiveDialog.vue
View File

@@ -1,6 +1,6 @@
<template>
<el-dialog
title="到货通知单"
title="到货情况"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
@@ -19,20 +19,11 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column show-overflow-tooltip prop="vbillcode" label="订单编号" min-width="150"/>
<el-table-column show-overflow-tooltip prop="receive_code" label="到货单号" min-width="130"/>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编号" min-width="130"/>
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" min-width="130"/>
<el-table-column show-overflow-tooltip prop="pcsn" label="批次号" />
<el-table-column show-overflow-tooltip prop="receive_qty" label="到货重量" :formatter="crud.formatNum3"/>
<el-table-column show-overflow-tooltip prop="instor_qty" label="入库重量" :formatter="crud.formatNum3"/>
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" />
<el-table-column show-overflow-tooltip prop="status" label="状态" :formatter="formatStatusName"/>
<el-table-column show-overflow-tooltip prop="input_optname" label="创建人" />
<el-table-column show-overflow-tooltip prop="honor_time" label="合同要求履约时间" width="150px" />
<el-table-column show-overflow-tooltip prop="honour_days" label="资金计划履约天数" width="150px"/>
<el-table-column show-overflow-tooltip prop="receive_date" label="到货日期" min-width="100"/>
<el-table-column show-overflow-tooltip prop="" label="资金计划履约时间" width="150px"/>
<el-table-column prop="receive_code" label="到货通知单" width="120px" show-overflow-tooltip/>
<el-table-column prop="input_time" label="到货时间" width="150px" show-overflow-tooltip />
<el-table-column prop="receive_qty" label="到货重量" show-overflow-tooltip :formatter="crud.formatNum3" />
<el-table-column prop="valmoney" label="到货金额" show-overflow-tooltip :formatter="crud.formatNum3" />
<el-table-column prop="plan_date" label="资金计划" width="150px" show-overflow-tooltip />
</el-table>
<!--分页组件-->
<pagination />
@@ -73,7 +64,7 @@ export default {
default: false
},
openParam: {
type: Object
type: String
}
},
data() {
@@ -86,7 +77,6 @@ export default {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
this.crud.query.vbillcode = this.openParam
}
}
},
@@ -108,6 +98,7 @@ export default {
this.$emit('update:dialogShow', false)
},
open() {
this.crud.query.id = this.openParam
this.crud.toQuery()
},
formatStatusName(row, column) {

18
mes/qd/src/views/wms/statistics/ledgerQuery/index.vue
View File

@@ -8,7 +8,7 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-width="120px"
label-suffix=":"
>
@@ -75,7 +75,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="采购未到货重量">
<el-form-item label="合同未到货重量">
<div>
<el-radio-group v-model="query.iszero" @change="crud.toQuery">
<el-radio-button label="true">为0</el-radio-button>
@@ -121,12 +121,18 @@
<el-table-column prop="all_valmoney" label="合计金额" show-overflow-tooltip :formatter="crud.formatNum3" />
</el-table-column>
<el-table-column label="到货情况" align="center">
<el-table-column prop="receive_code" label="到货通知单" width="120px" show-overflow-tooltip/>
<!-- <el-table-column prop="receive_code" label="到货通知单" width="120px" show-overflow-tooltip/>
<el-table-column prop="input_time" label="到货时间" width="150px" show-overflow-tooltip />
<el-table-column prop="receive_qty" label="到货重量" show-overflow-tooltip :formatter="crud.formatNum3" />
<el-table-column prop="notqty" label="未到货重量" width="150px" show-overflow-tooltip :formatter="crud.formatNum3" />
<el-table-column prop="valmoney" label="到货金额" show-overflow-tooltip :formatter="crud.formatNum3" />
<el-table-column prop="plan_date" label="资金计划" width="150px" show-overflow-tooltip />
<el-table-column prop="plan_date" label="资金计划" width="150px" show-overflow-tooltip />-->
<el-table-column show-overflow-tooltip prop="bill_code" width="150" label="点击查看到货情况">
<template slot-scope="scope">
<el-link type="warning" @click="openReceive(scope.$index, scope.row)">到货情况</el-link>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="备注" align="center">
<el-table-column prop="remark" label="内容" width="200px" show-overflow-tooltip />
@@ -213,8 +219,8 @@ export default {
}
}
},
openReceive(row) {
this.openParam = row.vbillcode
openReceive(index, row) {
this.openParam = row.id
this.receiveDialog = true
},
openRemarkDaing(row) {