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

fix: 解决冲突

This commit is contained in:
caoqianming 2023-11-06 19:19:07 +08:00
parent 6c4b1f75d1 d7c0fa0843
commit 024301c294
11 changed files with 997 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/App.vue
View File

@ -119,4 +119,15 @@ export default {
#table1.el-table th.el-table__cell.is-leaf {
background: rgba(0, 0, 0, 0);
}
</style>
.el-calendar-table .el-calendar-day {
height: 43px !important;
}
.el-calendar {
border-radius: 15px;
}
.el-calendar>.el-calendar__body {
padding: 0 20px 20px;
}</style>

8
src/api/model/inm.js
View File

@ -130,5 +130,13 @@ export default {
`${config.API_URL}/inm/mioitem/${id}/`);
}
},
test: {
name: "检验",
req: async function(id,data){
return await http.post(
`${config.API_URL}/inm/mioitem/${id}/test/`,
data);
}
},
}
}

42
src/api/model/qm.js
View File

@ -79,5 +79,47 @@ export default {
}
}
},
ptest: {
list: {
name: "检验列表",
req: async function(data){
return await http.get(
`${config.API_URL}/qm/ptest/`,
data
);
}
},
item: {
name: "检验",
req: async function(id){
return await http.get(
`${config.API_URL}/qm/ptest/${id}/`
);
}
},
update: {
name: "更新检验",
req: async function(id, data){
return await http.put(
`${config.API_URL}/qm/ptest/${id}/`,
data);
}
},
create: {
name: "创建检验",
req: async function(data){
return await http.post(
`${config.API_URL}/qm/ptest/`,
data);
}
},
delete: {
name: "删除检验",
req: async function(id){
return await http.delete(
`${config.API_URL}/qm/ptest/${id}/`);
}
}
},
}

140
src/views/home/widgets/index_photon.vue
View File

