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

src/views/customerOrg/patientRegisterImport.vue

@@ -583,9 +583,10 @@ export default {
         { dispLabel: '检查类别', val: 'ocCheckTypeName' },
         { dispLabel: '接害因素', val: 'poisons' },
         { dispLabel: '备注', val: 'remark' },
+        { dispLabel: '介绍人', val: 'salesman' },        
         { dispLabel: '支付方式', val: 'payTypeFlag' },
       ],
-      
+      masterCols:{}, // 批量导入必填的项目
 
       tableData: [],   //导入数据状态显示
 
@@ -674,6 +675,22 @@ export default {
         }
       });
 
+
+      // 获取系统参数 -- 人员登记必填列
+      postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId: 'patient_register_required_field' })
+        .then(res => {
+          if (res.code > -1) {
+            try {
+              this.masterCols = JSON.parse(res.data)              
+            } catch (error) {
+              console.error(error)
+            }
+          }
+        })
+        .finally(() => {
+          this.masterCols.patientName = "姓名"
+        })
+
     },
 
     //清空进度数据数据
@@ -1251,6 +1268,13 @@ export default {
 
     },
 
+    // 导入必填项验证 
+    checkValide(body){
+      let msg = ''
+      // personnelTypeName，medicalTypeName，salesman
+      return msg
+    },
+
     //导入进行时
     // startRow : 从第几行开始导入，同名判断交互时，续接导入
     // startRowNameType : 续接导入的第1行，执行 同名判断模式， 3.不提示，按新人导入(前端不用管)
@@ -1267,6 +1291,13 @@ export default {
         if (i == startRow) body.nameType = startRowNameType
         console.log(`this.choosedData[${i}],startRowNameType,body`)
 
+        // 判断是否必填:        
+        let msg = checkValide(body)
+        if(msg){
+          this.tableData.push(Object.assign({ importState: '导入失败', importDes: msg }, this.choosedData[i]))
+          continue
+        }
+
         try {
           // 同一人判断
           if (this.choosedSameMan.patientNo) {

src/views/customerReport/personnelPositive.vue

@@ -79,7 +79,7 @@
             <el-table-column :label="summary.customerOrgName">
               <el-table-column :label="`开始时间： ${summary.startDate || ''} 结束时间：${summary.endDate || ''
                 } 体检人员共计： ${summary.maleCount + summary.femaleCount
-                } 男性： ${summary.maleCount} 女性： ${summary.femaleCount}`" align="left">
+                }人 男性： ${summary.maleCount}人 女性： ${summary.femaleCount}人`" align="left">
                 <el-table-column type="index" label="序号" width="60" align="center" />
                 <el-table-column prop="customerOrgParentName" label="单位" align="center" />
                 <el-table-column prop="customerOrgName" label="部门" align="center" />

src/views/fee-settings/Asbitem.vue

@@ -1439,7 +1439,7 @@ export default {
         diagnosisFunction: "",
         isContinueProcess: "N",
         isPictureRotate: "N",
-        isCheck: "N",
+        isCheck: "Y", // 检查项目比较多 
         isActive: "Y",
         collectItemTypeId: "",
         barcodeMode: "0",

src/views/fee-settings/cardRegister.vue

@@ -1098,7 +1098,6 @@ export default {
       });
     },
 
-    //滚动加载数据
     //滚动加载数据
     scrollFull() {
       this.dom = this.$refs["info"].bodyWrapper;
@@ -1176,8 +1175,6 @@ export default {
         // 开始导入时，清除选择的 文件
         document.getElementById('fileNames').value = '';
       }
-
-
     },
 
     //导入完后，导入状态显示
@@ -1548,6 +1545,11 @@ export default {
         // 将Excel的数据转换成接口的数据
         body = this.excelDataToApiBody(this.choosedData[i]);
         body.medicalCenterId = medicalCenterId
+        if(!body.cardBalance){
+          body.cardBalance = 0  
+        }else{
+          body.cardBalance = Number(body.cardBalance)||0
+        }
         console.log(`this.choosedData[${i}],startRowNameType,body`, body);
 
         try {

src/views/login/Login.vue

@@ -131,7 +131,7 @@ export default {
   },
 
   computed: {
-    ...mapState(['sysConfig']),
+    ...mapState(['sysConfig','dict']),
   },
 
   methods: {
@@ -139,9 +139,12 @@ export default {
     async getSysConfig() {
       try {
         let res = await axios.get(`/sysConfig.json?r=${Math.random()}`, { timeout: 50000 }) // , { timeout: 50000 }
-        console.log('axios.get /sysConfig.json', res)
+        //console.log('axios.get /sysConfig.json', res)
         if (!res.data.apiurl) this.$message.error({ showClose: true, message: `获取配置参数错误，请重新刷新本页面！` })
+        // 设置应用参数
         this.setData({ key: "sysConfig", value: res.data });
+        if(res.data?.dict?.completeFlag) this.dict.completeFlag = res.data.dict.completeFlag
+
         // this.sysConfig = res.data
         window.sessionStorage.setItem('sysConfig', JSON.stringify(res.data))
       } catch (error) {