feat: 审核开关-业务页面修改

dev_ksck2.0
chenhc 1 year ago
parent e72c3871f0
commit b04eab404b

@ -251,6 +251,7 @@ export default {
1: "草稿",
2: "未审核",
3: "已审核",
4: "拒绝",
},
typeMap: {
1: "预入库",

@ -4,20 +4,28 @@
<el-form :model="formData" :rules="formRules" ref="dataForm" label-width="120px">
<el-row type="flex" justify="end" v-if="editType == 1">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button
type="primary"
@click.native="saveOrder('3')"
:loading="loading"
>审核通过
</el-button
>
<el-button
type="primary"
@click.native="saveOrder('4')"
:loading="loading"
>拒绝申请
</el-button
>
<el-button
v-show="!this.sysApprovalFlowConfig"
type="primary"
@click.native="saveOrder('3')"
:loading="loading"
>审核通过
</el-button
>
<el-button
v-show="!this.sysApprovalFlowConfig"
type="primary"
@click.native="saveOrder('4')"
:loading="loading"
>审核拒绝
</el-button
>
<el-button
v-show="this.sysApprovalFlowConfig"
type="primary"
@click.native="showApprovalFlowDetail()"
>审核过程
</el-button>
</el-button-group>
</el-row>
@ -145,10 +153,32 @@
:data="thisData"
></purApplyProducts>
</el-dialog>
<el-dialog
title="审批详情"
:visible.sync="approvalFlowDetailVisible"
width="80%"
v-if="approvalFlowDetailVisible"
@close='closeDialog'
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="handleClose"
>
<approvalFlowDetail
:isChang="true"
:closeDialog="closeDialog"
:idQuery="idQuery"
></approvalFlowDetail>
</el-dialog>
</div>
</template>
<script>
import approvalFlowDetail from "@/components/ApprovalFlow/index";
import {getSysApprovalFlowConfig} from "@/api/basic/sysApprovalFlow";
import draggable from "vuedraggable";
import purApplyProducts from "@/views/purchase/purApply/purApplyProducts";
import {delApplyDetail, listApplyDetail, auditOrder} from "@/api/purchase/purApply";
@ -197,6 +227,7 @@ export default {
audtoPlan: false,
targetSubInv:null,
createTime: "",
approvalFlowId: ""
},
targetSubInvList: [],
formRules: {},
@ -208,10 +239,13 @@ export default {
formVisible: false,
deleteLoading: false,
orderNo: null,
sysApprovalFlowConfig: false,
approvalFlowDetailVisible: false,
statusMap: {
1: "草稿",
2: "未审核",
3: "已审核",
4: "拒绝",
},
typeMap: {
1: "预入库",
@ -236,8 +270,25 @@ export default {
components: {
draggable,
purApplyProducts,
approvalFlowDetail
},
methods: {
getConfig(){
getSysApprovalFlowConfig().then((response) => {
this.sysApprovalFlowConfig = response.data;
}).catch(() => {
});
},
// closeDialog() {
// this.approvalFlowDetailVisible = false;
// },
handleClose() {
this.approvalFlowDetailVisible = false;
},
showApprovalFlowDetail() {
this.idQuery = this.formData
this.approvalFlowDetailVisible = true;
},
//
saveOrder(status) {
let tip = "";
@ -417,6 +468,7 @@ export default {
}
this.findTargetSubInvs();
this.codeArray = [];
this.getConfig();
},
};
</script>

@ -449,11 +449,28 @@
:isRepeat=true
></pureApplyEdit>
</el-dialog>
<el-dialog
title="审批详情"
:visible.sync="approvalFlowDetailVisible"
width="80%"
v-if="approvalFlowDetailVisible"
@close='closeDialog'
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="handleClose"
>
<approvalFlowDetail
:isChang="false"
:closeDialog="closeDialog"
:idQuery="idQuery"
></approvalFlowDetail>
</el-dialog>
</div>
</template>
<script>
import approvalFlowDetail from "@/components/ApprovalFlow/index";
import pureApplyDetail from "./pureApplyDetailDialog";
import pureApplyEdit from "./purApplyEditDiaolog";
import {delApply, auditOrder, listApplyDetail, auditListApply, listApply, printOrder,delApplyDetailAll} from "@/api/purchase/purApply";
@ -527,6 +544,7 @@ export default {
loading: false,
actDateRange: [],
actAuditDateRange: [],
approvalFlowDetailVisible: false,
newSpDistributionVisible: false,
pickerOptions: {
shortcuts: [
@ -598,6 +616,13 @@ export default {
},
methods: {
handleClose() {
this.approvalFlowDetailVisible = false;
},
showApprovalFlowDetail(_this,row) {
_this.idQuery = row
_this.approvalFlowDetailVisible = true;
},
onReset() {
this.$router.push({
path: "",
@ -842,7 +867,7 @@ export default {
}
,
components: {
pureApplyDetail, pureApplyEdit
pureApplyDetail, pureApplyEdit,approvalFlowDetail
}
,
filters: {

@ -430,9 +430,28 @@
:editType="editType"
></pureApplyDetail>
</el-dialog>
<el-dialog
title="审批详情"
:visible.sync="approvalFlowDetailVisible"
width="80%"
v-if="approvalFlowDetailVisible"
@close='closeDialog'
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="handleClose"
>
<approvalFlowDetail
:isChang="false"
:closeDialog="closeDialog"
:idQuery="idQuery"
></approvalFlowDetail>
</el-dialog>
</div>
</template>
<script>
import approvalFlowDetail from "@/components/ApprovalFlow/index";
import pureApplyDetail from "./pureApplyDetailDialog";
import {delApply, auditOrder, listApplyDetail, auditListApply, printOrder} from "@/api/purchase/purApply";
import {filterAll, getInvListByUser} from "@/api/system/invWarehouse";
@ -507,6 +526,7 @@ export default {
loading: false,
actDateRange: [],
actAuditDateRange: [],
approvalFlowDetailVisible: false,
newSpDistributionVisible: false,
pickerOptions: {
shortcuts: [
@ -576,6 +596,13 @@ export default {
},
methods: {
handleClose() {
this.approvalFlowDetailVisible = false;
},
showApprovalFlowDetail(_this,row) {
_this.idQuery = row
_this.approvalFlowDetailVisible = true;
},
onReset() {
this.$router.push({
path: "",
@ -722,6 +749,7 @@ export default {
closeDialog() {
this.newSpDistributionVisible = false;
this.approvalFlowDetailVisible = false;
this.getList();
this.detailList = [];
},
@ -795,7 +823,7 @@ export default {
}
,
components: {
pureApplyDetail,
pureApplyDetail,approvalFlowDetail
}
,
filters: {

@ -4,8 +4,28 @@
<el-form :model="formData" :rules="formRules" ref="dataForm" label-width="120px">
<el-row type="flex" justify="end" v-if="editType == 1">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button type="primary" @click.native="saveOrder('3')" :loading="loading">审核通过</el-button>
<el-button type="primary" @click.native="saveOrder('4')" :loading="loading">拒绝申请</el-button>
<el-button
v-show="!this.sysApprovalFlowConfig"
type="primary"
@click.native="saveOrder('3')"
:loading="loading"
>审核通过
</el-button
>
<el-button
v-show="!this.sysApprovalFlowConfig"
type="primary"
@click.native="saveOrder('4')"
:loading="loading"
>审核拒绝
</el-button
>
<el-button
v-show="this.sysApprovalFlowConfig"
type="primary"
@click.native="showApprovalFlowDetail()"
>审核过程
</el-button>
</el-button-group>
</el-row>
@ -168,10 +188,31 @@
:purType="1"
></purPlanProducts>
</el-dialog>
<el-dialog
title="审批详情"
:visible.sync="approvalFlowDetailVisible"
width="80%"
v-if="approvalFlowDetailVisible"
@close='closeDialog'
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="handleClose"
>
<approvalFlowDetail
:isChang="true"
:closeDialog="closeDialog"
:idQuery="idQuery"
></approvalFlowDetail>
</el-dialog>
</div>
</template>
<script>
import approvalFlowDetail from "@/components/ApprovalFlow/index";
import {getSysApprovalFlowConfig} from "@/api/basic/sysApprovalFlow";
import draggable from "vuedraggable";
import purPlanProducts from "@/views/purchase/purPlan/purOrderSelectProduct";
import {auditOrder, delOrderDetail, listOrderDetail} from "@/api/purchase/purOrder";
@ -231,6 +272,7 @@ export default {
1: "草稿",
2: "未审核",
3: "已审核",
4: "拒绝",
},
typeMap: {
1: "预入库",
@ -244,6 +286,8 @@ export default {
busTypes: [],
currentRow: {},
selectedIndex: "",
sysApprovalFlowConfig: false,
approvalFlowDetailVisible: false,
selectProductVisible: false,
thisData: {},
subInvList: [],
@ -255,9 +299,24 @@ export default {
},
components: {
draggable,
purPlanProducts,
purPlanProducts, approvalFlowDetail
},
methods: {
methods: { getConfig(){
getSysApprovalFlowConfig().then((response) => {
this.sysApprovalFlowConfig = response.data;
}).catch(() => {
});
},
// closeDialog() {
// this.approvalFlowDetailVisible = false;
// },
handleClose() {
this.approvalFlowDetailVisible = false;
},
showApprovalFlowDetail() {
this.idQuery = this.formData
this.approvalFlowDetailVisible = true;
},
saveOrder(status) {
let tip = "";
if (status == "3") {
@ -494,6 +553,7 @@ export default {
}
this.findTargetSubInvs();
this.codeArray = [];
this.getConfig();
},
};
</script>

@ -429,9 +429,29 @@
</el-dialog>
<el-dialog
title="审批详情"
:visible.sync="approvalFlowDetailVisible"
width="80%"
v-if="approvalFlowDetailVisible"
@close='closeDialog'
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="handleClose"
>
<approvalFlowDetail
:isChang="false"
:closeDialog="closeDialog"
:idQuery="idQuery"
></approvalFlowDetail>
</el-dialog>
</div>
</template>
<script>
import approvalFlowDetail from "@/components/ApprovalFlow/index";
import purPlanEdit from "./purOrderDetailDialog";
import {delApply, listOrder, listOrderDetail, delOrderDetailAll} from "@/api/purchase/purOrder";
import {getInvListByUser} from '@/api/system/invWarehouse'
@ -507,6 +527,7 @@ export default {
loading: false,
actDateRange: [],
actAuditDateRange: [],
approvalFlowDetailVisible: false,
newSpDistributionVisible: false,
pickerOptions: {
shortcuts: [
@ -574,6 +595,13 @@ export default {
},
methods: {
handleClose() {
this.approvalFlowDetailVisible = false;
},
showApprovalFlowDetail(_this,row) {
_this.idQuery = row
_this.approvalFlowDetailVisible = true;
},
onReset() {
this.$router.push({
path: "",
@ -711,6 +739,7 @@ export default {
closeDialog() {
this.newSpDistributionVisible = false;
this.approvalFlowDetailVisible = false;
this.getList();
this.detailList = [];
},
@ -773,7 +802,7 @@ export default {
}
,
components: {
purPlanEdit,
purPlanEdit,approvalFlowDetail
}
,
filters: {

@ -3,10 +3,30 @@
<el-form :model="formData" :rules="formRules" ref="dataForm" label-width="120px">
<el-row type="flex" justify="end" v-if="editType == 1">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button type="primary" @click.native="saveOrder('3')" :loading="loading">审核通过</el-button>
<el-button type="primary" @click.native="saveOrder('4')" :loading="loading">拒绝申请</el-button>
</el-button-group>
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button
v-show="!this.sysApprovalFlowConfig"
type="primary"
@click.native="saveOrder('3')"
:loading="loading"
>审核通过
</el-button
>
<el-button
v-show="!this.sysApprovalFlowConfig"
type="primary"
@click.native="saveOrder('4')"
:loading="loading"
>审核拒绝
</el-button
>
<el-button
v-show="this.sysApprovalFlowConfig"
type="primary"
@click.native="showApprovalFlowDetail()"
>审核过程
</el-button>
</el-button-group>
</el-row>
<el-card style="margin-top: -5px;">
@ -155,10 +175,31 @@
:purType="1"
></purPlanProducts>
</el-dialog>
<el-dialog
title="审批详情"
:visible.sync="approvalFlowDetailVisible"
width="80%"
v-if="approvalFlowDetailVisible"
@close='closeDialog'
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="handleClose"
>
<approvalFlowDetail
:isChang="true"
:closeDialog="closeDialog"
:idQuery="idQuery"
></approvalFlowDetail>
</el-dialog>
</div>
</template>
<script>
import approvalFlowDetail from "@/components/ApprovalFlow/index";
import {getSysApprovalFlowConfig} from "@/api/basic/sysApprovalFlow";
import draggable from "vuedraggable";
import purPlanProducts from "@/views/purchase/purPlan/purOrderSelectProduct";
import {auditOrder, delApplyDetail, listApplyDetail} from "@/api/purchase/purPlan";
@ -204,6 +245,8 @@ export default {
targetSubInv: null,
targetBillAction: null,
},
sysApprovalFlowConfig: false,
approvalFlowDetailVisible: false,
formRules: {},
codeArray: [],
total: 0,
@ -217,6 +260,7 @@ export default {
1: "草稿",
2: "未审核",
3: "已审核",
4: "拒绝",
},
typeMap: {
1: "预入库",
@ -242,8 +286,25 @@ export default {
components: {
draggable,
purPlanProducts,
approvalFlowDetail
},
methods: {
getConfig(){
getSysApprovalFlowConfig().then((response) => {
this.sysApprovalFlowConfig = response.data;
}).catch(() => {
});
},
// closeDialog() {
// this.approvalFlowDetailVisible = false;
// },
handleClose() {
this.approvalFlowDetailVisible = false;
},
showApprovalFlowDetail() {
this.idQuery = this.formData
this.approvalFlowDetailVisible = true;
},
saveOrder(status) {
let tip = "";
if (status == "3") {
@ -476,6 +537,7 @@ export default {
}
this.findTargetSubInvs();
this.codeArray = [];
this.getConfig();
},
};
</script>

@ -419,9 +419,29 @@
</el-dialog>
<el-dialog
title="审批详情"
:visible.sync="approvalFlowDetailVisible"
width="80%"
v-if="approvalFlowDetailVisible"
@close='closeDialog'
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="handleClose"
>
<approvalFlowDetail
:isChang="false"
:closeDialog="closeDialog"
:idQuery="idQuery"
></approvalFlowDetail>
</el-dialog>
</div>
</template>
<script>
import approvalFlowDetail from "@/components/ApprovalFlow/index";
import purPlanEdit from "./purPlanDetailDialog";
import {delApply, listPlan, listApplyDetail, delPlanDetailAll, delApplyDetail} from "@/api/purchase/purPlan";
import { getInvListByUser } from '@/api/system/invWarehouse'
@ -490,6 +510,7 @@ export default {
loading: false,
actDateRange: [],
actAuditDateRange: [],
approvalFlowDetailVisible: false,
newSpDistributionVisible: false,
pickerOptions: {
shortcuts: [
@ -557,6 +578,13 @@ export default {
},
methods: {
handleClose() {
this.approvalFlowDetailVisible = false;
},
showApprovalFlowDetail(_this,row) {
_this.idQuery = row
_this.approvalFlowDetailVisible = true;
},
onReset() {
this.$router.push({
path: "",
@ -680,6 +708,7 @@ export default {
closeDialog() {
this.newSpDistributionVisible = false;
this.approvalFlowDetailVisible = false;
this.getList();
this.detailList = [];
},
@ -725,7 +754,7 @@ export default {
}
,
components: {
purPlanEdit,
purPlanEdit,approvalFlowDetail
}
,
filters: {

Loading…
Cancel
Save