|
|
@@ -25,7 +25,8 @@
|
|
|
type="primary"
|
|
|
icon="el-icon-plus"
|
|
|
class="ele-btn-icon"
|
|
|
- @click="openEdit('add', {})">
|
|
|
+ @click="openEdit('add', {})"
|
|
|
+ >
|
|
|
新建
|
|
|
</el-button>
|
|
|
|
|
|
@@ -35,7 +36,8 @@
|
|
|
el-icon-delete
|
|
|
class="ele-btn-icon"
|
|
|
@click="allDelBtn"
|
|
|
- :disabled="selection?.length === 0">
|
|
|
+ :disabled="selection?.length === 0"
|
|
|
+ >
|
|
|
批量删除
|
|
|
</el-button>
|
|
|
</template>
|
|
|
@@ -46,8 +48,10 @@
|
|
|
<el-link
|
|
|
type="primary"
|
|
|
:underline="false"
|
|
|
- @click="openorderDetail(row, 'returnNo')">
|
|
|
- {{ row.returnNo }}</el-link>
|
|
|
+ @click="openorderDetail(row, 'returnNo')"
|
|
|
+ >
|
|
|
+ {{ row.returnNo }}</el-link
|
|
|
+ >
|
|
|
</template>
|
|
|
<template v-slot:receiveNo="{ row }">
|
|
|
<el-link
|
|
|
@@ -74,7 +78,11 @@
|
|
|
:underline="false"
|
|
|
icon="el-icon-edit"
|
|
|
@click="openEdit('edit', row)"
|
|
|
- v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
|
|
|
+ v-if="
|
|
|
+ (isNeed_process_is_close &&
|
|
|
+ [0, 3].includes(row.reviewStatus)) ||
|
|
|
+ !isNeed_process_is_close
|
|
|
+ "
|
|
|
>
|
|
|
修改
|
|
|
</el-link>
|
|
|
@@ -83,7 +91,9 @@
|
|
|
:underline="false"
|
|
|
icon="el-icon-plus"
|
|
|
@click="sub(row)"
|
|
|
- v-if="isNeed_process_is_close&&[0, 3].includes(row.reviewStatus)"
|
|
|
+ v-if="
|
|
|
+ isNeed_process_is_close && [0, 3].includes(row.reviewStatus)
|
|
|
+ "
|
|
|
>
|
|
|
提交
|
|
|
</el-link>
|
|
|
@@ -91,7 +101,11 @@
|
|
|
class="ele-action"
|
|
|
title="确定要删除此信息吗？"
|
|
|
@confirm="remove([row.id])"
|
|
|
- v-if="(isNeed_process_is_close&&[0, 3].includes(row.reviewStatus))||!isNeed_process_is_close"
|
|
|
+ v-if="
|
|
|
+ (isNeed_process_is_close &&
|
|
|
+ [0, 3].includes(row.reviewStatus)) ||
|
|
|
+ !isNeed_process_is_close
|
|
|
+ "
|
|
|
>
|
|
|
<template v-slot:reference>
|
|
|
<el-link type="danger" :underline="false" icon="el-icon-delete">
|
|
|
@@ -117,8 +131,13 @@
|
|
|
content="是否确定删除？"
|
|
|
@done="commitBtn"
|
|
|
/>
|
|
|
- <process-submit-dialog :isNotNeedProcess="false" :processSubmitDialogFlag.sync="processSubmitDialogFlag" v-if="processSubmitDialogFlag" ref="processSubmitDialogRef" @reload="reload"></process-submit-dialog>
|
|
|
-
|
|
|
+ <process-submit-dialog
|
|
|
+ :isNotNeedProcess="false"
|
|
|
+ :processSubmitDialogFlag.sync="processSubmitDialogFlag"
|
|
|
+ v-if="processSubmitDialogFlag"
|
|
|
+ ref="processSubmitDialogRef"
|
|
|
+ @reload="reload"
|
|
|
+ ></process-submit-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -137,11 +156,11 @@
|
|
|
submit
|
|
|
} from '@/api/purchasingManage/returnGoods';
|
|
|
import dictMixins from '@/mixins/dictMixins';
|
|
|
- import processSubmitDialog from "@/BIZComponents/processSubmitDialog/processSubmitDialog.vue";
|
|
|
+ import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
|
|
|
import tabMixins from '@/mixins/tableColumnsMixin';
|
|
|
|
|
|
export default {
|
|
|
- mixins: [dictMixins,tabMixins],
|
|
|
+ mixins: [dictMixins, tabMixins],
|
|
|
components: {
|
|
|
processSubmitDialog,
|
|
|
searchTable,
|
|
|
@@ -217,13 +236,20 @@
|
|
|
minWidth: 160
|
|
|
},
|
|
|
{
|
|
|
- prop: 'batchNo',
|
|
|
- label: '批次号',
|
|
|
- align: 'center',
|
|
|
- showOverflowTooltip: true,
|
|
|
- minWidth: 140
|
|
|
- },
|
|
|
-
|
|
|
+ prop: 'batchNos',
|
|
|
+ label: '批次号',
|
|
|
+ align: 'center',
|
|
|
+ showOverflowTooltip: true,
|
|
|
+ minWidth: 140
|
|
|
+ },
|
|
|
+ {
|
|
|
+ prop: 'productCount',
|
|
|
+ label: '数量',
|
|
|
+ align: 'center',
|
|
|
+ showOverflowTooltip: true,
|
|
|
+ minWidth: 140
|
|
|
+ },
|
|
|
+
|
|
|
{
|
|
|
prop: 'supplierName',
|
|
|
label: '供应商名称',
|
|
|
@@ -238,7 +264,9 @@
|
|
|
showOverflowTooltip: true,
|
|
|
minWidth: 200,
|
|
|
formatter: (_row, _column, cellValue) => {
|
|
|
- return _row.returnSourceType == 2? '委外发货退货':'采购收货退货'
|
|
|
+ return _row.returnSourceType == 2
|
|
|
+ ? '委外发货退货'
|
|
|
+ : '采购收货退货';
|
|
|
}
|
|
|
},
|
|
|
// {
|
|
|
@@ -277,7 +305,7 @@
|
|
|
fixed: 'right'
|
|
|
}
|
|
|
],
|
|
|
- cacheKeyUrl:'eos-41345bd0-purchaseOrder-returnorder'
|
|
|
+ cacheKeyUrl: 'eos-41345bd0-purchaseOrder-returnorder'
|
|
|
};
|
|
|
},
|
|
|
computed: {},
|
|
|
@@ -307,8 +335,13 @@
|
|
|
//批量删除
|
|
|
allDelBtn() {
|
|
|
if (this.selection.length === 0) return;
|
|
|
- let flag = this.selection.some(item=>[1,2].includes(item.reviewStatus))
|
|
|
- if(flag) return this.$message.warning('抱歉已审核、审核中的数据不能删除,请检查')
|
|
|
+ let flag = this.selection.some((item) =>
|
|
|
+ [1, 2].includes(item.reviewStatus)
|
|
|
+ );
|
|
|
+ if (flag)
|
|
|
+ return this.$message.warning(
|
|
|
+ '抱歉已审核、审核中的数据不能删除,请检查'
|
|
|
+ );
|
|
|
this.delVisible = true;
|
|
|
},
|
|
|
|
|
|
@@ -326,32 +359,35 @@
|
|
|
this.remove(dataId);
|
|
|
},
|
|
|
sub(res) {
|
|
|
- this.processSubmitDialogFlag = true
|
|
|
- let key = res.returnSourceType==1? "purchase_return_approve":'purchase_outsource_send_return_approve'
|
|
|
- this.$nextTick(()=>{
|
|
|
+ this.processSubmitDialogFlag = true;
|
|
|
+ let key =
|
|
|
+ res.returnSourceType == 1
|
|
|
+ ? 'purchase_return_approve'
|
|
|
+ : 'purchase_outsource_send_return_approve';
|
|
|
+ this.$nextTick(() => {
|
|
|
let params = {
|
|
|
businessId: res.id,
|
|
|
- businessKey : key,
|
|
|
+ businessKey: key,
|
|
|
formCreateUserId: res.createUserId,
|
|
|
- variables:{
|
|
|
+ variables: {
|
|
|
businessCode: res.returnNo,
|
|
|
storemanIds: res.storemanIds.toString(),
|
|
|
pass: true,
|
|
|
returnSourceType: res.returnSourceType,
|
|
|
businessName: res.supplierName,
|
|
|
- businessType: res.returnSourceType == 2? '委外发货退货':'采购收货退货'
|
|
|
- },
|
|
|
+ businessType:
|
|
|
+ res.returnSourceType == 2 ? '委外发货退货' : '采购收货退货'
|
|
|
+ }
|
|
|
// callBackMethodType : '1',
|
|
|
// callBackMethod : 'proTargetPlanApproveApiImpl.updatePlanApprovalStatus',
|
|
|
// pcHandle : '/bpm/handleTask/components/project-manage/plan-manage/submit.vue',
|
|
|
// pcView : '/bpm/handleTask/components/project-manage/plan-manage/detailDialog.vue',
|
|
|
// miniHandle : '',
|
|
|
// miniView : '',
|
|
|
- }
|
|
|
+ };
|
|
|
|
|
|
-
|
|
|
- this.$refs.processSubmitDialogRef.init(params)
|
|
|
- })
|
|
|
+ this.$refs.processSubmitDialogRef.init(params);
|
|
|
+ });
|
|
|
// submit({
|
|
|
// businessId: res.id,
|
|
|
// returnSourceType: res.returnSourceType,
|
