DJ

src/assets/css/global.css

@@ -25,13 +25,12 @@
 }
 
 
-/* 表格选中行 颜色 ::v-deep */
+/* 表格选中行 颜色 ::v-deep  #F4F8FF*/
 
 .el-table__body tr.current-row>td {
-    background-color: #F4F8FF !important;
+    background-color: #DCE7FD !important; 
 }
 
-
 /* 表格行背景色样式 end */
 
 

src/components/patientRegister/PatientLisRequest.vue

@@ -1,76 +1,90 @@
 <template>
-  <div>
-    <el-table :data="dataTransOpts.tableM.lis_request" border
-      :height="window.pageHeight < 600 ? 140 : Math.floor((window.pageHeight - 250) *2/ 5)" size="small"
-      highlight-current-row >
-      <el-table-column label="序号" width="50" align="center">
-        <template slot-scope="scope">
-          <div>           
-            {{ scope.$index + 1 }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column prop="asbitemName" label="已选组合项目" width="120" />
-      <el-table-column prop="standardPrice" label="标准价" align="center" />
-      <el-table-column prop="discount" label="折扣" align="center" />
-      <el-table-column prop="amount" label="数量" width="50" align="center" />
-      <el-table-column prop="chargePrice" label="价格" align="center" />
-      <el-table-column prop="payTypeFlag" label="支付方式" align="center">
-        <template slot-scope="scope">
-          <div>{{ dddw(dict.payType, "id", scope.row.payTypeFlag, "displayName") }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column prop="isCharge" label="收费" min-width="50" align="center">
-        <template slot-scope="scope">
-          <el-checkbox :value="scope.row.isCharge == 'Y'" align="center" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="checkCompleteFlag" label="状态" min-width="50" align="center">
-        <template slot-scope="scope">
-          <div>
-            {{
-              dddw(
-                dict.checkCompleteFlag,
-                "id",
-                scope.row.checkCompleteFlag,
-                "displayName"
-              )
-            }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column prop="isLock" label="锁" min-width="50" align="center">
-        <template slot-scope="scope">
-          <el-checkbox :value="scope.row.isLock == 'Y'" align="center" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="creatorName" label="登记人" min-width="70" align="center" />
-      <el-table-column prop="creationTime" label="登记日期" min-width="90" align="center">
-        <template slot-scope="scope">
-          <div>{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}</div>
-        </template>
-      </el-table-column>
-    </el-table>
+  <div style="display: flex;">
+    <div>
+      <el-table :data="dataTransOpts.tableM.lis_request" border @row-click="rowClick"
+        :height="window.pageHeight < 600 ? 140 : Math.floor((window.pageHeight - 250) * 2 / 5)" size="small"
+        highlight-current-row ref="lis_request">
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column prop="isPrint" label="打印" min-width="50">
+          <template slot-scope="scope">
+            <i class="el-icon-printer" v-if="scope.row.isPrint == 'Y'" style="font-size: 20px; color: green" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="patientName" label="姓名" min-width="70" align="center" />
+        <el-table-column prop="lisRequestNo" label="条码号" min-width="120" align="center" />
+        <el-table-column prop="sampleTypeName" label="标本" min-width="50" align="center" />
+        <el-table-column prop="sampleContainerName" label="标本容器" min-width="100" />
+        <el-table-column prop="containerColor" label="颜色" width="50" align="center">
+          <template slot-scope="scope">
+            <div
+              :style="`width: 45px;height: 25px;border-radius: 3px;background-color: ${colorTrans(scope.row.containerColor)};`">
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="sampleContainerRemark" label="容器说明" min-width="100" />
+        <el-table-column prop="asbitemNames" label="检验项目" min-width="120" />
+        <el-table-column prop="samplerName" label="采样人" min-width="70" align="center" />
+        <el-table-column prop="samplingTime" label="采样时间" min-width="120" align="center" />
+        <el-table-column prop="isSignIn" label="是否签收" width="70" align="center">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isSignIn == 'Y' ? '√' : '' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="signInOrder" label="签收顺序" width="70" align="center" />
+        <el-table-column prop="signInPerson" label="签收人" min-width="70" align="center" />
+        <el-table-column prop="signInTime" label="签收时间" min-width="120" align="center" />
+      </el-table>
+    </div>
+    <div style="margin-left: 10px;width: 110px;">
+      <div v-show="checkPagePriv(pagePriv.privs, '全选')" class="listBtn">
+        <el-button type="success" class="commonbutton" @click="btnChoose(true)">全选</el-button>
+      </div>
+      <div v-show="checkPagePriv(pagePriv.privs, '取消全选')" class="listBtn">
+        <el-button type="success" class="commonbutton" @click="btnChoose(false)">取消全选</el-button>
+      </div>
+      <div v-show="checkPagePriv(pagePriv.privs, '打印')" class="listBtn">
+        <el-button type="primary" class="commonbutton" @click="lisPrint(false)">打印条码</el-button>
+      </div>
+      <div v-show="checkPagePriv(pagePriv.privs, '预览条码')" class="listBtn">
+        <el-button type="danger" class="deleteButton" @click="lisPrint(true)">预览条码</el-button>
+      </div>
+      <div v-show="checkPagePriv(pagePriv.privs, '发送申请')" class="listBtn">
+        <el-button type="danger" class="deleteButton" @click="LisRequest(true)">发送申请</el-button>
+      </div>
+      <div v-show="checkPagePriv(pagePriv.privs, '撤消申请')" class="listBtn">
+        <el-button type="danger" class="deleteButton" @click="LisRequest(false)">撤消申请</el-button>
+      </div>
+    </div>
   </div>
 </template>
 <script>
 import moment from "moment";
 import { mapState } from "vuex";
-import { dddw } from "../../utlis/proFunc";
+import { dddw, getPagePriv, checkPagePriv, } from "../../utlis/proFunc";
 import { getapi, postapi, putapi, deletapi } from "../../api/api";
+import LisRequest from "./LisRequest.vue";
 
 export default {
   components: {},
   data() {
-    return {};
+    return {
+      pagePriv: {
+        routeUrlorPageName: 'patientLis', //当前页面归属路由或归属页面权限名称
+        privs: [] // 页面权限
+      },
+      chooseRows:[], // 选中的行
+    };
   },
 
   created() {
+    //获取用户当前页面的权限
+    let userPriv = window.sessionStorage.getItem('userPriv')
+    if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
 
   },
 
   updated() {
-    
+
   },
 
   //挂载完成
@@ -80,22 +94,43 @@ export default {
     ...mapState(["window", "dataTransOpts", "dict", "patientRegister"]),
   },
   methods: {
-    dddw, moment,
+    dddw, moment,checkPagePriv,
+
+    //颜色转换
+    colorTrans(intDataColor) {
+      let tempColor = '000000' + Number(intDataColor).toString(16)
+      let backgroundColor = '#' + tempColor.substring(tempColor.length - 6)
+      return backgroundColor
+    },
+
+    // 选中行
+    rowClick(row){
+      this.chooseRows = [row]
+    },
+
+    // 全选 / 取消全选
+    btnChoose(isChooseAll){
+      // this.$refs.singleTable.setCurrentRow(row);
+      // lis_request
+
+    },
+    
 
     // 刷新条码项目
     retrieve_lis_request(patientRegisterId) {
+      this.chooseRows = []
       this.dataTransOpts.tableM.lis_request = []
       if (!patientRegisterId) return
       // console.log(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`, res)
-      postapi('/api/app/printreport/GetLisRequestReportByPatientRegisterId',{patientRegisterId})
-        .then(res => {          
-          if (res.code > -1) {           
+      postapi('/api/app/printreport/GetLisRequestReportByPatientRegisterId', { patientRegisterId })
+        .then(res => {
+          if (res.code > -1) {
             this.dataTransOpts.tableM.lis_request = res.data
           }
         })
     },
 
-    
+
   },
 
   //监听事件

src/components/patientRegister/PatientRegisterEdit.vue

@@ -1101,19 +1101,12 @@ export default {
     },
 
     // //分组改变时触发
-    changeCustomerOrgGroupId() {
-      // this.patientRegister.customerOrgGroupChange++;      
-      // if (this.form.id) this.btnSubmit('form', false);
-      // this.getGroupPackageAsb('group',this.form.customerOrgGroupId)
+    changeCustomerOrgGroupId() {      
       this.prAsbOpraOpts.prAsbGroup++
-
     },
 
     // //套餐改变时触发
-    changeMedicalPackageId() {
-      // this.patientRegister.medicalPackageChange++;
-      // if (this.form.id) this.btnSubmit('form', false);
-      // this.getGroupPackageAsb('package',this.form.medicalPackageId)
+    changeMedicalPackageId() {      
       this.prAsbOpraOpts.prAsbPackage++
     },
 
@@ -1272,7 +1265,11 @@ export default {
         body.birthDate = null
       }
       if (body.birthDate == "Invalid date") body.birthDate = null
-      if (isNaN(body.age)) body.age = null
+      if (isNaN(body.age)){
+        body.age = null
+      }else{
+        body.age = Number(body.age)
+      }
       // console.log('body',body)
       // Invalid date
 
@@ -1640,6 +1637,7 @@ export default {
       let user = window.sessionStorage.getItem('user');
       let toOutShell = {
         ReportCode, token,
+        IsMoreLabel:'Y',
         isBuildImage: 'N',
         IsUploadPdf: 'N',
         BusinessCode:this.form.id,

src/components/patientRegister/PatientRegisterList.vue

@@ -1119,6 +1119,7 @@ export default {
       let toOutShell = {
         ReportCode,
         token,
+        IsMoreLabel:'Y',
         isBuildImage:'N',
         IsUploadPdf:'N',
         preViewCanPrint: "N",