seo

src/components/doctorCheck/PatientRegisterList.vue

@@ -157,35 +157,39 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="jobPost" label="职务" width="200" />
-      <el-table-column prop="jobTitle" label="职称" />
-      <el-table-column prop="salesman" label="介绍人" />
-      <el-table-column prop="isVip" label="是否VIP" align="center">
+      <el-table-column prop="jobPost" label="职务" width="200" sortable/>
+      <el-table-column prop="jobTitle" label="职称" sortable/>
+      <el-table-column prop="salesman" label="介绍人" sortable/>
+      <el-table-column prop="isVip" label="是否VIP" align="center" sortable>
         <template slot-scope="scope">
           <div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="creatorName" label="登记人" />
-      <el-table-column prop="creationTime" label="登记日期" width="100" align="center">
+      <el-table-column prop="creatorName" label="登记人" sortable/>
+      <el-table-column prop="creationTime" label="登记日期" width="100" align="center" sortable>
         <template slot-scope="scope">
           <div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="isUpload" label="是否上传">
+      <el-table-column prop="isUpload" label="是否上传" sortable>
         <template slot-scope="scope">
           <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="completeFlag" label="体检进度">
+      <el-table-column prop="completeFlag" label="体检进度" sortable>
         <template slot-scope="scope">
           <div>{{ dddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="isLock" label="锁住">
+      <el-table-column prop="isLock" label="锁住" sortable>
         <template slot-scope="scope">
           <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
         </template>
       </el-table-column>
+      <el-table-column prop="summaryDoctorName" label="总检医生" sortable>        
+      </el-table-column>
+      <el-table-column prop="auditDoctorName" label="审核医生" sortable>        
+      </el-table-column>
     </el-table>
     <div style="display: flex;justify-content:space-between;">
       <div></div>
@@ -259,7 +263,7 @@ export default {
       loadOpts: {
         totalCount: 0,
         skipCount: 0,
-        maxResultCount: 100,
+        maxResultCount: 1000,
       },
       loadOptsInit: {},
 

src/components/sumDoctorCheck/SumSug.vue

@@ -800,6 +800,9 @@ export default {
 
     //获取历次综述
     getHistorySummary(patientRegisterId, isGetExistData) {
+      // 报告不获历次综述
+      if(this.history_summary_years_limit == '0') return
+
       if (!patientRegisterId) {
         this.sumDoctorCheck.historySummary = '';
         return
@@ -1657,21 +1660,22 @@ export default {
   color: #00F;
 }
 
-/* 表格底色 .el-table__body  .el-table__body-wrapper*/
+/* 表格底色 .el-table__body  .el-table__body-wrapper */
 ::v-deep .el-table {  
-  background-color: #B9CEE9;
   color: #000;
 }
 
 ::v-deep .el-table__row {
-  background-color: #B9CEE9;
   color: #000;
 }
 
 ::v-deep .el-textarea__inner {
-  background-color: #B9CEE9;
   color: #000;
 }
+::v-deep .el-input__inner { 
+  color: #000;
+}
+
 
 /* 设置单元格内内容顶对齐 */
 ::v-deep .el-table__cell {
@@ -1706,8 +1710,6 @@ export default {
   min-height: 23px;
   height: 23px;
   padding: 1px 15px 1px 2px;  
-  background-color: #B9CEE9;
-  color: #000 !important;
 }
 
 ::v-deep .commonFont .el-textarea__inner {

src/views/doctorCheck/sumDoctorCheck.vue

@@ -1,5 +1,6 @@
 <template>
-  <div style="background-color: #B9CEE9;">
+  <!-- style="background-color: #B9CEE9;"-->
+  <div>
     <div>
       <div class="contenttitle">
         体检 /<span class="contenttitleBold">总检医生诊台</span>

src/views/fee-settings/Asbitem.vue

@@ -282,6 +282,107 @@
                     </div>
                     <!-- 科室改为体检中心 -->
                   </el-tab-pane>
+                  <!-- 互斥组合项目 -->
+                  <el-tab-pane label="互斥组合项目" name="3">
+                    <div style="display: flex;">
+                      <!--未选组合项目-->
+                      <div style="display: block; width:300px;">
+                        <div>
+                          <span>项目类别</span>
+                          <el-cascader :options="dict.itemTypeTree" v-model="itemTypeIds" popper-class="example"
+                            style="margin-left: 3px;width:240px;"
+                            :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }"
+                            clearable filterable @change="getAsbItemByItemType" size="small">
+                          </el-cascader>
+                        </div>
+                        <div class="box">
+                          <el-table :data="dict.asbItem" border size="small" highlight-current-row :height="tableHeight"
+                            @row-dblclick="dbClickChoosedAsb" row-key="id" @selection-change="selectLeft"
+                            :row-class-name="handleRowClassName" @row-click="chooseAsbItem">
+                            <!--
+            <el-table-column type="selection" align="center" ></el-table-column>
+            -->
+                            <el-table-column type="index" align="center" width="40" />
+                            <el-table-column label="未选组合项目" min-width="170" prop="displayName"
+                              align="center"></el-table-column>
+                          </el-table>
+                        </div>
+                      </div>
+
+                      <!--中间操作按钮-->
+                      <div style="display: block;margin: 40px 10px 0 15px;width:110px;">
+                        <div v-show="checkPagePriv(pagePriv.privs, '添加')" style="padding: 5px 0;">
+                          <el-button class="commonbutton" @click="addAbs(asbItemChoosed, 'choosed')">添加 <i
+                              class="el-icon-arrow-right"></i></el-button>
+                        </div>
+                        <div v-show="checkPagePriv(pagePriv.privs, '全部添加')" style="padding: 5px 0;">
+                          <el-button class="difference" @click="addAbs(asbItemChoosed, 'all')">全部添加</el-button>
+                        </div>
+                        <div v-show="checkPagePriv(pagePriv.privs, '移除')" style="padding: 5px 0;">
+                          <el-button class="commonbutton" @click="delAbs(customerOrgGroupAsbitemsChoosed, 'choosed')">移除
+                            <i class="el-icon-arrow-left"></i></el-button>
+                        </div>
+                        <div v-show="checkPagePriv(pagePriv.privs, '全部移除')" style="padding: 5px 0;">
+                          <el-button class="difference"
+                            @click="delAbs(customerOrgGroupAsbitemsChoosed, 'all')">全部移除</el-button>
+                        </div>
+                      </div>
+
+                      <!--已选组合项目-->
+                      <div
+                        :style="'display: block; width:' + (window.pageWidth - 300 - 120 - window.pageMarginWidth - 110 - 5) + 'px;'">
+                        <div style="height:32px;">
+                          <div v-show="checkPagePriv(pagePriv.privs, '快速选择')">
+                            <span>快速选择</span>
+                            <el-select v-model="asbItemId" placeholder="快速选择组合项目" size="small" filterable
+                              default-first-option :filter-method="filterMethod" clearable
+                              @clear="quickAsb = deepCopy(dict.asbItemQuick)" @change="quickChoosedAsb"
+                              ref="quickAsbOCX" style="margin-left: 3px;width:240px;">
+                              <el-option v-for="item in quickAsb" :key="item.id" :value="item.id"
+                                :label="item.displayName" />
+                            </el-select>
+                          </div>
+                        </div>
+                        <div class="box">
+                          <el-table :data="customerOrgGroupAsbitems" border size="small" @selection-change="selectRight"
+                            highlight-current-row :height="tableHeight" :summary-method="getSummaries" show-summary
+                            :row-class-name="handleRowClassName" @row-dblclick="removeAbs" @row-click="removeAsbItem"
+                            ref="tableCustomerOrgGroupAsbitems">
+                            <!--
+            <el-table-column type="selection"></el-table-column>
+            -->
+                            <el-table-column type="index" width="40" align="center" />
+                            <el-table-column label="已选组合项目" min-width="140" prop="displayName"></el-table-column>
+                            <el-table-column label="标准价格" prop="price" min-width="60" align="center" />
+                            <el-table-column label="折扣" min-width="40" align="center">
+                              <template slot-scope="scope">
+                                <el-input @input="changeDiscount(scope.$index)" type="number" size="small"
+                                  v-model="scope.row.discount" />
+                              </template>
+                            </el-table-column>
+                            <el-table-column label="应收价格" prop="customerOrgGroupDetailPrice" min-width="60"
+                              align="center">
+                              <template slot-scope="scope">
+                                <el-input @input="changePrices(scope.$index)" type="number" size="small"
+                                  v-model="scope.row.customerOrgGroupDetailPrice" />
+                              </template>
+                            </el-table-column>
+                            <el-table-column label="数量" prop="customerOrgGroupDetailAmount" width="50" align="center">
+                              <template slot-scope="scope">
+                                <el-input @input="changePrices(scope.$index)" type="number" size="small"
+                                  v-model="scope.row.customerOrgGroupDetailAmount" />
+                              </template>
+                            </el-table-column>
+                            <el-table-column label="标准金额" prop="asbitemMoney" min-width="60" align="center">
+                            </el-table-column>
+                            <el-table-column label="应收金额" prop="customerOrgGroupDetailMoney" min-width="60"
+                              align="center">
+                            </el-table-column>
+                          </el-table>
+                        </div>
+                      </div>
+                    </div>
+                  </el-tab-pane>
                 </el-tabs>
               </div>
             </div>
@@ -1107,6 +1208,11 @@ export default {
   },
   computed: {
     ...mapState(["window", "dict"]),
+    tableHeight(){
+      return this.window.pageHeight < 600
+                  ? 190
+                  : Math.floor((this.window.pageHeight - 260) / 2)
+    },
   },
   methods: {
     dddw,