qztl

src/components/common/LocalConfig.vue

@@ -13,6 +13,13 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="登记组件">
+                <el-checkbox v-model="LocalConfig.normal.isDevTool" size="small" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="检验条码">

src/components/patientRegister/PatientRegisterEdit.vue

@@ -23,17 +23,9 @@
               <el-col :span="5">
                 <el-form-item label="单位名称" prop="customerOrgName">
                   <el-input placeholder="请选择单位" v-model="form.customerOrgName" size="small" disabled>
-                    <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
-                      style="font-size: 20px;"></el-button>
+                    <el-button slot="append" icon="el-icon-search" @click="dialogOrg = true" style="font-size: 20px;"
+                      :disabled="(form.completeFlag == '3' || isDoctor != '1') ? true : false"></el-button>
                   </el-input>
-                  <!--
-                  <el-cascader v-model="form.customerOrgId" :options="patientRegister.customerOrgTreeAll"
-                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" filterable
-                    popper-class="example" :show-all-levels="false" @change="changeCustomerOrgId"
-                    :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }"
-                    :disabled="(form.completeFlag == '3' || isDoctor != '1') ? true : false" size="small">
-                  </el-cascader>
-                  -->
                 </el-form-item>
               </el-col>
               <el-col :span="5">
@@ -324,6 +316,60 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <!--青藏公司 start-->
+            <el-row>
+              <el-col :span="4">
+                <el-form-item label="高原/健康" >
+                  <el-input v-model="form.qztlType" size="small"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="2">
+                <el-form-item label="普速" >
+                  <el-checkbox v-model="form.qztlIsCw" true-label="Y" false-label="N" size="small"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="2">
+                <el-form-item label="从业" >
+                  <el-checkbox v-model="form.qztlIsCy" true-label="Y" false-label="N" size="small"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="2">
+                <el-form-item label="高铁" >
+                  <el-checkbox v-model="form.qztlIsGt" true-label="Y" false-label="N" size="small"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="2">
+                <el-form-item label="行车" >
+                  <el-checkbox v-model="form.qztlIsMain" true-label="Y" false-label="N" size="small"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="2">
+                <el-form-item label="职害" >
+                  <el-checkbox v-model="form.qztlIsWh" true-label="Y" false-label="N" size="small"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="2">
+                <el-form-item label="复检" >
+                  <el-checkbox v-model="form.qztlIsFj" true-label="Y" false-label="N" size="small"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="2">
+                <el-form-item label="导入" >
+                  <el-checkbox v-model="form.isQztlImport" true-label="Y" false-label="N" size="small"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="2">
+                <el-form-item label="上传" >
+                  <el-checkbox v-model="form.uploadQztlFlag" true-label="Y" false-label="N" size="small"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item label="计划" prop="planuserid">
+                  <el-input v-model="form.planuserid" size="small"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!--青藏公司 end-->
             <el-row>
               <el-col :span="6">
                 <el-form-item label="创建人员">
@@ -480,6 +526,19 @@
         </span>
       </el-dialog>
 
+      <el-dialog title="选择单位" :visible.sync="dialogOrg" width="800px" :close-on-click-modal="false" :append-to-body="true">
+        <div style="height: 320px;">
+          <el-cascader v-model="form.customerOrgId" :options="patientRegister.customerOrgTreeAll" style="width:400px;"
+            filterable popper-class="example" :show-all-levels="false"
+            :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }" size="small">
+          </el-cascader>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="btnOkOrg">确定</el-button>
+          <el-button @click="dialogOrg = false">关闭</el-button>
+        </span>
+      </el-dialog>
+
       <!-- 拍照（openCamera） 网页模式，已废弃  
     <el-dialog title="拍照" :visible.sync="patientRegister.cameraVisble" width="400" height="600"
       :close-on-click-modal="false" :append-to-body="true">
