Yangwl
/
LJ-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
yangwl
wws 1 year ago
parent 7c147fba2e e29f984876
commit 0ba2ef58be
10 changed files with 606 additions and 262 deletions
Show Stats Download Patch File Download Diff File

13
src/api/quality/checkTypeProject.js
Unescape Escape View File

@ -42,3 +42,16 @@ export function delCheckTypeProject(id) {
method: 'delete'
});
}
//更改状态
export function changeStatus(id,status) {
const data = {
id,
status
}
return request({
url: '/quality/checkTypeProject/changeStatus',
method: 'put',
data: data
});
}

139
src/views/device/faultReport/index.vue
Unescape Escape View File

@ -312,7 +312,7 @@
<el-dialog
:title="title"
:visible.sync="openCheck"
width="1100px"
width="1200px"
append-to-body
v-if="openCheck"
>
@ -362,16 +362,24 @@
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="检查项信息" v-if="checkList != null">
<el-table :data="checkList" border style="width: 100%">
<el-table-column prop="itemName" label="检查项名称" width="200">
<el-table :data="checkList" border style="width: 100%" :span-method="objectSpanMethod">
<el-table-column prop="itemTypeName" label="检查类型" width="100">
</el-table-column>
<el-table-column prop="itemMethod" label="检查项方法" width="160">
<el-table-column prop="itemName" label="检查项名称" width="160">
</el-table-column>
<el-table-column prop="itemMethod" label="方法" width="100">
</el-table-column>
<el-table-column prop="itemTools" label="工具" width="60">
</el-table-column>
<el-table-column prop="standardName" label="标准名称" width="180">
</el-table-column>
<el-table-column prop="standardType" label="标准类型" width="85">
</el-table-column>
<el-table-column prop="detailReach" label="是否达标" width="85">
<el-table-column prop="planLoopType" label="周期" width="50">
</el-table-column>
<el-table-column prop="planLoop" label="次" width="37">
</el-table-column>
<el-table-column prop="detailReach" label="是否达标" width="80">
<template slot-scope="scope">
<dict-tag
:options="dict.type.device_reach_standard"
@ -385,9 +393,9 @@
</el-table-column>
<el-table-column prop="detailDownLimit" label="下限" width="50">
</el-table-column>
<el-table-column prop="detailUnit" label="单位" width="47">
<el-table-column prop="detailUnit" label="单位" width="45">
</el-table-column>
<el-table-column prop="picturePath" label="图片">
<el-table-column prop="picturePath" label="图片" width="60">
<template slot-scope="scope">
<el-popover placement="right" width="300" trigger="hover">
<div class="standardUrl_body">
@ -631,12 +639,12 @@
<el-dialog
:title="title"
:visible.sync="viewCheck"
width="1100px"
width="1200px"
append-to-body
v-if="viewCheck"
>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-tabs type="border-card" :key="new Date().getTime()">
<el-tabs type="border-card">
<el-tab-pane label="基本信息">
<el-descriptions
:column="3"
@ -697,16 +705,24 @@
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="检查项信息" v-if="checkList != null">
<el-table :data="checkList" border style="width: 100%">
<el-table-column prop="itemName" label="检查项名称" width="200">
<el-table :data="checkList" border style="width: 100%" :span-method="objectSpanMethod">
<el-table-column prop="itemTypeName" label="检查类型" width="100">
</el-table-column>
<el-table-column prop="itemName" label="检查项名称" width="160">
</el-table-column>
<el-table-column prop="itemMethod" label="检查项方法" width="160">
<el-table-column prop="itemMethod" label="方法" width="100">
</el-table-column>
<el-table-column prop="itemTools" label="工具" width="60">
</el-table-column>
<el-table-column prop="standardName" label="标准名称" width="180">
</el-table-column>
<el-table-column prop="standardType" label="标准类型" width="85">
</el-table-column>
<el-table-column prop="detailReach" label="是否达标" width="85">
<el-table-column prop="planLoopType" label="周期" width="50">
</el-table-column>
<el-table-column prop="planLoop" label="次" width="37">
</el-table-column>
<el-table-column prop="detailReach" label="是否达标" width="80">
<template slot-scope="scope">
<dict-tag
:options="dict.type.device_reach_standard"
@ -720,9 +736,9 @@
</el-table-column>
<el-table-column prop="detailDownLimit" label="下限" width="50">
</el-table-column>
<el-table-column prop="detailUnit" label="单位" width="47">
<el-table-column prop="detailUnit" label="单位" width="45">
</el-table-column>
<el-table-column prop="picturePath" label="图片">
<el-table-column prop="picturePath" label="图片" width="60">
<template slot-scope="scope">
<el-popover placement="right" width="300" trigger="hover">
<div class="standardUrl_body">
@ -853,7 +869,7 @@
<el-form-item label="设备编码" prop="equipmentCode">
<el-input
v-model="form.equipmentCode"
placeholder="请选择辅助设备"
placeholder="请选择设备编码"
style="width: 200px"
>
<el-button
@ -978,7 +994,7 @@
<el-dialog
:title="title"
:visible.sync="openView"
width="1100px"
width="1200px"
append-to-body
v-if="openView"
>
@ -1028,16 +1044,24 @@
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="检查项信息" v-if="checkList != null">
<el-table :data="checkList" border style="width: 100%">
<el-table-column prop="itemName" label="检查项名称" width="200">
<el-table :data="checkList" border style="width: 100%" :span-method="objectSpanMethod">
<el-table-column prop="itemTypeName" label="检查类型" width="100">
</el-table-column>
<el-table-column prop="itemName" label="检查项名称" width="160">
</el-table-column>
<el-table-column prop="itemMethod" label="检查项方法" width="160">
<el-table-column prop="itemMethod" label="方法" width="100">
</el-table-column>
<el-table-column prop="itemTools" label="工具" width="60">
</el-table-column>
<el-table-column prop="standardName" label="标准名称" width="180">
</el-table-column>
<el-table-column prop="standardType" label="标准类型" width="85">
</el-table-column>
<el-table-column prop="detailReach" label="是否达标" width="85">
<el-table-column prop="planLoopType" label="周期" width="50">
</el-table-column>
<el-table-column prop="planLoop" label="次" width="37">
</el-table-column>
<el-table-column prop="detailReach" label="是否达标" width="80">
<template slot-scope="scope">
<dict-tag
:options="dict.type.device_reach_standard"
@ -1051,9 +1075,9 @@
</el-table-column>
<el-table-column prop="detailDownLimit" label="下限" width="50">
</el-table-column>
<el-table-column prop="detailUnit" label="单位" width="47">
<el-table-column prop="detailUnit" label="单位" width="45">
</el-table-column>
<el-table-column prop="picturePath" label="图片">
<el-table-column prop="picturePath" label="图片" width="60">
<template slot-scope="scope">
<el-popover placement="right" width="300" trigger="hover">
<div class="standardUrl_body">
@ -1453,8 +1477,12 @@ export default {
if (item1 != null) {
item1.standardList.forEach((item) => {
var standard = {};
standard.itemTypeName = item1.itemTypeName;
standard.itemName = item1.itemName;
standard.itemMethod = item1.itemMethod;
standard.itemTools = item1.itemTools;
standard.planLoop = item1.planLoop;
standard.planLoopType = item1.planLoopType;
standard.standardName = item.standardName;
standard.detailUpLimit = item.detailUpLimit;
standard.detailDownLimit = item.detailDownLimit;
@ -1469,8 +1497,10 @@ export default {
standardUrlLists.push(item2.fileAddress);
});
standard.standardUrlLists = standardUrlLists;
standards.push(standard);
} else {
standard.standardUrlLists = null;
}
standards.push(standard);
});
}
});
@ -1525,8 +1555,12 @@ export default {
if (item1 != null) {
item1.standardList.forEach((item) => {
var standard = {};
standard.itemTypeName = item1.itemTypeName;
standard.itemName = item1.itemName;
standard.itemMethod = item1.itemMethod;
standard.itemTools = item1.itemTools;
standard.planLoop = item1.planLoop;
standard.planLoopType = item1.planLoopType;
standard.standardName = item.standardName;
standard.detailUpLimit = item.detailUpLimit;
standard.detailDownLimit = item.detailDownLimit;
@ -1541,8 +1575,10 @@ export default {
standardUrlLists.push(item2.fileAddress);
});
standard.standardUrlLists = standardUrlLists;
standards.push(standard);
} else {
standard.standardUrlLists = null;
}
standards.push(standard);
});
}
});
@ -1640,6 +1676,59 @@ export default {
`faultReport_${new Date().getTime()}.xlsx`
);
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
// 获取当前单元格的值
const currentValue = row[column.property];
// 获取上一行相同列的值
const preRow = this.checkList[rowIndex - 1];
const preValue = preRow ? preRow[column.property] : null;
// 如果当前值和上一行的值相同，则将当前单元格隐藏
if (currentValue === preValue) {
return { rowspan: 0, colspan: 0 };
} else {
// 否则计算当前单元格应该跨越多少行
let rowspan = 1;
for (let i = rowIndex + 1; i < this.checkList.length; i++) {
const nextRow = this.checkList[i];
const nextValue = nextRow[column.property];
if (nextValue === currentValue) {
rowspan++;
} else {
break;
}
}
return { rowspan, colspan: 1 };
}
}
if (columnIndex === 1) {
// 获取当前单元格的值
const currentValue = row[column.property];
// 获取上一行相同列的值
const preRow = this.checkList[rowIndex - 1];
const preValue = preRow ? preRow[column.property] : null;
// 如果当前值和上一行的值相同，则将当前单元格隐藏
if (currentValue === preValue) {
return { rowspan: 0, colspan: 0 };
} else {
// 否则计算当前单元格应该跨越多少行
let rowspan = 1;
for (let i = rowIndex + 1; i < this.checkList.length; i++) {
const nextRow = this.checkList[i];
const nextValue = nextRow[column.property];
if (nextValue === currentValue) {
rowspan++;
} else {
break;
}
}
return { rowspan, colspan: 1 };
}
}
},
},
};
</script>

