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

src/components/customerOrg/customerOrgEdit.vue

@@ -89,7 +89,8 @@
             <el-form-item label="人员类别" prop="personnelTypeId">
               <el-select v-model="form.personnelTypeId" placeholder="请选择" filterable clearable
                 :style="'width:' + Math.floor((window.pageWidth - 585) / 3) + 'px;'" size="small">
-                <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName" :value="item.id" />
+                <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName"
+                  :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -109,7 +110,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="常用单位" prop="isRecommend">              
+            <el-form-item label="常用单位" prop="isRecommend">
               <el-checkbox v-model="form.isRecommend" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
@@ -157,7 +158,10 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="介绍人" prop="salesPerson">
-              <el-input v-model="form.salesPerson" />
+              <el-select v-model="form.salesPerson" placeholder="请选择" filterable clearable allow-create size="small"
+              :style="'width:' + Math.floor((window.pageWidth - 585) / 3) + 'px;'">
+                <el-option v-for="item in dictSalesman" :key="item.id" :label="item.surname" :value="item.surname"/>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -262,9 +266,9 @@ export default {
         lastModificationTime: null,
         salesPerson: "",
         salesPersonPhone: "",
-        medicalTypeId:'',
-        personnelTypeId:'',
-        isRecommend:'N',
+        medicalTypeId: '',
+        personnelTypeId: '',
+        isRecommend: 'N',
       }, //初始化  单位 记录 目前新增与更新是一致
       formInit: {},
       rules: {
@@ -276,6 +280,8 @@ export default {
         ],
       },
       isshow: false,
+
+      dictSalesman:[],
     };
   },
 
@@ -368,6 +374,14 @@ export default {
         }
       });
 
+      // 业务员 {operatorTypes:["1","3"]}
+      postapi('/api/identity/users/GetListByOperatorType', { operatorTypes: ["0", "1", "2", "3", "4"] })
+        .then(res => {
+          if (res.code > -1) {
+            this.dictSalesman = res.data
+          }
+        })
+
     },
 
     //更新获取单位树节点数据(局部刷新)
@@ -490,8 +504,8 @@ export default {
             body.parentId = null;
           }
         }
-        if(!body.medicalTypeId) delete body.medicalTypeId;
-        if(!body.personnelTypeId) delete body.personnelTypeId;
+        if (!body.medicalTypeId) delete body.medicalTypeId;
+        if (!body.personnelTypeId) delete body.personnelTypeId;
 
 
         console.log("body", body, "this.form", this.form);

src/components/doctorCheck/PatientRegisterList.vue

@@ -603,7 +603,7 @@ export default {
 
 /* 部份已检 */
 ::v-deep .el-table .complete2 {
-  background: #b9cee9 !important;
+  background: #ec7504 !important;
 }
 /* 总检 */
 ::v-deep .el-table .complete3 {

src/components/patientRegister/PatientRegisterEdit.vue

@@ -208,8 +208,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="3">
-                <el-form-item label="介绍人" prop="salesman">
-                  <el-input v-model="form.salesman" size="small"></el-input>
+                <el-form-item label="介绍人" prop="salesman">                 
+                  <el-select v-model="form.salesman" placeholder="请选择" filterable clearable allow-create
+                    size="small">
+                    <el-option v-for="item in dictSalesman" :key="item.id" :label="item.surname" :value="item.surname"/>
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -1067,6 +1070,8 @@ export default {
       customerOrgRegister: {}, // 当前选择体检次数
 
       hc_warn_mode: '1',  //0-仅提醒；1-提醒并决择；2-有互斥项目时不允许保存
+
+      dictSalesman:[] // 
     };
   },
 
@@ -1315,7 +1320,13 @@ export default {
         }
       })
 