@ -18,29 +18,29 @@
</div>
<div style="padding-top: 20px;display: flex;">
<div class="countItem">
<div class="countname">预制棒总产量</div>
<div class="countname">预制棒合格数</div>
<p class="countnum">6700</p>
<p class="countrate">同比上周<span class="redColor"> 8.63%▲</span></p>
<p class="countrate">同比前天<span class="redColor"> 8.63%▲</span></p>
</div>
<div class="countItem">
<div class="countname">管料产量</div>
<div class="countname">预制管合格数</div>
<p class="countnum">6700</p>
<p class="countrate">同比上周<span class="redColor"> 8.63%▲</span></p>
<p class="countrate">同比前天<span class="redColor"> 8.63%▲</span></p>
</div>
<div class="countItem">
<div class="countname">芯料产量</div>
<div class="countname">AVG合格数</div>
<p class="countnum">6700</p>
<p class="countrate">同比上周<span class="greenColor"> 8.63%▼</span></p>
<p class="countrate">同比前天<span class="greenColor"> 8.63%▼</span></p>
</div>
<div class="countItem">
<div class="countname">在制任务</div>
<div class="countname">预制棒管交付数</div>
<p class="countnum">6700</p>
<p class="countrate"></p>
<p class="countrate">同比前天<span class="redColor"> 8.63%▲</span></p>
</div>
<div class="countItem">
<div class="countname">交付产品</div>
<div class="countname">AVG交付数</div>
<p class="countnum">6700</p>
<p class="countrate"></p>
<p class="countrate">同比前天<span class="redColor"> 8.63%▲</span></p>
</div>
</div>
</div>
@ -49,20 +49,29 @@
<div class="retangle middleRetangle">
<div style="padding: 20px 0;display: flex;">
<div class="middleItem">
<div class="countname">在制任务</div>
<p class="countnum">189762670</p>
<div class="countname">本月累积交付数</div>
<div style="display: flex;justify-content: space-around;padding-top: 25px;font-size: 20px;">
<div>
<div>预制棒</div>
<p class="countnum">6700</p>
</div>
<div>
<div>预制棒</div>
<p class="countnum">6700</p>
</div>
</div>
</div>
<div class="middleItem" style="display: flex;">
<el-progress type="circle" :stroke-width="15" :show-text="false" :percentage="25" />
<div style="margin-left: 20px;">
<div class="countname">预制棒总产量</div>
<div class="countname">预制棒合格率</div>
<p class="countnum">80%</p>
</div>
</div>
<div class="middleItem" style="display: flex;">
<el-progress type="circle" :stroke-width="15" :show-text="false" :percentage="25" />
<div style="margin-left: 20px;">
<div class="countname">管料产量</div>
<div class="countname">预制管合格率</div>
<p class="countnum">80%</p>
<p class="countrate">同比上周 8.63%</p>
</div>
@ -70,8 +79,8 @@
<div class="middleItem" style="display: flex;">
<el-progress type="circle" :stroke-width="15" :show-text="false" :percentage="25" />
<div style="margin-left: 20px;">
<div class="countname">芯料产量</div>
<p class="countnum">70%</p>
<div class="countname">AVG合格率</div>
<p class="countnum">80%</p>
<p class="countrate">同比上周 8.63%</p>
</div>
</div>
@ -79,27 +88,46 @@
</div>
</div>
<el-row>
<el-col :span="7">
<div class="retangleWrap">
<el-col :span="14">
<div class="retangleWrap" style="padding-right: 0;">
<div class="retangle bottomRetangle">
<div style="display: flex;justify-content: space-between;padding: 0 24px;">
<div style="color: rgb(30, 30, 30);font-size: 16px;font-weight: 400;line-height: 24px;">月度趋势</div>
<div style="color: rgb(30, 30, 30);font-size: 16px;font-weight: 400;line-height: 24px;">本月生产合格趋势</div>
<div style="color: rgb(122, 121, 121);size: 12px;font-weight: 290;line-height: 22px;">...</div>
</div>
<div style="padding: 20px 24px 0 24px;background: #ffffff;">
<div class="bottomItem">
<div class="countname">本月完成情况</div>
<p class="countnum">45.82%</p>
<p class="countrate">同比上周<span class="redColor"> 8.63%▲</span> 月同比6.47%</p>
<div id="barCharts" style="width: 100%;height: 200px;"></div>
<div class="countname">本月计划完成度</div>
<p class="countnum">99%</p>
<!-- <p class="countrate">同比上周<span class="redColor"> 8.63%▲</span> 月同比6.47%</p> -->
<div id="barCharts" style="width: 100%;height: 218px;"></div>
</div>
</div>
</div>
</div>
</el-col>
<el-col :span="10">
<div class="retangleWrap retangleWrapTable">
<div class="retangle tableRetangle">
<div style="display: flex;justify-content: space-between;padding: 0 24px;">
<div style="color: rgb(30, 30, 30);font-size: 16px;font-weight: 400;line-height: 24px;">库存情况</div>
</div>
<div style="padding: 20px 24px 24px 24px;">
<el-table :data="tableData" style="width: 100%;height: 285px;">
<el-table-column prop="index" label="序号"/>
<el-table-column prop="number" label="设备编号"/>
<el-table-column prop="name" label="设备名称"/>
<el-table-column prop="state" label="设备状态"/>
</el-table>
</div>
</div>
</div>
</el-col>
</el-row>
<el-row style="margin-bottom: 20px;">
<el-col :span="7">
<div class="retangleWrap">
<div class="retangle bottomRetangle">
<div class="retangleWrap" style="padding-right: 0;">
<!-- <div class="retangle bottomRetangle">
<div style="display: flex;justify-content: space-between;padding: 0 24px;">
<div style="color: rgb(30, 30, 30);font-size: 16px;font-weight: 400;line-height: 24px;">月度趋势</div>
<div style="color: rgb(122, 121, 121);size: 12px;font-weight: 290;line-height: 22px;">...</div>
@ -120,12 +148,12 @@
</div>
</div>
</div>
</div>
<div class="retangle bottomRetangle" style="background: rgb(20,141,255);color:#ffffff;margin-top: 20px;">
</div> -->
<div class="retangle bottomRetangle" style="background: rgb(20,141,255);color:#ffffff;">
<div style="display: flex;justify-content: space-between;padding: 0 24px;">
<div style="font-size: 16px;font-weight: 400;line-height: 24px;">预警提示</div>
</div>
<div style="padding: 20px 24px 24px 24px;">
<div style="padding: 20px 24px 24px 24px;height: 311px;">
<div>
<p>延期任务数量上月同比增加 <span style="font-size: 24px;">10.23%</span></p>
</div>
@ -134,7 +162,7 @@
</div>
</el-col>
<el-col :span="10">
<div class="retangleWrap retangleWrapTable">
<div class="retangleWrap retangleWrapTable" style="padding-right: 0;">
<div class="retangle tableRetangle">
<div style="display: flex;justify-content: space-between;padding: 0 24px;">
<div style="color: rgb(30, 30, 30);font-size: 16px;font-weight: 400;line-height: 24px;">生产设备</div>
@ -150,38 +178,20 @@
</div>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="14">
<el-col :span="7">
<div class="retangleWrap retangleWrapTable">
<div class="retangle tableRetangle">
<div style="display: flex;justify-content: space-between;padding: 0 24px;">
<div style="color: rgb(30, 30, 30);font-size: 16px;font-weight: 400;line-height: 24px;">生产设备</div>
<div style="color: rgb(30, 30, 30);font-size: 16px;font-weight: 400;line-height: 24px;">日历</div>
</div>
<div style="padding: 20px 24px 24px 24px;">
<el-table :data="tableData" style="width: 100%;height: 285px;">
<div style="">
<el-calendar v-model="calendarValue" />
<!-- <el-table :data="tableData" style="width: 100%;height: 285px;">
<el-table-column prop="index" label="序号"/>
<el-table-column prop="number" label="设备编号"/>
<el-table-column prop="name" label="设备名称"/>
<el-table-column prop="state" label="设备状态"/>
</el-table>
</div>
</div>
</div>
</el-col>
<el-col :span="10">
<div class="retangleWrap retangleWrapTable">
<div class="retangle tableRetangle">
<div style="display: flex;justify-content: space-between;padding: 0 24px;">
<div style="color: rgb(30, 30, 30);font-size: 16px;font-weight: 400;line-height: 24px;">生产设备</div>
</div>
<div style="padding: 20px 24px 24px 24px;">
<el-table :data="tableData" style="width: 100%;height: 285px;">
<el-table-column prop="index" label="序号"/>
<el-table-column prop="number" label="设备编号"/>
<el-table-column prop="name" label="设备名称"/>
<el-table-column prop="state" label="设备状态"/>
</el-table>
</el-table> -->
</div>
</div>
</div>
@ -208,7 +218,8 @@ import * as echarts from 'echarts';
{index:2,number: 'GZKJ-02',name: '2号单坩埚熔化炉',state: '完好'},
{index:3,number: 'GZKJ-03',name: '3号单坩埚熔化炉',state: '禁用'},
{index:4,number: 'GZKJ-04',name: '4号单坩埚熔化炉',state: '检修'},
]
],
calendarValue:''
}
},
mounted() {
@ -220,6 +231,7 @@ import * as echarts from 'echarts';
that.year_s = year;
that.month_s = month;
that.initChart();
this.calendarValue = new Date();
},
methods: {
// 动态绑定Class
@ -257,17 +269,18 @@ import * as echarts from 'echarts';
var myChart = echarts.init(dom);
let option = {
grid: { // 图表距离边框的距离，可用百分比和数字（px）配置
top: '10%',
left: '3%',
right: '5%',
top: '5%',
left: '1%',
right: '1%',
bottom: '5%',
containLabel: true
},
xAxis: {
type: 'category',
axisLabel: {
show: false, // X 轴标签文字旋转角度
// show: false, // X 轴标签文字旋转角度
},
data:['1号','2号','3号','4号','5号','6号','7号','8号','9号','10号']
},
yAxis: {
type: 'value',
@ -276,8 +289,12 @@ import * as echarts from 'echarts';
},
},
series: [{
data: [10,9,8,11,12,10,9,10],
type: 'bar'
data: [10,9,8,11,12,10,9,10,8,9,10],
type: 'bar',
barMaxWidth:50,
itemStyle:{
normal:{color:'rgb(20, 141, 255)'}
}
}]
};
myChart.setOption(option, true);
@ -381,7 +398,4 @@ import * as echarts from 'echarts';
box-sizing: border-box;
background: #ffffff;
}
.bottomItem{
}
</style>

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

