From 4ca1c8fe75a68488702895d3cd280df5c5a55adc Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 09 五月 2025 10:46:13 +0800
Subject: [PATCH] qx总检修改提交

---
 src/views/doctor/checkAll/index.vue    |  510 +++++++++++---------
 src/views/doctor/examination/index.vue |    6 
 src/views/reservation/career/index.vue |  914 ++++++++++++++++++++++++++++++++++++
 src/api/doctor/checkAll.js             |   16 
 4 files changed, 1,208 insertions(+), 238 deletions(-)

diff --git a/src/api/doctor/checkAll.js b/src/api/doctor/checkAll.js
index 10f8373..726deb2 100644
--- a/src/api/doctor/checkAll.js
+++ b/src/api/doctor/checkAll.js
@@ -158,13 +158,19 @@
 }
 
 //鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏
-export function getFcList(tjNumber) {
+export function getFcList(data) {
   return request({
     url: '/check/getFcList',
     method: 'get',
-    params: {
-      tjNum: tjNumber,
-      type:0
-    }
+    params: data
+  })
+}
+
+
+export function UpdFcPro(data) {
+  return request({
+    url: '/check/UpdFcPro',
+    method: 'post',
+    data: data
   })
 }
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 29efbf2..03cf96c 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -227,15 +227,16 @@
               </div>
             </div>
             <div class="section-title">鑱屼笟鐥呮�绘</div>
-<el-form ref="numberValidateForm" label-width="80px" class="demo-ruleForm">
-  <el-form-item label="妫�鏌ョ粨璁�">
-    <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="textarea1" :rows="3" style="width: 96%"></el-input>
-  </el-form-item>
-  <el-form-item label="浣撴缁撴灉">
-    <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="res" :rows="3" style="width: 96%"></el-input>
-  </el-form-item>
- 
-</el-form>
+            <el-form ref="numberValidateForm" label-width="80px" class="demo-ruleForm">
+              <el-form-item label="妫�鏌ョ粨璁�">
+                <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="textarea1" :rows="3"
+                  style="width: 96%"></el-input>
+              </el-form-item>
+              <el-form-item label="浣撴缁撴灉">
+                <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="res" :rows="3" style="width: 96%"></el-input>
+              </el-form-item>
+
+            </el-form>
             <div style="margin: 0 0px 10px 15px" v-if="tjproject != '1'">
               <el-button type="primary" @click="propoChange">蹇嵎寤鸿</el-button>
               <el-button type="primary" @click="proposalChange">鐢熸垚寤鸿</el-button>
@@ -394,19 +395,27 @@
                   澶嶆煡椤圭洰
                 </div>
                 <div style="display: flex;margin:15px ;">
-                  <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
+                  <span slot="label" style="display: inline-block; border-bottom: 2px solid blue;font-size: 0.8vw;"
+                    @click="handleQuery">
                     椤圭洰閫夋嫨
                   </span>
-                  <div style="margin:0 20px;">椤圭洰鍚嶇О锛歿{ }}</div>
-                  <div style="margin:0 20px ;">浠锋牸锛歿{ }}</div>
+                  <div v-if="xmChange.length > 0" style="display: flex;">
+                    <div style="margin:0 40px;font-size: 0.8vw;">椤圭洰鍚嶇О锛歿{ xmChange[0].pro_name || "" }}</div>
+                    <div style="margin:0 40px ;font-size: 0.8vw;">浠锋牸锛歿{ xmChange[0].price || "" }}</div>
+                  </div>
+                  <div v-else style="display: flex;">
+                    <div style="margin:0 40px;font-size: 0.8vw;">椤圭洰鍚嶇О锛歿{ }}</div>
+                    <div style="margin:0 40px ;font-size: 0.8vw;">浠锋牸锛歿{ }}</div>
+                  </div>
                   <el-button type="primary" size="mini" @click="handleaddClick()">娣诲姞</el-button>
                 </div>
 
                 <el-table :row-style="redxiangmu" :data="fcList" style="width: 100%">
-                  <el-table-column align="center" label="搴忓彿" width="144" prop="deptName"></el-table-column>
-                  <el-table-column align="center" prop="proName" label="绉戝" width="260"></el-table-column>
-                  <el-table-column align="center" prop="pro_name" label="椤圭洰鍚嶇О" width="260"></el-table-column>
-                  <el-table-column label="浠锋牸" align="center" prop="bcupdateTime" width="100" />
+                  <el-table-column type="selection" width="40" align="center" />
+                  <el-table-column label="搴忓彿" align="center" prop="index" />
+                  <el-table-column label="鍚嶇О" align="center" prop="pro_name" width="100px" />
+                  <el-table-column label="浠锋牸" align="center" prop="price" />
+                  <el-table-column label="绉戝" align="center" prop="dept_name" />
                   <el-table-column label="鎿嶄綔" align="center" width="130px">
                     <template slot-scope="scope">
                       <el-button type="primary" icon="el-icon-share" size="mini" @click="handledeleteClick(scope.row)"
@@ -416,207 +425,210 @@
                 </el-table>
               </div>
             </template>
-            <el-button type="primary" @click="addnew" :disabled="isdisabled">鏂板</el-button>
+            <template v-if="wenzhen">
+              <div class="hist3">
+                <span class="txt">闂瘖淇℃伅</span>
+                <el-form ref="form" :model="formobj" label-width="100px" :inline="true" size="mini">
+                  <el-collapse class="coll" v-model="activeName" accordion>
+                    <el-collapse-item class="coll" title="鍩烘湰淇℃伅" name="1" style="width: 100%; font-weight: 600">
+                      <div style="width: 100%">
+                        <el-form-item label="濮撳悕" prop="cusName">
+                          <el-input disabled v-model="formobj.cusName" placeholder="璇疯緭鍏ュ鍚�" />
+                        </el-form-item>
+                        <el-form-item label="鑱屼笟" prop="work">
+                          <el-select filterable v-model="formobj.work" placeholder="璇烽�夋嫨鑱屼笟" clearable
+                            style="width: 150px" disabled>
+                            <el-option v-for="dict in dict.type.tj_work" :key="dict.value" :label="dict.label"
+                              :value="dict.value" />
+                          </el-select>
+                        </el-form-item>
+                        <el-form-item label="宸ヤ綔鐘舵��" prop="workStatus">
+                          <el-select disabled filterable v-model="formobj.workStatus" placeholder="璇烽�夋嫨宸ヤ綔鐘舵��" clearable
+                            style="width: 150px">
+                            <el-option v-for="dict in dict.type.tj_work_status" :key="dict.value" :label="dict.label"
+                              :value="dict.value" />
+                          </el-select>
+                        </el-form-item>
+                        <el-form-item label="鎺ヨЕ姣掔墿" prop="contactPoison">
+                          <el-input disabled type="textarea" rows="4" v-model="formobj.contactPoison"
+                            placeholder="璇疯緭鍏ユ帴瑙︽瘨鐗�" style="width: 700px" />
+                        </el-form-item>
+                        <el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistory">
+                          <el-input disabled type="textarea" rows="4" v-model="formobj.medicalHistory"
+                            placeholder="璇疯緭鍏ユ棦寰�鐥呭彶" style="width: 700px" />
+                        </el-form-item>
+                      </div>
+                    </el-collapse-item>
+                    <el-collapse-item title="鏈堢粡鍙�" name="2" v-show="sex">
+                      <div style="width: 100%">
+                        <el-form-item label="鍒濇疆(宀�)" prop="chuchao">
+                          <el-input v-model="formobj.chuchao" style="width: 70px" disabled />
+                        </el-form-item>
+                        <el-form-item label="缁忔湡" prop="jingqi">
+                          <el-input v-model="formobj.jingqi" disabled style="width: 70px" />澶�
+                        </el-form-item>
+                        <el-form-item label="鍛ㄦ湡" prop="zhouqi">
+                          <el-input v-model="formobj.zhouqi" disabled style="width: 70px" />澶�
+                        </el-form-item>
+                        <el-form-item label="鏈鏈堢粡" prop="mociage">
+                          <el-input v-model="formobj.mociage" disabled style="width: 100px" />
+                        </el-form-item>
+                      </div>
+                    </el-collapse-item>
+                    <el-collapse-item title="鐢熻偛鍙�" name="3" v-show="sex">
+                      <div style="width: 100%">
+                        <el-form-item label="鐜版湁瀛愬コ(浜�)" prop="zinv">
+                          <el-input v-model="formobj.zinv" style="width: 70px" disabled />
+                        </el-form-item>
+                        <el-form-item label="娴佷骇(娆�)" prop="liuchan">
+                          <el-input v-model="formobj.liuchan" style="width: 70px" disabled />
+                        </el-form-item>
+                        <el-form-item label="鏃╀骇(娆�)" prop="zaochan">
+                          <el-input v-model="formobj.zaochan" style="width: 70px" disabled />
+                        </el-form-item>
+                        <el-form-item label="姝讳骇(娆�)" prop="sichan">
+                          <el-input v-model="formobj.sichan" style="width: 70px" disabled />
+                        </el-form-item>
+                        <el-form-item label="寮傚父鑳�(娆�)" prop="yichangtai">
+                          <el-input v-model="formobj.yichangtai" style="width: 70px" disabled />
+                        </el-form-item>
+                      </div>
+                    </el-collapse-item>
+                    <el-collapse-item title="鐑熼厭鍙�" name="4">
+                      <div style="width: 100%">
+                        <el-form-item label="鏄惁鍚哥儫" prop="xiyan">
+                          <el-select disabled filterable v-model="formobj.xiyan" placeholder="璇烽�夋嫨鏄惁鍚哥儫" clearable
+                            style="width: 150px">
+                            <el-option v-for="dict in dict.type.tj_smoking_pinlv" :key="dict.value" :label="dict.label"
+                              :value="dict.value" />
+                          </el-select>
+                        </el-form-item>
+                        <el-form-item label="鍚哥儫棰戠巼" prop="xiyanpinlv">
+                          <el-input v-model="formobj.xiyanpinlv" disabled style="width: 70px" />鏀�/澶�
+                        </el-form-item>
+                        <el-form-item label="鍚哥儫鏃堕棿" prop="xiyanyear">
+                          <el-input v-model="formobj.xiyanyear" disabled style="width: 70px" />骞�
+                        </el-form-item><br />
+                        <el-form-item label="鏄惁楗厭" prop="yinjiu">
+                          <el-select filterable v-model="formobj.yinjiu" disabled placeholder="璇烽�夋嫨鏄惁楗厭" clearable
+                            style="width: 150px">
+                            <el-option v-for="dict in dict.type.tj_smoking_pinlv" :key="dict.value" :label="dict.label"
+                              :value="dict.value" />
+                          </el-select>
+                        </el-form-item>
+                        <el-form-item label="楗厭棰戠巼" prop="yinjiupinlv">
+                          <el-input v-model="formobj.yinjiupinlv" disabled style="width: 70px" />ml/澶�
+                        </el-form-item>
+                        <el-form-item label="楗厭鏃堕棿" prop="yinjiuyear">
+                          <el-input v-model="formobj.yinjiuyear" disabled style="width: 70px" />骞�
+                        </el-form-item>
+                        <el-form-item label="鍏朵粬" prop="qita">
+                          <el-input v-model="formobj.qita" placeholder="璇疯緭鍏ュ叾浠�" disabled type="textarea"
+                            style="width: 600px" rows="2" />
+                        </el-form-item>
+                      </div>
+                    </el-collapse-item>
+                    <el-collapse-item title="鎬ユ參鎬ц亴涓氱梾鍙蹭俊鎭�" name="5">
+                      <div style="width: 100%">
+                        <el-table border :data="formobj.tjAskHistorysList" ref="tjAskHistorys" style="width: 98%">
+                          <el-table-column type="selection" width="40" align="center" />
+                          <el-table-column label="鐤剧梾鍚嶇О" prop="diseaseName">
+                            <template slot-scope="scope">
+                              <el-input size="mini" disabled v-model="scope.row.diseaseName" placeholder="璇疯緭鍏ョ柧鐥呭悕绉�" />
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="璇婃柇鏃ユ湡" prop="diseaseData">
+                            <template slot-scope="scope">
+                              <el-date-picker size="mini" v-model="scope.row.diseaseData" align="right" type="date"
+                                placeholder="閫夋嫨鏃ユ湡" :picker-options="pickerOptions" style="width: 130px"
+                                value-format="yyyy-MM-dd">
+                              </el-date-picker>
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="璇婃柇鍗曚綅" prop="diseaseCompany">
+                            <template slot-scope="scope">
+                              <el-input size="mini" disabled v-model="scope.row.diseaseCompany" placeholder="璇疯緭鍏ヨ瘖鏂崟浣�" />
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="鏄惁鐥婃剤" prop="isOk">
+                            <template slot-scope="scope">
+                              <el-select disabled filterable size="mini" v-model="scope.row.isOk" placeholder="璇烽�夋嫨鏄惁鐥婃剤"
+                                clearable>
+                                <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+                                  :value="dict.value" />
+                              </el-select>
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="澶囨敞" prop="remark">
+                            <template slot-scope="scope">
+                              <el-input disabled size="mini" v-model="scope.row.remark" placeholder="璇疯緭鍏ュ娉�" />
+                            </template>
+                          </el-table-column>
+                        </el-table>
+                      </div>
+                    </el-collapse-item>
+                    <el-collapse-item title="鑱屼笟鍙�" name="7">
+                      <div style="width: 100%">
+                        <el-table border :data="formobj.workLogs" style="width: 98%">
+                          <el-table-column type="selection" width="40" align="center" />
+                          <el-table-column label="寮�濮嬫椂闂�" prop="beginTime">
+                            <template slot-scope="scope">
+                              <el-date-picker size="mini" v-model="scope.row.beginTime" align="right" type="date"
+                                placeholder="閫夋嫨鏃ユ湡" :picker-options="pickerOptions" style="width: 130px"
+                                value-format="yyyy-MM-dd">
+                              </el-date-picker>
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="缁撴潫鏃堕棿" prop="endTime">
+                            <template slot-scope="scope">
+                              <el-date-picker size="mini" disabled v-model="scope.row.endTime" align="right" type="date"
+                                placeholder="閫夋嫨鏃ユ湡" :picker-options="pickerOptions" style="width: 130px"
+                                value-format="yyyy-MM-dd">
+                              </el-date-picker>
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="宸ヤ綔鍗曚綅" prop="workCompany">
+                            <template slot-scope="scope">
+                              <el-input size="mini" disabled v-model="scope.row.workCompany" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="閮ㄩ棬" prop="workDept">
+                            <template slot-scope="scope">
+                              <el-input disabled size="mini" v-model="scope.row.workDept" placeholder="璇疯緭鍏ラ儴闂�" />
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="宸ョ" prop="workType">
+                            <template slot-scope="scope">
+                              <el-input disabled size="mini" v-model="scope.row.workType" placeholder="璇疯緭鍏ュ伐绉�" />
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="鏈夊鍥犵礌" prop="harmTypeLogs">
+                            <template slot-scope="scope">
+                              <el-select filterable disabled size="mini" v-model="scope.row.harmTypeLogs" multiple
+                                placeholder="璇烽�夋嫨鏈夊鍥犵礌" clearable>
+                                <el-option v-for="dict in harmTypeList" :key="dict.aid" :label="dict.harmtype"
+                                  :value="dict.aid" />
+                              </el-select>
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="闃叉姢鎺柦" prop="fangHu">
+                            <template slot-scope="scope">
+                              <el-input disabled size="mini" v-model="scope.row.fangHu" placeholder="璇疯緭鍏ラ槻鎶ゆ帾鏂�" />
+                            </template>
+                          </el-table-column>
+                        </el-table>
+                      </div>
+                    </el-collapse-item>
+                  </el-collapse>
+                </el-form>
+              </div>
+            </template>
+            <el-button type="primary" @click="addnew" :disabled="isdisabled" style="margin-top: 20px;">鏂板</el-button>
           </div>
         </div>
       </div>
 