-
+      // 业务员 {operatorTypes:["1","3"]}
+      postapi('/api/identity/users/GetListByOperatorType',{operatorTypes:["0","1","2","3","4"]})
+        .then(res => {
+          if (res.code > -1) {            
+            this.dictSalesman = res.data
+          }
+        })
 
       //项目类别 树结构
       // getapi("/api/app/item-type/by-code-all").then((res) => {
@@ -1427,6 +1438,7 @@ export default {
 
         this.peisid = window.sessionStorage.getItem('peisid');
         let customerOrgId, customerOrgName, customerOrgParentId
+
         if (this.patientRegister.query.customerOrgId) {
           customerOrgParentId = this.patientRegister.query.CustomerOrgParentId
           customerOrgId = this.patientRegister.query.customerOrgId
@@ -1436,6 +1448,7 @@ export default {
           customerOrgId = this.form.customerOrgId
           customerOrgName = this.form.customerOrgName
         }
+
         this.preCustomerOrgId = this.patientRegister.query.customerOrgId
         if (!patientRegisterId) { //添加
           this.form = Object.assign({}, this.form, this.formInit)
@@ -2360,8 +2373,10 @@ export default {
     btnAdd() {
       // 当前面点新增时，清部份信息
       this.clearPerson()
-      this.dataTransOpts.tableS.patient_register.id = ''
-      this.dataTransOpts.refresh.patient_register.S++
+      // this.dataTransOpts.tableS.patient_register.id = ''
+      // this.dataTransOpts.refresh.patient_register.S++
+      this.dataTransOpts.tableM.register_check_asbitem = []
+      //this.changeItemType(deepCopy(this.dataTransOpts.copyGroup.itemTypeIds))
     },
 
     //将现有的数据，复制并展现，但未保存

src/components/report/BtnReport.vue

@@ -994,7 +994,8 @@ export default {
 
         // 导出pdf
         try {
-          if (e.completeFlag == "3") {
+          // 石家庄长城 手动导出没有总检也可以导出
+          //if (e.completeFlag == "3") {
             toOutShell.BusinessCode = e.patientRegisterId;
             toOutShell.ExportDirectory = `${path}\\${e.patientName}_${e.patientRegisterNo}.pdf`;
             toOutShell.customerOrgName = e.customerOrgName || ""; // 增加单位名称参数
@@ -1006,7 +1007,7 @@ export default {
             if (JSON.parse(res).code < 0) {
               console.log("this.$peisAPI.exportToPdfPre err", res);
             }
-          }
+          //}
         } catch (error) {
           console.log("error", error);
           this.$message.warning({ showClose: true, message: error });

src/components/report/PatientRegisterListNobtn.vue

@@ -159,6 +159,19 @@ export default {
     this.loadOptsInit = Object.assign({}, this.loadOpts)
     this.patientRegister.prList = []
 
+    try {
+      let LocalConfig = JSON.parse(
+        window.localStorage.getItem("LocalConfig") || null
+      );
+      if (LocalConfig?.normal?.maxResultCount) {
+        this.loadOpts.maxResultCount =
+          LocalConfig.normal.maxResultCount;
+      }
+    } catch (error) {
+      console.log('window.localStorage.getItem("LocalConfig")', error);
+    }
+
+
     // 系统参数，获取 总检别名
     postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId: "summary_check_doctor_alias" })
       .then(res => {

src/components/sumDoctorCheck/SumAsbItemStatus.vue

@@ -3,7 +3,7 @@
     <div class="asbitemListClass">
       <div class="asbTitle">未检组合项目：</div>
       <div style="overflow-y:auto; height:68px;width:100%; margin-top:2px;border: 1px solid;">
-        <el-tag style="color:#303133;background-color: white;margin-left: 5px;" v-for="item in data.unCheckedAsbitem" :key="item" size="mini">{{
+        <el-tag style="color:red;background-color: white;margin-left: 5px;" v-for="item in data.unCheckedAsbitem" :key="item" size="mini">{{
           item }}</el-tag>
       </div>
     </div>