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

src/layout/index.vue

@@ -55,6 +55,7 @@ export default {
     }
   },
   created() {
+    localStorage.removeItem('questionquery')
     localStorage.removeItem('manualReviewquery')
     localStorage.removeItem('signRecordquery')
     localStorage.removeItem('followupquery')

src/store/modules/tagsView.js

@@ -112,6 +112,9 @@ const actions = {
   },
 
   delView({ dispatch, state }, view) {
+    if (view.fullPath == "/knowledge/question") {
+      localStorage.removeItem('questionquery')
+    }
     if (view.fullPath == '/task/manualReview') {
       localStorage.removeItem('manualReviewquery')
     }
@@ -144,6 +147,9 @@ const actions = {
   },
 
   delOthersViews({ dispatch, state }, view) {
+    if (view.fullPath == "/knowledge/question") {
+      localStorage.removeItem('questionquery')
+    }
     if (view.fullPath != '/task/manualReview') {
       localStorage.removeItem('manualReviewquery')
     }

src/views/components/DepartmentList.vue

@@ -79,6 +79,7 @@ export default {
             switchvalue: true,
             //校验
             itemid: null,
+            departmentName: '',
             // 表格数据
             DepartmentoList: [],
             count: '',
@@ -236,6 +237,11 @@ export default {
                             this.count += item.countNum;
                         }
                     });
+                    if (localStorage.getItem('questionquery')) {
+                        this.itemid = JSON.parse(localStorage.getItem('questionquery')).departmentId
+                        this.departmentName = JSON.parse(localStorage.getItem('questionquery')).departmentName
+                    }
+                    if (this.methods != 'getDepartmentList') {
                         this.$emit("clickdepartment", {
                             hospitalAgencyId: this.querydepartmen.hospitalAgencyId,
                             itemid: this.itemid,
@@ -243,6 +249,7 @@ export default {
                             hospitalAgencyName: this.hospitalAgencyName
                         });
                     }
+                }
             });
         },
     }

src/views/manage/components/PathReview.vue

@@ -286,14 +286,6 @@
                                 <div class="lefttext">
                                     文字提醒
                                 </div>
-                                <div class="righttextarea">
-                                    {{ item.textRemindContent }}
-                                </div>
-                            </div>
-                            <div class="tabtext" v-else>
-                                <div class="lefttext">
-                                    内容
-                                </div>
                                 <div class="righttextarea" v-html="item.nodeContent">
                                 </div>
                             </div>
@@ -501,6 +493,8 @@ export default {
     }
 
     span {
+        height: 20px;
+        line-height: 20px;
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;

src/views/manage/continueSigning/index.vue

@@ -301,6 +301,10 @@ export default {
             this.uploadsave();
         },
         uploadsave() {
+            this.$confirm('是否确认续约?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+            }).then(() => {
                 if (this.signPackage.healthManageId && this.attendingPhysicianlist?.length > 0) {
                     this.signPackage.healthManageName = this.attendingPhysicianlist.find(e => e.userId == this.signPackage.healthManageId)?.nickName
                 }
@@ -322,6 +326,7 @@ export default {
                         this.$modal.msgSuccess("续约成功");
                     });
                 })
+            })
         },
         //新增硬件
         addhardware() {

src/views/manage/newSigning/index.vue

@@ -259,6 +259,10 @@ export default {
             }
         },
         uploadsave() {
+            this.$confirm('是否确认签约?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+            }).then(() => {
                 if (this.signPackage.servicePackageId && this.packagelist?.length > 0) {
                     this.signPackage.packageName = this.packagelist.find(e => e.id == this.signPackage.servicePackageId)?.packageName
                 }
@@ -282,6 +286,7 @@ export default {
                         this.$modal.msgSuccess("签约成功");
                     });
                 })
