This commit is contained in:
parent
ac7371c95b
commit
7b3b9f59c5
|
|
@ -13,6 +13,7 @@
|
||||||
style="height: 500px; overflow-y: scroll; padding: 0 20px"
|
style="height: 500px; overflow-y: scroll; padding: 0 20px"
|
||||||
>
|
>
|
||||||
<vue-easy-print tableShow ref="printRef">
|
<vue-easy-print tableShow ref="printRef">
|
||||||
|
<div style="text-align: center; font-weight: 800;font-size: 18px;margin-bottom: 20px;">{{ billTitle }}</div>
|
||||||
<div class="order_box">
|
<div class="order_box">
|
||||||
<div class="order_box_one">
|
<div class="order_box_one">
|
||||||
<div>
|
<div>
|
||||||
|
|
@ -46,6 +47,7 @@
|
||||||
align="center"
|
align="center"
|
||||||
prop="typeName"
|
prop="typeName"
|
||||||
:show-overflow-tooltip="true"
|
:show-overflow-tooltip="true"
|
||||||
|
class-name="small-padding fixed-width"
|
||||||
/>
|
/>
|
||||||
<!-- <el-table-column type="expand">
|
<!-- <el-table-column type="expand">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
|
|
@ -86,6 +88,7 @@
|
||||||
align="center"
|
align="center"
|
||||||
prop="typeCode"
|
prop="typeCode"
|
||||||
:show-overflow-tooltip="true"
|
:show-overflow-tooltip="true"
|
||||||
|
class-name="small-padding fixed-width"
|
||||||
/>
|
/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="退料数量"
|
label="退料数量"
|
||||||
|
|
@ -94,6 +97,18 @@
|
||||||
width="200"
|
width="200"
|
||||||
prop="num"
|
prop="num"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
label="状态"
|
||||||
|
align="center"
|
||||||
|
class-name="small-padding fixed-width"
|
||||||
|
prop="status"
|
||||||
|
></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
label="备注"
|
||||||
|
align="center"
|
||||||
|
class-name="small-padding fixed-width"
|
||||||
|
prop="remark"
|
||||||
|
></el-table-column>
|
||||||
<!-- <el-table-column prop="remarks" label="备注" align="center">
|
<!-- <el-table-column prop="remarks" label="备注" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span
|
<span
|
||||||
|
|
@ -194,6 +209,15 @@ export default {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: {},
|
default: {},
|
||||||
},
|
},
|
||||||
|
// 单子title
|
||||||
|
title: {
|
||||||
|
type: String,
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
billTitle: {
|
||||||
|
type: String,
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
isShowFlag(val) {
|
isShowFlag(val) {
|
||||||
|
|
|
||||||
|
|
@ -152,7 +152,7 @@
|
||||||
:show-overflow-tooltip="true"
|
:show-overflow-tooltip="true"
|
||||||
/>
|
/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="出库数量"
|
label="预出库数量"
|
||||||
align="center"
|
align="center"
|
||||||
prop="outNum"
|
prop="outNum"
|
||||||
:show-overflow-tooltip="true"
|
:show-overflow-tooltip="true"
|
||||||
|
|
|
||||||
|
|
@ -524,7 +524,7 @@
|
||||||
prop="maStatus"
|
prop="maStatus"
|
||||||
:show-overflow-tooltip="true"
|
:show-overflow-tooltip="true"
|
||||||
/>
|
/>
|
||||||
<el-table-column label="备注" align="center" prop="remark">
|
<!-- <el-table-column label="备注" align="center" prop="remark">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="scope.row.remark"
|
v-model="scope.row.remark"
|
||||||
|
|
@ -534,7 +534,7 @@
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column> -->
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<pagination
|
<pagination
|
||||||
|
|
@ -626,7 +626,7 @@
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="备注" align="center" prop="remark">
|
<!-- <el-table-column label="备注" align="center" prop="remark">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="scope.row.remark"
|
v-model="scope.row.remark"
|
||||||
|
|
@ -636,7 +636,7 @@
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column> -->
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
|
@ -1080,6 +1080,7 @@ export default {
|
||||||
outNum: 1,
|
outNum: 1,
|
||||||
taskId: this.outObj.taskId,
|
taskId: this.outObj.taskId,
|
||||||
leaseType: this.leaseType,
|
leaseType: this.leaseType,
|
||||||
|
// remark: this.outCodeList.find((v) => v.maId == item).remark,
|
||||||
}
|
}
|
||||||
return obj
|
return obj
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -266,6 +266,7 @@
|
||||||
<!-- 退料单 -->
|
<!-- 退料单 -->
|
||||||
<dialogForm
|
<dialogForm
|
||||||
:dialogTitle="title"
|
:dialogTitle="title"
|
||||||
|
:billTitle="billTitle"
|
||||||
:isShowFlag.sync="isShowOneFlag"
|
:isShowFlag.sync="isShowOneFlag"
|
||||||
:rowObj="rowObj"
|
:rowObj="rowObj"
|
||||||
:priKey="priKey"
|
:priKey="priKey"
|
||||||
|
|
@ -314,6 +315,7 @@ export default {
|
||||||
typeList: [],
|
typeList: [],
|
||||||
// 弹出层标题
|
// 弹出层标题
|
||||||
title: '',
|
title: '',
|
||||||
|
billTitle: '', //单子标题
|
||||||
// 是否显示弹出层
|
// 是否显示弹出层
|
||||||
open: false,
|
open: false,
|
||||||
// 日期范围
|
// 日期范围
|
||||||
|
|
@ -479,6 +481,7 @@ export default {
|
||||||
//打开退料单
|
//打开退料单
|
||||||
handlePrint(row) {
|
handlePrint(row) {
|
||||||
// this.title = "退料单";
|
// this.title = "退料单";
|
||||||
|
this.billTitle = '退料单'
|
||||||
this.isShowOneFlag = true
|
this.isShowOneFlag = true
|
||||||
this.rowObj = row
|
this.rowObj = row
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue