From dc3d15dfe0c4a4a85bc5b4df7959b84a02beb064 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 11 十二月 2023 10:48:04 +0800
Subject: [PATCH] 随访题库完成

---
 src/comp/smartor3/dwo/dw_list_pat_archive.vue             |  304 +
 src/comp/smartor3/dwo/dw_list_pat_archivecontact.vue      |  279 +
 src/views/patient/patient/physical.vue                    |   32 
 src/comp/smartor3/dwo/dw_list_pat_med_weight.vue          |  283 +
 src/comp/smartor3/dwo/dw_list_pat_med_operation.vue       |  309 +
 src/views/patient/patient/outpatient.vue                  | 1819 +++++-----
 src/views/patient/patient/index.vue                       |   90 
 src/api/smartorpor/pat_archive.js                         |    4 
 src/comp/smartor3/dwo/dw_list_pat_med_inhosp.vue          |  385 +
 src/smartor/dataobject/dw_patarchive_list.vue             |  229 
 src/smartor/dataobject/dw_patarchive_base.vue             |  460 +-
 src/comp/smartor3/dwo/dw_list_pat_med_inspection.vue      |  321 +
 src/comp/smartor3/dwo/dw_list_pat_med_inspection_item.vue |  287 +
 src/views/repositoryai/verbaltrick/particulars/index.vue  | 1086 ++++++
 src/views/patient/patient/behospitalized.vue              |   35 
 src/comp/smartor3/dwo/dw_list_pat_med_registration.vue    |  313 +
 src/comp/smartor3/dwo/dw_list_pat_med_apointment.vue      |  391 +
 src/comp/smartor3/dwo/dw_list_pat_med_drug.vue            |  303 +
 src/views/repositoryai/verbaltrick/index.vue              |  183 -
 src/comp/smartor3/dwo/dw_query_pat_archive.vue            |  168 
 src/comp/smartor3/dwo/dw_list_pat_archivetag.vue          |  277 +
 src/comp/smartor3/dwo/dw_list_pat_med_hypertension.vue    |  295 +
 src/comp/smartor3/dwo/dw_list_pat_med_physical.vue        |  329 +
 src/comp/smartor3/dwo/dw_list_pat_med_bloodsugar.vue      |  289 +
 src/comp/smartor3/dwo/dw_list_pat_med_outhosp.vue         |  307 +
 src/views/patient/patient/profile/index.vue               |   29 
 src/api/smartorpor/svr_prjtaskline.js                     |   57 
 src/comp/smartor3/dwo/dw_maint_pat_archive.vue            |  250 
 src/views/patient/follow/index.vue                        |   32 
 29 files changed, 5,404 insertions(+), 3,742 deletions(-)

diff --git a/src/api/smartorpor/pat_archive.js b/src/api/smartorpor/pat_archive.js
index b8f03eb..aaf4232 100644
--- a/src/api/smartorpor/pat_archive.js
+++ b/src/api/smartorpor/pat_archive.js
@@ -3,7 +3,7 @@
 	      patid// 鑷ID 
    name// 濮撳悕 
    sex// 鎬у埆   1:鐢�  2:濂�
-   iccardno// 璇佷欢鍙风爜 
+   idno// 璇佷欢鍙风爜 
    birthdate// 鐢熸棩 
    age// 骞撮緞 
    source// 鏉ユ簮 
@@ -11,7 +11,7 @@
    archiveby// 寤烘。浜� 
    telcode// 鎵嬫満鍙风爜 
    relativetelcode// 浜插睘鍙风爜 
-   iccardtype// 璇佷欢绫诲瀷 
+   idtype// 璇佷欢绫诲瀷 
    orgid// 鏈烘瀯ID 
    openid// 寰俊openid 
    del_flag// 鍒犻櫎鏍囪 
diff --git a/src/api/smartorpor/svr_prjtaskline.js b/src/api/smartorpor/svr_prjtaskline.js
index e23e291..ef60f96 100644
--- a/src/api/smartorpor/svr_prjtaskline.js
+++ b/src/api/smartorpor/svr_prjtaskline.js
@@ -1,6 +1,61 @@
 
 	/*鎮h�呮湇鍔″瓙浠诲姟鏄庣粏琛ˋPI鎺ュ彛
-	      id// 鑷ID 
   schemeid// 鏂规ID 
   schemeplanid// 璁″垝ID 
   patientid// 鎮h�匢D 
   state// 鐘舵��
   baselinetime// 鍩虹嚎鏃堕棿 
   plantime// 璁″垝鎵ц鏃堕棿 
   actualtime// 瀹為檯瀹屾垚鏃堕棿 
   overtime// 閫炬湡鏃堕棿 
   patientsource// 鎮h�呮潵婧�
   taskconfigid// 閰嶇疆ID 
   relationid// 鍏宠仈缂栧彿 绉戝椤圭洰闂嵎瀹f暀 
   relationname// 鍏宠仈鍚嶇О 
   content// 浠嬬粛鎻愰啋鍐呭 
   tipscontent// 鎻愮ず鍐呭 
   tasktype// 浠诲姟绫诲瀷 
   finshtime// 鍏抽棴鏃堕棿 
   finshtype// 鍏抽棴绫诲瀷
   finshdesc// 鍏抽棴璇存槑 
   termvaliditytime// 鏈夋晥鏈� 
   schemestatus// 鏄惁鐢熸垚鏂规
   visitid// 灏辫瘖ID 
   visittype// 灏辫瘖绫诲瀷 
   tasksource// 浠诲姟鏉ユ簮
   relationtype// 鍏宠仈椤圭洰绫诲瀷
   isartificial// 鏄惁浜哄伐澶勭悊
   overduetipstime// 灏嗛�炬湡鏃堕棿 
   isabnormal// 鏄惁寮傚父璺熻繘浠诲姟
   artificialtag// 宸茬粡浜哄伐澶勭悊鏍囧織
   relationcode// 鍏宠仈浠g爜 闂嵎銆佸鏁欍�佸洖璁裤�佸璇婃彁閱掋�佷綋妫�鎻愰啋 
   schemecode// 鏂规浠g爜 
   lastplantime// 鏈�鍚庝竴娆¤鍒掓墽琛屾椂闂� 
   istest// 鏄惁涓烘祴璇曚换鍔�
   firstplantime// 绗竴娆¤鍒掓墽琛屾椂闂� 
   repeatsecond// 閲嶅彂娆℃暟
   isrepeat// 鏄惁瀛樺湪閲嶅彂鏍囪 
   ismanual// 鎵嬪姩鎵ц鏍囪 
   losstime// 澶辫鏃堕棿 
   relationlistid// 
   orgid// 鏈烘瀯ID 
   del_flag// 鍒犻櫎鏍囪 
   create_by// 鍒涘缓浜� 
   create_time// 鍒涘缓鏃堕棿 
   update_by// 鏇存柊浜� 
   update_time// 鏇存柊鏃堕棿 
   isupload// 涓婁紶鏍囪 
   upload_time// 涓婁紶鏃堕棿 
   pid//瀛愪换鍔D
   guid//GUID
   pguid//瀛愪换鍔uid
   patname// 濮撳悕 
   patsex// 鎬у埆   1:鐢�  2:濂�
   paticcardno// 璇佷欢鍙风爜 
   patbirthdate// 鐢熸棩 
   patage// 骞撮緞 
   pattelcode// 鎵嬫満鍙风爜 
+	      id// 鑷ID 
+   schemeid// 鏂规ID 
+   schemeplanid// 璁″垝ID 
+   patientid// 鎮h�匢D 
+   state// 鐘舵��
+   baselinetime// 鍩虹嚎鏃堕棿 
+   plantime// 璁″垝鎵ц鏃堕棿 
+   actualtime// 瀹為檯瀹屾垚鏃堕棿 
+   overtime// 閫炬湡鏃堕棿 
+   patientsource// 鎮h�呮潵婧�
+   taskconfigid// 閰嶇疆ID 
+   relationid// 鍏宠仈缂栧彿 绉戝椤圭洰闂嵎瀹f暀 
+   relationname// 鍏宠仈鍚嶇О 
+   content// 浠嬬粛鎻愰啋鍐呭 
+   tipscontent// 鎻愮ず鍐呭 
+   tasktype// 浠诲姟绫诲瀷 
+   finshtime// 鍏抽棴鏃堕棿 
+   finshtype// 鍏抽棴绫诲瀷
+   finshdesc// 鍏抽棴璇存槑 
+   termvaliditytime// 鏈夋晥鏈� 
+   schemestatus// 鏄惁鐢熸垚鏂规
+   visitid// 灏辫瘖ID 
+   visittype// 灏辫瘖绫诲瀷 
+   tasksource// 浠诲姟鏉ユ簮
+   relationtype// 鍏宠仈椤圭洰绫诲瀷
+   isartificial// 鏄惁浜哄伐澶勭悊
+   overduetipstime// 灏嗛�炬湡鏃堕棿 
+   isabnormal// 鏄惁寮傚父璺熻繘浠诲姟
+   artificialtag// 宸茬粡浜哄伐澶勭悊鏍囧織
+   relationcode// 鍏宠仈浠g爜 闂嵎銆佸鏁欍�佸洖璁裤�佸璇婃彁閱掋�佷綋妫�鎻愰啋 
+   schemecode// 鏂规浠g爜 
+   lastplantime// 鏈�鍚庝竴娆¤鍒掓墽琛屾椂闂� 
+   istest// 鏄惁涓烘祴璇曚换鍔�
+   firstplantime// 绗竴娆¤鍒掓墽琛屾椂闂� 
+   repeatsecond// 閲嶅彂娆℃暟
+   isrepeat// 鏄惁瀛樺湪閲嶅彂鏍囪 
+   ismanual// 鎵嬪姩鎵ц鏍囪 
+   losstime// 澶辫鏃堕棿 
+   relationlistid// 
+   orgid// 鏈烘瀯ID 
+   del_flag// 鍒犻櫎鏍囪 
+   create_by// 鍒涘缓浜� 
+   create_time// 鍒涘缓鏃堕棿 
+   update_by// 鏇存柊浜� 
+   update_time// 鏇存柊鏃堕棿 
+   isupload// 涓婁紶鏍囪 
+   upload_time// 涓婁紶鏃堕棿 
+   pid//瀛愪换鍔D
+   guid//GUID
+   pguid//瀛愪换鍔uid
+   patname// 濮撳悕 
+   patsex// 鎬у埆   1:鐢�  2:濂�
+   patidno// 璇佷欢鍙风爜 
+   patbirthdate// 鐢熸棩 
+   patage// 骞撮緞 
+   pattelcode// 鎵嬫満鍙风爜 
 	*/
 	import request from '@/utils/request'
 
diff --git a/src/comp/smartor3/dwo/dw_list_pat_archive.vue b/src/comp/smartor3/dwo/dw_list_pat_archive.vue
index 4c073d9..d94a109 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_archive.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_archive.vue
@@ -1,128 +1,180 @@
 <template>
-      <div>
-            <el-row v-if="false" :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="patid" label="  鑷ID " align="center"/>
-                  <el-table-column prop="name" label="  濮撳悕 " align="center"/>
-                  <el-table-column prop="sex" label="  鎬у埆   1:鐢�  2:濂�" align="center"/>
-                  <el-table-column prop="iccardno" label="  璇佷欢鍙风爜 " align="center"/>
-                  <el-table-column prop="birthdate" label="  鐢熸棩 " align="center"/>
-                  <el-table-column prop="age" label="  骞撮緞 " align="center"/>
-                  <el-table-column prop="source" label="  鏉ユ簮 " align="center"/>
-                  <el-table-column prop="archivetime" label="  寤烘。鏃堕棿 " align="center"/>
-                  <el-table-column prop="archiveby" label="  寤烘。浜� " align="center"/>
-                  <el-table-column prop="telcode" label="  鎵嬫満鍙风爜 " align="center"/>
-                  <el-table-column prop="relativetelcode" label="  浜插睘鍙风爜 " align="center"/>
-                  <el-table-column prop="iccardtype" label="  璇佷欢绫诲瀷 " align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="openid" label="  寰俊openid " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-            <pagination :total="total" :limit.sync="queryParams.pageSize" @pagination="getList" :page.sync="queryParams.pageNum" v-show="total &gt; 0"/>
-      </div>
+  <div>
+    <el-row v-if="false" :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="patid" label="  鑷ID " align="center" />
+      <el-table-column prop="name" label="  濮撳悕 " align="center" />
+      <el-table-column prop="sex" label="  鎬у埆   1:鐢�  2:濂�" align="center" />
+      <el-table-column prop="idno" label="  璇佷欢鍙风爜 " align="center" />
+      <el-table-column prop="birthdate" label="  鐢熸棩 " align="center" />
+      <el-table-column prop="age" label="  骞撮緞 " align="center" />
+      <el-table-column prop="source" label="  鏉ユ簮 " align="center" />
+      <el-table-column prop="archivetime" label="  寤烘。鏃堕棿 " align="center" />
+      <el-table-column prop="archiveby" label="  寤烘。浜� " align="center" />
+      <el-table-column prop="telcode" label="  鎵嬫満鍙风爜 " align="center" />
+      <el-table-column
+        prop="relativetelcode"
+        label="  浜插睘鍙风爜 "
+        align="center"
+      />
+      <el-table-column prop="idtype" label="  璇佷欢绫诲瀷 " align="center" />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="openid" label="  寰俊openid " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+    <pagination
+      :total="total"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+      :page.sync="queryParams.pageNum"
+      v-show="total &gt; 0"
+    />
+  </div>
 </template>
-	<script>
-	import { listpat_archive, getpat_archive, delpat_archive, addpat_archive, updatepat_archive } from "@/api/smartor3/pat_archive";
-	export default {
-		name: "dw_list_pat_archive",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //true,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		   this.getList(); 
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_archive(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  this.$parent.selectionRowChanged(row.patid)
-			  //this.$parent.patid = row.patid
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_archive,
+  getpat_archive,
+  delpat_archive,
+  addpat_archive,
+  updatepat_archive,
+} from "@/api/smartor3/pat_archive";
+export default {
+  name: "dw_list_pat_archive",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_archive(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      this.$parent.selectionRowChanged(row.patid);
+      //this.$parent.patid = row.patid
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_list_pat_archivecontact.vue b/src/comp/smartor3/dwo/dw_list_pat_archivecontact.vue
index 68fe175..64c9faa 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_archivecontact.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_archivecontact.vue
@@ -1,121 +1,162 @@
 <template>
-      <div>
-            <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="id" label="  鑷ID " align="center"/>
-                  <el-table-column prop="patid" label="  鑱旂郴鏂瑰紡ID " align="center"/>
-                  <el-table-column prop="contactway" label="  鑱旂郴鏂瑰紡 " align="center"/>
-                  <el-table-column prop="relation" label="  鍏崇郴 " align="center"/>
-                  <el-table-column prop="datasource" label="  鏁版嵁鏉ユ簮 " align="center"/>
-                  <el-table-column prop="isdefault" label="  鏄惁榛樿 " align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="contactname" label="  鑱旂郴濮撳悕 " align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="id" label="  鑷ID " align="center" />
+      <el-table-column prop="patid" label="  鑱旂郴鏂瑰紡ID " align="center" />
+      <el-table-column prop="contactway" label="  鑱旂郴鏂瑰紡 " align="center" />
+      <el-table-column prop="relation" label="  鍏崇郴 " align="center" />
+      <el-table-column prop="datasource" label="  鏁版嵁鏉ユ簮 " align="center" />
+      <el-table-column prop="isdefault" label="  鏄惁榛樿 " align="center" />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column prop="contactname" label="  鑱旂郴濮撳悕 " align="center" />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+  </div>
 </template>
-	<script>
-	import { listpat_archivecontact, getpat_archivecontact, delpat_archivecontact, addpat_archivecontact, updatepat_archivecontact } from "@/api/smartor3/pat_archivecontact";
-	export default {
-		name: "dw_list_pat_archivecontact",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_archivecontact(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.id)
-			  this.$parent.id = row.id
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_archivecontact,
+  getpat_archivecontact,
+  delpat_archivecontact,
+  addpat_archivecontact,
+  updatepat_archivecontact,
+} from "@/api/smartor3/pat_archivecontact";
+export default {
+  name: "dw_list_pat_archivecontact",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_archivecontact(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.id)
+      this.$parent.id = row.id;
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_list_pat_archivetag.vue b/src/comp/smartor3/dwo/dw_list_pat_archivetag.vue
index efd7d9b..cf19e2c 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_archivetag.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_archivetag.vue
@@ -1,118 +1,163 @@
 <template>
-      <div>
-            <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="id" label="  鑷ID " align="center"/>
-                  <el-table-column prop="tagcategoryid" label="  鏍囩鍒嗙被ID " align="center"/>
-                  <el-table-column prop="tagid" label="  鏍囩ID " align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="patid" label="  妗fID " align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="id" label="  鑷ID " align="center" />
+      <el-table-column
+        prop="tagcategoryid"
+        label="  鏍囩鍒嗙被ID "
+        align="center"
+      />
+      <el-table-column prop="tagid" label="  鏍囩ID " align="center" />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column prop="patid" label="  妗fID " align="center" />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+  </div>
 </template>
-	<script>
-	import { listpat_archivetag, getpat_archivetag, delpat_archivetag, addpat_archivetag, updatepat_archivetag } from "@/api/smartor3/pat_archivetag";
-	export default {
-		name: "dw_list_pat_archivetag",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_archivetag(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.id)
-			  this.$parent.id = row.id
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_archivetag,
+  getpat_archivetag,
+  delpat_archivetag,
+  addpat_archivetag,
+  updatepat_archivetag,
+} from "@/api/smartor3/pat_archivetag";
+export default {
+  name: "dw_list_pat_archivetag",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_archivetag(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.id)
+      this.$parent.id = row.id;
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_apointment.vue b/src/comp/smartor3/dwo/dw_list_pat_med_apointment.vue
index 6bddf19..156867d 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_apointment.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_apointment.vue
@@ -1,147 +1,248 @@
 <template>
-      <div>
-            <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="id" label="  鑷ID " align="center"/>
-                  <el-table-column prop="visittime" label=" 澶嶈瘖鏃堕棿" align="center"/>
-                  <el-table-column prop="visitdoctor" label=" 澶嶈瘖鍖荤敓" align="center"/>
-                  <el-table-column prop="visitdept" label=" 澶嶈瘖绉戝" align="center"/>
-                  <el-table-column prop="visitdesc" label=" 澶嶈瘖缁撴灉" align="center"/>
-                  <el-table-column prop="hospitalname" label="  鍖婚櫌鍚嶇О " align="center"/>
-                  <el-table-column prop="hospitalcode" label="  鍖婚櫌缂栧彿 " align="center"/>
-                  <el-table-column prop="hospitaldistrictcode" label="  闄㈠尯缂栧彿 " align="center"/>
-                  <el-table-column prop="hospitaldistrictname" label="  闄㈠尯鍚嶇О " align="center"/>
-                  <el-table-column prop="icd10code" label="  鍏ラ櫌璇婃柇ICD鍊� " align="center"/>
-                  <el-table-column prop="diagname" label="  鍏ラ櫌璇婃柇鍚嶇О " align="center"/>
-                  <el-table-column prop="starttime" label="  鍏ラ櫌鏃堕棿 " align="center"/>
-                  <el-table-column prop="endtime" label="  鍑洪櫌鏃堕棿 " align="center"/>
-                  <el-table-column prop="deptcode" label="  鍏ラ櫌绉戝浠g爜 " align="center"/>
-                  <el-table-column prop="deptname" label="  鍏ラ櫌绉戝鍚嶇О " align="center"/>
-                  <el-table-column prop="roomno" label="  鎴块棿鍙� " align="center"/>
-                  <el-table-column prop="bedno" label="  搴婁綅鍙� " align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="patid" label="  妗fID " align="center"/>
-                  <el-table-column prop="leavediagname" label="  鍑洪櫌璇婃柇 " align="center"/>
-                  <el-table-column prop="leaveicd10code" label="  鍑洪櫌璇婃柇ICD鍊� " align="center"/>
-                  <el-table-column prop="drcode" label="  鍖荤敓宸ュ彿 " align="center"/>
-                  <el-table-column prop="drname" label="  鍖荤敓鍚嶇О " align="center"/>
-                  <el-table-column prop="schemestatus" label="  鏄惁鐢熸垚鏂规鐘舵��" align="center"/>
-                  <el-table-column prop="generalschemestatus" label="  鏄惁鐢熸垚閫氱敤鏂规鐘舵��" align="center"/>
-                  <el-table-column prop="leaveldeptcode" label="  鍑洪櫌绉戝浠g爜 " align="center"/>
-                  <el-table-column prop="leaveldeptname" label="  鍑洪櫌绉戝浠g爜 " align="center"/>
-                  <el-table-column prop="hospitaldistrictid" label="  鐥呭尯ID " align="center"/>
-                  <el-table-column prop="leavehospitaldistrictcode" label="  鍑洪櫌鐥呭尯缂栧彿 " align="center"/>
-                  <el-table-column prop="leavehospitaldistrictname" label="  鍑洪櫌鐥呭尯鍚嶇О " align="center"/>
-                  <el-table-column prop="leavehospitaldistrictid" label="  鍑洪櫌鐥呭尯ID " align="center"/>
-                  <el-table-column prop="deptid" label="  鍏ラ櫌绉戝ID " align="center"/>
-                  <el-table-column prop="leaveldeptid" label="  鍑洪櫌绉戝ID " align="center"/>
-                  <el-table-column prop="schemetime" label="  鏂规鐘舵�佹搷浣滄椂闂� " align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="id" label="  鑷ID " align="center" />
+      <el-table-column prop="visittime" label=" 澶嶈瘖鏃堕棿" align="center" />
+      <el-table-column prop="visitdoctor" label=" 澶嶈瘖鍖荤敓" align="center" />
+      <el-table-column prop="visitdept" label=" 澶嶈瘖绉戝" align="center" />
+      <el-table-column prop="visitdesc" label=" 澶嶈瘖缁撴灉" align="center" />
+      <el-table-column prop="hospitalname" label="  鍖婚櫌鍚嶇О " align="center" />
+      <el-table-column prop="hospitalcode" label="  鍖婚櫌缂栧彿 " align="center" />
+      <el-table-column
+        prop="hospitaldistrictcode"
+        label="  闄㈠尯缂栧彿 "
+        align="center"
+      />
+      <el-table-column
+        prop="hospitaldistrictname"
+        label="  闄㈠尯鍚嶇О "
+        align="center"
+      />
+      <el-table-column
+        prop="icd10code"
+        label="  鍏ラ櫌璇婃柇ICD鍊� "
+        align="center"
+      />
+      <el-table-column prop="diagname" label="  鍏ラ櫌璇婃柇鍚嶇О " align="center" />
+      <el-table-column prop="starttime" label="  鍏ラ櫌鏃堕棿 " align="center" />
+      <el-table-column prop="endtime" label="  鍑洪櫌鏃堕棿 " align="center" />
+      <el-table-column prop="deptcode" label="  鍏ラ櫌绉戝浠g爜 " align="center" />
+      <el-table-column prop="deptname" label="  鍏ラ櫌绉戝鍚嶇О " align="center" />
+      <el-table-column prop="roomno" label="  鎴块棿鍙� " align="center" />
+      <el-table-column prop="bedno" label="  搴婁綅鍙� " align="center" />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column prop="patid" label="  妗fID " align="center" />
+      <el-table-column
+        prop="leavediagname"
+        label="  鍑洪櫌璇婃柇 "
+        align="center"
+      />
+      <el-table-column
+        prop="leaveicd10code"
+        label="  鍑洪櫌璇婃柇ICD鍊� "
+        align="center"
+      />
+      <el-table-column prop="drcode" label="  鍖荤敓宸ュ彿 " align="center" />
+      <el-table-column prop="drname" label="  鍖荤敓鍚嶇О " align="center" />
+      <el-table-column
+        prop="schemestatus"
+        label="  鏄惁鐢熸垚鏂规鐘舵��"
+        align="center"
+      />
+      <el-table-column
+        prop="generalschemestatus"
+        label="  鏄惁鐢熸垚閫氱敤鏂规鐘舵��"
+        align="center"
+      />
+      <el-table-column
+        prop="leaveldeptcode"
+        label="  鍑洪櫌绉戝浠g爜 "
+        align="center"
+      />
+      <el-table-column
+        prop="leaveldeptname"
+        label="  鍑洪櫌绉戝浠g爜 "
+        align="center"
+      />
+      <el-table-column
+        prop="hospitaldistrictid"
+        label="  鐥呭尯ID "
+        align="center"
+      />
+      <el-table-column
+        prop="leavehospitaldistrictcode"
+        label="  鍑洪櫌鐥呭尯缂栧彿 "
+        align="center"
+      />
+      <el-table-column
+        prop="leavehospitaldistrictname"
+        label="  鍑洪櫌鐥呭尯鍚嶇О "
+        align="center"
+      />
+      <el-table-column
+        prop="leavehospitaldistrictid"
+        label="  鍑洪櫌鐥呭尯ID "
+        align="center"
+      />
+      <el-table-column prop="deptid" label="  鍏ラ櫌绉戝ID " align="center" />
+      <el-table-column
+        prop="leaveldeptid"
+        label="  鍑洪櫌绉戝ID "
+        align="center"
+      />
+      <el-table-column
+        prop="schemetime"
+        label="  鏂规鐘舵�佹搷浣滄椂闂� "
+        align="center"
+      />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+  </div>
 </template>
-	<script>
-	import { listpat_med_apointment, getpat_med_apointment, delpat_med_apointment, addpat_med_apointment, updatepat_med_apointment } from "@/api/smartor3/pat_med_apointment";
-	export default {
-		name: "dw_list_pat_med_apointment",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_med_apointment(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.id)
-			  this.$parent.id = row.id
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_med_apointment,
+  getpat_med_apointment,
+  delpat_med_apointment,
+  addpat_med_apointment,
+  updatepat_med_apointment,
+} from "@/api/smartor3/pat_med_apointment";
+export default {
+  name: "dw_list_pat_med_apointment",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_med_apointment(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.id)
+      this.$parent.id = row.id;
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_bloodsugar.vue b/src/comp/smartor3/dwo/dw_list_pat_med_bloodsugar.vue
index cab09ed..a267b12 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_bloodsugar.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_bloodsugar.vue
@@ -1,124 +1,169 @@
 <template>
-      <div>
-            <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="bloodsugarid" label="  鑷ID " align="center"/>
-                  <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center"/>
-                  <el-table-column prop="recordtime" label="  璁板綍鏃堕棿 " align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="patid" label="  妗fID " align="center"/>
-                  <el-table-column prop="typename" label="  鏁版嵁绫诲瀷 " align="center"/>
-                  <el-table-column prop="sugarlevel" label="  琛�绯栧�� " align="center"/>
-                  <el-table-column prop="sourcename" label="  鏁版嵁鏉ユ簮 " align="center"/>
-                  <el-table-column prop="sugarlevelempty" label="  绌鸿吂琛�绯� " align="center"/>
-                  <el-table-column prop="visittype" label="  灏辫瘖绫诲瀷" align="center"/>
-                  <el-table-column prop="visitid" label="  灏辫瘖ID" align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="bloodsugarid" label="  鑷ID " align="center" />
+      <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center" />
+      <el-table-column prop="recordtime" label="  璁板綍鏃堕棿 " align="center" />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column prop="patid" label="  妗fID " align="center" />
+      <el-table-column prop="typename" label="  鏁版嵁绫诲瀷 " align="center" />
+      <el-table-column prop="sugarlevel" label="  琛�绯栧�� " align="center" />
+      <el-table-column prop="sourcename" label="  鏁版嵁鏉ユ簮 " align="center" />
+      <el-table-column
+        prop="sugarlevelempty"
+        label="  绌鸿吂琛�绯� "
+        align="center"
+      />
+      <el-table-column prop="visittype" label="  灏辫瘖绫诲瀷" align="center" />
+      <el-table-column prop="visitid" label="  灏辫瘖ID" align="center" />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+  </div>
 </template>
-	<script>
-	import { listpat_med_bloodsugar, getpat_med_bloodsugar, delpat_med_bloodsugar, addpat_med_bloodsugar, updatepat_med_bloodsugar } from "@/api/smartor3/pat_med_bloodsugar";
-	export default {
-		name: "dw_list_pat_med_bloodsugar",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_med_bloodsugar(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.bloodsugarid)
-			  this.$parent.bloodsugarid = row.bloodsugarid
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_med_bloodsugar,
+  getpat_med_bloodsugar,
+  delpat_med_bloodsugar,
+  addpat_med_bloodsugar,
+  updatepat_med_bloodsugar,
+} from "@/api/smartor3/pat_med_bloodsugar";
+export default {
+  name: "dw_list_pat_med_bloodsugar",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_med_bloodsugar(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.bloodsugarid)
+      this.$parent.bloodsugarid = row.bloodsugarid;
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_drug.vue b/src/comp/smartor3/dwo/dw_list_pat_med_drug.vue
index f7cb891..8e53486 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_drug.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_drug.vue
@@ -1,129 +1,178 @@
 <template>
-      <div>
-            <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="id" label="  鑷ID " align="center"/>
-                  <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center"/>
-                  <el-table-column prop="patid" label="  妗fID " align="center"/>
-                  <el-table-column prop="drugname" label="  鑽搧鍚嶇О " align="center"/>
-                  <el-table-column prop="opendate" label="  寮�鏂规棩鏈� " align="center"/>
-                  <el-table-column prop="drugtype" label="  鑽搧绫诲瀷 " align="center"/>
-                  <el-table-column prop="unit" label="  鍗曚綅 " align="center"/>
-                  <el-table-column prop="spec" label="  瑙勬牸 " align="center"/>
-                  <el-table-column prop="drugusage" label="  鐢ㄦ硶 " align="center"/>
-                  <el-table-column prop="dose" label="  鍓傞噺 " align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="drugid" label="  鑽搧ID " align="center"/>
-                  <el-table-column prop="visittype" label="  灏辫瘖绫诲瀷 " align="center"/>
-                  <el-table-column prop="visitid" label="  灏辫瘖ID " align="center"/>
-                  <el-table-column prop="schemestatus" label="  鏄惁鐢熸垚鏂规鐘舵��" align="center"/>
-                  <el-table-column prop="schemetime" label="  鏂规鐘舵�佹搷浣滄椂闂� " align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="id" label="  鑷ID " align="center" />
+      <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center" />
+      <el-table-column prop="patid" label="  妗fID " align="center" />
+      <el-table-column prop="drugname" label="  鑽搧鍚嶇О " align="center" />
+      <el-table-column prop="opendate" label="  寮�鏂规棩鏈� " align="center" />
+      <el-table-column prop="drugtype" label="  鑽搧绫诲瀷 " align="center" />
+      <el-table-column prop="unit" label="  鍗曚綅 " align="center" />
+      <el-table-column prop="spec" label="  瑙勬牸 " align="center" />
+      <el-table-column prop="drugusage" label="  鐢ㄦ硶 " align="center" />
+      <el-table-column prop="dose" label="  鍓傞噺 " align="center" />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column prop="drugid" label="  鑽搧ID " align="center" />
+      <el-table-column prop="visittype" label="  灏辫瘖绫诲瀷 " align="center" />
+      <el-table-column prop="visitid" label="  灏辫瘖ID " align="center" />
+      <el-table-column
+        prop="schemestatus"
+        label="  鏄惁鐢熸垚鏂规鐘舵��"
+        align="center"
+      />
+      <el-table-column
+        prop="schemetime"
+        label="  鏂规鐘舵�佹搷浣滄椂闂� "
+        align="center"
+      />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+  </div>
 </template>
-	<script>
-	import { listpat_med_drug, getpat_med_drug, delpat_med_drug, addpat_med_drug, updatepat_med_drug } from "@/api/smartor3/pat_med_drug";
-	export default {
-		name: "dw_list_pat_med_drug",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_med_drug(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.id)
-			  this.$parent.id = row.id
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_med_drug,
+  getpat_med_drug,
+  delpat_med_drug,
+  addpat_med_drug,
+  updatepat_med_drug,
+} from "@/api/smartor3/pat_med_drug";
+export default {
+  name: "dw_list_pat_med_drug",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_med_drug(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.id)
+      this.$parent.id = row.id;
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_hypertension.vue b/src/comp/smartor3/dwo/dw_list_pat_med_hypertension.vue
index 40863bd..8ebd3f6 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_hypertension.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_hypertension.vue
@@ -1,125 +1,174 @@
 <template>
-      <div>
-            <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="id" label="  鑷ID " align="center"/>
-                  <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center"/>
-                  <el-table-column prop="recordtime" label="  璁板綍鏃堕棿 " align="center"/>
-                  <el-table-column prop="typename" label="  鏁版嵁绫诲瀷 " align="center"/>
-                  <el-table-column prop="systolicpressure" label="  鏀剁缉鍘� " align="center"/>
-                  <el-table-column prop="diastolicpressure" label="  鑸掑紶鍘� " align="center"/>
-                  <el-table-column prop="sourcename" label="  鏁版嵁鏉ユ簮 " align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="patid" label="  妗fID " align="center"/>
-                  <el-table-column prop="heartrate" label="  蹇冪巼" align="center"/>
-                  <el-table-column prop="visittype" label="  灏辫瘖绫诲瀷" align="center"/>
-                  <el-table-column prop="visitid" label="  灏辫瘖ID" align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="id" label="  鑷ID " align="center" />
+      <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center" />
+      <el-table-column prop="recordtime" label="  璁板綍鏃堕棿 " align="center" />
+      <el-table-column prop="typename" label="  鏁版嵁绫诲瀷 " align="center" />
+      <el-table-column
+        prop="systolicpressure"
+        label="  鏀剁缉鍘� "
+        align="center"
+      />
+      <el-table-column
+        prop="diastolicpressure"
+        label="  鑸掑紶鍘� "
+        align="center"
+      />
+      <el-table-column prop="sourcename" label="  鏁版嵁鏉ユ簮 " align="center" />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column prop="patid" label="  妗fID " align="center" />
+      <el-table-column prop="heartrate" label="  蹇冪巼" align="center" />
+      <el-table-column prop="visittype" label="  灏辫瘖绫诲瀷" align="center" />
+      <el-table-column prop="visitid" label="  灏辫瘖ID" align="center" />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+  </div>
 </template>
-	<script>
-	import { listpat_med_hypertension, getpat_med_hypertension, delpat_med_hypertension, addpat_med_hypertension, updatepat_med_hypertension } from "@/api/smartor3/pat_med_hypertension";
-	export default {
-		name: "dw_list_pat_med_hypertension",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_med_hypertension(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.id)
-			  this.$parent.id = row.id
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_med_hypertension,
+  getpat_med_hypertension,
+  delpat_med_hypertension,
+  addpat_med_hypertension,
+  updatepat_med_hypertension,
+} from "@/api/smartor3/pat_med_hypertension";
+export default {
+  name: "dw_list_pat_med_hypertension",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_med_hypertension(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.id)
+      this.$parent.id = row.id;
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_inhosp.vue b/src/comp/smartor3/dwo/dw_list_pat_med_inhosp.vue
index 5173774..1f633b9 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_inhosp.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_inhosp.vue
@@ -1,144 +1,245 @@
 <template>
-      <div>
-            <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="inhospid" label="  鑷ID " align="center"/>
-                  <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center"/>
-                  <el-table-column prop="hospitalname" label="  鍖婚櫌鍚嶇О " align="center"/>
-                  <el-table-column prop="hospitalcode" label="  鍖婚櫌缂栧彿 " align="center"/>
-                  <el-table-column prop="hospitaldistrictcode" label="  闄㈠尯缂栧彿 " align="center"/>
-                  <el-table-column prop="hospitaldistrictname" label="  闄㈠尯鍚嶇О " align="center"/>
-                  <el-table-column prop="icd10code" label="  鍏ラ櫌璇婃柇ICD鍊� " align="center"/>
-                  <el-table-column prop="diagname" label="  鍏ラ櫌璇婃柇鍚嶇О " align="center"/>
-                  <el-table-column prop="starttime" label="  鍏ラ櫌鏃堕棿 " align="center"/>
-                  <el-table-column prop="endtime" label="  鍑洪櫌鏃堕棿 " align="center"/>
-                  <el-table-column prop="deptcode" label="  鍏ラ櫌绉戝浠g爜 " align="center"/>
-                  <el-table-column prop="deptname" label="  鍏ラ櫌绉戝鍚嶇О " align="center"/>
-                  <el-table-column prop="roomno" label="  鎴块棿鍙� " align="center"/>
-                  <el-table-column prop="bedno" label="  搴婁綅鍙� " align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="patid" label="  妗fID " align="center"/>
-                  <el-table-column prop="leavediagname" label="  鍑洪櫌璇婃柇 " align="center"/>
-                  <el-table-column prop="leaveicd10code" label="  鍑洪櫌璇婃柇ICD鍊� " align="center"/>
-                  <el-table-column prop="drcode" label="  鍖荤敓宸ュ彿 " align="center"/>
-                  <el-table-column prop="drname" label="  鍖荤敓鍚嶇О " align="center"/>
-                  <el-table-column prop="schemestatus" label="  鏄惁鐢熸垚鏂规鐘舵��" align="center"/>
-                  <el-table-column prop="generalschemestatus" label="  鏄惁鐢熸垚閫氱敤鏂规鐘舵��" align="center"/>
-                  <el-table-column prop="leaveldeptcode" label="  鍑洪櫌绉戝浠g爜 " align="center"/>
-                  <el-table-column prop="leaveldeptname" label="  鍑洪櫌绉戝浠g爜 " align="center"/>
-                  <el-table-column prop="hospitaldistrictid" label="  鐥呭尯ID " align="center"/>
-                  <el-table-column prop="leavehospitaldistrictcode" label="  鍑洪櫌鐥呭尯缂栧彿 " align="center"/>
-                  <el-table-column prop="leavehospitaldistrictname" label="  鍑洪櫌鐥呭尯鍚嶇О " align="center"/>
-                  <el-table-column prop="leavehospitaldistrictid" label="  鍑洪櫌鐥呭尯ID " align="center"/>
-                  <el-table-column prop="deptid" label="  鍏ラ櫌绉戝ID " align="center"/>
-                  <el-table-column prop="leaveldeptid" label="  鍑洪櫌绉戝ID " align="center"/>
-                  <el-table-column prop="schemetime" label="  鏂规鐘舵�佹搷浣滄椂闂� " align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="inhospid" label="  鑷ID " align="center" />
+      <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center" />
+      <el-table-column prop="hospitalname" label="  鍖婚櫌鍚嶇О " align="center" />
+      <el-table-column prop="hospitalcode" label="  鍖婚櫌缂栧彿 " align="center" />
+      <el-table-column
+        prop="hospitaldistrictcode"
+        label="  闄㈠尯缂栧彿 "
+        align="center"
+      />
+      <el-table-column
+        prop="hospitaldistrictname"
+        label="  闄㈠尯鍚嶇О "
+        align="center"
+      />
+      <el-table-column
+        prop="icd10code"
+        label="  鍏ラ櫌璇婃柇ICD鍊� "
+        align="center"
+      />
+      <el-table-column prop="diagname" label="  鍏ラ櫌璇婃柇鍚嶇О " align="center" />
+      <el-table-column prop="starttime" label="  鍏ラ櫌鏃堕棿 " align="center" />
+      <el-table-column prop="endtime" label="  鍑洪櫌鏃堕棿 " align="center" />
+      <el-table-column prop="deptcode" label="  鍏ラ櫌绉戝浠g爜 " align="center" />
+      <el-table-column prop="deptname" label="  鍏ラ櫌绉戝鍚嶇О " align="center" />
+      <el-table-column prop="roomno" label="  鎴块棿鍙� " align="center" />
+      <el-table-column prop="bedno" label="  搴婁綅鍙� " align="center" />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column prop="patid" label="  妗fID " align="center" />
+      <el-table-column
+        prop="leavediagname"
+        label="  鍑洪櫌璇婃柇 "
+        align="center"
+      />
+      <el-table-column
+        prop="leaveicd10code"
+        label="  鍑洪櫌璇婃柇ICD鍊� "
+        align="center"
+      />
+      <el-table-column prop="drcode" label="  鍖荤敓宸ュ彿 " align="center" />
+      <el-table-column prop="drname" label="  鍖荤敓鍚嶇О " align="center" />
+      <el-table-column
+        prop="schemestatus"
+        label="  鏄惁鐢熸垚鏂规鐘舵��"
+        align="center"
+      />
+      <el-table-column
+        prop="generalschemestatus"
+        label="  鏄惁鐢熸垚閫氱敤鏂规鐘舵��"
+        align="center"
+      />
+      <el-table-column
+        prop="leaveldeptcode"
+        label="  鍑洪櫌绉戝浠g爜 "
+        align="center"
+      />
+      <el-table-column
+        prop="leaveldeptname"
+        label="  鍑洪櫌绉戝浠g爜 "
+        align="center"
+      />
+      <el-table-column
+        prop="hospitaldistrictid"
+        label="  鐥呭尯ID "
+        align="center"
+      />
+      <el-table-column
+        prop="leavehospitaldistrictcode"
+        label="  鍑洪櫌鐥呭尯缂栧彿 "
+        align="center"
+      />
+      <el-table-column
+        prop="leavehospitaldistrictname"
+        label="  鍑洪櫌鐥呭尯鍚嶇О "
+        align="center"
+      />
+      <el-table-column
+        prop="leavehospitaldistrictid"
+        label="  鍑洪櫌鐥呭尯ID "
+        align="center"
+      />
+      <el-table-column prop="deptid" label="  鍏ラ櫌绉戝ID " align="center" />
+      <el-table-column
+        prop="leaveldeptid"
+        label="  鍑洪櫌绉戝ID "
+        align="center"
+      />
+      <el-table-column
+        prop="schemetime"
+        label="  鏂规鐘舵�佹搷浣滄椂闂� "
+        align="center"
+      />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+  </div>
 </template>
-	<script>
-	import { listpat_med_inhosp, getpat_med_inhosp, delpat_med_inhosp, addpat_med_inhosp, updatepat_med_inhosp } from "@/api/smartor3/pat_med_inhosp";
-	export default {
-		name: "dw_list_pat_med_inhosp",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_med_inhosp(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.inhospid)
-			  this.$parent.inhospid = row.inhospid
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_med_inhosp,
+  getpat_med_inhosp,
+  delpat_med_inhosp,
+  addpat_med_inhosp,
+  updatepat_med_inhosp,
+} from "@/api/smartor3/pat_med_inhosp";
+export default {
+  name: "dw_list_pat_med_inhosp",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_med_inhosp(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.inhospid)
+      this.$parent.inhospid = row.inhospid;
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_inspection.vue b/src/comp/smartor3/dwo/dw_list_pat_med_inspection.vue
index 68876af..855c3f0 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_inspection.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_inspection.vue
@@ -1,134 +1,191 @@
 <template>
-      <div>
-            <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="id" label="  鑷ID " align="center"/>
-                  <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center"/>
-                  <el-table-column prop="patid" label="  妗fID " align="center"/>
-                  <el-table-column prop="projecttype" label="  绫诲瀷" align="center"/>
-                  <el-table-column prop="projectcode" label="  椤圭洰缂栧彿 " align="center"/>
-                  <el-table-column prop="projectname" label="  椤圭洰鍚嶇О " align="center"/>
-                  <el-table-column prop="reporttime" label="  鎶ュ憡鏃堕棿 " align="center"/>
-                  <el-table-column prop="hospitalname" label="  鍖婚櫌鍚嶇О " align="center"/>
-                  <el-table-column prop="hospitalcode" label="  鍖婚櫌缂栧彿 " align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="projectid" label="  椤圭洰ID " align="center"/>
-                  <el-table-column prop="applicationtime" label="  鐢宠鏃堕棿 " align="center"/>
-                  <el-table-column prop="visittype" label="  灏辫瘖绫诲瀷 " align="center"/>
-                  <el-table-column prop="visitid" label="  灏辫瘖ID " align="center"/>
-                  <el-table-column prop="schemestatus" label="  鏄惁鐢熸垚鏂规鐘舵��" align="center"/>
-                  <el-table-column prop="isabnormal" label="  鏄惁寮傚父" align="center"/>
-                  <el-table-column prop="reportconclusion" label="  鎶ュ憡缁撹 " align="center"/>
-                  <el-table-column prop="schemetime" label="  鏂规鐘舵�佹搷浣滄椂闂� " align="center"/>
-                  <el-table-column prop="deptcode" label="  寮�鍗曠瀹や唬鐮� " align="center"/>
-                  <el-table-column prop="deptname" label="  寮�鍗曠瀹ゅ悕绉� " align="center"/>
-                  <el-table-column prop="deptid" label="  寮�鍗曠瀹D " align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="id" label="  鑷ID " align="center" />
+      <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center" />
+      <el-table-column prop="patid" label="  妗fID " align="center" />
+      <el-table-column prop="projecttype" label="  绫诲瀷" align="center" />
+      <el-table-column prop="projectcode" label="  椤圭洰缂栧彿 " align="center" />
+      <el-table-column prop="projectname" label="  椤圭洰鍚嶇О " align="center" />
+      <el-table-column prop="reporttime" label="  鎶ュ憡鏃堕棿 " align="center" />
+      <el-table-column prop="hospitalname" label="  鍖婚櫌鍚嶇О " align="center" />
+      <el-table-column prop="hospitalcode" label="  鍖婚櫌缂栧彿 " align="center" />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column prop="projectid" label="  椤圭洰ID " align="center" />
+      <el-table-column
+        prop="applicationtime"
+        label="  鐢宠鏃堕棿 "
+        align="center"
+      />
+      <el-table-column prop="visittype" label="  灏辫瘖绫诲瀷 " align="center" />
+      <el-table-column prop="visitid" label="  灏辫瘖ID " align="center" />
+      <el-table-column
+        prop="schemestatus"
+        label="  鏄惁鐢熸垚鏂规鐘舵��"
+        align="center"
+      />
+      <el-table-column prop="isabnormal" label="  鏄惁寮傚父" align="center" />
+      <el-table-column
+        prop="reportconclusion"
+        label="  鎶ュ憡缁撹 "
+        align="center"
+      />
+      <el-table-column
+        prop="schemetime"
+        label="  鏂规鐘舵�佹搷浣滄椂闂� "
+        align="center"
+      />
+      <el-table-column prop="deptcode" label="  寮�鍗曠瀹や唬鐮� " align="center" />
+      <el-table-column prop="deptname" label="  寮�鍗曠瀹ゅ悕绉� " align="center" />
+      <el-table-column prop="deptid" label="  寮�鍗曠瀹D " align="center" />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+  </div>
 </template>
-	<script>
-	import { listpat_med_inspection, getpat_med_inspection, delpat_med_inspection, addpat_med_inspection, updatepat_med_inspection } from "@/api/smartor3/pat_med_inspection";
-	export default {
-		name: "dw_list_pat_med_inspection",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_med_inspection(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.id)
-			  this.$parent.id = row.id
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_med_inspection,
+  getpat_med_inspection,
+  delpat_med_inspection,
+  addpat_med_inspection,
+  updatepat_med_inspection,
+} from "@/api/smartor3/pat_med_inspection";
+export default {
+  name: "dw_list_pat_med_inspection",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_med_inspection(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.id)
+      this.$parent.id = row.id;
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_inspection_item.vue b/src/comp/smartor3/dwo/dw_list_pat_med_inspection_item.vue
index e3d6be7..ede9b32 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_inspection_item.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_inspection_item.vue
@@ -1,123 +1,168 @@
 <template>
-      <div>
-            <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="id" label="  鑷ID " align="center"/>
-                  <el-table-column prop="inspectionid" label="  瀵瑰簲璁板綍琛� " align="center"/>
-                  <el-table-column prop="relationid" label="  鐩稿簲ID " align="center"/>
-                  <el-table-column prop="relationcode" label="  鐩稿簲缂栧彿 " align="center"/>
-                  <el-table-column prop="relationname" label="  鐩稿簲鍚嶇О " align="center"/>
-                  <el-table-column prop="value" label="  缁撴灉鍊�/缁撹 " align="center"/>
-                  <el-table-column prop="isabnormal" label="  鏄惁寮傚父" align="center"/>
-                  <el-table-column prop="unit" label="  鍗曚綅 " align="center"/>
-                  <el-table-column prop="consult" label="  鍙傝�� " align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="id" label="  鑷ID " align="center" />
+      <el-table-column
+        prop="inspectionid"
+        label="  瀵瑰簲璁板綍琛� "
+        align="center"
+      />
+      <el-table-column prop="relationid" label="  鐩稿簲ID " align="center" />
+      <el-table-column prop="relationcode" label="  鐩稿簲缂栧彿 " align="center" />
+      <el-table-column prop="relationname" label="  鐩稿簲鍚嶇О " align="center" />
+      <el-table-column prop="value" label="  缁撴灉鍊�/缁撹 " align="center" />
+      <el-table-column prop="isabnormal" label="  鏄惁寮傚父" align="center" />
+      <el-table-column prop="unit" label="  鍗曚綅 " align="center" />
+      <el-table-column prop="consult" label="  鍙傝�� " align="center" />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+  </div>
 </template>
-	<script>
-	import { listpat_med_inspection_item, getpat_med_inspection_item, delpat_med_inspection_item, addpat_med_inspection_item, updatepat_med_inspection_item } from "@/api/smartor3/pat_med_inspection_item";
-	export default {
-		name: "dw_list_pat_med_inspection_item",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_med_inspection_item(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.id)
-			  this.$parent.id = row.id
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_med_inspection_item,
+  getpat_med_inspection_item,
+  delpat_med_inspection_item,
+  addpat_med_inspection_item,
+  updatepat_med_inspection_item,
+} from "@/api/smartor3/pat_med_inspection_item";
+export default {
+  name: "dw_list_pat_med_inspection_item",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_med_inspection_item(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.id)
+      this.$parent.id = row.id;
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_operation.vue b/src/comp/smartor3/dwo/dw_list_pat_med_operation.vue
index aa09738..b0b5bb9 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_operation.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_operation.vue
@@ -1,126 +1,187 @@
 <template>
-      <div>
-            <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="id" label="  鑷ID " align="center"/>
-                  <el-table-column prop="serialnum" label="  灏辫瘖娴佹按鍙� " align="center"/>
-                  <el-table-column prop="patid" label="  妗fID " align="center"/>
-                  <el-table-column prop="operationname" label="  鎵嬫湳鍚嶇О " align="center"/>
-                  <el-table-column prop="operationcode" label="  鎵嬫湳浠g爜 " align="center"/>
-                  <el-table-column prop="operationid" label="  鎵嬫湳ID " align="center"/>
-                  <el-table-column prop="operationtime" label="  鎵嬫湳鏃堕棿 " align="center"/>
-                  <el-table-column prop="visitid" label="  灏辫瘖ID " align="center"/>
-                  <el-table-column prop="visittype" label="  灏辫瘖绫诲瀷" align="center"/>
-                  <el-table-column prop="status" label="  鎵嬫湳鐘舵��" align="center"/>
-                  <el-table-column prop="schemetime" label="  鏂规鐘舵�佹搷浣滄椂闂� " align="center"/>
-                  <el-table-column prop="schemestatus" label="  鏄惁鐢熸垚璁″垝" align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="id" label="  鑷ID " align="center" />
+      <el-table-column prop="serialnum" label="  灏辫瘖娴佹按鍙� " align="center" />
+      <el-table-column prop="patid" label="  妗fID " align="center" />
+      <el-table-column
+        prop="operationname"
+        label="  鎵嬫湳鍚嶇О "
+        align="center"
+      />
+      <el-table-column
+        prop="operationcode"
+        label="  鎵嬫湳浠g爜 "
+        align="center"
+      />
+      <el-table-column prop="operationid" label="  鎵嬫湳ID " align="center" />
+      <el-table-column
+        prop="operationtime"
+        label="  鎵嬫湳鏃堕棿 "
+        align="center"
+      />
+      <el-table-column prop="visitid" label="  灏辫瘖ID " align="center" />
+      <el-table-column prop="visittype" label="  灏辫瘖绫诲瀷" align="center" />
+      <el-table-column prop="status" label="  鎵嬫湳鐘舵��" align="center" />
+      <el-table-column
+        prop="schemetime"
+        label="  鏂规鐘舵�佹搷浣滄椂闂� "
+        align="center"
+      />
+      <el-table-column
+        prop="schemestatus"
+        label="  鏄惁鐢熸垚璁″垝"
+        align="center"
+      />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+  </div>
 </template>
-	<script>
-	import { listpat_med_operation, getpat_med_operation, delpat_med_operation, addpat_med_operation, updatepat_med_operation } from "@/api/smartor3/pat_med_operation";
-	export default {
-		name: "dw_list_pat_med_operation",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_med_operation(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.id)
-			  this.$parent.id = row.id
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_med_operation,
+  getpat_med_operation,
+  delpat_med_operation,
+  addpat_med_operation,
+  updatepat_med_operation,
+} from "@/api/smartor3/pat_med_operation";
+export default {
+  name: "dw_list_pat_med_operation",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_med_operation(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.id)
+      this.$parent.id = row.id;
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_outhosp.vue b/src/comp/smartor3/dwo/dw_list_pat_med_outhosp.vue
index 79ef346..e445cf7 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_outhosp.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_outhosp.vue
@@ -1,131 +1,180 @@
 <template>
-      <div>
-            <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="id" label="  鑷ID " align="center"/>
-                  <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center"/>
-                  <el-table-column prop="patid" label="  妗fID " align="center"/>
-                  <el-table-column prop="hospitalname" label="  鍖婚櫌鍚嶇О " align="center"/>
-                  <el-table-column prop="hospitalcode" label="  鍖婚櫌缂栧彿 " align="center"/>
-                  <el-table-column prop="icd10code" label="  璇婃柇ICD鍊� " align="center"/>
-                  <el-table-column prop="diagname" label="  璇婃柇鍚嶇О " align="center"/>
-                  <el-table-column prop="deptcode" label="  绉戝浠g爜 " align="center"/>
-                  <el-table-column prop="deptname" label="  绉戝鍚嶇О " align="center"/>
-                  <el-table-column prop="drcode" label="  鍖荤敓宸ュ彿 " align="center"/>
-                  <el-table-column prop="drname" label="  鍖荤敓鍚嶇О " align="center"/>
-                  <el-table-column prop="admitdate" label="  灏辫瘖鏃ユ湡 " align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="schemestatus" label="  鏄惁鐢熸垚鏂规鐘舵��" align="center"/>
-                  <el-table-column prop="deptid" label="  绉戝ID " align="center"/>
-                  <el-table-column prop="schemetime" label="  鏂规鐘舵�佹搷浣滄椂闂� " align="center"/>
-                  <el-table-column prop="hpi" label="  鐜扮梾鍙� " align="center"/>
-                  <el-table-column prop="mainsuit" label="  涓昏堪 " align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="id" label="  鑷ID " align="center" />
+      <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center" />
+      <el-table-column prop="patid" label="  妗fID " align="center" />
+      <el-table-column prop="hospitalname" label="  鍖婚櫌鍚嶇О " align="center" />
+      <el-table-column prop="hospitalcode" label="  鍖婚櫌缂栧彿 " align="center" />
+      <el-table-column prop="icd10code" label="  璇婃柇ICD鍊� " align="center" />
+      <el-table-column prop="diagname" label="  璇婃柇鍚嶇О " align="center" />
+      <el-table-column prop="deptcode" label="  绉戝浠g爜 " align="center" />
+      <el-table-column prop="deptname" label="  绉戝鍚嶇О " align="center" />
+      <el-table-column prop="drcode" label="  鍖荤敓宸ュ彿 " align="center" />
+      <el-table-column prop="drname" label="  鍖荤敓鍚嶇О " align="center" />
+      <el-table-column prop="admitdate" label="  灏辫瘖鏃ユ湡 " align="center" />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column
+        prop="schemestatus"
+        label="  鏄惁鐢熸垚鏂规鐘舵��"
+        align="center"
+      />
+      <el-table-column prop="deptid" label="  绉戝ID " align="center" />
+      <el-table-column
+        prop="schemetime"
+        label="  鏂规鐘舵�佹搷浣滄椂闂� "
+        align="center"
+      />
+      <el-table-column prop="hpi" label="  鐜扮梾鍙� " align="center" />
+      <el-table-column prop="mainsuit" label="  涓昏堪 " align="center" />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+  </div>
 </template>
-	<script>
-	import { listpat_med_outhosp, getpat_med_outhosp, delpat_med_outhosp, addpat_med_outhosp, updatepat_med_outhosp } from "@/api/smartor3/pat_med_outhosp";
-	export default {
-		name: "dw_list_pat_med_outhosp",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_med_outhosp(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.id)
-			  this.$parent.id = row.id
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_med_outhosp,
+  getpat_med_outhosp,
+  delpat_med_outhosp,
+  addpat_med_outhosp,
+  updatepat_med_outhosp,
+} from "@/api/smartor3/pat_med_outhosp";
+export default {
+  name: "dw_list_pat_med_outhosp",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_med_outhosp(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.id)
+      this.$parent.id = row.id;
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_physical.vue b/src/comp/smartor3/dwo/dw_list_pat_med_physical.vue
index d617cbb..a49880c 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_physical.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_physical.vue
@@ -1,132 +1,201 @@
 <template>
-      <div>
-            <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="id" label="  鑷ID " align="center"/>
-                  <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center"/>
-                  <el-table-column prop="patid" label="  妗fID " align="center"/>
-                  <el-table-column prop="drcode" label="  鎬荤粨鍖荤敓宸ュ彿 " align="center"/>
-                  <el-table-column prop="drname" label="  鎬荤粨鍖荤敓鍚嶇О " align="center"/>
-                  <el-table-column prop="hospitalcode" label="  浣撴鍗曚綅/鍖婚櫌缂栧彿 " align="center"/>
-                  <el-table-column prop="hospitalname" label="  浣撴鍗曚綅/鍖婚櫌 " align="center"/>
-                  <el-table-column prop="physicaldate" label="  浣撴鏃堕棿 " align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="deptcode" label="  绉戝浠g爜 " align="center"/>
-                  <el-table-column prop="deptname" label="  绉戝鍚嶇О " align="center"/>
-                  <el-table-column prop="projectname" label="  浣撴椤圭洰鍚嶇О " align="center"/>
-                  <el-table-column prop="projectcode" label="  浣撴椤圭洰缂栫爜 " align="center"/>
-                  <el-table-column prop="state" label="  鐘舵��" align="center"/>
-                  <el-table-column prop="schemestatus" label="  鏄惁鐢熸垚鏂规鐘舵��" align="center"/>
-                  <el-table-column prop="generalschemestatus" label="  鏄惁鐢熸垚閫氱敤鏂规鐘舵��" align="center"/>
-                  <el-table-column prop="deptid" label="  绉戝ID " align="center"/>
-                  <el-table-column prop="projectid" label="  浣撴濂楅ID " align="center"/>
-                  <el-table-column prop="schemetime" label="  鏂规鐘舵�佹搷浣滄椂闂� " align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="id" label="  鑷ID " align="center" />
+      <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center" />
+      <el-table-column prop="patid" label="  妗fID " align="center" />
+      <el-table-column prop="drcode" label="  鎬荤粨鍖荤敓宸ュ彿 " align="center" />
+      <el-table-column prop="drname" label="  鎬荤粨鍖荤敓鍚嶇О " align="center" />
+      <el-table-column
+        prop="hospitalcode"
+        label="  浣撴鍗曚綅/鍖婚櫌缂栧彿 "
+        align="center"
+      />
+      <el-table-column
+        prop="hospitalname"
+        label="  浣撴鍗曚綅/鍖婚櫌 "
+        align="center"
+      />
+      <el-table-column prop="physicaldate" label="  浣撴鏃堕棿 " align="center" />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column prop="deptcode" label="  绉戝浠g爜 " align="center" />
+      <el-table-column prop="deptname" label="  绉戝鍚嶇О " align="center" />
+      <el-table-column
+        prop="projectname"
+        label="  浣撴椤圭洰鍚嶇О "
+        align="center"
+      />
+      <el-table-column
+        prop="projectcode"
+        label="  浣撴椤圭洰缂栫爜 "
+        align="center"
+      />
+      <el-table-column prop="state" label="  鐘舵��" align="center" />
+      <el-table-column
+        prop="schemestatus"
+        label="  鏄惁鐢熸垚鏂规鐘舵��"
+        align="center"
+      />
+      <el-table-column
+        prop="generalschemestatus"
+        label="  鏄惁鐢熸垚閫氱敤鏂规鐘舵��"
+        align="center"
+      />
+      <el-table-column prop="deptid" label="  绉戝ID " align="center" />
+      <el-table-column prop="projectid" label="  浣撴濂楅ID " align="center" />
+      <el-table-column
+        prop="schemetime"
+        label="  鏂规鐘舵�佹搷浣滄椂闂� "
+        align="center"
+      />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+  </div>
 </template>
-	<script>
-	import { listpat_med_physical, getpat_med_physical, delpat_med_physical, addpat_med_physical, updatepat_med_physical } from "@/api/smartor3/pat_med_physical";
-	export default {
-		name: "dw_list_pat_med_physical",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_med_physical(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.id)
-			  this.$parent.id = row.id
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_med_physical,
+  getpat_med_physical,
+  delpat_med_physical,
+  addpat_med_physical,
+  updatepat_med_physical,
+} from "@/api/smartor3/pat_med_physical";
+export default {
+  name: "dw_list_pat_med_physical",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_med_physical(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.id)
+      this.$parent.id = row.id;
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_registration.vue b/src/comp/smartor3/dwo/dw_list_pat_med_registration.vue
index 8217485..14ecefc 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_registration.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_registration.vue
@@ -1,128 +1,189 @@
 <template>
-      <div>
-            <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="registid" label="  鑷ID " align="center"/>
-                  <el-table-column prop="serialnum" label="  娴佹按琛� " align="center"/>
-                  <el-table-column prop="patid" label="  妗fID " align="center"/>
-                  <el-table-column prop="hospitalname" label="  鍖婚櫌鍚嶇О " align="center"/>
-                  <el-table-column prop="hospitalcode" label="  鍖婚櫌缂栧彿 " align="center"/>
-                  <el-table-column prop="deptcode" label="  绉戝浠g爜 " align="center"/>
-                  <el-table-column prop="deptname" label="  绉戝鍚嶇О " align="center"/>
-                  <el-table-column prop="deptid" label="  绉戝ID " align="center"/>
-                  <el-table-column prop="state" label="  棰勭害鐘舵��" align="center"/>
-                  <el-table-column prop="appointmenttime" label="  棰勭害鏃堕棿 " align="center"/>
-                  <el-table-column prop="appointmenttimetype" label="  棰勭害鐝埆" align="center"/>
-                  <el-table-column prop="appointmentcode" label="  棰勭害鍙锋簮 " align="center"/>
-                  <el-table-column prop="appointmentbegintime" label="  棰勭害鏃舵寮�濮嬫椂闂� " align="center"/>
-                  <el-table-column prop="appointmentendtime" label="  棰勭害鏃舵缁撴潫鏃堕棿 " align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="registid" label="  鑷ID " align="center" />
+      <el-table-column prop="serialnum" label="  娴佹按琛� " align="center" />
+      <el-table-column prop="patid" label="  妗fID " align="center" />
+      <el-table-column prop="hospitalname" label="  鍖婚櫌鍚嶇О " align="center" />
+      <el-table-column prop="hospitalcode" label="  鍖婚櫌缂栧彿 " align="center" />
+      <el-table-column prop="deptcode" label="  绉戝浠g爜 " align="center" />
+      <el-table-column prop="deptname" label="  绉戝鍚嶇О " align="center" />
+      <el-table-column prop="deptid" label="  绉戝ID " align="center" />
+      <el-table-column prop="state" label="  棰勭害鐘舵��" align="center" />
+      <el-table-column
+        prop="appointmenttime"
+        label="  棰勭害鏃堕棿 "
+        align="center"
+      />
+      <el-table-column
+        prop="appointmenttimetype"
+        label="  棰勭害鐝埆"
+        align="center"
+      />
+      <el-table-column
+        prop="appointmentcode"
+        label="  棰勭害鍙锋簮 "
+        align="center"
+      />
+      <el-table-column
+        prop="appointmentbegintime"
+        label="  棰勭害鏃舵寮�濮嬫椂闂� "
+        align="center"
+      />
+      <el-table-column
+        prop="appointmentendtime"
+        label="  棰勭害鏃舵缁撴潫鏃堕棿 "
+        align="center"
+      />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+  </div>
 </template>
-	<script>
-	import { listpat_med_registration, getpat_med_registration, delpat_med_registration, addpat_med_registration, updatepat_med_registration } from "@/api/smartor3/pat_med_registration";
-	export default {
-		name: "dw_list_pat_med_registration",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_med_registration(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.registid)
-			  this.$parent.registid = row.registid
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_med_registration,
+  getpat_med_registration,
+  delpat_med_registration,
+  addpat_med_registration,
+  updatepat_med_registration,
+} from "@/api/smartor3/pat_med_registration";
+export default {
+  name: "dw_list_pat_med_registration",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_med_registration(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.registid)
+      this.$parent.registid = row.registid;
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_list_pat_med_weight.vue b/src/comp/smartor3/dwo/dw_list_pat_med_weight.vue
index 60ff57f..3c66587 100644
--- a/src/comp/smartor3/dwo/dw_list_pat_med_weight.vue
+++ b/src/comp/smartor3/dwo/dw_list_pat_med_weight.vue
@@ -1,123 +1,164 @@
 <template>
-      <div>
-            <el-row :gutter="10" class="mb8">
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-plus" v-hasPermi="['smartor:patinhosp:add']" type="primary" @click="handleAdd">鏂板</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-edit" :disabled="single" v-hasPermi="['smartor:patinhosp:edit']" type="success" @click="handleUpdate">淇敼</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-delete" :disabled="multiple" v-hasPermi="['smartor:patinhosp:remove']" type="danger" @click="handleDelete">鍒犻櫎</el-button>
-                  </el-col>
-                  <el-col :span="1.5">
-                        <el-button size="mini" plain="true" icon="el-icon-download" v-hasPermi="['smartor:patinhosp:export']" type="warning" @click="handleExport">瀵煎嚭</el-button>
-                  </el-col>
-                  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-            </el-row>
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" @row-click="rowChanged">
-                  <el-table-column width="50" type="selection" align="center"/>
-                  <el-table-column prop="id" label="  鑷ID " align="center"/>
-                  <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center"/>
-                  <el-table-column prop="fatweight" label="  鑴傝偑閲嶉噺 " align="center"/>
-                  <el-table-column prop="bodyweight" label="  浣撻噸 " align="center"/>
-                  <el-table-column prop="recordtime" label="  璁板綍鏃堕棿 " align="center"/>
-                  <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center"/>
-                  <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center"/>
-                  <el-table-column prop="update_by" label="  鏇存柊浜� " align="center"/>
-                  <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center"/>
-                  <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center"/>
-                  <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center"/>
-                  <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center"/>
-                  <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center"/>
-                  <el-table-column prop="patid" label="  妗fID " align="center"/>
-                  <el-table-column prop="sourcename" label="  鏁版嵁鏉ユ簮 " align="center"/>
-                  <el-table-column prop="visittype" label="  灏辫瘖绫诲瀷" align="center"/>
-                  <el-table-column prop="visitid" label="  灏辫瘖" align="center"/>
-                  <el-table-column prop="pid" label=" 鐖禝D" align="center"/>
-                  <el-table-column prop="guid" label=" GUID" align="center"/>
-            </el-table>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-plus"
+          v-hasPermi="['smartor:patinhosp:add']"
+          type="primary"
+          @click="handleAdd"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-edit"
+          :disabled="single"
+          v-hasPermi="['smartor:patinhosp:edit']"
+          type="success"
+          @click="handleUpdate"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-delete"
+          :disabled="multiple"
+          v-hasPermi="['smartor:patinhosp:remove']"
+          type="danger"
+          @click="handleDelete"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          size="mini"
+          plain="true"
+          icon="el-icon-download"
+          v-hasPermi="['smartor:patinhosp:export']"
+          type="warning"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      @row-click="rowChanged"
+    >
+      <el-table-column width="50" type="selection" align="center" />
+      <el-table-column prop="id" label="  鑷ID " align="center" />
+      <el-table-column prop="serialnum" label="  娴佹按鍙� " align="center" />
+      <el-table-column prop="fatweight" label="  鑴傝偑閲嶉噺 " align="center" />
+      <el-table-column prop="bodyweight" label="  浣撻噸 " align="center" />
+      <el-table-column prop="recordtime" label="  璁板綍鏃堕棿 " align="center" />
+      <el-table-column prop="orgid" label="  鏈烘瀯ID " align="center" />
+      <el-table-column prop="del_flag" label="  鍒犻櫎鏍囪 " align="center" />
+      <el-table-column prop="update_by" label="  鏇存柊浜� " align="center" />
+      <el-table-column prop="update_time" label="  鏇存柊鏃堕棿 " align="center" />
+      <el-table-column prop="create_by" label="  鍒涘缓浜� " align="center" />
+      <el-table-column prop="create_time" label="  鍒涘缓鏃堕棿 " align="center" />
+      <el-table-column prop="isupload" label="  涓婁紶鏍囪 " align="center" />
+      <el-table-column prop="upload_time" label="  涓婁紶鏃堕棿 " align="center" />
+      <el-table-column prop="patid" label="  妗fID " align="center" />
+      <el-table-column prop="sourcename" label="  鏁版嵁鏉ユ簮 " align="center" />
+      <el-table-column prop="visittype" label="  灏辫瘖绫诲瀷" align="center" />
+      <el-table-column prop="visitid" label="  灏辫瘖" align="center" />
+      <el-table-column prop="pid" label=" 鐖禝D" align="center" />
+      <el-table-column prop="guid" label=" GUID" align="center" />
+    </el-table>
+  </div>
 </template>
-	<script>
-	import { listpat_med_weight, getpat_med_weight, delpat_med_weight, addpat_med_weight, updatepat_med_weight } from "@/api/smartor3/pat_med_weight";
-	export default {
-		name: "dw_list_pat_med_weight",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_med_weight(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.id)
-			  this.$parent.id = row.id
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_med_weight,
+  getpat_med_weight,
+  delpat_med_weight,
+  addpat_med_weight,
+  updatepat_med_weight,
+} from "@/api/smartor3/pat_med_weight";
+export default {
+  name: "dw_list_pat_med_weight",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_med_weight(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.id)
+      this.$parent.id = row.id;
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_maint_pat_archive.vue b/src/comp/smartor3/dwo/dw_maint_pat_archive.vue
index a5d1c8f..43edab2 100644
--- a/src/comp/smartor3/dwo/dw_maint_pat_archive.vue
+++ b/src/comp/smartor3/dwo/dw_maint_pat_archive.vue
@@ -1,124 +1,132 @@
 <template>
-      <div>
-            <el-dialog append-to-body="true" width="500px" :title="title" :visible.sync="open">
-                  <el-form :rules="rules" ref="form" :model="form" label-width="80px">
-                        <el-form-item prop="patid" label=" 鑷ID ">
-                              <el-input placeholder="璇疯緭鍏� 鑷ID " v-model="form.patid"/>
-                        </el-form-item>
-                        <el-form-item prop="name" label=" 濮撳悕 ">
-                              <el-input placeholder="璇疯緭鍏� 濮撳悕 " v-model="form.name"/>
-                        </el-form-item>
-                        <el-form-item prop="sex" label=" 鎬у埆   1:鐢�  2:濂�">
-                              <el-input placeholder="璇疯緭鍏� 鎬у埆   1:鐢�  2:濂�" v-model="form.sex"/>
-                        </el-form-item>
-                        <el-form-item prop="iccardno" label=" 璇佷欢鍙风爜 ">
-                              <el-input placeholder="璇疯緭鍏� 璇佷欢鍙风爜 " v-model="form.iccardno"/>
-                        </el-form-item>
-                        <el-form-item prop="birthdate" label=" 鐢熸棩 ">
-                              <el-input placeholder="璇疯緭鍏� 鐢熸棩 " v-model="form.birthdate"/>
-                        </el-form-item>
-                        <el-form-item prop="age" label=" 骞撮緞 ">
-                              <el-input placeholder="璇疯緭鍏� 骞撮緞 " v-model="form.age"/>
-                        </el-form-item>
-                        <el-form-item prop="source" label=" 鏉ユ簮 ">
-                              <el-input placeholder="璇疯緭鍏� 鏉ユ簮 " v-model="form.source"/>
-                        </el-form-item>
-                        <el-form-item prop="archivetime" label=" 寤烘。鏃堕棿 ">
-                              <el-input placeholder="璇疯緭鍏� 寤烘。鏃堕棿 " v-model="form.archivetime"/>
-                        </el-form-item>
-                        <el-form-item prop="archiveby" label=" 寤烘。浜� ">
-                              <el-input placeholder="璇疯緭鍏� 寤烘。浜� " v-model="form.archiveby"/>
-                        </el-form-item>
-                        <el-form-item prop="telcode" label=" 鎵嬫満鍙风爜 ">
-                              <el-input placeholder="璇疯緭鍏� 鎵嬫満鍙风爜 " v-model="form.telcode"/>
-                        </el-form-item>
-                        <el-form-item prop="relativetelcode" label=" 浜插睘鍙风爜 ">
-                              <el-input placeholder="璇疯緭鍏� 浜插睘鍙风爜 " v-model="form.relativetelcode"/>
-                        </el-form-item>
-                        <el-form-item prop="iccardtype" label=" 璇佷欢绫诲瀷 ">
-                              <el-input placeholder="璇疯緭鍏� 璇佷欢绫诲瀷 " v-model="form.iccardtype"/>
-                        </el-form-item>
-                        <el-form-item prop="orgid" label=" 鏈烘瀯ID ">
-                              <el-input placeholder="璇疯緭鍏� 鏈烘瀯ID " v-model="form.orgid"/>
-                        </el-form-item>
-                        <el-form-item prop="openid" label=" 寰俊openid ">
-                              <el-input placeholder="璇疯緭鍏� 寰俊openid " v-model="form.openid"/>
-                        </el-form-item>
-                        <el-form-item prop="del_flag" label=" 鍒犻櫎鏍囪 ">
-                              <el-input placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " v-model="form.del_flag"/>
-                        </el-form-item>
-                        <el-form-item prop="update_by" label=" 鏇存柊浜� ">
-                              <el-input placeholder="璇疯緭鍏� 鏇存柊浜� " v-model="form.update_by"/>
-                        </el-form-item>
-                        <el-form-item prop="update_time" label=" 鏇存柊鏃堕棿 ">
-                              <el-input placeholder="璇疯緭鍏� 鏇存柊鏃堕棿 " v-model="form.update_time"/>
-                        </el-form-item>
-                        <el-form-item prop="create_by" label=" 鍒涘缓浜� ">
-                              <el-input placeholder="璇疯緭鍏� 鍒涘缓浜� " v-model="form.create_by"/>
-                        </el-form-item>
-                        <el-form-item prop="create_time" label=" 鍒涘缓鏃堕棿 ">
-                              <el-input placeholder="璇疯緭鍏� 鍒涘缓鏃堕棿 " v-model="form.create_time"/>
-                        </el-form-item>
-                        <el-form-item prop="isupload" label=" 涓婁紶鏍囪 ">
-                              <el-input placeholder="璇疯緭鍏� 涓婁紶鏍囪 " v-model="form.isupload"/>
-                        </el-form-item>
-                        <el-form-item prop="upload_time" label=" 涓婁紶鏃堕棿 ">
-                              <el-input placeholder="璇疯緭鍏� 涓婁紶鏃堕棿 " v-model="form.upload_time"/>
-                        </el-form-item>
-                        <el-form-item prop="pid" label="鐖禝D">
-                              <el-input placeholder="璇疯緭鍏ョ埗ID" v-model="form.pid"/>
-                        </el-form-item>
-                        <el-form-item prop="guid" label="GUID">
-                              <el-input placeholder="璇疯緭鍏UID" v-model="form.guid"/>
-                        </el-form-item>
-                  </el-form>
-                  <div slot="footer" class="dialog-footer">
-                        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
-                        <el-button @click="cancel">鍙� 娑�</el-button>
-                  </div>
-            </el-dialog>
+  <div>
+    <el-dialog
+      append-to-body="true"
+      width="500px"
+      :title="title"
+      :visible.sync="open"
+    >
+      <el-form :rules="rules" ref="form" :model="form" label-width="80px">
+        <el-form-item prop="patid" label=" 鑷ID ">
+          <el-input placeholder="璇疯緭鍏� 鑷ID " v-model="form.patid" />
+        </el-form-item>
+        <el-form-item prop="name" label=" 濮撳悕 ">
+          <el-input placeholder="璇疯緭鍏� 濮撳悕 " v-model="form.name" />
+        </el-form-item>
+        <el-form-item prop="sex" label=" 鎬у埆   1:鐢�  2:濂�">
+          <el-input placeholder="璇疯緭鍏� 鎬у埆   1:鐢�  2:濂�" v-model="form.sex" />
+        </el-form-item>
+        <el-form-item prop="idno" label=" 璇佷欢鍙风爜 ">
+          <el-input placeholder="璇疯緭鍏� 璇佷欢鍙风爜 " v-model="form.idno" />
+        </el-form-item>
+        <el-form-item prop="birthdate" label=" 鐢熸棩 ">
+          <el-input placeholder="璇疯緭鍏� 鐢熸棩 " v-model="form.birthdate" />
+        </el-form-item>
+        <el-form-item prop="age" label=" 骞撮緞 ">
+          <el-input placeholder="璇疯緭鍏� 骞撮緞 " v-model="form.age" />
+        </el-form-item>
+        <el-form-item prop="source" label=" 鏉ユ簮 ">
+          <el-input placeholder="璇疯緭鍏� 鏉ユ簮 " v-model="form.source" />
+        </el-form-item>
+        <el-form-item prop="archivetime" label=" 寤烘。鏃堕棿 ">
+          <el-input placeholder="璇疯緭鍏� 寤烘。鏃堕棿 " v-model="form.archivetime" />
+        </el-form-item>
+        <el-form-item prop="archiveby" label=" 寤烘。浜� ">
+          <el-input placeholder="璇疯緭鍏� 寤烘。浜� " v-model="form.archiveby" />
+        </el-form-item>
+        <el-form-item prop="telcode" label=" 鎵嬫満鍙风爜 ">
+          <el-input placeholder="璇疯緭鍏� 鎵嬫満鍙风爜 " v-model="form.telcode" />
+        </el-form-item>
+        <el-form-item prop="relativetelcode" label=" 浜插睘鍙风爜 ">
+          <el-input
+            placeholder="璇疯緭鍏� 浜插睘鍙风爜 "
+            v-model="form.relativetelcode"
+          />
+        </el-form-item>
+        <el-form-item prop="idtype" label=" 璇佷欢绫诲瀷 ">
+          <el-input placeholder="璇疯緭鍏� 璇佷欢绫诲瀷 " v-model="form.idtype" />
+        </el-form-item>
+        <el-form-item prop="orgid" label=" 鏈烘瀯ID ">
+          <el-input placeholder="璇疯緭鍏� 鏈烘瀯ID " v-model="form.orgid" />
+        </el-form-item>
+        <el-form-item prop="openid" label=" 寰俊openid ">
+          <el-input placeholder="璇疯緭鍏� 寰俊openid " v-model="form.openid" />
+        </el-form-item>
+        <el-form-item prop="del_flag" label=" 鍒犻櫎鏍囪 ">
+          <el-input placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " v-model="form.del_flag" />
+        </el-form-item>
+        <el-form-item prop="update_by" label=" 鏇存柊浜� ">
+          <el-input placeholder="璇疯緭鍏� 鏇存柊浜� " v-model="form.update_by" />
+        </el-form-item>
+        <el-form-item prop="update_time" label=" 鏇存柊鏃堕棿 ">
+          <el-input placeholder="璇疯緭鍏� 鏇存柊鏃堕棿 " v-model="form.update_time" />
+        </el-form-item>
+        <el-form-item prop="create_by" label=" 鍒涘缓浜� ">
+          <el-input placeholder="璇疯緭鍏� 鍒涘缓浜� " v-model="form.create_by" />
+        </el-form-item>
+        <el-form-item prop="create_time" label=" 鍒涘缓鏃堕棿 ">
+          <el-input placeholder="璇疯緭鍏� 鍒涘缓鏃堕棿 " v-model="form.create_time" />
+        </el-form-item>
+        <el-form-item prop="isupload" label=" 涓婁紶鏍囪 ">
+          <el-input placeholder="璇疯緭鍏� 涓婁紶鏍囪 " v-model="form.isupload" />
+        </el-form-item>
+        <el-form-item prop="upload_time" label=" 涓婁紶鏃堕棿 ">
+          <el-input placeholder="璇疯緭鍏� 涓婁紶鏃堕棿 " v-model="form.upload_time" />
+        </el-form-item>
+        <el-form-item prop="pid" label="鐖禝D">
+          <el-input placeholder="璇疯緭鍏ョ埗ID" v-model="form.pid" />
+        </el-form-item>
+        <el-form-item prop="guid" label="GUID">
+          <el-input placeholder="璇疯緭鍏UID" v-model="form.guid" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+        <el-button @click="cancel">鍙� 娑�</el-button>
       </div>
+    </el-dialog>
+  </div>
 </template>
-	<script>
-	import { listpat_archive, getpat_archive, delpat_archive, addpat_archive, updatepat_archive } from "@/api/smartor3/pat_archive";
-	export default {
-		name: "dw_maint_pat_archive",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		},
-		methods: {
-			showdlg(show,val)
-			{
-				if(val !="")
-				{
-					  const id = val;
-					  getpat_archive(id).then(response => {
-						this.form = response.data;
-						this.open = val;
-						this.title = "鎮h�呮。妗�";
-					  });
-				}
-				else
-				{
-					this.form={};
-					this.open = show;
-					this.title = "鏂板缓鎮h�呮。妗�";
-				}
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_archive,
+  getpat_archive,
+  delpat_archive,
+  addpat_archive,
+  updatepat_archive,
+} from "@/api/smartor3/pat_archive";
+export default {
+  name: "dw_maint_pat_archive",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {},
+  methods: {
+    showdlg(show, val) {
+      if (val != "") {
+        const id = val;
+        getpat_archive(id).then((response) => {
+          this.form = response.data;
+          this.open = val;
+          this.title = "鎮h�呮。妗�";
+        });
+      } else {
+        this.form = {};
+        this.open = show;
+        this.title = "鏂板缓鎮h�呮。妗�";
+      }
+    },
+  },
+};
+</script>
diff --git a/src/comp/smartor3/dwo/dw_query_pat_archive.vue b/src/comp/smartor3/dwo/dw_query_pat_archive.vue
index 9cb80e9..bdaff72 100644
--- a/src/comp/smartor3/dwo/dw_query_pat_archive.vue
+++ b/src/comp/smartor3/dwo/dw_query_pat_archive.vue
@@ -2,88 +2,90 @@
       <field name="patid" label=" 鑷ID "/>
       <field name="name" label=" 濮撳悕 "/>
       <field name="sex" label=" 鎬у埆   1:鐢�  2:濂�"/>
-      <field name="iccardno" label=" 璇佷欢鍙风爜 "/>
+      <field name="idno" label=" 璇佷欢鍙风爜 "/>
       <field name="birthdate" label=" 鐢熸棩 "/>
 </dw>
-	<script>
-	import { listpat_archive, getpat_archive, delpat_archive, addpat_archive, updatepat_archive } from "@/api/smartor3/pat_archive";
-	export default {
-		name: "dw_query_pat_archive",
-		dicts: ['sys_user_sex', 'sys_patientfrom'],
-		data() {
-			return {
-			parent:null,
-		   // 閬僵灞�
-			loading: true, //false,
-			// 閫変腑鏁扮粍
-			ids: [],
-			// 闈炲崟涓鐢�
-			single: true,
-			// 闈炲涓鐢�
-			multiple: true,
-			// 鏄剧ず鎼滅储鏉′欢
-			showSearch: false,
-			// 鎬绘潯鏁�
-			total: 0,
-			// 琛ㄦ牸鏁版嵁
-			dataList: [],
-			// 寮瑰嚭灞傛爣棰�
-			title: "",
-			// 鏄惁鏄剧ず寮瑰嚭灞�
-			open: false,
-			// 鏌ヨ鍙傛暟
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				name: null,
-				iccardno: null,
-				source: null,
-				telcode: null,
-				orgid: null,
-				isupload: null,
-				uploadTime: null
-			},
-		 // 琛ㄥ崟鍙傛暟
-			form: {},
-		// 琛ㄥ崟鏍¢獙
-			 rules: {
-			 }
-			};
-		},
-		created() {
-		   //this.getList();
-		    
-		},
-		methods: {
-			getList() {
-				this.loading = true;
-				listpat_archive(this.queryParams).then(response => {
-				  this.dataList = response.rows;
-				  this.total = response.total;
-				  this.loading = false;
-				});
-			  },
-			 handleSelectionChange(selection) {
-				this.ids = selection.map(item => item.patid)
-				this.single = selection.length !== 1
-				this.multiple = !selection.length
-				//alert("selections:"+this.ids[0])
-				//this.$parent.selectionChanged(this.ids[0])
-			}, 
-			handleAdd()
-			{
-				this.$parent.HandleCmdDefault("bill.new",this.ids[0])  
-			},
-			handleUpdate()
-			{
-				this.$parent.HandleCmdDefault("bill.open",this.ids[0])  
-			},
-			rowChanged(row){
-			  //alert(row.patid)
-			  //console.log(row)
-			  //this.$parent.selectionChanged(row.patid)
-			  this.$parent.patid = row.patid
-			}
-		}
-	}
-	</script>
\ No newline at end of file
+<script>
+import {
+  listpat_archive,
+  getpat_archive,
+  delpat_archive,
+  addpat_archive,
+  updatepat_archive,
+} from "@/api/smartor3/pat_archive";
+export default {
+  name: "dw_query_pat_archive",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true, //false,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: false,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      dataList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {},
+    };
+  },
+  created() {
+    //this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listpat_archive(this.queryParams).then((response) => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    handleAdd() {
+      this.$parent.HandleCmdDefault("bill.new", this.ids[0]);
+    },
+    handleUpdate() {
+      this.$parent.HandleCmdDefault("bill.open", this.ids[0]);
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.patid)
+      this.$parent.patid = row.patid;
+    },
+  },
+};
+</script>
diff --git a/src/smartor/dataobject/dw_patarchive_base.vue b/src/smartor/dataobject/dw_patarchive_base.vue
index 41529e3..cf6f084 100644
--- a/src/smartor/dataobject/dw_patarchive_base.vue
+++ b/src/smartor/dataobject/dw_patarchive_base.vue
@@ -1,204 +1,276 @@
 <template>
   <div>
-<!--el-dialog :title="title" :visible.sync="open" :showclose="true" :close-on-click-modal="false" :inline="true" width="1000px"  append-to-body-->
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="12"><el-form-item label=" 濮撳悕 " prop="name">
-              <el-input v-model="form.name" placeholder="璇疯緭鍏� 濮撳悕 " />
-            </el-form-item></el-col>
-          <el-col :span="12"><el-form-item label=" 鎬у埆 " prop="sex">
-              <el-select v-model="form.sex" placeholder="璇烽�夋嫨 鎬у埆 ">
-                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
-                  :value="parseInt(dict.value)"></el-option>
-              </el-select>
-            </el-form-item></el-col> 
-        </el-row> 
-        <el-row>
-          <el-col :span="12"><el-form-item label=" 璇佷欢鍙风爜 " prop="iccardno">
-              <el-input v-model="form.iccardno" placeholder="璇疯緭鍏� 璇佷欢鍙风爜 " />
-            </el-form-item></el-col>
-          <el-col :span="12"><el-form-item label=" 鐢熸棩 " prop="birthdate">
-              <el-date-picker clearable v-model="form.birthdate" type="date" value-format="yyyy-MM-dd"
-                placeholder="璇烽�夋嫨 鐢熸棩 ">
-              </el-date-picker>
-            </el-form-item></el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12"><el-form-item label=" 骞撮緞 " prop="age">
-              <el-input v-model="form.age" placeholder="璇疯緭鍏� 骞撮緞 " />
-            </el-form-item></el-col>
-          <el-col :span="12"><el-form-item label=" 鏉ユ簮 " prop="source">
-              <el-select v-model="form.source" placeholder="璇烽�夋嫨 鏉ユ簮 ">
-                <el-option v-for="dict in dict.type.sys_patientfrom" :key="dict.value" :label="dict.label"
-                  :value="parseInt(dict.value)"></el-option>
-              </el-select>
-            </el-form-item></el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12"><el-form-item label=" 寤烘。鏃堕棿 " prop="archivetime">
-              <el-date-picker clearable v-model="form.archivetime" type="date" value-format="yyyy-MM-dd"
-                placeholder="璇烽�夋嫨 寤烘。鏃堕棿 ">
-              </el-date-picker>
-            </el-form-item></el-col>
-          <el-col :span="12"><el-form-item label=" 寤烘。浜� " prop="archiveby">
-              <el-input v-model="form.archiveby" placeholder="璇疯緭鍏� 寤烘。浜� " />
-            </el-form-item></el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12"> <el-form-item label=" 鎵嬫満鍙风爜 " prop="telcode">
-              <el-input v-model="form.telcode" placeholder="璇疯緭鍏� 鎵嬫満鍙风爜 " />
-            </el-form-item></el-col>
-          <el-col :span="12"><el-form-item label=" 浜插睘鍙风爜 " prop="relativetelcode">
-              <el-input v-model="form.relativetelcode" placeholder="璇疯緭鍏� 浜插睘鍙风爜 " />
-            </el-form-item></el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12"><el-form-item label=" 鏈烘瀯ID " prop="orgid">
-              <el-select v-model="form.orgid" placeholder="璇烽�夋嫨 鏈烘瀯ID ">
-                <el-option v-for="dict in dict.type.sys_patientfrom" :key="dict.value" :label="dict.label"
-                  :value="dict.value"> <el-form-item label=" 寰俊openid " prop="openid">
-                    <el-input v-model="form.openid" placeholder="璇疯緭鍏� 寰俊openid " />
-                  </el-form-item></el-option>
-              </el-select>
-            </el-form-item></el-col>
-          <el-col :span="12"><el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-              <el-input v-model="form.delFlag" placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 " />
-            </el-form-item></el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12"><el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-              <el-input v-model="form.isupload" placeholder="璇疯緭鍏� 涓婁紶鏍囪 " />
-            </el-form-item></el-col>
-          <el-col :span="12"><el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-              <el-date-picker clearable v-model="form.uploadTime" type="date" value-format="yyyy-MM-dd"
-                placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-              </el-date-picker>
-            </el-form-item></el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">淇� 瀛�</el-button>
-        <!--el-button @click="cancel">鍙� 娑�</el-button-->
-      </div>
-    <!--/el-dialog-->
+    <!--el-dialog :title="title" :visible.sync="open" :showclose="true" :close-on-click-modal="false" :inline="true" width="1000px"  append-to-body-->
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-row>
+        <el-col :span="12"
+          ><el-form-item label=" 濮撳悕 " prop="name">
+            <el-input
+              v-model="form.name"
+              placeholder="璇疯緭鍏� 濮撳悕 "
+            /> </el-form-item
+        ></el-col>
+        <el-col :span="12"
+          ><el-form-item label=" 鎬у埆 " prop="sex">
+            <el-select v-model="form.sex" placeholder="璇烽�夋嫨 鎬у埆 ">
+              <el-option
+                v-for="dict in dict.type.sys_user_sex"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+              ></el-option>
+            </el-select> </el-form-item
+        ></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12"
+          ><el-form-item label=" 璇佷欢鍙风爜 " prop="idno">
+            <el-input
+              v-model="form.idno"
+              placeholder="璇疯緭鍏� 璇佷欢鍙风爜 "
+            /> </el-form-item
+        ></el-col>
+        <el-col :span="12"
+          ><el-form-item label=" 鐢熸棩 " prop="birthdate">
+            <el-date-picker
+              clearable
+              v-model="form.birthdate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="璇烽�夋嫨 鐢熸棩 "
+            >
+            </el-date-picker> </el-form-item
+        ></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12"
+          ><el-form-item label=" 骞撮緞 " prop="age">
+            <el-input
+              v-model="form.age"
+              placeholder="璇疯緭鍏� 骞撮緞 "
+            /> </el-form-item
+        ></el-col>
+        <el-col :span="12"
+          ><el-form-item label=" 鏉ユ簮 " prop="source">
+            <el-select v-model="form.source" placeholder="璇烽�夋嫨 鏉ユ簮 ">
+              <el-option
+                v-for="dict in dict.type.sys_patientfrom"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+              ></el-option>
+            </el-select> </el-form-item
+        ></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12"
+          ><el-form-item label=" 寤烘。鏃堕棿 " prop="archivetime">
+            <el-date-picker
+              clearable
+              v-model="form.archivetime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="璇烽�夋嫨 寤烘。鏃堕棿 "
+            >
+            </el-date-picker> </el-form-item
+        ></el-col>
+        <el-col :span="12"
+          ><el-form-item label=" 寤烘。浜� " prop="archiveby">
+            <el-input
+              v-model="form.archiveby"
+              placeholder="璇疯緭鍏� 寤烘。浜� "
+            /> </el-form-item
+        ></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label=" 鎵嬫満鍙风爜 " prop="telcode">
+            <el-input
+              v-model="form.telcode"
+              placeholder="璇疯緭鍏� 鎵嬫満鍙风爜 "
+            /> </el-form-item
+        ></el-col>
+        <el-col :span="12"
+          ><el-form-item label=" 浜插睘鍙风爜 " prop="relativetelcode">
+            <el-input
+              v-model="form.relativetelcode"
+              placeholder="璇疯緭鍏� 浜插睘鍙风爜 "
+            /> </el-form-item
+        ></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12"
+          ><el-form-item label=" 鏈烘瀯ID " prop="orgid">
+            <el-select v-model="form.orgid" placeholder="璇烽�夋嫨 鏈烘瀯ID ">
+              <el-option
+                v-for="dict in dict.type.sys_patientfrom"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              >
+                <el-form-item label=" 寰俊openid " prop="openid">
+                  <el-input
+                    v-model="form.openid"
+                    placeholder="璇疯緭鍏� 寰俊openid "
+                  /> </el-form-item
+              ></el-option>
+            </el-select> </el-form-item
+        ></el-col>
+        <el-col :span="12"
+          ><el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
+            <el-input
+              v-model="form.delFlag"
+              placeholder="璇疯緭鍏� 鍒犻櫎鏍囪 "
+            /> </el-form-item
+        ></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12"
+          ><el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
+            <el-input
+              v-model="form.isupload"
+              placeholder="璇疯緭鍏� 涓婁紶鏍囪 "
+            /> </el-form-item
+        ></el-col>
+        <el-col :span="12"
+          ><el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
+            <el-date-picker
+              clearable
+              v-model="form.uploadTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 "
+            >
+            </el-date-picker> </el-form-item
+        ></el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm">淇� 瀛�</el-button>
+      <!--el-button @click="cancel">鍙� 娑�</el-button-->
     </div>
+    <!--/el-dialog-->
+  </div>
 </template>
 <script>
-import { listPatarchive, getPatarchive, delPatarchive, addPatarchive, updatePatarchive } from "@/api/smartor/patarchive";
+import {
+  listPatarchive,
+  getPatarchive,
+  delPatarchive,
+  addPatarchive,
+  updatePatarchive,
+} from "@/api/smartor/patarchive";
 export default {
-    name: "PatarchiveForm",
-    dicts: ['sys_user_sex', 'sys_patientfrom'],
-    data() {
-        return {
-        // 閬僵灞�
-        loading: true,
-        // 閫変腑鏁扮粍
-        ids: [],
-        // 闈炲崟涓鐢�
-        single: true,
-        // 闈炲涓鐢�
-        multiple: true,
-        // 鏄剧ず鎼滅储鏉′欢
-        showSearch: true,
-        // 鎬绘潯鏁�
-        total: 0,
-        // 鎮h�呮。妗堣〃鏍兼暟鎹�
-        patarchiveList: [],
-        // 寮瑰嚭灞傛爣棰�
-        title: "",
-        // 鏄惁鏄剧ず寮瑰嚭灞�
-        open: true,
-        // 鏌ヨ鍙傛暟
-        // 琛ㄥ崟鍙傛暟
-        form: {},
-        // 琛ㄥ崟鏍¢獙
-        rules: {
-            delFlag: [
-            { required: true, message: " 鍒犻櫎鏍囪 涓嶈兘涓虹┖", trigger: "blur" }
-            ],
-            isupload: [
-            { required: true, message: " 涓婁紶鏍囪 涓嶈兘涓虹┖", trigger: "blur" }
-            ],
-        }
-        };
-    },
-    created() {
-        this.Retrieve(1);
-    },
-    methods: {
-          // 琛ㄥ崟閲嶇疆
-      reset() {
-        this.form = {
-          patid: null,
-          name: null,
-          sex: null,
-          iccardno: null,
-          birthdate: null,
-          age: null,
-          source: null,
-          archivetime: null,
-          archiveby: null,
-          telcode: null,
-          relativetelcode: null,
-          iccardtype: null,
-          orgid: null,
-          openid: null,
-          delFlag: null,
-          updateBy: null,
-          updateTime: null,
-          createBy: null,
-          createTime: null,
-          isupload: null,
-          uploadTime: null
-        };
-        this.resetForm("form");
+  name: "PatarchiveForm",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      // 閬僵灞�
+      loading: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 鎮h�呮。妗堣〃鏍兼暟鎹�
+      patarchiveList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: true,
+      // 鏌ヨ鍙傛暟
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        delFlag: [
+          { required: true, message: " 鍒犻櫎鏍囪 涓嶈兘涓虹┖", trigger: "blur" },
+        ],
+        isupload: [
+          { required: true, message: " 涓婁紶鏍囪 涓嶈兘涓虹┖", trigger: "blur" },
+        ],
       },
-      Retrieve(patid)
-      {
-        getPatarchive(patid).then(response => {
-          this.form = response.data;
-          //this.open = true;
-          //this.title = "淇敼鎮h�呮。妗�";
-        });
-      },
-       /** 鏂板鎸夐挳鎿嶄綔 */
-      handleAdd() {
-        this.reset();
+    };
+  },
+  created() {
+    this.Retrieve(1);
+  },
+  methods: {
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        patid: null,
+        name: null,
+        sex: null,
+        idno: null,
+        birthdate: null,
+        age: null,
+        source: null,
+        archivetime: null,
+        archiveby: null,
+        telcode: null,
+        relativetelcode: null,
+        idtype: null,
+        orgid: null,
+        openid: null,
+        delFlag: null,
+        updateBy: null,
+        updateTime: null,
+        createBy: null,
+        createTime: null,
+        isupload: null,
+        uploadTime: null,
+      };
+      this.resetForm("form");
+    },
+    Retrieve(patid) {
+      getPatarchive(patid).then((response) => {
+        this.form = response.data;
         //this.open = true;
-        //this.title = "娣诲姞鎮h�呮。妗�";
-      },
-      /** 淇敼鎸夐挳鎿嶄綔 */
-      handleUpdate(row) {
-        this.reset();
-        const patid = row.patid || this.ids
-        getPatarchive(patid).then(response => {
-          this.form = response.data;
-          this.open = true;
-          this.title = "淇敼鎮h�呮。妗�";
-        });
-      },
-      /** 鎻愪氦鎸夐挳 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.patid != null) {
-              updatePatarchive(this.form).then(response => {
-                this.$modal.msgSuccess("淇敼鎴愬姛");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              addPatarchive(this.form).then(response => {
-                this.$modal.msgSuccess("鏂板鎴愬姛");
-                this.open = false;
-                this.getList();
-              });
-            }
+        //this.title = "淇敼鎮h�呮。妗�";
+      });
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      //this.open = true;
+      //this.title = "娣诲姞鎮h�呮。妗�";
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      this.reset();
+      const patid = row.patid || this.ids;
+      getPatarchive(patid).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "淇敼鎮h�呮。妗�";
+      });
+    },
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.patid != null) {
+            updatePatarchive(this.form).then((response) => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPatarchive(this.form).then((response) => {
+              this.$modal.msgSuccess("鏂板鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
           }
-        });
-      }
-    }
-}
+        }
+      });
+    },
+  },
+};
 </script>
-
-
diff --git a/src/smartor/dataobject/dw_patarchive_list.vue b/src/smartor/dataobject/dw_patarchive_list.vue
index 255b3b3..1317680 100644
--- a/src/smartor/dataobject/dw_patarchive_list.vue
+++ b/src/smartor/dataobject/dw_patarchive_list.vue
@@ -1,32 +1,38 @@
 <template>
-    <el-table v-loading="loading"  :data="patarchiveList" @row-click="rowChanged">
-      <!--el-table-column type="selection" width="55" align="center" /-->
-      <el-table-column label=" 鑷ID " align="center" prop="patid"/>
-      <el-table-column label=" 濮撳悕 " align="center" prop="name" />
-      <el-table-column label=" 鎬у埆 " align="center" prop="sex">
-        <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="iccardno" />
-      <el-table-column label=" 鐢熸棩 " align="center" prop="birthdate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.birthdate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label=" 骞撮緞 " align="center" prop="age" />
-      <el-table-column label=" 鏉ユ簮 " align="center" prop="source">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_patientfrom" :value="scope.row.source" />
-        </template>
-      </el-table-column>
-      <el-table-column label=" 鎵嬫満鍙风爜 " align="center" prop="telcode" />
-      <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_patientfrom" :value="scope.row.orgid" />
-        </template>
-      </el-table-column>
-      <!--el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+  <el-table v-loading="loading" :data="patarchiveList" @row-click="rowChanged">
+    <!--el-table-column type="selection" width="55" align="center" /-->
+    <el-table-column label=" 鑷ID " align="center" prop="patid" />
+    <el-table-column label=" 濮撳悕 " align="center" prop="name" />
+    <el-table-column label=" 鎬у埆 " align="center" prop="sex">
+      <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="idno" />
+    <el-table-column label=" 鐢熸棩 " align="center" prop="birthdate" width="180">
+      <template slot-scope="scope">
+        <span>{{ parseTime(scope.row.birthdate, "{y}-{m}-{d}") }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column label=" 骞撮緞 " align="center" prop="age" />
+    <el-table-column label=" 鏉ユ簮 " align="center" prop="source">
+      <template slot-scope="scope">
+        <dict-tag
+          :options="dict.type.sys_patientfrom"
+          :value="scope.row.source"
+        />
+      </template>
+    </el-table-column>
+    <el-table-column label=" 鎵嬫満鍙风爜 " align="center" prop="telcode" />
+    <el-table-column label=" 鏈烘瀯ID " align="center" prop="orgid">
+      <template slot-scope="scope">
+        <dict-tag
+          :options="dict.type.sys_patientfrom"
+          :value="scope.row.orgid"
+        />
+      </template>
+    </el-table-column>
+    <!--el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['smartor:patarchive:edit']">淇敼</el-button>
@@ -34,89 +40,94 @@
             v-hasPermi="['smartor:patarchive:remove']">鍒犻櫎</el-button>
         </template>
       </el-table-column-->
-    </el-table>
+  </el-table>
 </template>
 <script>
-import { listPatarchive, getPatarchive, delPatarchive, addPatarchive, updatePatarchive } from "@/api/smartor/patarchive";
+import {
+  listPatarchive,
+  getPatarchive,
+  delPatarchive,
+  addPatarchive,
+  updatePatarchive,
+} from "@/api/smartor/patarchive";
 export default {
-    name: "PatarchiveList",
-    dicts: ['sys_user_sex', 'sys_patientfrom'],
-    data() {
-        return {
-        parent:null,
-        // 閬僵灞�
-        loading: true,
-        // 閫変腑鏁扮粍
-        ids: [],
-        // 闈炲崟涓鐢�
-        single: true,
-        // 闈炲涓鐢�
-        multiple: true,
-        // 鏄剧ず鎼滅储鏉′欢
-        showSearch: true,
-        // 鎬绘潯鏁�
-        total: 0,
-        // 鎮h�呮。妗堣〃鏍兼暟鎹�
-        patarchiveList: [],
-        // 寮瑰嚭灞傛爣棰�
-        title: "",
-        // 鏄惁鏄剧ず寮瑰嚭灞�
-        open: false,
-        // 鏌ヨ鍙傛暟
-        queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            name: null,
-            iccardno: null,
-            source: null,
-            telcode: null,
-            orgid: null,
-            isupload: null,
-            uploadTime: null
-        },
-        // 琛ㄥ崟鍙傛暟
-        form: {},
-        // 琛ㄥ崟鏍¢獙
-        rules: {
-            delFlag: [
-            { required: true, message: " 鍒犻櫎鏍囪 涓嶈兘涓虹┖", trigger: "blur" }
-            ],
-            isupload: [
-            { required: true, message: " 涓婁紶鏍囪 涓嶈兘涓虹┖", trigger: "blur" }
-            ],
-        }
-        };
+  name: "PatarchiveList",
+  dicts: ["sys_user_sex", "sys_patientfrom"],
+  data() {
+    return {
+      parent: null,
+      // 閬僵灞�
+      loading: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 鎮h�呮。妗堣〃鏍兼暟鎹�
+      patarchiveList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        idno: null,
+        source: null,
+        telcode: null,
+        orgid: null,
+        isupload: null,
+        uploadTime: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        delFlag: [
+          { required: true, message: " 鍒犻櫎鏍囪 涓嶈兘涓虹┖", trigger: "blur" },
+        ],
+        isupload: [
+          { required: true, message: " 涓婁紶鏍囪 涓嶈兘涓虹┖", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    initial(parent) {
+      this.parent = parent;
     },
-    created() {
-      this.getList();
+    getList() {
+      this.loading = true;
+      listPatarchive(this.queryParams).then((response) => {
+        this.patarchiveList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
-    methods: {
-        initial(parent)
-        {
-          this.parent = parent
-        },
-        getList() {
-            this.loading = true;
-            listPatarchive(this.queryParams).then(response => {
-              this.patarchiveList = response.rows;
-              this.total = response.total;
-              this.loading = false;
-            });
-          },
-        // 澶氶�夋閫変腑鏁版嵁
-        handleSelectionChange(selection) {
-            this.ids = selection.map(item => item.patid)
-            this.single = selection.length !== 1
-            this.multiple = !selection.length
-            //alert("selections:"+this.ids[0])
-            //this.$parent.selectionChanged(this.ids[0])
-        }, 
-        rowChanged(row){
-          //alert(row.patid)
-          //console.log(row)
-          //this.$parent.selectionChanged(row.patid)
-          this.$parent.patid = row.patid
-        }
-    }
-}
-</script>
\ No newline at end of file
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      //alert("selections:"+this.ids[0])
+      //this.$parent.selectionChanged(this.ids[0])
+    },
+    rowChanged(row) {
+      //alert(row.patid)
+      //console.log(row)
+      //this.$parent.selectionChanged(row.patid)
+      this.$parent.patid = row.patid;
+    },
+  },
+};
+</script>
diff --git a/src/views/patient/follow/index.vue b/src/views/patient/follow/index.vue
index 9eede60..4c99362 100644
--- a/src/views/patient/follow/index.vue
+++ b/src/views/patient/follow/index.vue
@@ -148,7 +148,7 @@
             prop="age"
             width="120"
           />
-       
+
           <el-table-column
             label="璇佷欢缂栧彿"
             align="center"
@@ -178,14 +178,14 @@
           <el-table-column
             label="璇佷欢绫诲瀷"
             align="center"
-            key="iccardtype"
-            prop="iccardtype"
+            key="idtype"
+            prop="idtype"
             width="120"
           /><el-table-column
             label="璇佷欢缂栧彿"
             align="center"
-            key="iccardno"
-            prop="iccardno"
+            key="idno"
+            prop="idno"
             width="190"
           />
           <el-table-column
@@ -198,8 +198,8 @@
           <el-table-column
             label="瀹跺涵浣忓潃"
             align="center"
-            key="iccardno"
-            prop="iccardno"
+            key="idno"
+            prop="idno"
             width="190"
           />
           <el-table-column
@@ -289,8 +289,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="璇佷欢绫诲瀷" prop="iccardtype">
-              <el-select v-model="form.iccardtype" placeholder="璇烽�夋嫨鎬у埆">
+            <el-form-item label="璇佷欢绫诲瀷" prop="idtype">
+              <el-select v-model="form.idtype" placeholder="璇烽�夋嫨鎬у埆">
                 <el-option
                   v-for="item in paperstypes"
                   :key="item.papersname"
@@ -301,9 +301,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="璇佷欢鍙�" prop="iccardno">
+            <el-form-item label="璇佷欢鍙�" prop="idno">
               <el-input
-                v-model="form.iccardno"
+                v-model="form.idno"
                 placeholder="璇疯緭鍏ヨ瘉浠跺彿"
                 maxlength="50"
               />
@@ -446,9 +446,9 @@
         age: "",
         sex: "",
         tagList: [],
-        iccardno: "",
+        idno: "",
         telcode: "",
-        iccardtype: "",
+        idtype: "",
         relativetelcode: "",
       },
       //瀵煎叆杩涘害
@@ -529,7 +529,7 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        iccardno: undefined,
+        idno: undefined,
         name: undefined,
         status: undefined,
         tagIds: undefined,
@@ -601,9 +601,9 @@
         age: "",
         sex: "",
         tagList: [],
-        iccardno: "",
+        idno: "",
         telcode: "",
-        iccardtype: "",
+        idtype: "",
         relativetelcode: "",
       };
       // this.resetForm("form");
diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue
index 24ffb83..d755294 100644
--- a/src/views/patient/patient/behospitalized.vue
+++ b/src/views/patient/patient/behospitalized.vue
@@ -20,9 +20,9 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="鎮h�呬綇闄㈠彿" prop="iccardno">
+          <el-form-item label="鎮h�呬綇闄㈠彿" prop="idno">
             <el-input
-              v-model="queryParams.iccardno"
+              v-model="queryParams.idno"
               placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
               clearable
               style="width: 250px"
@@ -31,10 +31,7 @@
           </el-form-item>
 
           <el-form-item label="鎶ょ悊绛夌骇" prop="tagId">
-            <el-select
-              v-model="queryParams.Patientid"
-              placeholder="璇烽�夋嫨"
-            >
+            <el-select v-model="queryParams.Patientid" placeholder="璇烽�夋嫨">
               <el-option
                 v-for="dict in dict.type.nursinggrade"
                 :key="dict.value"
@@ -202,15 +199,15 @@
           <el-table-column
             label="鎶ょ悊绛夌骇"
             align="center"
-            key="iccardtype"
-            prop="iccardtype"
+            key="idtype"
+            prop="idtype"
             width="120"
           />
           <el-table-column
             label="鐥呮儏鐘舵��"
             align="center"
-            key="iccardno"
-            prop="iccardno"
+            key="idno"
+            prop="idno"
             width="190"
           />
 
@@ -325,8 +322,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="璇佷欢绫诲瀷" prop="iccardtype">
-              <el-select v-model="form.iccardtype" placeholder="璇烽�夋嫨鎬у埆">
+            <el-form-item label="璇佷欢绫诲瀷" prop="idtype">
+              <el-select v-model="form.idtype" placeholder="璇烽�夋嫨鎬у埆">
                 <el-option
                   v-for="item in paperstypes"
                   :key="item.papersname"
@@ -337,9 +334,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="璇佷欢鍙�" prop="iccardno">
+            <el-form-item label="璇佷欢鍙�" prop="idno">
               <el-input
-                v-model="form.iccardno"
+                v-model="form.idno"
                 placeholder="璇疯緭鍏ヨ瘉浠跺彿"
                 maxlength="50"
               />
@@ -571,9 +568,9 @@
         age: "",
         sex: "",
         tagList: [],
-        iccardno: "",
+        idno: "",
         telcode: "",
-        iccardtype: "",
+        idtype: "",
         relativetelcode: "",
       },
       //瀵煎叆杩涘害
@@ -618,7 +615,7 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        iccardno: undefined,
+        idno: undefined,
         name: undefined,
         status: undefined,
         tagIds: undefined,
@@ -734,9 +731,9 @@
         age: "",
         sex: "",
         tagList: [],
-        iccardno: "",
+        idno: "",
         telcode: "",
-        iccardtype: "",
+        idtype: "",
         relativetelcode: "",
       };
       // this.resetForm("form");
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index 021b089..87791b7 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -256,14 +256,14 @@
               <el-table-column
                 label="璇佷欢绫诲瀷"
                 align="center"
-                key="iccardtype"
-                prop="iccardtype"
+                key="idtype"
+                prop="idtype"
                 width="120"
               /><el-table-column
                 label="璇佷欢鍙风爜"
                 align="center"
-                key="iccardno"
-                prop="iccardno"
+                key="idno"
+                prop="idno"
                 width="190"
               />
 
@@ -417,8 +417,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="璇佷欢绫诲瀷" prop="iccardtype">
-              <el-select v-model="form.iccardtype" placeholder="璇烽�夋嫨鎬у埆">
+            <el-form-item label="璇佷欢绫诲瀷" prop="idtype">
+              <el-select v-model="form.idtype" placeholder="璇烽�夋嫨鎬у埆">
                 <el-option
                   v-for="item in paperstypes"
                   :key="item.papersname"
@@ -429,9 +429,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="璇佷欢鍙�" prop="iccardno">
+            <el-form-item label="璇佷欢鍙�" prop="idno">
               <el-input
-                v-model="form.iccardno"
+                v-model="form.idno"
                 placeholder="璇疯緭鍏ヨ瘉浠跺彿"
                 maxlength="50"
               />
@@ -440,17 +440,17 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="鍑虹敓鍦�" prop="iccardno">
+            <el-form-item label="鍑虹敓鍦�" prop="idno">
               <el-input
-                v-model="form.iccardno"
+                v-model="form.idno"
                 placeholder="鍥姐�佺渷銆佸湴甯傘�佸尯鍘裤�佽閬撶瓑璇︾粏淇℃伅"
                 maxlength="50"
               />
             </el-form-item> </el-col
           ><el-col :span="12">
-            <el-form-item label="灞呬綇鍦�" prop="iccardno">
+            <el-form-item label="灞呬綇鍦�" prop="idno">
               <el-input
-                v-model="form.iccardno"
+                v-model="form.idno"
                 placeholder="鍥姐�佺渷銆佸湴甯傘�佸尯鍘裤�佽閬撶瓑璇︾粏淇℃伅"
                 maxlength="50"
               />
@@ -571,41 +571,43 @@
       </div>
       <!-- 瀹屾垚 -->
       <div class="drexamine" v-else-if="dractive == 3">
-        <img
-          src="@/assets/images/瀵煎叆.png"
-        />
+        <img src="@/assets/images/瀵煎叆.png" />
         <p>瀵煎叆鎮h�呮垚鍔燂紒</p>
         <p>
           鏈
-          <span style="color: #158bb8; font-size: 20px;">{{ ImportQuantity }}</span>
-          鏉℃暟鎹垚鍔熷鍏�<span style="color: #72d3a9; font-size: 20px;">{{ ImportQuantity }}</span
+          <span style="color: #158bb8; font-size: 20px">{{
+            ImportQuantity
+          }}</span>
+          鏉℃暟鎹垚鍔熷鍏�<span style="color: #72d3a9; font-size: 20px">{{
+            ImportQuantity
+          }}</span
           >浣嶆偅鑰�
         </p>
       </div>
       <div v-if="dractive == 3">
-        <el-table :data="uploadingData" style="width: 100%" >
-            <el-table-column prop="serial" label="搴忓彿"> </el-table-column>
-            <el-table-column prop="name" label="濮撳悕"> </el-table-column>
-            <el-table-column prop="sex" label="鎬у埆"> </el-table-column>
-            <el-table-column prop="certificate" label="璇佷欢绫诲瀷">
-            </el-table-column>
-            <el-table-column prop="certificatenum" label="璇佷欢鍙风爜">
-            </el-table-column>
-            <el-table-column prop="goday" label="鍑虹敓鏃ユ湡"> </el-table-column>
-            <el-table-column prop="menum" label="鏈汉鑱旂郴鏂瑰紡"> </el-table-column>
-            <el-table-column prop="younum" label="浜插睘鑱旂郴鏂瑰紡">
-            </el-table-column>
-            <el-table-column prop="tag" label="鎮h�呮爣绛�"> </el-table-column>
-            <el-table-column prop="erry" label="閿欒鍘熷洜"> </el-table-column>
+        <el-table :data="uploadingData" style="width: 100%">
+          <el-table-column prop="serial" label="搴忓彿"> </el-table-column>
+          <el-table-column prop="name" label="濮撳悕"> </el-table-column>
+          <el-table-column prop="sex" label="鎬у埆"> </el-table-column>
+          <el-table-column prop="certificate" label="璇佷欢绫诲瀷">
+          </el-table-column>
+          <el-table-column prop="certificatenum" label="璇佷欢鍙风爜">
+          </el-table-column>
+          <el-table-column prop="goday" label="鍑虹敓鏃ユ湡"> </el-table-column>
+          <el-table-column prop="menum" label="鏈汉鑱旂郴鏂瑰紡"> </el-table-column>
+          <el-table-column prop="younum" label="浜插睘鑱旂郴鏂瑰紡">
+          </el-table-column>
+          <el-table-column prop="tag" label="鎮h�呮爣绛�"> </el-table-column>
+          <el-table-column prop="erry" label="閿欒鍘熷洜"> </el-table-column>
           <el-table-column prop="opinion" label="澶勭悊鎰忚"> </el-table-column>
-          </el-table>
-          <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="geterryList"
-          />
+        </el-table>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="geterryList"
+        />
       </div>
 
       <div slot="footer" class="dialog-footer" v-if="dractive == 3">
@@ -744,9 +746,9 @@
         age: "",
         sex: "",
         tagList: [],
-        iccardno: "",
+        idno: "",
         telcode: "",
-        iccardtype: "",
+        idtype: "",
         relativetelcode: "",
       },
       activeName: "first", //渚ц竟閫夋嫨
@@ -783,7 +785,7 @@
         pageNum: 1,
         allhosp: "1",
         pageSize: 10,
-        iccardno: undefined,
+        idno: undefined,
         name: undefined,
         status: undefined,
         tagIds: undefined,
@@ -894,9 +896,9 @@
         age: "",
         sex: "",
         tagList: [],
-        iccardno: "",
+        idno: "",
         telcode: "",
-        iccardtype: "",
+        idtype: "",
         relativetelcode: "",
       };
       // this.resetForm("form");
diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue
index 729725d..563d1c5 100644
--- a/src/views/patient/patient/outpatient.vue
+++ b/src/views/patient/patient/outpatient.vue
@@ -1,946 +1,945 @@
 <template>
-    <div class="app-container">
-      <el-row :gutter="20">
-        <!--鐢ㄦ埛鏁版嵁-->
-        <el-col :span="24" :xs="24">
-          <el-form
-            :model="queryParams"
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="98px"
-          >
-            <el-form-item label="濮撳悕" prop="name">
-              <el-input
-                v-model="queryParams.name"
-                placeholder="璇疯緭鍏ュ鍚�"
-                clearable
-                style="width: 200px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="鎮h�呯紪鍙�" prop="iccardno">
-              <el-input
-                v-model="queryParams.iccardno"
-                placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
-                clearable
-                style="width: 250px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="鎮h�呯紪鍙�" prop="telcode">
-              <el-input
-                v-model="queryParams.telcode"
-                placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
-                clearable
-                style="width: 280px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="鎮h�呰寖鍥�" prop="tagId">
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--鐢ㄦ埛鏁版嵁-->
+      <el-col :span="24" :xs="24">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="98px"
+        >
+          <el-form-item label="濮撳悕" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="璇疯緭鍏ュ鍚�"
+              clearable
+              style="width: 200px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="鎮h�呯紪鍙�" prop="idno">
+            <el-input
+              v-model="queryParams.idno"
+              placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
+              clearable
+              style="width: 250px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="鎮h�呯紪鍙�" prop="telcode">
+            <el-input
+              v-model="queryParams.telcode"
+              placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
+              clearable
+              style="width: 280px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="鎮h�呰寖鍥�" prop="tagId">
+            <el-select
+              v-model="queryParams.Patientid"
+              multiple
+              placeholder="璇烽�夋嫨"
+            >
+              <el-option
+                v-for="item in Patientrange"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-row>
+            <el-form-item label="鎮h�呮爣绛�" prop="tagId">
               <el-select
-                v-model="queryParams.Patientid"
+                v-model="queryParams.tagIds"
                 multiple
                 placeholder="璇烽�夋嫨"
               >
                 <el-option
-                  v-for="item in Patientrange"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
+                  v-for="item in optionstag"
+                  :key="item.tagid"
+                  :label="item.tagname"
+                  :value="item.tagid"
                 >
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-row>
-              <el-form-item label="鎮h�呮爣绛�" prop="tagId">
-                <el-select
-                  v-model="queryParams.tagIds"
-                  multiple
-                  placeholder="璇烽�夋嫨"
-                >
-                  <el-option
-                    v-for="item in optionstag"
-                    :key="item.tagid"
-                    :label="item.tagname"
-                    :value="item.tagid"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label=" 灏辫瘖鏃ユ湡 " prop="admitdate">
-                <el-date-picker
-                  clearable
-                  v-model="queryParams.admitdate"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="璇烽�夋嫨 灏辫瘖鏃ユ湡 "
-                >
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item>
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  size="medium"
-                  @click="handleQuery"
-                  >鎼滅储</el-button
-                >
-                <el-button
-                  icon="el-icon-refresh"
-                  size="medium"
-                  @click="resetQuery"
-                  >閲嶇疆</el-button
-                >
-              </el-form-item>
-            </el-row>
-          </el-form>
-  
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+            <el-form-item label=" 灏辫瘖鏃ユ湡 " prop="admitdate">
+              <el-date-picker
+                clearable
+                v-model="queryParams.admitdate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨 灏辫瘖鏃ユ湡 "
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item>
               <el-button
                 type="primary"
-                plain
-                icon="el-icon-plus"
+                icon="el-icon-search"
                 size="medium"
-                @click="handleAdd"
-                v-hasPermi="['system:user:add']"
-                >鏂板</el-button
+                @click="handleQuery"
+                >鎼滅储</el-button
               >
-            </el-col>
-            <el-col :span="1.5">
               <el-button
-                type="success"
-                plain
-                icon="el-icon-edit"
+                icon="el-icon-refresh"
                 size="medium"
-                :disabled="single"
-                @click="handleUpdate"
-                v-hasPermi="['system:user:edit']"
-                >淇敼</el-button
+                @click="resetQuery"
+                >閲嶇疆</el-button
               >
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="danger"
-                plain
-                icon="el-icon-delete"
-                size="medium"
-                :disabled="multiple"
-                @click="handleDelete"
-                v-hasPermi="['system:user:remove']"
-                >鍒犻櫎</el-button
-              >
-            </el-col>
-            <el-col :span="19">
-              <div class="documentf">
-                <div class="document">
-                  <el-button
-                    type="info"
-                    plain
-                    icon="el-icon-upload2"
-                    size="medium"
-                    @click="handleImport"
-                    v-hasPermi="['system:user:import']"
-                    >瀵煎叆</el-button
-                  >
-                </div>
-                <div class="document">
-                  <el-button
-                    type="warning"
-                    plain
-                    icon="el-icon-download"
-                    size="medium"
-                    @click="handleExport"
-                    v-hasPermi="['system:user:export']"
-                    >瀵煎嚭</el-button
-                  >
-                </div>
-              </div>
-            </el-col>
-            <!-- <el-col :span="1.5"> </el-col> -->
-          </el-row>
-          <el-table
-            v-loading="loading"
-            :data="userList"
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column type="selection" width="50" align="center" />
-            <el-table-column
-              label="搴忓彿"
-              align="center"
-              key="patid"
-              prop="patid"
-            />
-            <el-table-column
-              label="鎮h�呯紪鍙�"
-              align="center"
-              key="Patientnumber"
-              prop="Patientnumber"
-            />
-            <el-table-column label="濮撳悕" align="center" key="name" prop="name" />
-            <el-table-column label="鎬у埆" align="center" key="sex" prop="sex">
-              <template slot-scope="scope">
-                <span>{{ scope.row.sex == 1 ? "鐢�" : "濂�" }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="骞撮緞"
-              align="center"
-              key="age"
-              prop="age"
-              width="120"
-            />
-            <el-table-column
-              label="鑱旂郴鐢佃瘽"
-              align="center"
-              key="telephone"
-              prop="telephone"
-              width="120"
-            />
-            <el-table-column
-              label="鎮h�呮爣绛�"
-              align="center"
-              key="tagList"
-              prop="tagList"
-              width="160"
-              :show-overflow-tooltip="true"
-            >
-              <template slot-scope="scope">
-                <span v-for="item in scope.row.tagList">{{ item }} </span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="灏辫瘖绫诲埆"
-              align="center"
-              key="iccardtype"
-              prop="iccardtype"
-              width="120"
-            />
-            <el-table-column
-              label="璇婃柇"
-              align="center"
-              key="iccardno"
-              prop="iccardno"
-              width="190"
-            />
-  
-            <el-table-column
-              label="绉戝"
-              align="center"
-              key="telcode"
-              prop="telcode"
-              width="120"
-            />
-            <el-table-column
-              label="鍖荤敓"
-              align="center"
-              key="telcode"
-              prop="telcode"
-              width="120"
-            />
-            <el-table-column
-              label="鐘舵��"
-              align="center"
-              key="telcode"
-              prop="telcode"
-              width="120"
-            />
-            <el-table-column
-              label="灏辫瘖鏃堕棿"
-              align="center"
-              key="archivetime"
-              prop="archivetime"
-              width="160"
-            >
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="澶嶈瘖鏃堕棿"
-              align="center"
-              prop="updateTime"
-              width="160"
-            >
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="鎿嶄綔"
-              align="center"
-              width="160"
-              class-name="small-padding fixed-width"
-            >
-              <template slot-scope="scope">
-                <el-button
-                  size="medium"
-                  type="text"
-                  @click="
-                    $router.push({
-                      path: '/patient/patient/profile/',
-                      query: { id: scope.row.patid },
-                    })
-                  "
-                  v-hasPermi="['system:user:edit']"
-                  ><span class="button-textsc"
-                    ><i class="el-icon-zoom-in"></i>鏌ョ湅</span
-                  ></el-button
-                >
-                <el-button
-                  size="medium"
-                  type="text"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['system:user:edit']"
-                  ><span class="button-textxg"
-                    ><i class="el-icon-edit"></i>淇敼</span
-                  ></el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-  
-          <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
-        </el-col>
-      </el-row>
-  
-      <!-- 娣诲姞鎴栦慨鏀圭敤鎴烽厤缃璇濇 -->
-      <el-dialog
-        :title="amendtag ? '淇敼鎮h�呬俊鎭�' : '鏂板鎮h��'"
-        :visible.sync="Labelchange"
-        width="900px"
-      >
-        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="濮撳悕" prop="name">
-                <el-input
-                  v-model="form.name"
-                  placeholder="璇疯緭鍏ュ鍚�"
-                  maxlength="30"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="鎬у埆" prop="sex">
-                <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
-                  <el-option
-                    v-for="dict in dict.type.sys_user_sex"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="璇佷欢绫诲瀷" prop="iccardtype">
-                <el-select v-model="form.iccardtype" placeholder="璇烽�夋嫨鎬у埆">
-                  <el-option
-                    v-for="item in paperstypes"
-                    :key="item.papersname"
-                    :label="item.papersname"
-                    :value="item.papersname"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="璇佷欢鍙�" prop="iccardno">
-                <el-input
-                  v-model="form.iccardno"
-                  placeholder="璇疯緭鍏ヨ瘉浠跺彿"
-                  maxlength="50"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="鏈汉鎵嬫満鍙�" prop="telcode">
-                <el-input
-                  v-model="form.telcode"
-                  placeholder="璇疯緭鍏ユ墜鏈哄彿"
-                  maxlength="30"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="浜插睘鎵嬫満鍙�" prop="relativetelcode">
-                <el-input
-                  v-model="form.relativetelcode"
-                  placeholder="璇疯緭鍏ヤ翰灞炴墜鏈哄彿"
-                  type="password"
-                  maxlength="20"
-                  show-password
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="骞撮緞" prop="age">
-                <el-input
-                  v-model="form.age"
-                  placeholder="璇疯緭鍏ュ勾榫�"
-                  maxlength="30"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="鎮h�呮爣绛�">
-                <!-- <el-select v-model="form.sex" placeholder="璇烽�夋嫨"> -->
-                <el-select v-model="form.tagList" multiple placeholder="璇烽�夋嫨">
-                  <el-option
-                    v-for="item in optionstag"
-                    :key="item.tagid"
-                    :label="item.tagname"
-                    :value="item.tagid"
-                  >
-                  </el-option>
-                </el-select>
-                <!-- </el-select> -->
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="澶囨敞">
-                <el-input
-                  v-model="form.remark"
-                  type="textarea"
-                  placeholder="璇疯緭鍏ュ唴瀹�"
-                ></el-input>
-              </el-form-item>
-            </el-col>
+            </el-form-item>
           </el-row>
         </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
-          <el-button @click="cancel">鍙� 娑�</el-button>
-        </div>
-      </el-dialog>
-  
-      <!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
-      <el-dialog
-        :title="upload.title"
-        :visible.sync="upload.open"
-        width="70%"
-        append-to-body
-      >
-        <el-steps :active="dractive" simple>
-          <el-step title="涓婁紶瀵煎叆鏂囦欢" icon="el-icon-upload"></el-step>
-          <el-step title="瀵煎叆妫�鏌�" icon="el-icon-picture"></el-step>
-          <el-step title="瀵煎叆缁撴灉" icon="el-icon-picture"></el-step>
-        </el-steps>
-        <!-- 涓婁紶瀵煎叆鏂囦欢 -->
-        <div class="download" v-if="dractive == 1">
-          <el-upload
-            class="upload-demo"
-            ref="upload"
-            :limit="1"
-            accept=".xlsx, .xls"
-            :headers="upload.headers"
-            :action="upload.url + '?updateSupport=' + upload.updateSupport"
-            :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" />
-                鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="medium"
+              @click="handleAdd"
+              v-hasPermi="['system:user:add']"
+              >鏂板</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="medium"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['system:user:edit']"
+              >淇敼</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="medium"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['system:user:remove']"
+              >鍒犻櫎</el-button
+            >
+          </el-col>
+          <el-col :span="19">
+            <div class="documentf">
+              <div class="document">
+                <el-button
+                  type="info"
+                  plain
+                  icon="el-icon-upload2"
+                  size="medium"
+                  @click="handleImport"
+                  v-hasPermi="['system:user:import']"
+                  >瀵煎叆</el-button
+                >
               </div>
-              <span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span>
-              <el-link
-                type="primary"
-                :underline="false"
-                style="font-size: 24px; vertical-align: baseline"
-                @click="importTemplate"
-                >涓嬭浇妯℃澘</el-link
-              >
+              <div class="document">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="medium"
+                  @click="handleExport"
+                  v-hasPermi="['system:user:export']"
+                  >瀵煎嚭</el-button
+                >
+              </div>
             </div>
-          </el-upload>
-        </div>
-        <!-- 瀵煎叆妫�鏌� -->
-        <div class="uploading" v-else-if="dractive == 2">
-          <el-table :data="uploadingData" style="width: 100%">
-            <el-table-column prop="serial" label="搴忓彿"> </el-table-column>
-            <el-table-column prop="name" label="濮撳悕"> </el-table-column>
-            <el-table-column prop="sex" label="鎬у埆"> </el-table-column>
-            <el-table-column prop="certificate" label="璇佷欢绫诲瀷">
-            </el-table-column>
-            <el-table-column prop="certificatenum" label="璇佷欢鍙风爜">
-            </el-table-column>
-            <el-table-column prop="goday" label="鍑虹敓鏃ユ湡"> </el-table-column>
-            <el-table-column prop="menum" label="鏈汉鑱旂郴鏂瑰紡"> </el-table-column>
-            <el-table-column prop="younum" label="浜插睘鑱旂郴鏂瑰紡">
-            </el-table-column>
-            <el-table-column prop="tag" label="鎮h�呮爣绛�"> </el-table-column>
-            <el-table-column prop="erry" label="閿欒鍘熷洜"> </el-table-column>
-          </el-table>
-          <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="geterryList"
+          </el-col>
+          <!-- <el-col :span="1.5"> </el-col> -->
+        </el-row>
+        <el-table
+          v-loading="loading"
+          :data="userList"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column
+            label="搴忓彿"
+            align="center"
+            key="patid"
+            prop="patid"
           />
-        </div>
-        <!-- 瀹屾垚 -->
-        <div class="drexamine" v-else-if="dractive == 3">
-          <img
-            src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
+          <el-table-column
+            label="鎮h�呯紪鍙�"
+            align="center"
+            key="Patientnumber"
+            prop="Patientnumber"
           />
-          <p>瀵煎叆鎮h�呮垚鍔燂紒</p>
-          <p>鏈鍏辫瀵煎叆{{ ImportQuantity }}浣嶆偅鑰�</p>
-        </div>
-  
-        <div slot="footer" class="dialog-footer" v-if="dractive == 3">
-          <!-- <el-button type="primary" @click="submitFileForm">涓嬩竴姝�</el-button> -->
-          <el-button @click="submitclose">瀹屾垚</el-button>
-        </div>
-        <div slot="footer" v-else>
-          <el-button type="primary" @click="submitFileForm">涓嬩竴姝�</el-button>
-          <el-button @click="submitclose">鍙� 娑�</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </template>
-  
-  <script>
-  import { delUser } from "@/api/system/user";
-  import {
-    listpat_archive,
-    getpat_archive,
-    addpat_archive,
-    updatepat_archive,
-    delpat_archive,
-  } from "@/api/smartorpor/pat_archive";
-  import {
-    messagelistpatient,
-    alterpatient,
-    addpatient,
-    particularpatient,
-    deletepatient,
-    Exporterrorpatient,
-    toleadpatient,
-  } from "@/api/patient/homepage";
-  import { listtag } from "@/api/system/label";
-  import { getToken } from "@/utils/auth";
-  import Treeselect from "@riophae/vue-treeselect";
-  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-  
-  export default {
-    name: "Userhuanze",
-    dicts: ["sys_normal_disable", "sys_user_sex"],
-    components: { Treeselect },
-    data() {
-      return {
-        // 閬僵灞�
-        loading: true,
-        // 閫変腑鏁扮粍
-        ids: [],
-        // 闈炲崟涓鐢�
-        single: true,
-        // 闈炲涓鐢�
-        multiple: true,
-        // 鏄剧ず鎼滅储鏉′欢
-        showSearch: true,
-        // 鎬绘潯鏁�
-        total: 0,
-        // 鐢ㄦ埛琛ㄦ牸鏁版嵁
-        userList: null,
-        // 寮瑰嚭灞傛爣棰�
-        title: "",
-        // 閮ㄩ棬鏍戦�夐」
-        deptOptions: undefined,
-        // 鏄惁鏄剧ず寮瑰嚭灞�
+          <el-table-column label="濮撳悕" align="center" key="name" prop="name" />
+          <el-table-column label="鎬у埆" align="center" key="sex" prop="sex">
+            <template slot-scope="scope">
+              <span>{{ scope.row.sex == 1 ? "鐢�" : "濂�" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="骞撮緞"
+            align="center"
+            key="age"
+            prop="age"
+            width="120"
+          />
+          <el-table-column
+            label="鑱旂郴鐢佃瘽"
+            align="center"
+            key="telephone"
+            prop="telephone"
+            width="120"
+          />
+          <el-table-column
+            label="鎮h�呮爣绛�"
+            align="center"
+            key="tagList"
+            prop="tagList"
+            width="160"
+            :show-overflow-tooltip="true"
+          >
+            <template slot-scope="scope">
+              <span v-for="item in scope.row.tagList">{{ item }} </span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="灏辫瘖绫诲埆"
+            align="center"
+            key="idtype"
+            prop="idtype"
+            width="120"
+          />
+          <el-table-column
+            label="璇婃柇"
+            align="center"
+            key="idno"
+            prop="idno"
+            width="190"
+          />
+
+          <el-table-column
+            label="绉戝"
+            align="center"
+            key="telcode"
+            prop="telcode"
+            width="120"
+          />
+          <el-table-column
+            label="鍖荤敓"
+            align="center"
+            key="telcode"
+            prop="telcode"
+            width="120"
+          />
+          <el-table-column
+            label="鐘舵��"
+            align="center"
+            key="telcode"
+            prop="telcode"
+            width="120"
+          />
+          <el-table-column
+            label="灏辫瘖鏃堕棿"
+            align="center"
+            key="archivetime"
+            prop="archivetime"
+            width="160"
+          >
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="澶嶈瘖鏃堕棿"
+            align="center"
+            prop="updateTime"
+            width="160"
+          >
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="鎿嶄綔"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="medium"
+                type="text"
+                @click="
+                  $router.push({
+                    path: '/patient/patient/profile/',
+                    query: { id: scope.row.patid },
+                  })
+                "
+                v-hasPermi="['system:user:edit']"
+                ><span class="button-textsc"
+                  ><i class="el-icon-zoom-in"></i>鏌ョ湅</span
+                ></el-button
+              >
+              <el-button
+                size="medium"
+                type="text"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:user:edit']"
+                ><span class="button-textxg"
+                  ><i class="el-icon-edit"></i>淇敼</span
+                ></el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!-- 娣诲姞鎴栦慨鏀圭敤鎴烽厤缃璇濇 -->
+    <el-dialog
+      :title="amendtag ? '淇敼鎮h�呬俊鎭�' : '鏂板鎮h��'"
+      :visible.sync="Labelchange"
+      width="900px"
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="濮撳悕" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder="璇疯緭鍏ュ鍚�"
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="鎬у埆" prop="sex">
+              <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
+                <el-option
+                  v-for="dict in dict.type.sys_user_sex"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="璇佷欢绫诲瀷" prop="idtype">
+              <el-select v-model="form.idtype" placeholder="璇烽�夋嫨鎬у埆">
+                <el-option
+                  v-for="item in paperstypes"
+                  :key="item.papersname"
+                  :label="item.papersname"
+                  :value="item.papersname"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="璇佷欢鍙�" prop="idno">
+              <el-input
+                v-model="form.idno"
+                placeholder="璇疯緭鍏ヨ瘉浠跺彿"
+                maxlength="50"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="鏈汉鎵嬫満鍙�" prop="telcode">
+              <el-input
+                v-model="form.telcode"
+                placeholder="璇疯緭鍏ユ墜鏈哄彿"
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="浜插睘鎵嬫満鍙�" prop="relativetelcode">
+              <el-input
+                v-model="form.relativetelcode"
+                placeholder="璇疯緭鍏ヤ翰灞炴墜鏈哄彿"
+                type="password"
+                maxlength="20"
+                show-password
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="骞撮緞" prop="age">
+              <el-input
+                v-model="form.age"
+                placeholder="璇疯緭鍏ュ勾榫�"
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="鎮h�呮爣绛�">
+              <!-- <el-select v-model="form.sex" placeholder="璇烽�夋嫨"> -->
+              <el-select v-model="form.tagList" multiple placeholder="璇烽�夋嫨">
+                <el-option
+                  v-for="item in optionstag"
+                  :key="item.tagid"
+                  :label="item.tagname"
+                  :value="item.tagid"
+                >
+                </el-option>
+              </el-select>
+              <!-- </el-select> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="澶囨敞">
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="璇疯緭鍏ュ唴瀹�"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+        <el-button @click="cancel">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="70%"
+      append-to-body
+    >
+      <el-steps :active="dractive" simple>
+        <el-step title="涓婁紶瀵煎叆鏂囦欢" icon="el-icon-upload"></el-step>
+        <el-step title="瀵煎叆妫�鏌�" icon="el-icon-picture"></el-step>
+        <el-step title="瀵煎叆缁撴灉" icon="el-icon-picture"></el-step>
+      </el-steps>
+      <!-- 涓婁紶瀵煎叆鏂囦欢 -->
+      <div class="download" v-if="dractive == 1">
+        <el-upload
+          class="upload-demo"
+          ref="upload"
+          :limit="1"
+          accept=".xlsx, .xls"
+          :headers="upload.headers"
+          :action="upload.url + '?updateSupport=' + upload.updateSupport"
+          :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銆亁lsx鏍煎紡鏂囦欢銆�</span>
+            <el-link
+              type="primary"
+              :underline="false"
+              style="font-size: 24px; vertical-align: baseline"
+              @click="importTemplate"
+              >涓嬭浇妯℃澘</el-link
+            >
+          </div>
+        </el-upload>
+      </div>
+      <!-- 瀵煎叆妫�鏌� -->
+      <div class="uploading" v-else-if="dractive == 2">
+        <el-table :data="uploadingData" style="width: 100%">
+          <el-table-column prop="serial" label="搴忓彿"> </el-table-column>
+          <el-table-column prop="name" label="濮撳悕"> </el-table-column>
+          <el-table-column prop="sex" label="鎬у埆"> </el-table-column>
+          <el-table-column prop="certificate" label="璇佷欢绫诲瀷">
+          </el-table-column>
+          <el-table-column prop="certificatenum" label="璇佷欢鍙风爜">
+          </el-table-column>
+          <el-table-column prop="goday" label="鍑虹敓鏃ユ湡"> </el-table-column>
+          <el-table-column prop="menum" label="鏈汉鑱旂郴鏂瑰紡"> </el-table-column>
+          <el-table-column prop="younum" label="浜插睘鑱旂郴鏂瑰紡">
+          </el-table-column>
+          <el-table-column prop="tag" label="鎮h�呮爣绛�"> </el-table-column>
+          <el-table-column prop="erry" label="閿欒鍘熷洜"> </el-table-column>
+        </el-table>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="geterryList"
+        />
+      </div>
+      <!-- 瀹屾垚 -->
+      <div class="drexamine" v-else-if="dractive == 3">
+        <img
+          src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
+        />
+        <p>瀵煎叆鎮h�呮垚鍔燂紒</p>
+        <p>鏈鍏辫瀵煎叆{{ ImportQuantity }}浣嶆偅鑰�</p>
+      </div>
+
+      <div slot="footer" class="dialog-footer" v-if="dractive == 3">
+        <!-- <el-button type="primary" @click="submitFileForm">涓嬩竴姝�</el-button> -->
+        <el-button @click="submitclose">瀹屾垚</el-button>
+      </div>
+      <div slot="footer" v-else>
+        <el-button type="primary" @click="submitFileForm">涓嬩竴姝�</el-button>
+        <el-button @click="submitclose">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { delUser } from "@/api/system/user";
+import {
+  listpat_archive,
+  getpat_archive,
+  addpat_archive,
+  updatepat_archive,
+  delpat_archive,
+} from "@/api/smartorpor/pat_archive";
+import {
+  messagelistpatient,
+  alterpatient,
+  addpatient,
+  particularpatient,
+  deletepatient,
+  Exporterrorpatient,
+  toleadpatient,
+} from "@/api/patient/homepage";
+import { listtag } from "@/api/system/label";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Userhuanze",
+  dicts: ["sys_normal_disable", "sys_user_sex"],
+  components: { Treeselect },
+  data() {
+    return {
+      // 閬僵灞�
+      loading: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 鐢ㄦ埛琛ㄦ牸鏁版嵁
+      userList: null,
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 閮ㄩ棬鏍戦�夐」
+      deptOptions: undefined,
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 閮ㄩ棬鍚嶇О
+      deptName: undefined,
+      // 榛樿瀵嗙爜
+      initPassword: undefined,
+      amendtag: false, //鏄惁淇敼
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      paperstypes: [
+        { papersname: "韬唤璇�" },
+        { papersname: "鎶ょ収" },
+        { papersname: "涓浗娓境灞呮皯韬唤璇�" },
+        { papersname: "涓浗鍙版咕灞呮皯韬唤璇�" },
+      ],
+      // 琛ㄥ崟鍙傛暟
+      form: {
+        name: "",
+        age: "",
+        sex: "",
+        tagList: [],
+        idno: "",
+        telcode: "",
+        idtype: "",
+        relativetelcode: "",
+      },
+      //瀵煎叆杩涘害
+      dractive: 1,
+      // 瀵煎叆灞曠ず琛ㄥ崟
+      uploadingData: {},
+      total: 0, // 鎬绘潯鏁�
+      ImportQuantity: 999, //瀵煎叆鎮h�呮暟閲�
+      Labelchange: false, //淇敼鏂板寮圭獥
+      propss: { multiple: true },
+      optionstag: [], //鏍囩鍒楄〃
+      Patientrange: [
+        {
+          name: "鍏ㄩ儴",
+          id: 1,
+        },
+        {
+          name: "褰撳墠绉戝",
+          id: 1,
+        },
+      ],
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      // 鐢ㄦ埛瀵煎叆鍙傛暟
+      upload: {
+        // 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
         open: false,
-        // 閮ㄩ棬鍚嶇О
-        deptName: undefined,
-        // 榛樿瀵嗙爜
-        initPassword: undefined,
-        amendtag: false, //鏄惁淇敼
-        // 鏃ユ湡鑼冨洿
-        dateRange: [],
-        paperstypes: [
-          { papersname: "韬唤璇�" },
-          { papersname: "鎶ょ収" },
-          { papersname: "涓浗娓境灞呮皯韬唤璇�" },
-          { papersname: "涓浗鍙版咕灞呮皯韬唤璇�" },
-        ],
-        // 琛ㄥ崟鍙傛暟
-        form: {
-          name: "",
-          age: "",
-          sex: "",
-          tagList: [],
-          iccardno: "",
-          telcode: "",
-          iccardtype: "",
-          relativetelcode: "",
-        },
-        //瀵煎叆杩涘害
-        dractive: 1,
-        // 瀵煎叆灞曠ず琛ㄥ崟
-        uploadingData: {},
-        total: 0, // 鎬绘潯鏁�
-        ImportQuantity: 999, //瀵煎叆鎮h�呮暟閲�
-        Labelchange: false, //淇敼鏂板寮圭獥
-        propss: { multiple: true },
-        optionstag: [], //鏍囩鍒楄〃
-        Patientrange: [
-          {
-            name: "鍏ㄩ儴",
-            id: 1,
-          },
-          {
-            name: "褰撳墠绉戝",
-            id: 1,
-          },
-        ],
-        defaultProps: {
-          children: "children",
-          label: "label",
-        },
-        // 鐢ㄦ埛瀵煎叆鍙傛暟
-        upload: {
-          // 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
-          open: false,
-          // 寮瑰嚭灞傛爣棰橈紙鐢ㄦ埛瀵煎叆锛�
-          title: "",
-          // 鏄惁绂佺敤涓婁紶
-          isUploading: false,
-          // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
-          updateSupport: 0,
-          // 璁剧疆涓婁紶鐨勮姹傚ご閮�
-          headers: { Authorization: "Bearer " + getToken() },
-          // 涓婁紶鐨勫湴鍧�
-          url: process.env.VUE_APP_BASE_API + "/system/user/importData",
-        },
-        // 鏌ヨ鍙傛暟
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          iccardno: undefined,
-          name: undefined,
-          status: undefined,
-          tagIds: undefined,
-          telcode: undefined,
-        },
-        // 琛ㄥ崟鏍¢獙
-        rules: {
-          // userName: [
-          //   { required: true, message: "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
-          //   {
-          //     min: 2,
-          //     max: 20,
-          //     message: "鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿",
-          //     trigger: "blur",
-          //   },
-          // ],
-          // nickName: [
-          //   { required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" },
-          // ],
-          // password: [
-          //   { required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
-          //   {
-          //     min: 5,
-          //     max: 20,
-          //     message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
-          //     trigger: "blur",
-          //   },
-          // ],
-          // email: [
-          //   {
-          //     type: "email",
-          //     message: "璇疯緭鍏ユ纭殑閭鍦板潃",
-          //     trigger: ["blur", "change"],
-          //   },
-          // ],
-          // phonenumber: [
-          //   {
-          //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-          //     message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜",
-          //     trigger: "blur",
-          //   },
-          // ],
-          // IDnumber: [
-          //   {
-          //     pattern:
-          //       /^\d{6}((((((19|20)\d{2})(0[13-9]|1[012])(0[1-9]|[12]\d|30))|(((19|20)\d{2})(0[13578]|1[02])31)|((19|20)\d{2})02(0[1-9]|1\d|2[0-8])|((((19|20)([13579][26]|[2468][048]|0[48]))|(2000))0229))\d{3})|((((\d{2})(0[13-9]|1[012])(0[1-9]|[12]\d|30))|((\d{2})(0[13578]|1[02])31)|((\d{2})02(0[1-9]|1\d|2[0-8]))|(([13579][26]|[2468][048]|0[048])0229))\d{2}))(\d|X|x)$/,
-          //     message: "璇疯緭鍏ユ纭殑韬唤璇佸彿鐮�",
-          //     trigger: "blur",
-          //   },
-          // ],
-        },
+        // 寮瑰嚭灞傛爣棰橈紙鐢ㄦ埛瀵煎叆锛�
+        title: "",
+        // 鏄惁绂佺敤涓婁紶
+        isUploading: false,
+        // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
+        updateSupport: 0,
+        // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+        headers: { Authorization: "Bearer " + getToken() },
+        // 涓婁紶鐨勫湴鍧�
+        url: process.env.VUE_APP_BASE_API + "/system/user/importData",
+      },
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        idno: undefined,
+        name: undefined,
+        status: undefined,
+        tagIds: undefined,
+        telcode: undefined,
+      },
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        // userName: [
+        //   { required: true, message: "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
+        //   {
+        //     min: 2,
+        //     max: 20,
+        //     message: "鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // nickName: [
+        //   { required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" },
+        // ],
+        // password: [
+        //   { required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
+        //   {
+        //     min: 5,
+        //     max: 20,
+        //     message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // email: [
+        //   {
+        //     type: "email",
+        //     message: "璇疯緭鍏ユ纭殑閭鍦板潃",
+        //     trigger: ["blur", "change"],
+        //   },
+        // ],
+        // phonenumber: [
+        //   {
+        //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        //     message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // IDnumber: [
+        //   {
+        //     pattern:
+        //       /^\d{6}((((((19|20)\d{2})(0[13-9]|1[012])(0[1-9]|[12]\d|30))|(((19|20)\d{2})(0[13578]|1[02])31)|((19|20)\d{2})02(0[1-9]|1\d|2[0-8])|((((19|20)([13579][26]|[2468][048]|0[48]))|(2000))0229))\d{3})|((((\d{2})(0[13-9]|1[012])(0[1-9]|[12]\d|30))|((\d{2})(0[13578]|1[02])31)|((\d{2})02(0[1-9]|1\d|2[0-8]))|(([13579][26]|[2468][048]|0[048])0229))\d{2}))(\d|X|x)$/,
+        //     message: "璇疯緭鍏ユ纭殑韬唤璇佸彿鐮�",
+        //     trigger: "blur",
+        //   },
+        // ],
+      },
+    };
+  },
+  watch: {
+    // 鏍规嵁鍚嶇О绛涢�夐儴闂ㄦ爲
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
+  created() {
+    this.getList();
+    this.gettabList();
+  },
+  methods: {
+    /** 鏌ヨ鎮h�呭垪琛� */
+    getList() {
+      this.loading = true;
+      messagelistpatient(this.queryParams).then((response) => {
+        console.log(response);
+        this.userList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 鏌ヨ鏍囩鍒楄〃 */
+    gettabList() {
+      const queryParams = {};
+      listtag().then((response) => {
+        console.log(response);
+        this.optionstag = response.rows;
+      });
+    },
+    // 鏌ヨ瀵煎叆灞曠ず鍒楄〃
+    geterryList() {
+      this.loading = true;
+      listJob(this.queryParams).then((response) => {
+        this.jobList = 1;
+        this.total = 1;
+        this.loading = false;
+      });
+    },
+
+    // 绛涢�夎妭鐐�
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 鑺傜偣鍗曞嚮浜嬩欢
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.handleQuery();
+    },
+
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.Labelchange = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        name: "",
+        age: "",
+        sex: "",
+        tagList: [],
+        idno: "",
+        telcode: "",
+        idtype: "",
+        relativetelcode: "",
       };
+      // this.resetForm("form");
     },
-    watch: {
-      // 鏍规嵁鍚嶇О绛涢�夐儴闂ㄦ爲
-      deptName(val) {
-        this.$refs.tree.filter(val);
-      },
-    },
-    created() {
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
       this.getList();
-      this.gettabList();
     },
-    methods: {
-      /** 鏌ヨ鎮h�呭垪琛� */
-      getList() {
-        this.loading = true;
-        messagelistpatient(this.queryParams).then((response) => {
-          console.log(response);
-          this.userList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      /** 鏌ヨ鏍囩鍒楄〃 */
-      gettabList() {
-        const queryParams = {};
-        listtag().then((response) => {
-          console.log(response);
-          this.optionstag = response.rows;
-        });
-      },
-      // 鏌ヨ瀵煎叆灞曠ず鍒楄〃
-      geterryList() {
-        this.loading = true;
-        listJob(this.queryParams).then((response) => {
-          this.jobList = 1;
-          this.total = 1;
-          this.loading = false;
-        });
-      },
-  
-      // 绛涢�夎妭鐐�
-      filterNode(value, data) {
-        if (!value) return true;
-        return data.label.indexOf(value) !== -1;
-      },
-      // 鑺傜偣鍗曞嚮浜嬩欢
-      handleNodeClick(data) {
-        this.queryParams.deptId = data.id;
-        this.handleQuery();
-      },
-  
-      // 鍙栨秷鎸夐挳
-      cancel() {
-        this.Labelchange = false;
-        this.reset();
-      },
-      // 琛ㄥ崟閲嶇疆
-      reset() {
-        this.form = {
-          name: "",
-          age: "",
-          sex: "",
-          tagList: [],
-          iccardno: "",
-          telcode: "",
-          iccardtype: "",
-          relativetelcode: "",
-        };
-        // this.resetForm("form");
-      },
-      /** 鎼滅储鎸夐挳鎿嶄綔 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 閲嶇疆鎸夐挳鎿嶄綔 */
-      resetQuery() {
-        this.dateRange = [];
-        this.resetForm("queryForm");
-        this.$refs.tree.setCurrentKey(null);
-        this.handleQuery();
-      },
-      // 澶氶�夋閫変腑鏁版嵁
-      handleSelectionChange(selection) {
-        this.ids = selection.map((item) => item.patid);
-        this.single = selection.length != 1;
-        this.multiple = !selection.length;
-      },
-  
-      /** 鏂板鎸夐挳鎿嶄綔 */
-      handleAdd() {
-        this.reset();
-        this.Labelchange = true;
-        this.amendtag = false;
-      },
-      /** 淇敼鎸夐挳鎿嶄綔 */
-      handleUpdate(row) {
-        console.log(row);
-        const userIds = row.patid || this.ids;
-        particularpatient(userIds).then((response) => {
-          console.log(response);
-          this.form = response.data;
-        });
-        this.amendtag = true;
-        this.Labelchange = true;
-      },
-  
-      //淇敼/鏂板鎮h��
-      submitForm() {
-        if (this.amendtag) {
-          alterpatient(this.form)
-            .then((response) => {
-              console.log(response);
-            })
-            .then(() => {
-              this.getList();
-              this.$modal.msgSuccess("淇敼鎴愬姛");
-            });
-        } else {
-          addpatient(this.form)
-            .then((response) => {
-              console.log(response);
-            })
-            .then(() => {
-              this.getList();
-              this.$modal.msgSuccess("娣诲姞鎴愬姛");
-            });
-        }
-        this.reset();
-        // this.idds = "";
-        this.Labelchange = false;
-      },
-  
-      /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-      handleDelete(row) {
-        const userIds = row.userId || this.ids;
-        this.$modal
-          .confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�')
-          .then(function () {
-            return deletepatient(userIds);
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.$refs.tree.setCurrentKey(null);
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.patid);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.Labelchange = true;
+      this.amendtag = false;
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      console.log(row);
+      const userIds = row.patid || this.ids;
+      particularpatient(userIds).then((response) => {
+        console.log(response);
+        this.form = response.data;
+      });
+      this.amendtag = true;
+      this.Labelchange = true;
+    },
+
+    //淇敼/鏂板鎮h��
+    submitForm() {
+      if (this.amendtag) {
+        alterpatient(this.form)
+          .then((response) => {
+            console.log(response);
           })
           .then(() => {
             this.getList();
-            this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+            this.$modal.msgSuccess("淇敼鎴愬姛");
+          });
+      } else {
+        addpatient(this.form)
+          .then((response) => {
+            console.log(response);
           })
-          .catch(() => {});
-      },
-      /** 瀵煎嚭鎸夐挳鎿嶄綔 */
-      handleExport() {
-        this.download(
-          "smartor/patarchive/export",
-          {
-            ...this.queryParams,
-          },
-          `user_${new Date().getTime()}.xlsx`
-        );
-      },
-      /** 瀵煎叆鎸夐挳鎿嶄綔 */
-      handleImport() {
-        this.upload.title = "鐢ㄦ埛瀵煎叆";
-        this.upload.open = true;
-      },
-      /** 涓嬭浇妯℃澘鎿嶄綔 */
-      importTemplate() {
-        this.download(
-          "system/user/importTemplate",
-          {},
-          `user_template_${new Date().getTime()}.xlsx`
-        );
-      },
-      // 鏂囦欢涓婁紶涓鐞�
-      handleFileUploadProgress(event, file, fileList) {
-        this.upload.isUploading = true;
-      },
-      // 鏂囦欢涓婁紶鎴愬姛澶勭悊
-      handleFileSuccess(response, file, fileList) {
-        this.upload.open = false;
-        this.upload.isUploading = false;
-        this.$refs.upload.clearFiles();
-        this.$alert(
-          "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-            response.msg +
-            "</div>",
-          "瀵煎叆缁撴灉",
-          { dangerouslyUseHTMLString: true }
-        );
-        this.getList();
-      },
-      // 鎻愪氦涓婁紶鏂囦欢
-      submitFileForm() {
-        // 涓婁紶
-        if (this.dractive == 1) {
-          this.$refs.upload.submit();
-          this.dractive++;
-        } else {
-          this.dractive++;
-        }
-      },
-      submitclose() {
-        this.upload.open = false;
-        this.dractive = 1;
-      },
+          .then(() => {
+            this.getList();
+            this.$modal.msgSuccess("娣诲姞鎴愬姛");
+          });
+      }
+      this.reset();
+      // this.idds = "";
+      this.Labelchange = false;
     },
-  };
-  </script>
-  
-  <style lang="scss" scoped>
-  .el-button--primary.is-plain {
-    color: #ffffff;
-    background: #409eff;
-    border-color: #4fabe9;
+
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$modal
+        .confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�')
+        .then(function () {
+          return deletepatient(userIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+        })
+        .catch(() => {});
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download(
+        "smartor/patarchive/export",
+        {
+          ...this.queryParams,
+        },
+        `user_${new Date().getTime()}.xlsx`
+      );
+    },
+    /** 瀵煎叆鎸夐挳鎿嶄綔 */
+    handleImport() {
+      this.upload.title = "鐢ㄦ埛瀵煎叆";
+      this.upload.open = true;
+    },
+    /** 涓嬭浇妯℃澘鎿嶄綔 */
+    importTemplate() {
+      this.download(
+        "system/user/importTemplate",
+        {},
+        `user_template_${new Date().getTime()}.xlsx`
+      );
+    },
+    // 鏂囦欢涓婁紶涓鐞�
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 鏂囦欢涓婁紶鎴愬姛澶勭悊
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "</div>",
+        "瀵煎叆缁撴灉",
+        { dangerouslyUseHTMLString: true }
+      );
+      this.getList();
+    },
+    // 鎻愪氦涓婁紶鏂囦欢
+    submitFileForm() {
+      // 涓婁紶
+      if (this.dractive == 1) {
+        this.$refs.upload.submit();
+        this.dractive++;
+      } else {
+        this.dractive++;
+      }
+    },
+    submitclose() {
+      this.upload.open = false;
+      this.dractive = 1;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.el-button--primary.is-plain {
+  color: #ffffff;
+  background: #409eff;
+  border-color: #4fabe9;
+}
+.document {
+  width: 100px;
+  height: 50px;
+}
+.documentf {
+  display: flex;
+  justify-content: flex-end;
+}
+.download {
+  text-align: center;
+  .el-upload__tip {
+    font-size: 23px;
   }
-  .document {
+  .el-upload__text {
+    font-size: 23px;
+  }
+}
+.uploading {
+  margin-top: 20px;
+  margin: 20px;
+  padding: 30px;
+  background: #ffffff;
+  border: 1px solid #dcdfe6;
+  -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
+    0 0 6px 0 rgba(0, 0, 0, 0.04);
+}
+.drexamine {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 30px;
+  background: #daeaf5;
+  img {
     width: 100px;
-    height: 50px;
+    height: 100px;
   }
-  .documentf {
-    display: flex;
-    justify-content: flex-end;
-  }
-  .download {
-    text-align: center;
-    .el-upload__tip {
-      font-size: 23px;
-    }
-    .el-upload__text {
-      font-size: 23px;
-    }
-  }
-  .uploading {
-    margin-top: 20px;
-    margin: 20px;
-    padding: 30px;
-    background: #ffffff;
-    border: 1px solid #dcdfe6;
-    -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
-      0 0 6px 0 rgba(0, 0, 0, 0.04);
-  }
-  .drexamine {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 30px;
-    background: #daeaf5;
-    img {
-      width: 100px;
-      height: 100px;
-    }
-  }
-  .button-textsc {
-    color: #28cfe6;
-  }
-  </style>
-  
\ No newline at end of file
+}
+.button-textsc {
+  color: #28cfe6;
+}
+</style>
diff --git a/src/views/patient/patient/physical.vue b/src/views/patient/patient/physical.vue
index 95dd8b7..563d1c5 100644
--- a/src/views/patient/patient/physical.vue
+++ b/src/views/patient/patient/physical.vue
@@ -15,14 +15,14 @@
             <el-input
               v-model="queryParams.name"
               placeholder="璇疯緭鍏ュ鍚�"
-              clearable 
+              clearable
               style="width: 200px"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="鎮h�呯紪鍙�" prop="iccardno">
+          <el-form-item label="鎮h�呯紪鍙�" prop="idno">
             <el-input
-              v-model="queryParams.iccardno"
+              v-model="queryParams.idno"
               placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
               clearable
               style="width: 250px"
@@ -214,15 +214,15 @@
           <el-table-column
             label="灏辫瘖绫诲埆"
             align="center"
-            key="iccardtype"
-            prop="iccardtype"
+            key="idtype"
+            prop="idtype"
             width="120"
           />
           <el-table-column
             label="璇婃柇"
             align="center"
-            key="iccardno"
-            prop="iccardno"
+            key="idno"
+            prop="idno"
             width="190"
           />
 
@@ -344,8 +344,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="璇佷欢绫诲瀷" prop="iccardtype">
-              <el-select v-model="form.iccardtype" placeholder="璇烽�夋嫨鎬у埆">
+            <el-form-item label="璇佷欢绫诲瀷" prop="idtype">
+              <el-select v-model="form.idtype" placeholder="璇烽�夋嫨鎬у埆">
                 <el-option
                   v-for="item in paperstypes"
                   :key="item.papersname"
@@ -356,9 +356,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="璇佷欢鍙�" prop="iccardno">
+            <el-form-item label="璇佷欢鍙�" prop="idno">
               <el-input
-                v-model="form.iccardno"
+                v-model="form.idno"
                 placeholder="璇疯緭鍏ヨ瘉浠跺彿"
                 maxlength="50"
               />
@@ -590,9 +590,9 @@
         age: "",
         sex: "",
         tagList: [],
-        iccardno: "",
+        idno: "",
         telcode: "",
-        iccardtype: "",
+        idtype: "",
         relativetelcode: "",
       },
       //瀵煎叆杩涘害
@@ -637,7 +637,7 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        iccardno: undefined,
+        idno: undefined,
         name: undefined,
         status: undefined,
         tagIds: undefined,
@@ -753,9 +753,9 @@
         age: "",
         sex: "",
         tagList: [],
-        iccardno: "",
+        idno: "",
         telcode: "",
-        iccardtype: "",
+        idtype: "",
         relativetelcode: "",
       };
       // this.resetForm("form");
diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue
index cb19817..596664c 100644
--- a/src/views/patient/patient/profile/index.vue
+++ b/src/views/patient/patient/profile/index.vue
@@ -156,7 +156,6 @@
                   </el-option>
                 </el-select>
 
-
                 <el-button
                   v-else
                   class="button-new-tag"
@@ -232,7 +231,7 @@
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="鍚哥儫鎯呭喌" prop="iccardtype">
+                <el-form-item label="鍚哥儫鎯呭喌" prop="idtype">
                   <el-radio-group v-model="form.radio">
                     <el-radio :label="1">鏈�</el-radio>
                     <el-radio :label="2">鏃�</el-radio>
@@ -240,7 +239,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="楗厭鎯呭喌" prop="iccardno">
+                <el-form-item label="楗厭鎯呭喌" prop="idno">
                   <el-radio-group v-model="form.radios">
                     <el-radio :label="1">鏈�</el-radio>
                     <el-radio :label="2">鏃�</el-radio>
@@ -248,7 +247,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="杩愬姩鎯呭喌" prop="iccardno">
+                <el-form-item label="杩愬姩鎯呭喌" prop="idno">
                   <el-radio-group v-model="form.radiosa">
                     <el-radio :label="1">鏈�</el-radio>
                     <el-radio :label="2">鏃�</el-radio>
@@ -258,7 +257,7 @@
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="楗鎯呭喌" prop="iccardno">
+                <el-form-item label="楗鎯呭喌" prop="idno">
                   <el-radio-group v-model="form.radiosa">
                     <el-radio :label="1">澶氬害楗</el-radio>
                     <el-radio :label="2">姝e父楗</el-radio>
@@ -266,7 +265,7 @@
                   </el-radio-group>
                 </el-form-item> </el-col
               ><el-col :span="12">
-                <el-form-item label="蹇冪悊鎯呭喌" prop="iccardno">
+                <el-form-item label="蹇冪悊鎯呭喌" prop="idno">
                   <el-radio-group v-model="form.radiosa">
                     <el-radio :label="1">蹇冩儏鎰夋偊</el-radio>
                     <el-radio :label="2">杞诲井鐒﹁檻</el-radio>
@@ -1176,7 +1175,7 @@
                 },
                 {
                   offset: 1,
-                  color: "#c4d7d6"
+                  color: "#c4d7d6",
                 },
               ]),
             },
@@ -1195,12 +1194,12 @@
         ["2000-06-05", 36.8],
         ["2000-06-06", 36.2],
         ["2000-06-07", 37.8],
-        ["2000-06-08",37.8],
-        ["2000-06-09",37.2],
-        ["2000-06-10",36.2],
-        ["2000-06-11",37.8],
-        ["2000-06-12",36.9],
-        ["2000-06-13",36.8],
+        ["2000-06-08", 37.8],
+        ["2000-06-09", 37.2],
+        ["2000-06-10", 36.2],
+        ["2000-06-11", 37.8],
+        ["2000-06-12", 36.9],
+        ["2000-06-13", 36.8],
         ["2000-06-14", 36.4],
         ["2000-06-15", 37.1],
         ["2000-06-16", 36.9],
@@ -1210,7 +1209,7 @@
         ["2000-06-20", 36.6],
         ["2000-06-21", 36.8],
         ["2000-06-22", 36.2],
-        ["2000-06-23",37.8],
+        ["2000-06-23", 37.8],
       ];
       const dateList = data.map(function (item) {
         return item[0];
@@ -1231,7 +1230,7 @@
             max: 400,
           },
         ],
-    
+
         tooltip: {
           trigger: "axis",
         },
diff --git a/src/views/repositoryai/verbaltrick/index.vue b/src/views/repositoryai/verbaltrick/index.vue
index e140120..6cbcb07 100644
--- a/src/views/repositoryai/verbaltrick/index.vue
+++ b/src/views/repositoryai/verbaltrick/index.vue
@@ -311,15 +311,6 @@
                   <el-button
                     size="medium"
                     type="text"
-                    @click="handleUpdate(scope.row)"
-                    v-hasPermi="['system:user:edit']"
-                    ><span class="button-textxg"
-                      ><i class="el-icon-edit-outline"></i>淇敼</span
-                    ></el-button
-                  >
-                  <el-button
-                    size="medium"
-                    type="text"
                     @click="compileUpdate(scope.row)"
                     v-hasPermi="['system:user:edit']"
                     ><span class="button-bji"
@@ -357,167 +348,6 @@
             />
           </el-col>
         </el-row>
-
-        <!-- 娣诲姞鎴栦慨鏀归棶棰橀厤缃璇濇 -->
-        <el-dialog
-          :title="title"
-          :visible.sync="indexopen"
-          width="900px"
-          append-to-body
-        >
-          <el-form
-            ref="form"
-            :model="indexform"
-            :rules="rules"
-            label-width="100px"
-          >
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="璇█" prop="deptId">
-                  <el-select
-                    v-model="indexform.language"
-                    placeholder="璇烽�夋嫨璇█"
-                  >
-                    <el-option
-                      v-for="index in languagelist"
-                      :key="index.value"
-                      :label="index.label"
-                      :value="index.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="闂涓绘棬" prop="nickName">
-                  <el-input
-                    v-model="indexform.nickName"
-                    placeholder="璇疯緭鍏ラ棶棰樹富鏃�"
-                    maxlength="80"
-                  />
-                </el-form-item> </el-col
-            ></el-row>
-            <el-row>
-              <el-col :span="24">
-                <div
-                  style="display: flex; margin-left: 100px; margin-bottom: 10px"
-                >
-                  <div class="tsgname" @click="tsgnameto()">鍖婚櫌鍚嶇О</div>
-                  <div class="tsgname" @click="tsgnameto()">鍖婚櫌鐢佃瘽</div>
-                  <div class="tsgname" @click="tsgnameto()">鍖婚櫌濮撳悕</div>
-                  <div class="tsgname" @click="tsgnameto()">闅忚濮撳悕</div>
-                  <div class="tsgname" @click="tsgnameto()">闅忚鐢佃瘽</div>
-                  <div class="tsgname" @click="tsgnameto()">鎬у埆</div>
-                  <div class="tsgname" @click="tsgnameto()">骞撮緞</div>
-                  <div class="tsgname" @click="tsgnameto()">鍦板潃</div>
-                </div>
-              </el-col></el-row
-            >
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="闂鏂囨湰" prop="verbaltricktext">
-                  <el-input v-model="indexform.userName" maxlength="30" />
-                </el-form-item> </el-col
-            ></el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="闂璇煶" prop="verbaltrickyy">
-                  <el-input v-model="indexform.userName" maxlength="30" />
-                </el-form-item> </el-col
-            ></el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="鏃犲尮閰嶆枃鏈�" prop="matchtext">
-                  <el-input v-model="indexform.userName" maxlength="30" />
-                </el-form-item> </el-col
-            ></el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="鏃犲尮閰嶈闊�" prop="matchyy">
-                  <el-input v-model="indexform.userName" maxlength="30" />
-                </el-form-item> </el-col
-            ></el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="鏃犲0鏂囨湰" prop="silenttext">
-                  <el-input v-model="indexform.userName" maxlength="30" />
-                </el-form-item> </el-col
-            ></el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="鏃犲0璇煶" prop="silentyy">
-                  <el-input v-model="indexform.userName" maxlength="30" />
-                </el-form-item> </el-col
-            ></el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="閫氱敤搴撴枃鏈�" prop="librarytext">
-                  <el-input v-model="indexform.userName" maxlength="30" />
-                </el-form-item> </el-col
-            ></el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="閫氱敤搴撹闊�" prop="libraryy">
-                  <el-input v-model="indexform.userName" maxlength="30" />
-                </el-form-item> </el-col
-            ></el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="鍚笉娓呮枃鏈�" prop="vaguetext">
-                  <el-input v-model="indexform.userName" maxlength="30" />
-                </el-form-item> </el-col
-            ></el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="鍚笉娓呰闊�" prop="vagueyy">
-                  <el-input v-model="indexform.userName" maxlength="30" />
-                </el-form-item> </el-col
-            ></el-row>
-
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="闂瑙勫垯" prop="email">
-                  <el-input
-                    v-model="indexform.remark"
-                    type="textarea"
-                    placeholder="璇疯緭鍏ュ唴瀹�"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="鏄惁鍙敤">
-                  <el-radio-group v-model="indexform.qystatus">
-                    <el-radio
-                      v-for="item in qyoptions"
-                      :key="item.value"
-                      :label="item.value"
-                      >{{ item.label }}</el-radio
-                    >
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="澶囨敞">
-                  <el-input
-                    v-model="indexform.remark"
-                    type="textarea"
-                    placeholder="璇疯緭鍏ュ唴瀹�"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
-            <el-button @click="cancel">鍙� 娑�</el-button>
-          </div>
-        </el-dialog>
       </div>
     </div>
     <!-- 娣诲姞绫诲埆寮规 -->
@@ -878,15 +708,10 @@
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
-      this.reset();
-      this.title = "鏂板闂";
-      this.indexopen = true;
-    },
-    /** 淇敼鎸夐挳鎿嶄綔 */
-    handleUpdate(row) {
-      this.reset();
-      this.title = "淇敼闂";
-      this.indexopen = true;
+      this.$router.push({
+        path: "/knowledge/verbaltrick/particulars/",
+        query: { id: "1" },
+      });
     },
     // 淇敼鍒嗙被寮规
     popoveramend(tagcategoryid) {
diff --git a/src/views/repositoryai/verbaltrick/particulars/index.vue b/src/views/repositoryai/verbaltrick/particulars/index.vue
index a05e672..a4b6152 100644
--- a/src/views/repositoryai/verbaltrick/particulars/index.vue
+++ b/src/views/repositoryai/verbaltrick/particulars/index.vue
@@ -1,65 +1,559 @@
 <template>
-  <div>
-    <div class="basic">鍩烘湰淇℃伅</div>
-    <div class="top-text">
-      <div class="substance">
-        <p>璇濇湳涓绘棬锛�<span>鏈夋棤澶嶆煡</span></p>
-        <p>闂鏂囨湰锛�<span>鏈夋棤澶嶆煡</span></p>
-        <p>鎸囨爣绉嶇被锛�<span>鏈夋棤澶嶆煡</span></p>
-        <p>
-          鎸囨爣閫夐」锛�<span>{{ optionvalue }}</span>
-        </p>
+  <div class="Questionnairemanagement">
+    <!-- 宸︿晶鏍� -->
+    <div class="sidecolumn">
+      <div style="height: 300px">
+        <el-steps direction="vertical" :active="Editprogress">
+          <el-step title="闂搴撶紪杈�"></el-step>
+          <el-step title="闂鎸囨爣缂栬緫"></el-step>
+        </el-steps>
       </div>
     </div>
-    <div class="headline">
-      <div class="basics">闂閰嶇疆</div>
-      <div class="headbottom">
-        <el-button
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="addzbiao"
-          >娣诲姞鎸囨爣</el-button
+    <!-- 鍙充晶鏁版嵁 -->
+    <div class="leftvlue">
+      <!-- 鍩烘湰淇℃伅 -->
+      <div v-if="Editprogress == 1">
+        <div class="leftvlue-jbxx">鍩烘湰淇℃伅</div>
+        <el-divider></el-divider>
+        <el-form
+          ref="form"
+          :model="indexform"
+          :rules="rules"
+          label-width="100px"
         >
-        <el-button type="primary" icon="el-icon-s-claim">淇濆瓨</el-button>
-        <el-button type="primary" icon="el-icon-document"
-          >鏇存柊鎸囨爣瑙勫垯鑷虫ā鐗�</el-button
-        >
-      </div>
-    </div>
-    <div class="valuetop" v-for="(item, index) in deployList" :key="item.id">
-      <div class="val-text">
-        <div>
-          鏈夋棤澶嶆煡 <span>{{ item.name }}</span>
-        </div>
-        <div class="text-icon" @click="deletei(index)">
-          <i class="el-icon-delete" />
-        </div>
-      </div>
-      <div class="val-bon">
-        <el-form ref="form" :model="form" label-width="80px">
-          <el-form-item label="鎸囨爣绫诲瀷">
-            <el-radio-group v-model="form.resource">
-              <el-radio label="閫夐」"></el-radio>
-              <el-radio label="鏂囨湰"></el-radio>
-              <el-radio label="鏁扮粍"></el-radio>
-            </el-radio-group>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="璇█" prop="deptId">
+                <el-select
+                  v-model="indexform.language"
+                  placeholder="璇烽�夋嫨璇█"
+                >
+                  <el-option
+                    v-for="index in languagelist"
+                    :key="index.value"
+                    :label="index.label"
+                    :value="index.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="鍙敤鐘舵��" prop="status">
+                <el-select v-model="indexform.status" placeholder="璇烽�夋嫨鐘舵��">
+                  <el-option
+                    v-for="item in qyoptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="闂涓绘棬" prop="nickName">
+                <el-input
+                  v-model="indexform.nickName"
+                  placeholder="璇疯緭鍏ラ棶棰樹富鏃�"
+                  maxlength="80"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item label="鐗堟湰鍙�" prop="nickName">
+                <el-input
+                  v-model="indexform.nickName"
+                  placeholder="璇疯緭鍏�"
+                  maxlength="80"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div
+                style="display: flex; margin-left: 100px; margin-bottom: 10px"
+              >
+                <div class="tsgname" @click="tsgnameto()">鍖婚櫌鍚嶇О</div>
+                <div class="tsgname" @click="tsgnameto()">鍖婚櫌鐢佃瘽</div>
+                <div class="tsgname" @click="tsgnameto()">鍖婚櫌濮撳悕</div>
+                <div class="tsgname" @click="tsgnameto()">闅忚濮撳悕</div>
+                <div class="tsgname" @click="tsgnameto()">闅忚鐢佃瘽</div>
+                <div class="tsgname" @click="tsgnameto()">鎬у埆</div>
+                <div class="tsgname" @click="tsgnameto()">骞撮緞</div>
+                <div class="tsgname" @click="tsgnameto()">鍦板潃</div>
+              </div>
+            </el-col></el-row
+          >
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="闂鏂囨湰" prop="verbaltricktext">
+                <el-input
+                  type="textarea"
+                  :rows="2"
+                  placeholder="璇疯緭鍏ュ唴瀹�"
+                  v-model="indexform.userName"
+                  maxlength="30"
+                />
+              </el-form-item> </el-col
+          ></el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="闂璇煶" prop="verbaltrickyy">
+                <el-upload
+                  class="upload-demo"
+                  action="https://jsonplaceholder.typicode.com/posts/"
+                  :on-change="handleChange"
+                  :file-list="fileList"
+                  :limit="1"
+                  :on-exceed="handleExceed"
+                >
+                  <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+                </el-upload>
+                <!-- <el-input v-model="indexform.userName" maxlength="30" /> -->
+              </el-form-item>
+            </el-col></el-row
+          >
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="鏃犲尮閰嶆枃鏈�" prop="matchtext">
+                <el-input
+                  type="textarea"
+                  :rows="2"
+                  placeholder="璇疯緭鍏ュ唴瀹�"
+                  v-model="indexform.userName"
+                  maxlength="30"
+                />
+              </el-form-item> </el-col
+          ></el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鏃犲尮閰嶈闊�" prop="matchyy">
+                <el-upload
+                  class="upload-demo"
+                  action="https://jsonplaceholder.typicode.com/posts/"
+                  :on-change="handleChange"
+                  :file-list="fileList"
+                  :limit="1"
+                  :on-exceed="handleExceed"
+                >
+                  <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col></el-row
+          >
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="鏃犲0鏂囨湰" prop="silenttext">
+                <el-input
+                  type="textarea"
+                  :rows="2"
+                  placeholder="璇疯緭鍏ュ唴瀹�"
+                  v-model="indexform.userName"
+                  maxlength="30"
+                />
+              </el-form-item> </el-col
+          ></el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鏃犲0璇煶" prop="silentyy">
+                <el-upload
+                  class="upload-demo"
+                  action="https://jsonplaceholder.typicode.com/posts/"
+                  :on-change="handleChange"
+                  :file-list="fileList"
+                  :limit="1"
+                  :on-exceed="handleExceed"
+                >
+                  <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col></el-row
+          >
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="閫氱敤搴撴枃鏈�" prop="librarytext">
+                <el-input
+                  type="textarea"
+                  :rows="2"
+                  placeholder="璇疯緭鍏ュ唴瀹�"
+                  v-model="indexform.userName"
+                  maxlength="30"
+                />
+              </el-form-item> </el-col
+          ></el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="閫氱敤搴撹闊�" prop="libraryy">
+                <el-upload
+                  class="upload-demo"
+                  action="https://jsonplaceholder.typicode.com/posts/"
+                  :on-change="handleChange"
+                  :file-list="fileList"
+                  :limit="1"
+                  :on-exceed="handleExceed"
+                >
+                  <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col></el-row
+          >
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="鍚笉娓呮枃鏈�" prop="vaguetext">
+                <el-input
+                  type="textarea"
+                  :rows="2"
+                  placeholder="璇疯緭鍏ュ唴瀹�"
+                  v-model="indexform.userName"
+                  maxlength="30"
+                />
+              </el-form-item> </el-col
+          ></el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍚笉娓呰闊�" prop="vagueyy">
+                <el-upload
+                  class="upload-demo"
+                  action="https://jsonplaceholder.typicode.com/posts/"
+                  :on-change="handleChange"
+                  :file-list="fileList"
+                  :limit="1"
+                  :on-exceed="handleExceed"
+                >
+                  <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+                </el-upload>
+              </el-form-item>
+            </el-col></el-row
+          >
+          <el-form-item label="閫氱煡鍙橀噺" prop="name">
+            <el-row v-for="item in variablelist">
+              <el-col :span="4">
+                <el-input v-model="item.variable"></el-input>
+              </el-col>
+              <el-col :span="8" :offset="1">
+                <el-input v-model="item.value"></el-input>
+              </el-col>
+              <el-col :span="4" :offset="1">
+                <el-button
+                  type="success"
+                  icon="el-icon-plus"
+                  circle
+                  @click="addvariable(item)"
+                ></el-button>
+                <el-button
+                  type="danger"
+                  icon="el-icon-delete"
+                  circle
+                  @click="delvariable(item)"
+                ></el-button>
+              </el-col>
+            </el-row>
           </el-form-item>
-          <el-form-item label="鎸囨爣鍚嶇О">
-            <el-input v-model="form.name"></el-input>
-          </el-form-item>
-          <el-form-item label="鎸囨爣鍊�">
-            <el-input v-model="item.name"></el-input>
-          </el-form-item>
-          <el-form-item label="鐗规畩璧勬簮">
-            <el-radio-group v-model="form.resource">
-              <el-radio label="鍩虹"></el-radio>
-              <el-radio label="鑷畾涔�"></el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="鍩虹瑙勫垯">
-            <el-input type="textarea" v-model="item.valuetop"></el-input>
-          </el-form-item>
+
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="鎸囨爣璇存槑">
+                <el-input
+                  v-model="indexform.remark"
+                  type="textarea"
+                  placeholder="璇疯緭鍏ュ唴瀹�"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="浠呴檺闄㈠尯" prop="region">
+                <el-select
+                  v-model="indexform.courtyard"
+                  size="medium"
+                  filterable
+                  placeholder="璇烽�夋嫨"
+                >
+                  <el-option
+                    class="indexformaa"
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="鍏宠仈鎸囨爣" prop="region">
+                <el-select
+                  v-model="indexform.relevance"
+                  size="medium"
+                  filterable
+                  placeholder="璇烽�夋嫨鍒嗙被"
+                >
+                  <el-option
+                    class="indexformaa"
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="nextstep">纭� 瀹�</el-button>
+          <el-button @click="closeFm">鍏� 闂�</el-button>
+        </div>
+      </div>
+      <!-- 鎸囨爣璁剧疆 -->
+      <div v-if="Editprogress == 2">
+        <div class="leftvlue-jbxx">鎸囨爣棰樼洰璁剧疆</div>
+        <el-divider></el-divider>
+        <el-form
+          ref="form"
+          :model="indexform"
+          :rules="rules"
+          label-width="100px"
+        >
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="鎸囨爣鍚嶇О" prop="deptId">
+                <el-input
+                  v-model="indexform.name"
+                  placeholder="璇疯緭鍏ユ寚鏍囩绫�"
+                  maxlength="40"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="鐗堟湰鍙�" prop="deptId">
+                <el-input
+                  v-model="indexform.versions"
+                  placeholder="璇疯緭鍏ユ寚鏍囩绫�"
+                  maxlength="40"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="璇█" prop="deptId">
+                <el-select
+                  v-model="indexform.language"
+                  placeholder="璇烽�夋嫨璇█"
+                >
+                  <el-option
+                    v-for="index in languagelist"
+                    :key="index.value"
+                    :label="index.label"
+                    :value="index.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="鏄惁鍙敤" prop="deptId">
+                <el-select v-model="indexform.useofstate" placeholder="璇烽�夋嫨">
+                  <el-option
+                    v-for="index in qyoptions"
+                    :key="index.value"
+                    :label="index.label"
+                    :value="index.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="鎸囨爣鎻忚堪" prop="nickName">
+                <el-input
+                  v-model="indexform.nickName"
+                  placeholder="璇疯緭鍏ユ寚鏍囨弿杩�"
+                  maxlength="40"
+                />
+              </el-form-item> </el-col
+          ></el-row>
+          <el-form-item label="鏍囩" prop="desc">
+            <div class="xinz-inf">
+              <el-tag
+                :key="tag"
+                type="success"
+                v-for="tag in dynamicTags"
+                closable
+                :disable-transitions="false"
+                @close="handleClose(tag)"
+              >
+                {{ tag }}
+              </el-tag>
+              <el-select
+                v-model="inputValue"
+                v-if="inputVisible"
+                @change="handleInputConfirm"
+                filterable
+                placeholder="璇烽�夋嫨"
+              >
+                <el-option
+                  v-for="item in optionss"
+                  :key="item.label"
+                  :label="item.label"
+                  :value="item.label"
+                >
+                </el-option>
+              </el-select>
+              <el-button
+                v-else
+                class="button-new-tag"
+                size="small"
+                @click="showInput"
+                >+ 鏂板鏍囩</el-button
+              >
+            </div>
+          </el-form-item>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="鍊肩被鍨�">
+                <el-radio-group v-model="indexform.resource">
+                  <el-radio label="閫夐」"></el-radio>
+                  <el-radio label="鏂囨湰"></el-radio>
+                  <el-radio label="鏁板��"></el-radio>
+                </el-radio-group>
+              </el-form-item> </el-col
+          ></el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="閫傜敤鐤剧梾" prop="userName">
+                <el-select v-model="indexform.useofstate" placeholder="璇烽�夋嫨">
+                  <el-option
+                    v-for="index in qyoptions"
+                    :key="index.value"
+                    :label="index.label"
+                    :value="index.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item> </el-col
+          ></el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="閫傜敤鏂瑰紡" prop="email">
+                <el-select v-model="indexform.useofstate" placeholder="璇烽�夋嫨">
+                  <el-option
+                    v-for="index in qyoptions"
+                    :key="index.value"
+                    :label="index.label"
+                    :value="index.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-card class="box-card" style="margin-bottom: 20px">
+            <el-table v-loading="loading" :data="testuserList">
+              <el-table-column
+                label="搴忓彿"
+                align="center"
+                key="userid"
+                prop="userid"
+                width="50"
+              />
+              <el-table-column
+                label="鎸囨爣閫夐」"
+                align="center"
+                key="nickName"
+                prop="nickName"
+                :show-overflow-tooltip="true"
+              >
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="scope.row.nickName"
+                    placeholder="璇疯緭鍏ュ唴瀹�"
+                  ></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="瑙f瀽瑙勫垯"
+                align="center"
+                key="aphonenumber"
+                prop="aphonenumber"
+                width="460"
+                :show-overflow-tooltip="true"
+              >
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="scope.row.aphonenumber"
+                    placeholder="璇疯緭鍏ュ唴瀹�"
+                  ></el-input>
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                label="鎿嶄綔"
+                align="center"
+                width="200"
+                class-name="small-padding fixed-width"
+              >
+                <template slot-scope="scope">
+                  <el-button
+                    @click="addoption(scope.row)"
+                    type="success"
+                    icon="el-icon-circle-plus-outline"
+                    circle
+                  ></el-button>
+                  <el-button
+                    type="danger"
+                    icon="el-icon-delete"
+                    circle
+                    @click="deloption(scope.row)"
+                  ></el-button>
+                  <el-button
+                    @click="syioption(scope.row)"
+                    type="primary"
+                    icon="el-icon-top"
+                    circle
+                  ></el-button>
+                  <el-button
+                    @click="xiayioption(scope.row)"
+                    type="primary"
+                    icon="el-icon-bottom"
+                    circle
+                  ></el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-card>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="娴嬭瘯杈撳叆" prop="nickName">
+                <el-input
+                  v-model="testvalue"
+                  placeholder="璇疯緭鍏ユ祴璇曞唴瀹�"
+                  maxlength="40"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-button type="success">寮�濮嬫祴璇�</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div style="margin-bottom: 10px">
+          <el-input
+            type="textarea"
+            :rows="4"
+            placeholder="姝ゅ灞曠ず璇嗗埆缁撴灉"
+            v-model="testgovalue"
+          >
+          </el-input>
+        </div>
+        <el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
+        <el-button type="info" @click="closeFm('ruleForm')">鍏抽棴</el-button>
+        <el-button @click="Saveproblem('ruleForm')">淇濆瓨鎸囨爣鏁版嵁</el-button>
       </div>
     </div>
   </div>
@@ -69,8 +563,21 @@
 export default {
   data() {
     return {
-      optionvalue: "涓嶉渶瑕併�佹病鏈夈�佷笉鐭ラ亾",
-      form: {
+      Editprogress: 1, //缂栬緫杩涘害
+      loading: false, // 閬僵灞�
+      radio: "false", //鍗曢�夐閫変腑
+      radios: [], //澶氶�夐閫変腑
+      radioas: "", //濉┖棰樼瓟妗�
+      dynamicTags: ["鏍囩涓�", "鏍囩浜�", "鏍囩涓�"],
+      inputVisible: false,
+      inputValue: "",
+      testvalue: "",
+      testgovalue: "",
+      topicobj: {},
+      indexform: {},
+      // 鎬绘潯鏁�
+      total: 1,
+      ruleForm: {
         name: "",
         region: "",
         date1: "",
@@ -79,104 +586,423 @@
         type: [],
         resource: "",
         desc: "",
+        templatevalue: "",
+        data2: "",
       },
-      deployList: [
+      rules: {},
+      rulesa: {},
+      xjxsoptions: [
         {
-          id: 1,
-          name: "鏈�",
-          valuetop:
-            "(?!.*蹇榺.*涓峾.*娌�)^.*(鏄瘄鏈墊瀵箌鍋殀浣渱妫�|鏌澶嶈瘖|濂絴鍙傚姞|澶嶈瘖|鍘�(杩噟濂絴浜唡瀹寍鍖婚櫌)|鏉�(杩噟浜唡鍖婚櫌))|娌¢敊|瀵瑰憖|鍙兘|(宸茬粡|鏃�)鍘讳簡|寮�浜嗚嵂|鑵板甫|鍚婂甫|瑕佺殑|(?<!娌�)鏈夌殑|琛ㄥ甫,10;瑕�,5",
+          value: "閫夐」1",
+          label: "鍥炬枃",
         },
         {
-          id: 2,
-          name: "涓嶇煡閬�",
-          valuetop:
-            "(涓峾娌璋亅楝紎鎬庝箞).*(鐥厊鍙兘|鐭ラ亾|浜嗚В|娓呮|鎳倈鏄庣櫧|纭|纭畾|鏅撳緱|鐭ユ檽|璁ゅ緱|璇嗗緱|鍗拌薄|鐔熸倝|璁皘浼殀鍏冲績|鍏虫敞|娉ㄦ剰|鍛婅瘔|閫氱煡|鍚�)",
+          value: "閫夐」2",
+          label: "瑙嗛",
+        },
+        {
+          value: "閫夐」3",
+          label: "闊抽",
         },
       ],
+      fileList: [
+        {
+          name: "food.jpeg",
+          url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+        },
+      ],
+      qyoptions: [
+        {
+          value: 1,
+          label: "鍙敤",
+        },
+        {
+          value: 2,
+          label: "绂佺敤",
+        },
+      ],
+      options: [
+        {
+          value: "閫夐」1",
+          label: "鐤剧梾鎸囨爣",
+        },
+        {
+          value: "閫夐」2",
+          label: "鍏ラ櫌鎸囨爣",
+        },
+        {
+          value: "閫夐」3",
+          label: "鎵嬫湳鎸囨爣",
+        },
+        {
+          value: "閫夐」4",
+          label: "鎶ょ悊鎸囨爣",
+        },
+      ],
+      variablelist: [
+        {
+          variable: "paitent",
+          value: "琛ㄧず鎮h�呯殑鏍囪瘑",
+        },
+      ],
+      testuserList: [
+        {
+          userid: 1,
+          nickName: "璐",
+          aphonenumber: "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10",
+        },
+        {
+          userid: 2,
+          nickName: "姝e父",
+          aphonenumber: "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10",
+        },
+        {
+          userid: 55,
+          nickName: "闈炴甯�",
+          aphonenumber: "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10",
+        },
+        {
+          userid: 4,
+          nickName: "a姝e父",
+          aphonenumber: "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10",
+          status: "0",
+        },
+      ],
+
+      addvalue: "娣诲姞棰樼洰",
+      // 棰樼洰琛ㄦ牸鏁版嵁
+      userList: [
+        {
+          userid: "1",
+          userName: "涓�鍙锋寚鏍�",
+        },
+        {
+          userid: "2",
+          userName: "浜屽彿鎸囨爣",
+        },
+        {
+          userid: "3",
+          userName: "涓夊彿鎸囨爣",
+        },
+        {
+          userid: "4",
+          userName: "鍥涘彿鎸囨爣",
+        },
+      ],
+      languagelist: [
+        {
+          value: 1,
+          label: "鏅�氳瘽",
+        },
+        {
+          value: 2,
+          label: "绮よ",
+        },
+        {
+          value: 3,
+          label: "鑻辫",
+        },
+      ], //璇█鍒楄〃
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userName: undefined,
+        phonenumber: undefined,
+        status: undefined,
+        deptId: undefined,
+        IDnumber: undefined,
+      },
     };
   },
 
   created() {},
 
   methods: {
-    onSubmit() {
-      console.log("submit!");
-    },
-    deletei(index) {
-      console.log(index);
-      this.deployList.splice(index, 1);
-    },
-    addzbiao() {
-      const ids = this.deployList.length + 1;
-      console.log(ids);
-      this.deployList.push({
-        id: ids,
-        name: "",
-        valuetop: "",
+    submitForm(formName) {
+      this.rules = this.rulesa;
+      //   鎻愪氦
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          alert("submit!");
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
       });
     },
+    // 涓嬩竴姝�
+    nextstep() {
+      if (this.Editprogress <= 1 && this.indexform.relevance) {
+        return this.Editprogress++;
+      } else {
+        this.$message.warning("璇峰厛閫夋嫨鍏宠仈鎸囨爣");
+      }
+    },
+    // 涓婁竴姝�
+    laststep() {
+      this.Editprogress = this.Editprogress - 1;
+    },
+    // 鍏抽棴
+    closeFm() {
+      this.$confirm("閫�鍑轰笉浼氫繚鐣欓〉闈㈠唴瀹规洿鏀�, 鏄惁缁х画?", "鎻愮ず", {
+        confirmButtonText: "纭畾",
+        cancelButtonText: "鍙栨秷",
+        type: "warning",
+      })
+        .then(() => {
+          this.$router.go(-1);
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "宸插彇娑�",
+          });
+        });
+    },
+    // 淇濆瓨棰樼洰淇℃伅
+    Saveproblem() {},
+    /** 鏌ヨ棰樼洰鍒楄〃 */
+    getList() {
+      //   this.loading = true;
+      listUser().then((response) => {
+        console.log(response);
+        // this.userList = response.data;
+        // this.total = response.total;
+        // this.loading = false;
+        console.log(this.userList);
+      });
+      //   const { rows } = await listUser();
+      //   console.log(rows);
+      //   this.list = rows;
+    },
+    // 淇敼棰樼洰淇℃伅
+    Submittopicobj() {},
+    // 鏂板鍙橀噺
+    addvariable() {
+      this.variablelist.push({
+        variable: "",
+        value: "",
+      });
+    },
+    // 鍒犻櫎鍙橀噺
+    delvariable(item) {
+      const index = this.variablelist.indexOf(item);
+      if (index !== -1) {
+        this.variablelist.splice(index, 1); // 浠庣储寮曚綅缃垹闄や竴涓厓绱�
+      } else {
+        console.log("鏈壘鍒拌瀵硅薄");
+      }
+    },
+    // 鎺у埗鏂囦欢
+    handleChange(file, fileList) {
+      this.fileList = fileList.slice(-3);
+    },
+    // 鏂囦欢瓒呭嚭涓暟闄愬埗鏃剁殑閽╁瓙
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `褰撳墠闄愬埗閫夋嫨 3 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${
+          files.length + fileList.length
+        } 涓枃浠禶
+      );
+    },
+    // 鏍囩-----------------
+    handleClose(tag) {
+      this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
+    },
+    handleInputConfirm() {
+      let inputValue = this.inputValue;
+      if (inputValue) {
+        this.dynamicTags.push(inputValue);
+      }
+      this.inputVisible = false;
+      this.inputValue = "";
+    },
+    showInput() {
+      this.inputVisible = true;
+      // 鑷姩鑾峰彇鐒︾偣
+      // this.$nextTick((_) => {
+      //   this.$refs.saveTagInput.$refs.input.focus();
+      // });
+    },
+    // --------------------------
+    //娴嬭瘯琛ㄥ崟 --------------------------
+    addoption() {
+      this.testuserList.push({
+        userid: 1,
+        nickName: "璐",
+        aphonenumber: "(?!涓�.*|娌�.*|鏈�.*)^.*([璐钩鍑]|璐|璇勫|璇勫),10",
+      });
+      this.sortFn();
+    },
+    deloption() {
+      const index = this.testuserList.indexOf(item);
+      if (index !== -1) {
+        this.testuserList.splice(index, 1); // 浠庣储寮曚綅缃垹闄や竴涓厓绱�
+        this.sortFn();
+      } else {
+        console.log("鏈壘鍒拌瀵硅薄");
+      }
+    },
+    syioption(row) {
+      const index = this.getIndexInArray(this.testuserList, row);
+      const item = this.testuserList.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+      this.testuserList.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+      this.sortFn();
+    },
+    xiayioption(row) {
+      const index = this.getIndexInArray(this.testuserList, row);
+      const item = this.testuserList.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+      this.testuserList.splice(index + 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+      this.sortFn();
+    },
+    sortFn() {
+      this.testuserList = this.testuserList.map((item, index) => {
+        return {
+          userid: index + 1,
+          nickName: item.nickName,
+          aphonenumber: item.aphonenumber,
+        };
+      });
+      console.log(this.testuserList);
+    },
+    // ---------------------
+    // 鏌ヨ棰樺簱
+    handleQuery() {},
+    resetQuery() {},
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    },
+    // 渚挎嵎鏍囩
+    tsgnameto() {},
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.top-text {
-  margin: 15px;
-  margin-top: 0;
-  padding: 0 30px 30px 30px;
-  background: #f2f5fc;
+.Questionnairemanagement {
+  display: flex;
+}
+.sidecolumn {
+  width: 300px;
+  min-height: 100vh;
+  text-align: center;
+  //   display: flex;
+  //   margin-top: 20px;
+  margin: 20px;
+  margin-bottom: 0;
+  padding: 30px;
+  background: #edf1f7;
   border: 1px solid #dcdfe6;
   -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
     0 0 6px 0 rgba(0, 0, 0, 0.04);
 }
-.basic {
-  height: 50px;
-  margin: 15px;
-  margin-bottom: 0;
-  padding: 0 20px 20px 20px;
-  line-height: 50px;
-  background: #92c5f0;
+.leftvlue {
+  //   display: flex;
+  //   flex: 1;
+  width: 80%;
+  margin-top: 20px;
+  //   margin: 20px;
+  padding: 30px;
+  background: #ffff;
+  border: 1px solid #dcdfe6;
+  -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
+    0 0 6px 0 rgba(0, 0, 0, 0.04);
+
+  .leftvlue-jbxx {
+    font-size: 24px;
+    border-left: 5px solid #41a1be;
+    padding-left: 5px;
+    margin: 15px 0;
+  }
 }
-.headline {
+.xinz-inf {
+  font-size: 18px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+
+  line-height: 48px;
+
+  .el-tag + .el-tag {
+    margin-left: 10px;
+  }
+  .button-new-tag {
+    margin-left: 10px;
+    height: 32px;
+    line-height: 30px;
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+  .input-new-tag {
+    width: 90px;
+    margin-left: 10px;
+    vertical-align: bottom;
+  }
+}
+.button-new-tag {
+  margin-left: 10px;
+  height: 32px;
+  line-height: 30px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+.tsgname {
+  width: 90px;
+  margin-right: 10px;
+  text-align: center;
+  cursor: pointer;
+  height: 40px;
+  line-height: 40px;
+  background: #7799fa;
+  color: #ffff;
+  font-size: 18px;
+  border-radius: 5px;
+}
+.tsgname:hover {
+  background: #3366f5;
+}
+
+::v-deep .addtopic-input {
+  input {
+    background: #02a7f0;
+    color: #edf1f7;
+    width: 150px;
+  }
+}
+::v-deep.el-step.is-vertical .el-step__title {
+  font-size: 25px;
+}
+::v-deep.el-input--medium {
+  font-size: 18px !important;
+}
+
+.el-select__tags {
+  font-size: 20px;
+  max-width: 888px !important;
+}
+::v-deep.el-radio__inner {
+  width: 22px;
+  height: 22px;
+}
+// ::v-deep.topic-dev.el-radio__label {
+//   font-size: 24px;
+// }
+::v-deep.el-radio-group {
+  span {
+    font-size: 24px;
+  }
+}
+::v-deep.upload-demo {
   display: flex;
-  height: 50px;
-  margin: 15px;
-  margin-bottom: 0;
-  padding: 0 20px 20px 20px;
-  line-height: 50px;
-  background: #92c5f0;
-  justify-content: space-between;
 }
-.valuetop {
-  .val-text {
-    display: flex;
-    height: 50px;
-    margin: 15px;
-    margin-bottom: 0;
-    // padding: 0 20px 20px 20px;
-    padding: 0 20px;
-    align-items: center;
-    background: #92c5f0;
-    justify-content: space-between;
-    .text-icon {
-      width: 35px;
-      height: 35px;
-      line-height: 35px;
-      text-align: center;
-      background: #fafafa;
-      cursor: pointer;
-      border-radius: 5px;
-    }
-  }
-  .val-bon {
-    margin: 15px;
-    margin-top: 0;
-    padding: 30px;
-    background: #f2f5fc;
-    border: 1px solid #dcdfe6;
-    -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
-      0 0 6px 0 rgba(0, 0, 0, 0.04);
+::v-deep.el-checkbox-group {
+  span {
+    font-size: 24px;
   }
 }
+// ::v-deep.el-form-item--medium .el-form-item__content {
+//   line-height: 36px;
+//   display: flex;
+// }
 </style>

--
Gitblit v1.9.3