Merge branch 'master' of http://106.225.187.159:8081/jiankun/GY_ceshi_web

src/views/allcase/contFile/mainHomePage.vue

@@ -523,6 +523,8 @@
         <tr>
           <td class="table-value table-label" colspan="1" ref="YLZZ" style="font-weight: bold">医疗组长:</td>
           <td class="table-value" colspan="2">
+            <div v-if="!ifFile">{{ data.YLZZ }}</div>
+            <el-input v-else class="width100 tableReach" v-model="data.YLZZ" placeholder="请输入内容"></el-input>
             <!-- <el-input :disabled="!ifFile" class="width100 tableReach"  v-model="data.YLZZ" placeholder="请输入内容"></el-input> -->
           </td>
           <td class="table-value table-label" colspan="1" ref="AEE02" style="font-weight: bold">主任(副主任)医师：</td>
@@ -1322,13 +1324,13 @@
         <span>{{ data.CJSJ }}</span>
       </div>
       <div class="bottom-time-list" v-if="data.ZXSJ">
-        <span class="bottom-time-bold">修改时间:</span>
+        <span class="bottom-time-bold">首次签名时间:</span>
         <span>{{ data.ZXSJ }}</span>
       </div>
     </div>
     <div class="bottom-time bottom-time-botom" v-if="data.WCSJ">
       <div class="bottom-time-list">
-        <span class="bottom-time-bold">完成时间:</span>
+        <span class="bottom-time-bold">末次修改时间:</span>
         <span>{{ data.WCSJ }}</span>
       </div>
     </div>

src/views/allcase/contFile/medicalAdvice.vue

@@ -21,10 +21,6 @@
           <span class="cont-title-text cont-title-twidt">科别:</span>
           <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAB02C }}</span>
         </div>
-        <div class="cont-title-item">
-          <span class="cont-title-text">床号:</span>
-          <span class="cont-title-normal"></span>
-        </div>
         <div class="cont-title-item">
           <span class="cont-title-text">住院号码:</span>
           <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAA28 }}</span>

src/views/allcase/contFile/medicalTemporary.vue

@@ -21,10 +21,6 @@
           <span class="cont-title-text cont-title-twidt">科别:</span>
           <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAB02C }}</span>
         </div>
-        <div class="cont-title-item">
-          <span class="cont-title-text">床号:</span>
-          <span class="cont-title-normal"></span>
-        </div>
         <div class="cont-title-item">
           <span class="cont-title-text">住院号码:</span>
           <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAA28 }}</span>

src/views/recordsRoom/qc/contFile/medicalAdvice.vue

@@ -5,30 +5,11 @@
       <div class="cont-title-item">长期医嘱单</div>
       <div></div>
       <div class="cont-title-name">
-        <div class="cont-title-item">
-          <span class="cont-title-text">姓名:</span>
-          <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAA01 }}</span>
-        </div>
-        <div class="cont-title-item">
-          <span class="cont-title-text">性别:</span>
-          <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAA02C }}</span>
-        </div>
-        <div class="cont-title-item">
-          <span class="cont-title-text">年龄:</span>
-          <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAA04 }}</span>
-        </div>
-        <div class="cont-title-item">
-          <span class="cont-title-text cont-title-twidt">科别:</span>
-          <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAB02C }}</span>
-        </div>
-        <div class="cont-title-item">
-          <span class="cont-title-text">床号:</span>
-          <span class="cont-title-normal"></span>
-        </div>
-        <div class="cont-title-item">
-          <span class="cont-title-text">住院号码:</span>
-          <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAA28 }}</span>
-        </div>
+        <div class="cont-title-item"><span class="cont-title-text">姓名:</span><span v-if="dataObj.info" class="cont-title-normal">{{ dataObj.info.AAA01 }}</span></div>
+        <div class="cont-title-item"><span class="cont-title-text">性别:</span><span v-if="dataObj.info" class="cont-title-normal">{{ dataObj.info.AAA02C }}</span></div>
+        <div class="cont-title-item"><span class="cont-title-text">年龄:</span><span v-if="dataObj.info" class="cont-title-normal">{{ dataObj.info.AAA04 }}</span></div>
+        <div class="cont-title-item"><span class="cont-title-text cont-title-twidt">科别:</span><span v-if="dataObj.info" class="cont-title-normal">{{ dataObj.info.AAB02C }}</span></div>
+        <div class="cont-title-item"><span class="cont-title-text">住院号:</span><span v-if="dataObj.info" class="cont-title-normal">{{ dataObj.info.AAA28 }}</span></div>
       </div>
       <div class="table">
         <table ref="tables">

src/views/recordsRoom/qc/contFile/medicalTemporary.vue

@@ -22,12 +22,8 @@
           <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAB02C }}</span>
         </div>
         <div class="cont-title-item">
-          <span class="cont-title-text">床号:</span>
-          <span class="cont-title-normal"></span>
-        </div>
-        <div class="cont-title-item">
-          <span class="cont-title-text">住院号码:</span>
-          <span class="cont-title-normal" v-if="dataObj.info">{{ dataObj.info.AAA28 }}</span>
+          <span class="cont-title-text">住院号:</span>
+          <span v-if="dataObj.info" class="cont-title-normal">{{ dataObj.info.AAA28 }}</span>
         </div>
       </div>
       <div class="table">