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

This commit is contained in:
闫晓茹 2024-06-13 15:40:51 +08:00
commit b0ea5cc041
2 changed files with 85 additions and 47 deletions

View File

@ -678,10 +678,7 @@
<img :src="baseUrl + formview.propagandaCoverPath" alt="" />
<div class="know">知识卡片</div>
<div class="knowlist">
<Editorxj
v-model="formview.propagandaContent"
:min-height="192"
/>
<Editorxj v-model="formview.propagandaContent" :min-height="192" />
</div>
</div>
</div>
@ -845,7 +842,7 @@ import Editorxj from "../../system/Editorxj/index.vue";
import { department, listDisease } from "@/api/manage/script";
export default {
name: "Propaganda",
components: { stationAcatar ,Editorxj},
components: { stationAcatar, Editorxj },
data() {
//
var isimgPath = (rule, value, callback) => {
@ -868,6 +865,10 @@ export default {
//
querydepartmen: {
departmentName: "",
materialsType: null,
materialsName: null,
materialsStatus: null,
createTime: null,
// pageNum: 1,
// pageSize: 10,
@ -1005,8 +1006,8 @@ export default {
},
//
rules: {
propagandaTitle:[
{ required: true, message: "宣教标题不能为空", trigger: "blur" }
propagandaTitle: [
{ required: true, message: "宣教标题不能为空", trigger: "blur" }
],
@ -1082,7 +1083,7 @@ export default {
},
//
changehospitalAgency(e) {
console.log(e,'00000')
console.log(e, '00000')
this.form.hospitalAgencyName = this.hospitalAgencylist.find(f => f.id == e).agencyName
this.form.hospitalAgencyId = e
this.form.departmentName = ''
@ -1425,6 +1426,11 @@ export default {
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
this.querydepartmen.createTimeStart = this.queryParams.createTimeStart
this.querydepartmen.createTimeEnd = this.queryParams.createTimeEnd
this.querydepartmen.propagandaType = this.queryParams.propagandaType
this.querydepartmen.hospitalAgencyId = this.queryParams.hospitalAgencyId
this.querydepartmen.propagandaStatus = this.queryParams.propagandaStatus
this.Departmentlist();
},
handleQuerysc() {
@ -1492,48 +1498,48 @@ export default {
submitForm() {
// return
console.log(this.form)
if(this.form.propagandaContent && this.form.propagandaContent.length - 7 > this.maxLength){
if (this.form.propagandaContent && this.form.propagandaContent.length - 7 > this.maxLength) {
// if (this.form.propagandaContent.length - 7 > this.maxLength) {
this.$message({
type: "error",
message: "已达到最大输入长度"
});
// }
// }
}else{
} else {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
if (this.diseaseTypeName == "请选择病种") {
this.form.diseaseTypeName = null
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
if (this.diseaseTypeName == "请选择病种") {
this.form.diseaseTypeName = null
} else {
this.form.diseaseTypeName = this.diseaseTypeName
}
updatePropaganda(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
this.form.diseaseTypeName = this.diseaseTypeName
}
updatePropaganda(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
if (this.diseaseTypeName == '请选择病种') {
this.form.diseaseTypeName = null
} else if (this.diseaseTypeName) {
this.form.diseaseTypeName = this.diseaseTypeName
}
addPropaganda(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
this.Departmentlist()
});
if (this.diseaseTypeName == '请选择病种') {
this.form.diseaseTypeName = null
} else if (this.diseaseTypeName) {
this.form.diseaseTypeName = this.diseaseTypeName
}
addPropaganda(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
this.Departmentlist()
});
}
}
}
});
}
});
}
},
/** 删除按钮操作 */
handleDelete(row) {
@ -1560,9 +1566,9 @@ export default {
// width: 800px;
// }
::v-deep iframe{
width:100%;
height: 500px;
::v-deep iframe {
width: 100%;
height: 500px;
}
.propagandaselect {
width: 100px;

View File

@ -190,6 +190,22 @@
@click="handlesee(scope.row)"
>预览</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-search"
@click="see(scope.row)"
>话术</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-search"
@click="seescript(scope.row)"
>话术预览</el-button
>
<el-button
size="mini"
type="text"
@ -536,10 +552,11 @@
</el-dialog>
</div>
</template>
<script>
import { listScript, getScript, delScript, addScript, updateScript, departmentDisease, department, listDisease, listScriptNum } from "@/api/manage/script";
import stationAcatar from "../../system/stationAvatar/index.vue";
import Cookies from 'js-cookie'
export default {
components: { stationAcatar },
name: "Script",
@ -553,11 +570,6 @@ export default {
departmentId: null,
count: '',//
sumcount: '',
innerVisibleshow: false, //
//
informationqueryParams: {
@ -769,6 +781,26 @@ export default {
imgUrl(imgUrl) {
this.form.scriptFilePath = imgUrl;
},
//
see(row){
Cookies.set("id",row.id)
this.$router.push({
path: "/knowledge/preview",
query: {
id: row.id,
},
});
},
seescript(row){
this.$router.push({
path: "/knowledge/Scriptpreview",
query: {
id: row.id,
},
});
},
//
handlesee(row) {