bonus
/
nw-cqdevicemgt-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
bb_pan 2025-03-07 09:02:55 +08:00
parent 979bfe92f6
commit c3846a6992
3 changed files with 320 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/claimAndreturn/return/receive/component/addReturn1.vue
View File

@ -187,6 +187,13 @@
min-width="180" min-width="180"
> >
</el-table-column> </el-table-column>
<el-table-column
label="预退数量"
align="center"
prop="outNum"
min-width="180"
>
</el-table-column>
<el-table-column <el-table-column
label="退料数量" label="退料数量"
align="center" align="center"

591
src/views/claimAndreturn/return/receive/component/handlePage.vue
View File

@ -1,18 +1,11 @@
<template> <template>
<!-- 退料接收查看 以及退料操作页面 --> <!-- 退料接收查看 以及退料操作页面 -->
<div> <div>
<el-form <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="80px"
>
<!-- <el-form-item label="关键字" prop="keyword"> <!-- <el-form-item label="关键字" prop="keyword">
<el-input <el-input
v-model="queryParams.keyword" v-model="queryParams.keyword"
placeholder="请输入关键字" placeholder="关键字"
clearable clearable
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -20,13 +13,7 @@
</el-form-item>--> </el-form-item>-->
<el-form-item label="机具名称" prop="typeId"> <el-form-item label="机具名称" prop="typeId">
<el-select <el-select v-model="queryParams.typeId" placeholder="请选择机具名称" clearable filterable style="width: 240px">
v-model="queryParams.typeId"
placeholder="请选择机具名称"
clearable
filterable
style="width: 240px"
>
<el-option <el-option
v-for="typeItem in typeList" v-for="typeItem in typeList"
:key="typeItem.typeId" :key="typeItem.typeId"
@ -50,21 +37,10 @@
</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" :loading="loading">
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
:loading="loading"
>
查询 查询
</el-button> </el-button>
<el-button <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -75,9 +51,7 @@
> >
</el-col> --> </el-col> -->
<el-col :span="1.5" v-if="!isView"> <el-col :span="1.5" v-if="!isView">
<el-button type="primary" size="mini" @click="completeBack" <el-button type="primary" size="mini" @click="completeBack">完成退料</el-button>
>完成退料</el-button
>
</el-col> </el-col>
</el-row> </el-row>
@ -88,9 +62,7 @@
align="center" align="center"
width="80" width="80"
type="index" type="index"
:index=" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
indexContinuation(queryParams.pageNum, queryParams.pageSize)
"
> >
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ <span>{{
@ -98,12 +70,7 @@
}}</span> }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
label="机具名称"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column type="expand" v-if="isPlural"> <!-- <el-table-column type="expand" v-if="isPlural">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="nested-table-container"> <div class="nested-table-container">
@ -145,68 +112,27 @@
</div> </div>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column <el-table-column label="规格型号" align="center" prop="typeCode" :show-overflow-tooltip="true" />
label="规格型号" <el-table-column label="退料人员" align="center" prop="backPerson" show-overflow-tooltip />
align="center" <el-table-column label="申请数量" align="center" prop="preNum" :show-overflow-tooltip="true" />
prop="typeCode" <el-table-column label="已完成退料数量" align="center" prop="finishedBackNum" :show-overflow-tooltip="true" />
:show-overflow-tooltip="true" <el-table-column label="最大退料数量" align="center" :show-overflow-tooltip="true">
/>
<el-table-column
label="退料人员"
align="center"
prop="backPerson"
show-overflow-tooltip
/>
<el-table-column
label="申请数量"
align="center"
prop="preNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="已完成退料数量"
align="center"
prop="finishedBackNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="最大退料数量"
align="center"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span> <span>
{{ {{
(scope.row.partNum = (scope.row.partNum =
scope.row.manageType == 0 || scope.row.manageType == 0 || scope.row.manageType == 1 ? scope.row.maxBackNum : scope.row.partNum)
scope.row.manageType == 1
? scope.row.maxBackNum
: scope.row.partNum)
}} }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="退料接收时间" align="center" prop="backReceiveTime" :show-overflow-tooltip="true" />
label="退料接收时间" <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
align="center"
prop="backReceiveTime"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="300"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@click="handleViewCode(scope.row)" @click="handleViewCode(scope.row)"
v-if=" v-if="scope.row.manageType == '0' || scope.row.manageType == '1' || scope.row.manageType == '2'"
scope.row.manageType == '0' ||
scope.row.manageType == '1' ||
scope.row.manageType == '2'
"
> >
查看 查看
</el-button> </el-button>
@ -234,8 +160,7 @@
@click="handleNumReturn(scope.row)" @click="handleNumReturn(scope.row)"
v-if=" v-if="
!isView && !isView &&
(scope.row.manageType == '1' || (scope.row.manageType == '1' || scope.row.manageType == '2') &&
scope.row.manageType == '2') &&
scope.row.maxBackNum > 0 && scope.row.maxBackNum > 0 &&
(userId == scope.row.userId || userId == 1) (userId == scope.row.userId || userId == 1)
" "
@ -246,11 +171,7 @@
size="mini" size="mini"
icon="el-icon-zoom-in" icon="el-icon-zoom-in"
@click="handleBackup(scope.row)" @click="handleBackup(scope.row)"
v-if=" v-if="!isView && scope.row.inCompletedBackNum > 0 && (userId == scope.row.userId || userId == 1)"
!isView &&
scope.row.inCompletedBackNum > 0 &&
(userId == scope.row.userId || userId == 1)
"
> >
撤回 撤回
</el-button> </el-button>
@ -267,85 +188,39 @@
/> />
<!-- 编码退料弹窗 --> <!-- 编码退料弹窗 -->
<el-dialog <el-dialog :title="title" :visible.sync="openCode" width="1200px" append-to-body>
:title="title"
:visible.sync="openCode"
width="1200px"
append-to-body
>
<!-- <div style="margin-left: 40px; margin-bottom: 10px" <!-- <div style="margin-left: 40px; margin-bottom: 10px"
>退料数量：{{ returnNum }}</div >退料数量：{{ returnNum }}</div
> --> > -->
<el-form <el-form :model="codeQuery" ref="codeQuery" size="small" :inline="true" label-width="100px">
:model="codeQuery"
ref="codeQuery"
size="small"
:inline="true"
label-width="100px"
>
<el-form-item label="设备编码" prop="maCode"> <el-form-item label="设备编码" prop="maCode">
<el-input v-model="codeQuery.maCode" maxlength="20" /> <el-input v-model="codeQuery.maCode" maxlength="20" />
</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="handleCodeQuery">查询</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="resetCodeQuery">重置</el-button>
icon="el-icon-search"
size="mini"
@click="handleCodeQuery"
>查询</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetCodeQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8" v-if="!dialogIsView"> <el-row :gutter="10" class="mb8" v-if="!dialogIsView">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="success" size="mini" :disabled="multiple" @click="saveCodeBackBatch(1)">批量合格</el-button>
type="success"
size="mini"
:disabled="multiple"
@click="saveCodeBackBatch(1)"
>批量合格</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" size="mini" :disabled="multiple" @click="saveCodeBackBatch(2)">批量维修</el-button>
type="primary"
size="mini"
:disabled="multiple"
@click="saveCodeBackBatch(2)"
>批量维修</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="warning" size="mini" :disabled="multiple" @click="saveCodeBackBatch(3)">批量报废</el-button>
type="warning"
size="mini"
:disabled="multiple"
@click="saveCodeBackBatch(3)"
>批量报废</el-button
>
</el-col> </el-col>
</el-row> </el-row>
<el-table <el-table v-loading="loading" :data="codeList" @selection-change="handleSelectionChange">
v-loading="loading"
:data="codeList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
label="序号" label="序号"
align="center" align="center"
width="80" width="80"
type="index" type="index"
:index=" :index="indexContinuation(codeQuery.pageNum, codeQuery.pageSize)"
indexContinuation(codeQuery.pageNum, codeQuery.pageSize)
"
> >
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ <span>{{
@ -353,30 +228,66 @@
}}</span> }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="设备类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
label="设备类型" <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
align="center" <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
prop="typeName" <el-table-column label="状态" align="center" prop="maStatus" :show-overflow-tooltip="true" />
:show-overflow-tooltip="true" <el-table-column label="附件" align="center" prop="fileList">
<template slot-scope="scope">
<el-upload
class="upload-demo"
:action="uploadUrl"
:headers="headers"
accept="image/*,application/pdf"
multiple
:limit="5"
:file-list="scope.row.fileList"
:before-remove="beforeRemove"
:on-preview="handlePreview"
:on-remove="(file, fileList) => handleRemove(file, fileList, scope.row)"
:on-exceed="handleExceed"
:on-success="(res, file, fileList) => handleSuccess(file, fileList, scope.row)"
>
<el-button v-if="!dialogIsView" size="mini" type="primary">点击上传</el-button>
</el-upload>
</template>
</el-table-column>
<el-table-column label="待维修备注" align="center" prop="serviceRemark" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input
v-model="scope.row.serviceRemark"
placeholder="待维修备注"
clearable
:disabled="dialogIsView"
style="width: 100%"
/> />
<el-table-column </template>
label="规格型号" </el-table-column>
align="center" <el-table-column label="报废原因" align="center" prop="scrapReason">
prop="typeModelName" <template slot-scope="scope">
:show-overflow-tooltip="true" <el-select
/> v-model="scope.row.scrapReason"
<el-table-column placeholder="报废原因"
label="设备编码" clearable
align="center" :disabled="dialogIsView"
prop="maCode" style="width: 100%"
:show-overflow-tooltip="true" >
/> <el-option label="人为" value="1" />
<el-table-column <el-option label="自然损坏" value="2" />
label="状态" </el-select>
align="center" </template>
prop="maStatus" </el-table-column>
:show-overflow-tooltip="true" <el-table-column label="待报废备注" align="center" prop="scrapRemark" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input
v-model="scope.row.scrapRemark"
placeholder="待报废备注"
clearable
:disabled="dialogIsView"
style="width: 100%"
/> />
</template>
</el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
@ -385,24 +296,9 @@
width="250" width="250"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" type="success" @click="saveCodeBack(scope.row, 1)">合格</el-button>
size="mini" <el-button size="mini" type="primary" @click="saveCodeBack(scope.row, 2)">待维修</el-button>
type="success" <el-button size="mini" type="warning" @click="saveCodeBack(scope.row, 3)">预报废</el-button>
@click="saveCodeBack(scope.row, 1)"
>合格</el-button
>
<el-button
size="mini"
type="primary"
@click="saveCodeBack(scope.row, 2)"
>待维修</el-button
>
<el-button
size="mini"
type="warning"
@click="saveCodeBack(scope.row, 3)"
>预报废</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -416,26 +312,14 @@
</el-dialog> </el-dialog>
<!-- 数量退料弹窗 --> <!-- 数量退料弹窗 -->
<el-dialog <el-dialog :title="title" :visible.sync="openNum" width="1200px" append-to-body v-if="openNum">
:title="title"
:visible.sync="openNum"
width="1200px"
append-to-body
>
<div v-if="dialogData.typeMange == 2"> <div v-if="dialogData.typeMange == 2">
<div style="margin-bottom: 30px"> <div style="margin-bottom: 30px">
接收抱杆类型：{{ dialogData.typeName }}，型号：{{ 接收抱杆类型：{{ dialogData.typeName }}，型号：{{ dialogData.typeCode }}，付数：{{ returnNum }}。接收明细如下
dialogData.typeCode
}}，付数：{{ returnNum }}。接收明细如下
</div> </div>
<el-row :gutter="10" class="mb8" v-if="!dialogIsView"> <el-row :gutter="10" class="mb8" v-if="!dialogIsView">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" size="mini" v-if="returnNum > 0" @click="saveNumReturn(dialogData.typeMange)">
type="primary"
size="mini"
v-if="returnNum > 0"
@click="saveNumReturn(dialogData.typeMange)"
>
保存 保存
</el-button> </el-button>
</el-col> </el-col>
@ -443,40 +327,15 @@
<el-table :data="dialogData.maTypeDetails" style="width: 100%"> <el-table :data="dialogData.maTypeDetails" style="width: 100%">
<!-- 子表格的列 --> <!-- 子表格的列 -->
<el-table-column label="序号" align="center" type="index" /> <el-table-column label="序号" align="center" type="index" />
<el-table-column <el-table-column label="设备类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
label="设备类型" <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
align="center" <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
prop="typeName" <el-table-column label="应退数量" align="center" prop="partNum" :show-overflow-tooltip="true" />
:show-overflow-tooltip="true" <el-table-column label="合格数量" align="center" prop="qualifiedNum" :show-overflow-tooltip="true">
/>
<el-table-column
label="规格型号"
align="center"
prop="typeModelName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="单位"
align="center"
prop="unitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="应退数量"
align="center"
prop="partNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="合格数量"
align="center"
prop="qualifiedNum"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model.number="scope.row.qualifiedNum" v-model.number="scope.row.qualifiedNum"
placeholder="请输入合格数量" placeholder="合格数量"
type="number" type="number"
:min="0" :min="0"
clearable clearable
@ -485,16 +344,11 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="待维修数量" align="center" prop="serviceNum" :show-overflow-tooltip="true">
label="待维修数量"
align="center"
prop="serviceNum"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model.number="scope.row.serviceNum" v-model.number="scope.row.serviceNum"
placeholder="请输入待维修数量" placeholder="待维修数量"
type="number" type="number"
:min="0" :min="0"
clearable clearable
@ -503,15 +357,11 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="待报废数量" align="center" prop="scrapNum">
label="待报废数量"
align="center"
prop="scrapNum"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model.number="scope.row.scrapNum" v-model.number="scope.row.scrapNum"
placeholder="请输入待报废数量" placeholder="待报废数量"
type="number" type="number"
:min="0" :min="0"
clearable clearable
@ -529,46 +379,41 @@
> --> > -->
<el-row :gutter="10" class="mb8" v-if="!dialogIsView"> <el-row :gutter="10" class="mb8" v-if="!dialogIsView">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" size="mini" v-if="returnNum > 0" @click="saveNumReturn(dialogData.typeMange)">
type="primary"
size="mini"
v-if="returnNum > 0"
@click="saveNumReturn(dialogData.typeMange)"
>
保存 保存
</el-button> </el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-table v-loading="loading" :data="numList" height="500"> <el-table v-loading="loading" :data="numList" height="500">
<el-table-column label="序号" align="center" type="index" /> <el-table-column label="序号" align="center" type="index" />
<el-table-column <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
label="机具名称" <el-table-column label="规格型号" align="center" prop="typeCode" :show-overflow-tooltip="true" />
align="center" <el-table-column label="最大退料数量" align="center" prop="backNum" :show-overflow-tooltip="true" />
prop="typeName" <el-table-column label="附件" align="center" prop="fileList">
:show-overflow-tooltip="true" <template slot-scope="scope">
/> <el-upload
<el-table-column class="upload-demo"
label="规格型号" :action="uploadUrl"
align="center" :headers="headers"
prop="typeCode" accept="image/*,application/pdf"
:show-overflow-tooltip="true" multiple
/> :limit="5"
<el-table-column :file-list="scope.row.fileList"
label="最大退料数量" :before-remove="beforeRemove"
align="center" :on-preview="handlePreview"
prop="backNum" :on-remove="(file, fileList) => handleRemove(file, fileList, scope.row)"
:show-overflow-tooltip="true" :on-exceed="handleExceed"
/> :on-success="(res, file, fileList) => handleSuccess(file, fileList, scope.row)"
<el-table-column
label="合格数量"
align="center"
prop="qualifiedNum"
:show-overflow-tooltip="true"
> >
<el-button v-if="!dialogIsView" size="mini" type="primary">点击上传</el-button>
</el-upload>
</template>
</el-table-column>
<el-table-column label="合格数量" align="center" prop="qualifiedNum" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model.number="scope.row.qualifiedNum" v-model.number="scope.row.qualifiedNum"
placeholder="请输入合格数量" placeholder="合格数量"
type="number" type="number"
:min="0" :min="0"
clearable clearable
@ -577,16 +422,11 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="待维修数量" align="center" prop="serviceNum" :show-overflow-tooltip="true">
label="待维修数量"
align="center"
prop="serviceNum"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model.number="scope.row.serviceNum" v-model.number="scope.row.serviceNum"
placeholder="请输入待维修数量" placeholder="待维修数量"
type="number" type="number"
:min="0" :min="0"
clearable clearable
@ -595,15 +435,22 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="待维修备注" align="center" prop="serviceRemark" :show-overflow-tooltip="true">
label="待报废数量" <template slot-scope="scope">
align="center" <el-input
prop="scrapNum" v-model="scope.row.serviceRemark"
> placeholder="待维修备注"
clearable
:disabled="dialogIsView"
style="width: 100%"
/>
</template>
</el-table-column>
<el-table-column label="待报废数量" align="center" prop="scrapNum">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model.number="scope.row.scrapNum" v-model.number="scope.row.scrapNum"
placeholder="请输入待报废数量" placeholder="待报废数量"
type="number" type="number"
:min="0" :min="0"
clearable clearable
@ -612,6 +459,31 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报废原因" align="center" prop="scrapReason">
<template slot-scope="scope">
<el-select
v-model="scope.row.scrapReason"
placeholder="报废原因"
clearable
:disabled="dialogIsView"
style="width: 100%"
>
<el-option label="人为" value="1" />
<el-option label="自然损坏" value="2" />
</el-select>
</template>
</el-table-column>
<el-table-column label="待报废备注" align="center" prop="scrapRemark" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input
v-model="scope.row.scrapRemark"
placeholder="待报废备注"
clearable
:disabled="dialogIsView"
style="width: 100%"
/>
</template>
</el-table-column>
<!-- <el-table-column label="报废信息" align="center" prop="" :show-overflow-tooltip="true" /> --> <!-- <el-table-column label="报废信息" align="center" prop="" :show-overflow-tooltip="true" /> -->
</el-table> </el-table>
</div> </div>
@ -636,6 +508,8 @@ import { equipmentTypeTree } from '@/api/store/tools'
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { getInfo } from '@/api/login' import { getInfo } from '@/api/login'
import { getToken } from '@/utils/auth'
export default { export default {
// name: "returnInDetail", // name: "returnInDetail",
components: { Treeselect }, components: { Treeselect },
@ -655,6 +529,10 @@ export default {
}, },
data() { data() {
return { return {
uploadUrl: process.env.VUE_APP_BASE_API + '/system/sys/file/upload', // 上传的图片服务器地址
headers: {
Authorization: 'Bearer ' + getToken(),
},
createBy: '', //用户名 createBy: '', //用户名
// 遮罩层 // 遮罩层
loading: false, loading: false,
@ -756,15 +634,10 @@ export default {
item.children.forEach((item2, index2) => { item.children.forEach((item2, index2) => {
if (item2.children && item2.children.length > 0) { if (item2.children && item2.children.length > 0) {
item2.children.forEach((item3) => { item2.children.forEach((item3) => {
if ( if (item3.children && item3.children.length > 0) {
item3.children &&
item3.children.length > 0
) {
item3.children.forEach((item4) => { item3.children.forEach((item4) => {
item4.machineTypeName = item4.machineTypeName = item3.typeName
item3.typeName item4.specificationType = item4.typeName
item4.specificationType =
item4.typeName
this.$set(item4, 'purchasePrice', 0) this.$set(item4, 'purchasePrice', 0)
this.$set(item4, 'purchaseNum', 1) this.$set(item4, 'purchaseNum', 1)
}) })
@ -824,8 +697,9 @@ export default {
this.$confirm('该操作后进行退料的数据之后无法再次修改和删除，是否确认？', '提示', { this.$confirm('该操作后进行退料的数据之后无法再次修改和删除，是否确认？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning',
}).then(async () => { })
.then(async () => {
let param1 = { let param1 = {
parentId: this.queryParams.id, parentId: this.queryParams.id,
} }
@ -844,18 +718,18 @@ export default {
} }
}) })
} }
}).catch(() => { })
.catch(() => {
// this.$message({ // this.$message({
// type: 'info', // type: 'info',
// message: '已取消操作' // message: '已取消操作'
// }); // });
}); })
// let param1 = { // let param1 = {
// parentId: this.queryParams.id, // parentId: this.queryParams.id,
// } // }
// const res1 = await getRecord(param1) // const res1 = await getRecord(param1)
// if (res1.code == 200) { // if (res1.code == 200) {
// let param = { // let param = {
@ -889,6 +763,14 @@ export default {
item.qualifiedNum = item.hgNum item.qualifiedNum = item.hgNum
item.serviceNum = item.wxNum item.serviceNum = item.wxNum
item.scrapNum = item.bfNum item.scrapNum = item.bfNum
// item.serviceRemark = item.wxRemark
// item.scrapRemark = item.bfRemark
// item.scrapReason = item.bfReason
// item.fileList = item.fileList
item.fileList?.forEach((item2) => {
item2.url = item2.fileUrl
item2.name = item2.fileName
})
// if (item.backStatus == '1') { // if (item.backStatus == '1') {
// item.qualifiedNum = item.backNum // item.qualifiedNum = item.backNum
// item.serviceNum = 0 // item.serviceNum = 0
@ -918,9 +800,7 @@ export default {
this.handleCodeQuery() this.handleCodeQuery()
} else if (row.manageType == '2') { } else if (row.manageType == '2') {
this.handleNumReturn(row) this.handleNumReturn(row)
const modelIdsJoined = row.maTypeDetails const modelIdsJoined = row.maTypeDetails.map((item) => item.modelId).join(',')
.map((item) => item.modelId)
.join(',')
let param = { let param = {
parentId: row.id, parentId: row.id,
typeId: modelIdsJoined, typeId: modelIdsJoined,
@ -932,9 +812,7 @@ export default {
this.openNum = true this.openNum = true
this.dialogIsView = true this.dialogIsView = true
this.dialogData.maTypeDetails.map((itemA) => { this.dialogData.maTypeDetails.map((itemA) => {
const matchingItemB = res.data.rows.find( const matchingItemB = res.data.rows.find((itemB) => itemA.modelId === itemB.modelId)
(itemB) => itemA.modelId === itemB.modelId,
)
if (matchingItemB) { if (matchingItemB) {
// switch (matchingItemB.backStatus) { // switch (matchingItemB.backStatus) {
// case '1': // case '1':
@ -982,6 +860,10 @@ export default {
this.$set(item, 'qualifiedNum', undefined) this.$set(item, 'qualifiedNum', undefined)
this.$set(item, 'serviceNum', undefined) this.$set(item, 'serviceNum', undefined)
this.$set(item, 'scrapNum', undefined) this.$set(item, 'scrapNum', undefined)
this.$set(item, 'serviceRemark', undefined)
this.$set(item, 'scrapRemark', undefined)
this.$set(item, 'fileList', [])
this.$set(item, 'scrapReason', undefined)
}) })
this.dialogData.maTypeDetails = row.maTypeDetails this.dialogData.maTypeDetails = row.maTypeDetails
} }
@ -1029,6 +911,12 @@ export default {
getBackMachine(this.codeQuery).then((response) => { getBackMachine(this.codeQuery).then((response) => {
this.codeList = response.data.rows this.codeList = response.data.rows
this.codeTotal = response.data.total this.codeTotal = response.data.total
this.codeList.forEach((item) => {
this.$set(item, 'fileList', [])
this.$set(item, 'serviceRemark', '')
this.$set(item, 'scrapRemark', '')
this.$set(item, 'scrapReason', '')
})
}) })
}, },
//获取退料编码查看列表 //获取退料编码查看列表
@ -1047,6 +935,10 @@ export default {
if (item.backStatus == '3') { if (item.backStatus == '3') {
item.maStatus = '报废' item.maStatus = '报废'
} }
item.fileList?.forEach((item) => {
item.url = item.filePath
item.name = item.fileName
})
}) })
this.codeTotal = response.data.total this.codeTotal = response.data.total
}) })
@ -1064,10 +956,7 @@ export default {
} }
let arr = [] let arr = []
for (const item of data) { for (const item of data) {
let sumUnmber = let sumUnmber = (item.qualifiedNum || 0) + (item.serviceNum || 0) + (item.scrapNum || 0)
(item.qualifiedNum || 0) +
(item.serviceNum || 0) +
(item.scrapNum || 0)
if (sumUnmber > item.partNum && sumUnmber > item.num) { if (sumUnmber > item.partNum && sumUnmber > item.num) {
this.$modal.msgError('退料总量已大于待退料数量！') this.$modal.msgError('退料总量已大于待退料数量！')
return return
@ -1080,6 +969,9 @@ export default {
createBy: this.createBy, createBy: this.createBy,
backStatus: 1, backStatus: 1,
backNum: item.qualifiedNum, backNum: item.qualifiedNum,
serviceRemark: item.serviceRemark,
scrapRemark: item.scrapRemark,
fileList: item.fileList,
} }
arr.push(obj) arr.push(obj)
} }
@ -1091,6 +983,9 @@ export default {
createBy: this.createBy, createBy: this.createBy,
backStatus: 2, backStatus: 2,
backNum: item.serviceNum, backNum: item.serviceNum,
serviceRemark: item.serviceRemark,
scrapRemark: item.scrapRemark,
fileList: item.fileList,
} }
arr.push(obj) arr.push(obj)
} }
@ -1102,6 +997,9 @@ export default {
createBy: this.createBy, createBy: this.createBy,
backStatus: 3, backStatus: 3,
backNum: item.scrapNum, backNum: item.scrapNum,
serviceRemark: item.serviceRemark,
scrapRemark: item.scrapRemark,
fileList: item.fileList,
} }
arr.push(obj) arr.push(obj)
} }
@ -1133,6 +1031,10 @@ export default {
manageType: 0, manageType: 0,
createBy: this.createBy, createBy: this.createBy,
maId: row.maId, maId: row.maId,
scrapReason: row.scrapReason,
scrapRemark: row.scrapRemark,
serviceRemark: row.serviceRemark,
fileList: row.fileList,
}, },
] ]
let param = { let param = {
@ -1171,6 +1073,10 @@ export default {
manageType: 0, manageType: 0,
createBy: this.createBy, createBy: this.createBy,
maId: item.maId, maId: item.maId,
scrapReason: item.scrapReason,
scrapRemark: item.scrapRemark,
serviceRemark: item.serviceRemark,
fileList: item.fileList,
} }
}) })
let param = { let param = {
@ -1182,14 +1088,59 @@ export default {
if (response.code == 200) { if (response.code == 200) {
this.$modal.msgSuccess('操作成功') this.$modal.msgSuccess('操作成功')
// this.openCode = false; // this.openCode = false;
this.returnNum = this.returnNum = Number(this.returnNum) - this.codeSelectList.length
Number(this.returnNum) - this.codeSelectList.length
this.handleCodeQuery() this.handleCodeQuery()
this.handleQuery() this.handleQuery()
} }
}) })
} }
}, },
handleRemove(file, fileList, row) {
console.log(file, fileList)
console.log('🚀 ~ handleRemove ~ row:', row)
row.fileList = fileList.map((item) => {
let fileName = ''
let fileUrl = ''
if (item.response) {
fileName = item.response.data.fileName
fileUrl = item.response.data.fileUrl
} else {
fileName = item.fileName
fileUrl = item.fileUrl
}
return {
fileName: fileName,
fileUrl: fileUrl,
}
})
console.log('🚀 ~ handleRemove ~ row.fileList:', row.fileList)
},
handlePreview(file) {
console.log('🚀 ~ handlePreview ~ file:', file)
// if (file.response) {
// window.open(file.response.data.fileUrl)
// } else {
// window.open(file.fileUrl)
// }
},
handleExceed(files, fileList) {
this.$message.warning(
`当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`,
)
},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.name} ？`)
},
handleSuccess(file, fileList, row) {
console.log(file, fileList, row)
row.fileList = fileList.map((item) => {
return {
fileName: item.response?.data.fileName,
fileUrl: item.response?.data.fileUrl,
}
})
console.log('🚀 ~ row.fileList=fileList.map ~ row.fileList:', row.fileList)
},
}, },
} }
</script> </script>

11
src/views/repairTest/repair/dialogOneForm.vue
View File

@ -60,7 +60,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item <el-form-item
:prop="'premiumList.' + index + '.partType'" :prop="'premiumList.' + index + '.partType'"
label="是否收费：" label="是否收费："
required required
@ -77,7 +77,7 @@
<el-radio :label="1">是</el-radio> <el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio> <el-radio :label="0">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> --> </el-form-item>
<el-form-item <el-form-item
:prop="'premiumList.' + index + '.partNum'" :prop="'premiumList.' + index + '.partNum'"
@ -229,7 +229,7 @@
@input="handleSelectTree($event, index)" @input="handleSelectTree($event, index)"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item <el-form-item
:prop="'premiumListTwo.' + index + '.partType'" :prop="'premiumListTwo.' + index + '.partType'"
label="是否收费：" label="是否收费："
required required
@ -246,7 +246,7 @@
<el-radio :label="1">是</el-radio> <el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio> <el-radio :label="0">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> --> </el-form-item>
<el-form-item <el-form-item
:prop="'premiumListTwo.' + index + '.partNum'" :prop="'premiumListTwo.' + index + '.partNum'"
label="配件数量：" label="配件数量："
@ -395,6 +395,7 @@ export default {
downRate: undefined, downRate: undefined,
downFee: undefined, downFee: undefined,
xiayoufeiyonge_unit: '', xiayoufeiyonge_unit: '',
isCharge: '',
}, },
], ],
}, },
@ -722,4 +723,4 @@ export default {
margin-right: 3%; margin-right: 3%;
margin-top: 10px; margin-top: 10px;
} }
</style> </>