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

3 months ago · 5b36d03933
8 changed files with 206 additions and 95 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -15,6 +15,7 @@
        "exceljs": "^4.3.0",
        "file-saver": "^2.0.5",
        "html2canvas": "^1.4.1",
+        "markdown-it": "^14.1.0",
        "moment": "^2.29.4",
        "node-polyfill-webpack-plugin": "^2.0.1",
        "print-js": "^1.6.0",
@ -7934,6 +7935,14 @@
      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
      "dev": true
    },
+    "node_modules/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
+      "dependencies": {
+        "uc.micro": "^2.0.0"
+      }
+    },
    "node_modules/listenercount": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
@ -8335,6 +8344,38 @@
        "node": ">=8"
      }
    },
+    "node_modules/markdown-it": {
+      "version": "14.1.0",
+      "resolved": "https://registry.npmmirror.com/markdown-it/-/markdown-it-14.1.0.tgz",
+      "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "^4.4.0",
+        "linkify-it": "^5.0.0",
+        "mdurl": "^2.0.0",
+        "punycode.js": "^2.3.1",
+        "uc.micro": "^2.1.0"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.mjs"
+      }
+    },
+    "node_modules/markdown-it/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
    "node_modules/md5.js": {
      "version": "1.3.5",
      "resolved": "https://registry.npmmirror.com/md5.js/-/md5.js-1.3.5.tgz",
@ -8351,6 +8392,11 @@
      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
      "dev": true
    },
+    "node_modules/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w=="
+    },
    "node_modules/media-typer": {
      "version": "0.3.0",
      "resolved": "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz",
@ -10088,6 +10134,14 @@
        "node": ">=6"
      }
    },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
    "node_modules/qrcode": {
      "version": "1.5.4",
      "resolved": "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.4.tgz",
@ -11667,6 +11721,11 @@
      "resolved": "https://registry.npmmirror.com/typedarray/-/typedarray-0.0.6.tgz",
      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
    },
