From 8d0f7fcc4a961a6a2cd969171066f652cc8e736f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 18 四月 2025 16:56:52 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/tasklist/index.vue |  100 +++++++++++++++++++++++++++++++++----------------
 1 files changed, 67 insertions(+), 33 deletions(-)

diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index e466c64..d04ce6b 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -23,7 +23,7 @@
             @keyup.enter.native="handleQuery"
           ></el-input>
         </el-form-item>
-        <el-form-item label="鍒涘彂閫佹椂闂�">
+        <el-form-item label="鍙戦�佹椂闂�">
           <el-date-picker
             v-model="dateRange"
             style="width: 240px"
@@ -142,7 +142,7 @@
         <el-table-column
           label="浠诲姟鍚嶇О"
           fixed
-          width="120"
+          width="200"
           align="center"
           key="taskName"
           prop="taskName"
@@ -165,13 +165,18 @@
           :show-overflow-tooltip="true"
         />
         <el-table-column
-          label="寰呮墽琛�/鎬讳换鍔�"
+          label="鎬讳换鍔�/宸查殢璁�"
           align="center"
           key="nickName"
+          width="120"
           prop="nickName"
         >
           <template slot-scope="scope">
-            <span>{{ scope.row.wfs }}/{{ scope.row.yfs }}</span>
+            <span
+              >{{ scope.row.wfs ? scope.row.wfs + scope.row.yfs : "" }}/{{
+                scope.row.yfs
+              }}</span
+            >
           </template>
         </el-table-column>
         <el-table-column
@@ -225,7 +230,7 @@
           label="鎿嶄綔"
           fixed="right"
           align="center"
-          width="180"
+          width="240"
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
@@ -269,7 +274,7 @@
           label="浠诲姟璇︽儏"
           fixed="right"
           align="center"
-          width="200"
+          width="240"
           class-name="small-padding fixed-width"
         >
           <template slot-scope="scope">
@@ -421,7 +426,7 @@
       // 鐢ㄦ埛琛ㄦ牸鏁版嵁
       userList: null,
       // 寮瑰嚭灞傛爣棰�
-      title: "鏂板闂ㄨ瘖闅忚",
+      title: "鏂板褰卞儚闅忚",
       // 鏄惁鏄剧ず淇敼銆佹坊鍔犲脊鍑哄眰
       addalteropen: false,
       // 閮ㄩ棬鍚嶇О
@@ -445,14 +450,14 @@
       dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」
       inputVisible: false,
       inputValue: "",
-      previewVisible: false, //闂ㄨ瘖闅忚棰勮寮规
+      previewVisible: false, //褰卞儚闅忚棰勮寮规
       TaskOperation: {},
       radio: "",
       radios: [],
-      previewtype: 2, //棰勮闂ㄨ瘖闅忚绫诲瀷
+      previewtype: 2, //棰勮褰卞儚闅忚绫诲瀷
       total: 0, // 鎬绘潯鏁�
-      ImportQuantity: 999, //瀵奸棬璇婇殢璁挎暟閲�
-      //棰勮闂ㄨ瘖闅忚淇℃伅
+      ImportQuantity: 999, //瀵煎奖鍍忛殢璁挎暟閲�
+      //棰勮褰卞儚闅忚淇℃伅
       previewvalue: {
         username: "杩欎釜鍖荤敓瀵逛綘鎬庝箞鏍�",
       },
@@ -468,6 +473,10 @@
         {
           value: 3,
           label: "瀹f暀鍏虫��",
+        },
+        {
+          value: 4,
+          label: "娑堟伅閫氱煡",
         },
       ],
       taskoptions: [
@@ -491,18 +500,37 @@
           value: "5",
           label: "澶嶈瘖绠$悊",
         },
-        {
-          value: "6",
-          label: "婊℃剰搴﹁皟鏌�",
-        },
+        // {
+        //   value: "5",
+        //   label: "婊℃剰搴﹁皟鏌�",
+        // },
         {
           value: "7",
           label: "鎮h�呮姤鍛�",
         },
