bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改修试相关代码

This commit is contained in:
zhouxain01 2023-12-21 17:54:28 +08:00
parent 09d6918f87
commit 87f8d807f8
4 changed files with 116 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
sgzb-ui/src/views/repairTest/brokenExamine/index.vue
View File

@ -59,7 +59,7 @@
<!-- nodeKey="id"--> <!-- nodeKey="id"-->
<!-- :defaultSelect="true"--> <!-- :defaultSelect="true"-->
<!-- :defaultData="defaultData"--> <!-- :defaultData="defaultData"-->
<!-- :clearable="false"--> <!-- :clearable="true"-->
<!-- :placeholder="'请选择'"--> <!-- :placeholder="'请选择'"-->
<!-- @handleNodeClick="selectDrop"--> <!-- @handleNodeClick="selectDrop"-->
<!-- ></selectTree>--> <!-- ></selectTree>-->
@ -79,10 +79,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="维修状态" prop="repairStatus"> <el-form-item label="报废状态" prop="repairStatus">
<el-select <el-select
v-model="queryParams.repairStatus" v-model="queryParams.repairStatus"
placeholder="请选择维修状态" placeholder="请选择报废状态"
clearable clearable
style="width: 240px" style="width: 240px"
> >
@ -126,7 +126,7 @@
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
:disabled="multiple" :disabled="!checkResultOne"
v-hasPermi="['store:labelType:add']" v-hasPermi="['store:labelType:add']"
@click="checkClick" @click="checkClick"
>批量审核</el-button >批量审核</el-button
@ -199,12 +199,13 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="报废单号" label="维修单号"
align="center" align="center"
sortable sortable
prop="repairNum" prop="repairNum"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="审核状态" label="审核状态"
align="center" align="center"
@ -234,10 +235,12 @@
v-hasPermi="['store:labelType:edit']" v-hasPermi="['store:labelType:edit']"
>查看</el-button >查看</el-button
> >
<!-- -->
<el-button <el-button
size="mini" size="mini"
type="warning" type="warning"
icon="el-icon-circle-check" icon="el-icon-circle-check"
:disabled="scope.row.taskStatus !== 58"
@click="handleUpdate(scope.row, 'update')" @click="handleUpdate(scope.row, 'update')"
v-hasPermi="['store:labelType:edit']" v-hasPermi="['store:labelType:edit']"
>审核</el-button >审核</el-button
@ -275,7 +278,7 @@
<el-input <el-input
v-model="dialogQueryParams.keyword" v-model="dialogQueryParams.keyword"
placeholder="请输入关键字" placeholder="请输入关键字"
clearable :clearable="false"
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
@ -304,13 +307,6 @@
></selectTree> ></selectTree>
</el-form-item> </el-form-item>
<el-form-item label="规格型号" prop="type"> <el-form-item label="规格型号" prop="type">
<!-- <treeselect
style="width: 250px"
v-model="dialogQueryParams.type"
:options="deptTypeList"
:normalizer="normalizerType"
placeholder="请选择类型名称"
/> -->
<selectTree <selectTree
ref="mychildDialogTwo" ref="mychildDialogTwo"
style="width: 240px" style="width: 240px"
@ -345,12 +341,7 @@
</el-row> </el-row>
</el-form> </el-form>
<el-table <el-table v-loading="loading" :data="dialogList" height="500px">
v-loading="loading"
:data="dialogList"
height="500px"
@selection-change="handleSelectionChange"
>
<el-table-column label="序号" sortable align="center" type="index" /> <el-table-column label="序号" sortable align="center" type="index" />
<el-table-column <el-table-column
label="类型名称" label="类型名称"
@ -389,7 +380,6 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
</el-table> </el-table>
<pagination <pagination
v-show="dialogTotal > 0" v-show="dialogTotal > 0"
:total="dialogTotal" :total="dialogTotal"
@ -438,6 +428,7 @@
:visible.sync="openTwo" :visible.sync="openTwo"
append-to-body append-to-body
width="400px" width="400px"
:before-close="openTextThreeClose"
> >
<div class="submit_box_two"> <div class="submit_box_two">
<div> <div>
@ -502,10 +493,11 @@ import selectTree from '../repair/selectTree.vue'
import Tree from '@/views/repairTest/repair/tree.vue' import Tree from '@/views/repairTest/repair/tree.vue'
export default { export default {
name: "Dict", name: "Dict",
components: { selectTree, Tree }, components: { Tree, selectTree, },
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
data() { data() {
return { return {
checkResultOne: false,
defaultData: null, defaultData: null,
selectionList: [], selectionList: [],
unitInfoSelectList: [], unitInfoSelectList: [],
@ -573,11 +565,12 @@ export default {
getProjectSelectApi().then(res => { getProjectSelectApi().then(res => {
this.projectSelectList = res.data this.projectSelectList = res.data
}) })
getDicSelectApi({ value: 'wx_task' }).then(res => { getDicSelectApi({ value: 'bf_task' }).then(res => {
this.dicSelectList = res.data this.dicSelectList = res.data
}) })
this.getTree() this.getTree()
}, },
methods: { methods: {
/** 查询字典类型列表 */ /** 查询字典类型列表 */
getList() { getList() {
@ -596,10 +589,10 @@ export default {
pageNum: this.dialogQueryParams.pageNum, pageNum: this.dialogQueryParams.pageNum,
pageSize: this.dialogQueryParams.pageSize, pageSize: this.dialogQueryParams.pageSize,
} }
this.loading = true; // this.loading = true;
getRepairAuditListApi(params).then(response => { getRepairAuditListApi(params).then(response => {
if (response.code == 200) { if (response.code == 200) {
this.loading = false; // this.loading = false;
this.open = true this.open = true
this.dialogList = response.rows this.dialogList = response.rows
this.dialogTotal = response.total; this.dialogTotal = response.total;
@ -650,12 +643,12 @@ export default {
getTree() { getTree() {
listPartTypeApi().then(response => { listPartTypeApi().then(response => {
this.deptList = response.data this.deptList = response.data
// this.deptList = this.handleTree(response.data, "id");
}); });
getMaTypeSelectApi().then(response => { getMaTypeSelectApi().then(response => {
this.deptTypeList = response.data this.deptTypeList = response.data
}); });
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
@ -665,9 +658,8 @@ export default {
resetQuery() { resetQuery() {
this.dateRange = []; this.dateRange = [];
this.resetForm("queryForm"); this.resetForm("queryForm");
// this.$refs.mychild.clearSelect();
this.queryParams.type = ''
this.$refs.mychildSon.inputValue = ''; this.$refs.mychildSon.inputValue = '';
this.queryParams.type = ''
this.handleQuery(); this.handleQuery();
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
@ -679,11 +671,11 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.selectionList = selection this.selectionList = selection
this.checkResultOne = selection.every(item => item.taskStatus == 58);
this.ids = selection.map(item => item.dictId) this.ids = selection.map(item => item.dictId)
this.single = selection.length != 1 this.single = selection.length != 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
handleSee(row, type) { handleSee(row, type) {
this.dialogTitle = '查看' this.dialogTitle = '查看'
this.rowObj = row this.rowObj = row
@ -710,6 +702,7 @@ export default {
}, },
submitOpenOneForm() { submitOpenOneForm() {
this.openOne = false this.openOne = false
this.open = false
// val 1代表对话框中审核 2代表批量审核 // val 1代表对话框中审核 2代表批量审核
if (this.checkResult == 1) { if (this.checkResult == 1) {
let taskIdList = [] let taskIdList = []
@ -719,11 +712,11 @@ export default {
taskIdList: taskIdList taskIdList: taskIdList
} }
addDetailsAuditApi(params).then(res => { addDetailsAuditApi(params).then(res => {
if (res.code == 200) { this.openTwo = true
this.openTwo = true this.open = false
this.openTextThree = '审批通过！' this.openTextThree = '审批通过！'
this.getdialogList() // this.getdialogList()
} this.getList()
}).catch(() => { }) }).catch(() => { })
} }
if (this.checkResult == 2) { if (this.checkResult == 2) {
@ -736,14 +729,20 @@ export default {
taskIdList: taskIdList taskIdList: taskIdList
} }
addDetailsAuditApi(params).then(res => { addDetailsAuditApi(params).then(res => {
if (res.code == 200) { this.openTwo = true
this.openTwo = true this.openTextThree = '审批通过！'
this.openTextThree = '审批通过！' this.getList()
this.getList()
}
}).catch(() => { }) }).catch(() => { })
} }
}, },
openTextThreeClose() {
this.open = false
this.openOne = false
this.openTwo = false
this.openThree = false
this.openFour = false
this.getList()
},
submitOpenOneFeturn() { submitOpenOneFeturn() {
this.openOne = false this.openOne = false
@ -759,7 +758,6 @@ export default {
}, },
formSubmit() { formSubmit() {
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
console.log('this.checkResult', this.checkResult);
if (valid) { if (valid) {
if (this.checkResult == 1) { if (this.checkResult == 1) {
let taskIdList = [] let taskIdList = []
@ -770,11 +768,12 @@ export default {
remark: this.form.remark remark: this.form.remark
} }
addDetailsAuditApi(params).then(res => { addDetailsAuditApi(params).then(res => {
if (res.code == 200) { this.$refs.form.resetFields();
this.$refs.form.resetFields(); this.formCancel()
this.formCancel() this.open = false
this.getdialogList() this.openThree = false
} // this.getdialogList()
this.getList()
}).catch(() => { }) }).catch(() => { })
} }
if (this.checkResult == 2) { if (this.checkResult == 2) {
@ -788,12 +787,12 @@ export default {
remark: this.form.remark remark: this.form.remark
} }
addDetailsAuditApi(params).then(res => { addDetailsAuditApi(params).then(res => {
if (res.code == 200) { // if (res.code == 200) {
this.$refs.form.resetFields(); this.$refs.form.resetFields();
this.openThree = false this.openThree = false
this.openFour = false this.openFour = false
this.getList() this.getList()
} // }
}).catch(() => { }) }).catch(() => { })
} }
} else { } else {

7
sgzb-ui/src/views/repairTest/repair/index.vue
View File

@ -143,7 +143,6 @@
>导出</el-button >导出</el-button
> >
</el-col> --> </el-col> -->
<right-toolbar <right-toolbar
:showSearch.sync="showSearch" :showSearch.sync="showSearch"
@queryTable="getList" @queryTable="getList"
@ -261,7 +260,7 @@
<!-- 维修对话框 --> <!-- 维修对话框 -->
<el-dialog <el-dialog
:visible.sync="open" :visible.sync="open"
width="1400px" width="1600px"
append-to-body append-to-body
:before-close="onClose" :before-close="onClose"
> >
@ -788,12 +787,12 @@ export default {
typeName: this.dialogQueryParams.typeName, typeName: this.dialogQueryParams.typeName,
type: this.dialogQueryParams.type, type: this.dialogQueryParams.type,
} }
this.loading = true; // this.loading = true;
getRepairMaTypeListApi(this.addDateRange(params)).then(res => { getRepairMaTypeListApi(this.addDateRange(params)).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.repairList = res.rows; this.repairList = res.rows;
this.dialogTotal = res.total; this.dialogTotal = res.total;
this.loading = false; // this.loading = false;
} }
}) })
}, },

85
sgzb-ui/src/views/repairTest/testExamine/index.vue
View File

@ -1,4 +1,3 @@
<script src="../../../../vue.config.js"></script>
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form
@ -71,19 +70,19 @@
@changeId="selectDrop" @changeId="selectDrop"
></Tree> ></Tree>
</el-form-item> </el-form-item>
<el-form-item label="维修单号" prop="backCode"> <el-form-item label="修试审核单号" prop="backCode">
<el-input <el-input
v-model="queryParams.backCode" v-model="queryParams.backCode"
placeholder="请选择维修单号" placeholder="请选择修试审核"
clearable clearable
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="维修状态" prop="repairStatus"> <el-form-item label="修试审核状态" prop="taskStatus">
<el-select <el-select
v-model="queryParams.repairStatus" v-model="queryParams.taskStatus"
placeholder="请选择维修状态" placeholder="请选择修试审核"
clearable clearable
style="width: 240px" style="width: 240px"
> >
@ -127,7 +126,7 @@
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
:disabled="multiple" :disabled="!checkResultOne"
v-hasPermi="['store:labelType:add']" v-hasPermi="['store:labelType:add']"
@click="checkClick" @click="checkClick"
>批量审核</el-button >批量审核</el-button
@ -236,10 +235,12 @@
v-hasPermi="['store:labelType:edit']" v-hasPermi="['store:labelType:edit']"
>查看</el-button >查看</el-button
> >
<!-- -->
<el-button <el-button
size="mini" size="mini"
type="warning" type="warning"
icon="el-icon-circle-check" icon="el-icon-circle-check"
:disabled="scope.row.taskStatus !== 46"
@click="handleUpdate(scope.row, 'update')" @click="handleUpdate(scope.row, 'update')"
v-hasPermi="['store:labelType:edit']" v-hasPermi="['store:labelType:edit']"
>审核</el-button >审核</el-button
@ -277,7 +278,7 @@
<el-input <el-input
v-model="dialogQueryParams.keyword" v-model="dialogQueryParams.keyword"
placeholder="请输入关键字" placeholder="请输入关键字"
clearable :clearable="false"
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
@ -340,12 +341,7 @@
</el-row> </el-row>
</el-form> </el-form>
<el-table <el-table v-loading="loading" :data="dialogList" height="500px">
v-loading="loading"
:data="dialogList"
height="500px"
@selection-change="handleSelectionChange"
>
<el-table-column label="序号" sortable align="center" type="index" /> <el-table-column label="序号" sortable align="center" type="index" />
<el-table-column <el-table-column
label="类型名称" label="类型名称"
@ -384,7 +380,6 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
</el-table> </el-table>
<pagination <pagination
v-show="dialogTotal > 0" v-show="dialogTotal > 0"
:total="dialogTotal" :total="dialogTotal"
@ -433,6 +428,7 @@
:visible.sync="openTwo" :visible.sync="openTwo"
append-to-body append-to-body
width="400px" width="400px"
:before-close="openTextThreeClose"
> >
<div class="submit_box_two"> <div class="submit_box_two">
<div> <div>
@ -501,6 +497,7 @@ export default {
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
data() { data() {
return { return {
checkResultOne: false,
defaultData: null, defaultData: null,
selectionList: [], selectionList: [],
unitInfoSelectList: [], unitInfoSelectList: [],
@ -568,7 +565,7 @@ export default {
getProjectSelectApi().then(res => { getProjectSelectApi().then(res => {
this.projectSelectList = res.data this.projectSelectList = res.data
}) })
getDicSelectApi({ value: 'wx_task' }).then(res => { getDicSelectApi({ value: 'ws_shenhe' }).then(res => {
this.dicSelectList = res.data this.dicSelectList = res.data
}) })
this.getTree() this.getTree()
@ -592,10 +589,10 @@ export default {
pageNum: this.dialogQueryParams.pageNum, pageNum: this.dialogQueryParams.pageNum,
pageSize: this.dialogQueryParams.pageSize, pageSize: this.dialogQueryParams.pageSize,
} }
this.loading = true; // this.loading = true;
getRepairAuditListApi(params).then(response => { getRepairAuditListApi(params).then(response => {
if (response.code == 200) { if (response.code == 200) {
this.loading = false; // this.loading = false;
this.open = true this.open = true
this.dialogList = response.rows this.dialogList = response.rows
this.dialogTotal = response.total; this.dialogTotal = response.total;
@ -674,6 +671,7 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.selectionList = selection this.selectionList = selection
this.checkResultOne = selection.every(item => item.taskStatus == 46);
this.ids = selection.map(item => item.dictId) this.ids = selection.map(item => item.dictId)
this.single = selection.length != 1 this.single = selection.length != 1
this.multiple = !selection.length this.multiple = !selection.length
@ -704,6 +702,7 @@ export default {
}, },
submitOpenOneForm() { submitOpenOneForm() {
this.openOne = false this.openOne = false
this.open = false
// val 1代表对话框中审核 2代表批量审核 // val 1代表对话框中审核 2代表批量审核
if (this.checkResult == 1) { if (this.checkResult == 1) {
let taskIdList = [] let taskIdList = []
@ -713,11 +712,11 @@ export default {
taskIdList: taskIdList taskIdList: taskIdList
} }
addDetailsAuditApi(params).then(res => { addDetailsAuditApi(params).then(res => {
if (res.code == 200) { this.openTwo = true
this.openTwo = true this.open = false
this.openTextThree = '审批通过！' this.openTextThree = '审批通过！'
this.getdialogList() // this.getdialogList()
} this.getList()
}).catch(() => { }) }).catch(() => { })
} }
if (this.checkResult == 2) { if (this.checkResult == 2) {
@ -730,14 +729,20 @@ export default {
taskIdList: taskIdList taskIdList: taskIdList
} }
addDetailsAuditApi(params).then(res => { addDetailsAuditApi(params).then(res => {
if (res.code == 200) { this.openTwo = true
this.openTwo = true this.openTextThree = '审批通过！'
this.openTextThree = '审批通过！' this.getList()
this.getList()
}
}).catch(() => { }) }).catch(() => { })
} }
}, },
openTextThreeClose() {
this.open = false
this.openOne = false
this.openTwo = false
this.openThree = false
this.openFour = false
this.getList()
},
submitOpenOneFeturn() { submitOpenOneFeturn() {
this.openOne = false this.openOne = false
@ -753,7 +758,6 @@ export default {
}, },
formSubmit() { formSubmit() {
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
console.log('this.checkResult', this.checkResult);
if (valid) { if (valid) {
if (this.checkResult == 1) { if (this.checkResult == 1) {
let taskIdList = [] let taskIdList = []
@ -764,11 +768,12 @@ export default {
remark: this.form.remark remark: this.form.remark
} }
addDetailsAuditApi(params).then(res => { addDetailsAuditApi(params).then(res => {
if (res.code == 200) { this.$refs.form.resetFields();
this.$refs.form.resetFields(); this.formCancel()
this.formCancel() this.open = false
this.getdialogList() this.openThree = false
} // this.getdialogList()
this.getList()
}).catch(() => { }) }).catch(() => { })
} }
if (this.checkResult == 2) { if (this.checkResult == 2) {
@ -782,12 +787,12 @@ export default {
remark: this.form.remark remark: this.form.remark
} }
addDetailsAuditApi(params).then(res => { addDetailsAuditApi(params).then(res => {
if (res.code == 200) { // if (res.code == 200) {
this.$refs.form.resetFields(); this.$refs.form.resetFields();
this.openThree = false this.openThree = false
this.openFour = false this.openFour = false
this.getList() this.getList()
} // }
}).catch(() => { }) }).catch(() => { })
} }
} else { } else {

37
sgzb-ui/src/views/store/label/labelBinding.vue
View File

@ -339,23 +339,24 @@
<el-button type="primary" @click="downloadCode">下 载</el-button> <el-button type="primary" @click="downloadCode">下 载</el-button>
</div> </div>
</el-dialog> </el-dialog>
<div <div style="background-color;: transparent">
id="qrCode" <div
v-for="(codeItem, codeIndex) in checkboxModel" id="qrCode"
:key="codeIndex" v-for="(codeItem, codeIndex) in checkboxModel"
class="captureId" :key="codeIndex"
v-show="codeId" class="captureId"
ref="QrcodePage" v-show="codeId"
style=" ref="QrcodePage"
z-index: -1111111; style="
position: absolute; z-index: -1111111;
top: 10px; position: absolute;
left: -99999; top: 10px;
width: 450px; left: -99999;
height: 475px; width: 450px;
background-size: cover; height: 475px;
" background-size: cover;
> "
></div>
<!-- <center style="text-align: center; font-size: 1.5625rem"> <!-- <center style="text-align: center; font-size: 1.5625rem">
{{ codeVal }} {{ codeVal }}
</center> --> </center> -->
@ -592,7 +593,7 @@ export default {
// 索引，数组下标 // 索引，数组下标
} }
let parmas = { let parmas = {
uuidList: uuidList, uuidList: uuidList.join(','),
labelType: this.cform.labelType, labelType: this.cform.labelType,
labelNum: this.cform.labelNum, labelNum: this.cform.labelNum,
} }