From 2e876b533f17de03f93676b0d6922e601dc4e1d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Wed, 10 Apr 2024 09:47:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/servicewaycontent/index.vue |  63 ++++-
 src/views/system/taskExecuteRecord/index.vue | 234 ++++---------------
 2 files changed, 95 insertions(+), 202 deletions(-)

diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue
index 5ed2ebe..73f5560 100644
--- a/src/views/manage/servicewaycontent/index.vue
+++ b/src/views/manage/servicewaycontent/index.vue
@@ -223,7 +223,7 @@
             prop="serviceWayFrequencyList"
           >
             <!-- <template slot-scope="scope">
-            
+
               <el-select
                 size="mini"
                 @click="getSuppliers()"
@@ -232,7 +232,7 @@
                 clearable
                 placeholder="请选择"
               >
-              
+
                 <el-option
                   v-for="item in scope.row.serviceWayFrequencyList"
                   :key="item.id"
@@ -249,7 +249,7 @@
                 >
                 </el-option>
               </el-select>
-        
+
             </template> -->
 
             <!-- </div> -->
@@ -355,7 +355,7 @@
             <el-form-item label="" prop="serviceFrequencyStart" label-width="">
               <el-input
                 :disabled="disableda"
-                oninput="value=value.replace(/[^\d.]/g,'')"
+                :change="checkPrice()"
                 v-model="form.serviceFrequencyStart"
                 placeholder="请输入服务频次数字起始值"
               />
@@ -364,6 +364,7 @@
             <el-form-item label="" prop="serviceFrequencyEnd" label-width="">
               <el-input
                 :disabled="disabledb"
+                :change="checkPricemax()"
                 oninput="value=value.replace(/[^\d.]/g,'')"
                 v-model="form.serviceFrequencyEnd"
                 placeholder="请输入服务频次数字结束值"
@@ -394,7 +395,7 @@
           <el-input-number
             v-model="form.serviceSort"
             controls-position="right"
-            :min="0"
+            @change="changeVal"
             style="width: 250px"
           />
         </el-form-item>
