From 00212ed8e808fc7b76c04389224e65f27f074fb2 Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期五, 26 四月 2024 15:30:04 +0800
Subject: [PATCH] su

---
 src/views/sampling/sampling/index.vue |  120 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 92 insertions(+), 28 deletions(-)

diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index ef9aba1..db6e314 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -10,10 +10,12 @@
     >
       <el-form-item label="浣撴鍙�" prop="tjNum">
         <el-input
+          ref="inputName"
           v-model="queryParams.tjNum"
           placeholder="璇疯緭鍏ヤ綋妫�鍙�"
           clearable
           @keyup.enter.native="handleQuery"
+          @blur="hb"
           style="width: 170px"
         />
       </el-form-item>
@@ -30,8 +32,9 @@
         <el-date-picker
           v-model="createTimeList"
           @change="dateChangebirthday1"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
+          :default-time="['00:00:00', '23:00:00']"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
           type="daterange"
           range-separator="-"
           start-placeholder="寮�濮嬫棩鏈�"
@@ -76,15 +79,23 @@
         >
       </el-form-item>
     </el-form>
-
-    <el-radio-group
-      v-model="tjStatus"
-      @input="radioChange"
-      style="margin: 10px 15px"
-    >
-      <el-radio-button label="1">鏈噰鏍�</el-radio-button>
-      <el-radio-button label="0">宸查噰鏍�</el-radio-button>
-    </el-radio-group>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="10">
+        <el-radio-group
+          v-model="tjStatus"
+          @input="radioChange"
+          style="margin: 10px 15px"
+        >
+          <el-radio-button label="1">鏈噰鏍�</el-radio-button>
+          <el-radio-button label="0">宸查噰鏍�</el-radio-button>
+        </el-radio-group>
+      </el-col>
+      <el-col :span="12" v-if="tableList.length > 1 && tjStatus == 0">
+        <el-button type="primary" plain v-hasPermi="['hosp:detail:add']"
+          >鍚堝苟鏍锋湰</el-button
+        >
+      </el-col>
+    </el-row>
 
     <div style="width: 100%; margin-left: 10px; display: flex">
       <div style="width: 40%; margin-right: 20px">
@@ -117,10 +128,13 @@
             prop="customer.cusSex"
             width="60px"
           >
-            <template slot-scope="scope">
-              <!-- {{scope.row.customer.cusSex}} -->
+            <!-- <template slot-scope="scope">
               {{ scope.row.customer.cusSex === 0 ? "鐢�" : "濂�" }}
-              <!-- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex " /> -->
+            </template> -->
+            <template slot-scope="scope">
+              <span v-if="scope.row.cusSex == '0'">鐢�</span>
+              <span v-if="scope.row.cusSex == '1'">濂�</span>
+              <span v-if="scope.row.cusSex == '2'">鏈煡</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -160,7 +174,12 @@
                     <span>{{ parseTime(scope.row.tjTime, '{y}-{m}-{d}') }}</span>
                 </template>
             </el-table-column> -->
-          <el-table-column label="鏍囨湰绫诲瀷" align="center" prop="specimenType" width="120">
+          <el-table-column
+            label="鏍囨湰绫诲瀷"
+            align="center"
+            prop="specimenType"
+            width="120"
+          >
             <template slot-scope="scope">
               <dict-tag
                 :options="dict.type.sys_dict_specimen"
@@ -169,15 +188,31 @@
             </template>
           </el-table-column>
           <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" />
-          <el-table-column label="鎬у埆" align="center" prop="proSex" width="90" />
-          <el-table-column label="绌鸿吂" align="center" prop="isEat" width="90" />
+          <el-table-column
+            label="鎬у埆"
+            align="center"
+            prop="proSex"
+            width="90"
+          />
+          <el-table-column
+            label="绌鸿吂"
+            align="center"
+            prop="proCheckMethod"
+            width="90"
+          />
           <el-table-column
             label="閲囨牱缂栧彿"
             align="center"
             prop="samplingNumber"
-            :show-overflow-tooltip="true" width="120"
+            :show-overflow-tooltip="true"
+            width="120"
           />
-          <el-table-column label="閲囨牱鐘舵��" align="center" prop="isSignFor" width="90">
+          <el-table-column
+            label="閲囨牱鐘舵��"
+            align="center"
+            prop="isSignFor"
+            width="90"
+          >
             <template slot-scope="scope">
               <dict-tag
                 :options="dict.type.sampling_type"
@@ -250,6 +285,8 @@
   updateSampling,
   confirmSampling,
 } from "@/api/sampling/sampling";
+import { getNewDateList } from "@/api/hosp/order";
+import moment from "moment";
 
 export default {
   dicts: [
@@ -342,10 +379,25 @@
     };
   },
   created() {
-    this.getNowTime();
-    this.getList();
+    // this.getNowTime();
+   
+    this.getdate();
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.$refs.inputName.focus();
+    });
   },
   methods: {
+    getdate() {
+      getNewDateList().then((res) => {
+        this.createTimeList = [
+          moment(res.data).format("YYYY-MM-DD 00:00:00"),
+          moment(res.data).format("YYYY-MM-DD 23:59:00"),
+        ];
+        this.getList();
+      });
+    },
     handleSizeChange(val) {
       this.size = val;
       this.page = 1;
@@ -381,11 +433,17 @@
     getList() {
       this.loading = true;
       this.queryParams.isSignFor = this.tjStatus;
-      this.queryParams.beginTime = this.createTimeList[0];
+      if(this.createTimeList){
+        this.queryParams.beginTime = this.createTimeList[0];
       this.queryParams.endTime = this.createTimeList[1];
+      }else if(this.createTimeList == null){
+        this.queryParams.beginTime = null;
+      this.queryParams.endTime = null;
+      }
+     
       getList(this.queryParams).then((response) => {
         if (response.data) {
-           if (response.data.list == null) {
+          if (response.data.list == null) {
             this.samplingList = [];
             this.tableList = [];
             this.loading = false;
@@ -435,6 +493,12 @@
       };
       this.resetForm("form");
     },
+    hb() {
+      // console.log(this.queryParams.tjNum);
+      if (this.queryParams.tjNum != null) {
+        this.handleQuery();
+      }
+    },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -442,6 +506,7 @@
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
+      this.createTimeList=[]
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -505,7 +570,6 @@
       this.loading = true;
       this.queryParams.isSignFor = value;
       getList(this.queryParams).then((response) => {
-
         if (response.data) {
           if (response.data.list == null) {
             this.samplingList = [];
@@ -524,10 +588,10 @@
           }
           this.total = response.data.total;
           this.loading = false;
-        }else{
-           this.samplingList= [];
-           this.tableList = [];
-           this.loading = false;
+        } else {
+          this.samplingList = [];
+          this.tableList = [];
+          this.loading = false;
         }
       });
     },

--
Gitblit v1.8.0