125
src/views/device/repairOrder/index.vue
Unescape Escape View File

@ -173,7 +173,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['device: repairOrder:add']"
v-hasPermi="['device:repairOrder:add']"
>快速工单</el-button
>
</el-col>
@ -185,7 +185,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['device: repairOrder:edit']"
v-hasPermi="['device:repairOrder:edit']"
>修改</el-button
>
</el-col>
@ -208,7 +208,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['device: repairOrder:export']"
v-hasPermi="['device:repairOrder:export']"
>导出</el-button
>
</el-col>
@ -220,7 +220,7 @@
icon="el-icon-document-add"
size="mini"
@click="handleApply"
v-hasPermi="['device: repairOrder:apply']"
v-hasPermi="['device:repairOrder:apply']"
>委外申请</el-button
>
</el-col>
@ -232,7 +232,7 @@
size="mini"
:disabled="single"
@click="handleWrite"
v-hasPermi="['device: repairOrder:write']"
v-hasPermi="['device:repairOrder:write']"
>填写维修记录</el-button
>
</el-col>
@ -397,7 +397,7 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['device: repairOrder:edit']"
v-hasPermi="['device:repairOrder:edit']"
>修改</el-button
>
<el-button
@ -405,7 +405,7 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['device: repairOrder:remove']"
v-hasPermi="['device:repairOrder:remove']"
>删除</el-button
>
</template>
@ -794,7 +794,7 @@
<el-dialog
:title="title"
:visible.sync="openWrite"
width="1100px"
width="1200px"
append-to-body
v-if="openWrite"
>
@ -883,10 +883,14 @@
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="检查项信息">
<el-table :data="detailList" border :contentStyle="CS" :label-style="LS">
<el-table :data="detailList" border :contentStyle="CS" :label-style="LS" :span-method="objectSpanMethod">
<el-table-column prop="itemTypeName" label="检查类型" width="100">
</el-table-column>
<el-table-column prop="itemName" label="检查项名称" width="150">
</el-table-column>
<el-table-column prop="itemMethod" label="检查项方法" width="150">
<el-table-column prop="itemMethod" label="方法" width="150">
</el-table-column>
<el-table-column prop="itemTools" label="工具" width="50">
</el-table-column>
<el-table-column prop="standardName" label="标准名称" width="150">
</el-table-column>
@ -905,7 +909,7 @@
width="110"
>
<template scope="scope">
<el-radio-group v-model="scope.row.repairReach">
<el-radio-group v-model="scope.row.repairReach" v-if="scope.row.standardType != 'quantify'">
<el-radio label="1">达标</el-radio>
<el-radio label="0">不达标</el-radio>
</el-radio-group>
@ -934,10 +938,9 @@
</el-table-column>
<el-table-column prop="detailDownLimit" label="下限" width="50">
</el-table-column>
<el-table-column prop="detailUnit" label="单位" width="50">
<el-table-column prop="detailUnit" label="单位" width="40">
</el-table-column>
</el-table-column>
<el-table-column prop="picturePath" label="图片">
<el-table-column prop="picturePath" label="维修后图片" width="60">
<template slot-scope="scope">
<el-popover placement="right" width="300" trigger="hover">
<div class="standardUrl_body">
@ -1124,19 +1127,19 @@ export default {
},
WLS: {
"text-align": "center",
width: "200px",
width: "225px",
},
CS: {
"text-align": "center",
},
LS: {
"text-align": "center",
width: "200px",
width: "225px",
},
//图片表格样式
LSP: {
"text-align": "center",
width: "200px",
width: "225px",
},
//检查项表格数据
detailList: [],
@ -1493,20 +1496,24 @@ export default {
this.detailList.forEach((item1) => {
//检查项名字
if (item1 != null) {
item1.standardList.forEach((item) => {
var standard = {};
standard.itemName = item1.itemName;
standard.itemMethod = item1.itemMethod;
standard.standardName = item.standardName;
standard.detailUpLimit = item.detailUpLimit;
standard.detailDownLimit = item.detailDownLimit;
standard.detailUnit = item.detailUnit;
standard.detailReach = item.detailReach;
standard.actualValue = item.actualValue;
//实际值
standard.repairValue = item.repairValue;
standard.repairReach = item.repairReach;
standard.standardType = item.standardType;
item1.standardList.forEach((item) => {
var standard = {};
standard.itemTypeName = item1.itemTypeName;
standard.itemName = item1.itemName;
standard.itemMethod = item1.itemMethod;
standard.itemTools = item1.itemTools;
standard.planLoop = item1.planLoop;
standard.planLoopType = item1.planLoopType;
standard.standardName = item.standardName;
standard.detailUpLimit = item.detailUpLimit;
standard.detailDownLimit = item.detailDownLimit;
standard.detailUnit = item.detailUnit;
standard.detailReach = item.detailReach;
standard.actualValue = item.actualValue;
//实际值
standard.repairValue = item.repairValue;
standard.repairReach = item.repairReach;
standard.standardType = item.standardType;
//检查项图片
var standardUrlLists = [];
if (item.picturePaths != null) {
@ -1514,8 +1521,10 @@ export default {
standardUrlLists.push(item2.fileAddress);
});
standard.standardUrlLists = standardUrlLists;
standards.push(standard);
} else {
standard.standardUrlLists = null;
}
standards.push(standard);
});
}
});
@ -1646,6 +1655,58 @@ export default {
` repairOrder_${new Date().getTime()}.xlsx`
);
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
// 获取当前单元格的值
const currentValue = row[column.property];
// 获取上一行相同列的值
const preRow = this.detailList[rowIndex - 1];
const preValue = preRow ? preRow[column.property] : null;
// 如果当前值和上一行的值相同，则将当前单元格隐藏
if (currentValue === preValue) {
return { rowspan: 0, colspan: 0 };
} else {
// 否则计算当前单元格应该跨越多少行
let rowspan = 1;
for (let i = rowIndex + 1; i < this.detailList.length; i++) {
const nextRow = this.detailList[i];
const nextValue = nextRow[column.property];
if (nextValue === currentValue) {
rowspan++;
} else {
break;
}
}
return { rowspan, colspan: 1 };
}
}
if (columnIndex === 1) {
// 获取当前单元格的值
const currentValue = row[column.property];
// 获取上一行相同列的值
const preRow = this.detailList[rowIndex - 1];
const preValue = preRow ? preRow[column.property] : null;
// 如果当前值和上一行的值相同，则将当前单元格隐藏
if (currentValue === preValue) {
return { rowspan: 0, colspan: 0 };
} else {
// 否则计算当前单元格应该跨越多少行
let rowspan = 1;
for (let i = rowIndex + 1; i < this.detailList.length; i++) {
const nextRow = this.detailList[i];
const nextValue = nextRow[column.property];
if (nextValue === currentValue) {
rowspan++;
} else {
break;
}
}
return { rowspan, colspan: 1 };
}
}
},
},
};
</script>

