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:
zty 2025-10-09 13:43:00 +08:00
parent 8c66b11b9e 9c46866c81
commit e962b9661c
9 changed files with 243 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/views/em/equipment.vue
View File

@ -4,29 +4,11 @@
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'">新增</el-button> <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'">新增</el-button>
<el-button type="primary" @click="echeckrecord" v-auth="'echeckrecord.create'">批量巡检</el-button> <el-button type="primary" @click="echeckrecord" v-auth="'echeckrecord.create'">批量巡检</el-button>
<!-- <el-select v-model="query.belong_dept" placeholder="所在车间" clearable style="margin-left: 2px;"
@change="handleQuery">
<el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> -->
</div> </div>
<div class="right-panel"> <div class="right-panel">
<el-cascader v-model="query.belong_dept" :options="group" :props="groupsProps" clearable placeholder="所在车间" <el-cascader v-model="query.belong_dept" :options="group" :props="groupsProps" clearable placeholder="所在车间"
:show-all-levels="false" @change="handleQuery"> :show-all-levels="false" @change="handleQuery">
</el-cascader> </el-cascader>
<!-- <el-select v-model="query.state" placeholder="设备状态" clearable>
<el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
@change="handleQuery"></el-option>
</el-select> -->
<!-- <el-select
v-model="query.is_deleted"
placeholder="筛选"
@change="handleQuery"
clearable
style="margin-left: 2px"
>
<el-option label="在用" :value="false"></el-option>
<el-option label="已删" :value="true"></el-option>
</el-select> -->
<el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input> <el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div> </div>
@ -92,9 +74,6 @@
<el-table-column label="所在工段" show-overflow-tooltip> <el-table-column label="所在工段" show-overflow-tooltip>
<template #default="scope">{{ scope.row.mgroup_name }}</template> <template #default="scope">{{ scope.row.mgroup_name }}</template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="保管人">
<template #default="scope">{{ scope.row.keeper_name }}</template>
</el-table-column> -->
<el-table-column label="安装位置" show-overflow-tooltip> <el-table-column label="安装位置" show-overflow-tooltip>
<template #default="scope">{{ scope.row.place }}</template> <template #default="scope">{{ scope.row.place }}</template>
</el-table-column> </el-table-column>
@ -103,12 +82,9 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" align="left" width="180"> <el-table-column label="操作" fixed="right" align="left" width="180">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="table_record(scope.row)" v-auth="'einspect.create'"> <el-button link type="success" @click="table_print(scope.row)">打印</el-button>
巡检 <el-button link type="primary" @click="table_record(scope.row)" v-auth="'einspect.create'">巡检</el-button>
</el-button> <el-button link type="warning" @click="table_edit(scope.row)" v-auth="'equipment.update'">编辑</el-button>
<el-button link type="warning" @click="table_edit(scope.row)" v-auth="'equipment.update'">
编辑
</el-button>
<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row)" v-auth="'equipment.delete'"> <el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row)" v-auth="'equipment.delete'">
<template #reference> <template #reference>
<el-button link type="danger">删除</el-button> <el-button link type="danger">删除</el-button>
@ -187,21 +163,6 @@
<ehsUserSelect :multiple="false" @submit="getReceptionist" /> <ehsUserSelect :multiple="false" @submit="getReceptionist" />
</span> </span>
</el-form-item> </el-form-item>
<!-- <el-form-item label="巡检人" prop="inspect_user">
<el-select
v-model="form.inspect_user"
placeholder="巡检人"
clearable
style="width:100%"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item> -->
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="巡检结果" prop="result"> <el-form-item label="巡检结果" prop="result">
@ -269,12 +230,6 @@ export default {
emitPath: false, emitPath: false,
checkStrictly: true, checkStrictly: true,
}, },
// stateOptions: [
// { label: '完好', value: 10 },
// { label: '限用', value: 20 },
// { label: '在修', value: 30 },
// { label: '禁用', value: 40 },
// ],
results_: { results_: {
'pass': '正常', 'pass': '正常',
'fail': '异常', 'fail': '异常',
@ -291,7 +246,8 @@ export default {
item: {}, item: {},
visible: false, visible: false,
visibleRecord: false, visibleRecord: false,
excelName: '' excelName: '',
printer_name:localStorage.getItem("printer_name"),
}; };
}, },
mounted() { mounted() {
@ -401,7 +357,22 @@ export default {
return err; return err;
}); });
}, },
table_print(row){
let that = this;
let params = {},data={};
data.name = row.name;
data.number = row.number;
params.data = data;
params.label_template_name = '设备打印模板';
that.$API.cm.labeltemplate.commands.req(params).then((res) => {
let obj = {};
obj.printer_commands = res.commands;
obj.printer_name = that.printer_name;
that.$API.wpm.prints.req(obj).then((response) => {
that.$message.success("打印成功");
});
});
},
//本地更新数据 //本地更新数据
handleSaveSuccess(data, mode) { handleSaveSuccess(data, mode) {
this.$refs.table.refresh(); this.$refs.table.refresh();

83
src/views/inm/helpso.vue
View File

@ -2,6 +2,12 @@
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button
type="primary"
:disabled = 'dLoading'
icon="el-icon-download"
@click="exportList"
>导出</el-button>
</div> </div>
<div class="right-panel"> <div class="right-panel">
<el-input <el-input
@ -120,6 +126,9 @@
</el-container> </el-container>
</template> </template>
<script> <script>
import * as XLSX2 from "xlsx";
import * as XLSX from "xlsx-style";
import printDialog from "./../template/printmaterial.vue"; import printDialog from "./../template/printmaterial.vue";
export default { export default {
name: "materials", name: "materials",
@ -135,6 +144,8 @@ export default {
query: {}, query: {},
warehouseOptions: [], warehouseOptions: [],
wmtype:0, wmtype:0,
ElLoading:null,
dLoading:false,
print_m:false, print_m:false,
materialsVisible:false, materialsVisible:false,
apiObjPrint:this.$API.cm.labelmat.fromMb, apiObjPrint:this.$API.cm.labelmat.fromMb,
@ -182,6 +193,78 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.printmaterial.open(); this.$refs.printmaterial.open();
}) })
},
exportList(){
let that = this;
that.dLoading = true;
let chartName = '辅料表';
let titleData = ['辅料表'];
let tipsData = ['日期','物料编号','物料名称','货位号','规格','品牌型号','单位','安全库存','数量','单价','总金额'];
let tableData = [];
tableData.push(titleData)
tableData.push(tipsData)
that.ElLoading = this.$loading({
lock: true,
text: '数据请求中，请稍后...',
background: 'rgba(0, 0, 0, 0)',
})
that.$API.inm.warehouse.batch.req({ page: 0, count__gte: 1, material__type__in: "40" }).then((res) => {
res.forEach(item => {
let data0 = [];
let total = Number(item.material_.unit_price)*Number(item.count);
data0.push(item.update_time);
data0.push(item.material_.number);
data0.push(item.material_.name);
data0.push(item.material_.bin_number_main);
data0.push(item.material_.specification);
data0.push(item.material_.model);
data0.push(item.material_.unit);
data0.push(item.material_.count_safe);
data0.push(item.count);
data0.push(item.material_.unit_price);
data0.push(total);
tableData.push(data0);
})
let ws = XLSX2.utils.aoa_to_sheet(tableData);
let wb = XLSX2.utils.book_new();
XLSX2.utils.book_append_sheet(wb, ws, chartName);
var wopts = {
bookType: 'xlsx',
bookSST: false,
type: 'binary'
};
var wbout = XLSX.write(wb, wopts);
var blob = new Blob([this.s2ab(wbout)], {
type: "application/octet-stream"
});
this.openDownloadDialog(blob, chartName+`.xlsx`);
that.dLoading = false;
that.ElLoading.close();
}).catch(res=>{
that.dLoading = false;
that.ElLoading.close();
})
},
s2ab(s) {
var buf = new ArrayBuffer(s.length);
var view = new Uint8Array(buf);
for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
return buf;
},
openDownloadDialog(url, saveName) {
if (typeof url == 'object' && url instanceof Blob) {
url = URL.createObjectURL(url); // 创建blob地址
}
var aLink = document.createElement('a');
aLink.href = url;
aLink.download = saveName || ''; // HTML5新增的属性，指定保存文件名，可以不要后缀，注意，file:///模式下不会生效
var event;
if (window.MouseEvent) event = new MouseEvent('click');
else {
event = document.createEvent('MouseEvents');
event.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
}
aLink.dispatchEvent(event);
}, },
}, },
}; };