+            })
         },
         //文件上传完成
         handleSuccess(response, file, fileList) {

src/views/system/ManageNodeInformation/indexjs.js

@@ -751,11 +751,8 @@ export default {
         });
         this.itemlist.specialDiseaseNodeList = [];
         this.lists.forEach((e) => {
-          console.log(e, 'taskNodeType')
           e.list.length > 0
             ? e.list.forEach((el) => {
-              console.log(el, 'taskNodeType')
-
               el.routeNodeDay = e.routeNodeDay;
               el.routeNodeName = e.routeNodeName;
               if (el.phoneDialMethod == 'COMMON' && el.templateId) {

src/views/system/ManuallyCreatingTasks/index.vue

@@ -677,7 +677,7 @@ export default {
         list(this.parentDictCode).then((res) => {
           res.rows.forEach((e) => {
             this.list.forEach((el) => {
-              el.routeNodeName = e.dictLabel;
+              el.routeNodeName = e.dictValue;
             });
           });
         });
@@ -698,6 +698,7 @@ export default {
         messagePushSign: "0",
         appletPushSign: "0",
         phonePushSign: "1",
+        phoneDialMethod: "",
       });
     },
     delitem(item, index, list) {
@@ -716,6 +717,10 @@ export default {
       }
     },
     upload() {
+      this.$confirm('保存此任务, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+      }).then(() => {
         this.updata.routeNodeList = this.list;
         // this.updata.routeNodeList.forEach((el) => {
         //   if (el.phoneDialMethod == "COMMON" && el.questionInfoId) {
@@ -750,6 +755,7 @@ export default {
               });
           }, 3000);
         });
+      })
     },
     // 获取表格最高高度
     getMaxTableHeight() {

src/views/system/agencyCategory/index.vue

@@ -304,6 +304,9 @@ export default {
       const id = row.id || this.ids;
       getAgencyCategory(id).then((response) => {
         this.form = response.data;
+        if (!this.form.categorySort) {
+          this.form.categorySort = undefined
+        }
         this.open = true;
         this.title = "修改机构类别";
       });
@@ -383,7 +386,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.el-cascader .el-input input::-webkit-input-placeholder {
+::v-deep .el-input-number .el-input__inner {
+  text-align: left;
+}
+
+::v-deep .el-cascader .el-input input::-webkit-input-placeholder {
   color: #cccfd6;
 }
 </style>

src/views/system/components/message.vue

@@ -188,11 +188,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.$refs.DepartmentList.resetQuery()
       this.queryParams.departmentId = null;
       this.itemname = null;
       this.resetForm("queryForm");
-      this.handleQuery();
+      this.$refs.DepartmentList.resetQuery()
+      // this.handleQuery();
     },
   },
 };

src/views/system/components/miniProgram.vue

@@ -193,10 +193,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.$refs.DepartmentList.resetQuery()
       this.queryParams.departmentId = null;
       this.resetForm("queryForm");
-      this.handleQuery();
+      this.$refs.DepartmentList.resetQuery()
+      // this.handleQuery();
     },
   },
 };

src/views/system/components/officialAccount.vue

@@ -172,10 +172,10 @@ export default {
         },
         /** 重置按钮操作 */
         resetQuery() {
-            this.$refs.DepartmentList.resetQuery()
             this.queryParams.departmentId = null;
             this.resetForm("queryForm");
-            this.handleQuery();
+            this.$refs.DepartmentList.resetQuery()
+            // this.handleQuery();
         },
     }
 };

src/views/system/components/propaganda.vue

@@ -280,9 +280,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForm");
-      this.handleQuery();
+      this.$refs.DepartmentList.resetQuery()
+      // this.handleQuery();
     },
   },
 };

src/views/system/components/question.vue

@@ -197,9 +197,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForm");
-      this.handleQuery();
+      this.$refs.DepartmentList.resetQuery()
+      // this.handleQuery();
     },
   },
 };

src/views/system/components/script.vue

@@ -234,9 +234,9 @@ export default {
         scriptSort: null,
         scriptRemark: null,
       };
-      this.$refs.DepartmentList.resetQuery()
       this.resetForm("queryForm");
-      this.getList();
+      this.$refs.DepartmentList.resetQuery()
+      // this.getList();
     },
   },
 };

src/views/system/partition/index.vue