@@ -518,6 +577,7 @@
 import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { getTreeNode } from "../../utlis/tree"
 
 import {
   getPagePriv, checkPagePriv, objCopy, setNull, dddw, checkIDCode, parseID,
@@ -568,8 +628,8 @@ export default {
         patientId: "00000000-0000-0000-0000-000000000000", //档案号ID 选择了档案就传档案号，未选就传00000-0000...
         patientNo: "", //档案号
         customerOrgId: ["00000000-0000-0000-0000-000000000001"], //单位编号 默认个人 
-        customerOrgParentId: "",
-        customerOrgName: "",
+        customerOrgParentId: "00000000-0000-0000-0000-000000000001",
+        customerOrgName: "个人体检",
         customerOrgRegisterId: "00000000-0000-0000-0000-000000000001", //默认单位体检次数
         customerOrgGroupId: null, //分组
         medicalPackageId: null, //套餐
@@ -670,6 +730,7 @@ export default {
         prAsbPackage: 0, //触发套餐更换
       },
       nation: [], //
+      dialogOrg: false,
     };
   },
 
@@ -839,16 +900,47 @@ export default {
       // // console.log("dict", this.dict);
     },
 
+    // 确定选中企业
+    btnOkOrg() {
+      let customerOrgId = ''
+      this.changeCustomerOrgId(this.form.customerOrgId)
+      if (Array.isArray(this.form.customerOrgId)) {
+        this.form.customerOrgParentId = this.form.customerOrgId[0]
+        customerOrgId = this.form.customerOrgId[this.form.customerOrgId.length - 1]
+      } else {
+        this.form.customerOrgParentId = this.form.customerOrgId
+        customerOrgId = this.form.customerOrgId
+      }
+      let node = getTreeNode(this.patientRegister.customerOrgTreeAll, "treeChildren", "id", customerOrgId)
+      if (node) this.form.customerOrgName = node.displayName
+
+      this.dialogOrg = false
+    },
+
+
+
 
     // 获取登记信息 初始form表单数据
     async initFormData(patientRegisterId) {
       this.peisid = window.sessionStorage.getItem('peisid');
-      this.preCustomerOrgId = this.preCustomerOrgId || this.patientRegister.query.customerOrgId
+      let customerOrgId,customerOrgName,customerOrgParentId
+      if(this.patientRegister.query.customerOrgId){
+        customerOrgParentId = this.patientRegister.query.CustomerOrgParentId
+        customerOrgId = this.patientRegister.query.customerOrgId
+        customerOrgName = this.patientRegister.query.customerOrgName
+      }else{
+        customerOrgParentId = this.form.customerOrgParentId
+        customerOrgId = this.form.customerOrgId
+        customerOrgName = this.form.customerOrgName
+      }
+      this.preCustomerOrgId = this.patientRegister.query.customerOrgId
       if (!patientRegisterId) { //添加
         objCopy(this.formInit, this.form);
+        this.form.registerCheckAsbitems=[] 
         this.form.medicalCenterId = this.peisid; //体检中收
-        this.form.customerOrgId = this.preCustomerOrgId || this.dict.personOrgId //体检单位
-        this.form.customerOrgParentId = await this.getParentCustomerOrgId(this.form.customerOrgId) //体检父单位
+        this.form.customerOrgId = customerOrgId //体检单位
+        this.form.customerOrgParentId = customerOrgParentId //体检父单位
+        this.form.customerOrgName = customerOrgName
         this.handleFormData()
       } else {
         // let res = await getapi(`/api/app/patient-register/${patientRegisterId}`)
@@ -865,7 +957,7 @@ export default {
     handleFormData() {
       this.initBox();
       this.getPeoplePhoto(this.form.photo)
-      
+
       // this.dataTransOpts.refresh.register_check_asbitem.D++ //触发所选组合项目刷新 (取消这种触发，减少交互)
       this.dataTransOpts.tableM.register_check_asbitem = this.form.registerCheckAsbitems
       this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
@@ -875,6 +967,8 @@ export default {
 
       // 单位/个人 的分组与套餐处理
       this.changeCustomerOrgId(this.form.customerOrgId)
+
+      this.dataTransOpts.refresh.register_check_asbitem.OnlyRefreshAsbitem++
     },
 
 
@@ -915,29 +1009,24 @@ export default {
           this.getCustomerOrgRegisterList(customerOrgParentId)
         }
 
-        // 父单位被更改时，需要触发 修改 分组/套餐
-        if (this.form.customerOrgParentId != customerOrgParentId) {
-          this.form.customerOrgGroupId = null
-          this.form.medicalPackageId = null
-          // 清除套餐分组标识
-          this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-            e.isBelongGroupPackage = 'N'
-          });
-
-          if (customerOrgParentId == this.dict.personOrgId) {
+        // 需要触发 修改 分组/套餐        
+        this.form.customerOrgGroupId = null
+        this.form.medicalPackageId = null
+        // 清除套餐分组标识
+        this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
+          e.isBelongGroupPackage = 'N'
+        });
 
-            this.patientRegister.customerOrgGroup = []
-          } else {
-            this.form.customerOrgRegisterId = null
-          }
+        if (customerOrgParentId == this.dict.personOrgId) {
+          this.patientRegister.customerOrgGroup = []
+        }
 
-          if (this.form.customerOrgParentId == this.dict.personOrgId) {
-            this.changeMedicalPackageId()
-          } else {
-            this.changeCustomerOrgGroupId()
-          }
-          this.form.customerOrgParentId = customerOrgParentId
+        if (this.form.customerOrgParentId == this.dict.personOrgId) {
+          this.changeMedicalPackageId()
+        } else {
+          this.changeCustomerOrgGroupId()
         }
+          
       }
     },
 
