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

ganttanddialog

This commit is contained in:
shijing 2023-11-13 18:44:15 +08:00
parent 821bf22e8c
commit ae78d57720
10 changed files with 373 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/glb/photon3.glb Normal file
View File

Binary file not shown.

37
src/views/bigScreen/textIndex.vue
View File

@ -194,7 +194,6 @@ export default {
},
initFactory() {
var that = this;
const canvas = document.getElementById("renderCanvas"); // Get the canvas element
const engine = new BABYLON.Engine(canvas, true); // Generate the BABYLON 3D engine
BABYLON.DefaultLoadingScreen.prototype.displayLoadingUI = function () {
@ -202,7 +201,6 @@ export default {
BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function () {
document.getElementById("loadingScreen").style.display = "none";
}
engine.displayLoadingUI();
const createScene = function () {
const scene = new BABYLON.Scene(engine);
@ -265,7 +263,6 @@ export default {
BABYLON.Animation.CreateAndStartAnimation('at61', camera, 'target', 45, 200, camera.target, that.initialTarget, 0, ease);
}
})
// 高亮显示mesh名
const mesh_rect = new BABYLON_GUI.Rectangle('mesh_rect');
mesh_rect.width = "200px";
@ -274,7 +271,6 @@ export default {
mesh_rect.alpha = 0.6;
mesh_rect.isVisible = false;
advancedTexture.addControl(mesh_rect);
var mesh_name = new BABYLON_GUI.TextBlock('mesh_name');
mesh_name.text = "";
mesh_name.color = 'white';
@ -284,7 +280,6 @@ export default {
BABYLON.SceneLoader.Append('glb/', "photon3.glb", scene, function (scene) {
//关闭灯光
// scene.lights[1].setEnabled(false);
// setEnable
engine.hideLoadingUI()
// for (let key in that.nodesLists) {
// // const value = that.nodesLists[key];
@ -322,18 +317,17 @@ export default {
// }
// }
},
//进度条
function (evt) {
var loadedPercent = 0;
if (evt.lengthComputable) {
loadedPercent = parseInt(evt.loaded * 100 / evt.total);
} else {
var dlCount = evt.loaded / (1024 * 1024);
loadedPercent = Math.floor(dlCount * 100.0) / 100.0;
}
that.loadedPercent = loadedPercent;
})
//进度条
function (evt) {
var loadedPercent = 0;
if (evt.lengthComputable) {
loadedPercent = parseInt(evt.loaded * 100 / evt.total);
} else {
var dlCount = evt.loaded / (1024 * 1024);
loadedPercent = Math.floor(dlCount * 100.0) / 100.0;
}
that.loadedPercent = loadedPercent;
})
// 自动旋转checkbox
var checkbox = new BABYLON_GUI.Checkbox();
checkbox.width = "20px";
@ -407,7 +401,6 @@ export default {
mesh_name.text = name;
// mesh_rect.isVisible = true;
that.infoVisibel = true;
let newColor = new BABYLON.Color3(12/ 255 -0.2,250 / 255 -0.2,252/ 255 -0.2);
hl1.addMesh(mesh, new BABYLON.Color3(12 / 255, 250 / 255, 252 / 255), true);
hl1.blurVerticalSize = 5;
hl1.blurHorizontalSize = 5;
@ -427,7 +420,6 @@ export default {
}
});
canvas.addEventListener('mousedown', (event) => {
debugger;
// 使用 scene.pick 检测鼠标拾取
const pickResult = scene.pick(scene.pointerX, scene.pointerY);
if (pickResult.hit) {
@ -453,7 +445,6 @@ export default {
}
}
});
// checkbox.isChecked = true; //默认开启自动旋转
// scene.onPointerObservable.add((pointerInfo) => {
// switch (pointerInfo.type) {
@ -486,19 +477,19 @@ export default {
// })
return scene;
};
const scene = createScene(); //Call the createScene function
// scene.debugLayer.show()
scene.debugLayer.show()
engine.runRenderLoop(function () {
scene.render();
});
this.engine = engine;
this.scene = scene;
console.log('scene:',scene)
window.addEventListener("resize", function () {
engine.resize();
});
},
initChart() {
initChart() {
//左1
let chartDom = document.getElementById('line1');
chartDom.style.height = this.blockHeight;

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

@ -9,10 +9,10 @@
<el-descriptions-item label="部门/车间">{{ mioObj.belong_dept_name }}</el-descriptions-item>
<el-descriptions-item label="执行人">{{ mioObj.do_user_name }}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{ mioObj.create_time }}</el-descriptions-item>
<el-descriptions-item label="采购订单">{{ mioObj.order_number }}</el-descriptions-item>
<el-descriptions-item label="销售订单">{{ mioObj.pu_order_number }}</el-descriptions-item>
<el-descriptions-item label="供应商/客户">{{ mioObj.supplier_name }}{{
mioObj.customer_name }}</el-descriptions-item>
<el-descriptions-item label="采购订单" v-if="mioObj.type=='pur_in'">{{ mioObj.order_number }}</el-descriptions-item>
<el-descriptions-item label="供应商" v-if="mioObj.type=='pur_in'">{{ mioObj.supplier_name }}</el-descriptions-item>
<el-descriptions-item label="销售订单" v-if="mioObj.type=='sale_out'">{{ mioObj.pu_order_number }}</el-descriptions-item>
<el-descriptions-item label="客户" v-if="mioObj.type=='sale_out'">{{mioObj.customer_name }}</el-descriptions-item>
</el-descriptions>
<el-button type="primary" @click="mioSubmit" v-auth="'mio.submit'" v-if="mioObj.state == 10">
提交
@ -57,7 +57,7 @@
</el-card>
</div>
</div>
<save-dialog v-if="dialog.save" ref="saveDialog" :mioId="mioId" :belongDeptId="belongDeptId" :mioObj="mioObj"
<save-dialog v-if="dialog.save" ref="saveDialog" :mioId="mioId" :belongDeptId="belongDeptId" :belongDeptName="mioObj.belong_dept_name" :mioObj="mioObj"
@success="handleSaveSuccess" @closed="dialog.save = false">
</save-dialog>

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

@ -6,30 +6,34 @@
@change="selectMaterialChange">
<el-option v-for="item in materialOptions" :key="item.id" :label="item.number" :value="item">
<span style="float: left">{{ item.number }}</span>
<span style="
float: right;
color: var(--el-text-color-secondary);
font-size: 13px;
">{{ item.name }}</span>
<span style=" float: right; color: var(--el-text-color-secondary);font-size: 13px;">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="仓库批次号">
<el-form-item label="批次号">
<!-- <el-input v-model="form.batch" placeholder="手动输入批次号" :disabled="inputBatchDisable" /> -->
<el-select v-model="form.batch" value-key="id" filterable allow-create clearable style="width: 100%;" :disabled="inputBatchDisable">
<el-option
v-for="item in wbatchOptions"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="仓库已有批次">
<el-select v-model="selectBatch" value-key="id" clearable style="width: 100%;" @change="selectBatchChange"
@clear="selectBatchClear" :disabled="selectBatchDisable">
<el-option v-for="item in batchOptions" :key="item.id" :label="item.batch" :value="item">
<span style="float: left">{{ item.batch }}</span>
<span style="
float: right;
color: var(--el-text-color-secondary);
font-size: 13px;
">{{ item.count }} -- {{ item.warehouse_name }}</span>
float: right;
color: var(--el-text-color-secondary);
font-size: 13px;
">{{ item.count }} -- {{ item.warehouse_name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="新批次号">
<el-input v-model="form.batch" placeholder="手动输入新批次" :disabled="inputBatchDisable" />
</el-form-item>
<el-form-item label="仓库">
<el-select v-model="form.warehouse" clearable style="width: 100%;" :disabled="warehouseDisable">
<el-option v-for="item in warehouseOptions" :key="item.id" :label="item.name"
@ -77,6 +81,7 @@ export default {
emits: ["success", "closed"],
props: {
mioId: { type: String, default: '' },
belongDeptName:{type: String, default: ''},
belongDeptId: { type: String, default: null },
mioObj: { type: Object }
},
@ -109,9 +114,11 @@ export default {
selectMaterial: null,
selectBatch: null,
components: [],
wbatchOptions:[],
};
},
mounted() {
this.getBatchs();
},
methods: {
init() {
@ -123,6 +130,13 @@ export default {
this.warehouseOptions = res
})
},
//获取车间物料批次号
getBatchs(){
let that = this;
this.$API.wpm.wmaterial.batchs.req({belong_dept_name:this.belongDeptName}).then(res=>{
that.wbatchOptions = res;
});
},
getMaterialOptions() {
var type = this.form.type
var query

5
src/views/mtm/materials_form.vue
View File

@ -14,6 +14,11 @@
<el-input v-model="form.name" placeholder="物料名称" />
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" prop="cate">
<el-form-item label="物料cate">
<el-input v-model="form.cate" placeholder="物料名称" />
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="规格型号">
<el-input v-model="form.specification" placeholder="规格型号" />

6
src/views/pm/mtask.vue
View File

@ -7,7 +7,7 @@
<el-button type="primary" @click="utaskDepuse" v-loading="isloading">任务下达</el-button>
</div>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="混料工序" name="8车间">
<!-- <el-tab-pane label="混料工序" name="8车间">
<scTable
ref="table8"
:apiObj="apiUtask"
@ -69,7 +69,7 @@
</template>
</el-table-column>
</scTable>
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="成型7车间" name="7车间">
<scTable
ref="table7"
@ -340,7 +340,7 @@ export default {
visibleRecord:false,
tableHeight:null,
hideDo:true,
activeName:'8车间',
activeName:'7车间',
dataList:[
// {number:'rwbh2023',name:'玻璃棒',xh:'',count:100,count1:100,start_date:'2023-10-15',end_date:'2023-10-15', count01:100, count02:200, count03:300 },
// {number:'rwbh2023',name:'玻璃棒',xh:'',count:100,count1:100,start_date:'2023-10-15',end_date:'2023-10-15', count01:100, count02:250, count03:300 },

2
src/views/pum/orderitemplan.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog title="计划明细变更采购订单明细" v-model="visible" :size="1000" destroy-on-close @closed="$emit('closed')">
<el-dialog title="计划明细变更采购订单明细" v-model="visible" width="80%" destroy-on-close @closed="$emit('closed')">
<el-container>
<el-aside width="45%">
<el-container>

7
src/views/pum/planitem.vue
View File

@ -15,7 +15,7 @@
<div>
<el-button type="primary" icon="el-icon-plus" v-auth="'pu_planitem.create'" @click="add"></el-button>
</div>
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query" hidePagination>
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query" hidePagination>
<el-table-column type="index" width="50" />
<el-table-column label="所属物料" prop="material" show-overflow-tooltip>
<template #default="scope">
@ -66,7 +66,7 @@ export default {
},
puPlan: '',
orderObj: {},
apiObj: this.$API.pum.planitem.list,
apiObj: null,
query: {
page: 1,
page_size: 20
@ -75,6 +75,9 @@ export default {
},
mounted() {
this.puPlan = this.$route.query.pu_plan;
this.query.pu_plan = this.$route.query.pu_plan;
this.apiObj= this.$API.pum.planitem.list;
this.$refs.table.refresh();
this.getOrder();
},
methods: {

204
src/views/wpm/worktask.vue
View File

@ -3,9 +3,20 @@
<el-main id="topContainer" class="nopadding" style="position: relative;height: 50%;margin-bottom: 10px;">
<el-row :gutter="10">
<el-col :span="activeSpan" style="border-right: 1px solid #eeeeee;position: relative;">
<div class="right-panel btnWrap" v-if="activeName == '8车间' || activeName == '退火'">
<el-button type="primary" icon="el-icon-plus" @click="add">新增</el-button>
<div class="right-panel btnWrap">
<el-button v-if="activeName == '8车间' || activeName == '退火'" type="primary" icon="el-icon-plus" @click="add">新增</el-button>
<el-button v-if="activeName == '退火'" type="primary" @click="submittuihuo">提交</el-button>
<el-date-picker v-if="activeName == '7车间' || activeName == '10车间'"
v-model="paramsDate"
type="date"
value-format="YYYY-MM-DD"
/>
<el-button
type="primary"
icon="el-icon-search"
@click="handleQuerys"
v-if="activeName == '7车间' || activeName == '10车间'"
>查询</el-button>
</div>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="混料工序" name="8车间">
@ -86,22 +97,19 @@
<scTable ref="table8" :apiObj="apiObjMlog" row-key="id" stripe :height="tableHeightHalf" :params="paramsth"
hidePagination hideDo>
<el-table-column type="index" width="50" />
<el-table-column label="配料日期" prop="handle_date">
<el-table-column label="合格数" prop="equipment_name">
</el-table-column>
<el-table-column label="产物" prop="material" show-overflow-tooltip>
<template #default="scope"><span v-if="scope.row.material_out_">{{ scope.row.material_out_.name
}}</span>
</template>
<el-table-column label="不合格数" prop="batch">
</el-table-column>
<el-table-column label="设备" prop="equipment_name">
<el-table-column label="不合格原因" prop="handle_date">
</el-table-column>
<el-table-column label="批次" prop="batch">
<el-table-column label="检测数" prop="count_real">
</el-table-column>
<el-table-column label="数量/桶数" prop="count_real">
<el-table-column label="检测合格数" prop="count_real_eweight">
</el-table-column>
<el-table-column label="每桶重量/kg" prop="count_real_eweight">
<el-table-column label="检测不合格数" prop="handle_user_name">
</el-table-column>
<el-table-column label="配料人" prop="handle_user_name">
<el-table-column label="检测不合格原因" prop="handle_user_name">
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="180">
<template #default="scope">
@ -109,6 +117,10 @@
编辑
</el-link>
<el-divider direction="vertical"></el-divider>
<el-link type="success" @click="table_tuihuo_submit(scope.row)" v-auth="'equipment'">
提交
</el-link>
<el-divider direction="vertical"></el-divider>
<el-link type="danger" @click="table_del(scope.row, '8车间')" v-auth="'equipment'">
删除
</el-link>
@ -156,7 +168,7 @@
<el-button type="primary" @click="getMaterial">领料</el-button>
</div>
</div>
<scTable ref="table8" :apiObj="apiObjMetarial" row-key="id" stripe :height="tableHeightHalf"
<scTable ref="table8wM" :apiObj="apiObjMetarial" row-key="id" stripe :height="tableHeightHalf"
:params="paramsMaterial" hidePagination hideDo @selection-change="handleSelectionChange">
<el-table-column type="index" width="50" />
<el-table-column type="selection" width="40" />
@ -204,7 +216,7 @@
</el-tab-pane>
<el-tab-pane label="7车间" name="7车间">
<scTable ref="table7" :apiObj="apiObjMtask" row-key="id" stripe :height="tableHeight" :params="params7"
hidePagination hideDo @row-click="rowClick">
hideDo @row-click="rowClick">
<el-table-column type="index" width="50" />
<el-table-column label="产品名称" prop="material" show-overflow-tooltip>
<template #default="scope">
@ -249,7 +261,7 @@
</el-tab-pane>
<el-tab-pane label="10车间" name="10车间">
<scTable ref="table10" :apiObj="apiObjMtask" row-key="id" stripe :height="tableHeight" :params="params10"
hidePagination hideDo @row-click="rowClick">
hideDo @row-click="rowClick">
<el-table-column type="index" width="50" />
<el-table-column label="产品名称" prop="material" show-overflow-tooltip>
<template #default="scope">
@ -291,40 +303,41 @@
</el-tab-pane>
</el-tabs>
</el-col>
<el-col :span="12" v-if="activeName !== '8车间' && activeName !== '退火'">
<div v-if="activeName == '退火'" style="font-size:16px;padding:10px 0;border-bottom:1px solid #eeeeee">退火日志</div>
<el-form v-else label-width="100px" style="border-bottom: 1px solid #eeeeee;padding: 4px 0;">
<el-row>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item class="infoForm" label="产品名称：">
<span v-if="choseData && choseData.material_out_">{{ choseData.material_out_.name }}</span>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item class="infoForm" label="产品型号：">
<span v-if="choseData && choseData.material_out_">{{ choseData.material_out_.number }}</span>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item class="infoForm" label="配粉料数：">
<span>{{ peifen_kg }}</span>
</el-form-item>
</el-col>
<!-- <el-col :md="8" :sm="12" :xs="24">
<el-form-item label="配粉料数：">
<el-input-number
v-model="materialCount"
controls-position="right"
:min="0" step="1"
:step-strictly="true"
style="width:100%"
placeholder="配粉料数"
>
</el-input-number>
</el-form-item>
</el-col> -->
</el-row>
</el-form>
<el-col :span="12" v-if="activeName=='7车间'||activeName == '10车间'">
<el-card>
<el-form label-width="100px">
<el-row>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item class="infoForm" label="产品名称：">
<span v-if="choseData && choseData.material_out_">{{ choseData.material_out_.name }}</span>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item class="infoForm" label="产品型号：">
<span v-if="choseData && choseData.material_out_">{{ choseData.material_out_.number }}</span>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item class="infoForm" label="配粉料数：">
<span>{{ peifen_kg }}</span>
</el-form-item>
</el-col>
<!-- <el-col :md="8" :sm="12" :xs="24">
<el-form-item label="配粉料数：">
<el-input-number
v-model="materialCount"
controls-position="right"
:min="0" step="1"
:step-strictly="true"
style="width:100%"
placeholder="配粉料数"
>
</el-input-number>
</el-form-item>
</el-col> -->
</el-row>
</el-form>
</el-card>
<div style="margin-top: 10px;">
<el-button type="primary" icon="el-icon-plus" @click="add"
:disabled="choseData && choseData.state == 40">新增</el-button>
@ -443,6 +456,36 @@
</template>
</el-table-column>
</scTable>
<div class="tableTitle">
车间物料
<div class="right-panel btnWrap">
<el-button type="primary" @click="getMaterial">领料</el-button>
</div>
</div>
<scTable ref="table8wM" :apiObj="apiObjMetarial" row-key="id" stripe :height="300"
:params="paramsMaterial" hidePagination hideDo>
<el-table-column type="index" width="50" />
<el-table-column type="selection" width="40" />
<el-table-column label="送料日期" prop="send_date">
</el-table-column>
<el-table-column label="产物" prop="material" show-overflow-tooltip>
<template #default="scope">
<span v-if="scope.row.material_out_">{{ scope.row.material_out_.name}}</span>
</template>
</el-table-column>
<el-table-column label="设备" prop="equipment_name">
</el-table-column>
<el-table-column label="批次" prop="batch">
</el-table-column>
<el-table-column label="数量/桶数" prop="count_real">
</el-table-column>
<el-table-column label="每桶重量/kg" prop="count_real_eweight">
</el-table-column>
<el-table-column label="交送人" prop="send_user_name">
</el-table-column>
<el-table-column label="接收人" prop="send_user_name">
</el-table-column>
</scTable>
</el-col>
</el-row>
</el-main>
@ -526,14 +569,13 @@ export default {
handover: false
},
handoverVisible: false,
paramsDate:'',
// apiObj: this.$API.pm.mtask.list,
params7: {
belong_dept_name: '7车间',
date: '2023-10-24'
mgroup__belong_dept__name: '7车间'
},
params10: {
belong_dept_name: '10车间',
date: '2023-10-20'
mgroup__belong_dept__name: '10车间'
},
params8: {
mgroup__belong_dept__name: '8车间',
@ -547,7 +589,7 @@ export default {
apiObjMlog: null,
apiObjHandover: null,
apiObjWMaterial: this.$API.wpm.wmaterial.list,
apiObjMtask: null,
apiObjMtask: this.$API.pm.mtask.list,
apiObj: null,
apiObjMetarial: this.$API.wpm.wmaterial.list,
@ -606,10 +648,9 @@ export default {
let rightHeight = heights - 100;
this.rightHeight = rightHeight / 2 + 'px';
let NowDate = new Date();
let month = NowDate.getMonth() > 8 ? NowDate.getMonth() + 1 : '0' + (NowDate.getMonth() + 1)
this.params7.date = NowDate.getFullYear() + '-' + (NowDate.getMonth() + 1) + '-' + NowDate.getDate();
this.params10.date = NowDate.getFullYear() + '-' + (NowDate.getMonth() + 1) + '-' + NowDate.getDate();
this.apiObjMtask = this.$API.pm.mtask.daylist;
let paramsDate = NowDate.getFullYear() + '-' + (NowDate.getMonth() + 1) + '-' + NowDate.getDate();
// NowDate.getMonth() > 8 ? NowDate.getMonth() + 1 : '0' + (NowDate.getMonth() + 1)
this.apiObjMtask = this.$API.pm.mtask.list;
this.apiObjMlog = this.$API.wpm.mlog.list;
this.apiObjHandover = this.$API.wpm.handover.list;
this.getGroup();
@ -636,14 +677,39 @@ export default {
},
handleClick(val) {
console.log(val.index);
if (val.index == 0 || val.index == 1) {
if (val.index == 0) {
this.activeSpan = 24
} else {
this.activeSpan = 12
}else if(val.index == 1) {
this.activeSpan = 24;
this.paramsMaterial.belong_dept__name = '8车间';
this.$refs.table8wM.refresh();
}else if(val.index == 2){
this.activeSpan = 12;
this.paramsMaterial.belong_dept__name = '7车间';
this.$refs.table8wM.refresh();
}
else if(val.index == 3){
this.activeSpan = 12;
this.paramsMaterial.belong_dept__name = '10车间';
this.$refs.table8wM.refresh();
}
this.choseData = null;
this.flogs = [];
},
handleQuerys(){
if(this.activeName=='7车间'){
this.params7.start_date = this.paramsDate;
this.params7.end_date = this.paramsDate;
console.log('paramsDate',this.paramsDate)
console.log('7车间',this.params7)
this.$refs.table7.queryData(this.params7);
}else{
this.params10.start_date = this.paramsDate;
this.params10.end_date = this.paramsDate;
this.$refs.table10.queryData(this.params10);
}
},
table_submit(row) {
let obj = {};
obj.ids = [];
@ -652,6 +718,12 @@ export default {
debugger;
})
},
//退火日志提交
table_tuihuo_submit(row){
this.$API.wpm.mlog.submit.req(row.id,row).then(res => {
console.log(res)
})
},
//自定义新增任务
addTask(taskId) {
var $this = this;
@ -732,11 +804,11 @@ export default {
handleSuccess() {
},
handleQuery() {
// this.$refs.table.queryData(this.query)
debugger;
generateExcel(this.columns, this.flogsData, '测试')
},
// handleQuery() {
// // this.$refs.table.queryData(this.query)
// debugger;
// generateExcel(this.columns, this.flogsData, '测试')
// },
resetQuery() {
this.query = {};
},

258
src/views/wpm/worktask_form.vue
View File

@ -111,110 +111,185 @@
</el-row>
</el-form>
<!-- 退火 -->
<el-form v-if="activeType=='退火'" ref="dialogForm" :model="form" :rules="rules" label-width="80px">
<el-form v-if="activeType=='退火'" ref="dialogForm" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="工段" prop="material">
<el-select
v-model="form.mgroup"
placeholder="工段"
clearable
style="width:100%"
>
<el-option
v-for="item in mgroupOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
<el-form-item label="合格数">
<el-input-number
v-model="form.count_ok"
controls-position="right"
:min="0" step="1"
:step-strictly="true"
style="width:100%"
placeholder="请输入合格数">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="消耗物" prop="material_in">
<el-form-item label="不合格数">
<el-input-number
v-model="form.count_notok"
controls-position="right"
style="width:100%"
placeholder="不合格数"
disabled
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="物料批次" prop="material_in">
<el-select
v-model="form.material_in"
placeholder="消耗物"
v-model="form.catch"
placeholder="物料批次"
clearable
style="width:100%"
@change="wmaterialInChange"
>
<el-option
v-for="item in wMaterialOptions"
:key="item.id"
:label="item.name"
:value="item.id"
:key="item.batch"
:label="item.batch"
:value="item.batch"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<div class="formTitle">不合格原因及数量:</div>
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="产物" prop="material_out">
<el-select
v-model="form.material_out"
placeholder="产物"
clearable
style="width:100%"
<el-form-item label="椭圆/弯曲">
<el-input-number
v-model="form.count_n_wq"
controls-position="right"
:min="0" step="1"
:step-strictly="true"
style="width:100%"
placeholder="椭圆/弯曲"
@change="countNotOkSun"
>
<el-option
v-for="item in materialOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-input-number>
</el-form-item>
</el-col>
<!-- <el-col :md="12" :sm="24">
<el-form-item label="设备" prop="material">
<el-select
v-model="form.equipment"
placeholder="设备"
clearable
style="width:100%"
<el-col :md="12" :sm="24">
<el-form-item label="条纹">
<el-input-number
v-model="form.count_n_tw"
controls-position="right"
:min="0" step="1"
:step-strictly="true"
style="width:100%"
placeholder="条纹"
@change="countNotOkSun"
>
<el-option
v-for="item in equipmentOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :md="12" :sm="24">
<el-form-item label="批次" width="100">
<el-input v-model="form.batch" disabled tyle="width:100%" placeholder="请输入批次"></el-input>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="数量" width="100">
<el-form-item label="断裂">
<el-input-number
v-model="form.count_n_dl"
controls-position="right"
:min="0" step="1"
:step-strictly="true"
style="width:100%"
placeholder="断裂"
@change="countNotOkSun"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="偏壁">
<el-input-number
v-model="form.count_n_pb"
controls-position="right"
:min="0" step="1"
:step-strictly="true"
style="width:100%"
placeholder="偏壁"
@change="countNotOkSun"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="大小头">
<el-input-number
v-model="form.count_n_dxt"
controls-position="right"
:min="0" step="1"
:step-strictly="true"
style="width:100%"
placeholder="大小头"
@change="countNotOkSun"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="结石气绒">
<el-input-number
v-model="form.count_n_jsqx"
controls-position="right"
:min="0" step="1"
:step-strictly="true"
style="width:100%"
placeholder="结石气绒"
@change="countNotOkSun"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="箱中破">
<el-input-number
v-model="form.count_break"
controls-position="right"
style="width:100%"
placeholder="箱中破"
@change="countNotOkSun"
>
</el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="检测数">
<el-input-number
v-model="form.count"
controls-position="right"
:min="0" step="1"
:step-strictly="true"
style="width:100%"
placeholder="请输入数量">
placeholder="请输入检测数">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="操作人" prop="material">
<el-select
v-model="form.handle_users"
placeholder="操作人"
clearable
multiple
style="width:100%"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
<el-form-item label="检测合格数">
<el-input-number
v-model="form.count"
controls-position="right"
:min="0" step="1"
:step-strictly="true"
style="width:100%"
placeholder="请输入检测合格数">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="检测不合格数">
<el-input-number
v-model="form.count"
controls-position="right"
:min="0" step="1"
:step-strictly="true"
style="width:100%"
placeholder="请输入检测不合格数">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
@ -621,7 +696,7 @@
</el-col>
</el-row>
<div class="formTitle">关联产品计数:</div>
<el-row v-for="item in form.mlogb" :key="item">
<el-row v-for="item in mlogb" :key="item">
<el-col :md="12" :sm="24">
<el-form-item label="产品名称" prop="material">
<el-select
@ -798,6 +873,7 @@
count_n_qt:0,
mlogb:[]
},
mlogb:[],
userList:[],
cateOptions:[],
mgroupOptions:[],
@ -835,10 +911,10 @@
this.brothersList.forEach(item=>{
let obj = {};
obj.material_out = item;
obj.count_ok = 0;
obj.count_ok = null;
mlogb.push(obj)
})
this.form.mlogb = mlogb;
this.mlogb = mlogb;
}
}
this.getWorkShopMaterial();
@ -910,11 +986,13 @@
this.form.count_notok = this.form.count_n_zw+this.form.count_n_tw+this.form.count_n_qp+this.form.count_n_wq+this.form.count_n_qt;
}else if(this.activeType=='10车间'){
this.form.count_notok = this.form.count_n_wq+this.form.count_n_tw+this.form.count_n_dl+this.form.count_n_pb+this.form.count_n_dxt+this.form.count_n_jsqx;
}
}else if(this.activeType=='退火'){
this.form.count_notok = this.form.count_n_wq+this.form.count_n_tw+this.form.count_n_dl+this.form.count_n_pb+this.form.count_n_dxt+this.form.count_n_jsqx+this.form.count_break;
}
},
countOkSun(){
let ok_number = 0;
this.form.mlogb.forEach(item=>{
this.mlogb.forEach(item=>{
ok_number+=item.count_ok;
})
this.form.count_ok = ok_number;
@ -934,14 +1012,32 @@
this.form.mtask = this.mtask;
this.form.count_notok = this.form.count_n_wq+this.form.count_n_tw+this.form.count_n_dl+this.form.count_n_pb+this.form.count_n_dxt+this.form.count_n_jsqx;
let ok_number = 0;
this.form.mlogb.forEach(item=>{
this.mlogb.forEach(item=>{
ok_number+=item.count_ok;
})
this.form.count_ok = ok_number;
}else if(this.activeType=='退火'){
this.form.mgroup = '3428194648706011136';
this.form.count_notok = this.form.count_n_wq+this.form.count_n_tw+this.form.count_n_dl+this.form.count_n_pb+this.form.count_n_dxt+this.form.count_n_jsqx+this.form.count_break;
}
let sun = this.form.count_ok+this.form.count_notok;
if(sun==this.form.count_real){
if (this.mode == "add") {
if(this.activeType=='10车间'){
let mlogb = this.mlogb;
let newArr = [];
mlogb.forEach(item=>{
if(item.count_ok!==null&&item.count_ok!==''){
newArr.push(item)
}
})
this.form.mlogb = newArr;
}
// let sun = this.form.count_ok+this.form.count_notok;
// if(sun==this.form.count_real){
// }else{
// this.isSaveing = false;
// this.$message.error("合格总数与不合格总数与出管总数不对等");
// }
if (this.mode == "add") {
this.$API.wpm.mlog.create.req(this.form).then(res=>{
this.isSaveing = false;
this.$emit("success", this.form, this.mode);
@ -964,10 +1060,6 @@
return err;
})
}
}else{
this.isSaveing = false;
this.$message.error("合格总数与不合格总数与出管总数不对等");
}
}
});
},