Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/components/patientRegister/PatientRegisterRecoverList.vue

@@ -4,22 +4,22 @@
       <el-table :data="tableData" width="100%" border :height="window.pageHeight < 600 ? 330 : window.pageHeight - 240" row-key="id"
         size="small" highlight-current-row ref="dataList" @selection-change="handleSelectionChange" @row-click="rowClick">
         <el-table-column type="selection" width="40" align="center" />
-        <el-table-column prop="isRecoverGuide" label="回收" align="center" width="50">
+        <el-table-column prop="isRecoverGuide" label="回收" align="center" width="50" sortable>
           <template slot-scope="scope">
             <el-checkbox :value="scope.row.isRecoverGuide == 'Y'" />
           </template>
         </el-table-column>
-        <el-table-column prop="completeFlag" label="体检进度">
+        <el-table-column prop="completeFlag" label="体检进度" sortable>
           <template slot-scope="scope">
             <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="isLock" label="锁住" width="50">
+        <el-table-column prop="isLock" label="锁住" width="50" sortable>
           <template slot-scope="scope">
             <i class="el-icon-lock" v-if="scope.row.isLock == 'Y'" style="font-size: 20px; color: red" />
           </template>
         </el-table-column>
-        <el-table-column prop="customerOrgParentName" label="单位" width="180">
+        <el-table-column prop="customerOrgParentName" label="单位" width="180" sortable>
           <template slot-scope="scope">
             <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}
             </div>

src/components/report/BtnReport.vue

@@ -725,12 +725,12 @@ export default {
                 if (e.isLock) e.isLock = e.isLock == 'Y' ? '√' : ''
                 //if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName")
                 // if (e.patientRegisterNo) e.patientRegisterNo = " " + e.patientRegisterNo
-                if (e.patientNo) e.patientNo = "'" + e.patientNo
-                if (e.idNo) e.idNo = "'" + e.idNo
+                if (e.patientNo) e.patientNo = e.patientNo
+                if (e.idNo) e.idNo = e.idNo + '&'
                 if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) {
-                    e.groupPack = e.medicalPackageName  // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
+                    e.packGroup = e.medicalPackageName  // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
                 } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) {
-                    e.groupPack = e.customerOrgGroupName // dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName")
+                    e.packGroup = e.customerOrgGroupName // dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName")
                 }
                 //if (e.nationId) e.nationId = dddw(this.dict.nation, "id", e.nationId, "displayName")
                 // if (e.idNo) e.idNo = " " + e.idNo