zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:入库信息，生产领料、销售发发货打印导出初版测试

This commit is contained in:
shijing 2024-10-15 10:49:28 +08:00
parent 4196873dd7
commit b9a7cd6b66
4 changed files with 203 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/views/inm/mioitem.vue
View File

@ -9,6 +9,7 @@
<div style="padding: 8px">
<div>
<el-card style="width: 100%" header="基本信息" shadow="hover">
<el-button type="primary" @click="handlePrint" style="position: absolute;right: 20px;">打印</el-button>
<el-descriptions>
<el-descriptions-item label="编号">{{
mioObj.number
@ -208,15 +209,20 @@
@closed="dialog.check = false"
>
</check-dialog>
<el-dialog v-model="printVisible" width="1200px">
<print :baseData="mioObj" :tableData="tableData" :type="mioObj.type" mtype="20"/>
</el-dialog>
</template>
<script>
import saveDialog from "./mioitem_form.vue";
import checkDialog from "./mioitem_check.vue";
import print from "./../setting/print/A4.vue";
export default {
name: "mioitem",
components: {
saveDialog,
checkDialog,
print
},
props: {
type: {
@ -243,6 +249,7 @@ export default {
// mioId: "",
mioObj: {},
selection: [],
tableData:[],
stateDict: {
10: "创建中",
20: "已提交",
@ -256,10 +263,12 @@ export default {
other_out: "其他出库",
},
visible: false,
printVisible:false,
mioitemId: "",
// type: "",
// cate: "",
objitem: {},
mtype:10
};
},
mounted() {
@ -369,6 +378,22 @@ export default {
this.mioObj = res;
});
},
handlePrint(){
let that = this;
let params = {
mio: that.mioId,
page:0
}
// if(){
// that.mtype = 10
// }else{
// }
that.$API.inm.mioitem.list.req(params).then((res) => {
that.tableData = res;
that.printVisible = true;
})
},//打印
},
};
</script>

52
src/views/sam/orderitem.vue
View File

@ -9,19 +9,20 @@
<div style="padding: 8px">
<div>
<el-card style="width: 100%" header="基本信息" shadow="hover">
<el-button type="primary" @click="handlePrint" style="position: absolute;right: 20px;">打印</el-button>
<el-descriptions>
<el-descriptions-item label="订单编号">{{
orderObj.number
}}</el-descriptions-item>
<el-descriptions-item label="客户">{{
orderObj.customer_name
}}</el-descriptions-item>
<el-descriptions-item label="订单状态">{{
orderObj.state
}}</el-descriptions-item>
<el-descriptions-item label="截止交货">{{
orderObj.delivery_date
}}</el-descriptions-item>
<el-descriptions-item label="订单编号">
{{orderObj.number}}
</el-descriptions-item>
<el-descriptions-item label="客户">
{{orderObj.customer_name}}
</el-descriptions-item>
<el-descriptions-item label="订单状态">
{{stateOption[orderObj.state]}}
</el-descriptions-item>
<el-descriptions-item label="截止交货">
{{orderObj.delivery_date}}
</el-descriptions-item>
</el-descriptions>
</el-card>
</div>
@ -33,6 +34,7 @@
type="primary"
icon="el-icon-plus"
@click="table_add"
v-if="orderObj.state == 10"
v-auth="'order.update'"
></el-button>
</div>
@ -110,13 +112,18 @@
@success="handleSaveSuccess"
@closed="dialog.save = false"
></save-dialog>
<el-dialog v-model="printVisible" width="1200px">
<print :baseData="orderObj" :tableData="tableData" :type="type" mtype="10"/>
</el-dialog>
</template>
<script>
import saveDialog from "./orderitem_form.vue";
import print from "./../setting/print/A4.vue";
export default {
name: "rparty",
components: {
saveDialog,
print
},
props: {
orderId: {
@ -133,13 +140,22 @@ export default {
params: {},
orderObj: {},
selection: [],
tableData:[],
state_: {
10: "完好",
20: "限用",
30: "在修",
40: "禁用",
},
stateOption: {
10: "创建中",
20: "已提交",
30: "进行中",
40: "已交付",
},
type:'sale_out',
visible: false,
printVisible:false
};
},
mounted() {},
@ -203,6 +219,18 @@ export default {
this.$refs.table.refresh();
}
},
//打印
handlePrint(){
let that = this;
let params = {
order: that.orderId,
page:0
}
that.$API.sam.orderitem.list.req(params).then((res) => {
that.tableData = res;
that.printVisible = true;
})
},
handleQuery() {
this.$refs.table.queryData(this.query);
},

122
src/views/setting/print/A4.vue
View File

@ -6,7 +6,7 @@
<el-button type="primary" @click="handlePrint">打印</el-button>
<div id="exportDiv" class="exportDiv">
<!-- 入库信息 -->
<div class="containersDom" v-if="type=='do_in'">
<div class="containersDom" v-if="type=='do_in'||type=='pur_in'">
<ul class="export_ul">
<li class="export_ulli export_ulli_title">入库信息单</li>
</ul>
@ -21,14 +21,14 @@
<li class="export_ulli" v-if="mtype=='30'||mtype=='40'">供应商名称</li>
</ul>
<ul class="export_ul">
<li class="export_ulli">11111111111</li>
<li class="export_ulli">22222222222</li>
<li class="export_ulli" v-if="mtype=='10'||mtype=='20'">33333333333</li>
<li class="export_ulli" v-if="mtype=='10'||mtype=='20'">44444444444</li>
<li class="export_ulli">55555555555</li>
<li class="export_ulli">66666666666</li>
<li class="export_ulli" v-if="mtype=='30'||mtype=='40'">77777777777</li>
<li class="export_ulli" v-if="mtype=='30'||mtype=='40'">88888888888</li>
<li class="export_ulli">{{baseData.number}}</li>
<li class="export_ulli">{{baseData.submit_time.slice(0,16)}}</li>
<li class="export_ulli" v-if="mtype=='10'||mtype=='20'">{{baseData.belong_dept_name}}</li>
<li class="export_ulli" v-if="mtype=='10'||mtype=='20'">{{baseData.do_user_name}}</li>
<li class="export_ulli">{{baseData.mio_user_name}}</li>
<li class="export_ulli">{{baseData.mio_user_name}}</li>
<li class="export_ulli" v-if="mtype=='30'||mtype=='40'">{{baseData.pu_order}}</li>
<li class="export_ulli" v-if="mtype=='30'||mtype=='40'">{{baseData.supplier_name}}</li>
</ul>
<ul class="export_ul">
@ -41,12 +41,12 @@
<li class="export_ulli">批次号</li>
<li class="export_ulli">数量</li>
</ul>
<ul class="export_ul">
<li class="export_ulli">11111111111</li>
<li class="export_ulli">22222222222</li>
<li class="export_ulli">33333333333</li>
<li class="export_ulli">44444444444</li>
<li class="export_ulli">55555555555</li>
<ul class="export_ul" v-for="item in tableData" :key="item.id">
<li class="export_ulli">{{ item.material_name }}</li>
<li class="export_ulli" v-if="item.material_">{{ item.material_.model }}</li>
<li class="export_ulli" v-if="item.material_">{{ item.material_.process_name }}</li>
<li class="export_ulli">{{ item.batch }}</li>
<li class="export_ulli">{{ item.count }}</li>
</ul>
</div>
<!-- 生产领料信息单 -->
@ -64,13 +64,13 @@
<li class="export_ulli">仓库</li>
</ul>
<ul class="export_ul">
<li class="export_ulli">11111111111</li>
<li class="export_ulli">22222222222</li>
<li class="export_ulli">33333333333</li>
<li class="export_ulli">44444444444</li>
<li class="export_ulli">55555555555</li>
<li class="export_ulli">66666666666</li>
<li class="export_ulli">77777777777</li>
<li class="export_ulli">{{baseData.number}}</li>
<li class="export_ulli">{{baseData.submit_time.slice(0,16)}}</li>
<li class="export_ulli">{{baseData.belong_dept_name}}-{{ baseData.mgroup_name }}</li>
<li class="export_ulli">{{baseData.do_user_name}}</li>
<li class="export_ulli">{{baseData.mio_user_name}}</li>
<li class="export_ulli">{{baseData.mio_user_name}}</li>
<li class="export_ulli">{{baseData.mio}}</li>
</ul>
<ul class="export_ul">
@ -81,10 +81,10 @@
<li class="export_ulli">批次号</li>
<li class="export_ulli">数量</li>
</ul>
<ul class="export_ul">
<li class="export_ulli">11111111111</li>
<li class="export_ulli">22222222222</li>
<li class="export_ulli">33333333333</li>
<ul class="export_ul" v-for="item in tableData" :key="item.id">
<li class="export_ulli">{{ item.material_name }}</li>
<li class="export_ulli">{{ item.batch }}</li>
<li class="export_ulli">{{ item.count }}</li>
</ul>
</div>
<!-- 销售发货信息单 -->
@ -96,13 +96,13 @@
<li class="export_ulli">发货单编号</li>
<li class="export_ulli">发货日期</li>
<li class="export_ulli">订单编号</li>
<li class="export_ulli">日期</li>
<li class="export_ulli">客户</li>
</ul>
<ul class="export_ul">
<li class="export_ulli">11111111111</li>
<li class="export_ulli">22222222222</li>
<li class="export_ulli">33333333333</li>
<li class="export_ulli">44444444444</li>
<li class="export_ulli">{{ baseData.number }}</li>
<li class="export_ulli">{{ baseData.inout_date }}</li>
<li class="export_ulli">{{ baseData.order_number }}</li>
<li class="export_ulli">{{ baseData.customer_name }}</li>
</ul>
<ul class="export_ul">
@ -113,10 +113,10 @@
<li class="export_ulli">批次号</li>
<li class="export_ulli">数量</li>
</ul>
<ul class="export_ul">
<li class="export_ulli">11111111111</li>
<li class="export_ulli">22222222222</li>
<li class="export_ulli">33333333333</li>
<ul class="export_ul" v-for="item in tableData" :key="item.id">
<li class="export_ulli">{{ item.material_.name }}</li>
<li class="export_ulli">{{ item.batch }}</li>
<li class="export_ulli">{{ item.count }}</li>
</ul>
</div>
<!-- 检验结果 -->
@ -134,13 +134,13 @@
<li class="export_ulli">备注</li>
</ul>
<ul class="export_ul">
<li class="export_ulli">11111111111</li>
<li class="export_ulli">22222222222</li>
<li class="export_ulli">33333333333</li>
<li class="export_ulli">44444444444</li>
<li class="export_ulli">55555555555</li>
<li class="export_ulli">66666666666</li>
<li class="export_ulli">77777777777</li>
<li class="export_ulli">{{ baseData.material_mame }}</li>
<li class="export_ulli">{{ baseData.count_real }}</li>
<li class="export_ulli">{{ baseData.count_use }}</li>
<li class="export_ulli">{{ baseData.handle_user_name }}</li>
<li class="export_ulli">{{ baseData.count_ok }}</li>
<li class="export_ulli">{{ baseData.test_time }}</li>
<li class="export_ulli">{{ baseData.note }}</li>
</ul>
<ul class="export_ul">
<li class="export_ulli">合格数</li>
@ -152,9 +152,9 @@
<li class="export_ulli"></li>
</ul>
<ul class="export_ul">
<li class="export_ulli">11111111111</li>
<li class="export_ulli">22222222222</li>
<li class="export_ulli">33333333333</li>
<li class="export_ulli">{{ baseData.count_ok }}</li>
<li class="export_ulli">{{baseData.count_notok}}</li>
<li class="export_ulli">{{ baseData.rate }}</li>
<li class="export_ulli"></li>
<li class="export_ulli"></li>
<li class="export_ulli"></li>
@ -173,16 +173,16 @@
<li class="export_ulli">产品同心度</li>
</ul>
<ul class="export_ul">
<li class="export_ulli">1</li>
<li class="export_ulli">2</li>
<li class="export_ulli">3</li>
<li class="export_ulli">4</li>
<li class="export_ulli">5</li>
<li class="export_ulli">6</li>
<li class="export_ulli">7</li>
<li class="export_ulli">8</li>
<li class="export_ulli">9</li>
<li class="export_ulli">10</li>
<li class="export_ulli">{{baseData.count_n_hd}}</li>
<li class="export_ulli">{{baseData.count_n_qp}}</li>
<li class="export_ulli">{{baseData.count_n_swen}}</li>
<li class="export_ulli">{{baseData.count_n_bb}}</li>
<li class="export_ulli">{{baseData.count_n_hs}}</li>
<li class="export_ulli">{{baseData.count_n_md}}</li>
<li class="export_ulli">{{baseData.count_n_xh}}</li>
<li class="export_ulli">{{baseData.count_n_cpwj}}</li>
<li class="export_ulli">{{baseData.count_n_cpyd}}</li>
<li class="export_ulli">{{baseData.count_n_cptxd}}</li>
</ul>
</div>
<!-- 任务分解单 -->
@ -407,6 +407,18 @@
type: Number,
default: 10,
},
baseData: {
type: Object,
default: () => {
return {};
},
},
tableData: {
type: Array,
default: () => {
return [];
},
},
mgroupId: {
type: String,
default: "",

134
src/views/wpm_gx/inm_record.vue
View File

@ -178,6 +178,7 @@
</el-footer>
</el-container>
<el-card v-else shadow="never" style="height: 100%;">
<el-button type="primary" @click="handlePrint" style="position: absolute;right: 20px;">打印</el-button>
<el-descriptions title="基本信息" :column="3" style="width: 100%">
<el-descriptions-item label="编号">
{{form.number}}
@ -200,70 +201,70 @@
</el-descriptions>
<div style="height: 8px"></div>
<scTable
ref="table"
:data="tableData"
row-key="id"
stripe
hidePagination
hideDo
ref="table"
:data="tableData"
row-key="id"
stripe
hidePagination
hideDo
>
<el-table-column type="index" width="50" />
<el-table-column
label="物料"
prop="material"
show-overflow-tooltip
>
<el-table-column type="index" width="50" />
<el-table-column
label="物料"
prop="material"
show-overflow-tooltip
>
<template #default="scope"
>{{ scope.row.material_name }}
</template>
</el-table-column>
<el-table-column label="批次号" prop="batch">
</el-table-column>
<el-table-column label="仓库" prop="warehouse_name">
</el-table-column>
<el-table-column label="数量" prop="count">
</el-table-column>
<el-table-column
label="组合件信息"
v-if="cate == 'good'"
width="300"
>
<template #default="scope">
<div v-if="scope.row.assemb.length > 0">
<div
v-for="item in scope.row.assemb"
:key="item.id"
>
<div>
{{ item.material_name }}
<span
style="
color: gray;
font-size: 12px;
"
>批:</span
>{{ item.batch }}
<span
style="
color: gray;
font-size: 12px;
"
>比:</span
>{{ item.rate }}
</div>
<template #default="scope"
>{{ scope.row.material_name }}
</template>
</el-table-column>
<el-table-column label="批次号" prop="batch">
</el-table-column>
<el-table-column label="仓库" prop="warehouse_name">
</el-table-column>
<el-table-column label="数量" prop="count">
</el-table-column>
<el-table-column
label="组合件信息"
v-if="cate == 'good'"
width="300"
>
<template #default="scope">
<div v-if="scope.row.assemb.length > 0">
<div
v-for="item in scope.row.assemb"
:key="item.id"
>
<div>
{{ item.material_name }}
<span
style="
color: gray;
font-size: 12px;
"
>批:</span
>{{ item.batch }}
<span
style="
color: gray;
font-size: 12px;
"
>比:</span
>{{ item.rate }}
</div>
</div>
</template>
</el-table-column>
<el-table-column label="不合格数量" prop="count_notok">
</el-table-column>
<el-table-column
label="创建时间"
prop="create_time"
show-overflow-tooltip
>
</el-table-column>
</scTable>
</div>
</template>
</el-table-column>
<el-table-column label="不合格数量" prop="count_notok">
</el-table-column>
<el-table-column
label="创建时间"
prop="create_time"
show-overflow-tooltip
>
</el-table-column>
</scTable>
</el-card>
<save-dialog
v-if="dialog.save"
@ -275,13 +276,17 @@
@success="handleSaveSuccess"
@closed="dialog.save = false"
></save-dialog>
<el-dialog v-model="printVisible" width="1200px">
<print :baseData="form" :tableData="tableData" :type="form.type" mtype="20"/>
</el-dialog>
</el-drawer>
</template>
<script>
import saveDialog from "./inm_record_form.vue";
import print from "./../setting/print/A4.vue";
export default {
name: "inm_record",
components: { saveDialog },
components: { saveDialog,print },
props: {
cate: { type: String, default: "" },
deptId: { type: String, default: "" },
@ -301,6 +306,7 @@ export default {
},
dialogTitle: "新增",
visible: false,
printVisible:false,
dialog: {
save: false,
},
@ -459,7 +465,9 @@ export default {
});
},
submitOut() {},
handlePrint(){
this.printVisible = true;
},//打印
//本地更新数据
handleSaveSuccess() {
this.$refs.tables.refresh();