@ -42,7 +42,10 @@
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="100px">
<template #default="scope">
<el-link type="primary" @click="table_check(scope.row)" >
<el-link type="primary" @click="table_check(scope.row)" v-if="scope.row.test_user==null">
检验
</el-link>
<el-link type="primary" @click="table_check(scope.row)" v-else>
检验
</el-link>
<el-link type="danger" @click="table_del(scope.row)" v-if="mioObj.state == 10">
@ -58,7 +61,7 @@
@success="handleSaveSuccess" @closed="dialog.save = false">
</save-dialog>
<check-dialog v-if="dialog.check" ref="checkDialog"
<check-dialog v-if="dialog.check" ref="checkDialog" :mioitemId="mioitemId"
@success="handleCheckSuccess" @closed="dialog.check = false">
</check-dialog>
</template>
@ -93,6 +96,7 @@ export default {
'other_in': '其他入库',
'other_out': '其他出库',
},
mioitemId:''
};
},
mounted() {
@ -145,6 +149,7 @@ export default {
},
table_check(row){
this.dialog.check = true;
this.mioitemId = row.id;
this.$nextTick(() => {
this.$refs.checkDialog.open("add");
});

197
src/views/inm/mioitem_check.vue
View File

@ -15,22 +15,6 @@
label-width="100px"
>
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="所属部门" prop="belong_dept">
<el-select
v-model="form.belong_dept"
placeholder="所属部门"
clearable style="width:100%"
>
<el-option
v-for="item in deptOptions"
: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="检验日期" prop="test_date">
<el-date-picker
@ -42,10 +26,10 @@
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="操作人" prop="test_user">
<el-form-item label="检验人" prop="test_user">
<el-select
v-model="form.test_user"
placeholder="操作人"
placeholder="检验人"
clearable
style="width:100%"
>
@ -59,77 +43,63 @@
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="专检人" prop="check_user">
<el-select
v-model="form.check_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-row>
<el-table :data="form.ftestitems" border placeholder="暂无数据">
<el-table-column prop="testitem" label="测量项" min-width="100" align="center">
<template #default="scope">
<span>{{ scope.row.testitem }}</span>
</template>
</el-table-column>
<el-table-column prop="test_val" label="操作人测量值" min-width="120" align="center">
<template #default="scope">
<el-input-number v-model="scope.row.test_val" :min="0" style="width:100%" controls-position="right">
<el-form-item label="不合格数" prop="count_notok">
<el-input-number v-model="form.count_notok" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</template>
</el-table-column>
<el-table-column prop="check_val" label="专检人测量值" min-width="120" align="center">
<template #default="scope">
<el-input-number v-model="scope.row.check_val" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</template>
</el-table-column>
</el-table>
<el-row style="margin-top:14px">
<el-col :md="12" :sm="24">
<el-form-item label="检验工序集" prop="test_group">
<el-select
v-model="form.test_group"
placeholder="检验工序集"
multiple
clearable style="width:100%"
>
<el-option
v-for="item in processOptions"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" prop="is_ok">
<el-form-item label="是否合格" prop="is_ok">
<el-select
v-model="form.is_ok"
placeholder="是否合格"
clearable
style="width:100%"
>
<el-option label="是" value="true"/>
<el-option label="否" value="false"/>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="备注">
<el-input v-model="form.note" placeholder="备注"/>
<el-form-item label="炸纹">
<el-input-number v-model="form.count_n_zw" :min="0" style="width:100%" controls-position="right">
</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_tw" :min="0" style="width:100%" controls-position="right">
</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_qp" :min="0" style="width:100%" controls-position="right">
</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_wq" :min="0" style="width:100%" controls-position="right">
</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_dl" :min="0" style="width:100%" controls-position="right">
</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" :min="0" style="width:100%" controls-position="right">
</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" :min="0" style="width:100%" controls-position="right">
</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" :min="0" style="width:100%" controls-position="right">
</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_qt" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</el-form-item>
</el-col>
</el-row>
@ -145,24 +115,17 @@
<script>
export default {
emits: ["success", "closed"],
props: {
mioitemId: { type: String, default: "" },
},
data() {
return {
loading: false,
form: {
ftestitems:[
{testitem:'椭圆度(≤0.02mm)',test_val:'',check_val:''},
{testitem:'锥度(≤0.05mm)',test_val:'',check_val:''},
{testitem:'直径(≥29.0)',test_val:'',check_val:''},
{testitem:'长度(≥455mm)',test_val:'',check_val:''},
],
},
form: {},
rules: {
belong_dept: [{required: true, message: "请选择所属部门", trigger: "blur"}],
test_date: [{required: true, message: "请选择检验日期", trigger: "blur"}],
test_user: [{required: true, message: "请选择操作人", trigger: "blur"}],
check_user: [{required: true, message: "请选择专检人", trigger: "blur"}],
test_group:[{required: true, message: "请选择检测工序集", trigger: "blur"}],
is_ok: [{required: true, message: "请选择是否合格", trigger: "blur"}],
test_user: [{required: true, message: "请选择检验人", trigger: "blur"}],
count_notok: [{required: true, message: "请填写不合格数", trigger: "blur"}],
},
visible: false,
isSaveing: false,
@ -176,28 +139,15 @@ export default {
};
},
mounted() {
this.getProcess();
this.getUserList();
this.getDeptOptions();
},
methods: {
//显示
open(mode = "add",type) {
open(mode = "add") {
this.mode = mode;
this.visible = true;
return this;
},
//获取部门列表
getDeptOptions() {
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
this.deptOptions = [];
res.forEach(item=>{
if(item.parent=='3423856735881117696'){
this.deptOptions.push(item)
}
})
});
},
//获取员工
getUserList(){
let that = this;
@ -205,29 +155,18 @@ export default {
that.userList = res.results;
});
},
getProcess(){
let that = this;
this.$API.mtm.process.list.req({page:0}).then(res=>{
that.processOptions = res;
})
},
//提交
submit() {
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
this.isSaveing = true;
try {
var res;
this.form.test_group = this.form.test_group.join(',')
if (this.mode == "add") {
res = await this.$API.qm.ftest.create.req(this.form);
} else if (this.mode == "edit") {
res = await this.$API.qm.ftest.update.req(this.form.id,this.form);
}
this.isSaveing = false;
this.$emit("success", this.form, this.mode);
this.visible = false;
this.$message.success("操作成功");
this.$API.inm.mioitem.test.req(this.mioitemId,this.form).then(res=>{
this.isSaveing = false;
this.$emit("success");
this.visible = false;
this.$message.success("操作成功");
})
} catch (err) {
//可以处理校验错误
this.isSaveing = false;

124
src/views/qm/behavior.vue
View File

@ -3,11 +3,11 @@
<el-header>
<div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="add">新增</el-button>
<el-button type="primary" icon="el-icon-top" @click="importInspect">上传</el-button>
<!-- <el-button type="primary" icon="el-icon-top" @click="importInspect">上传</el-button> -->
</div>
<div class="right-panel">
<el-date-picker
v-model="query.date"
v-model="query.test_date"
type="date"
value-format="YYYY-MM-DD"
/>
@ -19,32 +19,83 @@
</div>
</el-header>
<el-main class="nopadding">
<el-tabs v-model="activeId" class="demo-tabs" @tab-click="handleClick" type="card">
<el-tab-pane v-for="item in behaviors" v-bind:key="item.id" :label="item.name" :name="item.id">
</el-tab-pane>
</el-tabs>
<!-- <el-radio-group v-model="radio1" class="ml-4">
<el-radio
v-for="item in behaviors"
:key="item.id"
:label="item.id"
size="large"
>
{{ item.name }}
</el-radio>
</el-radio-group> -->
<scTable
ref="table"
:data="tableData"
:apiObj="apiObj"
row-key="id"
stripe
:height="600"
:params="query"
>
<el-table-column type="index" width="50"/>
<el-table-column label="日期" prop="name" show-overflow-tooltip>
<el-table-column label="实验日期" prop="test_date" show-overflow-tooltip>
</el-table-column>
<el-table-column label="检测内容" prop="model">
<el-table-column label="样品编号" prop="sample_number">
</el-table-column>
<el-table-column label="检验员" prop="factory" show-overflow-tooltip>
<el-table-column label="样品厚度/mm" prop="val_hd" v-if="activeName=='透过率'">
</el-table-column>
<el-table-column label="型号规格" prop="specification" v-if="activeName=='中温粘度'||activeName=='膨胀'">
</el-table-column>
<el-table-column label="样品数量" prop="sample_count" v-if="activeName=='析晶'">
</el-table-column>
<el-table-column label="样品密度" prop="sample_density" v-if="activeName=='高温粘度'">
</el-table-column>
<el-table-column label="检验员" prop="test_user" show-overflow-tooltip>
</el-table-column>
<el-table-column label="实验温度及保温时间" prop="sample_number" v-if="activeName=='析晶'">
</el-table-column>
<el-table-column label="升至最高温度/℃" prop="val_zgwd" v-if="activeName=='高温粘度'">
</el-table-column>
<el-table-column label="仪器状态" prop="factory" show-overflow-tooltip>
<template #default="scope">
<el-tag>{{ state_[scope.row.equip_state] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="折射率(589nm)" prop="val_zsl" v-if="activeName=='折射率'">
</el-table-column>
<el-table-column label="透过率(550nm)" prop="val_tgl" v-if="activeName=='透过率'">
</el-table-column>
<el-table-column label="Ts/℃" prop="val_ts" v-if="activeName=='中温粘度'">
</el-table-column>
<el-table-column label="30-300℃膨胀系数" prop="val_pzxs" v-if="activeName=='膨胀'">
</el-table-column>
<el-table-column label="Tg/℃" prop="val_tg" v-if="activeName=='膨胀'">
</el-table-column>
<el-table-column label="Tf/℃" prop="val_tf" v-if="activeName=='膨胀'">
</el-table-column>
<el-table-column label="析晶" prop="val_xj" v-if="activeName=='析晶'">
<template #default="scope">
<el-tag>{{ state_xj[scope.row.val_xj] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template #default="scope">
<el-link type="primary" @click="table_show(scope.row)">查看</el-link>
<el-divider direction="vertical"></el-divider>
<el-link type="danger" @click="table_del(scope.row)">删除</el-link>
<el-divider direction="vertical"></el-divider>
<el-link type="primary" @click="table_edit(scope.row)">下载</el-link>
</template>
</el-table-column>
</scTable>
</el-main>
<el-dialog
<save-dialog v-if="visible" ref="saveDialog" :activeName="activeName" :activeId="activeId"
@success="handleSuccess" @closed="visible = false">
</save-dialog>
<!-- <el-dialog
title="上传"
destroy-on-close
v-model="visible"
@ -52,7 +103,6 @@
>
<el-form ref="dialogForm" :model="form" :rules="rules" label-width="120px">
<el-form-item label="模板文件">
<!-- <el-link :href="scope.row.file_.file" type="primary">{{ }}</el-link> -->
<el-link href="" target="_blank" type="primary" style="margin-right:10px">模板一</el-link>
<el-link href="" target="_blank" type="primary">模板二</el-link>
</el-form-item>
@ -75,24 +125,29 @@
<el-button type="primary" :loading="isSaveing" @click="submitFile">提交</el-button>
<el-button @click="visible = false">取消</el-button>
</el-footer>
</el-dialog>
</el-dialog> -->
</el-container>
</template>
<script>
import saveDialog from './behavior_form.vue';
export default {
name: "rparty",
components:{ saveDialog },
data() {
return {
// apiObj: this.$API.qm.list,
apiObj:null,
apiObj: this.$API.qm.ptest.list,
query: {
page:1,
page_size:20,
type:10
testitem:'3442815297965547520',
test_date:''
},
state_: {
10: '',
20: '',
state_:{
'R':'正常',
'T':'异常'
},
state_xj:{
'S':'析晶',
'K':'不析晶',
'θ':'未化'
},
form:{
file:'',
@ -101,13 +156,38 @@
rules: {
file:[{required:true, message:'请上传上传文件', trigger: "blur"}]
},
visible:true,
activeId:'3442815297965547520',
activeName:'折射率',
visible:false,
isSaveing:false,
selection: [],
behaviors:[],
tableData:[],
};
},
mounted(){
this.getTextItem();
},
methods: {
//获取检验项目
getTextItem(){
let that = this;
that.$API.qm.getTestItem.get({tag:'behavior',page:0}).then(res=>{
that.behaviors = res;
})
},
handleClick(val){
this.activeId = val.props.name;
this.activeName = val.props.label;
this.query.testitem = val.props.name;
this.$refs.table.refresh();
},
add(){
this.visible = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("add");
});
},
importInspect(){
this.visible = true;
},
@ -117,6 +197,10 @@
closeVisible(){
this.visible = false;
},
handleSuccess(){
this.visible = false;
this.$refs.table.refresh();
},
//查看
table_show(row) {

314
src/views/qm/behavior_form.vue Normal file
View File

@ -0,0 +1,314 @@
<template>
<el-dialog
title="性能检验"
v-model="visible"
:size="1000"
destroy-on-close
@closed="$emit('closed')"
>
<el-container v-loading="loading">
<el-main style="padding: 0 20px 20px 20px">
<el-form
ref="dialogForm"
:model="form"
:rules="rules"
label-width="160px"
>
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="检验类型" prop="testitem">
<el-select
v-model="form.testitem"
placeholder="检验类型"
clearable
style="width:100%"
disabled
>
<el-option
v-for="item in behaviors"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="实验日期" prop="test_date">
<el-date-picker
v-model="form.test_date"
type="date"
value-format="YYYY-MM-DD"
style="width:100%"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="样品编号" prop="sample_number">
<el-input v-model="form.sample_number"></el-input>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName=='透过率'">
<el-form-item label="样品厚度/mm" prop="val_hd">
<el-input-number v-model="form.val_hd" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName=='中温粘度'||activeName=='膨胀'">
<el-form-item label="规格型号" prop="specification">
<el-input v-model="form.specification"></el-input>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName=='析晶'">
<el-form-item label="样品数量" prop="sample_count">
<el-input-number v-model="form.sample_count" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName=='高温粘度'">
<el-form-item label="样品密度" prop="sample_density">
<el-input v-model="form.sample_density"></el-input>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="检验员" prop="test_user">
<el-select
v-model="form.test_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 :md="12" :sm="24" v-if="activeName=='析晶'">
<el-form-item label="实验温度及保温时间" prop="sample_density">
<el-input v-model="form.sample_number"></el-input>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName=='高温粘度'">
<el-form-item label="升至最高温度/℃" prop="val_zgwd">
<el-input-number v-model="form.val_zgwd" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="仪器状态" prop="equip_state">
<el-select
v-model="form.equip_state"
placeholder="仪器状态"
clearable style="width:100%"
>
<el-option
v-for="item in stateOptios"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName=='折射率'">
<el-form-item label="折射率(589nm)" prop="val_zsl">
<el-input-number v-model="form.val_zsl" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName=='透过率'">
<el-form-item label="透过率(550nm)" prop="val_tgl">
<el-input-number v-model="form.val_tgl" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName=='中温粘度'">
<el-form-item label="Ts/℃" prop="val_ts">
<el-input-number v-model="form.val_ts" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName=='膨胀'">
<el-form-item label="30-300℃膨胀系数" prop="val_pzxs">
<el-input-number v-model="form.val_pzxs" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName=='膨胀'">
<el-form-item label="Tg/℃" prop="val_tg">
<el-input-number v-model="form.val_tg" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName=='膨胀'">
<el-form-item label="Tf/℃" prop="val_tf">
<el-input-number v-model="form.val_tf" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" v-if="activeName=='析晶'">
<el-form-item label="析晶状态" prop="val_xj">
<el-select
v-model="form.val_xj"
placeholder="析晶状态"
clearable style="width:100%"
>
<el-option
v-for="item in xjOptios"
: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="备注">
<el-input v-model="form.note" placeholder="备注"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-main>
<el-footer>
<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
<el-button @click="visible = false">取消</el-button>
</el-footer>
</el-container>
</el-dialog>
</template>
<script>
export default {
emits: ["success", "closed"],
props: {
activeId: { type: String, default: "" },
activeName: { type: String, default: "" },
},
data() {
return {
loading: false,
form: {
},
rules: {
belong_dept: [{required: true, message: "请选择所属部门", trigger: "blur"}],
test_date: [{required: true, message: "请选择检验日期", trigger: "blur"}],
test_user: [{required: true, message: "请选择操作人", trigger: "blur"}],
check_user: [{required: true, message: "请选择专检人", trigger: "blur"}],
test_group:[{required: true, message: "请选择检测工序集", trigger: "blur"}],
is_ok: [{required: true, message: "请选择是否合格", trigger: "blur"}],
},
stateOptios:[
{id:'R',name:'正常'},
{id:'T',name:'异常'},
],
xjOptios:[
{id:'S',name:'析晶'},
{id:'K',name:'不析晶'},
{id:'θ',name:'未化'},
],
visible: false,
isSaveing: false,
userList:[],
options: [],
processOptions: [],
deptOptions: [],
selectionFilters: [],
setFiltersVisible: false,
belong_dept_options: [],
group: [],
behaviors:[],
};
},
mounted() {
console.log(this.activeId)
console.log(this.activeName)
this.form.testitem = this.activeId;
this.getTextItem();
this.getProcess();
this.getUserList();
this.getDeptOptions();
},
methods: {
//显示
open(mode = "add") {
this.mode = mode;
this.visible = true;
return this;
},
//获取检验项目
getTextItem(){
let that = this;
that.$API.qm.getTestItem.get({tag:'behavior',page:0}).then(res=>{
that.behaviors = res;
})
},
//获取部门列表
getDeptOptions() {
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
this.deptOptions = [];
res.forEach(item=>{
if(item.parent=='3423856735881117696'){
this.deptOptions.push(item)
}
})
});
},
//获取员工
getUserList(){
let that = this;
this.$API.system.user.list.req({page_size:20,page:1}).then(res=>{
that.userList = res.results;
});
},
getProcess(){
let that = this;
this.$API.mtm.process.list.req({page:0}).then(res=>{
that.processOptions = res;
})
},
handleClick(){},
//提交
submit() {
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
this.isSaveing = true;
try {
var res;
if (this.mode == "add") {
res = await this.$API.qm.ptest.create.req(this.form);
} else if (this.mode == "edit") {
res = await this.$API.qm.ptest.update.req(this.form.id,this.form);
}
this.isSaveing = false;
this.$emit("success");
this.visible = false;
this.$message.success("操作成功");
} catch (err) {
//可以处理校验错误
this.isSaveing = false;
return err;
}
}
});
},
//表单注入数据
setData(data) {
Object.assign(this.form, data);
this.form.test_group = this.form.split(',')
},
//设置过滤项
setFilters(filters) {
this.selectionFilters = filters;
this.setFiltersVisible = true;
},
},
};
</script>
<style>
</style>

111
src/views/qm/first.vue
View File

@ -26,70 +26,117 @@
:params="query"
>
<el-table-column type="index" width="50"/>
<el-table-column label="日期" prop="name" show-overflow-tooltip>
<el-table-column label="日期" prop="test_date" show-overflow-tooltip>
</el-table-column>
<el-table-column label="工序" prop="number">
</el-table-column>
<el-table-column label="检测内容" prop="model">
<el-table-column label="检测内容">
<template #default="scope">
<div v-for="item in scope.row.ftestitems" :key="item.id">
{{ item.testitem_description }}
</div>
</template>
</el-table-column>
<el-table-column label="检测标准" prop="factory" show-overflow-tooltip>
<el-table-column label="检测标准" show-overflow-tooltip>
<template #default="scope">
<div v-for="item in scope.row.ftestitems" :key="item.id">
{{ item.testitem_name }}
</div>
</template>
</el-table-column>
<el-table-column label="操作人测量值" prop="production_date">
<template #default="scope">
<div v-for="item in scope.row.ftestitems" :key="item.id">
{{ item.test_val }}
</div>
</template>
</el-table-column>
<el-table-column label="操作人" prop="production_date">
<el-table-column label="操作人" prop="test_user_name">
</el-table-column>
<el-table-column label="专检人测量值" prop="buy_date">
<template #default="scope">
<div v-for="item in scope.row.ftestitems" :key="item.id">
{{ item.check_val }}
</div>
</template>
</el-table-column>
<el-table-column label="专检人" prop="production_date">
<el-table-column label="专检人" prop="check_user_name">
</el-table-column>
<el-table-column label="结论" prop="production_date">
<el-table-column label="结论">
<template #default="scope">
<el-tag v-if="scope.row.is_ok" type="success">
合格
</el-tag>
<el-tag v-else type="warning">
不合格
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="100">
<template #default="scope">
<el-link
type="primary"
@click="table_edit(scope.row)"
>编辑
</el-link>
<el-divider direction="vertical"></el-divider>
<el-link
type="primary"
@click="table_del(scope.row)"
>删除
</el-link>
</template>
</el-table-column>
<!-- <el-table-column label="结论">
<template #default="scope">
<el-tag v-if="scope.row.state===10" type="success">
{{ state_[scope.row.state] }}
</el-tag>
<el-tag v-else-if="scope.row.state===20" type="warning">
{{ state_[scope.row.state] }}
</el-tag>
<el-tag v-else-if="scope.row.state===30">
{{ state_[scope.row.state] }}
</el-tag>
<el-tag v-else type="danger">
{{ state_[scope.row.state] }}
</el-tag>
</template>
</el-table-column> -->
</scTable>
</el-main>
<check-dialog v-if="dialog.check" ref="checkDialog"
@success="handleCheckSuccess" @closed="dialog.check = false">
</check-dialog>
</el-container>
</template>
<script>
import checkDialog from "./first_check.vue";
export default {
name: "rparty",
components: {
checkDialog
},
data() {
return {
dialog: {
check:false
},
// apiObj: this.$API.qm.list,
apiObj:null,
apiObj:this.$API.qm.ftest.list,
query: {
page:1,
page_size:20,
type:10
},
selection: [],
state_: {
10: '',
20: '',
},
selection: []
};
},
methods: {
add(){
this.dialog.check = true;
this.$nextTick(() => {
this.$refs.checkDialog.open("add");
});
},
table_edit(row){
this.dialog.check = true;
this.$nextTick(() => {
this.$refs.checkDialog.open("edit").setData(row);
});
},
table_del(){},
//查看
table_show(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("show",10).setData(row);
});
},
handleCheckSuccess(){
this.$refs.table.refresh();
},
handleQuery() {
this.$refs.table.queryData(this.query)

274
src/views/qm/first_check.vue Normal file
View File

@ -0,0 +1,274 @@
<template>
<el-dialog
title="首件检验"
v-model="visible"
:size="1000"
destroy-on-close
@closed="$emit('closed')"
>
<el-container v-loading="loading">
<el-main style="padding: 0 20px 20px 20px">
<el-form
ref="dialogForm"
:model="form"
:rules="rules"
label-width="100px"
>
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="所属部门" prop="belong_dept">
<el-select
v-model="form.belong_dept"
placeholder="所属部门"
clearable style="width:100%"
>
<el-option
v-for="item in deptOptions"
: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="检验日期" prop="test_date">
<el-date-picker
v-model="form.test_date"
type="date"
value-format="YYYY-MM-DD"
style="width:100%"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="操作人" prop="test_user">
<el-select
v-model="form.test_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 :md="12" :sm="24">
<el-form-item label="专检人" prop="check_user">
<el-select
v-model="form.check_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-row>
<el-table :data="form.ftestitems" border placeholder="暂无数据">
<el-table-column prop="testitem" label="测量项" min-width="100" align="center">
<template #default="scope">
<span>{{ scope.row.testName }}</span>
</template>
</el-table-column>
<el-table-column prop="test_val" label="操作人测量值" min-width="120" align="center">
<template #default="scope">
<el-input-number v-model="scope.row.test_val" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</template>
</el-table-column>
<el-table-column prop="check_val" label="专检人测量值" min-width="120" align="center">
<template #default="scope">
<el-input-number v-model="scope.row.check_val" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</template>
</el-table-column>
</el-table>
<el-row style="margin-top:14px">
<el-col :md="12" :sm="24">
<el-form-item label="检验工序集" prop="test_group">
<el-select
v-model="form.test_group"
placeholder="检验工序集"
multiple
clearable style="width:100%"
>
<el-option
v-for="item in processOptions"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24" prop="is_ok">
<el-form-item label="是否合格" prop="is_ok">
<el-select
v-model="form.is_ok"
placeholder="是否合格"
clearable
style="width:100%"
>
<el-option label="是" value="true"/>
<el-option label="否" value="false"/>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="备注">
<el-input v-model="form.note" placeholder="备注"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-main>
<el-footer>
<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
<el-button @click="visible = false">取消</el-button>
</el-footer>
</el-container>
</el-dialog>
</template>
<script>
export default {
emits: ["success", "closed"],
data() {
return {
loading: false,
form: {
ftestitems:[
// {testitem:'椭圆度(≤0.02mm)',test_val:'',check_val:''},
// {testitem:'锥度(≤0.05mm)',test_val:'',check_val:''},
// {testitem:'直径(≥29.0)',test_val:'',check_val:''},
// {testitem:'长度(≥455mm)',test_val:'',check_val:''},
],
},
rules: {
belong_dept: [{required: true, message: "请选择所属部门", trigger: "blur"}],
test_date: [{required: true, message: "请选择检验日期", trigger: "blur"}],
test_user: [{required: true, message: "请选择操作人", trigger: "blur"}],
check_user: [{required: true, message: "请选择专检人", trigger: "blur"}],
test_group:[{required: true, message: "请选择检测工序集", trigger: "blur"}],
is_ok: [{required: true, message: "请选择是否合格", trigger: "blur"}],
},
visible: false,
isSaveing: false,
userList:[],
options: [],
processOptions: [],
deptOptions: [],
selectionFilters: [],
setFiltersVisible: false,
belong_dept_options: [],
group: [],
};
},
mounted() {
this.getTextItem();
this.getProcess();
this.getUserList();
this.getDeptOptions();
},
methods: {
//显示
open(mode = "add") {
this.mode = mode;
this.visible = true;
return this;
},
//获取检验项目
getTextItem(){
let that = this;
that.$API.qm.getTestItem.get({tag:'first',page:0}).then(res=>{
console.log(res)
let ftestitems = [];
res.forEach(item=>{
let obj = {};
obj.testitem = item.id;
obj.testName = item.name;
obj.test_val = 0;
obj.check_val = 0;
ftestitems.push(obj)
})
console.log(ftestitems)
that.form.ftestitems = ftestitems;
})
},
//获取部门列表
getDeptOptions() {
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
this.deptOptions = [];
res.forEach(item=>{
if(item.parent=='3423856735881117696'){
this.deptOptions.push(item)
}
})
});
},
//获取员工
getUserList(){
let that = this;
this.$API.system.user.list.req({page_size:20,page:1}).then(res=>{
that.userList = res.results;
});
},
getProcess(){
let that = this;
this.$API.mtm.process.list.req({page:0}).then(res=>{
that.processOptions = res;
})
},
//提交
submit() {
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
this.isSaveing = true;
try {
var res;
this.form.test_group = this.form.test_group.join(',')
if (this.mode == "add") {
res = await this.$API.qm.ftest.create.req(this.form);
} else if (this.mode == "edit") {
res = await this.$API.qm.ftest.update.req(this.form.id,this.form);
}
this.isSaveing = false;
this.$emit("success", this.form, this.mode);
this.visible = false;
this.$message.success("操作成功");
} catch (err) {
//可以处理校验错误
this.isSaveing = false;
return err;
}
}
});
},
//表单注入数据
setData(data) {
Object.assign(this.form, data);
this.form.test_group = this.form.split(',')
},
//设置过滤项
setFilters(filters) {
this.selectionFilters = filters;
this.setFiltersVisible = true;
},
},
};
</script>
<style>
</style>

41
src/views/qm/product.vue
View File

@ -26,40 +26,21 @@
:params="query"
>
<el-table-column type="index" width="50"/>
<el-table-column label="日期" prop="name" show-overflow-tooltip>
<el-table-column label="棒编号" prop="name" show-overflow-tooltip>
</el-table-column>
<el-table-column label="工序" prop="number">
<el-table-column label="棒最大外径/mm" prop="number">
</el-table-column>
<el-table-column label="检测内容" prop="model">
<el-table-column label="锥度/mm" prop="model">
</el-table-column>
<el-table-column label="检测标准" prop="factory" show-overflow-tooltip>
<el-table-column label="管编号" prop="factory" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作人测量值" prop="production_date">
<el-table-column label="管最大内径/mm" prop="production_date">
</el-table-column>
<el-table-column label="操作人" prop="production_date">
<el-table-column label="是否合格" prop="production_date">
<template #default="scope">
<el-tag>{{ state_[scope.row.equip_state] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="专检人测量值" prop="buy_date">
</el-table-column>
<el-table-column label="专检人" prop="production_date">
</el-table-column>
<el-table-column label="结论" prop="production_date">
</el-table-column>
<!-- <el-table-column label="结论">
<template #default="scope">
<el-tag v-if="scope.row.state===10" type="success">
{{ state_[scope.row.state] }}
</el-tag>
<el-tag v-else-if="scope.row.state===20" type="warning">
{{ state_[scope.row.state] }}
</el-tag>
<el-tag v-else-if="scope.row.state===30">
{{ state_[scope.row.state] }}
</el-tag>
<el-tag v-else type="danger">
{{ state_[scope.row.state] }}
</el-tag>
</template>
</el-table-column> -->
</scTable>
</el-main>
</el-container>
@ -78,8 +59,8 @@
},
selection: [],
state_: {
10: '',
20: '',
'R': '不合格',
'S': '合格',
},
};
},