-
+        // {
+        //   value: "8",
+        //   label: "鍏朵粬閫氱煡",
+        // },
         {
-          value: "8",
-          label: "鍏朵粬閫氱煡",
+          value: "9",
+          label: "浣撴闅忚",
+        },
+        // {
+        //   value: "10",
+        //   label: "鍖绘妧闅忚",
+        // },
+        {
+          value: "11",
+          label: "褰卞儚闅忚",
+        },
+        {
+          value: "12",
+          label: "蹇冪數闅忚",
+        },
+        {
+          value: "13",
+          label: "涓撶闅忚",
         },
       ],
       tasktopic: "2", //鏂板绫诲瀷
@@ -604,7 +632,7 @@
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
-        type: 1,
+        type: 2,
         userName: undefined,
         tagid: undefined,
         topic: undefined,
@@ -662,11 +690,11 @@
   },
   watch: {},
   created() {
-    this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
-      (obj) => obj.deptCode
-    );
-    this.topqueryParams.leavehospitaldistrictcodes =
-      store.getters.belongWards.map((obj) => obj.districtCode);
+    // this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+    //   (obj) => obj.deptCode
+    // );
+    // this.topqueryParams.leavehospitaldistrictcodes =
+    //   store.getters.belongWards.map((obj) => obj.districtCode);
     this.tasktopic = this.$route.query.tasktopic
       ? this.$route.query.tasktopic
       : this.tasktopic;
@@ -689,7 +717,6 @@
     /** 鏌ヨ浠诲姟鍒楄〃 */
     getList() {
       this.loading = true;
-      console.log(this.topqueryParams.type);
 
       this.topqueryParams.serviceType = Number(this.tasktopic);
       if (
@@ -699,7 +726,7 @@
         this.tasktopic == 7 ||
         this.tasktopic == 6
       ) {
-        if (!this.topqueryParams.type) this.topqueryParams.type = '2';
+        if (!this.topqueryParams.type) this.topqueryParams.type = "2";
         this.longtermlist = [
           {
             value: 1,
@@ -711,7 +738,7 @@
           },
         ];
       } else if (this.tasktopic == 4 || this.tasktopic == 8) {
-        if (!this.topqueryParams.type) this.topqueryParams.type = '3';
+        if (!this.topqueryParams.type) this.topqueryParams.type = "3";
         this.longtermlist = [
           {
             value: 3,
@@ -719,7 +746,7 @@
           },
         ];
       } else if (this.tasktopic == 5) {
-        if (!this.topqueryParams.type) this.topqueryParams.type = '1';
+        if (!this.topqueryParams.type) this.topqueryParams.type = "1";
         this.longtermlist = [
           {
             value: 1,
@@ -735,8 +762,8 @@
       //   this.taskoptions,
       //   this.tasktopic
       // );
-      this.topqueryParams.startOutHospTime = this.dateRange[0];
-      this.topqueryParams.endOutHospTime = this.dateRange[1];
+      this.topqueryParams.beginTime = this.dateRange[0];
+      this.topqueryParams.endTime = this.dateRange[1];
       getTasklist(this.topqueryParams).then((response) => {
         this.userList = response.rows;
         this.total = response.total;
@@ -744,7 +771,7 @@
         this.loading = false;
       });
     },
-    // 鏌ョ湅闂ㄨ瘖闅忚璇︽儏
+    // 鏌ョ湅褰卞儚闅忚璇︽儏
     Referencequestion(row) {
       this.previewVisible = true;
     },
@@ -795,8 +822,15 @@
     resetQuery() {
       this.dateRange = [];
       this.resetForm("queryForm");
-      this.topqueryParams.deptId = undefined;
-      this.$refs.tree.setCurrentKey(null);
+      this.topqueryParams= {
+        pageNum: 1,
+        pageSize: 10,
+        type: 2,
+        userName: undefined,
+        tagid: undefined,
+        topic: undefined,
+      };
+      // this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
     // 澶氶�夋閫変腑鏁版嵁

--
Gitblit v1.9.3