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

src/api/manage/servicepackage.js

@@ -18,9 +18,9 @@ export function serviceWayList(query) {
     })
 }
 // 查询服务内容
-export function serviccontent(id) {
+export function serviccontent(serviceWayId) {
     return request({
-        url: `/manage/servicewaycontent/list?id=${id}`,
+        url: `/manage/servicewaycontent/list?serviceWayId=${serviceWayId}`,
         method: 'get',
     })
 }

src/api/system/stationAvatar.js

@@ -15,6 +15,15 @@ export function uploadFilefm(data) {
         data: data
     })
 }
+// 话术图片
+export function uploadScriptInfo(data) {
+    return request({
+        url: '/manage/script/uploadScriptInfo',
+        method: 'post',
+        data: data
+    })
+}
+
 
 //海报视频上传
 export function updatePoserHeads(data) {

src/views/manage/message/index.vue

@@ -445,9 +445,9 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="病种名称" prop="departmentName" label-width="120">
+        <el-form-item label="病种名称" prop="diseaseTypeName" label-width="120">
           <el-input
-            v-model="querydisease.departmentName"
+            v-model="querydisease.diseaseTypeName"
             placeholder="请输入病种名称"
             clearable
           />
@@ -563,6 +563,8 @@ export default {
       querydisease: {
         pageNum: 1,
         pageSize: 10,
+        diseaseTypeName:null,
+        departmentId:null,
       },
       listdisease: [],
       diseasetotal: 0,
@@ -737,6 +739,8 @@ export default {
     nurseclick(row) {
       this.form.departmentId = row.departmentCode;
       this.departmentName = row.departmentName;
+      this.form.diseaseTypeId = '';
+      this.diseaseTypeName = '请选择病种';
       console.log(this.departmentName, '0000')
       this.innerVisibleshow = false;
     },

src/views/manage/propaganda/index.vue

@@ -503,9 +503,9 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="病种名称" prop="departmentName" label-width="120">
+        <el-form-item label="病种名称" prop="diseaseTypeName" label-width="120">
           <el-input
-            v-model="querydisease.departmentName"
+            v-model="querydisease.diseaseTypeName"
             placeholder="请输入病种名称"
             clearable
           />
@@ -642,6 +642,8 @@ export default {
       querydisease: {
         pageNum: 1,
         pageSize: 10,
+        diseaseTypeName:null,
+        departmentId:null,
       },
       listdisease: [],
       diseasetotal: 0,
@@ -938,6 +940,8 @@ export default {
     nurseclick(row) {
       this.form.departmentId = row.departmentCode;
       this.departmentName = row.departmentName;
+      this.form.diseaseTypeId = '';
+      this.diseaseTypeName = '请选择病种';
       this.innerVisibleshow = false;
     },
 

src/views/manage/script/index.vue

@@ -89,7 +89,7 @@
     </el-row>
     <el-row :gutter="20">
       <el-col :span="5">
-        <div class="left" ref="box">
+        <div class="leftscript" ref="box">
           <div class="name">科室名称</div>
           <div>
             <el-input
@@ -438,9 +438,9 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="病种名称" prop="departmentName" label-width="120">
+        <el-form-item label="病种名称" prop="diseaseTypeName" label-width="120">
           <el-input
-            v-model="querydisease.departmentName"
+            v-model="querydisease.diseaseTypeName"
             placeholder="请输入病种名称"
             clearable
           />
@@ -549,6 +549,8 @@ export default {
       querydisease: {
         pageNum: 1,
         pageSize: 10,
+        diseaseTypeName:null,
+        departmentId:null,
       },
       listdisease: [],
       diseasetotal: 0,
@@ -647,11 +649,7 @@ export default {
         scriptSort: null,
         scriptRemark: null,
       },
-      queryDisease: {
+
-        pageNum: 1,
-        pageSize: 10,
-        departmentId: null,
-      },
       querydepartmen: {
         departmentName: "",
         // pageNum: 1,
@@ -778,6 +776,8 @@ export default {
     nurseclick(row) {
       this.form.departmentId = row.departmentCode;
       this.departmentName = row.departmentName;
+      this.form.diseaseTypeId = '';
+      this.diseaseTypeName = '请选择病种';
       this.innerVisibleshow = false;
     },
 
@@ -1037,9 +1037,9 @@ export default {
 };
 </script>
 <style lang="scss">
-.left {
+.leftscript {
   // width: 30%;
-  height: 500px;
+  height: 850px;
   overflow: auto;
   .name {
     font-weight: 700;

src/views/manage/servicepackage/index.vue

@@ -127,7 +127,7 @@
     </el-row>
     <el-row :gutter="20">
       <el-col :span="5">
-        <div class="left" ref="box">
+        <div class="leftserv" ref="box">
           <div class="name">科室名称</div>
           <div>
             <el-input
@@ -165,6 +165,11 @@
           :data="servicepackageList"
           @selection-change="handleSelectionChange"
         >
+        <el-table-column
+            label="序号"
+            align="center"
+           type="index"
+          />
           <el-table-column
             label="服务包名称"
             align="center"
@@ -583,9 +588,9 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="病种名称" prop="departmentName" label-width="120">
+        <el-form-item label="病种名称" prop="diseaseTypeName" label-width="120">
           <el-input
-            v-model="querydisease.departmentName"
+            v-model="querydisease.diseaseTypeName"
             placeholder="请输入病种名称"
             clearable
           />
@@ -758,6 +763,8 @@ export default {
       querydisease: {
         pageNum: 1,
         pageSize: 10,
+        diseaseTypeName:null,
+        departmentId:null,
       },
       listdisease: [],
       diseasetotal: 0,
@@ -1009,9 +1016,9 @@ export default {
     },
     // 服务方式点击事件
     changeway(e) {
-      var id = null
+      var serviceWayId = null
-      id = this.optionsway.find(f => f.serviceWayName == e).id
+      serviceWayId = this.optionsway.find(f => f.serviceWayName == e).id
-      serviccontent(id).then(response => {
+      serviccontent(serviceWayId).then(response => {
         this.optionscontent = response.rows;
       });
       this.form.voList.serviceContent='';
@@ -1096,6 +1103,8 @@ export default {
     nurseclick(row) {
       this.form.departmentId = row.departmentCode;
       this.departmentName = row.departmentName;
+      this.form.diseaseTypeId = '';
+      this.diseaseTypeName = '请选择病种';
       this.innerVisibleshow = false;
       // this.form.diseaseTypeId = null;
       // this.diseaseTypeName = '请选择科室';
@@ -1128,7 +1137,7 @@ export default {
     },
     // 重置
     resetdisease() {
-      querydisease = {
+      this.querydisease = {
         pageNum: 1,
         pageSize: 10,
       };
@@ -1368,12 +1377,12 @@ export default {
   }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scope>
 ::v-deep .el-input-group {
   width: 204px !important;
 }
-.left {
+.leftserv{
-  height: 530px;
+  height: 1000px;
   overflow: auto;
   .name {
     font-weight: 700;

src/views/manage/template/index.vue

@@ -384,9 +384,9 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="病种名称" prop="departmentName" label-width="120">
+        <el-form-item label="病种名称" prop="diseaseTypeName" label-width="120">
           <el-input
-            v-model="querydisease.departmentName"
+            v-model="querydisease.diseaseTypeName"
             placeholder="请输入病种名称"
             clearable
           />
@@ -493,6 +493,8 @@ export default {
       querydisease: {
         pageNum: 1,
         pageSize: 10,
+        diseaseTypeName:null,
+        departmentId:null,
       },
       listdisease: [],
       diseasetotal: 0,
@@ -661,6 +663,8 @@ export default {
     nurseclick(row) {
       this.form.departmentId = row.departmentCode;
       this.departmentName = row.departmentName;
+      this.form.diseaseTypeId = '';
+      this.diseaseTypeName = '请选择病种';
       this.innerVisibleshow = false;
     },
 

src/views/system/stationAvatar/index.vue

@@ -128,7 +128,8 @@ import {
   uploadTrainingCategoryPicture,
   updatePoserHeads,
   uploadUrl,
-  uploadFilefm
+  uploadFilefm,
+  uploadScriptInfo
 } from "@/api/system/stationAvatar.js";
 
 export default {
@@ -165,7 +166,7 @@ export default {
   },
   created() {
     this.types = this.type;
-    console.log(this.types)
+
 
     this.items = this.item;
     if (this.tovideo == null) {
@@ -173,7 +174,7 @@ export default {
     } else if (this.tovideo == "") {
       this.video.VideoPath = null;
     } else {
-      console.log(this.tovideo)
+
       this.video.VideoPath = process.env.VUE_APP_BASE_API + this.tovideo;
     }
     if (this.img == null) {
@@ -249,7 +250,7 @@ export default {
     },
     // 上传预处理
     beforeUpload(file) {
-      console.log(file)
+
       if (this.types == "materialsVideoUrl") {
         const reader = new FileReader();
         this.previews.data = file;
@@ -383,6 +384,23 @@ export default {
             }
           });
         }
+        // 话术图片
+        else if(this.types == "scriptUrl"){
+          let formDatanew = new FormData();
+          formDatanew.append("file", this.previews.data);
+          uploadScriptInfo(formDatanew).then(response => {
+            if (response.code == 200) {
+              this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
+              this.$emit("imgUrl", response.imgUrl);
+              this.openimg = false;
+            } else {
+              setTimeout(e => {
+                this.openimg = false;
+              }, 1000);
+            }
+          });
+        }
+
 
         else {
           updateNurseStationHeads(formData).then(response => {