@@ -553,6 +554,44 @@ export default {
     this.mentlist();
   },
   methods: {
+    changeVal() {
+      this.$forceUpdate(); //解决点击计数器失效问题
+    },
+    /**只能输入数字且有小数点最多保留两位*/
+    checkPrice() {
+      let checkPlan = "" + this.form.serviceFrequencyStart;
+      checkPlan = checkPlan
+        .replace(/[^\d.]/g, "") // 清除“数字”和“.”以外的字符
+        .replace(/\.{2,}/g, ".") // 只保留第一个. 清除多余的
+        .replace(/^\./g, "") // 保证第一个为数字而不是.
+        .replace(".", "$#$")
+        .replace(/\./g, "")
+        .replace("$#$", ".");
+      if (checkPlan.indexOf(".") < 0 && checkPlan !== "") {
+        // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
+        checkPlan = parseFloat(checkPlan) + "";
+      } else if (checkPlan.indexOf(".") >= 0) {
+        checkPlan = checkPlan.replace(/^()*(\d+)\.(\d\d).*$/, "$1$2.$3"); // 只能输入两个小数
+      }
+      this.form.serviceFrequencyStart = checkPlan;
+    },
+    checkPricemax() {
+      let checkPlan = "" + this.form.serviceFrequencyEnd;
+      checkPlan = checkPlan
+        .replace(/[^\d.]/g, "") // 清除“数字”和“.”以外的字符
+        .replace(/\.{2,}/g, ".") // 只保留第一个. 清除多余的
+        .replace(/^\./g, "") // 保证第一个为数字而不是.
+        .replace(".", "$#$")
+        .replace(/\./g, "")
+        .replace("$#$", ".");
+      if (checkPlan.indexOf(".") < 0 && checkPlan !== "") {
+        // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
+        checkPlan = parseFloat(checkPlan) + "";
+      } else if (checkPlan.indexOf(".") >= 0) {
+        checkPlan = checkPlan.replace(/^()*(\d+)\.(\d\d).*$/, "$1$2.$3"); // 只能输入两个小数
+      }
+      this.form.serviceFrequencyEnd = checkPlan;
+    },
     // getSuppliers(e) {
     //   console.log(e);
     // },
@@ -733,7 +772,6 @@ export default {
       this.disableda = false;
       this.disabledb = false;
       this.disabled = true; //文本
-
       this.form.serviceFrequencyType = "DIGIT";
       console.log(this.itemname, "itemname");
       if (this.itemname) {
@@ -741,10 +779,6 @@ export default {
         this.form.serviceWayId = this.itemname;
         console.log(this.form, " this.form");
       }
-
-      // else if (this.itemname == null) {
-      //   this.form.serviceWayId = "请选择服务方式"
-      // }
       this.open = true;
       this.title = "添加服务方式内容";
     },
@@ -757,7 +791,12 @@ export default {
       this.reset();
       getServicewaycontent(row.id).then((response) => {
         this.form = response.data;
-        // this.form.serviceWayId=row.serviceWayId
+        if (response.data.serviceFrequencySort) {
+        this.form.serviceSort = response.data.serviceFrequencySort;
+        }
+        else {
+          this.form.serviceSort = undefined;
+        }
         this.form.id = response.data.serviceFrequencyId;
         if (response.data.serviceWayId) {
           this.form.serviceWayId = response.data.serviceWayId;
@@ -996,4 +1035,4 @@ export default {
 .el-button--success.is-plain {
   font-size: 10px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/system/taskExecuteRecord/index.vue b/src/views/system/taskExecuteRecord/index.vue
index 232096d..07f4210 100644
--- a/src/views/system/taskExecuteRecord/index.vue
+++ b/src/views/system/taskExecuteRecord/index.vue
@@ -1,10 +1,5 @@
 <template>
   <div class="app-container">
-    <!-- <el-tabs v-model="queryParams.serviceStatus" @tab-click="handleClick">
-      <el-tab-pane label="未执行" name="INTENTIONAL_SIGNING"></el-tab-pane>
-      <el-tab-pane label="执行中" name="SERVICE_CENTER"></el-tab-pane>
-      <el-tab-pane label="已执行" name="SERVICE_END"></el-tab-pane>
-    </el-tabs> -->
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -16,49 +11,17 @@
       <el-form-item label="执行时间" prop="startDate" label-width="110px">
         <el-date-picker
           v-model="intentionalTime"
+          @change="pickerChangeFn"
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
           style="width: 300px"
           value-format="yyyy-MM-dd"
+          clearable
           end-placeholder="结束日期"
         >
         </el-date-picker>
       </el-form-item>
-      <!-- <el-form-item
-        label="出院时间"
-        prop="intentionalTimeStart"
-        label-width="110px"
-        v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'"
-      >
-        <el-date-picker
-          v-model="intentionalTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          style="width: 300px"
-          value-format="yyyy-MM-dd"
-          end-placeholder="结束日期"
-        >
-        </el-date-picker>
-      </el-form-item> -->
-      <!-- <el-form-item
-        label="入院时间"
-        prop="intentionalTimeStart"
-        label-width="110px"
-        v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'"
-      >
-        <el-date-picker
-          v-model="intentionalTime"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          style="width: 300px"
-          value-format="yyyy-MM-dd"
-          end-placeholder="结束日期"
-        >
-        </el-date-picker>
-      </el-form-item> -->
       <el-form-item label="医院" prop="hospitalAgencyId">
         <el-select
           v-model="queryParams.hospitalAgencyId"
@@ -66,10 +29,8 @@
           placeholder="请选择医院"
           style="width: 200px"
           clearable
-       
         >
-        <!-- @clear="clearhospitalAgency" -->
-
+          <!-- @clear="clearhospitalAgency" -->
           <el-option
             v-for="item in hospitalAgencylist"
             :key="item.id"
@@ -79,69 +40,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <!-- <el-form-item
-        label="院区"
-        prop="campusAgencyId"
-        v-if="queryParams.hospitalAgencyId"
-      >
-        <el-select
-          v-model="queryParams.campusAgencyId"
-          filterable
-          placeholder="请选择院区"
-          style="width: 200px"
-          clearable
-          @clear="clearcampusAgency"
-          @change="changecampusAgency"
-        >
-          <el-option
-            v-for="item in campusAgencylist"
-            :key="item.id"
-            :label="item.agencyName"
-            :value="item.id"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        label="科室"
-        prop="departmentId"
-        v-if="queryParams.campusAgencyId"
-      >
-        <el-select
-          v-model="queryParams.departmentId"
-          filterable
-          placeholder="请选择科室"
-          style="width: 200px"
-          clearable
-          @clear="cleardepartment"
-          @change="changedepartment"
-        >
-          <el-option
-            v-for="item in departmentlist"
-            :key="item.id"
-            :label="item.departmentName"
-            :value="item.id"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="病区" prop="wardId" v-if="queryParams.departmentId">
-        <el-select
-          v-model="queryParams.wardId"
-          filterable
-          placeholder="请选择病区"
-          style="width: 200px"
-          clearable
-        >
-          <el-option
-            v-for="item in wardlist"
-            :key="item.id"
-            :label="item.departmentName"
-            :value="item.id"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
+
       <el-form-item label="就诊方式" prop="visitMethod">
         <el-select
           v-model="queryParams.visitMethod"
@@ -156,14 +55,7 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="患者表id" prop="patientId">
-        <el-input
-          v-model="queryParams.patientId"
-          placeholder="请输入患者表id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
+
       <el-form-item label="就诊流水号" prop="visitSerialNumber">
         <el-input
           v-model="queryParams.visitSerialNumber"
@@ -172,14 +64,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="签约患者管理任务节点表id" prop="manageRouteNodeId">
-        <el-input
-          v-model="queryParams.manageRouteNodeId"
-          placeholder="请输入签约患者管理任务节点表id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
+
       <el-form-item label="患者姓名" prop="patientName">
         <el-input
           v-model="queryParams.patientName"
@@ -198,43 +83,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="路径节点名称" prop="manageRouteNodeName">
-        <el-input
-          v-model="queryParams.manageRouteNodeName"
-          placeholder="请输入管理路径节点名称"
-          clearable
-          style="width: 200px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="任务执行时间" prop="executeTime">
-        <el-date-picker
-          clearable
-          style="width: 200px"
-          v-model="queryParams.executeTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择任务执行时间，格式：yyyy-MM-dd HH:mm:ss"
-        >
-        </el-date-picker>
-      </el-form-item> -->
-      <!-- <el-form-item label="执行人姓名" prop="executePerson">
-        <el-input
-          v-model="queryParams.executePerson"
-          placeholder="请输入执行人姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="模板名称" prop="executeRemark">
-        <el-input
-          v-model="queryParams.executeRemark"
-          placeholder="请输入模板名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-
       <el-form-item>
         <el-button
           type="primary"
@@ -303,10 +151,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
       <!-- <el-table-column label="患者表id" align="center" prop="patientId" /> -->
- 
+
       <el-table-column label="患者姓名" align="center" prop="patientName" />
       <el-table-column label="电话" align="center" prop="patientPhone" />
-      <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" />
+      <el-table-column
+        label="就诊流水号"
+        align="center"
+        prop="visitSerialNumber"
+      />
       <el-table-column label="医院" align="center" prop="hospitalAgencyName" />
       <el-table-column label="院区" align="center" prop="campusAgencyName" />
       <el-table-column label="科室名称" align="center" prop="departmentName" />
@@ -314,9 +166,17 @@
       <!-- <el-table-column label="门诊/住院号" align="center" prop="patientName" />
       <el-table-column label="手术名称" align="center" prop="patientName" /> -->
       <el-table-column label="执行人姓名" align="center" prop="executePerson" />
-      <el-table-column label="签约患者管理路径节点名称" align="center" prop="manageRouteNodeName" />
-      <el-table-column label="签约患者管理任务名称" align="center" prop="manageRouteName" />
-      
+      <el-table-column
+        label="签约患者管理路径节点名称"
+        align="center"
+        prop="manageRouteNodeName"
+      />
+      <el-table-column
+        label="签约患者管理任务名称"
+        align="center"
+        prop="manageRouteName"
+      />
+
       <el-table-column
         label="入院时间"
         align="center"
@@ -341,7 +201,7 @@
         <template slot-scope="scope">
           <span
             >{{ scope.row.visitMethod == "OUTPATIENT_SERVICE" ? "门诊" : "" }}
-            {{ scope.row.visitMethod == "BE_IN_HOSPITAL" ? "住院" : "" }}
+            {{ scope.row.visitMethod == "BE_HOSPITALIZED" ? "住院" : "" }}
           </span>
         </template></el-table-column
       >
@@ -380,16 +240,7 @@
           </span>
         </template></el-table-column
       >
-      <el-table-column
-        label="执行时间"
-        align="center"
-        prop="executeTime"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
+    
       <!-- <el-table-column label="执行人姓名，手动执行时记录" align="center" prop="executePerson" /> -->
       <!-- <el-table-column label="任务执行方式，人工执行：MANUAL_EXECUTE，系统自动执行：SYSTEM_AUTOMATIC_EXECUTE" align="center" prop="executeType" /> -->
       <!-- <el-table-column
@@ -430,8 +281,6 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-   
   </div>
 </template>
 
@@ -444,9 +293,7 @@ import {
 } from "@/api/system/taskExecuteRecord";
 
 import { getAge } from "@/utils/age";
-import {
-  selectAgencyList,
-} from "@/api/manage/selectAgencyList";
+import { selectAgencyList } from "@/api/manage/selectAgencyList";
 export default {
   name: "TaskExecuteRecord",
   dicts: ["visit_type"],
@@ -518,6 +365,18 @@ export default {
     this.selectAgencyinfo();
   },
   methods: {
+    // pickerChangeFn(value){ // 日期选择器改变事件 ~ 解决日期选择器清空 值不清空的问题
+    pickerChangeFn() {
+      if (this.intentionalTime == null) {
+        this.intentionalTime = [];
+        this.queryParams.startDate = null;
+        this.queryParams.endDate = null;
+      } else {
+        this.queryParams.startDate = this.intentionalTime[0];
+        this.queryParams.endDate = this.intentionalTime[1];
+      }
+    },
+    // },
     //获取医院list
     selectAgencyinfo() {
       let query = {
@@ -567,19 +426,15 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      if (this.intentionalTime?.length > 0) {
-        this.queryParams.startDate  = this.intentionalTime[0]
-        this.queryParams.endDate  = this.intentionalTime[1]
-      }
-
-      this.getList();
+        this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.handleQuery();
       this.intentionalTime = [];
-
+      this.queryParams.startDate = null;
+      this.queryParams.endDate = null;
+      this.getList();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -595,12 +450,12 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row)
+      console.log(row);
       this.$router.push({
         path: "/task/record",
         query: {
           patientId: row.patientId,
-          taskContent:row.taskContent,
+          taskContent: row.taskContent,
           cardNo: row.cardNo,
           patientName: row.patientName,
           patientPhone: row.patientPhone,
@@ -613,7 +468,6 @@ export default {
           age: row.birthDate ? getAge(row.birthDate) : "",
         },
       });
-     
     },
     /** 提交按钮 */
     submitForm() {