140
src/views/device/repairOrderReport/index.vue
Unescape Escape View File

@ -342,13 +342,18 @@
<el-dialog
:title="title"
:visible.sync="openView"
width="1100px"
width="1200px"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-tabs type="border-card">
<el-tab-pane label="报修基本信息">
<el-descriptions :column="3" border :contentStyle="CS" :label-style="LS">
<el-descriptions
:column="3"
border
:contentStyle="CS"
:label-style="LS"
>
<el-descriptions-item label="报修单编号">{{
form.orderCode
}}</el-descriptions-item>
@ -390,7 +395,11 @@
}}</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="1" border>
<el-descriptions-item label="维修前故障图片" :contentStyle="CS" :label-style="LS">
<el-descriptions-item
label="维修前故障图片"
:contentStyle="CS"
:label-style="LS"
>
<el-image
v-for="(item, index) in urlBeforeLists"
:key="index"
@ -401,7 +410,12 @@
</el-tab-pane>
<el-tab-pane label="维修基本信息">
<el-descriptions :column="2" border :contentStyle="CS" :label-style="LS">
<el-descriptions
:column="2"
border
:contentStyle="CS"
:label-style="LS"
>
<el-descriptions-item label="维修工单号">{{
form.workCode
}}</el-descriptions-item>
@ -465,7 +479,12 @@
form.workReason
}}</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="1" border :contentStyle="CS" :label-style="LS">
<el-descriptions
:column="1"
border
:contentStyle="CS"
:label-style="LS"
>
<el-descriptions-item label="维修后图片">
<el-image
v-for="(item, index) in urlAfterLists"
@ -477,10 +496,14 @@
</el-tab-pane>
<el-tab-pane label="检查项信息">
<el-table :data="detailList" border >
<el-table :data="detailList" border :span-method="objectSpanMethod">
<el-table-column prop="itemTypeName" label="检查类型" width="100">
</el-table-column>
<el-table-column prop="itemName" label="检查项名称" width="150">
</el-table-column>
<el-table-column prop="itemMethod" label="检查项方法" width="150">
<el-table-column prop="itemMethod" label="方法" width="150">
</el-table-column>
<el-table-column prop="itemTools" label="工具" width="50">
</el-table-column>
<el-table-column prop="standardName" label="标准名称" width="150">
</el-table-column>
@ -499,7 +522,10 @@
width="110"
>
<template scope="scope">
<el-radio-group v-model="scope.row.repairReach">
<el-radio-group
v-model="scope.row.repairReach"
v-if="scope.row.standardType != 'quantify'"
>
<el-radio label="1">达标</el-radio>
<el-radio label="0">不达标</el-radio>
</el-radio-group>
@ -528,10 +554,9 @@
</el-table-column>
<el-table-column prop="detailDownLimit" label="下限" width="50">
</el-table-column>
<el-table-column prop="detailUnit" label="单位" width="50">
<el-table-column prop="detailUnit" label="单位" width="40">
</el-table-column>
</el-table-column>
<el-table-column prop="picturePath" label="图片">
<el-table-column prop="picturePath" label="图片" width="60">
<template slot-scope="scope">
<el-popover placement="right" width="300" trigger="hover">
<div class="standardUrl_body">
@ -551,7 +576,7 @@
</el-popover>
</template>
</el-table-column>
</el-table>
</el-table>
</el-tab-pane>
</el-tabs>
</el-form>
@ -582,6 +607,7 @@ export default {
//表格样式
CS: {
"text-align": "center",
width: "200px",
},
LS: {
"text-align": "center",
@ -616,7 +642,7 @@ export default {
openView: false,
// 查询参数
queryParams: {
workStatus:"1",
workStatus: "1",
pageNum: 1,
pageSize: 10,
orderId: null,
@ -831,20 +857,24 @@ export default {
this.detailList.forEach((item1) => {
//检查项名字
if (item1 != null) {
item1.standardList.forEach((item) => {
var standard = {};
standard.itemName = item1.itemName;
standard.itemMethod = item1.itemMethod;
standard.standardName = item.standardName;
standard.detailUpLimit = item.detailUpLimit;
standard.detailDownLimit = item.detailDownLimit;
standard.detailUnit = item.detailUnit;
standard.detailReach = item.detailReach;
standard.actualValue = item.actualValue;
//实际值
standard.repairValue = item.repairValue;
standard.repairReach = item.repairReach;
standard.standardType = item.standardType;
item1.standardList.forEach((item) => {
var standard = {};
standard.itemTypeName = item1.itemTypeName;
standard.itemName = item1.itemName;
standard.itemMethod = item1.itemMethod;
standard.itemTools = item1.itemTools;
standard.planLoop = item1.planLoop;
standard.planLoopType = item1.planLoopType;
standard.standardName = item.standardName;
standard.detailUpLimit = item.detailUpLimit;
standard.detailDownLimit = item.detailDownLimit;
standard.detailUnit = item.detailUnit;
standard.detailReach = item.detailReach;
standard.actualValue = item.actualValue;
//实际值
standard.repairValue = item.repairValue;
standard.repairReach = item.repairReach;
standard.standardType = item.standardType;
//检查项图片
var standardUrlLists = [];
if (item.picturePaths != null) {
@ -852,8 +882,10 @@ export default {
standardUrlLists.push(item2.fileAddress);
});
standard.standardUrlLists = standardUrlLists;
standards.push(standard);
} else {
standard.standardUrlLists = null;
}
standards.push(standard);
});
}
});
@ -879,6 +911,58 @@ export default {
` repairOrder_${new Date().getTime()}.xlsx`
);
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
// 获取当前单元格的值
const currentValue = row[column.property];
// 获取上一行相同列的值
const preRow = this.detailList[rowIndex - 1];
const preValue = preRow ? preRow[column.property] : null;
// 如果当前值和上一行的值相同，则将当前单元格隐藏
if (currentValue === preValue) {
return { rowspan: 0, colspan: 0 };
} else {
// 否则计算当前单元格应该跨越多少行
let rowspan = 1;
for (let i = rowIndex + 1; i < this.detailList.length; i++) {
const nextRow = this.detailList[i];
const nextValue = nextRow[column.property];
if (nextValue === currentValue) {
rowspan++;
} else {
break;
}
}
return { rowspan, colspan: 1 };
}
}
if (columnIndex === 1) {
// 获取当前单元格的值
const currentValue = row[column.property];
// 获取上一行相同列的值
const preRow = this.detailList[rowIndex - 1];
const preValue = preRow ? preRow[column.property] : null;
// 如果当前值和上一行的值相同，则将当前单元格隐藏
if (currentValue === preValue) {
return { rowspan: 0, colspan: 0 };
} else {
// 否则计算当前单元格应该跨越多少行
let rowspan = 1;
for (let i = rowIndex + 1; i < this.detailList.length; i++) {
const nextRow = this.detailList[i];
const nextValue = nextRow[column.property];
if (nextValue === currentValue) {
rowspan++;
} else {
break;
}
}
return { rowspan, colspan: 1 };
}
}
},
},
};
</script>

21
src/views/quality/checkType/index.vue
Unescape Escape View File

@ -1,10 +1,10 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="名称" prop="checkName">
<el-form-item label="节点名称" prop="checkName">
<el-input
v-model="queryParams.checkName"
placeholder="请输入名称"
placeholder="请输入检验节点名称"
clearable
@keyup.enter.native="handleQuery"
/>
@ -63,9 +63,9 @@
<el-table v-loading="loading" :data="checkTypeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="流程编号" align="center" type="index" width="100"/>
<el-table-column label="名称" align="center" prop="checkName" />
<el-table-column label="类型名称" align="center" prop="typeCode" >
<el-table-column label="检验节点编码" align="center" prop="orderCode" width="150"/>
<el-table-column label="检验节点名称" align="center" prop="checkName"/>
<el-table-column label="类型名称" align="center" prop="typeCode" width="150">
<template slot-scope="scope">
<dict-tag
:options="dict.type.check_type"
@ -106,8 +106,15 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="15">
<el-form-item label="名称" prop="checkName">
<el-input v-model="form.checkName" placeholder="请输入名称" />
<el-form-item label="节点编码" prop="orderCode">
<el-input v-model="form.orderCode" placeholder="请输入检验节点编码" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="15">
<el-form-item label="节点名称" prop="checkName">
<el-input v-model="form.checkName" placeholder="请输入检验节点名称" />
</el-form-item>
</el-col>
</el-row>

5
src/views/quality/checkTypeProject/MaterialGroupAdd.vue
Unescape Escape View File

@ -308,9 +308,8 @@ export default {
},
//物料选择确认
onSelectMaterial(obj) {
debugger
this.form.materialCode = obj.code[0];
this.form.materialName = obj.name[0];
this.form.materialCode = obj.code;
this.form.materialName = obj.name;
console.log(this.form.groupId);
if(this.form.materialCode != null) {
addMaterialGroupDetail(this.form).then((response) => {

66
src/views/quality/checkTypeProject/index.vue
Unescape Escape View File

@ -106,17 +106,26 @@
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="检验规则名称" align="center" prop="ruleName" />
<el-table-column label="标准值" align="center" prop="standardValue" />
<el-table-column label="上差值" align="center" prop="upperDiff" />
<el-table-column label="下差值" align="center" prop="downDiff" />
<el-table-column label="标准值" align="left" prop="standardValue" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="上差值" align="left" prop="upperDiff" />
<el-table-column label="下差值" align="left" prop="downDiff" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="抽样比例" align="center" prop="sample" />
<el-table-column label="抽样数量" align="center" prop="sampleNum" />
<el-table-column label="抽样比例" align="left" prop="sample" />
<el-table-column label="抽样数量" align="left" prop="sampleNum" />
<el-table-column
label="是否启用"
align="center"
prop="status"
/>
>
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
active-value="1"
inactive-value="0"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
@ -192,8 +201,20 @@
<el-form-item label="下差值" prop="downDiff">
<el-input v-model="form.downDiff" placeholder="请输入下差值" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-select v-model="form.unit" placeholder="请选择单位" >
<el-option
v-for="dict in dict.type.unit"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</div>
<el-form-item label="排序" prop="sort">
<el-input type="number" v-model="form.sort" placeholder="请输入排序" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -210,6 +231,7 @@ import {
delCheckTypeProject,
addCheckTypeProject,
updateCheckTypeProject,
changeStatus
} from "@/api/quality/checkTypeProject";
import MaterialGroupAdd from "./MaterialGroupAdd.vue";
import {listCheckType} from "@/api/quality/checkType";
@ -217,7 +239,7 @@ import {listProject} from "@/api/quality/project";
export default {
name: "CheckTypeProject",
dicts: ["qc_rule_prop"],
dicts: ["qc_rule_prop",'unit'],
components: {MaterialGroupAdd,},
data() {
return {
@ -283,9 +305,15 @@ export default {
};
},
created() {
//this.getList();
this.getProjectList();
},
methods: {
/**获取检测项目列表**/
getProjectList(){
listProject().then((response) => {
this.checkRuleList = response.rows;
});
},
/** 查询物料检验项目维护列表 */
getList() {
this.loading = true;
@ -376,6 +404,7 @@ export default {
this.form.propertyCode = obj.propertyCode;
this.form.standardValue = obj.checkStandard;
this.form.projectNo = obj.orderNum;
this.form.unit = obj.unitCode;
},
// 多选框选中数据
handleSelectionChange(selection) {
@ -391,13 +420,11 @@ export default {
this.form.groupId = this.groupId;
this.form.materialCode = this.materialCode;
this.form.typeId = this.editableTabsValue;
listProject().then((response) => {
this.checkRuleList = response.rows;
});
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
getCheckTypeProject(id).then((response) => {
this.form = response.data;
@ -483,6 +510,21 @@ export default {
this.queryParams.typeId = tab.name;
this.handleQuery();
},
// 状态修改
handleStatusChange(row) {
let text = row.status === "1" ? "启用" : "停用";
this.$modal
.confirm('确认要"' + text + '""' + row.id + '"检测项吗？')
.then(function () {
return changeStatus(row.id, row.status);
})
.then(() => {
this.$modal.msgSuccess(text + "成功");
})
.catch(function () {
row.status = row.status === "0" ? "1" : "0";
});
},
},
};
</script>

3
src/views/quality/material/index.vue
Unescape Escape View File

@ -44,7 +44,6 @@
<el-table-column label="姓名" align="center" prop="userName" />
<el-table-column label="联系方式" align="center" prop="phonenumber" />
<el-table-column label="邮箱" align="center" prop="email" />
<el-table-column label="绑定的检验物料" align="center" prop="materialNames" width="400" />
<el-table-column label="状态" align="center" prop="status" >
<template slot-scope="scope">
<span
@ -85,7 +84,7 @@
</el-form>
<el-tabs type="border-card" v-if="form.userCodes != null">
<el-tab-pane label="关联物料">
<UserBind v-if="form.userCodes !=null" :optType="optType" :userCodes="form.userCodes"></UserBind>
<UserBind v-if="form.userCodes != null" :optType="optType" :userCodes="form.userCodes"></UserBind>
</el-tab-pane>
</el-tabs>
<div slot="footer" class="dialog-footer">

277
src/views/quality/material/userbind.vue
Unescape Escape View File

@ -1,90 +1,114 @@
<template>
<div>
<el-input placeholder="请输入内容" clearable > </el-input>
<el-transfer v-model="rightList" :data="leftList" :titles="titles"
:filterable=false
@change="handleChange"
>
<!-- 左侧栏分页 -->
<el-button
type="text"
style="color:#606266"
v-if="leftLength != 0"
class="transfer-footer"
slot="left-footer"
size="small"
>共{{ Ltotal }}条</el-button>
<el-button
v-if="leftLength != 0"
class="transfer-footer"
slot="left-footer"
size="small"
@click="leftPageNumChange"
:disabled="LPageNum - 1 < 1"
>上一页</el-button>
<el-input
v-if="leftLength != 0"
v-model="LPageNum"
size="mini"
class="transfer-footer"
slot="left-footer"
:placeholder="LPageNum"
style="width: 67px;padding: 1px 3px"
disabled
></el-input>
<el-button
class="transfer-footer"
slot="left-footer"
size="small"
@click="leftAddPageNumChange"
v-if="leftLength != 0"
:disabled="LNextPage>LPages"
>下一页</el-button>
<div class="query">
<el-input
style="width: 351px; margin-bottom: 10px"
v-model="leftQueryParams.materialName"
placeholder="请输入内容"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input
style="width: 351px; margin-bottom: 10px"
v-model="rightQueryParams.materialName"
placeholder="请输入内容"
clearable
@keyup.enter.native="handleQuery"
/>
</div>
<!-- 右侧栏分页 -->
<el-button
type="text"
style="color:#606266"
v-if="rightLength != 0"
class="transfer-footer"
slot="right-footer"
size="small"
>共{{ Rtotal }}条</el-button>
<el-button
v-if="rightLength != 0"
class="transfer-footer"
slot="right-footer"
size="small"
@click="rightPageNumChange"
:disabled="RPageNum - 1 < 1"
>上一页</el-button>
<el-input
v-if="rightLength != 0"
v-model="RPageNum"
size="mini"
class="transfer-footer"
slot="right-footer"
:placeholder="RPageNum"
style="width: 43px"
></el-input>
<el-button
class="transfer-footer"
slot="right-footer"
size="small"
@click="rightAddPageNumChange"
v-if="rightLength != 0"
:disabled="RNextPage>RPages"
>下一页</el-button>
<el-transfer
v-model="rightList"
:data="leftList"
:titles="titles"
:filterable="true"
@change="handleChange"
>
<!-- 左侧栏分页 -->
<el-button
type="text"
style="color: #606266"
v-if="leftLength != 0"
class="transfer-footer"
slot="left-footer"
size="small"
>共{{ Ltotal }}条</el-button
>
<el-button
v-if="leftLength != 0"
class="transfer-footer"
slot="left-footer"
size="small"
@click="leftPageNumChange"
:disabled="LPageNum - 1 < 1"
>上一页</el-button
>
<el-input
v-if="leftLength != 0"
v-model="LPageNum"
size="mini"
class="transfer-footer"
slot="left-footer"
:placeholder="LPageNum"
style="width: 67px; padding: 1px 3px"
disabled
></el-input>
<el-button
class="transfer-footer"
slot="left-footer"
size="small"
@click="leftAddPageNumChange"
v-if="leftLength != 0"
:disabled="LNextPage > LPages"
>下一页</el-button
>
</el-transfer>
<!-- 右侧栏分页 -->
<el-button
type="text"
style="color: #606266"
v-if="rightLength != 0"
class="transfer-footer"
slot="right-footer"
size="small"
>共{{ Rtotal }}条</el-button
>
<el-button
v-if="rightLength != 0"
class="transfer-footer"
slot="right-footer"
size="small"
@click="rightPageNumChange"
:disabled="RPageNum - 1 < 1"
>上一页</el-button
>
<el-input
v-if="rightLength != 0"
v-model="RPageNum"
size="mini"
class="transfer-footer"
slot="right-footer"
:placeholder="RPageNum"
style="width: 43px"
></el-input>
<el-button
class="transfer-footer"
slot="right-footer"
size="small"
@click="rightAddPageNumChange"
v-if="rightLength != 0"
:disabled="RNextPage > RPages"
>下一页</el-button
>
</el-transfer>
</div>
</template>
<script>
import { getListProduct,getRightList ,addProduct, updateProduct, getProduct, delProduct} from "@/api/quality/userbind";
import { getListProduct,getRightList ,addProduct} from "@/api/quality/userbind";
export default {
name: "UserBind",
name: "Routeprodproduct",
data() {
return {
@ -113,8 +137,8 @@ export default {
pageNum: 1,
pageSize: 10,
userCodes: this.userCodes,
materialId: null,
materialCode: null,
itemId: null,
itemCode: null,
materialName: null,
specification: null,
unitOfMeasure: null,
@ -124,11 +148,13 @@ export default {
},
// 表单参数
form: {},
// 分页
page: { pageNo: 1, pageSize: 20, total: 0 },
//--------------------->
leftList: [],
rightList: [],
titles:['未关联物料','已关联物料'],
titles: ["未关联产品", "已关联产品"],
// 左侧分页数据
Ltotal: "",
LPageNum: "1",
@ -137,10 +163,11 @@ export default {
LPages: null,
leftLength: null,
leftQueryParams: {
userCodes: this.userCodes,
materialName: null,
userCodes: this.userCodes,
pageNum: 1,
pageSize: 20
},
pageSize: 20,
},
// 右侧分页数据
Rtotal: "",
RPageNum: "1",
@ -149,42 +176,53 @@ export default {
rightLength: null,
RNextPage: null,
rightQueryParams: {
userCodes: this.userCodes,
materialName: null,
userCodes: this.userCodes,
pageNum: 1,
pageSize: 20
},
pageSize: 20,
},
};
},
props :{
userCodes: undefined,
optType: undefined
props: {
userCodes: undefined,
optType: undefined,
},
created() {
this.getList();
this.getRightListFun();
},
methods: {
// // 穿梭框搜索
// filterMethod(keyword, row) {
// console.log(keyword, row);
// return row.label.indexOf(keyword) > -1;
// },
// 查询
handleQuery() {
this.getList();
this.getRightListFun();
},
/** 查询未分配产品列表 */
getList() {
this.loading = true;
getListProduct(this.leftQueryParams).then(response => {
this.LPages = Math.ceil(response.total/this.LPageSize)
getListProduct(this.leftQueryParams).then((response) => {
this.LPages = Math.ceil(response.total / this.LPageSize);
this.leftList = response.rows;
this.Ltotal = response.total;
this.Ltotal = response.total;
this.LPageNum = this.leftQueryParams.pageNum;
this.LNextPage = this.leftQueryParams.pageNum+1;
this.LNextPage = this.leftQueryParams.pageNum + 1;
this.loading = false;
});
},
/**左边上一页**/
leftPageNumChange(){
this.leftQueryParams.pageNum = this.LPageNum-1;
leftPageNumChange() {
this.leftQueryParams.pageNum = this.LPageNum - 1;
this.loading = true;
this.getList();
this.getRightListFun();
},
/**左边下一页**/
leftAddPageNumChange(){
leftAddPageNumChange() {
this.leftQueryParams.pageNum = this.LNextPage;
this.loading = true;
this.getList();
@ -194,35 +232,33 @@ export default {
/** 查询已分配产品列表 -------------------------------*/
getRightListFun() {
this.loading = true;
getRightList(this.rightQueryParams).then(response => {
this.RPages = Math.ceil(response.total/this.RPageSize);
getRightList(this.rightQueryParams).then((response) => {
this.RPages = Math.ceil(response.total / this.RPageSize);
const dataright = [];
for(let i in response.rows){
for (let i in response.rows) {
// 将返回的列表赋值于穿梭框左边列表
dataright.push(response.rows[i].key)
dataright.push(response.rows[i].key);
}
this.rightList = dataright;
this.Rtotal = response.total;
this.Rtotal = response.total;
this.RPageNum = this.rightQueryParams.pageNum;
this.RNextPage = this.rightQueryParams.pageNum+1;
this.RNextPage = this.rightQueryParams.pageNum + 1;
this.loading = false;
});
},
/**右边上一页**/
rightPageNumChange(){
this.rightQueryParams.pageNum = this.RPageNum-1;
rightPageNumChange() {
this.rightQueryParams.pageNum = this.RPageNum - 1;
this.loading = true;
this.getRightListFun();
},
/**右边下一页**/
rightAddPageNumChange(){
rightAddPageNumChange() {
this.rightQueryParams.pageNum = this.RNextPage;
this.loading = true;
this.getRightListFun();
},
// 取消按钮
cancel() {
@ -233,9 +269,9 @@ export default {
reset() {
this.form = {
recordId: null,
userCodes: this.userCodes,
materialId: null,
materialCode: null,
userCodes: this. userCodes,
itemId: null,
itemCode: null,
materialName: null,
specification: null,
unitOfMeasure: null,
@ -246,24 +282,29 @@ export default {
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
updateTime: null,
};
},
/** 提交按钮 */
handleChange(value, direction, movedKeys) {
if (this.queryParams.userCodes != null) {
if (this.queryParams. userCodes != null) {
this.queryParams.selectedValues = value;
addProduct(this.queryParams).then(response => {
this.$modal.msgSuccess("关联成功");
addProduct(this.queryParams).then((response) => {
this.$modal.msgSuccess("关联成功");
});
}
}
}
},
},
};
</script>
<style>
.el-transfer-panel {
width: 350px;
};
width: 350px;
}
.query{
display: flex;
justify-content: space-between;
padding-right: 4px;
}
</style>

79
src/views/quality/project/index.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="检验规则名称" prop="ruleName">
<el-input
v-model="queryParams.ruleName"
@ -93,8 +93,8 @@
<el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="检验规则编号" align="center" prop="orderNum" width="100"/>
<el-table-column label="检验规则名称" align="center" prop="ruleName" />
<el-table-column label="检验规则属性" align="center" prop="propertyCode" >
<el-table-column label="检验规则名称" align="center" prop="ruleName" width="100"/>
<el-table-column label="检验规则属性" align="center" prop="propertyCode" width="100">
<template slot-scope="scope">
<dict-tag
:options="dict.type.qc_rule_prop"
@ -102,18 +102,16 @@
/>
</template>
</el-table-column>
<el-table-column label="检验方式" align="center" prop="checkMode" />
<el-table-column label="检验方式" align="center" prop="checkMode" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="检验工具" align="center" prop="checkTool" />
<el-table-column label="检验标准" align="center" prop="checkStandard" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="单位" align="center" prop="unitCode" >
<template slot-scope="scope">
<dict-tag
:options="dict.type.unit"
:value="scope.row.unitCode"
/>
</template>
<template slot-scope="scope"><dict-tag :options="dict.type.unit" :value="scope.row.unitCode"/></template>
</el-table-column>
<el-table-column label="检验标准" align="center" prop="checkStandard" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="检验标准" align="center" prop="checkStandard" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="抽样方案" align="center" prop="samplePlan" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="合格判定" align="center" prop="judge" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope">
<el-button
size="mini"
@ -145,16 +143,16 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px" >
<el-row>
<el-col :span="15">
<el-col>
<el-form-item label="检验规则名称" prop="ruleName">
<el-input v-model="form.ruleName" placeholder="请输入检验规则名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="15">
<el-col>
<el-form-item label="检验规则属性" prop="propertyCode">
<el-select v-model="form.propertyCode" placeholder="请选择检验规则属性" >
<el-select v-model="form.propertyCode" placeholder="请选择检验规则属性" style="width:100%">
<el-option
v-for="dict in dict.type.qc_rule_prop"
:key="dict.value"
@ -165,32 +163,30 @@
</el-form-item>
</el-col>
</el-row>
<template v-if="form.propertyCode === '0'">
<el-row>
<el-col :span="15">
<el-form-item label="检验标准" prop="checkStandard">
<el-input v-model="form.checkStandard" placeholder="请输入检验标准" />
</el-form-item>
</el-col>
</el-row>
</template>
<el-row>
<el-col>
<el-form-item label="检验标准" prop="checkStandard">
<el-input type='textarea' v-model="form.checkStandard" placeholder="请输入检验标准" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="检验方式" prop="checkMode">
<el-input type='textarea' v-model="form.checkMode" placeholder="请输入检验方式" />
</el-form-item>
</el-col>
</el-row>
<template v-if="form.propertyCode === '1'">
<el-row>
<el-col :span="15">
<el-form-item label="检验方式" prop="checkMode">
<el-input v-model="form.checkMode" placeholder="请输入检验方式" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="15">
<el-col>
<el-form-item label="检验工具" prop="checkTool">
<el-input v-model="form.checkTool" placeholder="请输入检验工具" />
<el-input type='textarea' v-model="form.checkTool" placeholder="请输入检验工具" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="15">
<el-col>
<el-form-item label="单位" prop="unitCode">
<el-select v-model="form.unitCode" placeholder="请选择单位" >
<el-option
@ -204,7 +200,20 @@
</el-col>
</el-row>
</template>
<el-row>
<el-col>
<el-form-item label="抽样方案" prop="samplePlan">
<el-input type='textarea' v-model="form.samplePlan" placeholder="抽样方案" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="合格判定" prop="judge">
<el-input type='textarea' v-model="form.judge" placeholder="合格判定" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">

Write Preview
Loading…
Cancel
Save