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

Merge remote-tracking branch 'origin/dev-cq-bug' into dev-cq-bug

This commit is contained in:
liang.chao 2024-05-06 17:59:58 +08:00
parent 25ad01ce71 b86f8fd839
commit c0394d1f59
7 changed files with 656 additions and 1130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,53 +1,23 @@
<template> <template>
<div class="app-container" id="brokenExamine"> <div class="app-container" id="brokenExamine">
<el-form <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
:model="queryParams" label-width="120px">
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="120px"
>
<el-form-item label="关键字" prop="keyword"> <el-form-item label="关键字" prop="keyword">
<el-input <el-input v-model="queryParams.keyword" placeholder="请输入关键字" clearable maxlength="50"
v-model="queryParams.keyword" style="width: 240px" @keyup.enter.native="handleQuery" />
placeholder="请输入关键字"
clearable
maxlength="50"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="单位名称" prop="backUnit"> <el-form-item label="单位名称" prop="backUnit">
<el-select <el-select v-model="queryParams.backUnit" placeholder="请选择单位名称" clearable filterable
v-model="queryParams.backUnit" style="width: 240px">
placeholder="请选择单位名称" <el-option v-for="dict in unitInfoSelectList" :key="dict.unitId" :label="dict.unitName"
clearable :value="dict.unitId" />
filterable
style="width: 240px"
>
<el-option
v-for="dict in unitInfoSelectList"
:key="dict.unitId"
:label="dict.unitName"
:value="dict.unitId"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工程名称" prop="backPro"> <el-form-item label="工程名称" prop="backPro">
<el-select <el-select v-model="queryParams.backPro" placeholder="请选择工程名称" clearable filterable
v-model="queryParams.backPro" style="width: 240px">
placeholder="请选择工程名称" <el-option v-for="dict in projectSelectList" :key="dict.projectId" :label="dict.projectName"
clearable :value="dict.projectId" />
filterable
style="width: 240px"
>
<el-option
v-for="dict in projectSelectList"
:key="dict.projectId"
:label="dict.projectName"
:value="dict.projectId"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工机具类型" prop="type"> <el-form-item label="工机具类型" prop="type">
@ -66,235 +36,79 @@
<!-- :placeholder="'请选择'"--> <!-- :placeholder="'请选择'"-->
<!-- @handleNodeClick="selectDrop"--> <!-- @handleNodeClick="selectDrop"-->
<!-- ></selectTree>--> <!-- ></selectTree>-->
<Tree <Tree ref="mychildSon" :width="240" :dataList="deptList" @changeId="selectDrop"></Tree>
ref="mychildSon"
:width="240"
:dataList="deptList"
@changeId="selectDrop"
></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" placeholder="请选择报废单号" clearable maxlength="50"
v-model="queryParams.backCode" style="width: 240px" @keyup.enter.native="handleQuery" />
placeholder="请选择报废单号"
clearable
maxlength="50"
style="width: 240px"
@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" placeholder="请选择报废状态" clearable filterable
v-model="queryParams.repairStatus" style="width: 240px">
placeholder="请选择报废状态" <el-option v-for="dict in dicSelectList" :key="dict.id" :label="dict.name" :value="dict.id" />
clearable
filterable
style="width: 240px"
>
<el-option
v-for="dict in dicSelectList"
:key="dict.id"
:label="dict.name"
:value="dict.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="任务创建时间"> <el-form-item label="任务创建时间">
<el-date-picker <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
v-model="dateRange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
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-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
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-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8" style="margin-left: 3%"> <el-row :gutter="10" class="mb8" style="margin-left: 3%">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" plain icon="el-icon-plus" size="mini" :disabled="multiple"
type="primary" @click="checkClick">批量审核</el-button>
plain
icon="el-icon-plus"
size="mini"
:disabled="multiple"
@click="checkClick"
>批量审核</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
</el-col> </el-col>
<right-toolbar <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
v-loading="loading" <el-table-column type="selection" width="55" align="center" :selectable="selectable" />
: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"> <el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope"> <template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span> <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="报废审核单号" align="center" sortable prop="scrapNum" :show-overflow-tooltip="true" />
label="报废审核单号" <el-table-column label="单位名称" align="center" prop="unitName" sortable :show-overflow-tooltip="true" />
align="center" <el-table-column label="工程名称" sortable align="center" prop="projectName" :show-overflow-tooltip="true" />
sortable <el-table-column label="机具类型" align="center" prop="itemType" sortable :show-overflow-tooltip="true" />
prop="scrapNum" <el-table-column label="任务创建人" sortable align="center" prop="createBy" :show-overflow-tooltip="true" />
: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"
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 <el-table-column label="审核状态" align="center" sortable prop="taskStatusName" :show-overflow-tooltip="true" />
label="审核状态" <el-table-column label="不通过原因" align="center" sortable prop="remark" :show-overflow-tooltip="true" />
align="center" <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
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"> <template slot-scope="scope">
<el-button <el-button size="mini" type="primary" icon="el-icon-zoom-in"
size="mini" @click="handleSee(scope.row, 'see')">查看</el-button>
type="primary"
icon="el-icon-zoom-in"
@click="handleSee(scope.row, 'see')"
>查看</el-button
>
<!-- --> <!-- -->
<el-button <el-button size="mini" type="warning" icon="el-icon-circle-check"
size="mini"
type="warning"
icon="el-icon-circle-check"
:disabled="scope.row.taskStatus !== 58" :disabled="scope.row.taskStatus !== 58"
@click="handleUpdate(scope.row, 'update')" @click="handleUpdate(scope.row, 'update')">审核</el-button>
>审核</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
v-show="total > 0" :limit.sync="queryParams.pageSize" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog <el-dialog :title="dialogTitle" :visible.sync="open" width="1300px" append-to-body :before-close="onClose">
:title="dialogTitle" <el-form :model="dialogQueryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
:visible.sync="open" label-width="100px">
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-row>
<el-form-item label="关键字" prop="keyword"> <el-form-item label="关键字" prop="keyword">
<el-input <el-input v-model="dialogQueryParams.keyword" placeholder="请输入关键字" :clearable="false"
v-model="dialogQueryParams.keyword" maxlength="50" style="width: 240px" />
placeholder="请输入关键字"
:clearable="false"
maxlength="50"
style="width: 240px"
/>
</el-form-item> </el-form-item>
<el-form-item label="类型名称" prop="typeName"> <el-form-item label="类型名称" prop="typeName">
<!-- <treeselect <!-- <treeselect
@ -304,93 +118,38 @@
:normalizer="normalizer" :normalizer="normalizer"
placeholder="请选择类型名称" placeholder="请选择类型名称"
/> --> /> -->
<selectTree <selectTree ref="mychildDialog" style="width: 240px" :treeList="deptList" :treeProps="{
ref="mychildDialog"
style="width: 240px"
:treeList="deptList"
:treeProps="{
children: 'children', children: 'children',
label: 'label', label: 'label',
}" }" nodeKey="id" :defaultSelect="true" :defaultData="defaultData" :clearable="false"
nodeKey="id" :placeholder="'请选择'" @handleNodeClick="selectDropDialog"></selectTree>
:defaultSelect="true"
:defaultData="defaultData"
:clearable="false"
:placeholder="'请选择'"
@handleNodeClick="selectDropDialog"
></selectTree>
</el-form-item> </el-form-item>
<el-form-item label="规格型号" prop="type"> <el-form-item label="规格型号" prop="type">
<selectTree <selectTree ref="mychildDialogTwo" style="width: 240px" :treeList="deptTypeList" :treeProps="{
ref="mychildDialogTwo"
style="width: 240px"
:treeList="deptTypeList"
:treeProps="{
children: 'children', children: 'children',
label: 'label', label: 'label',
}" }" nodeKey="id" :defaultSelect="true" :defaultData="defaultData" :clearable="false"
nodeKey="id" :placeholder="'请选择'" @handleNodeClick="selectDropDialogTwo"></selectTree>
:defaultSelect="true"
:defaultData="defaultData"
:clearable="false"
:placeholder="'请选择'"
@handleNodeClick="selectDropDialogTwo"
></selectTree>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini"
type="primary" @click="getdialogList">查询</el-button>
icon="el-icon-search" <el-button icon="el-icon-refresh" size="mini" @click="resetQueryDialog">重置</el-button>
size="mini"
@click="getdialogList"
>查询</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQueryDialog"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
<el-table <el-table v-loading="loading" :data="dialogList" height="500px"
v-loading="loading" @selection-change="handleDialogSelectionChange">
:data="dialogList" <el-table-column type="selection" width="55" align="center" :selectable="selectableDialog" />
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"> <el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope"> <template scope="scope">
<span>{{ (dialogQueryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span> <span>{{ (dialogQueryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="类型名称" align="center" prop="machineTypeName" :show-overflow-tooltip="true" />
label="类型名称" <el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
align="center" <el-table-column label="编码" align="center" prop="maCode" width="200" :show-overflow-tooltip="true" />
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 <!-- <el-table-column
label="维修总量" label="维修总量"
align="center" align="center"
@ -403,158 +162,72 @@
prop="repairedNum" prop="repairedNum"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> --> /> -->
<el-table-column <el-table-column label="报废数量" align="center" prop="scrapNum" :show-overflow-tooltip="true" />
label="报废数量" <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
align="center"
prop="scrapNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="状态"
align="center"
prop="status"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status == '0'">未审核</span> <span v-if="scope.row.status == '0'">未审核</span>
<span v-if="scope.row.status == '1'">通过</span> <span v-if="scope.row.status == '1'">通过</span>
<span v-if="scope.row.status == '2'">驳回</span> <span v-if="scope.row.status == '2'">驳回</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="上级" align="center" prop="scrapSource" :show-overflow-tooltip="true">
label="上级"
align="center"
prop="scrapSource"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.scrapSource == '1'">退料</span> <span v-if="scope.row.scrapSource == '1'">退料</span>
<span v-if="scope.row.scrapSource == '2'" <span v-if="scope.row.scrapSource == '2'">维修审核</span>
>维修审核</span
>
<span v-if="scope.row.scrapSource == '3'">盘点</span> <span v-if="scope.row.scrapSource == '3'">盘点</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
label="操作"
align="center"
class-name="small-padding fixed-width"
width="200px"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" type="primary" icon="el-icon-zoom-in" v-if="scope.row.scrapSource == '2'"
size="mini" @click="scrapRecord(scope.row)">报废明细</el-button>
type="primary"
icon="el-icon-zoom-in"
v-if="scope.row.scrapSource == '2'"
@click="scrapRecord(scope.row)"
>报废明细</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="dialogQueryParams.pageNum"
v-show="dialogTotal > 0" :limit.sync="dialogQueryParams.pageSize" @pagination="getList" />
:total="dialogTotal"
:page.sync="dialogQueryParams.pageNum"
:limit.sync="dialogQueryParams.pageSize"
@pagination="getList"
/>
<div <div slot="footer" class="dialog-footer-btn" style="text-align: center"
slot="footer" v-if="type == 'update' && dialogList.length !== 0">
class="dialog-footer-btn" <el-button type="primary" @click="submitForm(1)" :disabled="dialogMultiple">通过</el-button>
style="text-align: center" <el-button @click="returnSubmit(1)" :disabled="dialogMultiple">不通过</el-button>
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> </div>
</el-dialog> </el-dialog>
<!-- 报废明细 --> <!-- 报废明细 -->
<el-dialog <el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openScrapRecord"
v-loading.fullscreen.lock="fullscreenLoading" append-to-body width="1200px">
:title="title"
:visible.sync="openScrapRecord"
append-to-body
width="1200px"
>
<el-table :data="scrapRecordList" height="450px"> <el-table :data="scrapRecordList" height="450px">
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope"> <template scope="scope">
<span>{{ (scrapRecordParams.pageNum - 1) * 10 + scope.$index + 1 }}</span> <span>{{ (scrapRecordParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="报废原因" align="center" prop="scrapReason" :show-overflow-tooltip="true" />
label="报废原因" <el-table-column label="报废数量" align="center" prop="scrapNum" :show-overflow-tooltip="true" />
align="center" <el-table-column label="报废类型" align="center" prop="scrapType" :show-overflow-tooltip="true">
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"> <template slot-scope="scope">
<span v-if="scope.row.scrapType == '0'">自然报废</span> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true">
label="备注"
align="center"
prop="remark"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button type="primary" size="mini" @click="checkImages(scope.row)">
type="primary"
size="mini"
@click="checkImages(scope.row)"
>
查看图片 查看图片
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="scrapRecordTotal > 0" :total="scrapRecordTotal" :page.sync="scrapRecordParams.pageNum"
v-show="scrapRecordTotal > 0" :limit.sync="scrapRecordParams.pageSize" @pagination="getScrapRecordList" />
:total="scrapRecordTotal"
:page.sync="scrapRecordParams.pageNum"
:limit.sync="scrapRecordParams.pageSize"
@pagination="getScrapRecordList"
/>
</el-dialog> </el-dialog>
<el-dialog <el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openOne" append-to-body
v-loading.fullscreen.lock="fullscreenLoading" width="400px">
:title="title"
:visible.sync="openOne"
append-to-body
width="400px"
>
<div class="submit_box"> <div class="submit_box">
<div> <div>
<i <i class="el-icon-circle-check" style="color: #ff9900; font-size: 30px"></i>
class="el-icon-circle-check"
style="color: #ff9900; font-size: 30px"
></i>
</div> </div>
<div class="submit_box_title"> <div class="submit_box_title">
<div>{{ openTextOne }}</div> <div>{{ openTextOne }}</div>
@ -563,52 +236,26 @@
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="submitOpenOneFeturn">返回</el-button> <el-button @click="submitOpenOneFeturn">返回</el-button>
<el-button type="primary" @click="submitOpenOneForm()" <el-button type="primary" @click="submitOpenOneForm()">确定</el-button>
>确定</el-button
>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog <el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openTwo" append-to-body
v-loading.fullscreen.lock="fullscreenLoading" width="400px" :before-close="openTextThreeClose">
:title="title"
:visible.sync="openTwo"
append-to-body
width="400px"
:before-close="openTextThreeClose"
>
<div class="submit_box_two"> <div class="submit_box_two">
<div> <div>
<i <i class="el-icon-circle-check" style="color: #00c196; font-size: 30px"></i>
class="el-icon-circle-check"
style="color: #00c196; font-size: 30px"
></i>
</div> </div>
<div class="submit_box_title">{{ openTextThree }}</div> <div class="submit_box_title">{{ openTextThree }}</div>
</div> </div>
<div slot="footer" class="dialog-footer"></div> <div slot="footer" class="dialog-footer"></div>
</el-dialog> </el-dialog>
<el-dialog <el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openThree" append-to-body
v-loading.fullscreen.lock="fullscreenLoading" width="800px">
:title="title"
:visible.sync="openThree"
append-to-body
width="800px"
>
<div class="submit_box"> <div class="submit_box">
<el-form <el-form ref="form" :model="form" :rules="rules" label-width="140px">
ref="form"
:model="form"
:rules="rules"
label-width="140px"
>
<el-form-item label="请输入驳回原因：" prop="remark"> <el-form-item label="请输入驳回原因：" prop="remark">
<el-input <el-input style="width: 600px" type="textarea" v-model="form.remark" maxlength="100"
style="width: 600px" show-word-limit></el-input>
type="textarea"
v-model="form.remark"
maxlength="100"
show-word-limit
></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -617,57 +264,45 @@
<el-button type="primary" @click="formSubmit">保存</el-button> <el-button type="primary" @click="formSubmit">保存</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog <el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openFour" append-to-body
v-loading.fullscreen.lock="fullscreenLoading" width="400px">
:title="title"
:visible.sync="openFour"
append-to-body
width="400px"
>
<div class="submit_box_openFour"> <div class="submit_box_openFour">
你选择了{{ selectionList.length }}条数据,请进行审批 你选择了{{ selectionList.length }}条数据,请进行审批
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="submitForm(2)" type="primary" <el-button @click="submitForm(2)" type="primary">通过</el-button>
>通过</el-button
>
<el-button @click="returnSubmit(2)">不通过</el-button> <el-button @click="returnSubmit(2)">不通过</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogVisible"> <el-dialog :visible.sync="dialogVisible" title="图片">
<div style="width: 100%; height: 500px"> <div style="width: 100%; height: 500px" v-if="imagesList.length > 0">
<img <img v-for="(item, index) in imagesList" :key="index" width="50%" height="200px" :src="uploadUrl + item"
v-for="(item, index) in imagesList" alt="" />
:key="index"
width="50%"
height="200px"
:src="uploadUrl + item"
alt=""
/>
</div> </div>
<el-empty style="width: 100%; height: 500px" v-else description="暂无数据"></el-empty>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { import {
getQuestListApi, getQuestListApi,
getRepairAuditListApi, getRepairAuditListApi,
addDetailsAuditApi, addDetailsAuditApi,
getScrapRecord, getScrapRecord,
getFileUrl, getFileUrl,
} from '@/api/repairTest/brokenExamine' } from '@/api/repairTest/brokenExamine'
import { getProjectList } from '@/api/claimAndRefund/receive' import { getProjectList } from '@/api/claimAndRefund/receive'
import { import {
getUnitInfoSelectApi, getUnitInfoSelectApi,
getProjectSelectApi, getProjectSelectApi,
getDicSelectApi, getDicSelectApi,
listPartTypeApi, listPartTypeApi,
getMaTypeSelectApi, getMaTypeSelectApi,
} from '@/api/repairTest/repair' } from '@/api/repairTest/repair'
import selectTree from '../repair/selectTree.vue' 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: 'BrokenExamine', name: 'BrokenExamine',
components: { Tree, selectTree }, components: { Tree, selectTree },
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
@ -805,7 +440,7 @@
this.dialogTotal = response.total this.dialogTotal = response.total
} }
}) })
.catch(() => {}) .catch(() => { })
}, },
//报废明细 //报废明细
scrapRecord(row) { scrapRecord(row) {
@ -827,7 +462,7 @@
this.openScrapRecord = true this.openScrapRecord = true
this.title = '报废明细' this.title = '报废明细'
}) })
.catch(() => {}) .catch(() => { })
}, },
checkImages(row) { checkImages(row) {
// console.log(row) // console.log(row)
@ -843,7 +478,7 @@
// }) // })
console.log(this.imagesList) console.log(this.imagesList)
}) })
.catch(() => {}) .catch(() => { })
}, },
checkClick() { checkClick() {
this.title = '审批' this.title = '审批'
@ -994,7 +629,7 @@
// this.getdialogList() // this.getdialogList()
this.getList() this.getList()
}) })
.catch(() => {}) .catch(() => { })
} }
if (this.checkResult == 2) { if (this.checkResult == 2) {
let taskIdList = [] let taskIdList = []
@ -1011,7 +646,7 @@
this.openTextThree = '审批通过！' this.openTextThree = '审批通过！'
this.getList() this.getList()
}) })
.catch(() => {}) .catch(() => { })
} }
}, },
openTextThreeClose() { openTextThreeClose() {
@ -1056,7 +691,7 @@
// this.getdialogList() // this.getdialogList()
this.getList() this.getList()
}) })
.catch(() => {}) .catch(() => { })
} }
if (this.checkResult == 2) { if (this.checkResult == 2) {
let taskIdList = [] let taskIdList = []
@ -1077,7 +712,7 @@
this.getList() this.getList()
// } // }
}) })
.catch(() => {}) .catch(() => { })
} }
} else { } else {
return false return false
@ -1095,10 +730,10 @@
) )
}, },
}, },
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.submit_box { .submit_box {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
@ -1118,9 +753,9 @@
font-size: 12px; font-size: 12px;
} }
} }
} }
.submit_box_two { .submit_box_two {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -1134,20 +769,23 @@
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
} }
} }
::v-deep.el-table .fixed-width .el-button--mini {
::v-deep.el-table .fixed-width .el-button--mini {
width: 70px !important; width: 70px !important;
margin-bottom: 6px; margin-bottom: 6px;
} }
.dialog-footer-btn {
.dialog-footer-btn {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
} }
.submit_box_openFour {
.submit_box_openFour {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-content: center; align-content: center;
font-size: 18px; font-size: 18px;
} }
</style> </style>

