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

src/views/manage/propaganda/index.vue

@@ -678,10 +678,7 @@
           <img :src="baseUrl + formview.propagandaCoverPath" alt="" />
           <div class="know">知识卡片</div>
           <div class="knowlist">
-            <Editorxj
+            <Editorxj v-model="formview.propagandaContent" :min-height="192" />
-            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,7 +1006,7 @@ export default {
       },
       // 表单校验
       rules: {
-        propagandaTitle:[
+        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,7 +1498,7 @@ 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",
@@ -1501,7 +1507,7 @@ export default {
 
         // }
 
-      }else{
+      } else {
 
         this.$refs["form"].validate(valid => {
           if (valid) {
@@ -1560,8 +1566,8 @@ export default {
 //   width: 800px;
 
 // }
-::v-deep iframe{
+::v-deep iframe {
-    width:100%;
+  width: 100%;
   height: 500px;
 }
 .propagandaselect {

src/views/manage/script/index.vue

@@ -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) {