Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2023-03-17 03:08:43 +08:00
14 changed files with 172 additions and 147 deletions

View File

@@ -321,7 +321,7 @@
:scroll="{ x: 'max-content' }"
>
<template #operation="{ text, record, index }">
<a-space>
<a-space :key="record.id">
<a-button
v-if="(record.auditStatus === 2 || record.auditStatus === 3) && !record.publishStatus && checkPer(record.permissions,createId)"
@click="() => handlePush(text, index)"
@@ -417,7 +417,8 @@
>启用</a-button
>
<a-button
@click="() => handleDelete(text, index)"
v-if="record.publishStatus!==1"
@click="() => handleDelete(text, index, record)"
type="link"
danger
>删除
@@ -1165,7 +1166,7 @@
<span style="margin-right: 3px"></span>
</div>
<div class="b_input">
<FJUpload v-model:value="attachName" @changevalue="changevalue" />
<FJUpload v-model:value="attach" @changevalue="changevalue" />
</div>
</div>
@@ -2591,7 +2592,6 @@ export default defineComponent({
imgList: [],
validated: 0,
attach: "",
attachName: "",
pageSize2: 10,
currentPage2: 0,
tableDataTotal2: 0,
@@ -3740,15 +3740,6 @@ export default defineComponent({
console.log("获取面授课开课详情", item);
state.xjkkinputV2 = item.address;
state.checked1 = item.applyFlag === 1 ? true : false;
let arrss = item.attach.split(",");
let str = "";
for (let i = 0; i < arrss.length; i++) {
i == arrss.length - 1
? (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1))
: (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1) + ",");
}
console.log(str);
state.attachName = str;
state.attach = item.attach;
state.xjkkinputV3 = [