24
sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
View File

@ -47,12 +47,10 @@
style="width: 350px" type="textarea"></el-input> style="width: 350px" type="textarea"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<!-- <el-button @click.prevent="removeDomain(domain, index)"-->
<!-- >删除-->
<!-- </el-button>-->
<div class="add_box"> <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> </el-button>
<el-button size="mini" icon="el-icon-delete" @click="delDomain(domain, 1)" v-show="index > 0">删除</el-button>
</div> </div>
</div> </div>
</el-form> </el-form>
@ -114,13 +112,10 @@
style="width: 350px" type="textarea"></el-input> style="width: 350px" type="textarea"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<!-- <el-button @click.prevent="removeDomain(domain, index)"-->
<!-- >删除-->
<!-- </el-button>-->
<div class="add_box"> <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> </el-button>
<el-button size="mini" icon="el-icon-delete" @click="delDomain(domain, 2)" v-show="index > 0">删除</el-button>
</div> </div>
</div> </div>
</el-form> </el-form>
@ -242,11 +237,11 @@ export default {
}, },
//正则校验配件数量--维修数量 //正则校验配件数量--维修数量
numberIntegerValidator(rule, value, callback) { numberIntegerValidator(rule, value, callback) {
const reg = /^\+?[1-9][0-9]*$/; const reg = /^\+?[1-9][0-9]*$/
if (value === '' || reg.test(value)) { if ((value === '' || reg.test(value)) && value <= this.rowObj.repairNum) {
callback(); callback()
} else { } else {
callback(new Error('请输入大于0的正整数')); callback(new Error('请输入大于0的并且小于维修总量的正整数'))
} }
}, },
getTree() { getTree() {
@ -320,6 +315,13 @@ export default {
key: Date.now() key: Date.now()
}); });
}, },
delDomain(domain, type) {
if (type == 1) {
this.dynamicValidateForm.premiumList = this.dynamicValidateForm.premiumList.filter(item => item.key != domain.key);
} else {
this.dynamicValidateFormTwo.premiumListTwo = this.dynamicValidateFormTwo.premiumListTwo.filter(item => item.key != domain.key);
}
},
addDomainTwo() { addDomainTwo() {
this.dynamicValidateFormTwo.premiumListTwo.push({ this.dynamicValidateFormTwo.premiumListTwo.push({
selected: "N", selected: "N",

15
sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
View File

@ -28,7 +28,7 @@
@fileListChange="fileListChange" @fileListChange="fileListChange"
></uploadImage> --> ></uploadImage> -->
<upload style="width: 350px" :file-list="fileList" :action-url="actionUrl" :limit="3" :multiple="true" <upload style="width: 350px" :file-list="fileList" :action-url="actionUrl" :limit="3" :multiple="true"
@remove="handleRemove" @preview="handlePreview" @exceed="handleExceed" @before-remove="beforeRemove" @remove="handleRemove" @preview="handlePreview" @before-remove="beforeRemove"
@success="handleSuccess"> @success="handleSuccess">
<el-button size="small" type="primary">点击上传</el-button> <el-button size="small" type="primary">点击上传</el-button>
</upload> </upload>
@ -65,7 +65,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="损坏照片1："> <el-form-item label="损坏照片：">
<!-- <uploadImage <!-- <uploadImage
style="width: 250px" style="width: 250px"
:value="fileList" :value="fileList"
@ -76,7 +76,7 @@
@fileListChange="fileListChange" @fileListChange="fileListChange"
></uploadImage> --> ></uploadImage> -->
<upload style="width: 350px" :file-list="fileList" :action-url="actionUrl" :limit="3" :multiple="true" <upload style="width: 350px" :file-list="fileList" :action-url="actionUrl" :limit="3" :multiple="true"
@remove="handleRemove" @preview="handlePreview" @exceed="handleExceed" @before-remove="beforeRemove" @remove="handleRemove" @preview="handlePreview" @before-remove="beforeRemove"
@success="handleSuccess"> @success="handleSuccess">
<el-button size="small" type="primary">点击上传</el-button> <el-button size="small" type="primary">点击上传</el-button>
</upload> </upload>
@ -176,11 +176,6 @@ export default {
handlePreview(file) { handlePreview(file) {
console.log('file') console.log('file')
}, },
handleExceed(files, fileList) {
this.$message.warning(
`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`
)
},
beforeRemove(file, fileList) { beforeRemove(file, fileList) {
// return this.$confirm(`确定移除 ${file.name}？`); // return this.$confirm(`确定移除 ${file.name}？`);
}, },
@ -193,10 +188,10 @@ export default {
//正则校验配件数量--维修数量 //正则校验配件数量--维修数量
numberIntegerValidator(rule, value, callback) { numberIntegerValidator(rule, value, callback) {
const reg = /^\+?[1-9][0-9]*$/ const reg = /^\+?[1-9][0-9]*$/
if (value === '' || reg.test(value)) { if ((value === '' || reg.test(value)) && value <= this.rowObj.repairNum) {
callback() callback()
} else { } else {
callback(new Error('请输入大于0的正整数')) callback(new Error('请输入大于0的并且小于维修总量的正整数'))
} }
}, },
getList() { getList() {

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

@ -92,8 +92,7 @@
<el-input v-model="domain.partName" placeholder="请输入" size="small" maxlength="50" <el-input v-model="domain.partName" placeholder="请输入" size="small" maxlength="50"
style="width: 350px"></el-input> style="width: 350px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="是否收费：" required <el-form-item label="是否收费：" required :rules="{ required: true, message: '请选择是否收费', trigger: 'blur', }">
:rules="{ required: true, message: '请选择是否收费', trigger: 'blur', }">
<el-radio-group style="width: 350px" v-model="domain.partType"> <el-radio-group style="width: 350px" v-model="domain.partType">
<el-radio :label="1">是</el-radio> <el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio> <el-radio :label="0">否</el-radio>
@ -272,10 +271,10 @@ export default {
//正则校验配件数量--维修数量 //正则校验配件数量--维修数量
numberIntegerValidator(rule, value, callback) { numberIntegerValidator(rule, value, callback) {
const reg = /^\+?[1-9][0-9]*$/; const reg = /^\+?[1-9][0-9]*$/;
if (reg.test(value)) { if (reg.test(value) && value <= this.rowObj.repairNum) {
callback(); callback();
} else { } else {
callback(new Error('请输入大于0的正整数')); callback(new Error('请输入大于0的并且小于维修总量的正整数'));
} }
}, },
getTree() { getTree() {

18
sgzb-ui/src/views/repairTest/repair/upload.vue
View File

@ -1,19 +1,7 @@
<template> <template>
<el-upload <el-upload class="upload-demo" :action="actionUrl" :on-preview="handlePreview" :on-remove="handleRemove"
class="upload-demo" :before-remove="beforeRemove" :multiple="multiple" :limit="limit" :on-exceed="handleExceed" :file-list="fileList"
:action="actionUrl" :headers="headers" :on-success="handleSuccess" :data="uploadData" :before-upload="beforeUpload">
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-remove="beforeRemove"
:multiple="multiple"
:limit="limit"
:on-exceed="handleExceed"
:file-list="fileList"
:headers="headers"
:on-success="handleSuccess"
:data="uploadData"
:before-upload="beforeUpload"
>
<slot name="default"> <slot name="default">
<el-button size="small" type="primary">点击上传</el-button> <el-button size="small" type="primary">点击上传</el-button>
</slot> </slot>

162
sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
View File

@ -1,47 +1,18 @@
<template> <template>
<div class="app-container" id="repairWarehousing"> <div class="app-container" id="repairWarehousing">
<el-form <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form-item label="关键字" prop="keyWord"> <el-form-item label="关键字" prop="keyWord">
<el-input <el-input v-model="queryParams.keyWord" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
v-model="queryParams.keyWord" @keyup.enter.native="handleQuery" />
placeholder="请输入关键字"
clearable
maxlength="50"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="维修时间"> <el-form-item label="维修时间">
<el-date-picker <el-date-picker v-model="queryParams.wxTime" style="width: 240px" value-format="yyyy-MM-dd" type="date"
v-model="queryParams.wxTime" range-separator="-" placeholder="维修时间"></el-date-picker>
style="width: 240px"
value-format="yyyy-MM-dd"
type="date"
range-separator="-"
placeholder="维修时间"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="设备类型" prop="deviceTypeId"> <el-form-item label="设备类型" prop="deviceTypeId">
<el-select <el-select v-model="queryParams.deviceTypeId" placeholder="请选择设备类型" clearable filterable style="width: 240px">
v-model="queryParams.deviceTypeId" <el-option v-for="typeItem in typeList" :key="typeItem.typeId" :label="typeItem.typeName"
placeholder="请选择设备类型" :value="typeItem.typeId" />
clearable
filterable
style="width: 240px"
>
<el-option
v-for="typeItem in typeList"
:key="typeItem.typeId"
:label="typeItem.typeName"
:value="typeItem.typeId"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="规格型号" prop="modelId"> <!-- <el-form-item label="规格型号" prop="modelId">
@ -109,12 +80,7 @@
<el-table v-loading="loading" :data="tableList"> <el-table v-loading="loading" :data="tableList">
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="维修单号" align="center" prop="repairCode" /> <el-table-column label="维修单号" align="center" prop="repairCode" />
<el-table-column <el-table-column label="工机具类型" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
label="工机具类型"
align="center"
prop="maTypeName"
:show-overflow-tooltip="true"
/>
<el-table-column label="维修人员" align="center" prop="wxName" :show-overflow-tooltip="true" /> <el-table-column label="维修人员" align="center" prop="wxName" :show-overflow-tooltip="true" />
<el-table-column label="维修时间" align="center" prop="wxTime" :show-overflow-tooltip="true"></el-table-column> <el-table-column label="维修时间" align="center" prop="wxTime" :show-overflow-tooltip="true"></el-table-column>
<!-- <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" /> <!-- <el-table-column label="退料单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
@ -131,13 +97,8 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" icon="el-icon-zoom-in" @click="handleView(scope.row)">查看</el-button> <el-button size="mini" icon="el-icon-zoom-in" @click="handleView(scope.row)">查看</el-button>
<el-button <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(scope.row)"
size="mini" v-if="scope.row.taskStatus == '入库进行中'">审核</el-button>
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-if="scope.row.taskStatus == '入库进行中'"
>审核</el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="text"--> <!-- type="text"-->
@ -149,33 +110,15 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
v-show="total > 0" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form <el-form :model="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px">
:model="query"
ref="query"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="关键字" prop="keyWord"> <el-form-item label="关键字" prop="keyWord">
<el-input <el-input v-model="query.keyWord" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
v-model="query.keyWord" @keyup.enter.native="handleQuery" />
placeholder="请输入关键字"
clearable
maxlength="50"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="状态" prop="status"> --> <!-- <el-form-item label="状态" prop="status"> -->
<!-- <el-select --> <!-- <el-select -->
@ -192,17 +135,9 @@
<!-- </el-form-item> --> <!-- </el-form-item> -->
<el-form-item label="机具类型" prop="typeId"> <el-form-item label="机具类型" prop="typeId">
<treeselect <treeselect v-model="query.typeId" default-expand-all :options="equipmentTypeList" placeholder="请选择规格型号"
v-model="query.typeId" :disable-branch-nodes="true" style="width: 240px" noChildrenText="没有数据了" noOptionsText="没有数据"
default-expand-all noResultsText="没有搜索结果" />
:options="equipmentTypeList"
placeholder="请选择规格型号"
:disable-branch-nodes="true"
style="width: 240px"
noChildrenText="没有数据了"
noOptionsText="没有数据"
noResultsText="没有搜索结果"
/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="设备类型" prop="deviceTypeId"> --> <!-- <el-form-item label="设备类型" prop="deviceTypeId"> -->
@ -260,34 +195,18 @@
<!-- >导出</el-button>--> <!-- >导出</el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
</el-row> </el-row>
<el-table <el-table v-loading="loading" :data="detailTableList" @selection-change="handleSelectionChange" height="400">
v-loading="loading"
:data="detailTableList"
@selection-change="handleSelectionChange"
height="400"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" width="80" type="index"> <el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope"> <template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span> <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="设备类型" align="center" prop="typeName2" :show-overflow-tooltip="true" />
label="设备类型"
align="center"
prop="typeName2"
:show-overflow-tooltip="true"
/>
<el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" /> <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" /> <el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
<el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" /> <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
<el-table-column <el-table-column label="提交入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100" />
label="提交入库人员"
align="center"
prop="updateBy"
:show-overflow-tooltip="true"
width="100"
/>
<el-table-column label="提交入库时间" align="center" prop="updateTime" width="100"></el-table-column> <el-table-column label="提交入库时间" align="center" prop="updateTime" width="100"></el-table-column>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
@ -298,25 +217,11 @@
</template>--> </template>-->
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle">
label="操作"
align="center"
class-name="small-padding fixed-width"
v-if="showHandle"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" type="text" @click="pass(scope.row)" v-if="scope.row.status == '进行中'">通过</el-button>
size="mini" <el-button size="mini" type="text" v-if="scope.row.status == '进行中'"
type="text" @click="refused(scope.row)">不通过</el-button>
@click="pass(scope.row)"
v-if="scope.row.status == '进行中'"
>通过</el-button>
<el-button
size="mini"
type="text"
v-if="scope.row.status == '进行中'"
@click="refused(scope.row)"
>不通过</el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="text"--> <!-- type="text"-->
@ -328,13 +233,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="query.pageNum" :limit.sync="query.pageSize"
v-show="dialogTotal > 0" @pagination="getDialogTable" />
:total="dialogTotal"
:page.sync="query.pageNum"
:limit.sync="query.pageSize"
@pagination="getDialogTable"
/>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -396,6 +296,8 @@ export default {
query: { query: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
keyWord: '',
typeId: ''
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@ -498,6 +400,7 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
// this.reset(); // this.reset();
this.query.keyWord = ''
this.query.taskId = row.id this.query.taskId = row.id
this.getDialogTable() this.getDialogTable()
this.open = true this.open = true
@ -506,6 +409,7 @@ export default {
}, },
//查看 //查看
handleView(row) { handleView(row) {
this.query.keyWord = ''
this.query.taskId = row.id this.query.taskId = row.id
this.getDialogTable() this.getDialogTable()
this.open = true this.open = true
@ -613,7 +517,7 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function () {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.dictId != undefined) { if (this.form.dictId != undefined) {

4
sgzb-ui/vue.config.js
View File

@ -46,8 +46,8 @@ module.exports = {
// target: `http://10.40.92.8:8080`, //超 // target: `http://10.40.92.8:8080`, //超
// target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.81:8080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.74:8080`,//旭/
// target: `http://10.40.92.153:8080`, //帅 target: `http://10.40.92.140:28080`, //帅
target: `http://10.40.92.5:28080`, //福 // target: `http://10.40.92.5:28080`, //福
//******** 注意事项 ********* */ //******** 注意事项 ********* */
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target; //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;