@@ -529,6 +529,9 @@ export default {
       const id = row.id || this.ids
       getPartition(id).then(response => {
         this.form = response.data;
+        if(!this.form.taskPartitionSort){
+          this.form.taskPartitionSort=undefined
+        }
         this.open = true;
         this.title = "修改任务细分字典";
       });

src/views/system/question/index.vue

@@ -3,256 +3,105 @@
     <el-row :gutter="20">
       <!--部门数据-->
       <el-col :span="5" :xs="24">
-        <DepartmentList
+        <DepartmentList ref="DepartmentList" @clickdepartment="clickdepartment" :methods="'getDepartmentList'">
-          ref="DepartmentList"
-          @clickdepartment="clickdepartment"
-          :methods="'getDepartmentList'"
-        >
         </DepartmentList>
       </el-col>
       <!--用户数据-->
       <el-col :span="19" :xs="24">
         <div ref="topform" class="form">
-          <el-form
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="70px">
-            :model="queryParams"
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            label-width="70px"
-          >
             <el-form-item label="问卷标题" prop="questionnaireName">
-              <el-input
+              <el-input v-model="queryParams.questionnaireName" placeholder="请输入问卷标题" clearable
-                v-model="queryParams.questionnaireName"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入问卷标题"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item label="病种名称" prop="diseaseTypeName">
-              <el-input
+              <el-input v-model="queryParams.diseaseTypeName" placeholder="请输入病种名称" clearable
-                v-model="queryParams.diseaseTypeName"
+                @keyup.enter.native="handleQuery" />
-                placeholder="请输入病种名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <el-form-item>
-              <el-button
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                type="primary"
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                icon="el-icon-search"
-                size="mini"
-                @click="handleQuery"
-                >搜索</el-button
-              >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-              >
             </el-form-item>
           </el-form>
         </div>
         <div ref="mb8" class="mb8">
           <el-row :gutter="10" class="">
             <el-col :span="1.5">
-              <el-button
+              <el-button type="primary" size="mini" @click="handleAdd"
-                type="primary"
+                v-hasPermi="['system:question:add']">新增问卷模板</el-button>
-                size="mini"
+              <el-button type="warning" plain icon="el-icon-upload2" size="mini" @click="handleUpload">导入</el-button>
-                @click="handleAdd"
-                v-hasPermi="['system:question:add']"
-                >新增问卷模板</el-button
-              >
-              <el-button
-                type="warning"
-                plain
-                icon="el-icon-upload2"
-                size="mini"
-                @click="handleUpload"
-                >导入</el-button
-              >
             </el-col>
           </el-row>
         </div>
         <div ref="table">
-          <el-table
+          <el-table :max-height="maxTableHeight" v-loading="loading" :data="questionList">
-            :max-height="maxTableHeight"
+            <el-table-column label="序号" type="index" width="55" align="center" />
-            v-loading="loading"
+            <el-table-column label="问卷模板名称" align="center" prop="questionnaireName" />
-            :data="questionList"
+            <el-table-column label="问题个数" align="center" prop="questionCount" />
-          >
+            <el-table-column label="问卷模板ID" align="center" prop="questionnaireId" />
-            <el-table-column
+            <el-table-column label="问卷类型" align="center" prop="questionType">
-              label="序号"
-              type="index"
-              width="55"
-              align="center"
-            />
-            <el-table-column
-              label="问卷模板名称"
-              align="center"
-              prop="questionnaireName"
-            />
-            <el-table-column
-              label="问题个数"
-              align="center"
-              prop="questionCount"
-            />
-            <el-table-column
-              label="问卷模板ID"
-              align="center"
-              prop="questionnaireId"
-            />
-            <el-table-column
-              label="问卷类型"
-              align="center"
-              prop="questionType"
-            >
               <template slot-scope="scope">
                 <div v-if="scope.row.questionType == 'REGULAR_QUESTIONNAIRE'">
                   普通问卷
                 </div>
-                <div
+                <div v-if="scope.row.questionType == 'SATISFACTION_QUESTIONNAIRE'">
-                  v-if="scope.row.questionType == 'SATISFACTION_QUESTIONNAIRE'"
-                >
                   满意度问卷
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column label="问卷状态" align="center" prop="questionnaireStatus">
-              label="问卷状态"
-              align="center"
-              prop="questionnaireStatus"
-            >
               <template slot-scope="scope">
-                <el-tag
+                <el-tag type="success" v-if="scope.row.questionnaireStatus == 'PUBLISHED'">已发布</el-tag>
-                  type="success"
-                  v-if="scope.row.questionnaireStatus == 'PUBLISHED'"
-                  >已发布</el-tag
-                >
                 <el-tag type="warning" v-else>未发布</el-tag>
               </template>
             </el-table-column>
-            <el-table-column
+            <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
-              label="病种名称"
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-              align="center"
-              prop="diseaseTypeName"
-            />
-            <el-table-column
-              label="操作"
-              align="center"
-              class-name="small-padding fixed-width"
-            >
               <template slot-scope="scope">
                 <!-- <el-switch v-model="scope.row.questionnaireStatus" active-color="#13ce66" inactive-color="#ff4949"
                 active-value="PUBLISHED" inactive-value="UNPUBLISHED" @change="switchstatus($event, scope.row)">
               </el-switch> -->
-                <el-button
+                <el-button size="mini" type="text" @click="switchstatus('UNPUBLISHED', scope.row)"
-                  size="mini"
+                  v-if="scope.row.questionnaireStatus == 'PUBLISHED'">取消发布</el-button>
-                  type="text"
+                <el-button size="mini" type="text" @click="switchstatus('PUBLISHED', scope.row)" v-else>发布</el-button>
-                  @click="switchstatus('UNPUBLISHED', scope.row)"
+                <el-button size="mini" type="text" @click="handleClassification(scope.row)"
-                  v-if="scope.row.questionnaireStatus == 'PUBLISHED'"
+                  v-hasPermi="['system:question:edit']">分类管理</el-button>
-                  >取消发布</el-button
+                <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
-                >
+                  v-hasPermi="['system:question:edit']">编辑</el-button>
-                <el-button
+                <el-button size="mini" type="text" @click="handleDelete(scope.row)"
-                  size="mini"
+                  v-hasPermi="['system:question:remove']">删除</el-button>
-                  type="text"
-                  @click="switchstatus('PUBLISHED', scope.row)"
-                  v-else
-                  >发布</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="handleClassification(scope.row)"
-                  v-hasPermi="['system:question:edit']"
-                  >分类管理</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['system:question:edit']"
-                  >编辑</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['system:question:remove']"
-                  >删除</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
-        <myPagination
+        <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-          v-show="total > 0"
+          :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
-          :total="total"
-          :pageSize="queryParams.pageSize"
-          :indexFromWrap="queryParams.pageNum"
-          @updateCPage="updateCPage"
-        ></myPagination>
       </el-col>
     </el-row>
-    <el-dialog
+    <el-dialog title="提示" :visible.sync="classificationOpen" width="30%" :before-close="classificationOpenfalse">
-      title="提示"
+      <el-form ref="form" :model="classificationform" label-width="80px" :rules="rules">
-      :visible.sync="classificationOpen"
-      width="30%"
-      :before-close="classificationOpenfalse"
-    >
-      <el-form
-        ref="form"
-        :model="classificationform"
-        label-width="80px"
-        :rules="rules"
-      >
         <el-form-item label="科室名称" prop="departmentId">
-          <el-select
+          <el-select v-model="classificationform.departmentId" placeholder="请选择科室" clearable style="width: 300px"
-            v-model="classificationform.departmentId"
+            @clear="cleardepartment" @change="changedepartment">
-            placeholder="请选择科室"
+            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id" />
-            clearable
-            style="width: 300px"
-            @clear="cleardepartment"
-            @change="changedepartment"
-          >
-            <el-option
-              v-for="item in departmentlist"
-              :key="item.id"
-              :label="item.departmentName"
-              :value="item.id"
-            />
           </el-select>
         </el-form-item>
         <el-form-item label="病种名称">
-          <el-select
+          <el-select v-model="classificationform.diseaseTypeId" placeholder="请选择病种" clearable style="width: 300px"
-            v-model="classificationform.diseaseTypeId"
+            @change="changediseaseType">
-            placeholder="请选择病种"
+            <el-option v-for="item in diseaselist" :key="item.id" :label="item.diseaseTypeName" :value="item.id" />
-            clearable
-            style="width: 300px"
-            @change="changediseaseType"
-          >
-            <el-option
-              v-for="item in diseaselist"
-              :key="item.id"
-              :label="item.diseaseTypeName"
-              :value="item.id"
-            />
           </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="classificationupload"
+        <el-button type="primary" @click="classificationupload">确 定</el-button>
-          >确 定</el-button
-        >
         <el-button @click="classificationOpenfalse">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 导入弹框 -->
-    <el-dialog
+    <el-dialog title="" :visible.sync="innerexport" width="1000px" append-to-body :before-close="exportcancel">
-      title=""
-      :visible.sync="innerexport"
-      width="1000px"
-      append-to-body
-      :before-close="exportcancel"
-    >
       <questionexport @submit="submit" ref="childComponent"></questionexport>
       <div slot="footer" class="dialog-footer footerlist">
         <el-button type="primary" @click="submitexport">确 定</el-button>
@@ -317,7 +166,12 @@ export default {
     };
   },
   created() {
-    // this.getList();
+    if (localStorage.getItem('questionquery')) {
+      this.queryParams = JSON.parse(localStorage.getItem('questionquery'))
+    } else {
+      this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
+    }
+    this.getList();
   },
   mounted() {
     this.getMaxTableHeight()
@@ -351,7 +205,6 @@ export default {
         }
       } else {
         this.$modal.msgError("请先选择左侧科室");
-
       }
     },
     // 弹框取消
