This commit is contained in:
parent
ff490e7441
commit
546485505b
|
|
@ -538,7 +538,7 @@ export default {
|
|||
})
|
||||
.finally(() => {
|
||||
// 刷新页面
|
||||
window.location.reload()
|
||||
// window.location.reload()
|
||||
})
|
||||
},
|
||||
//审核 驳回
|
||||
|
|
|
|||
|
|
@ -354,47 +354,6 @@
|
|||
align="center"
|
||||
prop="typeName"
|
||||
/>
|
||||
<el-table-column type="expand">
|
||||
<template slot-scope="scope">
|
||||
<div class="nested-table-container">
|
||||
<el-table
|
||||
:data="scope.row.maTypeDetails"
|
||||
style="width: 100%"
|
||||
>
|
||||
<!-- 子表格的列 -->
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
/>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
: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>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -180,7 +180,7 @@
|
|||
(scope.row.partNum =
|
||||
scope.row.manageType == 0 ||
|
||||
scope.row.manageType == 1
|
||||
? scope.row.maxBackNum
|
||||
? scope.row.preNum
|
||||
: scope.row.partNum)
|
||||
}}
|
||||
</span>
|
||||
|
|
@ -222,7 +222,7 @@
|
|||
v-if="
|
||||
!isView &&
|
||||
scope.row.manageType == '0' &&
|
||||
scope.row.maxBackNum > 0 &&
|
||||
scope.row.preNum > 0 &&
|
||||
(userId == scope.row.userId || userId == 1)
|
||||
"
|
||||
>
|
||||
|
|
@ -236,7 +236,7 @@
|
|||
!isView &&
|
||||
(scope.row.manageType == '1' ||
|
||||
scope.row.manageType == '2') &&
|
||||
scope.row.maxBackNum > 0 &&
|
||||
scope.row.preNum > 0 &&
|
||||
(userId == scope.row.userId || userId == 1)
|
||||
"
|
||||
>
|
||||
|
|
@ -881,7 +881,7 @@ export default {
|
|||
this.codeQuery.parentId = row.id
|
||||
this.codeQuery.typeId = row.modelId
|
||||
this.dialogIsView = true
|
||||
this.returnNum = Number(row.maxBackNum)
|
||||
this.returnNum = Number(row.preNum)
|
||||
this.handleCodeQuery()
|
||||
} else if (row.manageType == '2') {
|
||||
this.handleNumReturn(row)
|
||||
|
|
@ -931,7 +931,7 @@ export default {
|
|||
this.codeQuery.typeId = row.modelId
|
||||
this.codeQuery.agreementId = row.agreementId
|
||||
this.dialogIsView = false
|
||||
this.returnNum = Number(row.maxBackNum)
|
||||
this.returnNum = Number(row.preNum)
|
||||
this.handleCodeQuery()
|
||||
},
|
||||
//数量退料
|
||||
|
|
@ -939,8 +939,8 @@ export default {
|
|||
this.title = '数量退料'
|
||||
this.openNum = true
|
||||
this.dialogIsView = false
|
||||
this.$set(row, 'backNum', row.maxBackNum) //退料数量
|
||||
this.returnNum = Number(row.maxBackNum)
|
||||
this.$set(row, 'backNum', row.preNum) //退料数量
|
||||
this.returnNum = Number(row.preNum)
|
||||
this.dialogData.typeMange = row.manageType
|
||||
this.dialogData.typeName = row.typeName
|
||||
this.dialogData.typeCode = row.typeCode
|
||||
|
|
|
|||
|
|
@ -126,6 +126,11 @@
|
|||
>批量审核</el-button
|
||||
>
|
||||
</el-col> -->
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain size="mini" @click="handleAdd"
|
||||
>退料接收</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
|
|
@ -322,16 +327,16 @@ export default {
|
|||
unitList: [],
|
||||
proList: [],
|
||||
taskStatusList: [
|
||||
// {
|
||||
// name: '待退料审核',
|
||||
// id: '37',
|
||||
// },
|
||||
// {
|
||||
// name: '退料审核通过',
|
||||
// id: '38',
|
||||
// },
|
||||
{
|
||||
name: '待退料审核',
|
||||
id: '37',
|
||||
},
|
||||
{
|
||||
name: '退料审核通过',
|
||||
id: '38',
|
||||
},
|
||||
{
|
||||
name: '退料核查中',
|
||||
name: '退料进行中',
|
||||
id: '39',
|
||||
},
|
||||
{
|
||||
|
|
@ -339,9 +344,13 @@ export default {
|
|||
id: '40',
|
||||
},
|
||||
{
|
||||
name: '退料审核驳回',
|
||||
id: '101',
|
||||
name: '退料未开始',
|
||||
id: '139',
|
||||
},
|
||||
// {
|
||||
// name: '退料审核驳回',
|
||||
// id: '101',
|
||||
// },
|
||||
],
|
||||
rowObj: {},
|
||||
}
|
||||
|
|
@ -446,6 +455,13 @@ export default {
|
|||
this.initSelectData()
|
||||
this.handleQuery()
|
||||
},
|
||||
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
// this.$tab.closeOpenPage('/claimAndRefund/return/returnApplyAddByCq')
|
||||
this.$emit('returnApply')
|
||||
},
|
||||
|
||||
//打开退料单
|
||||
handlePrint(row) {
|
||||
// this.title = "退料单";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@
|
|||
:isView="isView"
|
||||
:rejectId="rejectId"
|
||||
:rejectTaskId="rejectTaskId"
|
||||
:isEdit="isEdit"
|
||||
@returnApply="returnApply"
|
||||
@receiveView="receiveView"
|
||||
@receiveReturn="receiveReturn"
|
||||
@goBackPage="goBack"
|
||||
|
|
@ -22,11 +24,13 @@
|
|||
import PageHeader from '@/components/pageHeader'
|
||||
import Home from './component/home.vue'
|
||||
import HandlePage from './component/handlePage.vue'
|
||||
import AddReturn from './component/addReturn1.vue'
|
||||
export default {
|
||||
components: {
|
||||
PageHeader,
|
||||
Home,
|
||||
HandlePage,
|
||||
AddReturn,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -35,9 +39,17 @@ export default {
|
|||
rejectId: '',
|
||||
rejectTaskId: '',
|
||||
isView: false,
|
||||
isEdit: false,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
// 退料申请
|
||||
returnApply() {
|
||||
this.rejectId = ''
|
||||
this.pageContent = '新建退料任务'
|
||||
this.isShowComponent = 'AddReturn'
|
||||
this.isEdit = false
|
||||
},
|
||||
// 查看
|
||||
receiveView(id) {
|
||||
this.pageContent = '退料详情'
|
||||
|
|
|
|||
|
|
@ -548,12 +548,17 @@
|
|||
width="500px"
|
||||
append-to-body
|
||||
>
|
||||
<div style="text-align: center">
|
||||
<div >
|
||||
<div class="uploadImg">
|
||||
<div id="qrcode" class="qrcode" ref="codeItem"></div>
|
||||
<!-- <img src="" alt="">-->
|
||||
</div>
|
||||
<div class="maCode">二维码编号：{{ rowObj.qrCode }}</div>
|
||||
<div class="info-container">
|
||||
<div class="maCode">机具名称：{{ rowObj.deviceType }}</div>
|
||||
<div class="maCode">规格型号：{{ rowObj.specificationType }}</div>
|
||||
<div class="maCode">资产编号：{{ rowObj.maCode }}</div>
|
||||
<div class="maCode">二维码编号：{{ rowObj.qrCode }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div slot="footer" class="dialog-footer" style="text-align: center">
|
||||
<!-- <el-button type="primary" @click="downloadCode">下 载</el-button> -->
|
||||
|
|
@ -926,6 +931,14 @@ export default {
|
|||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.info-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
justify-content: center;
|
||||
gap: 10px; /* 可根据需要调整间距 */
|
||||
padding-left:100px;
|
||||
}
|
||||
.maCode {
|
||||
margin-top: 15px;
|
||||
font-size: 18px;
|
||||
|
|
|
|||
|
|
@ -437,7 +437,12 @@
|
|||
<div id="qrcode" class="qrcode" ref="codeItem"></div>
|
||||
<!-- <img src="" alt="">-->
|
||||
</div>
|
||||
<div class="maCode">设备编号：{{ rowObj.maCode }}</div>
|
||||
<div class="info-container">
|
||||
<div class="maCode">机具名称：{{ rowObj.modelName }}</div>
|
||||
<div class="maCode">规格型号：{{ rowObj.typeName }}</div>
|
||||
<div class="maCode">设备编号：{{ rowObj.maCode }}</div>
|
||||
<div class="maCode">标签编号：{{ rowObj.labelCode }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div slot="footer" class="dialog-footer" style="text-align: center">
|
||||
<el-button type="primary" @click="downloadCode"
|
||||
|
|
@ -1114,10 +1119,18 @@ export default {
|
|||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.info-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
justify-content: center;
|
||||
gap: 10px; /* 可根据需要调整间距 */
|
||||
padding-left:80px;
|
||||
}
|
||||
.maCode {
|
||||
margin-top: 10px;
|
||||
padding-bottom: 20px;
|
||||
margin-top: 15px;
|
||||
font-size: 18px;
|
||||
// margin-left:40px;
|
||||
}
|
||||
::v-deep.el-table .fixed-width .el-button--mini {
|
||||
width: 60px !important;
|
||||
|
|
|
|||
|
|
@ -171,7 +171,12 @@
|
|||
<div class="uploadImg">
|
||||
<div id="qrcode" class="qrcode" ref="codeItem"></div>
|
||||
</div>
|
||||
<div class="maCode">设备编号：{{ rowObj.maCode }}</div>
|
||||
<div class="info-container">
|
||||
<div class="maCode">机具名称：{{ rowObj.modelName }}</div>
|
||||
<div class="maCode">规格型号：{{ rowObj.typeName }}</div>
|
||||
<div class="maCode">设备编号：{{ rowObj.maCode }}</div>
|
||||
<div class="maCode">标签编号：{{ rowObj.labelCode }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
|
@ -345,9 +350,18 @@ export default {
|
|||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.info-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
justify-content: center;
|
||||
gap: 10px; /* 可根据需要调整间距 */
|
||||
padding-left:100px;
|
||||
}
|
||||
.maCode {
|
||||
margin-top: 15px;
|
||||
font-size: 18px;
|
||||
// margin-left:40px;
|
||||
}
|
||||
::v-deep.el-table .fixed-width .el-button--mini {
|
||||
width: 60px !important;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ module.exports = {
|
|||
// target: `http://10.40.92.81:8080`, //韩/
|
||||
// target: `http://192.168.2.74:49080`, //旭/
|
||||
// target: `http://192.168.2.17:39080`, //帅
|
||||
target: `http://192.168.2.209:49080`, //福
|
||||
target: `http://localhost:39080`, //福
|
||||
// target: `http://192.168.0.37:49080`, //跃
|
||||
|
||||
//******** 注意事项 ********* */
|
||||
|
|
|
|||
Loading…
Reference in New Issue