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

src/views/manage/propaganda/index.vue

@@ -185,6 +185,7 @@
             label="宣教ID"
             align="center"
             prop="propagandaCode"
+            :show-overflow-tooltip="true"
           />
           <el-table-column
             label="宣教状态"
@@ -274,17 +275,15 @@
           </el-table-column>
         </el-table>
         <pagination
-      v-show="total > 0"
+          v-show="total > 0"
-      :total="total"
+          :total="total"
-      :page.sync="queryParams.pageNum"
+          :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+          :limit.sync="queryParams.pageSize"
-      @pagination="getList"
+          @pagination="getList"
-    />
+        />
       </el-col>
     </el-row>
 
- 
-
     <!-- 添加或修改患者宣教信息对话框 -->
     <el-dialog
       :title="title"
@@ -348,7 +347,6 @@
         </el-form-item>
 
         <el-form-item label="科室名称" prop="departmentId">
-     
           <el-select
             v-model="form.departmentName"
             filterable
@@ -366,7 +364,7 @@
             >
             </el-option>
           </el-select>
-    
+
           <!-- <el-button
             type=""
             v-if="departmentName == '请选择科室'"
@@ -1028,7 +1026,7 @@ export default {
     // 医院
     changehospitalAgency(e) {
       this.form.hospitalAgencyName = this.hospitalAgencylist.find(f => f.id == e).agencyName
-      this.form.hospitalAgencyId=e
+      this.form.hospitalAgencyId = e
 
       // hospitalAgencyId
 
@@ -1047,7 +1045,7 @@ export default {
     },
     // 科室点击事件
     changeDepartment(e) {
-      this.form.departmentId=e
+      this.form.departmentId = e
       this.form.departmentName = this.Departmentdata.find(f => f.departmentCode == e).departmentName
       this.diseaseTypeName = '请选择病种'
       this.form.diseaseTypeId = '';
@@ -1056,8 +1054,8 @@ export default {
 
 
     },
-    onBlur(){
+    onBlur() {
-      console.log(this.form,'------------------')
+      console.log(this.form, '------------------')
       if (!this.form.hospitalAgencyName) {
         this.$modal.msgError("请先选择医院");
       }
@@ -1343,7 +1341,7 @@ export default {
       this.form = {
         imgPath: null,
         materialsInfoList: [],
-        hospitalAgencyId:null,
+        hospitalAgencyId: null,
         id: null,
         patientId: null,
         propagandaId: null,
@@ -1405,10 +1403,10 @@ export default {
       this.selectAgencyinfo();
       this.form.propagandaStatus = 'CREATE_COMPLETE'
       this.diseaseTypeName = "请选择病种"
-      this.Departmentdata=[]
+      this.Departmentdata = []
       this.open = true;
       this.title = "新增宣教";
-      console.log(this.form,'90909090')
+      console.log(this.form, '90909090')
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -1447,10 +1445,10 @@ export default {
               this.getList();
             });
           } else {
-            if(this.diseaseTypeName = '请选择病种'){
+            if (this.diseaseTypeName = '请选择病种') {
-              this.form.diseaseTypeName=null
+              this.form.diseaseTypeName = null
-            }else{
+            } else {
-            this.form.diseaseTypeName = this.diseaseTypeName
+              this.form.diseaseTypeName = this.diseaseTypeName
             }
             addPropaganda(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
@@ -1498,7 +1496,6 @@ export default {
 }
 
 .leftpro {
-
   height: 760px;
   overflow: auto;
   .name {

src/views/manage/servicepackage/index.vue

@@ -205,6 +205,7 @@
             prop="diseaseTypeName"
           />
           <el-table-column
+          width="180"
             label="操作"
             align="center"
             class-name="small-padding fixed-width"
@@ -1494,7 +1495,7 @@ export default {
   width: 204px !important;
 }
 .leftserv {
-  height: 1000px;
+  height: 857px;
   overflow: auto;
   .name {
     font-weight: 700;

src/views/system/department/index.vue

@@ -724,6 +724,9 @@ export default {
         departmentName: [
           { required: true, message: "科室名称不能为空", trigger: "blur" },
         ],
+        departmentCode: [
+          { required: true, message: "科室代码不能为空", trigger: "blur" },
+        ],
         departmentPhone: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,

src/views/system/departmentDisease/index.vue

@@ -205,15 +205,15 @@
             </template>
           </el-table-column>
         </el-table>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改科室病种信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
@@ -516,9 +516,8 @@ export default {
         departmentId: [
           { required: true, message: "所属科室不能为空", trigger: "blur" },
         ],
-        diseaseTypeName:[
+        diseaseTypeName: [
-        { required: true, message: "病种名称不能为空", trigger: "blur" },
+          { required: true, message: "病种名称不能为空", trigger: "blur" },
-        
         ],
       },
     };
@@ -703,7 +702,7 @@ export default {
       this.reset();
       this.open = true;
       // if (this.itemname == null) {
-        this.form.departmentName = "请选择科室";
+      this.form.departmentName = "请选择科室";
       // }
       this.title = "添加科室病种信息";
     },