|
@@ -160,17 +160,17 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="right-card">
|
|
|
-
|
|
|
<el-tabs v-model="activeName" class="demo-tabs">
|
|
|
<el-tab-pane label="审批记录" name="first">
|
|
|
-
|
|
|
<ul class="flow-chart">
|
|
|
<li
|
|
|
- v-for="(item,index) in recordList"
|
|
|
+ v-for="(item, index) in recordList"
|
|
|
:key="item.id"
|
|
|
:class="
|
|
|
!route.query.id
|
|
|
- ? (index == 0) ? '' : 'flow-grey'
|
|
|
+ ? index == 0
|
|
|
+ ? ''
|
|
|
+ : 'flow-grey'
|
|
|
: item.status == 2
|
|
|
? 'flow-orange'
|
|
|
: item.status == 3 && !route.query.id
|
|
@@ -185,7 +185,10 @@
|
|
|
<i class="iconfont icon-icomx_quertj1 right-btm-status"></i>
|
|
|
</div>
|
|
|
<div class="right-conetnt">
|
|
|
- <div class="name">{{ item.nodeName }} <span style="float: right;">{{ item.handleTypeName }}</span></div>
|
|
|
+ <div class="name">
|
|
|
+ {{ item.nodeName }}
|
|
|
+ <span style="float: right">{{ item.handleTypeName }}</span>
|
|
|
+ </div>
|
|
|
<div class="remark">
|
|
|
<div class="label">
|
|
|
<span v-if="item.status != 3">办理人:</span
|
|
@@ -205,17 +208,15 @@
|
|
|
>
|
|
|
</div>
|
|
|
</div>
|
|
|
-
|
|
|
</div>
|
|
|
<div class="line"></div>
|
|
|
</li>
|
|
|
-
|
|
|
</ul>
|
|
|
<div>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
:loading="btnLoading"
|
|
|
- style="margin: 20px 150px;"
|
|
|
+ style="margin: 20px 150px"
|
|
|
v-if="isRevocation"
|
|
|
@click="handleSubmit(3)"
|
|
|
>撤回</el-button
|
|
@@ -349,11 +350,11 @@ const flowForm = reactive({
|
|
|
});
|
|
|
//获取当前用户id
|
|
|
const userStore = useUserStore();
|
|
|
-let userId = ''
|
|
|
+let userId = "";
|
|
|
userStore.getInfo().then((res) => {
|
|
|
- console.log(res)
|
|
|
- userId = res.user.userId
|
|
|
-})
|
|
|
+ console.log(res);
|
|
|
+ userId = res.user.userId;
|
|
|
+});
|
|
|
const uploadData = ref({});
|
|
|
const flowRules = reactive({
|
|
|
// remark: [{ required: true, message: "请输入处理意见", trigger: "blur" }],
|
|
@@ -659,11 +660,11 @@ const skipPage = () => {
|
|
|
});
|
|
|
if (flowForm.flowKey == "subscribe_flow") {
|
|
|
router.replace({
|
|
|
- path: "/ERP/purchaseManage/subscribe",
|
|
|
+ name: "Subscribe",
|
|
|
});
|
|
|
} else if (flowForm.flowKey == "purchase_flow") {
|
|
|
router.replace({
|
|
|
- path: "/ERP/purchaseManage/purchase",
|
|
|
+ name: "Purchase",
|
|
|
});
|
|
|
} else if (flowForm.flowKey == "sales_return_flow") {
|
|
|
router.replace({
|
|
@@ -754,9 +755,9 @@ const getRecords = (_id) => {
|
|
|
});
|
|
|
for (let i = 0; i < res.recordList.length; i++) {
|
|
|
const element = res.recordList[i];
|
|
|
- if(element.status == 2) {
|
|
|
+ if (element.status == 2) {
|
|
|
// 2为审批中
|
|
|
- if(res.recordList[i - 1].processedUserId == userId) {
|
|
|
+ if (res.recordList[i - 1].processedUserId == userId) {
|
|
|
// 当前审批人和上一条审批人相同,开启撤回开关
|
|
|
isRevocation.value = true;
|
|
|
}
|
|
@@ -788,18 +789,17 @@ onMounted(async () => {
|
|
|
route.query.processType == 20 ||
|
|
|
route.query.processType == 30
|
|
|
) {
|
|
|
- if(route.query.flowKey == "account_request_funds_flow") {
|
|
|
+ if (route.query.flowKey == "account_request_funds_flow") {
|
|
|
await proxy
|
|
|
.post("/accountRequestFunds/detail", { id: route.query.businessId })
|
|
|
.then((res) => {
|
|
|
- queryData.data = { ...res };
|
|
|
+ queryData.data = { ...res };
|
|
|
});
|
|
|
} else {
|
|
|
-
|
|
|
await proxy
|
|
|
.post("/flowProcess/getStartData", { flowId: route.query.id })
|
|
|
.then((res) => {
|
|
|
- queryData.data = { ...res };
|
|
|
+ queryData.data = { ...res };
|
|
|
});
|
|
|
}
|
|
|
} else {
|
|
@@ -816,7 +816,6 @@ onMounted(async () => {
|
|
|
margin: 0 !important;
|
|
|
}
|
|
|
.el-upload-list li {
|
|
|
-
|
|
|
margin-left: 10px;
|
|
|
}
|
|
|
.el-upload--text {
|