UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 设备管理优化-0514-合同管理

Browse Source
演示数据2.0
chenhc 11 months ago
parent 2f55d9eb30
commit b9b77e1a1c
5 changed files with 335 additions and 200 deletions
Show Stats Download Patch File Download Diff File

7
src/api/purchase/purContract.js
Unescape Escape View File

@ -89,3 +89,10 @@ export function importPlan(data) {
} }
export function auditOrder(data) {
return axios({
url: '/purchase/contract/auditOrder',
method: 'post',
data: data
})
}

14
src/views/purchase/purContract/purContract.vue
Unescape Escape View File

@ -65,13 +65,15 @@
<el-table-column label="往来单位/供应商" prop="fromCorp"></el-table-column> <el-table-column label="往来单位/供应商" prop="fromCorp"></el-table-column>
<el-table-column label="合同仓库" prop="invCode" :formatter="invCodeFormat"></el-table-column> <el-table-column label="合同仓库" prop="invCode" :formatter="invCodeFormat"></el-table-column>
<!-- <el-table-column label="合同状态" prop="status" :formatter="statusFormat"></el-table-column>--> <el-table-column label="合同状态" prop="status" >
<el-table-column label="合同状态" prop="status" width="230"> <template slot-scope="scope" >
<template slot-scope="scope"> <el-tag :type="(scope.row.status == 0? 1:scope.row.status ) | statusFilterType" v-if="scope.row.approvalFlowId == null" >
<el-tag :type="(scope.row.status == 0? 1:scope.row.status ) | statusFilterType">
{{ statusMap[(scope.row.status == 0? 1:scope.row.status ) ] }} {{ statusMap[(scope.row.status == 0? 1:scope.row.status ) ] }}
</el-tag> </el-tag>
<el-tag v-if="scope.row.nextNodeName != null && scope.row.nextNodeName != '' && scope.row.status == 2 " class="tag-right-align"> <el-tag :type="(scope.row.flowStatus == 0? 1:scope.row.flowStatus ) | statusFilterType" v-if="scope.row.approvalFlowId != null">
{{ statusMap[(scope.row.flowStatus == 0? 1:scope.row.flowStatus ) ] }}
</el-tag>
<el-tag v-if="scope.row.nextNodeName != null && scope.row.nextNodeName != '' && scope.row.flowStatus == 2 && scope.row.approvalFlowId != null" class="tag-right-align">
<b v-if="scope.row.nextApprovalNodeType == 1">待人员</b> <b v-if="scope.row.nextApprovalNodeType == 1">待人员</b>
<b v-if="scope.row.nextApprovalNodeType == 2">待岗位</b> <b v-if="scope.row.nextApprovalNodeType == 2">待岗位</b>
【{{ scope.row.nextNodeName }}】审核 【{{ scope.row.nextNodeName }}】审核
@ -94,7 +96,7 @@
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" v-show="(scope.row.status=='' || scope.row.status==1) " >删除</el-button> <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" v-show="(scope.row.status=='' || scope.row.status==1) " >删除</el-button>
<el-button type="text" size="small" @click.native.stop="showApprovalFlowDetail(scope.row)" <el-button type="text" size="small" @click.native.stop="showApprovalFlowDetail(scope.row)"
v-show=" scope.row.status != 1 && scope.row.status !='' ">审批详情 v-show=" scope.row.status != 1 && scope.row.status !='' && scope.row.approvalFlowId != null">审批详情
</el-button> </el-button>
</template> </template>

447
src/views/purchase/purContract/purContractDetailDialog.vue
Unescape Escape View File

