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

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

This commit is contained in:
caoqianming 2025-12-05 18:35:31 +08:00
parent 400b41ba87 ee65f15665
commit 75fbd857e7
24 changed files with 460 additions and 436 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/route.js
View File

@ -1177,7 +1177,7 @@ const routes = [
path: "/enm_energy/carbon", path: "/enm_energy/carbon",
meta: { meta: {
title: "碳排放", title: "碳排放",
// icon: "el-icon-grid", icon: "el-icon-grid",
perms: ["carbon_base"], perms: ["carbon_base"],
}, },
component: "enm_energy/carbon", component: "enm_energy/carbon",

92
src/views/bigScreen/index_enm_ly.vue
View File

@ -379,6 +379,7 @@ export default {
KHData: [], KHData: [],
SMData: [], SMData: [],
IMData: [], IMData: [],
echartLine1: null,
factoryName: "", factoryName: "",
initialAlpha: -Math.PI / 4.5, initialAlpha: -Math.PI / 4.5,
initialBeta: Math.PI / 2, initialBeta: Math.PI / 2,
@ -743,7 +744,6 @@ export default {
this.$API.mtm.mgroup.list this.$API.mtm.mgroup.list
.req({ page: 0, search: "回转窑" }) .req({ page: 0, search: "回转窑" })
.then((res) => { .then((res) => {
// console.log("回转窑", res);
that.huihzuanyaoId = res[0].id; that.huihzuanyaoId = res[0].id;
let query = {}; let query = {};
query.page = 0; query.page = 0;
@ -865,7 +865,6 @@ export default {
this.$API.mtm.mgroup.list this.$API.mtm.mgroup.list
.req({ page: 0, search: "余热发电" }) .req({ page: 0, search: "余热发电" })
.then((res) => { .then((res) => {
// console.log("余热发电", res);
that.yurefadianId = res[0].id; that.yurefadianId = res[0].id;
let params = {}; let params = {};
params.page = 0; params.page = 0;
@ -929,7 +928,6 @@ export default {
}; };
that.$API.enm.enstat.req(params).then((res) => { that.$API.enm.enstat.req(params).then((res) => {
let data = res.results; let data = res.results;
console.log("工序电耗", data);
let seriesData = [0, 0, 0, 0, 0]; let seriesData = [0, 0, 0, 0, 0];
data.forEach((item, index) => { data.forEach((item, index) => {
if (item.mgroup_name == "石灰石破碎") { if (item.mgroup_name == "石灰石破碎") {
@ -939,7 +937,6 @@ export default {
} else if (item.mgroup_name == "回转窑") { } else if (item.mgroup_name == "回转窑") {
seriesData[2] = item.elec_consume; seriesData[2] = item.elec_consume;
} else if (item.mgroup_name == "余热发电") { } else if (item.mgroup_name == "余热发电") {
console.log("余热发电工序电耗", item.elec_consume);
seriesData[3] = item.elec_consume; seriesData[3] = item.elec_consume;
} else if (item.mgroup_name == "煤磨") { } else if (item.mgroup_name == "煤磨") {
seriesData[4] = item.elec_consume; seriesData[4] = item.elec_consume;
@ -969,7 +966,6 @@ export default {
return typeof variable; return typeof variable;
} }
that.$API.enm.mpoint.list.req(params).then((res) => { that.$API.enm.mpoint.list.req(params).then((res) => {
console.log("数据采集", res);
let success_num = 0; let success_num = 0;
let error_num = 0; let error_num = 0;
res.forEach((item, index) => { res.forEach((item, index) => {
@ -985,8 +981,6 @@ export default {
} }
that.tableData.push(item); that.tableData.push(item);
}); });
console.log("数据采集tableData", that.tableData);
let chartDom6 = document.getElementById("pieChart"); let chartDom6 = document.getElementById("pieChart");
let myChart6 = echarts.init(chartDom6); let myChart6 = echarts.init(chartDom6);
let colors = []; let colors = [];
@ -1079,16 +1073,14 @@ export default {
// right_block.style.display = "none"; // right_block.style.display = "none";
var itemHeight = Math.round((windowHeight - 150) / 3); var itemHeight = Math.round((windowHeight - 150) / 3);
var itemBodyHeight = itemHeight - 40; var itemBodyHeight = itemHeight - 40;
var flexItems = document.getElementsByClassName("flexItem"); const flexItems = document.querySelectorAll('.flexItem')
var itemBodys = document.getElementsByClassName("itemBody"); const itemBodys = document.querySelectorAll('.itemBody')
for (var i = 0; i < flexItems.length; i++) { flexItems.forEach(el => {
var flexItem = flexItems[i]; el.style.height = `${itemHeight}px`
flexItem.style.height = itemHeight + "px"; })
} itemBodys.forEach(el => {
for (var i = 0; i < itemBodys.length; i++) { el.style.height = `${itemBodyHeight}px`
var itemBody = itemBodys[i]; })
itemBody.style.height = itemBodyHeight + "px";
}
elTable.style.height = itemBodyHeight - 20 + "px"; elTable.style.height = itemBodyHeight - 20 + "px";
let pieWidth = Math.round(windowWidth / 100) * 22 - 180; let pieWidth = Math.round(windowWidth / 100) * 22 - 180;
let radarWidth = Math.round(windowWidth / 100) * 22 - 130; let radarWidth = Math.round(windowWidth / 100) * 22 - 130;
@ -1114,7 +1106,6 @@ export default {
document.getElementById(name) document.getElementById(name)
); );
if (myChart != undefined) { if (myChart != undefined) {
// console.log(name + ' :resize')
myChart.resize(); myChart.resize();
} }
}, },
@ -1417,7 +1408,6 @@ export default {
); );
} }
} else if (camera.target != mesh.position) { } else if (camera.target != mesh.position) {
console.log("fly to");
// 计算新的相机位置 // 计算新的相机位置
let position = mesh._parentNode._position; let position = mesh._parentNode._position;
if (mesh._parentNode.id == "__root__") { if (mesh._parentNode.id == "__root__") {
@ -1745,25 +1735,55 @@ export default {
}, },
}, },
beforeUnmount() { beforeUnmount() {
let that = this; // 1. 清理定时器
clearInterval(this.timerTime);
clearInterval(this.qualityTimer);
clearInterval(this.heightTimer);
// 3. 移除事件监听
window.removeEventListener("resize", this.handleResize);
if (this.scene && this.pointerListener) {
this.scene.onPointerObservable.remove(this.pointerListener);
}
// 4. 销毁 Babylon
if (this.engine) this.engine.dispose();
if (this.scene) this.scene.dispose();
// 5. 清空引用避免内存持续占用
this.engine = null;
this.scene = null; this.scene = null;
clearInterval(that.timerTime); this.echartLine1 = null;
clearInterval(that.timerData);
clearInterval(that.qualityTimer);
that.timerTime = null;
that.timerData = null;
that.qualityTimer = null;
},
beforeDestoryed() {
let that = this;
this.scene = null;
clearInterval(that.timerTime);
clearInterval(that.timerData);
clearInterval(that.qualityTimer);
that.timerTime = null;
that.timerData = null;
that.qualityTimer = null;
}, },
// beforeUnmount() {
// let that = this;
// this.scene = null;
// clearInterval(that.timerTime);
// clearInterval(that.timerData);
// clearInterval(that.qualityTimer);
// that.timerTime = null;
// that.timerData = null;
// that.qualityTimer = null;
// },
// beforeDestoryed() {
// let that = this;
// this.scene = null;
// clearInterval(that.timerTime);
// clearInterval(that.timerData);
// clearInterval(that.qualityTimer);
// that.timerTime = null;
// that.timerData = null;
// that.qualityTimer = null;
// if (this.engine) {
// this.engine.dispose(); // 释放 GPU 内容
// this.engine = null;
// }
// if (this.scene) {
// this.scene.dispose();
// this.scene = null;
// }
// },
}; };
</script> </script>
<style scoped> <style scoped>

6
src/views/inm/helpso_mioitem.vue
View File

@ -295,8 +295,10 @@ export default {
}, },
getUsers(){ getUsers(){
let that = this; let that = this;
that.$API.system.user.list.req({ posts__name: "库管", page: 0 }).then((res) => { let userOption = [];
that.userOption = res; that.$API.system.user.list.req({ posts__code__contains: "inm", page: 0 }).then((res) => {
userOption = Array.from(new Map(res.map(item => [item.id, item])).values());
that.userOption = userOption;
}); });
}, },
deptChange(){ deptChange(){

18
src/views/inm/inmScrap.vue
View File

@ -2,8 +2,8 @@
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" v-auth="'handover.create'" @click="table_add(20)"> <el-button type="primary" v-auth="'handover.create'" @click="table_add(20)">返工交接</el-button>
返工交接</el-button> <el-button type="primary" v-auth="'handover.create'" v-if="route_code=='scrap'" @click="table_bsofei(40,30)">合批报废</el-button>
</div> </div>
<div class="right-panel"> <div class="right-panel">
<el-input <el-input
@ -108,7 +108,7 @@ export default {
data() { data() {
return { return {
wmState, wmState,
apiObj: this.$API.wpm.wmaterial.list, apiObj: null,
params: { params: {
state : 50, state : 50,
state_all: 1 state_all: 1
@ -126,6 +126,11 @@ export default {
}, },
mounted() { mounted() {
let that = this; let that = this;
that.route_code = that.$route.path.split("/")[2];
if(that.route_code=='scrap'){
that.params.material__type__in = 30;
}
that.apiObj = that.$API.wpm.wmaterial.list;
that.$API.mtm.mgroup.list.req({ page: 0}).then((res) => { that.$API.mtm.mgroup.list.req({ page: 0}).then((res) => {
that.mgroupOptions = res; that.mgroupOptions = res;
res.forEach(item=>{ res.forEach(item=>{
@ -145,6 +150,13 @@ export default {
this.$refs.saveDialog.open("add"); this.$refs.saveDialog.open("add");
}); });
}, },
table_bsofei(type,mtype) {
this.dialog.save = true;
this.type = type;
this.$nextTick(() => {
this.$refs.saveDialog.open("add",null,mtype);
});
},
//搜索 //搜索
handleQuery() { handleQuery() {
this.$refs.table.queryData(this.query); this.$refs.table.queryData(this.query);

46
src/views/inm/mainso_mio.vue
View File

@ -12,8 +12,13 @@
type="primary" type="primary"
@click="add('pur_in')" @click="add('pur_in')"
v-auth="'mio.pur'" v-auth="'mio.pur'"
>采购入库</el-button >采购入库</el-button>
> <el-button
type="primary"
@click="add('do_out','baofei')"
v-auth="'mio.do'"
v-if="project_code=='gx'"
>报废</el-button>
<el-select <el-select
v-model="query.type" v-model="query.type"
clearable clearable
@ -73,7 +78,8 @@
></el-table-column> ></el-table-column>
<el-table-column label="出/入库类型"> <el-table-column label="出/入库类型">
<template #default="scope"> <template #default="scope">
{{ typeDict[scope.row.type] }} <span v-if="scope.row.mgroup_name=='废品库'&&scope.row.type=='do_out'">原料报废</span>
<span v-else>{{ typeDict[scope.row.type] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="记录状态"> <el-table-column label="记录状态">
@ -119,15 +125,19 @@
> >
编辑 编辑
</el-button> </el-button>
<el-button <!-- 光芯的出入库记录中生产领料不显示提交，在生产执行里接收 -->
link <span v-if="scope.row.state==10">
type="primary" <span v-if="scope.row.type=='do_out'&&project_code=='gx'&&(scope.row.mgroup_name!=='外协白片抛'||scope.row.mgroupName!=='外协一次抛'||scope.row.mgroupName!=='外扫')"></span>
@click="table_submit(scope.row)" <el-button
v-auth="'mio.submit'" link
v-if="scope.row.state == 10" type="primary"
> @click="table_submit(scope.row)"
提交 v-auth="'mio.submit'"
</el-button> v-else
>
提交
</el-button>
</span>
<el-button <el-button
link link
type="danger" type="danger"
@ -208,17 +218,25 @@ export default {
apiObj: this.$API.inm.mio.list, apiObj: this.$API.inm.mio.list,
selection: [], selection: [],
type: "", type: "",
htype: "",
cate: "mainso", cate: "mainso",
mioId: "", mioId: "",
project_code: "",
visibleDrawer: false, visibleDrawer: false,
}; };
}, },
mounted() {this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;},
methods: { methods: {
//添加 //添加
add(type) { add(type,htype) {
this.dialog.save = true; this.dialog.save = true;
this.htype = htype;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.saveDialog.open("add", type); if(htype!==undefined){
this.$refs.saveDialog.open("add", type,htype);
}else{
this.$refs.saveDialog.open("add", type);
}
}); });
}, },
//编辑 //编辑

75
src/views/inm/mio_form.vue
View File

@ -29,6 +29,7 @@
<el-select <el-select
v-model="form.pu_order" v-model="form.pu_order"
clearable clearable
filterable
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
@ -46,6 +47,7 @@
<el-select <el-select
v-model="form.supplier" v-model="form.supplier"
clearable clearable
filterable
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
@ -57,7 +59,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="销售订单" v-if="form.type == 'sale_out'"> <el-form-item label="销售订单" v-if="form.type == 'sale_out'">
<el-select v-model="form.order" clearable style="width: 100%"> <el-select v-model="form.order" clearable filterable style="width: 100%">
<el-option <el-option
v-for="item in orderOptions" v-for="item in orderOptions"
:key="item.id" :key="item.id"
@ -84,6 +86,7 @@
<el-select <el-select
v-model="form.customer" v-model="form.customer"
clearable clearable
filterable
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
@ -101,6 +104,7 @@
<el-select <el-select
v-model="form.mgroup" v-model="form.mgroup"
clearable clearable
filterable
style="width: 100%" style="width: 100%"
placeholder="为空时代表领料/入库到车间" placeholder="为空时代表领料/入库到车间"
@change="mgroupChange" @change="mgroupChange"
@ -115,11 +119,12 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="操作部门" label="操作部门"
v-if="form.type == 'do_in' || form.type == 'do_out' || form.type == 'borrow_out' || form.type == 'return_in'" v-if="(form.type == 'do_in' || form.type == 'do_out' || form.type == 'borrow_out' || form.type == 'return_in')&& htype!='baofei'"
> >
<el-select <el-select
v-model="form.belong_dept" v-model="form.belong_dept"
clearable clearable
filterable
style="width: 100%" style="width: 100%"
@change="getgetDeptUsers" @change="getgetDeptUsers"
> >
@ -132,10 +137,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="部门执行人" label="部门执行人" prop="do_user"
v-if="form.type == 'do_in' || form.type == 'do_out'|| form.type == 'borrow_out' || form.type == 'return_in'" v-if="(form.type == 'do_in' || form.type == 'do_out'|| form.type == 'borrow_out' || form.type == 'return_in')&& htype!='baofei'"
> >
<el-select v-model="form.do_user" clearable style="width: 100%"> <el-select v-model="form.do_user" filterable clearable style="width: 100%">
<el-option <el-option
v-for="item in userOptions" v-for="item in userOptions"
:key="item.id" :key="item.id"
@ -144,12 +149,11 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="仓库执行人" prop="mio_user">
label="仓库执行人"
>
<el-select <el-select
v-model="form.mio_user" v-model="form.mio_user"
clearable clearable
filterable
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
@ -199,13 +203,16 @@ export default {
form: {}, form: {},
rules: { rules: {
number: [ number: [
{ {required: true,message: "请填写编号",trigger: "blur"},
required: true, ],
message: "请填写编号", do_user: [
trigger: "blur", {required: true,message: "请选择部门执行人",trigger: "blur"},
}, ],
mio_user: [
{required: true,message: "请选择仓库执行人",trigger: "blur"},
], ],
}, },
htype:"",
visible: false, visible: false,
isSaveing: false, isSaveing: false,
options: [], options: [],
@ -221,10 +228,21 @@ export default {
}; };
}, },
mounted() { mounted() {
let that = this;
this.form.inout_date = this.$TOOL.dateFormat2(new Date()); this.form.inout_date = this.$TOOL.dateFormat2(new Date());
//原料库
if(that.htype=='baofei'){
//操作工段：废品库
//部门操作人员：原料库
that.$API.mtm.mgroup.list.req({ name:'废品库',page: 0}).then((res) => {
that.form.recive_mgroup = item.id;
that.getCkUserList();//废品库接收人
});
}
}, },
methods: { methods: {
init() { init() {
let that = this;
this.getDeptUser(); this.getDeptUser();
var type = this.form.type; var type = this.form.type;
if (type == "pur_in") { if (type == "pur_in") {
@ -234,9 +252,16 @@ export default {
this.getOrderOptions(); this.getOrderOptions();
this.getCustomerOptions(); this.getCustomerOptions();
} else if (type == "do_in" || type == "do_out" || type == "borrow_out" || type == "return_in") { } else if (type == "do_in" || type == "do_out" || type == "borrow_out" || type == "return_in") {
this.getDeptOptions(); if(that.htype=='baofei'){
this.getmgroupOptions(); that.$API.mtm.mgroup.list.req({ name:'废品库',page: 0}).then((res) => {
this.getgetDeptUsers(); that.mgroupOptions = res;
that.form.mgroup = res[0].id;
});
}else{
this.getDeptOptions();
this.getmgroupOptions();
this.getgetDeptUsers();
}
} else if (type == "other_in") { } else if (type == "other_in") {
this.getSupplierOptions(); this.getSupplierOptions();
} else if (type == "other_out") { } else if (type == "other_out") {
@ -293,15 +318,18 @@ export default {
}); });
}, },
getDeptUser() { getDeptUser() {
this.$API.system.user.list let that = this;
.req({ posts__name: "库管", page: 0 }) let userOption = [];
.then((res) => { that.$API.system.user.list.req({ posts__code__contains: "inm", page: 0 }).then((res) => {
this.userOption = res; userOption = Array.from(new Map(res.map(item => [item.id, item])).values());
}); that.userOption = userOption;
// console.log('userOption',userOption);
});
}, },
//显示 //显示
open(mode = "add", type = "") { open(mode = "add", type = "",htype="") {
this.mode = mode; this.mode = mode;
this.htype = htype;
this.form.type = type; this.form.type = type;
this.init(); this.init();
this.visible = true; this.visible = true;
@ -314,6 +342,9 @@ export default {
this.isSaveing = true; this.isSaveing = true;
try { try {
var res; var res;
if(this.htype=='baofei'){
this.form.do_user = this.form.mio_user
}
if (this.mode == "add") { if (this.mode == "add") {
res = await this.$API.inm.mio.create.req(this.form); res = await this.$API.inm.mio.create.req(this.form);
} else if (this.mode == "edit") { } else if (this.mode == "edit") {

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

@ -100,7 +100,7 @@
</el-table-column> </el-table-column>
<el-table-column label="数量"> <el-table-column label="数量">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.material_&&scope.row.material_.tracking==10">{{scope.row.count}}</span> <span v-if="scope.row.material_&&scope.row.material_.tracking==10">{{ project_code=='gx'?Math.round(scope.row.count):scope.row.count }}</span>
<el-link v-else :underline="false" type="primary" @click="showWpr(scope.row)">{{scope.row.count}}</el-link> <el-link v-else :underline="false" type="primary" @click="showWpr(scope.row)">{{scope.row.count}}</el-link>
</template> </template>
</el-table-column> </el-table-column>
@ -113,7 +113,7 @@
</el-table-column> </el-table-column>
<el-table-column label="检验" prop="count_tested" v-if="cate=='mainso'"> <el-table-column label="检验" prop="count_tested" v-if="cate=='mainso'">
</el-table-column> </el-table-column>
<el-table-column label="不合格数量" prop="count_notok"> <el-table-column label="不合格数量" prop="count_notok" v-if="cate!=='helpso'">
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="create_time" show-overflow-tooltip> <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip>
</el-table-column> </el-table-column>
@ -354,7 +354,6 @@ export default {
mounted() { mounted() {
let url1 = window.location.hash; let url1 = window.location.hash;
this.url_code = url1.split('/')[2]; this.url_code = url1.split('/')[2];
console.log(this.url_code);
this.checkTemplate = this.checkTemplate+"?t=" + new Date().getTime(); this.checkTemplate = this.checkTemplate+"?t=" + new Date().getTime();
this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code; this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;
this.params.mio = this.mioId; this.params.mio = this.mioId;

82
src/views/inm/mioitem_form.vue
View File

@ -139,7 +139,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="mTracking==20&&form.type == 'sale_out'&&project_code=='bxerp'"> <el-col :md="12" :sm="24" v-else-if="mTracking==20&&form.type == 'sale_out'&&project_code=='bxerp'">
<el-form-item label="数量"> <el-form-item label="数量">
<el-input-number <el-input-number
v-model="form.count" v-model="form.count"
@ -270,12 +270,13 @@ const defaultForm = {
export default { export default {
emits: ["success", "closed"], emits: ["success", "closed"],
props: { props: {
mioObj: { type: Object },
cate: { type: String, default: null }, cate: { type: String, default: null },
htype: { type: String, default: null },
mioId: { type: String, default: null }, mioId: { type: String, default: null },
mgroup: { type: String, default: null },
belongDeptName: { type: String, default: null }, belongDeptName: { type: String, default: null },
belongDeptId: { type: String, default: null }, belongDeptId: { type: String, default: null },
mgroup: { type: String, default: null },
mioObj: { type: Object },
tableDatas: { type: Array ,default:function(){return []}}, tableDatas: { type: Array ,default:function(){return []}},
}, },
data() { data() {
@ -304,6 +305,7 @@ export default {
isSaveing: false, isSaveing: false,
materialOptions: [], materialOptions: [],
batchOptions: [], batchOptions: [],
batchOptions_o: [],
setFiltersVisible: false, setFiltersVisible: false,
warehouseOptions: [], warehouseOptions: [],
// warehouseDisable: false, // warehouseDisable: false,
@ -330,13 +332,35 @@ export default {
let that = this; let that = this;
let config_base = that.$TOOL.data.get("BASE_INFO").base; let config_base = that.$TOOL.data.get("BASE_INFO").base;
that.project_code = config_base.base_code; that.project_code = config_base.base_code;
//原料库
if(that.htype=='baofei'){
//操作工段：废品库
//部门操作人员：原料库
that.$API.mtm.mgroup.list.req({ name:'废品库',page: 0}).then((res) => {
that.form.recive_mgroup = item.id;
that.getCkUserList();//废品库接收人
});
}
}, },
methods: { methods: {
init() { init() {
this.getMaterialOptions(); this.getMaterialOptions();
this.getWarehouseOptions(); this.getWarehouseOptions();
}, },
//获取仓库人员
getCkUserList() {
let that = this;
this.$API.system.user.list.req({ page: 0, posts__code__contains: "inm" })
.then((res) => {
if(that.type==40){
that.userList2 = [];
that.userList2 = res;
}else if(that.type==20&&that.mgroupName=='废品库'){
that.userList = [];
that.userList = res;
}
});
},
getWarehouseOptions() { getWarehouseOptions() {
let that = this; let that = this;
this.$API.inm.warehouse.list.req({ page: 0 }).then((res) => { this.$API.inm.warehouse.list.req({ page: 0 }).then((res) => {
@ -367,34 +391,28 @@ export default {
}); });
}, },
inputChange(e){ inputChange(e){
console.log('e',e);
let that = this; let that = this;
if(e!==''&&e!==null&&e!==undefined){ if(e!==''&&e!==null&&e!==undefined){
let codeId = e.split('#')[1]; if(e.indexOf('#')>-1){
this.$API.cm.labelmat.item.req(codeId).then((res) => { let codeId = e.split('#')[1];
if(res){ this.$API.cm.labelmat.item.req(codeId).then((res) => {
let arr = that.batchOptions.filter((item) => { if(res){
return item.batch == res.batch&&item.state==res.state; let arr = that.batchOptions.filter((item) => {
}) return item.batch == res.batch&&item.state==res.state;
if (arr.length > 0) { })
that.selectBatch = arr[0].batch; that.batchOptions = arr;
that.form.batch = arr[0].batch;
that.form.mb = arr[0].id;
that.batchcount = Number(arr[0].count_canmio);
that.form.count = Number(arr[0].count_canmio);
that.form.warehouse = arr[0].warehouse;
that.inputBatchDisable = true;
setTimeout(() => {
options.value = res.batch;
}, 200)
}else{ }else{
that.selectBatch = ''; that.selectBatch = '';
that.$message.error("批次号不存在");
} }
}else{ })
that.selectBatch = ''; }else{
} let arr = that.batchOptions.filter((item) => {
}) return item.batch.indexOf(e)>-1;
})
that.batchOptions = arr;
}
}else{
that.batchOptions = that.batchOptions_o;
} }
}, },
getMaterialOptions() { getMaterialOptions() {
@ -500,7 +518,7 @@ export default {
this.$API.inm.warehouse.batch this.$API.inm.warehouse.batch
.req({ page: 0, material: this.form.material }) .req({ page: 0, material: this.form.material })
.then((res) => { .then((res) => {
this.batchOptions = res; this.batchOptions_o = this.batchOptions = res;
if (res.length == 0) { if (res.length == 0) {
this.selectBatchDisable = true; this.selectBatchDisable = true;
} else { } else {
@ -541,9 +559,11 @@ export default {
} else { } else {
this.getBatchOptions(); this.getBatchOptions();
} }
if(that.project_code=='gx'&&that.type == 'pur_in'){ if(that.type == 'pur_in'){
that.form.batch = '无'
that.batchcount = 99999999999; that.batchcount = 99999999999;
if(that.project_code=='gx'){
that.form.batch = '无'
}
} }
}, },
getItem(options, id) { getItem(options, id) {
@ -628,10 +648,8 @@ export default {
this.init(); this.init();
} }
this.visible = true; this.visible = true;
// console.log('that.type',that.type);
if(that.type=='other_in'||that.type=='do_out'){ if(that.type=='other_in'||that.type=='do_out'){
let mioitemSelecObj =JSON.parse(sessionStorage.getItem("mioitemSelecObj")); let mioitemSelecObj =JSON.parse(sessionStorage.getItem("mioitemSelecObj"));
// console.log('mioitemSelecObj',mioitemSelecObj);
if(mioitemSelecObj!==null){ if(mioitemSelecObj!==null){
that.selectObj = mioitemSelecObj; that.selectObj = mioitemSelecObj;
that.form.material = that.selectObj.id; that.form.material = that.selectObj.id;

4
src/views/srm/paperlist.vue
View File

@ -6,7 +6,6 @@
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="handleAdd" @click="handleAdd"
v-auth="'paperrecord.create'"
></el-button> ></el-button>
</div> </div>
<div class="right-panel"> <div class="right-panel">
@ -125,7 +124,6 @@
link link
size="small" size="small"
type="danger" type="danger"
v-auth="'paperrecord.delete'"
>删除</el-button >删除</el-button
> >
</template> </template>
@ -239,7 +237,6 @@
</el-form> </el-form>
<template #footer> <template #footer>
<el-button <el-button
v-auth="'paperrecord.create'"
v-if="type !== 'show'" v-if="type !== 'show'"
type="primary" type="primary"
:loading="isSaving" :loading="isSaving"
@ -377,7 +374,6 @@ export default {
this.type = "edit"; this.type = "edit";
this.editId = row.id; this.editId = row.id;
this.limitedVisible = true; this.limitedVisible = true;
console.log('row--',row);
this.addForm = Object.assign({}, row); this.addForm = Object.assign({}, row);
}, },
async filerecordDel(row) { async filerecordDel(row) {

2
src/views/srm/paperse.vue
View File

@ -6,7 +6,6 @@
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="handleAdd" @click="handleAdd"
v-auth="'PaperSe.create'"
>新增</el-button> >新增</el-button>
</div> </div>
<div class="right-panel"> <div class="right-panel">
@ -121,7 +120,6 @@
link link
size="small" size="small"
type="danger" type="danger"
v-auth="'PaperSe.delete'"
>删除</el-button >删除</el-button
> >
</template> </template>

4
src/views/srm/paperse_form.vue
View File

@ -16,8 +16,8 @@
</el-form-item> </el-form-item>
<el-form-item label="拟发表文章类型" prop="paper_type"> <el-form-item label="拟发表文章类型" prop="paper_type">
<el-select v-model="localForm.paper_type" placeholder="请选择拟发表文章类型" :disabled="localMode ==='show'"> <el-select v-model="localForm.paper_type" placeholder="请选择拟发表文章类型" :disabled="localMode ==='show'">
<el-option label="研究论文" value="研究论文"></el-option> <el-option label="研究论文" value="research"></el-option>
<el-option label="综述" value="综述"></el-option> <el-option label="综述" value="overview"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否为中文核心" prop="is_chinese_core"> <el-form-item label="是否为中文核心" prop="is_chinese_core">

2
src/views/srm/patent.vue
View File

@ -6,7 +6,6 @@
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="handleAdd" @click="handleAdd"
v-auth="'patentinfo.create'"
>新增</el-button> >新增</el-button>
</div> </div>
<div class="right-panel"> <div class="right-panel">
@ -125,7 +124,6 @@
link link
size="small" size="small"
type="danger" type="danger"
v-auth="'patentinfo.delete'"
>删除</el-button >删除</el-button
> >
</template> </template>

4
src/views/srm/patentlist.vue
View File

@ -6,7 +6,6 @@
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="handleAdd" @click="handleAdd"
v-auth="'patentrecord.create'"
></el-button> ></el-button>
</div> </div>
<div class="right-panel"> <div class="right-panel">
@ -118,7 +117,6 @@
size="small" size="small"
type="primary" type="primary"
@click="filerecordEidt(scope.row)" @click="filerecordEidt(scope.row)"
v-auth="'patentrecord.update'"
>编辑 >编辑
</el-button> </el-button>
<el-popconfirm <el-popconfirm
@ -130,7 +128,6 @@
link link
size="small" size="small"
type="danger" type="danger"
v-auth="'patentrecord.delete'"
>删除</el-button >删除</el-button
> >
</template> </template>
@ -251,7 +248,6 @@
</el-form> </el-form>
<template #footer> <template #footer>
<el-button <el-button
v-auth="'patentrecord.create'"
v-if="type !== 'show'" v-if="type !== 'show'"
type="primary" type="primary"
:loading="isSaving" :loading="isSaving"

1
src/views/srm/plat.vue
View File

@ -96,7 +96,6 @@
link link
size="small" size="small"
type="danger" type="danger"
v-auth="'PaperSe.delete'"
>删除</el-button >删除</el-button
> >
</template> </template>

310
src/views/srm/plat_record.vue
View File

@ -15,21 +15,6 @@
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
></el-input> ></el-input>
<!-- <el-select
v-model="query.name"
placeholder="选择名称"
clearable
filterable
:loading="loading"
@visible-change="handlePatentChange"
>
<el-option
v-for="item in platlist"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select> -->
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -42,53 +27,18 @@
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="红头发文号/公示页" label="红头发文号/公示页"
prop="number" prop="red_head_doc_no"
min-width="100" min-width="60"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="名称" label="名称"
prop="plat_name" prop="name"
min-width="100" min-width="60"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="平台类型" label="项目类型"
prop="p_type" prop="project_type"
min-width="100" min-width="60"
></el-table-column>
<el-table-column
label="单位"
prop="org"
min-width="100">
</el-table-column>
<el-table-column
label="建设期（年）"
prop="period"
min-width="100">
</el-table-column>
<el-table-column
label="平台资金（元）"
prop="plat_amount"
min-width="100"
></el-table-column>
<el-table-column
label="子项目"
prop="son_pro"
min-width="100"
></el-table-column>
<el-table-column
label="成果"
prop="achieve"
min-width="100"
></el-table-column>
<el-table-column
label="完成情况"
prop="finished"
min-width="100"
></el-table-column>
<el-table-column
label="建成绩效完成情况"
prop="completion"
min-width="100"
></el-table-column> ></el-table-column>
<el-table-column label="市级平台" prop="city_p" mim-width="60"> <el-table-column label="市级平台" prop="city_p" mim-width="60">
<template #default="scope"> <template #default="scope">
@ -104,6 +54,62 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="项目来源"
prop="project_source"
min-width="60">
</el-table-column>
<el-table-column
label="建设期（年）"
prop="const"
min-width="60">
</el-table-column>
<el-table-column
label="项目资金(财政与自筹)(元)"
prop="project_funding"
min-width="60"
></el-table-column>
<el-table-column
label="项目支持期"
prop="support_period"
min-width="60"
></el-table-column>
<el-table-column
label="承担单位"
prop="undertaking_unit"
min-width="60"
></el-table-column>
<el-table-column
label="负责人"
prop="responsible_person"
min-width="60"
></el-table-column>
<el-table-column
label="项目人员"
prop="project_members"
min-width="60"
></el-table-column>
<el-table-column
label="里程碑节点"
prop="milestone"
min-width="60"
></el-table-column>
<el-table-column
label="项目中期情况"
prop="mid_term_status"
min-width="60"
></el-table-column>
<el-table-column
label="项目验收情况"
prop="acceptance_status"
min-width="60"
></el-table-column>
<el-table-column
label="科技成果"
prop="sci_tech_achievements"
min-width="60"
></el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="250"> <el-table-column label="操作" fixed="right" align="center" width="250">
<template #default="scope"> <template #default="scope">
<el-button <el-button
@ -122,7 +128,6 @@
link link
size="small" size="small"
type="danger" type="danger"
v-auth="'ps.delete'"
>删除</el-button >删除</el-button
> >
</template> </template>
@ -154,98 +159,57 @@
<el-table-column label="平台名称" prop="name"></el-table-column> <el-table-column label="平台名称" prop="name"></el-table-column>
</xtSelect> </xtSelect>
</el-form-item> </el-form-item>
<el-form-item label="平台类型" prop="p_type"> <el-form-item label="项目类型" prop="p_type">
<el-input v-model="addForm.p_type" clearable></el-input> <el-input v-model="addForm.p_type" clearable></el-input>
<!-- <el-select
v-model="addForm.patent"
placeholder="请选择"
clearable
:loading="loading"
@visible-change="handlePatentChange">
<el-option
v-for="item in platlist"
:key="item.name"
:value="item.id"
:label="item.name"></el-option>
</el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="单位" prop="org"> <el-form-item label="市级平台" prop="city_p">
<el-input v-model="addForm.org" clearable></el-input> <el-radio-group v-model="addForm.city_p" :disabled="localMode ==='show'">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="省级平台" prop="province_p">
<el-radio-group v-model="addForm.province_p" :disabled="localMode ==='show'">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="项目来源" prop="project_source">
<el-input v-model="addForm.project_source" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="建设期" prop="period"> <el-form-item label="建设期" prop="const" label-width="120px">
<el-input v-model="addForm.period" clearable></el-input> <el-input v-model="addForm.const" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="代理人" prop="agent" label-width="120px"> <el-form-item label="项目资金(财政与自筹)" prop="project_funding">
<el-input v-model="addForm.agent" clearable></el-input> <el-input v-model="addForm.project_funding" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="归属平台" prop="affiliated_platforms"> <el-form-item label="项目支持期" prop="support_period" >
<el-input v-model="addForm.affiliated_platforms" clearable></el-input> <el-input v-model="addForm.support_period" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="归属项目" prop="affiliated_projects" > <el-form-item label="承担单位" prop="undertaking_unit" >
<el-input v-model="addForm.affiliated_projects" clearable></el-input> <el-input v-model="addForm.undertaking_unit" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="申请日" prop="application_date" > <el-form-item label="负责人" prop="responsible_person" >
<el-date-picker <el-input v-model="addForm.responsible_person" clearable></el-input>
v-model="addForm.application_date"
type="date"
align="right"
value-format="YYYY-MM-DD"
unlink-panels
palceholder="选择日期"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="授权日" prop="authorization_date" > <el-form-item label="项目人员" prop="project_members" >
<el-date-picker <el-input v-model="addForm.project_members" clearable></el-input>
v-model="addForm.authorization_date"
type="date"
align="right"
value-format="YYYY-MM-DD"
unlink-panels
palceholder="选择日期"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="有效年限" prop="validity_years" > <el-form-item label="里程碑节点" prop="milestone">
<el-input v-model="addForm.validity_years" type="number" min="0" clearable></el-input> <el-input v-model="addForm.milestone" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="年费缴纳" prop="annuity_paid" > <el-form-item label="项目中期情况" prop="mid_term_status">
<el-input-number <el-input v-model="addForm.mid_term_status" clearable></el-input>
v-model="addForm.annuity_paid"
:precision="2"
:step="0.01"
:min="0"
style="width: 200px"
controls-position="right"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="项目验收情况" prop="acceptance_status">
<el-select v-model="addForm.status" placeholder="请选择" clearable> <el-input v-model="addForm.acceptance_status" clearable></el-input>
<el-option
v-for="(label, value) in statusOptions"
:key="value"
:label="label"
:value="value"/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="报奖情况" prop="award_info" > <el-form-item label="科技成果" prop="sci_tech_achievements">
<el-input <el-input v-model="addForm.sci_tech_achievements" clearable></el-input>
v-model="addForm.award_info"
clearable type="textarea"
palaceholder="请输入内容"
rows="3">
></el-input>
</el-form-item>
<el-form-item label="奖金发放" prop="bonus_amount" >
<el-input-number
v-model="addForm.bonus_amount"
:precision="2"
:step="0.01"
:min="0"
style="width: 200px"
controls-position="right"></el-input-number>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button <el-button
v-auth="'ps.create'"
v-if="type !== 'show'" v-if="type !== 'show'"
type="primary" type="primary"
:loading="isSaving" :loading="isSaving"
@ -260,21 +224,9 @@ export default {
name: "index", name: "index",
data() { data() {
return { return {
workflowName:"",
workFlowId:'',
loading: false, loading: false,
apiObj: this.$API.srm.platstand.list, apiObj: this.$API.srm.platstand.list,
apiObjM2: this.$API.ofm.platform.list, apiObjM2: this.$API.ofm.platform.list,
platlist: [],
statusOptions: {
"not_disclosed":"未公开" ,
"under_examination":"实审中",
"first_office_action":"一通",
"second_office_action":"二通",
"rejected":"驳回",
"reexamination":"复审",
"authorized":"授权"
},
query: {}, query: {},
editId: null, editId: null,
isSaving: false, isSaving: false,
@ -287,86 +239,23 @@ export default {
show: "查看", show: "查看",
}, },
//表单数据 //表单数据
addForm: { addForm: {},
volume_number: null,
application_number: null,
patent: null,
pc_type: null,
organization: null,
inventors: "",
agent: "",
affiliated_platforms: "",
affiliated_projects: "",
application_date: "",
authorization_date: "",
validity_years: "",
annuity_paid: "",
status: "",
award_info: "",
bonus_amount: "",
},
}; };
}, },
methods: { methods: {
formatPcType(row, column, cellValue) {
const map = {
'invention': '发明专利',
'utility': '实用新型',
'design': '外观设计'
};
return map[cellValue] || cellValue;
},
handleAdd() { handleAdd() {
this.type = "add"; this.type = "add";
this.addForm = this.getDefaultForm();
this.limitedVisible = true; this.limitedVisible = true;
}, },
handlePatentChange(visible){
if(visible){
this.get_patentList();
}
},
async get_patentList() {
const res = await this.$API.srm.platstand.get_name.req();
this.platlist = res;
},
handleAdd_outer() {
this.addForm = this.getDefaultForm();
this.type = "add";
this.limitedVisible = true;
this.lending_type = "outer";
this.addForm.is_lending = true;
},
handleCancel() { handleCancel() {
this.limitedVisible = false; // 关闭弹窗 this.limitedVisible = false; // 关闭弹窗
this.lending_type = ""; // 重置 lending_type this.lending_type = ""; // 重置 lending_type
this.getDefaultForm()// 清空表单
}, },
submitHandle() { submitHandle() {
let that = this; let that = this;
that.isSaving = true; that.isSaving = true;
that.submit(); that.submit();
}, },
getDefaultForm(){
return {
volume_number: null,
application_number: null,
patent: null,
pc_type: null,
organization: null,
inventors: "",
agent: "",
affiliated_platforms: "",
affiliated_projects: "",
application_date: "",
authorization_date: "",
validity_years: "",
annuity_paid: "",
status: "",
award_info: "",
bonus_amount: "",
}
},
async submit() { async submit() {
let that = this; let that = this;
let res = null; let res = null;
@ -386,7 +275,6 @@ export default {
that.isSaving = false; that.isSaving = false;
} }
}, },
// 审批流结束之后才可以编辑
filerecordEidt(row) { filerecordEidt(row) {
this.type = "edit"; this.type = "edit";
this.editId = row.id; this.editId = row.id;

2
src/views/statistics/bxerp/defect.vue
View File

@ -110,7 +110,7 @@ export default {
}, },
methods: { methods: {
deptMgroup() { deptMgroup() {
this.$API.mtm.mgroup.list.req({ page: 0 }).then(res => { this.$API.mtm.mgroup.list.req({ page: 0,belong_dept__name:'拉丝排板班组' }).then(res => {
this.mgroups = res; this.mgroups = res;
}); });
}, },

31
src/views/statistics/bxerp/inmTotal.vue
View File

@ -13,6 +13,8 @@
<el-table-column type="index" width="50" fixed="left"/> <el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品" prop="物料名" fixed="left" width="120"> <el-table-column label="产品" prop="物料名" fixed="left" width="120">
</el-table-column> </el-table-column>
<el-table-column label="总数" prop="总数" fixed="left" width="80">
</el-table-column>
<el-table-column v-for="item in lists" :key="item" :label="item"> <el-table-column v-for="item in lists" :key="item" :label="item">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row[item]">{{ scope.row[item] }}</span> <span v-if="scope.row[item]">{{ scope.row[item] }}</span>
@ -52,22 +54,31 @@ export default {
let that = this; let that = this;
let params = {}; let params = {};
that.$API.bi.dataset.exec.req('mat_p_count', params).then((res) => { that.$API.bi.dataset.exec.req('mat_p_count', params).then((res) => {
let data = res.data2.ds0; let data = res.data2.ds0;
let data2 = []; let data2 = [];
data.forEach(item=>{ data.forEach(item=>{
if(item.物料名.indexOf('玻璃棒管')<0){ if(item.物料名.indexOf('玻璃棒管')<0){
data2.push(item); data2.push(item);
} }
}) })
data2.forEach(item=>{ data2.forEach(item=>{
if(item.工序数量分布){ if(item.工序数量分布){
let obj = JSON.parse(item.工序数量分布); let obj = JSON.parse(item.工序数量分布);
for(let key in obj){ for(let key in obj){
item[key]= obj[key]; item[key]= obj[key];
} }
} }
}) })
that.tableData = data2; data2.forEach(item=>{
let total = 0;
that.lists.forEach(list=>{
if(item[list]){
total+= item[list];
}
})
item['总数']= total;
})
that.tableData = data2;
}); });
}, },
}, },

6
src/views/statistics/bxerp/maopiTotal.vue
View File

@ -87,7 +87,7 @@
<el-table-column label="比率" class-name="colorheader3"> <el-table-column label="比率" class-name="colorheader3">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格_比例']"> <span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格_比例']">
<span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']">{{ 100-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格_比例']-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例'] }}</span> <span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']">{{ 100-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格_比例']-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例'] }}%</span>
<span v-else>{{ 100-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格_比例'] }}%</span> <span v-else>{{ 100-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格_比例'] }}%</span>
</span> </span>
<span v-else> <span v-else>
@ -136,7 +136,7 @@
</el-table-column> </el-table-column>
<el-table-column label="比率" class-name="colorheader4"> <el-table-column label="比率" class-name="colorheader4">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.data.毛坯检测_含缺陷_暗点合格_比例">{{ scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?100-scope.row.data.毛坯检测_含缺陷_暗点不合格_比例-scope.row.data.毛坯检测_含缺陷_暗点合格_比例:100-scope.row.data.毛坯检测_含缺陷_暗点合格_比例 }}</span> <span v-if="scope.row.data.毛坯检测_含缺陷_暗点合格_比例">{{ scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?100-scope.row.data.毛坯检测_含缺陷_暗点不合格_比例-scope.row.data.毛坯检测_含缺陷_暗点合格_比例:100-scope.row.data.毛坯检测_含缺陷_暗点合格_比例 }}%</span>
<span v-else>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?100-scope.row.data.毛坯检测_含缺陷_暗点不合格_比例:100 }}%</span> <span v-else>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?100-scope.row.data.毛坯检测_含缺陷_暗点不合格_比例:100 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
@ -267,7 +267,7 @@
</el-table-column> </el-table-column>
<el-table-column label="合格率" class-name="colorheader7"> <el-table-column label="合格率" class-name="colorheader7">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.毛坯检测_合格率 }}</span> <span>{{ scope.row.data.毛坯检测_合格率 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>

106
src/views/statistics/stock_statistics.vue
View File

@ -42,13 +42,13 @@
<scTable v-else ref="tables11" :data="tableData11" id="exportDiv1" stripe hideDo hidePagination <scTable v-else ref="tables11" :data="tableData11" id="exportDiv1" stripe hideDo hidePagination
:summary-method="getSummaries2" show-summary row-key="id"> :summary-method="getSummaries2" show-summary row-key="id">
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="物料名" prop="name" :filters="nameFilters11" <el-table-column label="物料名" prop="material_name" :filters="nameFilters11"
:filter-method="filterName11" filter-placement="bottom-end" /> :filter-method="filterName11" filter-placement="bottom-end" />
<el-table-column label="型号" prop="model" :filters="modelFilters11" <el-table-column label="型号" prop="material_model" :filters="modelFilters11"
:filter-method="filterModel11" filter-placement="bottom-end" /> :filter-method="filterModel11" filter-placement="bottom-end" />
<el-table-column label="规格" prop="specification" :filters="specsFilters11" <el-table-column label="规格" prop="material_specification" :filters="specsFilters11"
:filter-method="filterSpecs11" filter-placement="bottom-end" /> :filter-method="filterSpecs11" filter-placement="bottom-end" />
<el-table-column label="仓库合格品数" prop="count_mb" /> <el-table-column label="仓库合格品数" prop="count" />
<el-table-column label="周预估值" v-if="params.type == 30"> <el-table-column label="周预估值" v-if="params.type == 30">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.week_esitimate_consume" <el-input v-model="scope.row.week_esitimate_consume"
@ -274,39 +274,35 @@ export default {
that.nameFilters11 = []; that.nameFilters11 = [];
that.modelFilters11 = []; that.modelFilters11 = [];
that.specsFilters11 = []; that.specsFilters11 = [];
let nameList = [], specsList = [], modelList = []; let obj = {query: {"material_types": this.params.type,}};
if (that.material_name !== '' && that.material_name !== null) { that.$API.bi.dataset.exec.req("materialCount2", obj).then((res) => {
that.params.name = that.material_name; if (res.data2.ds0) {
} let data = res.data2.ds0;
that.params.query = '{id,name,model,specification,count_mb,week_esitimate_consume}'; that.tableData11 = data;
this.$API.mtm.material.list.req(that.params).then((res) => { if(data.length>0){
that.tableData11 = res; data.forEach((ite)=>{
if (res.length > 0) { if (that.nameFilters11.findIndex(i=>i.value==ite.material_name)<0) {
res.forEach((ite) => { let obj={};
if (nameList.indexOf(ite.name) > -1) { } else { obj.text=ite.material_name;
nameList.push(ite.name); obj.value=ite.material_name;
let obj = {}; that.nameFilters11.push(obj);
obj.text = ite.name; }
obj.value = ite.name; if (that.modelFilters11.findIndex(i=>i.value==ite.material_model)<0) {
that.nameFilters11.push(obj); let obj2={};
} obj2.text=ite.material_model;
if (modelList.indexOf(ite.model) > -1) { } else { obj2.value=ite.material_model;
modelList.push(ite.model); that.modelFilters11.push(obj2);
let obj2 = {}; }
obj2.text = ite.model; if (that.specsFilters11.findIndex(i=>i.value==ite.material_specification)<0) {
obj2.value = ite.model; let obj3={};
that.modelFilters11.push(obj2); obj3.text=ite.material_specification;
} obj3.value=ite.material_specification;
if (specsList.indexOf(ite.specification) > -1) { } else { that.specsFilters11.push(obj3);
specsList.push(ite.specification); }
let obj3 = {}; })
obj3.text = ite.specification; }
obj3.value = ite.specification;
that.specsFilters11.push(obj3);
}
});
} }
}); })
}, },
materialTypeChange() { materialTypeChange() {
let that = this; let that = this;
@ -329,17 +325,31 @@ export default {
"select_material": "", "select_material": "",
"groupby_material": "" "groupby_material": ""
}; };
if(that.params.type==40){ let query2 = {
query.select_material="material.cate as cate"; "material_types": this.params.type,
query.groupby_material="material.cate"; "select_material": "material.name as material_name",
query.select_material_name = ""; "groupby_material": "material.name"
query.groupby_material_name = "";
} }
this.$API.bi.dataset.exec.req("materialCount", {query:query }).then((res) => { if(that.params.type==10||that.params.type==20){
if (res.echart_options) { this.$API.bi.dataset.exec.req("materialCount", {query:query }).then((res) => {
this.echartsOptions = JSON.parse(res.echart_options); if (res.echart_options) {
this.echartsOptions = JSON.parse(res.echart_options);
}
})
}else{
if(that.params.type==40){
query2.select_material="material.cate as cate";
query2.groupby_material="material.cate";
query2.select_material_name = "";
query2.groupby_material_name = "";
} }
}) this.$API.bi.dataset.exec.req("materialCount2", {query:query2 }).then((res) => {
if (res.echart_options) {
this.echartsOptions = JSON.parse(res.echart_options);
}
})
}
}, },
//更改周预估用量 //更改周预估用量
weekcountChange(row) { weekcountChange(row) {
@ -521,13 +531,13 @@ export default {
return row.dept_name == value; return row.dept_name == value;
}, },
filterName11(value, row) { filterName11(value, row) {
return row.name == value; return row.material_name == value;
}, },
filterSpecs11(value, row) { filterSpecs11(value, row) {
return row.specification == value; return row.material_specification == value;
}, },
filterModel11(value, row) { filterModel11(value, row) {
return row.model == value; return row.material_model == value;
}, },
filterName2(value, row) { filterName2(value, row) {
return row.物料名 == value; return row.物料名 == value;

41
src/views/wpm_bx/index.vue
View File

@ -11,7 +11,7 @@
<el-main id="elMain" class="nopadding"> <el-main id="elMain" class="nopadding">
<!-- 日志 --> <!-- 日志 -->
<mlogs <mlogs
v-if="values == '日志'&&componentsShow" v-if="values == '日志'&&componentsShow&&!isFeiPinku"
:mgroupName="mgroupName" :mgroupName="mgroupName"
:mgroupId="mgroupId" :mgroupId="mgroupId"
:deptId="mgroupDept" :deptId="mgroupDept"
@ -23,7 +23,7 @@
style="height: 100%" style="height: 100%"
></mlogs> ></mlogs>
<!-- 隐藏任务 --> <!-- 隐藏任务 -->
<div v-if="values == '日志'&&componentsShow&&mtaskVisible" class="iconWrap" @click="hiddenMtask"> <div v-if="values == '日志'&&componentsShow&&mtaskVisible&&!isFeiPinku" class="iconWrap" @click="hiddenMtask">
<span class="iconSpan"> <span class="iconSpan">
<el-icon> <el-icon>
<el-icon-arrow-down /> <el-icon-arrow-down />
@ -31,7 +31,7 @@
</span> </span>
</div> </div>
<!-- 显示任务 --> <!-- 显示任务 -->
<div v-if="values == '日志'&&componentsShow&&!mtaskVisible" class="iconWrap iconWrapBottom" @click="showMtask"> <div v-if="values == '日志'&&componentsShow&&!mtaskVisible&&!isFeiPinku" class="iconWrap iconWrapBottom" @click="showMtask">
<span class="iconSpan iconSpanBottom"> <span class="iconSpan iconSpanBottom">
<el-icon> <el-icon>
<el-icon-arrow-up /> <el-icon-arrow-up />
@ -39,7 +39,7 @@
</span> </span>
</div> </div>
<mtask <mtask
v-if="values == '日志'&&componentsShow" v-if="values == '日志'&&componentsShow&&!isFeiPinku"
:mgroupName="mgroupName" :mgroupName="mgroupName"
:mgroupId="mgroupId" :mgroupId="mgroupId"
:deptId="mgroupDept" :deptId="mgroupDept"
@ -50,6 +50,15 @@
id="mtask" id="mtask"
style="height: 40%;display: none;" style="height: 40%;display: none;"
></mtask> ></mtask>
<inm v-else-if="values == '库存'&&componentsShow&&isFeiPinku"
:mgroupName="mgroupName"
:mgroupId="mgroupId"
:deptId="mgroupDept"
:process = "mgroupProcess"
:processType = "mgroupProcessType"
:mgroup_code="mgroup_code"
:mgroupMtype = "mgroupMtype"
></inm>
<!-- 交接记录 --> <!-- 交接记录 -->
<handover <handover
v-else-if="values == '交接记录'&&componentsShow" v-else-if="values == '交接记录'&&componentsShow"
@ -62,7 +71,7 @@
:mgroupMtype = "mgroupMtype" :mgroupMtype = "mgroupMtype"
></handover> ></handover>
<!-- 未完成 --> <!-- 未完成 -->
<inmIn v-else-if="values == '未完成'&&componentsShow" <inmIn v-else-if="values == '未完成'&&componentsShow&&!isFeiPinku"
:mgroupName="mgroupName" :mgroupName="mgroupName"
:mgroupId="mgroupId" :mgroupId="mgroupId"
:deptId="mgroupDept" :deptId="mgroupDept"
@ -72,7 +81,7 @@
:mgroupMtype = "mgroupMtype" :mgroupMtype = "mgroupMtype"
></inmIn> ></inmIn>
<!-- 已完成 --> <!-- 已完成 -->
<inmOut v-else-if="values == '已完成'&&componentsShow" <inmOut v-else-if="values == '已完成'&&componentsShow&&!isFeiPinku"
:mgroupName="mgroupName" :mgroupName="mgroupName"
:mgroupId="mgroupId" :mgroupId="mgroupId"
:deptId="mgroupDept" :deptId="mgroupDept"
@ -81,7 +90,7 @@
:mgroup_code="mgroup_code" :mgroup_code="mgroup_code"
:mgroupMtype = "mgroupMtype" :mgroupMtype = "mgroupMtype"
></inmOut> ></inmOut>
<record v-else-if="values == '出入库记录'" <record v-else-if="values == '出入库记录'&&componentsShow&&!isFeiPinku"
:mgroupId="mgroupId" :mgroupId="mgroupId"
:deptId = "mgroupDept" :deptId = "mgroupDept"
:mgroupName="mgroupName" :mgroupName="mgroupName"
@ -92,6 +101,7 @@
</el-container> </el-container>
</template> </template>
<script> <script>
import inm from "../inm/inmScrap.vue";
import inmIn from "./inmIn.vue"; import inmIn from "./inmIn.vue";
import inmOut from "./inmOut.vue"; import inmOut from "./inmOut.vue";
import mlogs from "./mlogs.vue"; import mlogs from "./mlogs.vue";
@ -100,13 +110,13 @@ import record from "./../wpm_gx/inmrecord.vue";
import handover from "./handover.vue"; import handover from "./handover.vue";
export default { export default {
name: "bx", name: "bx",
components: { inmIn, mlogs, mtask, handover,inmOut,record }, components: { inm,inmIn, mlogs, mtask, handover,inmOut,record },
data() { data() {
return { return {
mgroups:[], mgroups:[],
tableHieght: 200, tableHieght: 200,
selectedIndex:0, selectedIndex:0,
options: ["日志", "交接记录","未完成", "已完成"], options: [ "交接记录"],
values: "日志", values: "日志",
mgroupName: "", mgroupName: "",
mgroupId: "", mgroupId: "",
@ -116,7 +126,8 @@ export default {
mgroupProcess: '', mgroupProcess: '',
mgroupProcessType: '', mgroupProcessType: '',
componentsShow:false, componentsShow:false,
mtaskVisible:false mtaskVisible:false,
isFeiPinku:false,
}; };
}, },
mounted() { mounted() {
@ -126,6 +137,15 @@ export default {
let paths = this.$route.path; let paths = this.$route.path;
let arr = paths.split("/"); let arr = paths.split("/");
this.mgroup_code = arr[2]; this.mgroup_code = arr[2];
if(this.mgroup_code=='fpk'){
this.isFeiPinku = true;
this.options.unshift('库存');
this.values = '库存';
}else{
this.options.unshift('日志');
this.options.push('未完成');
this.options.push('已完成');
}
if(this.mgroup_code=='chengpingneiwaichujian'||this.mgroup_code=='guangzhuichengpjianc'|| if(this.mgroup_code=='chengpingneiwaichujian'||this.mgroup_code=='guangzhuichengpjianc'||
this.mgroup_code=='chengpneizhifujian'||this.mgroup_code=='chengpingxinengjiance'|| this.mgroup_code=='chengpneizhifujian'||this.mgroup_code=='chengpingxinengjiance'||
this.mgroup_code=='chenpjianchicunjiance'||this.mgroup_code=='chengpwaiguanfujianyi'|| this.mgroup_code=='chenpjianchicunjiance'||this.mgroup_code=='chengpwaiguanfujianyi'||
@ -151,6 +171,7 @@ export default {
that.mgroupDept = res[0].belong_dept; that.mgroupDept = res[0].belong_dept;
that.mgroupMtype = res[0].mtype; that.mgroupMtype = res[0].mtype;
that.componentsShow = true; that.componentsShow = true;
console.log('that.mgroupName',that.mgroupName);
}); });
}, },
showMtask(){ showMtask(){

43
src/views/wpm_bx/mlog_detail.vue
View File

@ -64,7 +64,6 @@
v-model="processLists" v-model="processLists"
:addTemplate="addTemplate" :addTemplate="addTemplate"
placeholder="暂无数据" placeholder="暂无数据"
@add="rowAdd"
> >
<el-table-column label="工序"> <el-table-column label="工序">
<template #default="scope"> <template #default="scope">
@ -101,6 +100,27 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="使用设备">
<template #default="scope">
<el-select
v-if="scope.row.isEdit"
v-model="scope.row.equipment"
placeholder="设备"
class="width-100"
>
<el-option
v-for="item in equipmentOtions"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
<div v-else>
<span v-if="scope.row.equipment!==null">{{ scope.row.equipment_name}}</span>
</div>
</template>
</el-table-column>
<el-table-column label="操作时间"> <el-table-column label="操作时间">
<template #default="scope"> <template #default="scope">
<el-date-picker <el-date-picker
@ -116,23 +136,6 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-form-item v-if="route_code=='pengma'" label="使用设备" prop="equipment">
<template #default="scope">
<el-select
v-model="scope.row.equipment"
placeholder="设备"
class="width-100"
>
<el-option
v-for="item in equipmentOtions"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</template>
</el-form-item>
<el-table-column label="班次"></el-table-column> <el-table-column label="班次"></el-table-column>
<el-table-column label="创建时间"></el-table-column> <el-table-column label="创建时间"></el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="150px"> <el-table-column label="操作" fixed="right" align="center" width="150px">
@ -514,9 +517,10 @@ export default {
addTemplate:{ addTemplate:{
mlog: "", mlog: "",
process: "", process: "",
equipment: "",
handle_user: "", handle_user: "",
handle_user_name: "",
work_start_time: "", work_start_time: "",
handle_user_name: "",
isEdit: true, isEdit: true,
}, },
qct:null, qct:null,
@ -540,6 +544,7 @@ export default {
this.apiObj = this.$API.wpm.mlogb.list; this.apiObj = this.$API.wpm.mlogb.list;
let userInfo = that.$TOOL.data.get("USER_INFO"); let userInfo = that.$TOOL.data.get("USER_INFO");
that.addTemplate.mlog = that.mlogItem.id; that.addTemplate.mlog = that.mlogItem.id;
that.addTemplate.equipment = "";
that.addTemplate.handle_user = userInfo.id; that.addTemplate.handle_user = userInfo.id;
that.addTemplate.handle_user_name = userInfo.name; that.addTemplate.handle_user_name = userInfo.name;
that.addTemplate.work_start_time = this.$TOOL.dateFormat(new Date()); that.addTemplate.work_start_time = this.$TOOL.dateFormat(new Date());

4
src/views/wpm_bx/mlogbw_check_table.vue
View File

@ -29,7 +29,7 @@
</th> </th>
<th class="w_30 inlineBlock">序号</th> <th class="w_30 inlineBlock">序号</th>
<th class="w_140 inlineBlock">物料批次</th> <th class="w_140 inlineBlock">物料批次</th>
<th class="w_140 inlineBlock">物料编号</th> <th class="w_150 inlineBlock">物料编号</th>
<th class="w_80 inlineBlock" v-for="item in qct_testitems" :key="item.id">{{ item.testitem_name }}</th> <th class="w_80 inlineBlock" v-for="item in qct_testitems" :key="item.id">{{ item.testitem_name }}</th>
<th class="w_80 inlineBlock" v-for="item in qct_defects" :key="item.id">{{ item.defect_name }}</th> <th class="w_80 inlineBlock" v-for="item in qct_defects" :key="item.id">{{ item.defect_name }}</th>
<th class="w_80 inlineBlock">备注</th> <th class="w_80 inlineBlock">备注</th>
@ -48,7 +48,7 @@
<input v-if="row.isEdit" v-model="row.mlogb__batch" placeholder="物料批次"> <input v-if="row.isEdit" v-model="row.mlogb__batch" placeholder="物料批次">
<span v-else>{{ row.mlogb__batch }}</span> <span v-else>{{ row.mlogb__batch }}</span>
</td> </td>
<td class="w_140 inlineBlock"> <td class="w_150 inlineBlock">
<input v-if="row.isEdit" v-model="row.number" placeholder="物料编号"> <input v-if="row.isEdit" v-model="row.number" placeholder="物料编号">
<span v-else>{{ row.number }}</span> <span v-else>{{ row.number }}</span>
<span v-if="row.wpr_number_out !== null && row.wpr_number_out !== undefined">——{{ row.wpr_number_out }}</span> <span v-if="row.wpr_number_out !== null && row.wpr_number_out !== undefined">——{{ row.wpr_number_out }}</span>

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

@ -453,8 +453,10 @@ export default {
//仓库人员 //仓库人员
getDeptUser() { getDeptUser() {
let that = this; let that = this;
let userOption = [];
this.$API.system.user.list.req({ page: 0, posts__code__contains: "inm" }).then((res) => { this.$API.system.user.list.req({ page: 0, posts__code__contains: "inm" }).then((res) => {
that.userOption = res; userOption = Array.from(new Map(res.map(item => [item.id, item])).values());
that.userOption = userOption;
}); });
}, },
//仓库物料 //仓库物料

6
src/views/wpm_gx/inmrecord.vue
View File

@ -2,9 +2,9 @@
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<!-- <el-button type="primary" @click="tomio('do_out')" v-auth="'mio.do'" <el-button type="primary" @click="tomio('do_out')" v-auth="'mio.do'"
v-if="mgroupName!=='size'&&mgroupName!=='facade'&&project_code=='gx'" v-if="mgroupName=='外协白片抛'||mgroupName=='外协一次抛'||mgroupName=='外扫'"
>领料</el-button> --> >领料</el-button>
<el-button type="primary" @click="tomio('do_in')" v-auth="'mio.do'">入库</el-button> <el-button type="primary" @click="tomio('do_in')" v-auth="'mio.do'">入库</el-button>
<el-button <el-button
type="primary" type="primary"