From 3d7db13d312a8b188354bad29809e2f42f990f26 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 30 Dec 2024 17:43:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/propaganda/index.vue      | 33 ++++++++++++++++++++
 src/views/system/components/propaganda.vue | 35 ++++++++++++++++++++--
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/src/views/manage/propaganda/index.vue b/src/views/manage/propaganda/index.vue
index 655877e..1677aca 100644
--- a/src/views/manage/propaganda/index.vue
+++ b/src/views/manage/propaganda/index.vue
@@ -21,6 +21,7 @@
           >
             <el-form-item label="创建时间" prop="">
               <el-date-picker
+              style="width:205px"
                 v-model="queryParams.createTimeStart"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -31,6 +32,7 @@
               </el-date-picker>
               -
               <el-date-picker
+              style="width:205px"
                 v-model="queryParams.createTimeEnd"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -44,6 +46,7 @@
               <el-select
                 v-model="queryParams.propagandaType"
                 placeholder="请选择"
+                clearable 
               >
                 <el-option
                   v-for="item in optionstype"
@@ -65,6 +68,7 @@
               <el-select
                 v-model="queryParams.propagandaStatus"
                 placeholder="请选择"
+                clearable
               >
                 <el-option
                   v-for="item in optionsstate"
@@ -81,6 +85,21 @@
           @keyup.enter.native="handleQuery"
         /> -->
             </el-form-item>
+            <el-form-item label="来源" prop="source" label-width="50">
+              <el-select
+                v-model="queryParams.source"
+                placeholder="请选择"
+                clearable
+              >
+                <el-option
+                  v-for="item in optionspublick"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-button
                 type="primary"
@@ -873,6 +892,18 @@ export default {
       },//预览数据
       copyid: null,//复制id
       examineid: null,//审核id
+      // 来源
+      optionspublick:[
+      {
+        value: 'PRIVATE',
+        label: '私有'
+      },
+      {
+        value: 'PUBLIC',
+        label: '共有'
+      }, 
+
+      ],
       optionstype: [{
         value: 'MEDICATION_KNOWLEDGE',
         label: '用药知识'
@@ -949,6 +980,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        source:'PRIVATE',
         patientId: null,
         propagandaId: null,
         departmentName: null,
@@ -1419,6 +1451,7 @@ export default {
       this.queryParams.createTimeStart = null
       this.queryParams.propagandaType=null
       this.queryParams.propagandaStatus=null
+      this.queryParams.source=null
       this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
       this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
       this.resetForm("queryForms");
diff --git a/src/views/system/components/propaganda.vue b/src/views/system/components/propaganda.vue
index df2a44a..78377b8 100644
--- a/src/views/system/components/propaganda.vue
+++ b/src/views/system/components/propaganda.vue
@@ -26,11 +26,26 @@
                 @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item label="宣教类型" prop="propagandaType">
-              <el-select v-model="queryParams.propagandaType" placeholder="请选择">
+              <el-select v-model="queryParams.propagandaType" placeholder="请选择" clearable>
                 <el-option v-for="item in optionstype" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="来源" prop="source">
+              <el-select
+                v-model="queryParams.source"
+                placeholder="请选择"
+                clearable
+              >
+                <el-option
+                  v-for="item in optionspublick"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -112,6 +127,18 @@ export default {
       handleselectName: "",
       handleselectId: "",
       classificationOpen: false,
+            // 来源
+      optionspublick:[
+      {
+        value: 'PRIVATE',
+        label: '私有'
+      },
+      {
+        value: 'PUBLIC',
+        label: '共有'
+      }, 
+
+      ],
       optionstype: [
         {
           value: "MEDICATION_KNOWLEDGE",
@@ -155,6 +182,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        source:'PRIVATE',
         patientId: null,
         propagandaId: null,
         departmentName: null,
@@ -280,7 +308,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams.propagandaTitle = null
+      this.queryParams.propagandaType=null
+      this.queryParams.source=null
+      // this.resetForm("queryForm");
       this.$refs.DepartmentList.resetQuery()
       // this.handleQuery();
     },