fix:bug修改

This commit is contained in:
hhui 2024-05-06 17:03:01 +08:00
parent 6015dd0ae5
commit d1d7c93872
5 changed files with 719 additions and 1345 deletions

View File

@ -63,7 +63,7 @@
</el-table-column>
<el-table-column label="规格型号" align="center" prop="typeCode" :show-overflow-tooltip="true" />
<el-table-column label="申请数量" align="center" prop="preNum" :show-overflow-tooltip="true" />
<el-table-column label="退料数量1" align="center" :show-overflow-tooltip="true">
<el-table-column label="退料数量" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.partNum = scope.row.manageType == 0 || scope.row.manageType == 1 ? scope.row.num :
scope.row.partNum

View File

@ -513,7 +513,7 @@
>
<template slot-scope="scope">
<span v-if="scope.row.scrapType == '0'">自然报废</span>
<span v-if="scope.row.scrapType == '1'">任务报废</span>
<span v-if="scope.row.scrapType == '1'">人为报废</span>
</template>
</el-table-column>
<el-table-column

View File

@ -1,260 +1,115 @@
<template>
<el-dialog
v-dialogDrag
v-loading.fullscreen.lock="fullscreenLoading"
:before-close="cancel"
:title="dialogTitle"
:visible.sync="dialogShowFlag"
append-to-body
width="600px"
>
<el-dialog v-dialogDrag v-loading.fullscreen.lock="fullscreenLoading" :before-close="cancel" :title="dialogTitle"
:visible.sync="dialogShowFlag" append-to-body width="600px">
<div class="form_box_one">
<el-form
ref="dynamicValidateForm"
:model="dynamicValidateForm"
class="demo-dynamic"
label-width="90px"
>
<div
v-for="(domain, index) in dynamicValidateForm.premiumList"
:key="domain.key"
class="bor_box"
>
<el-form ref="dynamicValidateForm" :model="dynamicValidateForm" class="demo-dynamic" label-width="90px">
<div v-for="(domain, index) in dynamicValidateForm.premiumList" :key="domain.key" class="bor_box">
<p class="form_box_title">编码管理设备</p>
<div class="form_box_line"></div>
<div class="form_box_item">
<el-form-item
:prop="'premiumList.' + index + '.partId'"
label="选择配件:"
>
<treeselect
v-model="domain.partId"
style="width: 350px"
:options="deptList"
:normalizer="normalizer"
noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
placeholder="选择上级"
:disable-branch-nodes="true"
/>
<el-form-item :prop="'premiumList.' + index + '.partId'" label="选择配件:">
<treeselect v-model="domain.partId" style="width: 350px" :options="deptList" :normalizer="normalizer"
noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果" placeholder="请选择配件"
:disable-branch-nodes="true" />
</el-form-item>
<el-form-item
v-if="index == 0"
:prop="'premiumListTwo.' + index + '.repairer'"
label="维修人:"
>
<el-select
v-model="domain.repairer"
placeholder="请选择"
size="small" filterable
style="width: 350px"
>
<el-option
v-for="dict in userSelectList"
:key="dict.userId"
:label="dict.nickName"
:value="dict.userId"
/>
<el-form-item v-if="index == 0" :prop="'premiumListTwo.' + index + '.repairer'" label="维修人:">
<el-select v-model="domain.repairer" placeholder="请选择" size="small" filterable style="width: 350px">
<el-option v-for="dict in userSelectList" :key="dict.userId" :label="dict.nickName"
:value="dict.userId" />
</el-select>
</el-form-item>
<el-form-item
:prop="'premiumList.' + index + '.partType'"
label="是否收费:"
>
<el-form-item :prop="'premiumList.' + index + '.partType'" label="是否收费:">
<el-radio-group style="width: 350px" v-model="domain.partType">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
</el-form-item>
<!-- { required: true, message: '配件数量不能为空', trigger: 'blur' }, -->
<el-form-item
:prop="'premiumList.' + index + '.partNum'"
label="配件数量:"
:rules="{
<el-form-item :prop="'premiumList.' + index + '.partNum'" label="配件数量:" :rules="{
required: false,
validator: numberIntegerValidator,
trigger: 'blur',
}"
>
<el-input
v-model="domain.partNum"
placeholder="请输入"
size="small" maxlength="10"
style="width: 350px"
></el-input>
}">
<el-input v-model="domain.partNum" placeholder="请输入" size="small" maxlength="10"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item
:prop="'premiumList.' + index + '.partCost'"
label="配件费用:"
:rules="{
<el-form-item :prop="'premiumList.' + index + '.partCost'" label="配件费用:" :rules="{
required: false,
validator: meneyIntegerValidator,
trigger: 'blur',
}"
>
<el-input
v-model="domain.partCost"
placeholder="请输入"
size="small" maxlength="10"
style="width: 350px"
></el-input>
}">
<el-input v-model="domain.partCost" placeholder="请输入" size="small" maxlength="10"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item
:prop="'premiumList.' + index + '.repairContent'"
label="维修内容:"
>
<el-input
v-model="domain.repairContent"
maxlength="100"
placeholder="请输入"
show-word-limit
size="small"
style="width: 350px"
type="textarea"
></el-input>
<el-form-item :prop="'premiumList.' + index + '.repairContent'" label="维修内容:">
<el-input v-model="domain.repairContent" maxlength="100" placeholder="请输入" show-word-limit size="small"
style="width: 350px" type="textarea"></el-input>
</el-form-item>
</div>
<!-- <el-button @click.prevent="removeDomain(domain, index)"-->
<!-- >删除-->
<!-- </el-button>-->
<div class="add_box">
<el-button
icon="el-icon-plus"
size="mini"
type="success"
@click="addDomainOne"
>添加配件
<el-button icon="el-icon-plus" size="mini" type="success" @click="addDomainOne">添加配件
</el-button>
</div>
</div>
</el-form>
<div
slot="footer"
class="dialog-footer"
v-if="rowObj.code !== null && rowObj.code !== ''"
>
<div slot="footer" class="dialog-footer" v-if="rowObj.code !== null && rowObj.code !== ''">
<el-button @click="cancel">取消</el-button>
<el-button type="primary" @click="submit">保存</el-button>
</div>
</div>
<div class="form_box_two">
<el-form
ref="dynamicValidateFormTwo"
:model="dynamicValidateFormTwo"
class="demo-dynamic"
label-width="100px"
>
<div
v-for="(domain, index) in dynamicValidateFormTwo.premiumListTwo"
:key="domain.key"
class="bor_box"
>
<el-form ref="dynamicValidateFormTwo" :model="dynamicValidateFormTwo" class="demo-dynamic" label-width="100px">
<div v-for="(domain, index) in dynamicValidateFormTwo.premiumListTwo" :key="domain.key" class="bor_box">
<p class="form_box_title">数量管理设备</p>
<div class="form_box_line"></div>
<div class="form_box_item">
<el-form-item
v-if="index == 0"
:prop="'premiumListTwo.' + index + '.repairNum'"
label="维修数量:"
:rules="{
<el-form-item v-if="index == 0" :prop="'premiumListTwo.' + index + '.repairNum'" label="维修数量:" :rules="{
required: true,
validator: numberIntegerValidator,
trigger: 'blur',
}"
>
<el-input
v-model="domain.repairNum"
placeholder="请输入"
size="small" maxlength="10"
style="width: 350px"
></el-input>
}">
<el-input v-model="domain.repairNum" placeholder="请输入" size="small" maxlength="10"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item
v-if="index == 0"
:prop="'premiumListTwo.' + index + '.repairer'"
label="维修人:"
>
<el-select
v-model="domain.repairer"
placeholder="请选择"
size="small" filterable
style="width: 350px"
>
<el-option
v-for="dict in userSelectList"
:key="dict.userId"
:label="dict.nickName"
:value="dict.userId"
/>
<el-form-item v-if="index == 0" :prop="'premiumListTwo.' + index + '.repairer'" label="维修人:">
<el-select v-model="domain.repairer" placeholder="请选择" size="small" filterable style="width: 350px">
<el-option v-for="dict in userSelectList" :key="dict.userId" :label="dict.nickName"
:value="dict.userId" />
</el-select>
</el-form-item>
<el-form-item
:prop="'premiumList.' + index + '.partId'"
label="选择配件:"
>
<treeselect
style="width: 350px"
v-model="domain.partId"
:options="deptList"
:normalizer="normalizer"
noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
placeholder="选择上级"
:disable-branch-nodes="true"
/>
<el-form-item :prop="'premiumList.' + index + '.partId'" label="选择配件:">
<treeselect style="width: 350px" v-model="domain.partId" :options="deptList" :normalizer="normalizer"
noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果" placeholder="选择上级"
:disable-branch-nodes="true" />
</el-form-item>
<el-form-item
:prop="'premiumListTwo.' + index + '.partType'"
label="是否收费:"
>
<el-form-item :prop="'premiumListTwo.' + index + '.partType'" label="是否收费:">
<el-radio-group style="width: 350px" v-model="domain.partType">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
:prop="'premiumListTwo.' + index + '.partNum'"
label="配件数量:"
:rules="{
<el-form-item :prop="'premiumListTwo.' + index + '.partNum'" label="配件数量:" :rules="{
required: false,
validator: numberIntegerValidator,
trigger: 'blur',
}"
>
<el-input
v-model="domain.partNum"
placeholder="请输入"
size="small" maxlength="10"
style="width: 350px"
></el-input>
}">
<el-input v-model="domain.partNum" placeholder="请输入" size="small" maxlength="10"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item
:prop="'premiumListTwo.' + index + '.partCost'"
label="配件费用:"
:rules="{
<el-form-item :prop="'premiumListTwo.' + index + '.partCost'" label="配件费用:" :rules="{
required: false,
validator: meneyIntegerValidator,
trigger: 'blur',
}"
>
<el-input
v-model="domain.partCost"
placeholder="请输入"
size="small" maxlength="10"
style="width: 350px"
></el-input>
}">
<el-input v-model="domain.partCost" placeholder="请输入" size="small" maxlength="10"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item
:prop="'premiumListTwo.' + index + '.repairContent'"
label="维修内容:"
>
<el-input
v-model="domain.repairContent"
maxlength="100"
placeholder="请输入"
show-word-limit
size="small"
style="width: 350px"
type="textarea"
></el-input>
<el-form-item :prop="'premiumListTwo.' + index + '.repairContent'" label="维修内容:">
<el-input v-model="domain.repairContent" maxlength="100" placeholder="请输入" show-word-limit size="small"
style="width: 350px" type="textarea"></el-input>
</el-form-item>
</div>
@ -262,21 +117,12 @@
<!-- >删除-->
<!-- </el-button>-->
<div class="add_box">
<el-button
icon="el-icon-plus"
size="mini"
type="success"
@click="addDomainTwo"
>添加配件
<el-button icon="el-icon-plus" size="mini" type="success" @click="addDomainTwo">添加配件
</el-button>
</div>
</div>
</el-form>
<div
slot="footer"
class="dialog-footer"
v-if="rowObj.code == null || rowObj.code == ''"
>
<div slot="footer" class="dialog-footer" v-if="rowObj.code == null || rowObj.code == ''">
<el-button @click="cancel">取消</el-button>
<el-button type="primary" @click="submitTwo">保存</el-button>
</div>
@ -571,6 +417,7 @@ export default {
width: 100%;
border-bottom: 2px solid #1a1c22;
}
.form_box_item {
width: 100%;
display: flex;
@ -602,6 +449,7 @@ export default {
width: 100%;
border-bottom: 2px solid #1a1c22;
}
.form_box_item {
width: 100%;
display: flex;
@ -616,6 +464,7 @@ export default {
margin-right: 3%;
}
}
.dialog-footer {
display: flex;
justify-content: flex-end;

View File

@ -1,13 +1,6 @@
<template>
<el-dialog
v-dialogDrag
v-loading.fullscreen.lock="fullscreenLoading"
:before-close="cancel"
:title="dialogTitle"
:visible.sync="dialogShowFlag"
append-to-body
width="600px"
>
<el-dialog v-dialogDrag v-loading.fullscreen.lock="fullscreenLoading" :before-close="cancel" :title="dialogTitle"
:visible.sync="dialogShowFlag" append-to-body width="600px">
<div class="form_box_one" v-if="!isShow">
<el-form ref="dynamicValidateForm" :model="dynamicValidateForm" class="demo-dynamic" label-width="90px">
<div class="bor_box">
@ -15,13 +8,8 @@
<div class="form_box_line"></div>
<div class="form_box_item">
<el-form-item label="报废原因:">
<el-input
v-model="dynamicValidateForm.scrapReason"
placeholder="请输入"
size="small"
maxlength="50"
style="width: 350px"
></el-input>
<el-input v-model="dynamicValidateForm.scrapReason" placeholder="请输入" size="small" maxlength="50"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item label="损坏原因:">
<el-radio-group style="width: 350px" v-model="dynamicValidateForm.scrapType">
@ -39,18 +27,9 @@
:isShowTip="isShowTip"
@fileListChange="fileListChange"
></uploadImage> -->
<upload
style="width: 350px"
:file-list="fileList"
:action-url="actionUrl"
:limit="3"
:multiple="true"
@remove="handleRemove"
@preview="handlePreview"
@exceed="handleExceed"
@before-remove="beforeRemove"
@success="handleSuccess"
>
<upload style="width: 350px" :file-list="fileList" :action-url="actionUrl" :limit="3" :multiple="true"
@remove="handleRemove" @preview="handlePreview" @exceed="handleExceed" @before-remove="beforeRemove"
@success="handleSuccess">
<el-button size="small" type="primary">点击上传</el-button>
</upload>
</el-form-item>
@ -67,31 +46,17 @@
<p class="form_box_title">数量管理设备</p>
<div class="form_box_line"></div>
<div class="form_box_item">
<el-form-item
label="报废数量:"
prop="scrapNum"
:rules="{
<el-form-item label="报废数量:" prop="scrapNum" :rules="{
required: true,
validator: numberIntegerValidator,
trigger: 'blur',
}"
>
<el-input
v-model="dynamicValidateFormTwo.scrapNum"
placeholder="请输入"
size="small"
maxlength="10"
style="width: 350px"
></el-input>
}">
<el-input v-model="dynamicValidateFormTwo.scrapNum" placeholder="请输入" size="small" maxlength="10"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item label="报废原因:">
<el-input
v-model="dynamicValidateFormTwo.scrapReason"
placeholder="请输入"
size="small"
maxlength="50"
style="width: 350px"
></el-input>
<el-input v-model="dynamicValidateFormTwo.scrapReason" placeholder="请输入" size="small" maxlength="50"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item label="损坏原因:">
<el-radio-group style="width: 350px" v-model="dynamicValidateFormTwo.scrapType">
@ -100,7 +65,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="损坏照片">
<el-form-item label="损坏照片1">
<!-- <uploadImage
style="width: 250px"
:value="fileList"
@ -110,18 +75,9 @@
:isShowTip="isShowTip"
@fileListChange="fileListChange"
></uploadImage> -->
<upload
style="width: 350px"
:file-list="fileList"
:action-url="actionUrl"
:limit="3"
:multiple="true"
@remove="handleRemove"
@preview="handlePreview"
@exceed="handleExceed"
@before-remove="beforeRemove"
@success="handleSuccess"
>
<upload style="width: 350px" :file-list="fileList" :action-url="actionUrl" :limit="3" :multiple="true"
@remove="handleRemove" @preview="handlePreview" @exceed="handleExceed" @before-remove="beforeRemove"
@success="handleSuccess">
<el-button size="small" type="primary">点击上传</el-button>
</upload>
</el-form-item>
@ -410,6 +366,7 @@ export default {
width: 100%;
border-bottom: 2px solid #1a1c22;
}
.form_box_item {
width: 100%;
display: flex;
@ -441,6 +398,7 @@ export default {
width: 100%;
border-bottom: 2px solid #1a1c22;
}
.form_box_item {
width: 100%;
display: flex;
@ -455,6 +413,7 @@ export default {
margin-right: 3%;
}
}
.dialog-footer {
display: flex;
justify-content: flex-end;

View File

@ -1,53 +1,23 @@
<template>
<div class="app-container" id="testExamine">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="120px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="120px">
<el-form-item label="关键字" prop="keyword">
<el-input
v-model="queryParams.keyword"
placeholder="请输入关键字"
clearable
maxlength="50"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.keyword" placeholder="请输入关键字" clearable maxlength="50"
style="width: 240px" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="单位名称" prop="backUnit">
<el-select
v-model="queryParams.backUnit"
placeholder="请选择单位名称"
clearable
filterable
style="width: 240px"
>
<el-option
v-for="dict in unitInfoSelectList"
:key="dict.unitId"
:label="dict.unitName"
:value="dict.unitId"
/>
<el-select v-model="queryParams.backUnit" placeholder="请选择单位名称" clearable filterable
style="width: 240px">
<el-option v-for="dict in unitInfoSelectList" :key="dict.unitId" :label="dict.unitName"
:value="dict.unitId" />
</el-select>
</el-form-item>
<el-form-item label="工程名称" prop="backPro">
<el-select
v-model="queryParams.backPro"
placeholder="请选择工程名称"
clearable
filterable
style="width: 240px"
>
<el-option
v-for="dict in projectSelectList"
:key="dict.projectId"
:label="dict.projectName"
:value="dict.projectId"
/>
<el-select v-model="queryParams.backPro" placeholder="请选择工程名称" clearable filterable
style="width: 240px">
<el-option v-for="dict in projectSelectList" :key="dict.projectId" :label="dict.projectName"
:value="dict.projectId" />
</el-select>
</el-form-item>
<el-form-item label="工机具类型" prop="type">
@ -66,235 +36,79 @@
<!-- :placeholder="'请选择'"-->
<!-- @handleNodeClick="selectDrop"-->
<!-- ></selectTree>-->
<Tree
ref="mychildSon"
:width="240"
:dataList="deptList"
@changeId="selectDrop"
></Tree>
<Tree ref="mychildSon" :width="240" :dataList="deptList" @changeId="selectDrop"></Tree>
</el-form-item>
<el-form-item label="修试审核单号" prop="backCode">
<el-input
v-model="queryParams.backCode"
placeholder="请选择修试审核单号"
clearable
maxlength="50"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.backCode" placeholder="请选择修试审核单号" clearable maxlength="50"
style="width: 240px" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="修试审核状态" prop="taskStatus">
<el-select
v-model="queryParams.taskStatus"
placeholder="请选择修试审核状态"
clearable
filterable
style="width: 240px"
>
<el-option
v-for="dict in dicSelectList"
:key="dict.id"
:label="dict.name"
:value="dict.id"
/>
<el-select v-model="queryParams.taskStatus" placeholder="请选择修试审核状态" clearable filterable
style="width: 240px">
<el-option v-for="dict in dicSelectList" :key="dict.id" :label="dict.name" :value="dict.id" />
</el-select>
</el-form-item>
<el-form-item label="任务创建时间">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8" style="margin-left: 3%">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
:disabled="multiple"
@click="checkClick"
>批量审核</el-button
>
<el-button type="primary" plain icon="el-icon-plus" size="mini" :disabled="multiple"
@click="checkClick">批量审核</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="typeList"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center"
:selectable="selectable"
/>
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" :selectable="selectable" />
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
label="修试审核单号"
align="center"
sortable
prop="scrapNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="单位名称"
align="center"
prop="unitName"
sortable
:show-overflow-tooltip="true"
/>
<el-table-column
label="工程名称"
sortable
align="center"
prop="projectName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="机具类型"
align="center"
prop="itemType"
sortable
:show-overflow-tooltip="true"
/>
<el-table-column
label="任务创建人"
sortable
align="center"
prop="createBy"
:show-overflow-tooltip="true"
/>
<el-table-column
label="任务创建时间"
sortable
align="center"
prop="createTime"
:show-overflow-tooltip="true"
/>
<el-table-column
label="维修单号"
align="center"
sortable
prop="repairNum"
:show-overflow-tooltip="true"
/>
<el-table-column label="修试审核单号" align="center" sortable prop="scrapNum" :show-overflow-tooltip="true" />
<el-table-column label="单位名称" align="center" prop="unitName" sortable :show-overflow-tooltip="true" />
<el-table-column label="工程名称" sortable align="center" prop="projectName" :show-overflow-tooltip="true" />
<el-table-column label="机具类型" align="center" prop="itemType" sortable :show-overflow-tooltip="true" />
<el-table-column label="任务创建人" sortable align="center" prop="createBy" :show-overflow-tooltip="true" />
<el-table-column label="任务创建时间" sortable align="center" prop="createTime" :show-overflow-tooltip="true" />
<el-table-column label="维修单号" align="center" sortable prop="repairNum" :show-overflow-tooltip="true" />
<el-table-column
label="审核状态"
align="center"
sortable
prop="taskStatusName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="不通过原因"
align="center"
sortable
prop="remark"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="200px"
>
<el-table-column label="审核状态" align="center" sortable prop="taskStatusName" :show-overflow-tooltip="true" />
<el-table-column label="不通过原因" align="center" sortable prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-zoom-in"
@click="handleSee(scope.row, 'see')"
>查看</el-button
>
<el-button size="mini" type="primary" icon="el-icon-zoom-in"
@click="handleSee(scope.row, 'see')">查看</el-button>
<!-- -->
<el-button
size="mini"
type="warning"
icon="el-icon-circle-check"
<el-button size="mini" type="warning" icon="el-icon-circle-check"
:disabled="scope.row.taskStatus !== 46"
@click="handleUpdate(scope.row, 'update')"
>审核</el-button
>
@click="handleUpdate(scope.row, 'update')">审核</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改参数配置对话框 -->
<el-dialog
:title="dialogTitle"
:visible.sync="open"
width="1300px"
append-to-body
:before-close="onClose"
>
<el-form
:model="dialogQueryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-dialog :title="dialogTitle" :visible.sync="open" width="1300px" append-to-body :before-close="onClose">
<el-form :model="dialogQueryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="100px">
<el-row>
<el-form-item label="关键字" prop="keyword">
<el-input
v-model="dialogQueryParams.keyword"
placeholder="请输入关键字"
:clearable="false"
maxlength="50"
style="width: 240px"
/>
<el-input v-model="dialogQueryParams.keyword" placeholder="请输入关键字" :clearable="false"
maxlength="50" style="width: 240px" />
</el-form-item>
<el-form-item label="类型名称" prop="typeName">
<!-- <treeselect
@ -304,357 +118,139 @@
:normalizer="normalizer"
placeholder="请选择类型名称"
/> -->
<selectTree
ref="mychildDialog"
style="width: 240px"
:treeList="deptList"
:treeProps="{
<selectTree ref="mychildDialog" style="width: 240px" :treeList="deptList" :treeProps="{
children: 'children',
label: 'label',
}"
nodeKey="id"
:defaultSelect="true"
:defaultData="defaultData"
:clearable="false"
:placeholder="'请选择'"
@handleNodeClick="selectDropDialog"
></selectTree>
}" nodeKey="id" :defaultSelect="true" :defaultData="defaultData" :clearable="false"
:placeholder="'请选择'" @handleNodeClick="selectDropDialog"></selectTree>
</el-form-item>
<el-form-item label="规格型号" prop="type">
<selectTree
ref="mychildDialogTwo"
style="width: 240px"
:treeList="deptTypeList"
:treeProps="{
<selectTree ref="mychildDialogTwo" style="width: 240px" :treeList="deptTypeList" :treeProps="{
children: 'children',
label: 'label',
}"
nodeKey="id"
:defaultSelect="true"
:defaultData="defaultData"
:clearable="false"
:placeholder="'请选择'"
@handleNodeClick="selectDropDialogTwo"
></selectTree>
}" nodeKey="id" :defaultSelect="true" :defaultData="defaultData" :clearable="false"
:placeholder="'请选择'" @handleNodeClick="selectDropDialogTwo"></selectTree>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="getdialogList"
>查询</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQueryDialog"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini"
@click="getdialogList">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQueryDialog">重置</el-button>
</el-form-item>
</el-row>
</el-form>
<el-table
v-loading="loading"
:data="dialogList"
height="500px"
@selection-change="handleDialogSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center"
:selectable="selectableDialog"
/>
<el-table v-loading="loading" :data="dialogList" height="500px"
@selection-change="handleDialogSelectionChange">
<el-table-column type="selection" width="55" align="center" :selectable="selectableDialog" />
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<span>{{ (dialogQueryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
label="类型名称"
align="center"
prop="machineTypeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
prop="specificationType"
:show-overflow-tooltip="true"
/>
<el-table-column
label="编码"
align="center"
prop="maCode"
width="200"
:show-overflow-tooltip="true"
/>
<el-table-column
label="维修总量"
align="center"
prop="repairNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="维修数量"
align="center"
prop="repairedNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="报废数量"
align="center"
prop="scrapNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="状态"
align="center"
prop="status"
:show-overflow-tooltip="true"
>
<el-table-column label="类型名称" align="center" prop="machineTypeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
<el-table-column label="编码" align="center" prop="maCode" width="200" :show-overflow-tooltip="true" />
<el-table-column label="维修总量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
<el-table-column label="维修数量" align="center" prop="repairedNum" :show-overflow-tooltip="true" />
<el-table-column label="报废数量" align="center" prop="scrapNum" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.status == '0'">未审核</span>
<span v-if="scope.row.status == '1'">通过</span>
<span v-if="scope.row.status == '2'">驳回</span>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="200px"
>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-zoom-in"
@click="repairRecord(scope.row)"
>维修记录</el-button
>
<el-button
size="mini"
type="warning"
icon="el-icon-circle-check"
@click="partRecord(scope.row)"
>配件详情</el-button
>
<el-button size="mini" type="primary" icon="el-icon-zoom-in"
@click="repairRecord(scope.row)">维修记录</el-button>
<el-button size="mini" type="warning" icon="el-icon-circle-check"
@click="partRecord(scope.row)">配件详情</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="dialogTotal > 0"
:total="dialogTotal"
:page.sync="dialogQueryParams.pageNum"
:limit.sync="dialogQueryParams.pageSize"
@pagination="getdialogList"
/>
<pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="dialogQueryParams.pageNum"
:limit.sync="dialogQueryParams.pageSize" @pagination="getdialogList" />
<div
slot="footer"
class="dialog-footer-btn"
style="text-align: center"
v-if="type == 'update' && dialogList.length !== 0"
>
<el-button
type="primary"
@click="submitForm(1)"
:disabled="dialogMultiple"
>通过</el-button
>
<el-button @click="returnSubmit(1)" :disabled="dialogMultiple"
>不通过</el-button
>
<div slot="footer" class="dialog-footer-btn" style="text-align: center"
v-if="type == 'update' && dialogList.length !== 0">
<el-button type="primary" @click="submitForm(1)" :disabled="dialogMultiple">通过</el-button>
<el-button @click="returnSubmit(1)" :disabled="dialogMultiple">不通过</el-button>
</div>
</el-dialog>
<!-- 维修记录 -->
<el-dialog
v-loading.fullscreen.lock="fullscreenLoading"
:title="title"
:visible.sync="openRepairRecord"
append-to-body
width="1200px"
>
<el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openRepairRecord"
append-to-body width="1200px">
<el-table :data="repairRecordList" height="450px">
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<span>{{ (repairRecordParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
label="维修内容"
align="center"
prop="repairContent"
:show-overflow-tooltip="true"
/>
<el-table-column
label="维修数量"
align="center"
prop="repairNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="维修人"
align="center"
prop="repairer"
:show-overflow-tooltip="true"
/>
<el-table-column
label="维修方式"
align="center"
prop="repairType"
:show-overflow-tooltip="true"
>
<el-table-column label="维修内容" align="center" prop="repairContent" :show-overflow-tooltip="true" />
<el-table-column label="维修数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
<el-table-column label="维修人" align="center" prop="repairer" :show-overflow-tooltip="true" />
<el-table-column label="维修方式" align="center" prop="repairType" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.repairType == '1'">内部</span>
<span v-if="scope.row.repairType == '2'">返厂</span>
<span v-if="scope.row.repairType == '3'">报废</span>
</template>
</el-table-column>
<el-table-column
label="返厂名称"
align="center"
prop="supplier"
:show-overflow-tooltip="true"
/>
<el-table-column
label="报废原因"
align="center"
prop="scrapReason"
:show-overflow-tooltip="true"
/>
<el-table-column
label="报废数量"
align="center"
prop="scrapNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="报废类型"
align="center"
prop="scrapType"
:show-overflow-tooltip="true"
>
<el-table-column label="返厂名称" align="center" prop="supplier" :show-overflow-tooltip="true" />
<el-table-column label="报废原因" align="center" prop="scrapReason" :show-overflow-tooltip="true" />
<el-table-column label="报废数量" align="center" prop="scrapNum" :show-overflow-tooltip="true" />
<el-table-column label="报废类型" align="center" prop="scrapType" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.scrapType == '0'">自然报废</span>
<span v-if="scope.row.scrapType == '1'">任务报废</span>
<span v-if="scope.row.scrapType == '1'">人为报废</span>
</template>
</el-table-column>
<el-table-column
label="配件名称"
align="center"
prop="partName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="配件数量"
align="center"
prop="partNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="配件单价"
align="center"
prop="partPrice"
:show-overflow-tooltip="true"
/>
<el-table-column
label="类型"
align="center"
prop="partType"
:show-overflow-tooltip="true"
>
<el-table-column label="配件名称" align="center" prop="partName" :show-overflow-tooltip="true" />
<el-table-column label="配件数量" align="center" prop="partNum" :show-overflow-tooltip="true" />
<el-table-column label="配件单价" align="center" prop="partPrice" :show-overflow-tooltip="true" />
<el-table-column label="类型" align="center" prop="partType" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.partType == '0'">不收费</span>
<span v-if="scope.row.partType == '1'">收费</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="repairRecordTotal > 0"
:total="repairRecordTotal"
:page.sync="repairRecordParams.pageNum"
:limit.sync="repairRecordParams.pageSize"
@pagination="getRepairRecordList"
/>
<pagination v-show="repairRecordTotal > 0" :total="repairRecordTotal"
:page.sync="repairRecordParams.pageNum" :limit.sync="repairRecordParams.pageSize"
@pagination="getRepairRecordList" />
</el-dialog>
<!-- 维修记录 -->
<el-dialog
v-loading.fullscreen.lock="fullscreenLoading"
:title="title"
:visible.sync="openPartRecord"
append-to-body
width="1200px"
>
<el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openPartRecord"
append-to-body width="1200px">
<el-table :data="partRecordList" height="450px">
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<span>{{ (partRecordParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
label="配件名称"
align="center"
prop="partName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="配件数量"
align="center"
prop="partNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="配件费用"
align="center"
prop="partCost"
:show-overflow-tooltip="true"
/>
<el-table-column
label="类型"
align="center"
prop="partType"
:show-overflow-tooltip="true"
>
<el-table-column label="配件名称" align="center" prop="partName" :show-overflow-tooltip="true" />
<el-table-column label="配件数量" align="center" prop="partNum" :show-overflow-tooltip="true" />
<el-table-column label="配件费用" align="center" prop="partCost" :show-overflow-tooltip="true" />
<el-table-column label="类型" align="center" prop="partType" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.partType == '0'">不收费</span>
<span v-if="scope.row.partType == '1'">收费</span>
</template>
</el-table-column>
<el-table-column
label="备注"
align="center"
prop="remark"
:show-overflow-tooltip="true"
/>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
</el-table>
<pagination
v-show="partRecordTotal > 0"
:total="partRecordTotal"
:page.sync="partRecordParams.pageNum"
:limit.sync="partRecordParams.pageSize"
@pagination="getPartRecordList"
/>
<pagination v-show="partRecordTotal > 0" :total="partRecordTotal" :page.sync="partRecordParams.pageNum"
:limit.sync="partRecordParams.pageSize" @pagination="getPartRecordList" />
</el-dialog>
<el-dialog
v-loading.fullscreen.lock="fullscreenLoading"
:title="title"
:visible.sync="openOne"
append-to-body
width="400px"
>
<el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openOne" append-to-body
width="400px">
<div class="submit_box">
<div>
<i
class="el-icon-circle-check"
style="color: #ff9900; font-size: 30px"
></i>
<i class="el-icon-circle-check" style="color: #ff9900; font-size: 30px"></i>
</div>
<div class="submit_box_title">
<div>{{ openTextOne }}</div>
@ -663,52 +259,26 @@
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="submitOpenOneFeturn">返回</el-button>
<el-button type="primary" @click="submitOpenOneForm()"
>确定</el-button
>
<el-button type="primary" @click="submitOpenOneForm()">确定</el-button>
</div>
</el-dialog>
<el-dialog
v-loading.fullscreen.lock="fullscreenLoading"
:title="title"
:visible.sync="openTwo"
append-to-body
width="400px"
:before-close="openTextThreeClose"
>
<el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openTwo" append-to-body
width="400px" :before-close="openTextThreeClose">
<div class="submit_box_two">
<div>
<i
class="el-icon-circle-check"
style="color: #00c196; font-size: 30px"
></i>
<i class="el-icon-circle-check" style="color: #00c196; font-size: 30px"></i>
</div>
<div class="submit_box_title">{{ openTextThree }}</div>
</div>
<div slot="footer" class="dialog-footer"></div>
</el-dialog>
<el-dialog
v-loading.fullscreen.lock="fullscreenLoading"
:title="title"
:visible.sync="openThree"
append-to-body
width="800px"
>
<el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openThree" append-to-body
width="800px">
<div class="submit_box">
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="140px"
>
<el-form ref="form" :model="form" :rules="rules" label-width="140px">
<el-form-item label="请输入驳回原因:" prop="remark">
<el-input
style="width: 600px"
type="textarea"
v-model="form.remark"
maxlength="100"
show-word-limit
></el-input>
<el-input style="width: 600px" type="textarea" v-model="form.remark" maxlength="100"
show-word-limit></el-input>
</el-form-item>
</el-form>
</div>
@ -717,20 +287,13 @@
<el-button type="primary" @click="formSubmit">保存</el-button>
</div>
</el-dialog>
<el-dialog
v-loading.fullscreen.lock="fullscreenLoading"
:title="title"
:visible.sync="openFour"
append-to-body
width="400px"
>
<el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openFour" append-to-body
width="400px">
<div class="submit_box_openFour">
你选择了{{ selectionList.length }}条数据,请进行审批
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="submitForm(2)" type="primary"
>通过</el-button
>
<el-button @click="submitForm(2)" type="primary">通过</el-button>
<el-button @click="returnSubmit(2)">不通过</el-button>
</div>
</el-dialog>
@ -738,24 +301,24 @@
</template>
<script>
import {
import {
getQuestListApi,
getRepairAuditListApi,
addDetailsAuditApi,
getRepairRecord,
getPartRecord,
} from '@/api/repairTest/testExamine'
import { getProjectList } from '@/api/claimAndRefund/receive'
import {
} from '@/api/repairTest/testExamine'
import { getProjectList } from '@/api/claimAndRefund/receive'
import {
getUnitInfoSelectApi,
getProjectSelectApi,
getDicSelectApi,
listPartTypeApi,
getMaTypeSelectApi,
} from '@/api/repairTest/repair'
import selectTree from '../repair/selectTree.vue'
import Tree from '@/views/repairTest/repair/tree.vue'
export default {
} from '@/api/repairTest/repair'
import selectTree from '../repair/selectTree.vue'
import Tree from '@/views/repairTest/repair/tree.vue'
export default {
name: 'TestExamine',
components: { Tree, selectTree },
dicts: ['sys_normal_disable'],
@ -897,7 +460,7 @@
this.dialogTotal = response.total
}
})
.catch(() => {})
.catch(() => { })
},
checkClick() {
this.title = '审批'
@ -1050,7 +613,7 @@
// this.getdialogList()
this.getList()
})
.catch(() => {})
.catch(() => { })
}
if (this.checkResult == 2) {
let taskIdList = []
@ -1067,7 +630,7 @@
this.openTextThree = '审批通过!'
this.getList()
})
.catch(() => {})
.catch(() => { })
}
},
openTextThreeClose() {
@ -1102,7 +665,7 @@
this.openRepairRecord = true
this.title = '维修记录'
})
.catch(() => {})
.catch(() => { })
},
//
partRecord(row) {
@ -1124,7 +687,7 @@
this.openPartRecord = true
this.title = '配件详情'
})
.catch(() => {})
.catch(() => { })
},
returnSubmit(val) {
@ -1157,7 +720,7 @@
// this.getdialogList()
this.getList()
})
.catch(() => {})
.catch(() => { })
}
if (this.checkResult == 2) {
let taskIdList = []
@ -1178,7 +741,7 @@
this.getList()
// }
})
.catch(() => {})
.catch(() => { })
}
} else {
return false
@ -1196,10 +759,10 @@
)
},
},
}
}
</script>
<style lang="scss" scoped>
.submit_box {
.submit_box {
display: flex;
justify-content: flex-start;
align-items: center;
@ -1219,9 +782,9 @@
font-size: 12px;
}
}
}
}
.submit_box_two {
.submit_box_two {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
@ -1235,20 +798,23 @@
font-size: 18px;
font-weight: 600;
}
}
::v-deep.el-table .fixed-width .el-button--mini {
}
::v-deep.el-table .fixed-width .el-button--mini {
width: 70px !important;
margin-bottom: 6px;
}
.dialog-footer-btn {
}
.dialog-footer-btn {
display: flex;
align-items: center;
justify-content: flex-end;
}
.submit_box_openFour {
}
.submit_box_openFour {
display: flex;
justify-content: center;
align-content: center;
font-size: 18px;
}
}
</style>