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

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

This commit is contained in:
zty 2024-10-15 14:36:51 +08:00
parent 6e4a817324 77224cdbd4
commit 38a9d7b4fb
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 style="padding: 8px">
<div> <div>
<el-card style="width: 100%" header="基本信息" shadow="hover"> <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>
<el-descriptions-item label="编号">{{ <el-descriptions-item label="编号">{{
mioObj.number mioObj.number
@ -208,15 +209,20 @@
@closed="dialog.check = false" @closed="dialog.check = false"
> >
</check-dialog> </check-dialog>
<el-dialog v-model="printVisible" width="1200px">
<print :baseData="mioObj" :tableData="tableData" :type="mioObj.type" mtype="20"/>
</el-dialog>
</template> </template>
<script> <script>
import saveDialog from "./mioitem_form.vue"; import saveDialog from "./mioitem_form.vue";
import checkDialog from "./mioitem_check.vue"; import checkDialog from "./mioitem_check.vue";
import print from "./../setting/print/A4.vue";
export default { export default {
name: "mioitem", name: "mioitem",
components: { components: {
saveDialog, saveDialog,
checkDialog, checkDialog,
print
}, },
props: { props: {
type: { type: {
@ -243,6 +249,7 @@ export default {
// mioId: "", // mioId: "",
mioObj: {}, mioObj: {},
selection: [], selection: [],
tableData:[],
stateDict: { stateDict: {
10: "创建中", 10: "创建中",
20: "已提交", 20: "已提交",
@ -256,10 +263,12 @@ export default {
other_out: "其他出库", other_out: "其他出库",
}, },
visible: false, visible: false,
printVisible:false,
mioitemId: "", mioitemId: "",
// type: "", // type: "",
// cate: "", // cate: "",
objitem: {}, objitem: {},
mtype:10
}; };
}, },
mounted() { mounted() {
@ -369,6 +378,22 @@ export default {
this.mioObj = res; 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> </script>

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

@ -9,19 +9,20 @@
<div style="padding: 8px"> <div style="padding: 8px">
<div> <div>
<el-card style="width: 100%" header="基本信息" shadow="hover"> <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>
<el-descriptions-item label="订单编号">{{ <el-descriptions-item label="订单编号">
orderObj.number {{orderObj.number}}
}}</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="客户">{{ <el-descriptions-item label="客户">
orderObj.customer_name {{orderObj.customer_name}}
}}</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="订单状态">{{ <el-descriptions-item label="订单状态">
orderObj.state {{stateOption[orderObj.state]}}
}}</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="截止交货">{{ <el-descriptions-item label="截止交货">
orderObj.delivery_date {{orderObj.delivery_date}}
}}</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
</div> </div>
@ -33,6 +34,7 @@
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="table_add" @click="table_add"
v-if="orderObj.state == 10"
v-auth="'order.update'" v-auth="'order.update'"
></el-button> ></el-button>
</div> </div>
@ -110,13 +112,18 @@
@success="handleSaveSuccess" @success="handleSaveSuccess"
@closed="dialog.save = false" @closed="dialog.save = false"
></save-dialog> ></save-dialog>
<el-dialog v-model="printVisible" width="1200px">
<print :baseData="orderObj" :tableData="tableData" :type="type" mtype="10"/>
</el-dialog>
</template> </template>
<script> <script>
import saveDialog from "./orderitem_form.vue"; import saveDialog from "./orderitem_form.vue";
import print from "./../setting/print/A4.vue";
export default { export default {
name: "rparty", name: "rparty",
components: { components: {
saveDialog, saveDialog,
print
}, },
props: { props: {
orderId: { orderId: {
@ -133,13 +140,22 @@ export default {
params: {}, params: {},
orderObj: {}, orderObj: {},
selection: [], selection: [],
tableData:[],
state_: { state_: {
10: "完好", 10: "完好",
20: "限用", 20: "限用",
30: "在修", 30: "在修",
40: "禁用", 40: "禁用",
}, },
stateOption: {
10: "创建中",
20: "已提交",
30: "进行中",
40: "已交付",
},
type:'sale_out',
visible: false, visible: false,
printVisible:false
}; };
}, },
mounted() {}, mounted() {},
@ -203,6 +219,18 @@ export default {
this.$refs.table.refresh(); 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() { handleQuery() {
this.$refs.table.queryData(this.query); 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> <el-button type="primary" @click="handlePrint">打印</el-button>
<div id="exportDiv" class="exportDiv"> <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"> <ul class="export_ul">
<li class="export_ulli export_ulli_title">入库信息单</li> <li class="export_ulli export_ulli_title">入库信息单</li>
</ul> </ul>
@ -21,14 +21,14 @@
<li class="export_ulli" v-if="mtype=='30'||mtype=='40'">供应商名称</li> <li class="export_ulli" v-if="mtype=='30'||mtype=='40'">供应商名称</li>
</ul> </ul>
<ul class="export_ul"> <ul class="export_ul">
<li class="export_ulli">11111111111</li> <li class="export_ulli">{{baseData.number}}</li>
<li class="export_ulli">22222222222</li> <li class="export_ulli">{{baseData.submit_time.slice(0,16)}}</li>
<li class="export_ulli" v-if="mtype=='10'||mtype=='20'">33333333333</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'">44444444444</li> <li class="export_ulli" v-if="mtype=='10'||mtype=='20'">{{baseData.do_user_name}}</li>
<li class="export_ulli">55555555555</li> <li class="export_ulli">{{baseData.mio_user_name}}</li>
<li class="export_ulli">66666666666</li> <li class="export_ulli">{{baseData.mio_user_name}}</li>
<li class="export_ulli" v-if="mtype=='30'||mtype=='40'">77777777777</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'">88888888888</li> <li class="export_ulli" v-if="mtype=='30'||mtype=='40'">{{baseData.supplier_name}}</li>
</ul> </ul>
<ul class="export_ul"> <ul class="export_ul">
@ -41,12 +41,12 @@
<li class="export_ulli">批次号</li> <li class="export_ulli">批次号</li>
<li class="export_ulli">数量</li> <li class="export_ulli">数量</li>
</ul> </ul>
<ul class="export_ul"> <ul class="export_ul" v-for="item in tableData" :key="item.id">
<li class="export_ulli">11111111111</li> <li class="export_ulli">{{ item.material_name }}</li>
<li class="export_ulli">22222222222</li> <li class="export_ulli" v-if="item.material_">{{ item.material_.model }}</li>
<li class="export_ulli">33333333333</li> <li class="export_ulli" v-if="item.material_">{{ item.material_.process_name }}</li>
<li class="export_ulli">44444444444</li> <li class="export_ulli">{{ item.batch }}</li>
<li class="export_ulli">55555555555</li> <li class="export_ulli">{{ item.count }}</li>
</ul> </ul>
</div> </div>
<!-- 生产领料信息单 --> <!-- 生产领料信息单 -->
@ -64,13 +64,13 @@
<li class="export_ulli">仓库</li> <li class="export_ulli">仓库</li>
</ul> </ul>
<ul class="export_ul"> <ul class="export_ul">
<li class="export_ulli">11111111111</li> <li class="export_ulli">{{baseData.number}}</li>
<li class="export_ulli">22222222222</li> <li class="export_ulli">{{baseData.submit_time.slice(0,16)}}</li>
<li class="export_ulli">33333333333</li> <li class="export_ulli">{{baseData.belong_dept_name}}-{{ baseData.mgroup_name }}</li>
<li class="export_ulli">44444444444</li> <li class="export_ulli">{{baseData.do_user_name}}</li>
<li class="export_ulli">55555555555</li> <li class="export_ulli">{{baseData.mio_user_name}}</li>
<li class="export_ulli">66666666666</li> <li class="export_ulli">{{baseData.mio_user_name}}</li>
<li class="export_ulli">77777777777</li> <li class="export_ulli">{{baseData.mio}}</li>
</ul> </ul>
<ul class="export_ul"> <ul class="export_ul">
@ -81,10 +81,10 @@
<li class="export_ulli">批次号</li> <li class="export_ulli">批次号</li>
<li class="export_ulli">数量</li> <li class="export_ulli">数量</li>
</ul> </ul>
<ul class="export_ul"> <ul class="export_ul" v-for="item in tableData" :key="item.id">
<li class="export_ulli">11111111111</li> <li class="export_ulli">{{ item.material_name }}</li>
<li class="export_ulli">22222222222</li> <li class="export_ulli">{{ item.batch }}</li>
<li class="export_ulli">33333333333</li> <li class="export_ulli">{{ item.count }}</li>
</ul> </ul>
</div> </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> <li class="export_ulli">订单编号</li>
<li class="export_ulli">日期</li> <li class="export_ulli">客户</li>
</ul> </ul>
<ul class="export_ul"> <ul class="export_ul">
<li class="export_ulli">11111111111</li> <li class="export_ulli">{{ baseData.number }}</li>
<li class="export_ulli">22222222222</li> <li class="export_ulli">{{ baseData.inout_date }}</li>
<li class="export_ulli">33333333333</li> <li class="export_ulli">{{ baseData.order_number }}</li>
<li class="export_ulli">44444444444</li> <li class="export_ulli">{{ baseData.customer_name }}</li>
</ul> </ul>
<ul class="export_ul"> <ul class="export_ul">
@ -113,10 +113,10 @@
<li class="export_ulli">批次号</li> <li class="export_ulli">批次号</li>
<li class="export_ulli">数量</li> <li class="export_ulli">数量</li>
</ul> </ul>
<ul class="export_ul"> <ul class="export_ul" v-for="item in tableData" :key="item.id">
<li class="export_ulli">11111111111</li> <li class="export_ulli">{{ item.material_.name }}</li>
<li class="export_ulli">22222222222</li> <li class="export_ulli">{{ item.batch }}</li>
<li class="export_ulli">33333333333</li> <li class="export_ulli">{{ item.count }}</li>
</ul> </ul>
</div> </div>
<!-- 检验结果 --> <!-- 检验结果 -->
@ -134,13 +134,13 @@
<li class="export_ulli">备注</li> <li class="export_ulli">备注</li>
</ul> </ul>
<ul class="export_ul"> <ul class="export_ul">
<li class="export_ulli">11111111111</li> <li class="export_ulli">{{ baseData.material_mame }}</li>
<li class="export_ulli">22222222222</li> <li class="export_ulli">{{ baseData.count_real }}</li>
<li class="export_ulli">33333333333</li> <li class="export_ulli">{{ baseData.count_use }}</li>
<li class="export_ulli">44444444444</li> <li class="export_ulli">{{ baseData.handle_user_name }}</li>
<li class="export_ulli">55555555555</li> <li class="export_ulli">{{ baseData.count_ok }}</li>
<li class="export_ulli">66666666666</li> <li class="export_ulli">{{ baseData.test_time }}</li>
<li class="export_ulli">77777777777</li> <li class="export_ulli">{{ baseData.note }}</li>
</ul> </ul>
<ul class="export_ul"> <ul class="export_ul">
<li class="export_ulli">合格数</li> <li class="export_ulli">合格数</li>
@ -152,9 +152,9 @@
<li class="export_ulli"></li> <li class="export_ulli"></li>
</ul> </ul>
<ul class="export_ul"> <ul class="export_ul">
<li class="export_ulli">11111111111</li> <li class="export_ulli">{{ baseData.count_ok }}</li>
<li class="export_ulli">22222222222</li> <li class="export_ulli">{{baseData.count_notok}}</li>
<li class="export_ulli">33333333333</li> <li class="export_ulli">{{ baseData.rate }}</li>
<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> <li class="export_ulli"></li>
@ -173,16 +173,16 @@
<li class="export_ulli">产品同心度</li> <li class="export_ulli">产品同心度</li>
</ul> </ul>
<ul class="export_ul"> <ul class="export_ul">
<li class="export_ulli">1</li> <li class="export_ulli">{{baseData.count_n_hd}}</li>
<li class="export_ulli">2</li> <li class="export_ulli">{{baseData.count_n_qp}}</li>
<li class="export_ulli">3</li> <li class="export_ulli">{{baseData.count_n_swen}}</li>
<li class="export_ulli">4</li> <li class="export_ulli">{{baseData.count_n_bb}}</li>
<li class="export_ulli">5</li> <li class="export_ulli">{{baseData.count_n_hs}}</li>
<li class="export_ulli">6</li> <li class="export_ulli">{{baseData.count_n_md}}</li>
<li class="export_ulli">7</li> <li class="export_ulli">{{baseData.count_n_xh}}</li>
<li class="export_ulli">8</li> <li class="export_ulli">{{baseData.count_n_cpwj}}</li>
<li class="export_ulli">9</li> <li class="export_ulli">{{baseData.count_n_cpyd}}</li>
<li class="export_ulli">10</li> <li class="export_ulli">{{baseData.count_n_cptxd}}</li>
</ul> </ul>
</div> </div>
<!-- 任务分解单 --> <!-- 任务分解单 -->
@ -407,6 +407,18 @@
type: Number, type: Number,
default: 10, default: 10,
}, },
baseData: {
type: Object,
default: () => {
return {};
},
},
tableData: {
type: Array,
default: () => {
return [];
},
},
mgroupId: { mgroupId: {
type: String, type: String,
default: "", default: "",

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

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