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

This commit is contained in:
闫晓茹 2024-08-14 14:09:50 +08:00
commit 620776519a
10 changed files with 38 additions and 17 deletions

View File

@ -41,7 +41,14 @@ export function specialDiseaseRoutedel(id) {
method: 'delete'
})
}
// 克隆
export function cloneRoute(id) {
return request({
url: `system/specialDiseaseRoute/cloneRoute?id=${id}`,
method: 'post',
})
}
// 修改专病路径信息
export function updateSpecialDiseaseRoute(data) {
return request({

View File

@ -31,7 +31,7 @@
</div>
</div>
<div class="bottom">
<div class="formitem">医生{{ item.attendingPhysician }}</div>
<div class="formitem">医生{{ item.attendingPhysicianName }}</div>
<div class="formitem">科室{{ item.departmentName }}</div>
<div class="formitem">就诊时间{{ item.visitDate }}</div>
<div class="formitem flex">
@ -47,7 +47,7 @@
<el-progress v-else :percentage="item.taskFinishRate"></el-progress>
<span style="flex: 0.1">({{ item.taskFinishNum }}/{{ item.taskNum }})</span>
</div>
<div class="formitem">下次任务</div>
<div class="formitem">下次任务{{ item.nextTaskName }} - {{ item.nextTaskTime }}</div>
</div>
</div>
</div>

View File

@ -73,7 +73,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['manage:template:edit']" v-if="!scope.row.sourceTemplateId ||scope.row.sourceTemplateId==0">修改</el-button>
v-hasPermi="['manage:template:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['manage:template:remove']">删除</el-button>
</template>

View File

@ -258,10 +258,6 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['manage:propaganda:edit']"
v-if="
!scope.row.sourceTemplateId ||
scope.row.sourceTemplateId == 0
"
>修改</el-button
>
<el-button
@ -1487,6 +1483,7 @@ export default {
this.form.propagandaContent = this.fn(this.form.propagandaContent)
this.form.hospitalAgencyId = this.queryParams.hospitalAgencyId
this.form.hospitalAgencyName = this.queryParams.hospitalAgencyName
this.form.propagandaStatus = 'CREATE_COMPLETE'
if (this.form.propagandaContent && (this.form.propagandaContent.length - 7 > this.maxLength)) {
// if (this.form.propagandaContent.length - 7 > this.maxLength) {
this.$message({

View File

@ -79,9 +79,9 @@
<!-- <el-button size="mini" type="text" icon="el-icon-search" @click="handlesee(scope.row)">预览</el-button> -->
<el-button size="mini" type="text" icon="el-icon-zoom-in" @click="see(scope.row)">话术</el-button>
<el-button size="mini" type="text" icon="el-icon-picture-outline"
@click="seescript(scope.row)">话术预览</el-button>
@click="seescript(scope.row)">预览</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['manage:script:edit']" v-if="!scope.row.sourceTemplateId ||scope.row.sourceTemplateId==0">修改</el-button>
v-hasPermi="['manage:script:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['manage:script:remove']">删除</el-button>
</template>

View File

@ -71,7 +71,7 @@
v-if="scope.row.whetherRelease == 0">发布</el-button>
<el-button size="mini" type="text" icon="el-icon-notebook-2" @click="detail(scope.row)">详情</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['manage:servicepackage:edit']" v-if="!scope.row.sourceTemplateId ||scope.row.sourceTemplateId==0">修改</el-button>
v-hasPermi="['manage:servicepackage:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['manage:servicepackage:remove']">删除</el-button>
</template>

View File

@ -67,7 +67,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['manage:template:edit']" v-if="!scope.row.sourceTemplateId ||scope.row.sourceTemplateId==0">修改</el-button>
v-hasPermi="['manage:template:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['manage:template:remove']">删除</el-button>
</template>
@ -92,7 +92,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="科室名称" prop="departmentId">
<el-button type="" @click="clickinnerVisible()"
:style="form.departmentName == '请选择科室' ? 'color: #c0c4cc;' : ''" style="
@ -125,12 +125,12 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="模板内容" prop="templateContent">
<el-input v-model="form.templateContent" placeholder="请输入模板内容" type="textarea" maxlength="300" :rows="10" />
<!-- <editor v-model="form.templateContent" :min-height="192"/> -->
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>

View File

@ -39,7 +39,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['operationInfo:operationInfo:edit']" v-if="!scope.row.sourceTemplateId ||scope.row.sourceTemplateId==0">修改</el-button>
v-hasPermi="['operationInfo:operationInfo:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['operationInfo:operationInfo:remove']">删除</el-button>
</template>

View File

@ -67,7 +67,7 @@
<!-- <el-button size="mini" type="text" @click="handleClassification(scope.row)"
v-hasPermi="['system:question:edit']">分类管理</el-button> -->
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:question:edit']" v-if="!scope.row.sourceTemplateId ||scope.row.sourceTemplateId==0">编辑</el-button>
v-hasPermi="['system:question:edit']">编辑</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:question:remove']">删除</el-button>
</template>

View File

@ -76,8 +76,11 @@
<!-- <el-button size="mini" type="text">复制</el-button> -->
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:specialDiseaseRoute:edit']">编辑</el-button>
<el-button size="mini" type="text" @click="handlecopy(scope.row)"
>克隆</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:specialDiseaseRoute:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -144,7 +147,7 @@
<script>
import {
listSpecialDiseaseRoute, getSpecialDiseaseRoute, addSpecialDiseaseRoute, updateSpecialDiseaseRoute,
editReleaseStatus, selectDiseaseCount, getDepartmentList, getdiseaseList, specialDiseaseRoutedel
editReleaseStatus, selectDiseaseCount, getDepartmentList, getdiseaseList, specialDiseaseRoutedel,cloneRoute
} from "@/api/system/specialDiseaseRoute";
import {
servicepackageinfo
@ -448,6 +451,20 @@ export default {
});
})
},
/** 克隆按钮操作 */
handlecopy(row){
this.$confirm('此操作会克隆主路径, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
}).then(() => {
cloneRoute(row.id).then(res => {
this.getList();
this.$modal.msgSuccess("克隆成功");
this.$refs.DepartmentList.Departmentlist()
})
})
},
/** 删除按钮操作 */
handleDelete(row) {
//