-      <div class="hist3" v-if="wenzhen">
-        <span class="txt">闂瘖淇℃伅</span>
-        <el-form ref="form" :model="formobj" label-width="100px" :inline="true" size="mini">
-          <el-collapse class="coll" v-model="activeName" accordion>
-            <el-collapse-item class="coll" title="鍩烘湰淇℃伅" name="1" style="width: 100%; font-weight: 600">
-              <div style="width: 100%">
-                <el-form-item label="濮撳悕" prop="cusName">
-                  <el-input disabled v-model="formobj.cusName" placeholder="璇疯緭鍏ュ鍚�" />
-                </el-form-item>
-                <el-form-item label="鑱屼笟" prop="work">
-                  <el-select filterable v-model="formobj.work" placeholder="璇烽�夋嫨鑱屼笟" clearable style="width: 150px"
-                    disabled>
-                    <el-option v-for="dict in dict.type.tj_work" :key="dict.value" :label="dict.label"
-                      :value="dict.value" />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="宸ヤ綔鐘舵��" prop="workStatus">
-                  <el-select disabled filterable v-model="formobj.workStatus" placeholder="璇烽�夋嫨宸ヤ綔鐘舵��" clearable
-                    style="width: 150px">
-                    <el-option v-for="dict in dict.type.tj_work_status" :key="dict.value" :label="dict.label"
-                      :value="dict.value" />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="鎺ヨЕ姣掔墿" prop="contactPoison">
-                  <el-input disabled type="textarea" rows="4" v-model="formobj.contactPoison" placeholder="璇疯緭鍏ユ帴瑙︽瘨鐗�"
-                    style="width: 700px" />
-                </el-form-item>
-                <el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistory">
-                  <el-input disabled type="textarea" rows="4" v-model="formobj.medicalHistory" placeholder="璇疯緭鍏ユ棦寰�鐥呭彶"
-                    style="width: 700px" />
-                </el-form-item>
-              </div>
-            </el-collapse-item>
-            <el-collapse-item title="鏈堢粡鍙�" name="2" v-show="sex">
-              <div style="width: 100%">
-                <el-form-item label="鍒濇疆(宀�)" prop="chuchao">
-                  <el-input v-model="formobj.chuchao" style="width: 70px" disabled />
-                </el-form-item>
-                <el-form-item label="缁忔湡" prop="jingqi">
-                  <el-input v-model="formobj.jingqi" disabled style="width: 70px" />澶�
-                </el-form-item>
-                <el-form-item label="鍛ㄦ湡" prop="zhouqi">
-                  <el-input v-model="formobj.zhouqi" disabled style="width: 70px" />澶�
-                </el-form-item>
-                <el-form-item label="鏈鏈堢粡" prop="mociage">
-                  <el-input v-model="formobj.mociage" disabled style="width: 100px" />
-                </el-form-item>
-              </div>
-            </el-collapse-item>
-            <el-collapse-item title="鐢熻偛鍙�" name="3" v-show="sex">
-              <div style="width: 100%">
-                <el-form-item label="鐜版湁瀛愬コ(浜�)" prop="zinv">
-                  <el-input v-model="formobj.zinv" style="width: 70px" disabled />
-                </el-form-item>
-                <el-form-item label="娴佷骇(娆�)" prop="liuchan">
-                  <el-input v-model="formobj.liuchan" style="width: 70px" disabled />
-                </el-form-item>
-                <el-form-item label="鏃╀骇(娆�)" prop="zaochan">
-                  <el-input v-model="formobj.zaochan" style="width: 70px" disabled />
-                </el-form-item>
-                <el-form-item label="姝讳骇(娆�)" prop="sichan">
-                  <el-input v-model="formobj.sichan" style="width: 70px" disabled />
-                </el-form-item>
-                <el-form-item label="寮傚父鑳�(娆�)" prop="yichangtai">
-                  <el-input v-model="formobj.yichangtai" style="width: 70px" disabled />
-                </el-form-item>
-              </div>
-            </el-collapse-item>
-            <el-collapse-item title="鐑熼厭鍙�" name="4">
-              <div style="width: 100%">
-                <el-form-item label="鏄惁鍚哥儫" prop="xiyan">
-                  <el-select disabled filterable v-model="formobj.xiyan" placeholder="璇烽�夋嫨鏄惁鍚哥儫" clearable
-                    style="width: 150px">
-                    <el-option v-for="dict in dict.type.tj_smoking_pinlv" :key="dict.value" :label="dict.label"
-                      :value="dict.value" />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="鍚哥儫棰戠巼" prop="xiyanpinlv">
-                  <el-input v-model="formobj.xiyanpinlv" disabled style="width: 70px" />鏀�/澶�
-                </el-form-item>
-                <el-form-item label="鍚哥儫鏃堕棿" prop="xiyanyear">
-                  <el-input v-model="formobj.xiyanyear" disabled style="width: 70px" />骞�
-                </el-form-item><br />
-                <el-form-item label="鏄惁楗厭" prop="yinjiu">
-                  <el-select filterable v-model="formobj.yinjiu" disabled placeholder="璇烽�夋嫨鏄惁楗厭" clearable
-                    style="width: 150px">
-                    <el-option v-for="dict in dict.type.tj_smoking_pinlv" :key="dict.value" :label="dict.label"
-                      :value="dict.value" />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="楗厭棰戠巼" prop="yinjiupinlv">
-                  <el-input v-model="formobj.yinjiupinlv" disabled style="width: 70px" />ml/澶�
-                </el-form-item>
-                <el-form-item label="楗厭鏃堕棿" prop="yinjiuyear">
-                  <el-input v-model="formobj.yinjiuyear" disabled style="width: 70px" />骞�
-                </el-form-item>
-                <el-form-item label="鍏朵粬" prop="qita">
-                  <el-input v-model="formobj.qita" placeholder="璇疯緭鍏ュ叾浠�" disabled type="textarea" style="width: 600px"
-                    rows="2" />
-                </el-form-item>
-              </div>
-            </el-collapse-item>
-            <el-collapse-item title="鎬ユ參鎬ц亴涓氱梾鍙蹭俊鎭�" name="5">
-              <div style="width: 100%">
-                <el-table border :data="formobj.tjAskHistorysList" ref="tjAskHistorys" style="width: 98%">
-                  <el-table-column type="selection" width="40" align="center" />
-                  <el-table-column label="鐤剧梾鍚嶇О" prop="diseaseName">
-                    <template slot-scope="scope">
-                      <el-input size="mini" disabled v-model="scope.row.diseaseName" placeholder="璇疯緭鍏ョ柧鐥呭悕绉�" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="璇婃柇鏃ユ湡" prop="diseaseData">
-                    <template slot-scope="scope">
-                      <el-date-picker size="mini" v-model="scope.row.diseaseData" align="right" type="date"
-                        placeholder="閫夋嫨鏃ユ湡" :picker-options="pickerOptions" style="width: 130px"
-                        value-format="yyyy-MM-dd">
-                      </el-date-picker>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="璇婃柇鍗曚綅" prop="diseaseCompany">
-                    <template slot-scope="scope">
-                      <el-input size="mini" disabled v-model="scope.row.diseaseCompany" placeholder="璇疯緭鍏ヨ瘖鏂崟浣�" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="鏄惁鐥婃剤" prop="isOk">
-                    <template slot-scope="scope">
-                      <el-select disabled filterable size="mini" v-model="scope.row.isOk" placeholder="璇烽�夋嫨鏄惁鐥婃剤"
-                        clearable>
-                        <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
-                          :value="dict.value" />
-                      </el-select>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="澶囨敞" prop="remark">
-                    <template slot-scope="scope">
-                      <el-input disabled size="mini" v-model="scope.row.remark" placeholder="璇疯緭鍏ュ娉�" />
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </div>
-            </el-collapse-item>
-            <el-collapse-item title="鑱屼笟鍙�" name="7">
-              <div style="width: 100%">
-                <el-table border :data="formobj.workLogs" style="width: 98%">
-                  <el-table-column type="selection" width="40" align="center" />
-                  <el-table-column label="寮�濮嬫椂闂�" prop="beginTime">
-                    <template slot-scope="scope">
-                      <el-date-picker size="mini" v-model="scope.row.beginTime" align="right" type="date"
-                        placeholder="閫夋嫨鏃ユ湡" :picker-options="pickerOptions" style="width: 130px"
-                        value-format="yyyy-MM-dd">
-                      </el-date-picker>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="缁撴潫鏃堕棿" prop="endTime">
-                    <template slot-scope="scope">
-                      <el-date-picker size="mini" disabled v-model="scope.row.endTime" align="right" type="date"
-                        placeholder="閫夋嫨鏃ユ湡" :picker-options="pickerOptions" style="width: 130px"
-                        value-format="yyyy-MM-dd">
-                      </el-date-picker>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="宸ヤ綔鍗曚綅" prop="workCompany">
-                    <template slot-scope="scope">
-                      <el-input size="mini" disabled v-model="scope.row.workCompany" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="閮ㄩ棬" prop="workDept">
-                    <template slot-scope="scope">
-                      <el-input disabled size="mini" v-model="scope.row.workDept" placeholder="璇疯緭鍏ラ儴闂�" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="宸ョ" prop="workType">
-                    <template slot-scope="scope">
-                      <el-input disabled size="mini" v-model="scope.row.workType" placeholder="璇疯緭鍏ュ伐绉�" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="鏈夊鍥犵礌" prop="harmTypeLogs">
-                    <template slot-scope="scope">
-                      <el-select filterable disabled size="mini" v-model="scope.row.harmTypeLogs" multiple
-                        placeholder="璇烽�夋嫨鏈夊鍥犵礌" clearable>
-                        <el-option v-for="dict in harmTypeList" :key="dict.aid" :label="dict.harmtype"
-                          :value="dict.aid" />
-                      </el-select>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="闃叉姢鎺柦" prop="fangHu">
-                    <template slot-scope="scope">
-                      <el-input disabled size="mini" v-model="scope.row.fangHu" placeholder="璇疯緭鍏ラ槻鎶ゆ帾鏂�" />
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </div>
-            </el-collapse-item>
-          </el-collapse>
-        </el-form>
-      </div>
+
     </el-drawer>
 
     <el-dialog title="PDF 棰勮" :visible.sync="dialogVisible" :close-on-click-modal="false" width="50%">