@@ -363,6 +216,7 @@ export default {
       this.queryParams.hospitalAgencyId = item.hospitalAgencyId
       this.queryParams.hospitalAgencyName = item.hospitalAgencyName
       this.queryParams.departmentId = item.itemid
+      this.queryParams.departmentName = item.itemName
       this.departmentName = item.itemName
       if (item.hospitalAgencyId) {
         this.handleQuery();
@@ -469,6 +323,8 @@ export default {
     /** 查询问卷基本信息列表 */
     getList() {
       this.loading = true;
+      console.log(this.queryParams)
+      localStorage.setItem('questionquery', JSON.stringify(this.queryParams))
       listQuestion(this.queryParams).then(response => {
         this.questionList = response.rows;
         this.total = response.total;
@@ -606,10 +462,12 @@ export default {
 .app-container {
   padding: 20px 0 0 20px !important;
 }
+
 ::v-deep .el-dialog__footer {
   padding-top: 33px !important;
 
 }
+
 ::v-deep .el-row {
   height: 100% !important;
 }

src/views/system/subdivision/index.vue

@@ -218,6 +218,9 @@ export default {
       const id = row.id || this.ids;
       getSubdivision(id).then((response) => {
         this.form = response.data;
+        if (!this.form.sort) {
+          this.form.sort = undefined
+        }
         this.open = true;
         this.title = "修改细分类别信息";
       });
@@ -292,3 +295,8 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+::v-deep .el-input-number .el-input__inner {
+  text-align: left;
+}
+</style>

src/views/system/taskStatus/index.vue

@@ -274,7 +274,6 @@ export default {
         this.form = response.data;
         if (!this.form.taskStatusSort) {
           this.form.taskStatusSort = undefined
-
         }
         this.open = true;
         this.title = "修改任务状态字典";
@@ -342,8 +341,8 @@ export default {
   }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
-.el-input-number .el-input__inner {
+::v-deep .el-input-number .el-input__inner {
   text-align: left;
 }
 </style>

src/views/system/taskType/index.vue

@@ -229,6 +229,9 @@ export default {
       const id = row.id || this.ids
       getTaskType(id).then(response => {
         this.form = response.data;
+        if(!this.form.taskTypeSort){
+          this.form.taskTypeSort=undefined
+        }
         this.open = true;
         this.title = "修改任务类型字典";
       });