@@ -966,7 +1055,8 @@ export default {
           if (res.code > - 1) {
             // console.log('获取单位体检次数', this.form.customerOrgRegisterId, res.data)
             this.customerOrgRegisterList = res.data
-            if (!this.form.customerOrgRegisterId) {
+
+            if (!this.form.customerOrgRegisterId || this.form.customerOrgRegisterId == "00000000-0000-0000-0000-000000000001") {
               let customerOrgRegisterList = arrayFilter(res.data, 'isComplete', 'N')  //不显示已完成的体检次数
               if (customerOrgRegisterList.length > 0) {
                 this.form.customerOrgRegisterId = customerOrgRegisterList[customerOrgRegisterList.length - 1].id

src/components/patientRegister/PatientRegisterItem.vue

@@ -1195,6 +1195,14 @@ export default {
       }
     },
 
+    "dataTransOpts.refresh.register_check_asbitem.OnlyRefreshAsbitem": {
+      // immediate: true, // 立即执行
+      // deep: true, // 深度监听复杂类型内变化
+      handler(newVal, oldVal) {
+        if (newVal != oldVal) this.refreshAsbitem()
+      }
+    },
+
     //更换分组
     "prAsbOpraOpts.prAsbGroup": {
       // immediate: true, // 立即执行

src/components/patientRegister/PatientRegisterList.vue

@@ -31,9 +31,18 @@
                 <div v-else-if="dropCol[index].prop == 'isLock'">
                   <i class="el-icon-lock" v-if="scope.row.isLock == 'Y'" style="font-size: 20px; color: red" />
                 </div>
-                <div v-else-if="dropCol[index].prop == 'isVip' || dropCol[index].prop == 'isUpload'">
+                <div v-else-if="dropCol[index].prop == 'isVip'
+                  || dropCol[index].prop == 'isUpload'
+                  || dropCol[index].prop == 'qztlIsMain'                  
+                  || dropCol[index].prop == 'qztlIsCy'
+                  || dropCol[index].prop == 'qztlIsCw'
+                  || dropCol[index].prop == 'qztlIsGt'
+                  || dropCol[index].prop == 'qztlIsWh'
+                  || dropCol[index].prop == 'qztlIsFj'
+                  ">
                   {{ scope.row[dropCol[index].prop] == "Y" ? "是" : "否" }}
                 </div>
+
                 <div v-else-if="dropCol[index].prop == 'customerOrgParentName'">
                   {{ scope.row.customerOrgParentName
                     ? scope.row.customerOrgParentName
@@ -314,6 +323,13 @@ export default {
         { label: "登记人", prop: "creatorName", minWidth: 80, align: "center" },
         { label: "登记日期", prop: "creationTime", minWidth: 80, align: "center" },
         { label: "是否上传", prop: "isUpload", minWidth: 80, align: "center" },
+        { label: "高原/健康", prop: "qztlType", minWidth: 90, align: "center" },
+        { label: "行车", prop: "qztlIsMain", minWidth: 50, align: "center" },
+        { label: "从业", prop: "qztlIsCy", minWidth: 50, align: "center" },
+        { label: "普速", prop: "qztlIsCw", minWidth: 50, align: "center" },
+        { label: "高铁", prop: "qztlIsGt", minWidth: 50, align: "center" },
+        { label: "职害", prop: "qztlIsWh", minWidth: 50, align: "center" },
+        { label: "复检", prop: "qztlIsFj", minWidth: 50, align: "center" },
       ],
 
       dom: null,   //用于滚动加载数据
@@ -616,7 +632,7 @@ export default {
 
       if (lfind > -1) {
         // 弹出编辑框，只有在编辑框显示时，才去触发获取数据
-        this.dataTransOpts.tableS.patient_register.id = this.tableData[lfind].id
+        this.dataTransOpts.tableS.patient_register = deepCopy(this.tableData[lfind])
         this.tableDataCurrentRow = deepCopy(this.tableData[lfind])
         this.dataTransOpts.refresh.register_check_asbitem.M++ //触发所选组合项目刷新       
       }
@@ -720,7 +736,7 @@ export default {
 
       let res = await postapi('/api/app/patientregister/getlistinfilter', { patientRegisterNo: this.dataTransOpts.tableS.patient_register.patientRegisterNo })
       if (res.code != 1) return
-      let currentRow = res.data[0]
+      let currentRow = res.data.items[0]
 
       // this.tableData.forEach(e => {
       //   e.choosed = false
@@ -780,7 +796,7 @@ export default {
       })
         .then(() => {
           //// console.log('{patientRegisterIds}',{patientRegisterIds})
-          return postapi(`/ api / app / patient - register / delete -many`, {
+          return postapi('/api/app/patient-register/delete-many', {
             patientRegisterIds,
           });
         })
@@ -1062,7 +1078,7 @@ export default {
       }
 
       try {
-        res = await postapi(`/ api / app / lisrequest / setlisrequest ? PatientRegisterId = ${ prId }`);
+        res = await postapi(`/ api / app / lisrequest / setlisrequest ? PatientRegisterId = ${prId}`);
         // console.log(`/ api / app / lisrequest / setlisrequest ? PatientRegisterId = ${ prId }`,res);
       } catch (error) {
         return;
@@ -1146,7 +1162,7 @@ export default {
           })
           .catch((err) => {
             // console.log('打印检验条码错误', err)
-            this.$message.warning({ showClose: true, message: `${ err }` });
+            this.$message.warning({ showClose: true, message: `${err}` });
           });
 
       } else {
@@ -1196,12 +1212,12 @@ export default {
           })
           .then(res => {
             if (res && res.code < 0) {
-              this.$message.error({ showClose: true, message: `${ res.message }` });
+              this.$message.error({ showClose: true, message: `${res.message}` });
             }
           })
           .catch((err) => {
             // console.log('打印检验条码错误', err)
-            this.$message.error({ showClose: true, message: `${ err }` });
+            this.$message.error({ showClose: true, message: `${err}` });
           });
       }
     },
@@ -1254,7 +1270,7 @@ export default {
           })
           .catch((err) => {
             // console.log('打印pacs条码错误', err)
-            this.$message.warning({ showClose: true, message: `${ err }` });
+            this.$message.warning({ showClose: true, message: `${err}` });
           });
       } else {
         /*
@@ -1302,12 +1318,12 @@ export default {
           })
           .then(res => {
             if (res && res.code < 0) {
-              this.$message.error({ showClose: true, message: `${ res.message }` });
+              this.$message.error({ showClose: true, message: `${res.message}` });
             }
           })
           .catch((err) => {
             // console.log('打印pacs条码错误', err)
-            this.$message.error({ showClose: true, message: `${ err }` });
+            this.$message.error({ showClose: true, message: `${err}` });
           });
       }
     },

src/components/patientRegister/customerOrgTreeAll.vue

@@ -85,8 +85,9 @@ export default {
 
     //点击树节点
     treeclick(data) {
+      // console.log('data',data)
       this.patientRegister.query.customerOrgId = data.id;
-
+      this.patientRegister.query.customerOrgName = data.displayName;
       this.dataTransOpts.plus.PatientRegisterEditQuery++
       //获取体检单位父级ID
       // this.getCustomerOrgParentId(data.id);

src/components/patientRegister/patientRegisterQuery.vue

@@ -132,12 +132,14 @@ export default {
         return
       }
 
+      // 获取顶级ID
       getapi(`/api/app/customer-org/parent/${customerOrgId}`).then(res => {
-        if (res.code != - 1) {
+        if (res.code > - 1) {
+          this.patientRegister.query.CustomerOrgParentId = res.data
           return getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${res.data}`)
         }
       }).then(res => {
-        if (res.code != -1) {
+        if (res && res.code > -1) {
           this.customerOrgRegisterList = res.data;
           if (res.data.length > 0) {
             this.patientRegister.query.customerOrgRegister = res.data[res.data.length - 1];

src/store/index.js

@@ -129,7 +129,7 @@ export default new Vuex.Store({
                 endDate: null,
                 containRefuse: true, //包含弃检项目        
                 times: 0, //触发查询次数
-                customerOrgId: "", //体检单位ID
+                customerOrgId: "", //体检单位ID                
                 CustomerOrgParentId: "", //单位父级ID
                 customerOrgFlag: true, //单位作为查询条件
                 customerOrgRegister: { id: '' }, //单位体检次数 
@@ -309,7 +309,7 @@ export default new Vuex.Store({
                 menu_info: { S: 0, M: 0 }, // 菜单与页面
                 lis_request: { S: 0, M: 0 }, // 检验申请（条码）
                 patient_register: { S: 0, M: 0 }, // 体检人员记录
-                register_check_asbitem: { S: 0, M: 0, D: 0 }, // 体检人员登记的项目（合并前） 
+                register_check_asbitem: { S: 0, M: 0, D: 0, OnlyRefreshAsbitem: 0 }, // 体检人员登记的项目（合并前） 
                 register_check: { S: 0, M: 0 }, // 体检人员登记的项目（合并后）
                 register_check_item: { S: 0, M: 0 }, // 体检人员登记的明细项目
                 role_menu_info: { S: 0, M: 0 }, // 角色对应的菜单

src/views/customerOrg/patientRegister.vue

@@ -66,8 +66,7 @@ export default {
     ...mapState(["window","dataTransOpts", "dict", "patientRegister", "customerOrg"]),
   },
 
-  methods: {
-    ...mapActions(["getCustomerOrgGroup"]),
+  methods: {    
     //数据初始化
     dictInit() {
       //性别（仅档案用）
@@ -183,18 +182,7 @@ export default {
 
   //监听事件()
   watch: {
-    //1级单位值改变，分组改变
-    "patientRegister.query.CustomerOrgParentId"(newVal, oldVal) {
-      console.log(
-        "watch patientRegister.query.CustomerOrgParentId newVal：",
-        newVal,
-        "oldVal：",
-        oldVal
-      );
-      if (newVal != oldVal && newVal !== this.dict.personOrgId) {
-        this.getCustomerOrgGroup(newVal);
-      }
-    },
+    
   },
 };
 </script>

src/views/doctorCheck/sumDoctorCheck.vue

@@ -233,7 +233,7 @@ export default {
       // immediate:true,
       handler(newVal, oldVal) {
         console.log(`watch 总检--历次综述建议 newVal: ${newVal}, oldVal: ${oldVal} `);        
-        if(newVal != oldVal) this.dataTransOpts.refresh.sumDoctor.M++
+        if(newVal != oldVal && newVal != '1') this.dataTransOpts.refresh.sumDoctor.M++
       }
     },