@@ -709,19 +721,16 @@
     </el-dialog>
 
     <el-dialog :visible.sync="xmopen" width="800px" append-to-body>
-      <el-form ref="form" :model="forms" label-width="80px">
-        <el-form-item label="鍚嶇О" prop="pacName">
-          <el-input v-model="forms.pacName" placeholder="璇疯緭鍏ュ悕绉�" />
-        </el-form-item>
-      </el-form>
-      <el-table :data="datasList" ref="elTable" v-loading="loading" @selection-change="handlexmChange" border
-        height="320px">
-        <el-table-column type="selection" width="40" align="center" />
-        <el-table-column label="搴忓彿" align="center" prop="pacRemark" />
-        <el-table-column label="鍚嶇О" align="center" prop="pacName" width="100px" />
-        <el-table-column label="浠锋牸" align="center" prop="price" />
-        <el-table-column label="绉戝" align="center" prop="pacRemark" />
-      </el-table>
+      <div style="margin: 20px;">
+        <el-table :data="datasList" ref="elTable" v-loading="loading" @selection-change="handlexmChange" border
+          height="320px">
+          <el-table-column type="selection" width="40" align="center" />
+          <el-table-column label="鍚嶇О" align="center" prop="pro_name" width="100px" />
+          <el-table-column label="浠锋牸" align="center" prop="price" />
+          <el-table-column label="绉戝" align="center" prop="dept_name" />
+        </el-table>
+      </div>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFormxm">纭� 瀹�</el-button>
         <el-button @click="cancels">鍙� 娑�</el-button>
@@ -755,7 +764,7 @@
   isPdfOrJimu,
   addOrder,
   addOrder1,
-  getFcList
+  getFcList, UpdFcPro
 } from "@/api/doctor/checkAll";
 import { getInfoById } from "@/api/hosp/history";
 import { getInfo } from "@/api/login";
@@ -800,6 +809,7 @@
       selectedAdvice: null,
       activeAdviceIndex: 0,
       advicerulesList: [],
+      xmChange: [],
       showjianyi: false,
       adviceLoading: false, // 鎺у埗琛ㄦ牸鍔犺浇鐘舵��
       adviceEmptyText: '鏆傛棤鏁版嵁', // 鑷畾涔夌┖鏁版嵁鎻愮ず
@@ -1251,25 +1261,50 @@
 
     handleQuery() {
       this.xmopen = true
-
+      let data = {
+        tjNum: this.tjNumber,
+        type: 0
+      }
+      getFcList(data).then(res => {
+        this.datasList = res.data
+      })
     },
 
     handleaddClick() {
+      console.log(this.xmChange)
+      let data = {
+        orderId: this.xmChange[0].order_id,
+        data: [{
+          proId: this.xmChange[0].pro_id,
+          type: 1
+        }]
+      }
+      UpdFcPro(data).then(res => {
 
+      })
     },
 
     handledeleteClick() {
 
+      UpdFcPro(data).then(res => {
+
+      })
     },
 