44
src/views/ofm/booking_form.vue
View File

@ -7,13 +7,15 @@
ref="addForm" ref="addForm"
label-width="100px" label-width="100px"
> >
<el-form-item label="标题" prop="title">
<el-input v-model="form.title" clearable></el-input>
</el-form-item>
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="会议名称" prop="title">
<el-input v-model="form.title" clearable placeholder="请输入会议名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="会议室" prop="mroom"> <el-form-item label="会议室" prop="mroom">
<el-select v-model="form.mroom" placeholder="请选择" @change="mRoomChange" style="width: 100%;"> <el-select v-model="form.mroom" placeholder="请选择会议室" @change="mRoomChange" style="width: 100%;">
<el-option <el-option
v-for="item in mRoomList" v-for="item in mRoomList"
:key="item.id" :key="item.id"
@ -24,8 +26,23 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="时间" prop="mdate"> <el-form-item label="参会领导" prop="key_participants">
<el-date-picker v-model="form.mdate" type="date" value-format="YYYY-MM-DD" style="width: 100%;"/> <el-input v-model="form.key_participants" clearable placeholder="请输入参会领导"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="会议人数" prop="participant_count">
<el-input-number v-model="form.participant_count" clearable style="width: 100%;" :precision="0" :step="1" min="1"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="会议时间" prop="mdate">
<el-date-picker v-model="form.mdate" type="date" value-format="YYYY-MM-DD" style="width: 100%;" placeholder="请选择会议时间"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注">
<el-input v-model="form.title" clearable placeholder="备注"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -41,7 +58,7 @@
:workflow_key="'booking'" :workflow_key="'booking'"
:title="bookingTitle" :title="bookingTitle"
:t_id="form.id" :t_id="form.id"
:ticketId="form.ticket" :ticket_="form.ticket_"
@success="()=>{$emit('success')}" @success="()=>{$emit('success')}"
:submit_b_func="submit_b_func" :submit_b_func="submit_b_func"
ref="ticketd_b_start" ref="ticketd_b_start"
@ -50,7 +67,7 @@
</el-footer> </el-footer>
</el-main> </el-main>
<el-aside width="20%" v-if="form.ticket"> <el-aside width="20%" v-if="form.ticket">
<ticketd :ticket_full_data="form.ticket_" @success="$emit('success')"></ticketd> <ticketd :ticket_="form.ticket_" @success="$emit('success')"></ticketd>
</el-aside> </el-aside>
</el-container> </el-container>
</template> </template>
@ -98,11 +115,15 @@ export default {
}, },
//表单数据 //表单数据
form: { form: {
note: "",
mroom: "", mroom: "",
mdate: "", mdate: "",
title: "", title: "",
slots: [], slots: [],
ticket_: null ticket_: null,
belong_dept: "",
participant_count: 0,
key_participants: "",
}, },
//验证规则 //验证规则
rules: { rules: {
@ -168,7 +189,10 @@ export default {
let that = this; let that = this;
that.getmRoomList(); that.getmRoomList();
that.getTid(); that.getTid();
if(that.type=='edit'){ if(that.type=='add'){
that.form.belong_dept = that.$TOOL.data.get("USER_INFO").dept_id;
}
if(that.type=='edit'||that.type=='show'){
that.form = that.bookingIitem; that.form = that.bookingIitem;
that.mroomName = that.bookingIitem.mroom_name; that.mroomName = that.bookingIitem.mroom_name;
that.bookingTitle = that.mroomName+"预定"; that.bookingTitle = that.mroomName+"预定";

20
src/views/ofm/mroombooking.vue
View File

@ -45,6 +45,13 @@
link link
size="small" size="small"
type="primary" type="primary"
@click="handleShow(scope.row)"
>查看</el-button>
<el-button
link
size="small"
type="primary"
v-if="scope.row.ticket_.state_.type==1"
@click="handleEidt(scope.row)" @click="handleEidt(scope.row)"
>编辑</el-button> >编辑</el-button>
<el-popconfirm title="确定删除吗？" @confirm="handleDel(scope.row)"> <el-popconfirm title="确定删除吗？" @confirm="handleDel(scope.row)">
@ -63,7 +70,7 @@
:editId="editId" :editId="editId"
:bookingIitem="bookingIitem" :bookingIitem="bookingIitem"
@success="handleSuccess" @success="handleSuccess"
@cancel="handleCancel" @closed="handleCancel"
></bookingDialog> ></bookingDialog>
</el-drawer> </el-drawer>
</template> </template>
@ -107,6 +114,10 @@ export default {
handleCancel() { handleCancel() {
this.limitedVisible = false; this.limitedVisible = false;
}, },
handleSuccess(){
this.$refs.table.refresh();
this.limitedVisible = false;
},
handleEidt(row) { handleEidt(row) {
let that = this; let that = this;
that.type = "edit"; that.type = "edit";
@ -114,6 +125,13 @@ export default {
that.bookingIitem = row; that.bookingIitem = row;
that.limitedVisible = true; that.limitedVisible = true;
}, },
handleShow(row){
let that = this;
that.type = "show";
that.editId = row.id;
that.bookingIitem = row;
that.limitedVisible = true;
},
async handleDel(row) { async handleDel(row) {
var id = row.id; var id = row.id;
var res = await this.$API.ofm.mroombooking.delete.req(id); var res = await this.$API.ofm.mroombooking.delete.req(id);

4
src/views/statistics/bxerp/maopi.vue
View File

@ -173,8 +173,8 @@ export default {
data() { data() {
return { return {
params: { params: {
ordering:'-data__毛坯检测_小日期', ordering:'data__毛坯检测_批次号,-data__毛坯检测_小日期,number_prefix,number_suffix',
ordering:'data__毛坯检测_批次号', annotate_field_list:["number_prefix", "number_suffix"],
querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]], querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"毛坯检测_批次号"}]],
}, },
query:{ query:{

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

@ -48,24 +48,24 @@
<el-table-column label="放大率￠2mm" align="center" class-name="colorheader1"> <el-table-column label="放大率￠2mm" align="center" class-name="colorheader1">
<el-table-column label="合格数" class-name="colorheader1"> <el-table-column label="合格数" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['毛坯检测_缺陷_放大率￠2mm不合格']?scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_放大率￠2mm不合格']:scope.row.data.毛坯检测_count_use }}</span> <span>{{ scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格']?scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格']:scope.row.data.毛坯检测_count_use }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合格率" class-name="colorheader1"> <el-table-column label="合格率" class-name="colorheader1">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['毛坯检测_缺陷_放大率￠2mm不合格_比例']?100-scope.row.data['毛坯检测_缺陷_放大率￠2mm不合格_比例']:100 }}%</span> <span>{{ scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格_比例']?100-scope.row.data['毛坯检测_含缺陷_放大率￠2mm不合格_比例']:100 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="放大率￠16mm" align="center" class-name="colorheader2"> <el-table-column label="放大率￠16mm" align="center" class-name="colorheader2">
<el-table-column label="合格数" class-name="colorheader2"> <el-table-column label="合格数" class-name="colorheader2">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['毛坯检测_缺陷_放大率￠16mm不合格']?scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_放大率￠16mm不合格']:scope.row.data.毛坯检测_count_use }}</span> <span>{{ scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格']?scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格']:scope.row.data.毛坯检测_count_use }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合格率" class-name="colorheader2"> <el-table-column label="合格率" class-name="colorheader2">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['毛坯检测_缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['毛坯检测_缺陷_放大率￠16mm不合格_比例']:100 }}%</span> <span>{{ scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格_比例']?100-scope.row.data['毛坯检测_含缺陷_放大率￠16mm不合格_比例']:100 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -73,80 +73,80 @@
<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可加工']">{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm不合格']-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工'] }}</span> <span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工']">{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格']-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工'] }}</span>
<span v-else>{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm不合格']}}</span> <span v-else>{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm不合格']}}</span>
</span> </span>
<span v-else> <span v-else>
<span v-if="scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工']">{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工'] }}</span> <span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工']">{{ scope.row.data.毛坯检测_count_use-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工'] }}</span>
<span v-else>{{ scope.row.data.毛坯检测_count_use }}</span> <span v-else>{{ scope.row.data.毛坯检测_count_use }}</span>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<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>
<span v-if="scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例']">{{ 100-scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例'] }}%</span> <span v-if="scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']">{{ 100-scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例'] }}%</span>
<span v-else>100%</span> <span v-else>100%</span>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="可加工" class-name="colorheader3"> <el-table-column label="可加工" class-name="colorheader3">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工']?scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工']:0 }}</span> <span>{{ scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工']?scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工']:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="加工率" class-name="colorheader3"> <el-table-column label="加工率" class-name="colorheader3">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例']?scope.row.data['毛坯检测_缺陷_剪切￠18.3mm可加工_比例']:0 }}%</span> <span>{{ scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']?scope.row.data['毛坯检测_含缺陷_剪切￠18.3mm可加工_比例']:0 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="暗点" align="center" class-name="colorheader4"> <el-table-column label="暗点" align="center" class-name="colorheader4">
<el-table-column label="内标数" class-name="colorheader4"> <el-table-column label="内标数" class-name="colorheader4">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.毛坯检测_缺陷_暗点不合格?scope.row.data.毛坯检测_count_use-scope.row.data.毛坯检测_缺陷_暗点不合格:scope.row.data.毛坯检测_count_use }}</span> <span>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格?scope.row.data.毛坯检测_count_use-scope.row.data.毛坯检测_含缺陷_暗点不合格:scope.row.data.毛坯检测_count_use }}</span>
</template> </template>
</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>{{ scope.row.data.毛坯检测_缺陷_暗点不合格_比例?100-scope.row.data.毛坯检测_缺陷_暗点不合格_比例:100 }}%</span> <span>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?100-scope.row.data.毛坯检测_含缺陷_暗点不合格_比例:100 }}%</span>
</template> </template>
</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>{{ scope.row.data.毛坯检测_缺陷_暗点不合格?scope.row.data.毛坯检测_缺陷_暗点不合格:0 }}</span> <span>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格?scope.row.data.毛坯检测_含缺陷_暗点不合格:0 }}</span>
</template> </template>
</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>{{ scope.row.data.毛坯检测_缺陷_暗点不合格_比例?scope.row.data.毛坯检测_缺陷_暗点不合格_比例:0 }}%</span> <span>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?scope.row.data.毛坯检测_含缺陷_暗点不合格_比例:0 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="崩炸" align="center" class-name="colorheader5"> <el-table-column label="崩炸" align="center" class-name="colorheader5">
<el-table-column label="崩" align="center" class-name="colorheader5"> <el-table-column label="崩" align="center" class-name="colorheader5">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.毛坯检测_缺陷_崩?scope.row.data.毛坯检测_缺陷_崩:0 }}</span> <span>{{ scope.row.data.毛坯检测_含缺陷_崩?scope.row.data.毛坯检测_含缺陷_崩:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合格率" align="center" class-name="colorheader5"> <el-table-column label="合格率" align="center" class-name="colorheader5">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.毛坯检测_缺陷_崩_比例?100-scope.row.data.毛坯检测_缺陷_崩_比例:100 }}%</span> <span>{{ scope.row.data.毛坯检测_含缺陷_崩_比例?100-scope.row.data.毛坯检测_含缺陷_崩_比例:100 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="炸废" align="center" class-name="colorheader5"> <el-table-column label="炸废" align="center" class-name="colorheader5">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.毛坯检测_缺陷_炸废?scope.row.data.毛坯检测_缺陷_炸废:0 }}</span> <span>{{ scope.row.data.毛坯检测_含缺陷_炸废?scope.row.data.毛坯检测_含缺陷_炸废:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合格率" align="center" class-name="colorheader5"> <el-table-column label="合格率" align="center" class-name="colorheader5">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.毛坯检测_缺陷_炸废_比例?100-scope.row.data.毛坯检测_缺陷_炸废_比例:100 }}%</span> <span>{{ scope.row.data.毛坯检测_含缺陷_炸废_比例?100-scope.row.data.毛坯检测_含缺陷_炸废_比例:100 }}%</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -164,16 +164,16 @@
</el-table-column> </el-table-column>
<el-table-column label="长点试加工数" align="center" class-name="colorheader7"> <el-table-column label="长点试加工数" align="center" class-name="colorheader7">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.毛坯检测_缺陷_暗点不合格?scope.row.data.毛坯检测_缺陷_暗点不合格:0 }}</span> <span>{{ scope.row.data.毛坯检测_含缺陷_暗点不合格?scope.row.data.毛坯检测_含缺陷_暗点不合格:0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外形偏(0.5mm)" align="center" class-name="colorheader1"> <el-table-column label="外形偏(0.5mm)" align="center" class-name="colorheader1">
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" class-name="colorheader3"> <!-- <el-table-column label="备注" align="center" class-name="colorheader3">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.data.毛坯检测_缺陷_备注 }}</span> <span>{{ scope.row.data.毛坯检测_含缺陷_备注 }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
</scTable> </scTable>
</el-main> </el-main>
</el-container> </el-container>

1
src/views/wpm_bx/handover_form.vue
View File

@ -672,6 +672,7 @@ export default {
if(that.mtype==30){ if(that.mtype==30){
that.form.recive_mgroup = that.form.send_mgroup; that.form.recive_mgroup = that.form.send_mgroup;
} }
that.form.mtype=that.mtype;
//合批、分批、报废，这三个交接操作直接创建并提交 //合批、分批、报废，这三个交接操作直接创建并提交
if(that.mtype==20||that.mtype==30||that.type==40){ if(that.mtype==20||that.mtype==30||that.type==40){
that.$API.wpm.handover.createsubmit.req(that.form).then((res) => { that.$API.wpm.handover.createsubmit.req(that.form).then((res) => {

69
src/views/wpm_bx/mlogbw_check.vue
View File

@ -41,12 +41,10 @@
@selectAllChange="selectAllChange" @selectAllChange="selectAllChange"
@add="rowAdd" @add="rowAdd"
> >
<!-- <el-table-column prop="number" fixed type="selection"></el-table-column> -->
<el-table-column prop="number" label="物料编号" fixed min-width="80px"> <el-table-column prop="number" label="物料编号" fixed min-width="80px">
<template #default="scope"> <template #default="scope">
<span v-if="mode == 'outs'">{{ scope.row.number }}</span> <span v-if="mode == 'outs'">{{ scope.row.number }}</span>
<span v-if="mode == 'outs'&&scope.row.wpr_number_out!==null&&scope.row.wpr_number_out!==undefined">——{{ scope.row.wpr_number_out }}</span> <span v-if="mode == 'outs'&&scope.row.wpr_number_out!==null&&scope.row.wpr_number_out!==undefined">——{{ scope.row.wpr_number_out }}</span>
<!-- <el-input v-if="scope.row.isEdit&&mode == 'outs'" v-model="scope.row.number" placeholder="物料编号"></el-input> -->
<el-select <el-select
v-if="scope.row.isEdit&&mode == 'ins'&&route_code!=='niuzhuan'" v-if="scope.row.isEdit&&mode == 'ins'&&route_code!=='niuzhuan'"
v-model="scope.row.wpr" v-model="scope.row.wpr"
@ -73,12 +71,14 @@
placeholder="生产设备" placeholder="生产设备"
clearable clearable
filterable filterable
style="width: 100%" remote = "true"
default-first-option = "true"
style="width: 50%"
> >
<el-option <el-option
v-for="item in optionsEq" v-for="item in optionsEq"
:key="item.id" :key="item.id"
:label="item.name" :label="item.number"
:value="item.id" :value="item.id"
> >
<span style="float:left">{{item.name}}</span> <span style="float:left">{{item.name}}</span>
@ -94,13 +94,14 @@
v-if="scope.row.isEdit" v-if="scope.row.isEdit"
v-model="scope.row.work_start_time" v-model="scope.row.work_start_time"
type="datetime" type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm"
formatter="YYYY-MM-DD" formatter="YYYY-MM-DD HH:mm"
style="width: 100%;" style="width: 100%;"
popper-append-to-body popper-append-to-body
@change = "timeChange(scope.row)"
/> />
<div v-else> <div v-else>
<span v-if="scope.row.work_start_time!==null">{{ scope.row.work_start_time.split(' ')[0]}}</span> <span v-if="scope.row.work_start_time!==null">{{ scope.row.work_start_time}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -914,7 +915,8 @@ export default {
let date = new Date(); let date = new Date();
if(that.mlogbwlist[index].work_start_time==''||that.mlogbwlist[index].work_start_time==null){ if(that.mlogbwlist[index].work_start_time==''||that.mlogbwlist[index].work_start_time==null){
that.mlogbwlist[index].work_start_time = that.$TOOL.dateFormat(date, 'yyyy-MM-dd hh:mm:ss'); that.mlogbwlist[index].work_start_time = that.$TOOL.dateFormat(date, 'yyyy-MM-dd hh:mm:ss');
} that.timeChange(that.mlogbwlist[index]);
}else{}
} }
}); });
}, },
@ -1177,21 +1179,6 @@ export default {
}).catch((err) => { }).catch((err) => {
return err; return err;
}); });
// let retryCount = 0;
// let MAX_RETRIES = 3;
// that.$API.em.cd.req({method:that.setForm.cd_req_addr}).then((res) => {
// that.qct_testitems.forEach(item0 => {
// if(item0.testitem_cd_expr!=null){
// that.mlogbwlist[0][item0.testitem_name]= eval(item0.testitem_cd_expr);
// }
// })
// }).catch((err) => {
// if (retryCount < MAX_RETRIES) {
// retryCount++;
// that.getEqData(); // 递归调用
// }
// return err;
// });
}, },
wprChange(wprNumber){ wprChange(wprNumber){
let that = this; let that = this;
@ -1210,6 +1197,42 @@ export default {
} }
}); });
}, },
equipRemoteMethod(row){
let that = this;
console.log('row',row);
console.log('scope.row.equip',row.equip);
},
timeChange(row){
let that = this;
let index = that.mlogbwlist.indexOf(row);
let waveNum = 1;
let hours =Number(row.work_start_time.split(" ")[1].split(":")[0]);
let minutes =Number(row.work_start_time.split(" ")[1].split(":")[1]) ;
console.log('hours',hours);
console.log('minutes',minutes);
if((hours==0&&minutes>29)||hours==1||(hours==2&&minutes<30)){
waveNum = 9;
}else if((hours==2&&minutes>29)||hours==3||(hours==4&&minutes<30)){
waveNum = 10;
}else if(hours==7||hours==8){
waveNum = 1;
}else if(hours==9||hours==10){
waveNum = 2;
}else if(hours==11||hours==12){
waveNum = 3;
}else if((hours==13&&minutes>29)||hours==14||(hours==15&&minutes<30)){
waveNum = 4;
}else if((hours==15&&minutes>29)||hours==16||(hours==17&&minutes<30)){
waveNum = 5;
}else if(hours==18||hours==19){
waveNum = 6;
}else if(hours==20||hours==21){
waveNum = 7;
}else if(hours==22||hours==23){
waveNum = 8;
}
that.mlogbwlist[index].波数 = waveNum;
},
saveSetting(){ saveSetting(){
let that = this; let that = this;
that.$refs.dialogForm.validate((valid) => { that.$refs.dialogForm.validate((valid) => {

10
src/views/wpm_gx/handover_form.vue
View File

@ -179,7 +179,9 @@
:accept="['.xlsx', '.xls']" :accept="['.xlsx', '.xls']"
@success = "fileUPSuccess" @success = "fileUPSuccess"
> >
<el-button type="primary" icon="el-icon-upload"> </el-button> <el-button type="primary" icon="el-icon-upload" v-if="mode!=='show'"> </el-button>
<br/>
<el-link v-if="mode!=='add'&&form.oinfo_json" :href="form.oinfo_json.test_file" type="primary" target="_blank">{{form.oinfo_json.test_file}}</el-link>
</sc-upload-file> </sc-upload-file>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -615,6 +617,12 @@ export default {
console.log('交接记录查看',data) console.log('交接记录查看',data)
let that = this; let that = this;
Object.assign(this.form, data); Object.assign(this.form, data);
let obj = {};
if(data.oinfo_json&&data.oinfo_json.test_file){
obj.name=data.oinfo_json.test_file;
obj.url=data.oinfo_json.test_file;
this.fileList.push(obj);
}
that.totalCount = 0; that.totalCount = 0;
that.form.handoverb = data.handoverb; that.form.handoverb = data.handoverb;
data.handoverb.forEach(item=>{ data.handoverb.forEach(item=>{