+    "node_modules/uc.micro": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A=="
+    },
    "node_modules/umy-table": {
      "version": "1.1.8",
      "resolved": "https://registry.npmmirror.com/umy-table/-/umy-table-1.1.8.tgz",
--- a/public/sysConfig.json
+++ b/public/sysConfig.json
@ -1,5 +1,5 @@
 {
-    "apiurl": "http://192.168.0.188:9527",
+    "apiurl": "http://192.168.0.188:9530",
    "softName": "神豚体检管理系统",
    "pacsApi": "http://192.168.0.188:9530",
    "dcmViewers": "https://app.mzaktj.com:4436",
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@ -208,8 +208,9 @@
                </el-form-item>
              </el-col>
              <el-col :span="3">
+                <!--allow-create -->
                <el-form-item label="介绍人" prop="salesman">
-                  <el-select v-model="form.salesman" placeholder="请选择" filterable clearable allow-create size="small">
+                  <el-select v-model="form.salesman" placeholder="请选择" filterable clearable size="small">
                    <el-option v-for="item in dictSalesman" :key="item.id" :label="item.surname"
                      :value="item.surname" />
                  </el-select>
@ -1322,6 +1323,8 @@ export default {

      // 业务员 {operatorTypes:["1","3"]}
      postapi('/api/identity/users/GetListByOperatorType', { operatorTypes: ["0", "1", "2", "3", "4"] })
+      //roleSysParmId:'sale_role_id'
+      //postapi('/api/identity/users/GetUserListBySaleRole',{})
        .then(res => {
          if (res.code > -1) {
            this.dictSalesman = res.data
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@ -120,19 +120,19 @@
          <el-table-column label="折扣" prop="discount" min-width="60">
            <template slot-scope="scope">
              <el-input type="number" v-model="scope.row.discount" size="small" @input="changeDiscount(scope.$index)"
-                :disabled="scope.row.isCharge == 'Y' ? true : false" />
+                :disabled="scope.row.isCharge == 'Y' || scope.row.isDiscount == 'N' ? true : false" />
            </template>
          </el-table-column>
          <el-table-column label="数量" prop="amount" min-width="50">
            <template slot-scope="scope">
              <el-input type="number" v-model="scope.row.amount" size="small" @input="changeDiscount(scope.$index)"
-                :disabled="scope.row.isCharge == 'Y' ? true : false" />
+                :disabled="scope.row.isCharge == 'Y' || scope.row.isDiscount == 'N' ? true : false" />
            </template>
          </el-table-column>
          <el-table-column label="应收价格" prop="chargePrice" min-width="70">
            <template slot-scope="scope">
              <el-input type="number" v-model="scope.row.chargePrice" size="small" @input="changePrice(scope.$index)"
-                :disabled="scope.row.isCharge == 'Y' ? true : false" />
+                :disabled="scope.row.isCharge == 'Y' || scope.row.isDiscount == 'N' ? true : false" />
              <!--立即触发保存 @blur="onSubmit('')"  -->
            </template>
          </el-table-column>
@ -601,6 +601,7 @@ export default {
          discount: 100,
          amount: 1,
          total: asbItemChoosed[i].price,
+          isDiscount:asbItemChoosed[i].isDiscount
        }
        // 优化加最上面
        //this.dataTransOpts.tableM.register_check_asbitem.push(pojo)
@ -856,15 +857,16 @@ export default {
      this.groupAsbs.forEach(e => {
        lfind = arrayExistObj(this.dataTransOpts.tableM.register_check_asbitem, 'asbitemId', e.asbitemId)
        if (lfind > -1) {
-          this.dataTransOpts.tableM.register_check_asbitem[i].groupPackageId = newId
-          this.dataTransOpts.tableM.register_check_asbitem[i].isBelongGroupPackage = 'Y'
+          this.dataTransOpts.tableM.register_check_asbitem[lfind].groupPackageId = newId
+          this.dataTransOpts.tableM.register_check_asbitem[lfind].isBelongGroupPackage = 'Y'
          // 未收费，则更新价格
-          if (this.dataTransOpts.tableM.register_check_asbitem[i].isCharge != 'Y') {
-            this.dataTransOpts.tableM.register_check_asbitem[i].payTypeFlag = payTypeFlag
-            this.dataTransOpts.tableM.register_check_asbitem[i].amount = tempRd.customerOrgGroupDetailAmount
-            this.dataTransOpts.tableM.register_check_asbitem[i].standardPrice = tempRd.price
-            this.dataTransOpts.tableM.register_check_asbitem[i].chargePrice = tempRd.customerOrgGroupDetailPrice
-            this.dataTransOpts.tableM.register_check_asbitem[i].discount = tempRd.discount
+          if (this.dataTransOpts.tableM.register_check_asbitem[lfind].isCharge != 'Y') {
+            this.dataTransOpts.tableM.register_check_asbitem[lfind].payTypeFlag = payTypeFlag
+            this.dataTransOpts.tableM.register_check_asbitem[lfind].amount = e.customerOrgGroupDetailAmount
+            this.dataTransOpts.tableM.register_check_asbitem[lfind].standardPrice = e.price
+            this.dataTransOpts.tableM.register_check_asbitem[lfind].chargePrice = e.customerOrgGroupDetailPrice
+            this.dataTransOpts.tableM.register_check_asbitem[lfind].discount = e.discount
+            this.dataTransOpts.tableM.register_check_asbitem[lfind].isDiscount = e.isDiscount
          }
        } else {
          tempRd = {
@ -878,6 +880,7 @@ export default {
            payTypeFlag,
            isCharge: "N",
            discount: e.discount,
+            isDiscount:e.isDiscount,
            amount: e.customerOrgGroupDetailAmount,
            total: Math.round(e.customerOrgGroupDetailAmount * e.customerOrgGroupDetailPrice * 100) / 100
          }
@ -907,15 +910,16 @@ export default {
      this.packageAsbs.forEach(e => {
        lfind = arrayExistObj(this.dataTransOpts.tableM.register_check_asbitem, 'asbitemId', e.id)
        if (lfind > -1) {
-          this.dataTransOpts.tableM.register_check_asbitem[i].groupPackageId = newId
-          this.dataTransOpts.tableM.register_check_asbitem[i].isBelongGroupPackage = 'Y'
+          this.dataTransOpts.tableM.register_check_asbitem[lfind].groupPackageId = newId
+          this.dataTransOpts.tableM.register_check_asbitem[lfind].isBelongGroupPackage = 'Y'
          // 未收费，则更新价格
-          if (this.dataTransOpts.tableM.register_check_asbitem[i].isCharge != 'Y') {
-            this.dataTransOpts.tableM.register_check_asbitem[i].payTypeFlag = payTypeFlag
-            this.dataTransOpts.tableM.register_check_asbitem[i].amount = tempRd.customerOrgGroupDetailAmount
-            this.dataTransOpts.tableM.register_check_asbitem[i].standardPrice = tempRd.price
-            this.dataTransOpts.tableM.register_check_asbitem[i].chargePrice = tempRd.customerOrgGroupDetailPrice
-            this.dataTransOpts.tableM.register_check_asbitem[i].discount = tempRd.discount
+          if (this.dataTransOpts.tableM.register_check_asbitem[lfind].isCharge != 'Y') {
+            this.dataTransOpts.tableM.register_check_asbitem[lfind].payTypeFlag = payTypeFlag
+            this.dataTransOpts.tableM.register_check_asbitem[lfind].amount = e.customerOrgGroupDetailAmount
+            this.dataTransOpts.tableM.register_check_asbitem[lfind].standardPrice = e.price
+            this.dataTransOpts.tableM.register_check_asbitem[lfind].chargePrice = e.customerOrgGroupDetailPrice
+            this.dataTransOpts.tableM.register_check_asbitem[lfind].discount = e.discount
+            this.dataTransOpts.tableM.register_check_asbitem[lfind].isDiscount = e.isDiscount
          }
        } else {
          tempRd = {
@ -929,6 +933,7 @@ export default {
            payTypeFlag,
            isCharge: "N",
            discount: e.discount,
+            isDiscount: e.isDiscount,
            amount: e.medicalPackageDetailAmount,
            total: Math.round(e.medicalPackageDetailAmount * e.medicalPackageDetailPrice * 100) / 100
          }
@ -1021,7 +1026,8 @@ export default {

      let total = Number(0)
      this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-        if (e.isCharge == 'N') {
+        // 未收费及允许折扣的项目，才允许修改折扣
+        if (e.isCharge == 'N' && e.isDiscount == 'Y') {
          e.discount = this.discount
          e.chargePrice = Math.round(e.standardPrice * this.discount) / 100
          e.total = Math.round(e.standardPrice * this.discount * e.amount) / 100
@ -1051,7 +1057,8 @@ export default {
      let unChargeTotalStand = Number(this.totalStand) //未收费的总标准价
      let chargeTotal = Number(0)  // 
      this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-        if (e.isCharge == 'Y') {
+        // 未收费及允许折扣的项目，才允许修改折扣
+        if (e.isCharge == 'Y' || e.isDiscount == 'N') {
          chargeTotal = chargeTotal + Math.round(e.chargePrice * e.amount * 100) / 100
          unChargeTotalStand = unChargeTotalStand - Math.round(e.standardPrice * e.amount * 100) / 100
        }
@ -1061,7 +1068,8 @@ export default {
      this.discount = Math.round((100 * total / unChargeTotalStand) * 100) / 100

      this.dataTransOpts.tableM.register_check_asbitem.forEach((e, index) => {
-        if (e.isCharge == 'N') {
+        // 未收费及允许折扣的项目，才允许修改折扣
+        if (e.isCharge == 'N' && e.isDiscount == 'Y') {
          if (e.amount == 1 && e.standardPrice != 0) qtyIsOneLast = index
          e.discount = this.discount
          e.chargePrice = Math.round((e.standardPrice * this.discount / 100) * 100) / 100
--- a/src/components/report/TurnoverReport.vue
+++ b/src/components/report/TurnoverReport.vue
@ -37,6 +37,10 @@
            <span class="spanClass">包含预登记</span>
            <el-checkbox v-model="query.isPreRegistration" true-label="Y" false-label="N" />
          </div>
+          <div class="query">
+            <span class="spanClass">显示子单位</span>
+            <el-checkbox v-model="query.isChild" true-label="Y" false-label="N" @change="btnQuery"/>
+          </div>
        </div>
      </div>
      <div>
@ -48,7 +52,12 @@
      <el-table :data="tableData" border :height="window.pageHeight - 160" highlight-current-row 
        size="small" row-key="id" :summary-method="getSummaries" show-summary ref="refTable">
        <el-table-column type="index" label="序号" width="50" align="center" />
-        <el-table-column prop="customerOrgName" label="单位名称" min-width="150" />
+        <el-table-column prop="customerOrgName" label="单位名称" min-width="180">
+          <template slot-scope="scope">
+            <div>{{ query.isChild == 'Y' ? scope.row.customerOrgName + (scope.row.departmentName && scope.row.customerOrgName != scope.row.departmentName ? '--'+scope.row.departmentName:''):scope.row.customerOrgName}}</div>
+          </template>
+        </el-table-column>
+        
        <el-table-column prop="registerCount" label="登记人数" min-width="80" align="center" />
        <el-table-column prop="startMedical" label="检查人数" min-width="80" align="center" />
        <el-table-column prop="checkCount" label="总检人数" min-width="80" align="center" />
@ -89,7 +98,8 @@ export default {
        customerOrgIds: [],
        // medicalTypeIds: [],
        // isMedicalTypeId: 'Y',
-        isPreRegistration:'N'
+        isPreRegistration:'N',
+        isChild:'Y',
      },
      tableData: [],

--- a/src/views/charge/charge.vue
+++ b/src/views/charge/charge.vue
@ -152,12 +152,12 @@
                    <el-row>
                      <el-col :span="12">
                        <el-form-item label="折扣" prop="discount">
-                          <el-input v-model="form.discount" @input="discountToDetails" size="small" />
+                          <el-input type="number" v-model="form.discount" @input="discountToDetails" size="small" />
                        </el-form-item>
                      </el-col>
                      <el-col :span="12">
                        <el-form-item label="应收金额" prop="total">
-                          <el-input v-model="form.total" @input="totalToDetails" size="small" />
+                          <el-input type="number" v-model="form.total" @input="totalToDetails" size="small" />
                        </el-form-item>
                      </el-col>
                    </el-row>
@ -231,7 +231,7 @@
                    <el-table-column label="折扣" prop="discount" width="60" align="center">
                      <template slot-scope="scope">
                        <el-input type="number" v-model="scope.row.discount" v-if="query.chargeFlag == 'N'"
-                          :disabled="scope.row.isCharge == 'Y' ? true : false" size="small"
+                          :disabled="scope.row.isCharge == 'Y' || scope.row.isDiscount == 'N' ? true : false" size="small"
                          @input="changeDiscount(scope.row)" />
                        <div v-if="query.chargeFlag != 'N'">{{ scope.row.discount }}</div>
                      </template>
@ -240,7 +240,7 @@
                    <el-table-column label="实收价格" prop="chargePrice" width="80" align="center">
                      <template slot-scope="scope">
                        <el-input type="number" v-model="scope.row.chargePrice" v-if="query.chargeFlag == 'N'"
-                          :disabled="scope.row.isCharge == 'Y' ? true : false" size="small"
+                          :disabled="scope.row.isCharge == 'Y' || scope.row.isDiscount == 'N' ? true : false" size="small"
                          @input="changePrice(scope.row)" />
                        <div v-if="query.chargeFlag != 'N'">{{ scope.row.chargePrice }}</div>
                      </template>
@ -934,18 +934,21 @@ export default {
      let lfind = -1;
      this.selectedData.forEach(e => {
        totalOri += Number(e.amount * e.chargePriceOri);  //原始实收价格
-        lfind = arrayExistObj(this.asbItemsForFee, 'id', e.id)
+        lfind = arrayExistObj(this.asbItemsForFee, 'id', e.id)        
        if (lfind > -1 && e.chargePriceOri != 0) {
-          e.chargePrice = Math.round(e.chargePriceOri * discount) / 100;
-          e.discount = Math.round(10000 * e.chargePrice / e.standardPrice) / 100;
+          // 允许折扣的项目，才可以调整折扣
+          if(e.isDiscount == 'Y'){
+            e.chargePrice = Math.round(e.standardPrice * discount) / 100;
+            e.discount = discount;
+          }
          totalCompute += Math.round(e.chargePrice * e.amount * 100) / 100;
        }
      });
-      totalPlan = Math.round(totalOri * discount) / 100;
+      totalPlan = Math.round(totalCompute * 100) / 100;
      this.form.total = totalPlan;
      //this.form.preTotal = totalPlan;
      //明细和与总金额不符处理
-      this.handleBalance(totalPlan, totalCompute);
+      // this.handleBalance(totalPlan, totalCompute); 通过折扣计算时，无需处理

      this.findBalance()
    },
@ -954,22 +957,29 @@ export default {
    totalToDetails() {
      let discount = 100;
      let totalOri = 0, totalCompute = 0, totalPlan = Number(this.form.total);
+      let totalUnDiscount = 0  // 不允许折扣的金额
      let lfind = -1;

      this.selectedData.forEach(e => {
-        totalOri += Math.round(100 * e.amount * e.chargePriceOri) / 100;  //原始实收价格        
+        totalOri += Math.round(100 * e.amount * e.standardPrice) / 100;  //原始实收价格    
+        if(e.isDiscount == 'N'){
+          totalUnDiscount += Math.round(100 * e.amount * e.standardPrice) / 100;  //不允许折扣的金额
+        }    
      });

      if (totalOri != 0) {
-        discount = Math.round(10000 * totalPlan / totalOri) / 100;
+        discount = Math.round(10000 * (totalPlan - totalUnDiscount) / (totalOri - totalUnDiscount)) / 100;
        this.form.discount = discount;
      }
+
      //
      this.selectedData.forEach(e => {
        lfind = arrayExistObj(this.asbItemsForFee, 'id', e.id);
        if (lfind > -1) {
-          e.chargePrice = Math.round(e.chargePriceOri * discount) / 100;
-          e.discount = Math.round(10000 * e.chargePrice / e.standardPrice) / 100;
+          if(e.isDiscount == 'Y'){
+            e.chargePrice = Math.round(e.standardPrice * discount) / 100;
+            e.discount = discount;
+          }
          totalCompute += Math.round(100 * e.chargePrice * e.amount) / 100;
        }
      });
@ -992,7 +1002,8 @@ export default {
          //   break;
          // }
          //console.log('this.selectedData[i].amount', this.selectedData[i].amount)
-          if (this.selectedData[i].amount == 1) {
+          // 允许折扣的项目，才可以调整折扣
+          if (this.selectedData[i].amount == 1 && this.selectedData[i].isDiscount == 'Y') {
            let chargePrice = this.selectedData[i].chargePrice
            this.selectedData[i].chargePrice = Math.round((Number(chargePrice) + Number(totalPlan) - totalCompute)*100)/100 ;
            this.selectedData[i].discount = Math.round(this.selectedData[i].chargePrice * 10000/this.selectedData[i].standardPrice)/100
--- a/src/views/customerOrg/patientRegisterImport.vue
+++ b/src/views/customerOrg/patientRegisterImport.vue
@ -1271,7 +1271,29 @@ export default {
    // 导入必填项验证 
    checkValide(body){
      let msg = ''
-      // personnelTypeName，medicalTypeName，salesman
+      // patientName，personnelTypeName，medicalTypeName，salesman
+      let keys = Object.keys(this.masterCols)
+      for (let i = 0; i < keys.length; i++) {
+        const key = keys[i];
+        switch (key) {
+          case 'patientName':
+          case 'name':  
+            if(!body.patientName) msg = this.masterCols[key] + ' 未填值'
+            break;
+          case 'medicalTypeId': //体检类别
+            if(!body.medicalTypeName) msg = this.masterCols[key] + ' 未填值'
+            break;
+          case 'personnelTypeId': //人员类别
+            if(!body.personnelTypeName) msg = this.masterCols[key] + ' 未填值'
+            break;
+          case 'salesman': //介绍人
+            if(!body.salesman) msg = this.masterCols[key] + ' 未填值'
+            break;
+          default:
+            break;
+        }
+        if(msg) break;
+      }
      return msg
    },

@ -1292,47 +1314,44 @@ export default {
        console.log(`this.choosedData[${i}],startRowNameType,body`)

        // 判断是否必填:        
-        let msg = checkValide(body)
+        let msg = this.checkValide(body)
        if(msg){
          this.tableData.push(Object.assign({ importState: '导入失败', importDes: msg }, this.choosedData[i]))
-          continue
-        }
-
-        try {
-          // 同一人判断
-          if (this.choosedSameMan.patientNo) {
-            // 上一次循环已经判断是否同一人，此次循环不需再判断了
-            if (this.choosedSameMan.patientNo == '$newPatient$') {
-              body.nameType = '3'
-            } else {
-              body.patientNo = this.choosedSameMan.patientNo
-            }
-          } else if (startRowNameType != '3') {
-            let result = await this.isSamePatient(startRowNameType, body)
-            if (result.isContinue) {
-              if (result.err) {
-                this.tableData.push(Object.assign({ importState: '导入失败', importDes: result.err }, this.choosedData[i]))
-                continue
+        }else{
+          try {
+            // 同一人判断
+            if (this.choosedSameMan.patientNo) {
+              // 上一次循环已经判断是否同一人，此次循环不需再判断了
+              if (this.choosedSameMan.patientNo == '$newPatient$') {
+                body.nameType = '3'
+              } else {
+                body.patientNo = this.choosedSameMan.patientNo
+              }
+            } else if (startRowNameType != '3') {
+              let result = await this.isSamePatient(startRowNameType, body)
+              if (result.isContinue) {
+                if (result.err) {
+                  this.tableData.push(Object.assign({ importState: '导入失败', importDes: result.err }, this.choosedData[i]))
+                }
+              } else {
+                this.dataImportOpts.startRow = i
+                break; // 跳出循环，重新从 i 开执行 this.importing
              }
-            } else {
-              this.dataImportOpts.startRow = i
-              break; // 跳出循环，重新从 i 开执行 this.importing
            }
-          }

-          // 旧接口：/api/app/patientregister/createpatientregisterexcel                                 
-          let res = await postapi('/api/app/patientregister/CreatePatientRegisterFromExcel', body)
-          this.choosedSameMan = {}  // 清除选择同一人员的记录
-          if (res.code >= 0) {
-            this.tableData.push(Object.assign({ importState: '导入成功' }, this.choosedData[i]))
-          } else {
-            this.tableData.push(Object.assign({ importState: '导入失败', importDes: res.message }, this.choosedData[i]))
+            // 旧接口：/api/app/patientregister/createpatientregisterexcel                                 
+            let res = await postapi('/api/app/patientregister/CreatePatientRegisterFromExcel', body)
+            this.choosedSameMan = {}  // 清除选择同一人员的记录
+            if (res.code >= 0) {
+              this.tableData.push(Object.assign({ importState: '导入成功' }, this.choosedData[i]))
+            } else {
+              this.tableData.push(Object.assign({ importState: '导入失败', importDes: res.message }, this.choosedData[i]))
+            }
+          } catch (error) {
+            this.tableData.push(Object.assign({ importState: '导入失败', importDes: `${error}` }, this.choosedData[i]))
          }
-        } catch (error) {
-          this.tableData.push(Object.assign({ importState: '导入失败', importDes: `${error}` }, this.choosedData[i]))
        }

-
        // 结束导入
        if (i == this.choosedData.length - 1) {
          this.elProgress.display = false;
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@ -89,14 +89,14 @@
                  @row-click="rowick"
                  @row-dblclick="dblClick"
                  highlight-current-row
-                  :row-style="{ height: '36px' }"
-                  ref="tableData"
+                  :row-style="{ height: '28px' }"
+                  ref="tableData" border
                >
-                  <el-table-column prop="id" label="编号" width="320">
+                  <el-table-column prop="id" label="编号" width="300" align="center">
                  </el-table-column>
-                  <el-table-column prop="displayName" label="名称" width="">
+                  <el-table-column prop="displayName" label="名称" min-width="200">
                  </el-table-column>
-                  <el-table-column prop="price" label="价格" width="">
+                  <el-table-column prop="price" label="价格" width="" align="center">
                  </el-table-column>
                  <el-table-column
                    prop="forPregnantFlag"
@ -134,18 +134,18 @@
                      </div>
                    </template>
                  </el-table-column>
-                  <el-table-column prop="creatorName" label="创建者" width="">
+                  <el-table-column prop="creatorName" label="创建者" width="" align="center">
                  </el-table-column>
                  <el-table-column
                    prop="lastModifierName"
                    label="修改者"
-                    width=""
+                    width="" align="center"
                  >
                  </el-table-column>
                  <el-table-column
                    prop="creationTime"
                    label="创建时间"
-                    width="200"
+                    width="160" align="center"
                  >
                    <template slot-scope="scope">
                      {{ scope.row.creationTime | dateFormat }}
@ -154,7 +154,7 @@
                  <el-table-column
                    prop="lastModificationTime"
                    label="修改时间"
-                    width="200"
+                    width="160" align="center"
                  >
                    <template slot-scope="scope">
                      {{ scope.row.lastModificationTime | dateFormat }}
@ -622,7 +622,7 @@
              ></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
            <el-form-item label="适用性别" prop="">
              <el-select
                v-model="form.forSexId"
@ -640,7 +640,7 @@
              </el-select>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="7">
            <el-form-item label="婚姻状况">
              <el-select
                v-model="form.maritalStatusId"
@ -658,6 +658,15 @@
              </el-select>
            </el-form-item>
          </el-col>
+          <el-col :span="3">
+            <el-form-item label="允许折扣" prop="isDiscount">              
+              <el-checkbox
+                v-model="form.isDiscount"
+                true-label="Y"
+                false-label="N"
+              />
+            </el-form-item>
+          </el-col>
        </el-row>
        <el-row>
          <el-col :span="5">
@ -732,16 +741,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="3">
-            <el-form-item label="餐前项目" prop="">
-              <!-- <el-select v-model="form.isBeforeEat" placeholder="请选择">
-                    <el-option
-                      v-for="item in isBeforeEat"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select> -->
+            <el-form-item label="餐前项目" prop="">              
              <el-checkbox
                v-model="form.isBeforeEat"
                true-label="Y"
@ -1456,6 +1456,7 @@ export default {
        followUpFunction: "",
        isPrivacy: "N",
        isOutsend: "N",
+        isDiscount:"Y",
      },
      forSexId: [], //性别
      forPregnantFlag: [