-    handlexmChange() {
-
+    handlexmChange(selection) {
+      this.xmChange = []
+      this.xmChange = selection
+      if (selection.length > 1) {
+        let del_row = selection.shift();
+        this.$refs.elTable.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+      }
     },
     submitFormxm() {
-
+      this.xmopen = false
     },
     cancels() {
       this.xmopen = false
+      this.xmChange = []
     },
     getExpends() {
       this.expends = this.yichangList.flatMap(item =>
@@ -1296,6 +1331,7 @@
     xiangmuqingkuang() {
       cSWebGetPro(this.tjNumber).then((res) => {
         this.status1 = 1;
+        this.wenzhen = false
         this.statusList = res.data;
 
         if (this.statusList.length == 0) {
@@ -1335,7 +1371,12 @@
 
     fuchaxiangmu() {
       this.status1 = 2;
-      getFcList(this.tjNumber).then(res => {
+      this.wenzhen = false
+      let data = {
+        tjNum: this.tjNumber,
+        type: 1
+      }
+      getFcList(data).then(res => {
         this.fcList = res.data
       })
     },
@@ -2342,17 +2383,20 @@
     }
   }
 }
+
 .section-title {
   font-size: 20px;
   font-weight: bold;
   color: #303133;
   background-color: #f5f7fa;
   padding: 10px 15px;
-  border-left: 4px solid #409eff; /* 宸︿晶钃濊壊杈规潯锛屽寮鸿瑙夋晥鏋� */
+  border-left: 4px solid #409eff;
+  /* 宸︿晶钃濊壊杈规潯锛屽寮鸿瑙夋晥鏋� */
   margin-bottom: 15px;
   margin-top: 15px;
   border-radius: 4px;
 }
+
 .dialog-pager {
   display: flex;
   justify-content: center;
diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue
index 45c2ee0..af6ab36 100644
--- a/src/views/doctor/examination/index.vue
+++ b/src/views/doctor/examination/index.vue
@@ -313,6 +313,7 @@
                 size="mini"
                 type="text"
                 @click="yijian(scope.row)"
+                v-if="yijiantype == N"
                 >宸叉</el-button
               >
               <el-button
@@ -427,6 +428,7 @@
       selectedTjNumber: "",
       drawer: false,
       type: null,
+      yijiantype: null,
       CompanyList: [],
       CheckBox: {},
       // 鏌ヨ鍙傛暟
@@ -749,6 +751,10 @@
         this.type = res.data;
       });
 
+      getConfigKey("sfyccsyjan").then((res) => {
+        this.yijiantype = res.msg;
+      });
+
       cSWebGetPro(tjNumber).then((res) => {
         this.xiangmuList = res.data;
         this.xiangmuList.forEach((item) => {
diff --git a/src/views/reservation/career/index.vue b/src/views/reservation/career/index.vue
new file mode 100644
index 0000000..366c8b2
--- /dev/null
+++ b/src/views/reservation/career/index.vue
@@ -0,0 +1,914 @@
+<template>
+  <div class="app-container">
+    <el-form :model="objs" :rules="rules" ref="form" size="small" :inline="true" label-width="100px">
+      <el-form-item label="鍗曚綅鍚嶇О" prop="drugManufacturerId">
+        <el-select :remote-method="getRemoteData" v-model="objs.drugManufacturerId" remote filterable
+          style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @clear="getCompanyList" @change="idFn">
+          <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName"
+            :value="dict.drugManufacturerId" />
+        </el-select>
+        <i class="el-icon-circle-plus-outline" @click="handleAdd"></i>
+      </el-form-item>
+      <!-- <el-form-item label="閮ㄩ棬" prop="dwDeptName">
+        <el-select
+          v-model="objs.dwDeptName"
+          placeholder="璇烽�夋嫨閮ㄩ棬"
+          style="width: 200px"
+          clearable
+          @change="idBm"
+        >
+          <el-option
+            v-for="dict in deptList"
+            :key="dict.id"
+            :label="dict.dwDeptName"
+            :value="dict.id"
+          />
+        </el-select>
+        <i class="el-icon-circle-plus-outline" @click="handleAddbumen"></i>
+      </el-form-item> -->
+      <!-- <el-form-item label="鍒嗙粍" prop="payType">
+        <el-select v-model="objs.payType" placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" style="width: 200px" clearable>
+          <el-option v-for="dict in groupingList" :key="dict.id" :label="dict.groupingName" :value="dict.id" />
+        </el-select>
+      </el-form-item> -->
+      <el-form-item label="棰勭害鏃堕棿" prop="reservationTime">
+        <el-date-picker clearable v-model="objs.reservationTime" type="date" format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd" style="width: 130px" placeholder="璇烽�夋嫨棰勭害鏃ユ湡" @change="selectTime"
+          :picker-options="setDisabled">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="鏈夋晥澶╂暟" prop="yxts">
+        <el-input style="width: 100px" v-model="objs.yxts" placeholder="鏈夋晥澶╂暟" />澶�(鍙嚜瀹氫箟)
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8" style="margin: 5px 20px">
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-upload2" size="mini" @click="handleImport">瀵煎叆</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-upload2" size="mini" @click="importTemplate">涓嬭浇妯℃澘</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" class="btn" icon="el-icon-thumb" :disabled="isdisabled" size="mini"
+          @click="submitForm">
+          纭</el-button>
+      </el-col>
+    </el-row>
+    <div style="margin: 5px 20px; width: 94%">
+      <el-table v-loading="loading" :data="userList" :summary-method="getSummaries" show-summary border>
+        <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="company" width="200">
+        </el-table-column>
+        <el-table-column label="鍗曚綅閮ㄩ棬" align="center" prop="department" width="200">
+        </el-table-column>
+        <!-- <el-table-column label="宸ュ彿" align="center" prop="jobNo" width="80" /> -->
+        <el-table-column label="濮撳悕" align="center" prop="name" width="75" />
+        <el-table-column label="鎬у埆" align="center" prop="sex" width="75">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
+          </template>
+        </el-table-column>
+        <el-table-column label="韬唤璇佸彿" align="center" prop="idCard" width="200" />
+        <el-table-column label="骞撮緞" align="center" prop="age" width="75" />
+        <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="birthday" width="100" />
+        <!-- <el-table-column label="鑱屼綅" align="center" prop="position" /> -->
+        <!-- <el-table-column label="閮ㄩ棬" align="center" prop="department" /> -->
+        <!-- <el-table-column label="閮ㄩ棬缂栧彿" align="center" prop="departmentId" /> -->
+        <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phoe" width="140" />
+        <el-table-column label="鍦板潃" align="center" prop="address" />
+        <el-table-column label="濠氬Щ鐘跺喌" align="center" prop="marriage" key="marriage">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.dict_user_marry" :value="scope.row.marriage" />
+          </template>
+        </el-table-column>
+        <el-table-column label="姘戞棌" align="center" prop="nation" key="nation">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.dict_user_national" :value="scope.row.nation" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="鑱旂郴閭" align="center" prop="email" /> -->
+        <!-- <el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory" /> -->
+        <el-table-column label="鍒嗙粍" align="center" prop="groupingName" />
+        <el-table-column label="鎵�鍦ㄥ湴" align="center" prop="szd" />
+        <el-table-column label="椤圭洰鏀惰垂" align="center" prop="ysPrice" />
+      </el-table>
+    </div>
+
+    <!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload ref="upload" :limit="1" :key="uploadKey" accept=".xls" :headers="upload.headers" :data="data"
+        :action="upload.url" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <!-- <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" />
+            鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
+          </div> -->
+          <span>浠呭厑璁稿鍏ls鏍煎紡鏂囦欢銆�</span>
+          <!-- <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >涓嬭浇妯℃澘</el-link
+          > -->
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">淇濆瓨淇℃伅</el-button>
+        <el-button @click="upload.open = false">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 娣诲姞鎴栦慨鏀逛綋妫�鍗曚綅淇℃伅缁存姢瀵硅瘽妗� -->
+    <div class="dia">
+      <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+          <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
+            <el-input v-model="form.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
+          </el-form-item>
+          <el-form-item label="鑱旂郴浜�" prop="contactPerson">
+            <el-input v-model="form.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
+          </el-form-item>
+          <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
+            <el-input v-model="form.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+          </el-form-item>
+          <el-form-item label="绋庡彿" prop="taxNumber">
+            <el-input v-model="form.taxNumber" placeholder="璇疯緭鍏ョ◣鍙�" />
+          </el-form-item>
+          <el-form-item label="娉曚汉" prop="legalPerson">
+            <el-input v-model="form.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
+          </el-form-item>
+          <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
+            <el-input v-model="form.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" />
+          </el-form-item>
+          <el-form-item label="閫氳鍦板潃" prop="mailingAddress">
+            <el-input v-model="form.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" />
+          </el-form-item>
+          <el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
+            <el-input v-model="form.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
+          </el-form-item>
+          <el-form-item label="閾惰璐︽埛" prop="countNum">
+            <el-input v-model="form.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" />
+          </el-form-item>
+          <el-form-item label="閭" prop="email">
+            <el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" />
+          </el-form-item>
+          <el-form-item label="璐熻矗浜�" prop="principal">
+            <el-input v-model="form.principal" placeholder="璇疯緭鍏ヨ礋璐d汉" />
+          </el-form-item>
+          <el-form-item label="缃戝潃" prop="url">
+            <el-input v-model="form.url" placeholder="璇疯緭鍏ョ綉鍧�" />
+          </el-form-item>
+          <el-form-item label="浼犵湡" prop="faxNumber">
+            <el-input v-model="form.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
+          </el-form-item>
+          <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
+            <el-input v-model="form.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" />
+          </el-form-item>
+          <el-form-item label="鎺掑簭" prop="orderNum">
+            <el-input v-model="form.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
+          </el-form-item>
+          <el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
+            <el-date-picker clearable v-model="form.validTime" type="date" value-format="yyyy-MM-dd"
+              placeholder="璇烽�夋嫨鏈夋晥鏃堕棿">
+            </el-date-picker> </el-form-item><br />
+          <el-form-item label="澶囨敞" prop="remark">
+            <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px"
+              style="width: 830px" resize="none"></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer2">
+          <el-button type="primary" @click="submitFormS">纭� 瀹�</el-button>
+          <el-button @click="cancel">鍙� 娑�</el-button>
+        </div>
+      </el-dialog>
+    </div>
+
+    <!-- 娣诲姞鎴栦慨鏀归儴闂ㄤ俊鎭淮鎶ゅ璇濇 -->
+    <div class="dia">
+      <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+          <el-form-item label="鍗曚綅鍚嶇О" prop="drugManufacturerId">
+            <el-select :remote-method="getRemoteData" v-model="objs.drugManufacturerId" remote filterable
+              style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @clear="getCompanyList" @change="idFn1">
+              <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName"
+                :value="dict.drugManufacturerId" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="閮ㄩ棬鍚嶇О" prop="dwDeptName">
+            <el-input v-model="form.dwDeptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" />
+          </el-form-item>
+          <el-form-item label="绛剧害閲戦" prop="signingPrice">
+            <el-input v-model="form.signingPrice" placeholder="璇疯緭鍏ョ绾﹂噾棰�" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer2">
+          <el-button type="primary" @click="handleAddDept">纭� 瀹�</el-button>
+          <el-button @click="cancel">鍙� 娑�</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import Cookies from "js-cookie"
+import {
+  addDept,
+  addComp,
+  Deptlist,
+  getDwAndDwDept,
+  newExcelImport,
+} from "@/api/system/comp";
+import {
+  newConfirm,
+  getCompany,
+  queryCompany,
+  getconfigKey,
+} from "@/api/team/tuanti";
+import { getToken } from "@/utils/auth";
+
+export default {
+  dicts: [
+    "dict_user_national",
+    "dict_user_marry",
+    "sys_yes_no",
+    "sys_user_sex",
+    "reservation_pay_type",
+    "sys_normal_disable",
+  ],
+
+  name: "Tijian",
+  data() {
+    let checkPhoneNum = (rule, value, callback) => {
+      console.log(value);
+      let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
+      if (value == "" && value == undefined && !value) {
+        return callback("");
+      } else if (value != undefined && value != "") {
+        return callback();
+      } else if (!patter.test(value)) {
+        return callback("");
+      }
+    };
+    return {
+
+      leftList: "",
+      isdisabled: true,
+      setDisabled: {
+        // 杩斿洖绂佺敤鏃堕棿
+        disabledDate(time) {
+          // return time.getTime() < Date.now()// 涓嶅彲閫夊巻鍙插ぉ銆佷笉鍙�夊綋鍓嶅ぉ銆佸彲閫夋湭鏉ュぉ
+          return time.getTime() < Date.now() - 8.64e7; // 涓嶅彲閫夊巻鍙插ぉ銆佸彲閫夊綋鍓嶅ぉ銆佸彲閫夋湭鏉ュぉ
+        },
+      },
+      CompanyList: [],
+      reservationList: [],
+      rightList: [],
+      isShow: true,
+      isShows: true,
+      message: "鏄剧ず",
+      fileList: [], //涓婁紶鏂囦欢鍒楄〃
+      tableHead: [], //琛ㄥご
+      tableData: [], // 琛ㄦ暟鎹�
+      form: {
+        company: "",
+        payType: "",
+        name: "",
+        phoe: "",
+        signingPic: "",
+        discount: "",
+      },
+      formLabelWidth: "120px",
+      imageUrl: "",
+      size: "",
+      tcShow: false,
+      creaseopen: false,
+      // 濂楅鎻愪氦鎸夐挳
+      confirm: false,
+      TotalPrice: 0,
+      TotalPrice1: 0,
+      discount: 100,
+      deptList: [],
+      groupingList: [],
+      tableList: [],
+      data: {
+        dwId: "",
+        dwDeptId: "",
+        dwName: "",
+
+      },
+
+      objs: {
+        drugManufacturerId: "",
+        reservationTime: "",
+        yxts: "",
+      },
+      DataList: [],
+      tjOrderList: [], //鍗曚釜椤圭洰闆嗗悎
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      Seachopen: false,
+      dialogVisible: false,
+      notification: false,
+      // 鐢ㄦ埛琛ㄦ牸鏁版嵁
+      userList: null,
+      // 鐢ㄦ埛瀵煎叆鍙傛暟
+      upload: {
+        // 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
+        open: false,
+        // 寮瑰嚭灞傛爣棰橈紙鐢ㄦ埛瀵煎叆锛�
+        title: "",
+        // 鏄惁绂佺敤涓婁紶
+        isUploading: false,
+        // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
+        updateSupport: 0,
+        // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+        headers: { Authorization: "Bearer " + getToken(), hospId: Cookies.get("hospId") },
+        // 涓婁紶鐨勫湴鍧�
+        url:
+          process.env.VUE_APP_BASE_API +
+          "/reservation/reservation/newExcelImportNotDwDeptId",
+      },
+      // 鏌ヨ鍙傛暟
+      queryParam: {
+        pageNum: 1,
+        pageSize: 10,
+        company: undefined,
+        companyId: undefined,
+        pacName: undefined,
+        jobNo: undefined,
+        name: undefined,
+        sex: undefined,
+        idCard: undefined,
+        age: undefined,
+        birthday: undefined,
+        position: undefined,
+        department: undefined,
+        departmentId: undefined,
+        phoe: undefined,
+        address: undefined,
+        marriage: undefined,
+        nation: undefined,
+        email: undefined,
+        tjCategory: undefined,
+        payType: undefined,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+
+      rules: {
+        drugManufacturerId: [
+          { required: true, validator: checkPhoneNum, trigger: "change" },
+        ],
+        reservationTime: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        // dwDeptName: [
+        //   { required: true, validator: checkPhoneNum, trigger: "change" },
+        // ],
+        signingPic: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        contactPerson: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        contactPhone: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        taxNumber: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        legalPerson: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        registerAddress: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        bankAccount: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        countNum: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        principal: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        faxNumber: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        mailingAddress: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        email: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
+        pacName: [
+          { required: true, validator: checkPhoneNum, trigger: "change" },
+        ],
+        payType: [
+          { required: true, validator: checkPhoneNum, trigger: "change" },
+        ],
+        phoe: [
+          {
+            required: true,
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            validator: checkPhoneNum,
+            trigger: "blur",
+          },
+        ],
+
+        proPrice: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        createTime: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        cnName: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
+        businessLicenseNumber: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        createTime: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        updateTime: [
+          { required: true, validator: checkPhoneNum, trigger: "blur" },
+        ],
+        effective: [
+          {
+            required: true,
+            validator: checkPhoneNum,
+            trigger: "change",
+          },
+        ],
+        name: [{ required: true, validator: checkPhoneNum, trigger: "change" }],
+        contactPhone: [
+          { required: true, validator: checkPhoneNum, trigger: "change" },
+        ],
+      },
+      ListObj: {},
+      uploadKey: 0,
+      // 閬僵灞�
+      loading: true,
+      pacStatus: "鍚敤",
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 浣撴鍗曚綅淇℃伅缁存姢琛ㄦ牸鏁版嵁
+      compList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      open1: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        cnName: null,
+        enName: null,
+        code: null,
+      },
+    };
+  },
+  created() {
+    this.getCompanyList();
+  },
+
+  watch: {
+    inputVal(newValue) {
+      if (newValue) {
+        this.searchData(true);
+      } else {
+        this.searchData(false);
+      }
+    },
+  },
+  methods: {
+    // 淇濆瓨閮ㄩ棬
+    handleAddDept() {
+      let data = {
+        dwName: this.data.dwName,
+        dwId: this.data.dwId,
+        dwDeptName: this.form.dwDeptName,
+        signingPrice: this.form.signingPrice,
+      };
+      addDept(data).then((response) => {
+        if (response.code == 200) {
+          this.$modal.msgSuccess("鏂板鎴愬姛");
+          this.open1 = false;
+        }
+      });
+    },
+    idFn(value) {
+      this.userList = []
+      if (value) {
+        this.data.dwId = value;
+        Deptlist(value).then((response) => {
+          this.deptList = response.data;
+        });
+      }
+    },
+    idFn1(value) {
+      console.log(value);
+      if (value) {
+        this.data.dwId = value;
+        this.CompanyList.forEach((item) => {
+          console.log(item);
+          if (item.drugManufacturerId == this.data.dwId) {
+            this.data.dwName = item.cnName;
+          }
+        });
+      }
+    },
+    idBm(value) {
+      this.data.dwDeptId = value;
+    },
+
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        // if (index === 0) {
+        //   sums[index] = "鍚堣";
+        //   return;
+        // }
+        if (index === 0) {
+          sums[index] = "鎬昏浜烘暟";
+          return;
+        }
+        if (index === 1) {
+          sums[index] = this.ListObj.count;
+          return;
+        }
+        if (index === 2) {
+          sums[index] = "鐢风粍浜烘暟";
+          return;
+        }
+        if (index === 3) {
+          sums[index] = this.ListObj.manCount;
+          return;
+        }
+        if (index === 4) {
+          sums[index] = "鐢风粍閲戦";
+          return;
+        }
+        if (index === 5) {
+          sums[index] = this.ListObj.manMoney;
+          return;
+        }
+        if (index === 6) {
+          sums[index] = "濂崇粍浜烘暟";
+          return;
+        }
+        if (index === 7) {
+          sums[index] = this.ListObj.woManCount;
+          return;
+        }
+        if (index === 8) {
+          sums[index] = "濂崇粍閲戦";
+          return;
+        }
+        if (index === 9) {
+          sums[index] = this.ListObj.woManMoney;
+          return;
+        }
+        if (index === 10) {
+          sums[index] = "鍚堣閲戦";
+          return;
+        }
+        if (index === 11) {
+          sums[index] = this.ListObj.hjMoney;
+          return;
+        }
+      });
+      return sums;
+    },
+    // 鎼滅储
+    getRemoteData(query) {
+
+      if (query) {
+        let compName = query;
+        queryCompany(compName).then((response) => {
+          this.CompanyList = response.data;
+          this.CompanyList.forEach((item) => {
+            this.objs = item;
+          });
+        });
+      }
+    },
+
+    // 鑾峰彇鍗曚綅淇℃伅闆嗗悎
+    getCompanyList() {
+      this.loading = true;
+      getconfigKey('team_reservation_default_day').then((res) => {
+        console.log(res, 1111);
+        this.objs.yxts = res.msg;
+      });
+      getCompany(this.queryParam).then((response) => {
+        this.CompanyList = response.data;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.open1 = false;
+      this.creaseopen = false;
+      this.reset();
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
+    },
+    /** 閮ㄩ棬鏂板鎸夐挳鎿嶄綔 */
+    handleAddbumen() {
+      this.reset();
+      this.open1 = true;
+      this.title = "娣诲姞閮ㄩ棬淇℃伅缁存姢";
+    },
+
+    /** 鎻愪氦鎸夐挳 */
+    submitFormS() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          addComp(this.form).then((response) => {
+            this.$modal.msgSuccess("鏂板鎴愬姛");
+            this.open = false;
+            this.getCompanyList();
+          });
+        }
+      });
+    },
+
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        company: null,
+        payType: null,
+        name: null,
+        phoe: null,
+        signingPic: null,
+        pacStatus: "鍚敤",
+      };
+      this.resetForm("form");
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.date = [];
+      this.objs.drugManufacturerId = "";
+      this.objs.dwDeptName = "";
+      this.objs.reservationTime = "";
+      this.TotalPrice = "";
+      this.tableData[0] = [];
+      this.TotalPrice1 = "";
+      this.userList = []
+      // this.resetForm("form");
+      this.form = {};
+    },
+
+    //鑾峰彇鏃堕棿
+    selectTime(val) {
+      this.objs.reservationTime = val;
+    },
+    /** 瀵煎叆鎸夐挳鎿嶄綔 */
+    handleImport() {
+      if (this.objs.drugManufacturerId && this.objs.reservationTime) {
+        this.$refs.upload?.clearFiles();
+        this.uploadKey = Date.now(); // 鏀瑰彉 key 寮哄埗閲嶆柊娓叉煋缁勪欢
+        this.upload.title = "鐢ㄦ埛瀵煎叆";
+        this.upload.open = true;
+      } else {
+        this.$modal.msgError("璇烽�夋嫨鍗曚綅鎴栭绾︽椂闂�");
+      }
+    },
+    /** 涓嬭浇妯℃澘鎿嶄綔 */
+    importTemplate() {
+      this.download(
+        "/reservation/reservation/importTemplate",
+        {},
+        `鑱屼笟鍥綋棰勭害Excel妯$増.xls`
+      );
+    },
+    // 鏂囦欢涓婁紶涓鐞�
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 鏂囦欢涓婁紶鎴愬姛澶勭悊
+    handleFileSuccess(response, file, fileList) {
+      if (response.code == 500) {
+        this.isdisabled = true;
+        // Message.warning(response.msg);
+        // this.$modal.msgError(response.msg);
+        // this.$modal.msgError("浜哄憳"+ response.data.list + "淇℃伅閿欒");
+        if (response.data) {
+          if (response.data.list) {
+            const errorList = `
+  <div style="max-height: 300px; overflow-y: auto;">
+    ${response.data.list.join(", ")}
+  </div>`
+
+            this.$confirm(errorList, `${response.msg}`, {
+              confirmButtonText: "纭畾",
+              cancelButtonText: "鍙栨秷",
+              type: "error",
+              center: true,
+              dangerouslyUseHTMLString: true,
+            });
+          }
+        } else {
+          this.$confirm(`${response.msg}`, {
+            confirmButtonText: "纭畾",
+            cancelButtonText: "鍙栨秷",
+            type: "error",
+            center: true,
+            dangerouslyUseHTMLString: true,
+          });
+        }
+      } else {
+        this.isdisabled = false;
+        this.ListObj = response.data;
+        this.userList = response.data.list;
+
+        this.userList.forEach((item) => {
+          this.CompanyList.forEach((item1) => {
+            if (item1.drugManufacturerId == this.objs.drugManufacturerId) {
+              item.company = item1.cnName;
+            }
+          });
+        });
+      }
+
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.leftList = response.msg;
+
+      if (this.leftList == "鎿嶄綔澶辫触") {
+        this.isdisabled = true;
+        this.$alert(
+          "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "<div style='br;margin:10px'>" +
+          response.data[0] +
+          "韬唤璇佹垨鎵嬫満鍙风爜鏈夎" +
+          "</div>",
+          "瀵煎叆缁撴灉",
+          { dangerouslyUseHTMLString: true }
+        );
+      }
+      // else {
+      //   console.log(11111)
+      //   this.isdisabled = false;
+      //   this.$alert(
+      //     "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+      //       response.msg,
+      //     { dangerouslyUseHTMLString: true }
+      //   );
+      //   this.rightList = response;
+      // }
+      for (let i = 0; i < fileList.length; i++) {
+        if (file.name != fileList[i].name) {
+          this.fileList.push({
+            name: file.name,
+            url: "",
+            uid: file.uid,
+          });
+        }
+      }
+      //  let data = {
+      //   dwDeptId: this.deptId,
+      //   dwId: this.dwId,
+      //   file:file
+      // }
+      // newExcelImport(data).then(response => {
+      //   console.log(11111)
+      // })
+      const files = { 0: file };
+      // this.readExcel(files);
+    },
+    // 鎻愪氦涓婁紶鏂囦欢
+    submitFileForm() {
+      this.$refs.upload.submit();
+      this.isShow = false;
+    },
+
+    // readExcel(file) {
+    //   const fileReader = new FileReader();
+    //   fileReader.onload = (ev) => {
+    //     try {
+    //       const data = ev.target.result;
+    //       const workbook = read(data, { type: "binary" });
+    //       const params = [];
+    //       // 鍙栧搴旇〃鐢熸垚json琛ㄦ牸鍐呭
+    //       workbook.SheetNames.forEach((item) => {
+    //         params.push({
+    //           name: item,
+    //           dataList: utils.sheet_to_json(workbook.Sheets[item]),
+    //         });
+    //         this.tableData.push(utils.sheet_to_json(workbook.Sheets[item]));
+    //       });
+    //       // 璇ョ畻娉曚粎閽堝琛ㄥご鏃犲悎骞剁殑鎯呭喌
+    //       if (this.tableData.length > 0) {
+    //         // 鑾峰彇excel涓涓�涓〃鏍兼暟鎹畉ableData[0][0]锛屽苟涓斿皢琛ㄥご鎻愬彇鍑烘潵
+    //         for (const key in this.tableData[0][0]) {
+    //           this.tableHead.push(key);
+    //         }
+    //       }
+    //       return params;
+    //       // 閲嶅啓鏁版嵁
+    //     } catch (e) {
+    //       console.log("error:" + e);
+    //       return false;
+    //     }
+    //   };
+    //   fileReader.readAsBinaryString(file[0].raw);
+    // },
+
+    /** 纭鎸夐挳 */
+    submitForm() {
+      // if (this.objs.reservationTime && this.data.dwDeptId) {
+      if (this.objs.reservationTime) {
+        let data = {
+          copeWith: this.ListObj.hjMoney,
+          reservations: this.userList,
+          reservationTime: this.objs.reservationTime,
+          dwDeptId: this.data.dwDeptId,
+          yxts: this.objs.yxts,
+          dwId: this.data.dwId,
+        };
+        newConfirm(data).then((res) => {
+          this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+          this.confirm = true;
+          this.userList = [];
+        });
+      } else {
+        this.$modal.msgError("璇峰~鍐欏甫鏄熷彿鍐呭");
+      }
+    },
+  },
+};
+</script>
+
+
+<style>
+.el-dialog:not(.is-fullscreen) {
+  margin-top: 6vh !important;
+  width: 600px;
+}
+
+/* .el-table td.el-table__cell div {
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  display: flex;
+  flex-wrap: wrap;
+  font-size: 14px;
+} */
+
+.upload-demo {
+  width: 100%;
+}
+
+.el-icon-circle-plus-outline {
+  line-height: 20px;
+  font-size: 20px;
+}
+
+.dia {
+  display: flex;
+}
+
+.dialog-footer2 {
+  width: 960px;
+  height: 36px;
+  display: flex;
+  justify-content: center;
+}
+
+.dialog-footer1 {
+  width: 860px;
+  height: 36px;
+  display: flex;
+  justify-content: center;
+}
+</style>
\ No newline at end of file

--
Gitblit v1.8.0