@ -1,133 +1,225 @@
<template> <template>
<div> <div>
<el-form :model="formData" :rules="formRules" ref="dataForm" label-width="120px"> <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="120px" :disabled="true">
<el-row type="flex" justify="end" v-if="editType == 1"> <el-row type="flex" justify="end" v-if="editType == 1">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px"> <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px" v-if="formData.approvalFlowId == null">
<el-button type="primary" @click.native="saveOrder('3')" :loading="loading">审核通过</el-button> <el-button type="primary" @click.native="saveOrder('3')" :loading="loading" :disabled="false">审核通过</el-button>
<el-button type="primary" @click.native="saveOrder('4')" :loading="loading">拒绝申请</el-button> <el-button type="primary" @click.native="saveOrder('4')" :loading="loading" :disabled="false">拒绝申请</el-button>
</el-button-group> </el-button-group>
</el-row> </el-row>
<el-card style="margin-top: -5px;"> <el-card style="margin-top: -5px;">
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="采购单号:" prop="billNo"> <el-form-item label="合同编号:" prop="code">
<el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input> <el-input v-model="formData.code" auto-complete="off" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="创建时间:" prop="createTime"> <el-form-item label="合同名称:" prop="name">
<el-date-picker <el-input v-model="formData.name"></el-input>
:disabled="true" </el-form-item>
v-model="formData.createTime" </el-col>
type="datetime" </el-row>
placeholder="选择日期"
style="width: 90%"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row style="margin-top: -10px">
<el-col :span="11">
<el-form-item label="紧急程度:" prop="emergency">
<el-select v-model="formData.emergency" :disabled="true" placeholder="请选择紧急程度" style="width: 90%"
clearable>
<el-option label="正常" :value=1></el-option>
<el-option label="较急" :value=2></el-option>
<el-option label="特急" :value=3></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="到货截止:" prop="arrivalTime">
<el-date-picker
:disabled="true"
v-model="formData.arrivalTime"
type="datetime"
placeholder="选择日期"
style="width: 90%"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="采购仓库:" prop="locStorageCode">
<el-select v-model="formData.invName" placeholder="采购仓库信息" style="width: 90%"
:disabled="true" clearable>
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="审核说明:" prop="billNo">
<el-input v-model="formData.auditRemark" style="width: 90%" auto-complete="off" type="textarea"
autosize></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="合同仓库:" prop="invCode">
<el-select v-model="formData.invCode" placeholder="合同仓库信息" style="width: 100%"
clearable>
<el-option
v-for="item in invCodeList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="合同签订日期:" prop="contractDate">
<el-date-picker
v-model="formData.contractDate"
style="width: 100%"
type="datetime"
placeholder="选择日期"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
:disabled-date="disabledArrivalDate"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-row> </el-row>
<el-col :span="11">
<el-form-item label="采购说明:" prop="billNo"> <el-row >
<el-input v-model="formData.remark" style="width: 90%" :disabled="true" auto-complete="off" <el-col :span="11">
type="textarea" autosize></el-input> <el-form-item label="合同类型:" prop="type">
</el-form-item> <el-select v-model="formData.type" placeholder="合同类型" style="width: 100%"
</el-col> clearable>
<!-- <el-col :span="11">--> <el-option
<!-- <el-form-item>--> v-for="item in typeList"
<!-- <el-checkbox v-model="formData.autoPurchase">是否生成采购入库单</el-checkbox>--> :key="item.name"
<!-- </el-form-item>--> :label="item.name"
<!-- </el-col>--> :value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-row> </el-option>
<el-row v-show="formData.autoPurchase"> </el-select>
<el-col :span="11"> </el-form-item>
<el-form-item label="入库仓库:" prop="locStorageCode"> </el-col>
<el-select v-model="formData.targetSubInv" placeholder="入库仓库信息" style="width: 90%"
@change="targetInvChange" clearable> <el-col :span="11">
<el-option <el-form-item
v-for="item in tarSubList" prop="fromCorp"
:key="item.name" label="供应商:"
:label="item.name"
:value="item.code"> >
<span style="float: left">{{ item.name }}</span> <el-select
</el-option> v-model="formData.fromCorp"
</el-select> filterable
</el-form-item> remote
</el-col> :disabled="corpOrderIdDisabled"
<el-col :span="11"> clearable
<el-form-item label="入库单据类型:" class="query-form-item" prop="targetBillAction"> reserve-keyword
<el-select v-model="formData.targetBillAction" placeholder="请选择单据类型" style="width: 90%"> placeholder="请选择供应商"
<el-option :remote-method="findMethod"
v-for="item in busTypes" style="width: 100%"
:key="item.name" >
:label="item.name" <el-option
:value="item.action"> v-for="item in fromOptions"
<span style="float: left">{{ item.name }}</span> :key="item.erpId"
</el-option> :label="item.name"
</el-select> :value="item.erpId"
</el-form-item> >
</el-col> <span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-row> </el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-col :span="11">-->
<!-- <el-form-item label="合同状态:" prop="status">-->
<!-- <el-select v-model="formData.status" placeholder="合同状态" style="width: 100%" disabled-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in statusList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="11">
<el-form-item label="开始时间:" prop="startDate" >
<el-date-picker
style="width: 100%"
v-model="formData.startDate"
type="datetime"
placeholder="选择日期"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
:disabled-date="disabledArrivalDate"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="截止时间:" prop="endDate">
<el-date-picker
style="width: 100%"
v-model="formData.endDate"
type="datetime"
placeholder="选择日期"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
:disabled-date="disabledArrivalDate"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="订单金额:" prop="amount">
<el-input-number
style="width: 60%"
:precision="2"
:step="1"
:min="0.00"
v-model="formData.amount" size="small" ></el-input-number>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="合同金额:" prop="payAmount">
<el-input-number
style="width: 60%"
:precision="2"
:step="1"
:min="0.00"
v-model="formData.payAmount" size="small" ></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="付款日期:" prop="payDate">
<el-date-picker
style="width: 100%"
v-model="formData.payDate"
type="datetime"
placeholder="选择日期"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
:disabled-date="disabledArrivalDate"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="付款方式:" prop="payType">
<!-- <el-select v-model="formData.payType" placeholder="付款方式" style="width: 100%"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in payTypeList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<el-input v-model="formData.payType" style="width: 100%"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="备注:" prop="remark">
<el-input v-model="formData.remark" style="width: 100%"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border
highlight-current-row max-height="300" height="300" ref="multipleTable"> highlight-current-row max-height="300" height="300" ref="multipleTable">
@ -144,28 +236,28 @@
</el-card> </el-card>
</el-form> </el-form>
<el-dialog <!-- <el-dialog-->
title="产品录入" <!-- title="产品录入"-->
:visible.sync="selectProductVisible" <!-- :visible.sync="selectProductVisible"-->
:close-on-click-modal="false" <!-- :close-on-click-modal="false"-->
:close-on-press-escape="false" <!-- :close-on-press-escape="false"-->
width="80%" <!-- width="80%"-->
v-if="selectProductVisible" <!-- v-if="selectProductVisible"-->
:append-to-body='true' <!-- :append-to-body='true'-->
> <!-- >-->
<selectProduct <!-- <selectProduct-->
:closeDialog="closeDialogC2" <!-- :closeDialog="closeDialogC2"-->
:data="thisData" <!-- :data="thisData"-->
:purType="1" <!-- :purType="1"-->
></selectProduct> <!-- ></selectProduct>-->
</el-dialog> <!-- </el-dialog>-->
</div> </div>
</template> </template>
<script> <script>
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import {auditOrder, delApplyDetail, listApplyDetail} from "@/api/purchase/purContract"; import {auditOrder, delApplyDetail, listApplyDetail} from "@/api/purchase/purContract";
// import selectProduct from "@/views/components/selectProduct.vue"; import {findInvByUser} from "@/api/system/invSubWarehouse";
export default { export default {
name: "idQuery", name: "idQuery",
@ -197,7 +289,8 @@ export default {
}, },
formData: { formData: {
id: null, id: null,
billNo: null, code: null,
name: null,
createTime: "", createTime: "",
remark: "", remark: "",
deptCode: null, deptCode: null,
@ -246,15 +339,48 @@ export default {
}; };
}, },
components: { components: {
draggable, selectProduct draggable
}, },
methods: { methods: {
findSubInvs()
{
this.subInvList = [];
let query = {
filter: 3,
code : this.formData.invCode
};
findInvByUser(query)
.then((response) => {
this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) {
this.formData.invCode = this.subInvList[0].code;
this.formData.deptCode = this.subInvList[0].parentId;
}
})
.catch(() => {
});
}
,
getInvList()
{
this.invCodeList = [];
let query = {
filter: 3
};
findInvByUser(query)
.then((response) => {
this.invCodeList = response.data || [];
})
.catch(() => {
});
}
,
saveOrder(status) { saveOrder(status) {
let tip = ""; let tip = "";
if (status == "3") { if (status == "3") {
tip = "是否确定通过该采购计划？"; tip = "是否确定通过该采购合同？";
} else { } else {
tip = "是否确定拒绝该采购计划？"; tip = "是否确定拒绝该采购合同？";
} }
this.$confirm(tip, "提示", { this.$confirm(tip, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -267,23 +393,17 @@ export default {
}); });
}, },
submitFunction(status) { submitFunction(status) {
let tMessage = status === '1' ? '保存' : '提交';
this.loading = true; this.loading = true;
this.formData.pageType = this.pageType this.formData.pageType = this.pageType
let tQuery = { let tQuery = {
autoPurchase: this.formData.autoPurchase, status:status,
targetSubInv: this.formData.targetSubInv, code:this.formData.code
targetDeptCode: this.formData.targetDeptCode,
targetBillAction: this.formData.targetBillAction,
editStatus: status,
purPlanEntity: this.formData,
subErpOrders: this.codeArray,
} }
auditOrder(tQuery) auditOrder(tQuery)
.then(response => { .then(response => {
this.loading = false; this.loading = false;
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success(tMessage + "成功"); this.$message.success("审批成功");
this.closeDialog(true); this.closeDialog(true);
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
@ -372,9 +492,9 @@ export default {
}, },
getStockOrderDetailList() { getStockOrderDetailList() {
this.loading = true; this.loading = true;
this.query.orderIdFk=this.idQuery.id
listApplyDetail(this.query) //查找该单号下的所有条码 listApplyDetail(this.query) //查找该单号下的所有条码
.then((response) => { .then((response) => {
console.log(response)
this.codeArray = response.data.list || []; this.codeArray = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
this.loading = false; this.loading = false;
@ -385,8 +505,6 @@ export default {
this.total = 0; this.total = 0;
}); });
}, },
}, },
filters: {}, filters: {},
mounted() { mounted() {
@ -396,33 +514,10 @@ export default {
}; };
}, },
created() { created() {
if (this.$isNotBlank(this.idQuery.id)) { this.formData = this.idQuery
this.query.limit = 100; this.findSubInvs();
this.query.orderIdFk = this.idQuery.id; this.getInvList();
this.formData = this.idQuery.formData; this.getStockOrderDetailList();
this.formData.targetInv = 1000;
this.orderEditor = true;
this.sValue = this.formData.corpName;
this.getStockOrderDetailList();
} else {
this.formData = {
id: null,
billNo: null,
createTime: "",
remark: "",
deptCode: null,
locStorageCode: null,
invWarehouseCode: null,
auditRemark: null,
autoPurchase: false,
targetInv: 1000,
targetSubInv: null,
targetBillAction: null,
};
this.orderEditor = false;
}
this.findTargetSubInvs();
this.codeArray = [];
}, },
}; };
</script> </script>

16
src/views/purchase/purContract/purContractFinish.vue
Unescape Escape View File

@ -65,13 +65,15 @@
<el-table-column label="往来单位/供应商" prop="fromCorp"></el-table-column> <el-table-column label="往来单位/供应商" prop="fromCorp"></el-table-column>
<el-table-column label="合同仓库" prop="invCode" :formatter="invCodeFormat"></el-table-column> <el-table-column label="合同仓库" prop="invCode" :formatter="invCodeFormat"></el-table-column>
<!-- <el-table-column label="合同状态" prop="status" :formatter="statusFormat"></el-table-column>--> <el-table-column label="合同状态" prop="status" >
<el-table-column label="合同状态" prop="status" width="230"> <template slot-scope="scope" >
<template slot-scope="scope"> <el-tag :type="(scope.row.status == 0? 1:scope.row.status ) | statusFilterType" v-if="scope.row.approvalFlowId == null" >
<el-tag :type="(scope.row.status) | statusFilterType"> {{ statusMap[(scope.row.status == 0? 1:scope.row.status ) ] }}
{{ statusMap[scope.row.status] }} </el-tag>
<el-tag :type="(scope.row.flowStatus == 0? 1:scope.row.flowStatus ) | statusFilterType" v-if="scope.row.approvalFlowId != null">
{{ statusMap[(scope.row.flowStatus == 0? 1:scope.row.flowStatus ) ] }}
</el-tag> </el-tag>
<el-tag v-if="scope.row.nextNodeName != null && scope.row.nextNodeName != '' && scope.row.status == 2 " class="tag-right-align"> <el-tag v-if="scope.row.nextNodeName != null && scope.row.nextNodeName != '' && scope.row.flowStatus == 2 && scope.row.approvalFlowId != null" class="tag-right-align">
<b v-if="scope.row.nextApprovalNodeType == 1">待人员</b> <b v-if="scope.row.nextApprovalNodeType == 1">待人员</b>
<b v-if="scope.row.nextApprovalNodeType == 2">待岗位</b> <b v-if="scope.row.nextApprovalNodeType == 2">待岗位</b>
【{{ scope.row.nextNodeName }}】审核 【{{ scope.row.nextNodeName }}】审核
@ -94,7 +96,7 @@
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" v-show="(scope.row.status=='' || scope.row.status==1) " >删除</el-button> <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" v-show="(scope.row.status=='' || scope.row.status==1) " >删除</el-button>
<el-button type="text" size="small" @click.native.stop="showApprovalFlowDetail(scope.row)" <el-button type="text" size="small" @click.native.stop="showApprovalFlowDetail(scope.row)"
v-show=" scope.row.status != 1 && scope.row.status !='' ">审批详情 v-show=" scope.row.status != 1 && scope.row.status !='' && scope.row.approvalFlowId != null ">审批详情
</el-button> </el-button>
</template> </template>

51
src/views/purchase/purContract/purContractReviewed.vue
Unescape Escape View File

@ -65,13 +65,15 @@
<el-table-column label="往来单位/供应商" prop="fromCorp"></el-table-column> <el-table-column label="往来单位/供应商" prop="fromCorp"></el-table-column>
<el-table-column label="合同仓库" prop="invCode" :formatter="invCodeFormat"></el-table-column> <el-table-column label="合同仓库" prop="invCode" :formatter="invCodeFormat"></el-table-column>
<!-- <el-table-column label="合同状态" prop="status" :formatter="statusFormat"></el-table-column>--> <el-table-column label="合同状态" prop="status" width="260">
<el-table-column label="合同状态" prop="status" width="230"> <template slot-scope="scope" >
<template slot-scope="scope"> <el-tag :type="(scope.row.status == 0? 1:scope.row.status ) | statusFilterType" v-if="scope.row.approvalFlowId == null" >
<el-tag :type="(scope.row.status) | statusFilterType"> {{ statusMap[(scope.row.status == 0? 1:scope.row.status ) ] }}
{{ statusMap[scope.row.status] }} </el-tag>
<el-tag :type="(scope.row.flowStatus == 0? 1:scope.row.flowStatus ) | statusFilterType" v-if="scope.row.approvalFlowId != null">
{{ statusMap[(scope.row.flowStatus == 0? 1:scope.row.flowStatus ) ] }}
</el-tag> </el-tag>
<el-tag v-if="scope.row.nextNodeName != null && scope.row.nextNodeName != '' && scope.row.status == 2 " class="tag-right-align"> <el-tag v-if="scope.row.nextNodeName != null && scope.row.nextNodeName != '' && scope.row.flowStatus == 2 && scope.row.approvalFlowId != null" class="tag-right-align">
<b v-if="scope.row.nextApprovalNodeType == 1">待人员</b> <b v-if="scope.row.nextApprovalNodeType == 1">待人员</b>
<b v-if="scope.row.nextApprovalNodeType == 2">待岗位</b> <b v-if="scope.row.nextApprovalNodeType == 2">待岗位</b>
【{{ scope.row.nextNodeName }}】审核 【{{ scope.row.nextNodeName }}】审核
@ -83,8 +85,7 @@
<!-- <el-table-column label="付款方式" prop="payType" :formatter="payTypeFormat"></el-table-column>--> <!-- <el-table-column label="付款方式" prop="payType" :formatter="payTypeFormat"></el-table-column>-->
<el-table-column label="付款方式" prop="payType"></el-table-column> <el-table-column label="付款方式" prop="payType"></el-table-column>
<el-table-column label="合同签订日期" prop="contractDate" <el-table-column label="合同签订日期" prop="contractDate" ></el-table-column>
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column> <el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" width="120"> <el-table-column label="操作" width="120">
@ -94,7 +95,11 @@
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" v-show="(scope.row.status=='' || scope.row.status==1) " >删除</el-button> <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" v-show="(scope.row.status=='' || scope.row.status==1) " >删除</el-button>
<el-button type="text" size="small" @click.native.stop="showApprovalFlowDetail(scope.row)" <el-button type="text" size="small" @click.native.stop="showApprovalFlowDetail(scope.row)"
v-show=" scope.row.status != 1 && scope.row.status !='' ">审批 v-show=" scope.row.status != 1 && scope.row.status !='' && scope.row.approvalFlowId != null ">审批
</el-button>
<el-button type="text" size="small" @click.native.stop="showDetail(scope.row)"
v-show=" scope.row.status != 1 && scope.row.status !='' && scope.row.approvalFlowId == null ">审批
</el-button> </el-button>
</template> </template>
@ -187,6 +192,23 @@
<el-dialog
title="审批详情"
:visible.sync="purContractDetailDialogVisible"
width="65%"
v-if="purContractDetailDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="handleClose"
>
<purContractDetailDialog
:pageType="pageType"
:closeDialog="closeDialog"
:idQuery="idQuery"
:editType="1"
></purContractDetailDialog>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
@ -194,7 +216,7 @@ import approvalFlowDetail from "@/components/ApprovalFlow";
import purContractEdit from "@/views/purchase/purContract/purContractEditDialog"; import purContractEdit from "@/views/purchase/purContract/purContractEditDialog";
import purContractSelectPlan from "@/views/purchase/purContract/purContractSelectPlan"; import purContractSelectPlan from "@/views/purchase/purContract/purContractSelectPlan";
import {delApply, inserThrOrderWeb, listPlan, listApplyDetail, delContractDetailAll} from "@/api/purchase/purContract"; import {delApply, inserThrOrderWeb, listPlan, listApplyDetail, delContractDetailAll} from "@/api/purchase/purContract";
// import {filterAllByUser} from "@/api/basic/invWarehouse"; import purContractDetailDialog from "@/views/purchase/purContract/purContractDetailDialog";
export default { export default {
name: "purContract", name: "purContract",
@ -277,6 +299,7 @@ export default {
newSpDistributionVisible: false, newSpDistributionVisible: false,
newDistributionFormPlanVisible: false, newDistributionFormPlanVisible: false,
approvalFlowDetailVisible: false, approvalFlowDetailVisible: false,
purContractDetailDialogVisible: false,
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
{ {
@ -312,6 +335,10 @@ export default {
}, },
methods: { methods: {
showDetail(row) {
this.idQuery = row
this.purContractDetailDialogVisible = true;
},
showApprovalFlowDetail(row) { showApprovalFlowDetail(row) {
this.idQuery.approvalFlowId = row.approvalFlowId this.idQuery.approvalFlowId = row.approvalFlowId
this.approvalFlowDetailVisible = true; this.approvalFlowDetailVisible = true;
@ -387,6 +414,7 @@ export default {
}, },
handleClose() { handleClose() {
this.approvalFlowDetailVisible = false; this.approvalFlowDetailVisible = false;
this.purContractDetailDialogVisible = false;
if (this.formName == 'add') { if (this.formName == 'add') {
this.isChang = !this.isChang this.isChang = !this.isChang
} else { } else {
@ -545,6 +573,7 @@ export default {
closeDialog() { closeDialog() {
this.approvalFlowDetailVisible = false; this.approvalFlowDetailVisible = false;
this.newSpDistributionVisible = false; this.newSpDistributionVisible = false;
this.purContractDetailDialogVisible = false;
this.getList(); this.getList();
this.detailList = []; this.detailList = [];
}, },
@ -582,7 +611,7 @@ export default {
} }
, ,
components: { components: {
purContractEdit,purContractSelectPlan,approvalFlowDetail purContractEdit,purContractSelectPlan,approvalFlowDetail,purContractDetailDialog
} }
, ,
filters: { filters: {

Write Preview
Loading…
Cancel
Save