From 53606eac81e6d3a76937c4cb6f45ad61581cb4da Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 05 六月 2025 14:41:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb

---
 src/views/doctor/examination/index.vue |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue
index de7d006..8952269 100644
--- a/src/views/doctor/examination/index.vue
+++ b/src/views/doctor/examination/index.vue
@@ -52,6 +52,15 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="椤圭洰" prop="tcm">
+        <el-input
+          v-model="queryParams.tcm"
+          placeholder="璇疯緭鍏ヤ綋妫�鍙�"
+          clearable
+          @keyup.enter.native="handleQuery"
+          style="width: 170px"
+        />
+      </el-form-item>
       <el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
         <el-date-picker
           v-model="createTimeList"
@@ -137,9 +146,21 @@
             <!-- </template> -->
           </el-table-column>
           <el-table-column
+            label="骞撮緞"
+            align="center"
+            prop="age"
+            min-width="100"
+          />
+          <el-table-column
             label="鎵嬫満鍙�"
             align="center"
             prop="cusPhone"
+            min-width="100"
+          />
+          <el-table-column
+            label="濂楅鍚�"
+            align="center"
+            prop="tcm"
             min-width="100"
           />
           <el-table-column
@@ -313,6 +334,7 @@
                 size="mini"
                 type="text"
                 @click="yijian(scope.row)"
+                 v-if="yijiantype == 'N'"
                 >宸叉</el-button
               >
               <el-button
@@ -322,6 +344,7 @@
                 @click="queryResultone(scope.row)"
                 >缁撴灉</el-button
               >
+              <!--  -->
               <!--  @click="chaxun(scope.row) " -->
             </template>
           </el-table-column>
@@ -347,6 +370,11 @@
             <el-table-column label="妫�娴嬬粨鏋�" prop="pro_result">
             </el-table-column>
             <el-table-column label="鍙傝�冭寖鍥�" prop="ckfw"> </el-table-column>
+             <el-table-column label="寮傚父鏍囧織" prop="ycbz">
+               <template slot-scope="scope">
+                {{ scope.row.ycbz == 0 ? "姝ｅ父" : "寮傚父" }}
+               </template>
+            </el-table-column>
           </el-table>
         </div>
 
@@ -426,6 +454,7 @@
       loading: true,
       selectedTjNumber: "",
       drawer: false,
+      yijiantype: null,
       type: null,
       CompanyList: [],
       CheckBox: {},
@@ -439,6 +468,7 @@
         name: null,
         beginTime: null,
         endTime: null,
+        tcm:"",
         tjCompName: "",
       },
       // 缁戝畾鍗曢�夋寜閽�
@@ -502,7 +532,7 @@
   },
   methods: {
     changRed({ row }) {
-      if (row.ycbz != "" && row.ycbz != null && row.ycbz === "1") {
+      if (row.ycbz != "" && row.ycbz != null && row.ycbz === 1) {
         // 鍙橀鑹茬殑鏉′欢
         return {
           color: "red", // 杩欎釜return鐨勫氨鏄牱寮� 鍙互鏄痗olor 涔熷彲浠ユ槸backgroundColor
@@ -698,6 +728,7 @@
         beginTime: null,
         endTime: null,
         tjCompName: "",
+        tcm:""
       }),
         (this.CheckBox.drugManufacturerId = "");
       this.handleQuery();
@@ -747,6 +778,10 @@
 
       typeOne(tjNumber).then((res) => {
         this.type = res.data;
+      });
+
+      getConfigKey("sfyccsyjan").then((res) => {
+        this.yijiantype = res.msg;
       });
 
       cSWebGetPro(tjNumber).then((res) => {
@@ -844,8 +879,6 @@
       const proId = row.proId;
       resultList(tjNum, proId).then((res) => {
         this.jieguoList = res.data;
-        console.log(this.jieguoList, 998877);
-
         this.jyjc = this.jieguoList[0].jyjc;
         const ycbz = this.jieguoList[0].ycbz;
         /* if (ycbz === "" || ycbz === null) {

--
Gitblit v1.8.0