Merge branch 'master' of http://git.shengws.com/csx/Vue_New

config/dev.env.js

@@ -6,9 +6,8 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
   // BASE_API:'"http://localhost:9531"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

src/api/config.js

@@ -109,6 +109,16 @@ export function changeOrg(params) {
 
 
 
+export function generateLog(params) {
+  return request({
+    url: '/api/log/generate',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
 
 
 

src/api/patient.js

@@ -344,3 +344,22 @@ export function getAllData(id, page, limit) {
     params: params
   })
 }
+
+
+export function postExportPatients(params) {
+  return request({
+    url: '/api/patients/export',
+    method: 'Post',
+    data: params,
+  })
+}
+
+
+
+
+
+
+
+
+
+

src/api/schedule.js

@@ -86,3 +86,30 @@ export function getScheduleWeekDay(params) {
     params: params
   })
 }
+
+
+export function exportSchedule(params,date) {
+  return request({
+    url: '/api/schedule/export?date='+date,
+    method: 'Post',
+    data: params
+  })
+}
+
+
+export function initDate() {
+  return request({
+    url: '/api/excel_date/init',
+    method: 'Get',
+  })
+}
+
+
+export function exportScheduleTemplate(params) {
+  return request({
+    url: '/api/schedule_template/export',
+    method: 'Post',
+    data: params
+  })
+}
+

src/vendor/Export2Excel.js

@@ -1,6 +1,5 @@
 /* eslint-disable */
-require('script-loader!file-saver');
-require('script-loader!@/vendor/Blob');
+import { saveAs } from 'file-saver'
 import XLSX from 'xlsx'
 
 function generateArray(table) {
@@ -146,19 +145,35 @@ export function export_table_to_excel(id) {
 }
 
 export function export_json_to_excel({
+  multiHeader = [],
   header,
   data,
   filename,
-  autoWidth = true
+  merges = [],
+  autoWidth = true,
+  bookType = 'xlsx'
 } = {}) {
   /* original data */
   filename = filename || 'excel-list'
   data = [...data]
   data.unshift(header);
+
+  for (let i = multiHeader.length - 1; i > -1; i--) {
+    data.unshift(multiHeader[i])
+  }
+
   var ws_name = "SheetJS";
   var wb = new Workbook(),
     ws = sheet_from_array_of_arrays(data);
 
+  if (merges.length > 0) {
+    if (!ws['!merges']) ws['!merges'] = [];
+    merges.forEach(item => {
+      console.log(XLSX.utils.decode_range(item))
+      ws['!merges'].push(XLSX.utils.decode_range(item))
+    })
+  }
+
   if (autoWidth) {
     /*设置worksheet每列的最大宽度*/
     const colWidth = data.map(row => row.map(val => {
@@ -196,11 +211,11 @@ export function export_json_to_excel({
   wb.Sheets[ws_name] = ws;
 
   var wbout = XLSX.write(wb, {
-    bookType: 'xlsx',
+    bookType: bookType,
     bookSST: false,
     type: 'binary'
   });
   saveAs(new Blob([s2ab(wbout)], {
     type: "application/octet-stream"
-  }), filename + ".xlsx");
+  }), `${filename}.${bookType}`);
 }

src/xt_pages/components/UploadExcel/index.vue

@@ -0,0 +1,143 @@
+<template>
+  <div>
+    <input id="excel-upload-input" ref="excel-upload-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
+    <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="handleUpload">点击导入
+    </el-button>
+  </div>
+</template>
+
+<script>
+  import XLSX from 'xlsx'
+
+  export default {
+    props: {
+      beforeUpload: Function,
+      onSuccess: Function
+    },
+    data() {
+      return {
+        loading: false,
+        excelData: {
+          header: null,
+          results: null
+        }
+      }
+    },
+    methods: {
+      generateDate({ header, results }) {
+        console.log("11111111")
+        this.excelData.header = header
+        this.excelData.results = results
+        this.onSuccess && this.onSuccess(this.excelData)
+      },
+      handleDrop(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        if (this.loading) return
+        const files = e.dataTransfer.files
+        if (files.length !== 1) {
+          this.$message.error('Only support uploading one file!')
+          return
+        }
+        const rawFile = files[0] // only use files[0]
+
+        if (!this.isExcel(rawFile)) {
+          this.$message.error('Only supports upload .xlsx, .xls, .csv suffix files')
+          return false
+        }
+        this.upload(rawFile)
+        e.stopPropagation()
+        e.preventDefault()
+      },
+      handleDragover(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        e.dataTransfer.dropEffect = 'copy'
+      },
+      handleUpload() {
+        document.getElementById('excel-upload-input').click()
+      },
+      handleClick(e) {
+        const files = e.target.files
+        const rawFile = files[0] // only use files[0]
+        if (!rawFile) return
+        this.upload(rawFile)
+      },
+      upload(rawFile) {
+        this.$refs['excel-upload-input'].value = null // fix can't select the same excel
+
+        if (!this.beforeUpload) {
+          this.readerData(rawFile)
+          return
+        }
+        const before = this.beforeUpload(rawFile)
+        if (before) {
+          this.readerData(rawFile)
+        }
+      },
+      readerData(rawFile) {
+        this.loading = true
+        return new Promise((resolve, reject) => {
+          const reader = new FileReader()
+          reader.onload = e => {
+            const data = e.target.result
+            const fixedData = this.fixdata(data)
+            const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
+            const firstSheetName = workbook.SheetNames[0]
+            const worksheet = workbook.Sheets[firstSheetName]
+            const header = this.get_header_row(worksheet)
+            const results = XLSX.utils.sheet_to_json(worksheet)
+            this.generateDate({ header, results })
+            this.loading = false
+            resolve()
+          }
+          reader.readAsArrayBuffer(rawFile)
+        })
+      },
+      fixdata(data) {
+        let o = ''
+        let l = 0
+        const w = 10240
+        for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)))
+        o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)))
+        return o
+      },
+      get_header_row(sheet) {
+        const headers = []
+        const range = XLSX.utils.decode_range(sheet['!ref'])
+        let C
+        const R = range.s.r /* start in the first row */
+        for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
+          var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })] /* find the cell in the first row */
+          var hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+          if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+          headers.push(hdr)
+        }
+        return headers
+      },
+      isExcel(file) {
+        return /\.(xlsx|xls|csv)$/.test(file.name)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  #excel-upload-input {
+    display: none;
+    z-index: -9999;
+  }
+
+  #drop {
+    border: 2px dashed #bbb;
+    width: 600px;
+    height: 160px;
+    line-height: 160px;
+    margin: 0 auto;
+    font-size: 24px;
+    border-radius: 5px;
+    text-align: center;
+    color: #bbb;
+    position: relative;
+  }
+</style>

src/xt_pages/data/prescription.vue

@@ -688,7 +688,7 @@ export default {
         // },
         // {
         //   id: 17,
-        //   name: "HDF前置换", 
+        //   name: "HDF前置换",
         //   dialysis_duration: 1,
         //   replacement_way: 1,
         //   hemodialysis_machine: 2,

src/xt_pages/data/printTemplate.vue

@@ -227,9 +227,7 @@ export default {
               // 同步
               // console.log(response.data.data.fileds)
               this.loading = false;
-              // store
-              //   .dispatch("updateAllFiledConfigList", response.data.data.fileds)
-              //   .then(() => {});
+               store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
               this.$message({
                 type: "success",
                 message: "切换成功"

src/xt_pages/dialysis/batch_print/batch_print_order_eight.vue

@@ -31,12 +31,12 @@
                       {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
                     </span>
                   </td>
-                  <td style="text-align:center;">
+                  <td style="text-align:center">
                     姓名:<span style="display:inline-block;margin-left:10px;">
                        {{ record.patient.name }}
                     </span>
                   </td>
-                  <td style="text-align:center;">
+                  <td style="text-align:center;width:100px">
                     性别:<span
                       style="display:inline-block;margin-left:10px;"
                     >
@@ -55,7 +55,7 @@
                    &nbsp;
                      <check-box text="住院" :checked="record.receive_assessment.condition == 2"></check-box>
                   </td>
-                  <td style="text-align:center;">
+                  <td style="text-align:center;width:160px"">
                     住院号:<span style="display:inline-block;margin-left:10px;">
                        {{record.receive_assessment.admission_number?record.receive_assessment.admission_number:"/"}}
                     </span>
@@ -132,7 +132,7 @@
                       }}kg</span
                     >
                   </td>
-                  <td style="text-align:left;" colspan="1">
+                  <td style="text-align:left;" colspan="2">
                     <span style="display:inline-block;margin-left:15px;"
                       >电导率:{{record.prescription.conductivity?record.prescription.conductivity:"0"}}(mS/cm)</span
                     >
@@ -223,7 +223,7 @@
                       {{record.assessment_after_dislysis.actual_ultrafiltration?record.assessment_after_dislysis.actual_ultrafiltration:"0"}}
                       </span>&nbsp;L
                   </td>
-                   <td style="text-align:left;" colspan="2">
+                   <td style="text-align:left;" colspan="3">
                     <span style="display:inline-block;margin-left:15px;"
                       >透析时间:
                      {{
@@ -247,7 +247,7 @@
                         }}
                       </span>&nbsp;L
                   </td>
-                   <td style="text-align:left;" colspan="2">
+                   <td style="text-align:left;" colspan="1">
                     <span style="display:inline-block;margin-left:15px;"
                       >置换方式:
                        <label-box
@@ -273,7 +273,7 @@
                 </tr>
                 <tr>
                   <td style="text-align:left;">
-                    <span style="display:inline-block;margin-left:15px;"
+                    <span style="display:inline-block;margin-left:15px;display:flex;align-items:center;height:36px;"
                       >责任护士:
                        <span
                             v-if="
@@ -359,9 +359,10 @@
                       </span>
                   </td>
                   <td style="text-align:left;" colspan="3">
-                    <span style="display:inline-block;margin-left:15px;"
+                    <span style="display:inline-block;margin-left:15px;display:flex;align-items:center;height:36px;"
                       >医生签名:
                        <span
+                           
                             v-if="
                               !record.advices ||
                                 typeof record.advices[0] == 'undefined' ||
@@ -382,7 +383,9 @@
                               )
                             }}</span
                           >
+                          
                           <img
+                            v-else
                             class="es-img"
                             :src="
                               setAdminUserES(
@@ -392,10 +395,7 @@
                             "
                             alt=""
                             srcset=""
-                            v-else
-                            style="height: 30px;"
-                          />  </span
-                    >
+                            style="height: 30px;"/> </span> 
                   </td>
                 </tr>
                 <tr>
@@ -607,13 +607,13 @@
                             <label-box
                               showValue="好"
                               :isChecked="
-                                record.assessment_before_dislysis.catheter.indexOf('流畅度-好') > -1 ? true : false
+                                record.assessment_before_dislysis.catheter.indexOf('通畅度-好') > -1 ? true : false
                               "
                             ></label-box>
                             <label-box
                               showValue="差"
                               :isChecked="
-                                record.assessment_before_dislysis.catheter.indexOf('流畅度-差') > -1 ? true : false
+                                record.assessment_before_dislysis.catheter.indexOf('通畅度-差') > -1 ? true : false
                               "
                             ></label-box>
                             &nbsp;&nbsp;溶栓：
@@ -992,6 +992,14 @@
                     : false
                 "
                 showValue="腹痛"
+              ></label-box>
+                <label-box
+                :isChecked="
+                  record.assessment_after_dislysis.complication.indexOf('肌肉痉挛') > -1
+                    ? true
+                    : false
+                "
+                showValue="肌肉痉挛"
               ></label-box>
               <label-box
                 :isChecked="
@@ -1070,8 +1078,8 @@
            </span>
          </td>
          <td style="text-align:left;" >
-           <span>下机护士:
-              <span v-if="setAdminUserES(record.dialysis_order, 'finish_nurse') == ''">{{getAdminUser(record.dialysis_order, 'finish_nurse')}}</span>
+           <span style="display:flex;align-items:center;height:36px;">下机护士:
+              <span  v-if="setAdminUserES(record.dialysis_order, 'finish_nurse') == ''">{{getAdminUser(record.dialysis_order, 'finish_nurse')}}</span>
                 <img class="es-img" :src="setAdminUserES(record.dialysis_order, 'finish_nurse')" alt=""
               srcset="" v-else style="height: 30px;">
            </span>

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -952,6 +952,7 @@
       this.hemorrhage = getDataConfig('hemodialysis', 'hemorrhage')
       this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
       this.blood_access_part_opera = getDataConfig('hemodialysis', 'vascular_access_desc')
+      //console.log("血管通路部位",this.blood_access_part_opera)
       this.internal_fistula = getDataConfig('hemodialysis', 'internal_fistula')
       this.internal_fistula_skin = getDataConfig('hemodialysis', 'internal_fistula_skin')
       this.puncture_method = getDataConfig('hemodialysis', 'puncture_method')

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1602,7 +1602,6 @@ export default {
       //入口
       var pre = pre;
       console.log("pre是----", pre);
-      console.log("pre-------------", pre.mode_id);
       if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12) {
         this.zhiShow = true;
         this.huShow = true;

src/xt_pages/dialysis/details/index.vue

@@ -540,9 +540,21 @@ export default {
           var patient = resp.data.patient; // 患者信息
           var schedual = resp.data.schedual; // 患者排班信息
           var prescription = resp.data.prescription; // 透析处方
+          if(prescription!=null){
+              if(prescription.body_fluid == -2 ){
+                 prescription.body_fluid = 0
+             }
+          }
+          console.log("透析处方",prescription)
           var solution = resp.data.solution; // 透析方案
           var receiver_treatment_access = resp.data.receiver_treatment_access; // 接诊评估
           var predialysis_evaluation = resp.data.predialysis_evaluation; // 透前评估
+          console.log("透前评估",predialysis_evaluation)
+           if(predialysis_evaluation !=null){
+             if(predialysis_evaluation.blood_access_part_id == -2){
+                predialysis_evaluation.blood_access_part_id = 0
+             }
+           }
           var doctor_advices = resp.data.doctor_advices; // 临时医嘱
           //console.log("力气-------", doctor_advices);
           var double_check = resp.data.double_check; // 双人核对
@@ -567,6 +579,12 @@ export default {
           var aliquid_info = resp.data.aliquid_info;
 
           var lastPredialysisEvaluation = resp.data.lastPredialysisEvaluation;
+          console.log("上次透前评估",lastPredialysisEvaluation)
+          if(lastPredialysisEvaluation !=null){
+             if(lastPredialysisEvaluation.blood_access_part_id == -2){
+               lastPredialysisEvaluation.blood_access_part_id = 0
+             }
+          }
           var lastMonitorRecord = resp.data.lastMonitorRecord;
           var lastAssessmentAfterDislysis =
             resp.data.lastAssessmentAfterDislysis;

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -15,9 +15,11 @@
       </el-row>
       <div class="configTable">
         <el-table :data="tableData" border style="width: 100%">
-          <el-table-column prop="date" label="日期" width="180"></el-table-column>
-          <el-table-column prop="name" label="姓名" width="180"></el-table-column>
-          <el-table-column prop="address" label="地址"></el-table-column>
+          <el-table-column prop="date" label="检验检查大项" width="180"></el-table-column>
+          <el-table-column prop="name" label="检查小项" width="180"></el-table-column>
+          <el-table-column prop="address" label="范围"></el-table-column>
+           <el-table-column prop="address" label="单位"></el-table-column>
+            <el-table-column prop="address" label="排序"></el-table-column>
           <el-table-column label="操作" width="180">
             <template slot-scope="scope">
               <el-button size="mini" type="primary" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
@@ -28,59 +30,79 @@
       </div>
 
       <el-dialog title="新增" :visible.sync="newDialog">
-        <el-form :model="form">
-          <el-form-item label="检查大项" :label-width="formLabelWidth">
-            <el-select v-model="form.region" placeholder="请选择活动区域">
-              <el-option label="区域一" value="shanghai"></el-option>
-              <el-option label="区域二" value="beijing"></el-option>
+        <el-form :model="form" ref="form" :rules="rules">
+          <el-form-item label="检查大项" :label-width="formLabelWidth" required prop="inspectionMajor">
+            <el-select v-model="form.inspectionMajor" placeholder="请选择活动区域" @change="changeInspection">
+               <el-option
+                  v-for="item in InspectionMajor"
+                  :key="item.project_id"
+                  :value="item.project_id"
+                  :label="item.project_name"
+                  >
+               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="检查小项" :label-width="formLabelWidth">
-            <el-select v-model="form.region" placeholder="请选择活动区域">
-              <el-option label="区域一" value="shanghai"></el-option>
-              <el-option label="区域二" value="beijing"></el-option>
+          <el-form-item label="检查小项" :label-width="formLabelWidth" required prop="inspectionMinor">
+            <el-select v-model="form.inspectionMinor" placeholder="请选择活动区域" @change="changeInspectionMonior">
+                <el-option
+                  v-for="it in InspectionMinor"
+                  :key="it.id"
+                  :value="it.id"
+                  :label="it.item_name"
+                  >
+                </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="指控范围" :label-width="formLabelWidth">
-            <el-input style="width:200px" v-model="form.name"></el-input>&nbsp;
+          <el-form-item label="指控范围" :label-width="formLabelWidth" required prop="large_range">
+            <el-input style="width:200px" v-model="form.min_range"></el-input>&nbsp;
             -
-            <el-input style="width:200px" v-model="form.name"></el-input>
+            <el-input style="width:200px" v-model="form.large_range"></el-input>
           </el-form-item>
           <el-form-item label="排序" :label-width="formLabelWidth">
-            <el-input style="width:200px" v-model="form.name"></el-input>
+            <el-input style="width:200px" v-model="form.sort"></el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="newDialog = false">取 消</el-button>
-          <el-button type="primary" @click="newDialog = false">确 定</el-button>
+          <el-button type="primary" @click="saveInspection('form')">保存</el-button>
         </div>
       </el-dialog>
       <el-dialog title="编辑" :visible.sync="editDialog">
         <el-form :model="form">
           <el-form-item label="检查大项" :label-width="formLabelWidth">
-            <el-select v-model="form.region" placeholder="请选择活动区域">
-              <el-option label="区域一" value="shanghai"></el-option>
-              <el-option label="区域二" value="beijing"></el-option>
+            <el-select v-model="form.inspectionMajor" placeholder="请选择活动区域">
+              <el-option
+                  v-for="patient in InspectionMajor"
+                  :key="patient.id"
+                  :value="patient.id"
+                  :label="patient.project_name"
+                  >
+               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="检查小项" :label-width="formLabelWidth">
-            <el-select v-model="form.region" placeholder="请选择活动区域">
-              <el-option label="区域一" value="shanghai"></el-option>
-              <el-option label="区域二" value="beijing"></el-option>
+            <el-select v-model="form.inspectionMinor" placeholder="请选择活动区域">
+               <el-option
+                  v-for="item in InspectionMinor"
+                  :key="item.project_id"
+                  :value="item.project_id"
+                  :label="item.item_name"
+                  >
+                </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="指控范围" :label-width="formLabelWidth">
-            <el-input style="width:200px" v-model="form.name"></el-input>&nbsp;
+            <el-input style="width:200px" v-model="form.min_range"></el-input>&nbsp;
             -
-            <el-input style="width:200px" v-model="form.name"></el-input>
+            <el-input style="width:200px" v-model="form.large_range"></el-input>
           </el-form-item>
           <el-form-item label="排序" :label-width="formLabelWidth">
-            <el-input style="width:200px" v-model="form.name"></el-input>
+            <el-input style="width:200px" v-model="form.sort"></el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="editDialog = false">取 消</el-button>
-          <el-button type="primary" @click="editDialog = false">确 定</el-button>
+          <el-button type="primary" @click="editDialog = false">保存</el-button>
         </div>
       </el-dialog>
     </div>
@@ -94,6 +116,7 @@ import { GetOICData } from "@/api/qcd";
 import PieChart from "../qcd/components/BarChart";
 import { uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { getInspectionMajor,getInspectionMinor,getInspectionRange,saveInspection }from "@/api/common/common";
 export default {
   name: "dialysisTotal",
   data() {
@@ -104,6 +127,8 @@ export default {
         { path: false, name: "质控达标统计配置" }
       ],
       tabActiveName: "control",
+      InspectionMajor:[],
+      InspectionMinor:[],
       tableData: [
         {
           date: "2016-05-02",
@@ -130,18 +155,19 @@ export default {
       editDialog: false,
       formLabelWidth: "120px",
       form: {
-        name: "",
-        region: "",
-        date1: "",
-        date2: "",
-        delivery: false,
-        type: [],
-        resource: "",
-        desc: ""
+        inspectionMajor: "",
+        inspectionMinor: "",
+        min_range: "",
+        large_range: "",
+        sort:"",
+      },
+      rules: {
+        inspectionMajor: [{ required: true, message: "检查大项不能为空" }],
+        inspectionMinor: [{ required: true, message: "检查小项不能为空" }],
+        large_range:[{required:true,message:"指控范围不能为空"}]
       }
     };
   },
-  created() {},
   methods: {
     handleTabClick(tab, event) {
       if (this.tabActiveName == "query") {
@@ -150,12 +176,58 @@ export default {
     },
     handleEdit() {
       this.editDialog = true;
+    },
+    
+    //获取大项数据来源
+    getInspectionMajor(){
+      getInspectionMajor().then(response=>{
+        if(response.data.state == 1){
+          var inspection =  response.data.data.inspection
+          console.log("inspection",inspection)
+          this.InspectionMajor = inspection
+
+        }
+      })
+    },
+    //获取小项
+    changeInspection(id){
+      console.log("id----",id)
+      getInspectionMinor(id).then(response=>{
+        if(response.data.state == 1){
+         var inspection =  response.data.data.inspection
+         console.log("inspection",inspection)
+         this.InspectionMinor = inspection
+        }
+      })
+    },
+    // 获取指控范围
+    changeInspectionMonior(id){
+       getInspectionRange(id).then(response=>{
+         if(response.data.state == 1){
+           var inspectionRange =  response.data.data.inspectionRange
+           console.log("inspectionRange",inspectionRange)
+           this.form.min_range = inspectionRange.range_min
+           this.form.large_range = inspectionRange.range_max
+         }
+      })
+    },
+    saveInspection(formName){
+      this.$refs[formName].validate(valid=>{
+        if(valid){
+          saveInspection(this.form).then(response=>{
+          })
+        }
+      })
     }
   },
   components: {
     PieChart,
     BreadCrumb
-  }
+  },
+   created() {
+     //获取检查大项数据来源
+       this.getInspectionMajor()
+   },
 };
 </script>
 <style lang="scss">

src/xt_pages/user/components/PatientForm.vue

@@ -1382,6 +1382,7 @@ export default {
         return false;
       }
 
+      this.form.user_sys_before_count =  this.form.user_sys_before_count.toString()
       this.$refs[formName].validate(valid => {
         if (valid) {
           this.formSubmit = false;

src/xt_pages/workforce/components/scheduleTemplateUploadExcel/index.vue

@@ -0,0 +1,166 @@
+<template>
+  <div>
+    <el-dialog
+      :visible.sync="msgTipVisible"
+      width="40%"
+    >
+      <span>如果导入成功,会将当前已有的排版模版会被全部清除,是否继续导入排版模版数据</span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="msgTipVisible = false">取 消</el-button>
+    <el-button type="primary" @click="handleUpload()">确 定</el-button>
+  </span>
+    </el-dialog>
+    <input id="excel-upload-input" ref="excel-upload-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
+    <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">点击导入
+    </el-button>
+  </div>
+</template>
+
+<script>
+  import XLSX from 'xlsx'
+
+  export default {
+    name: "scheduleTemplateUploadExcel",
+    props: {
+      beforeUpload: Function,
+      onSuccess: Function
+    },
+    data() {
+      return {
+        loading: false,
+        msgTipVisible:false,
+        excelData: {
+          header: null,
+          results: null
+        }
+      }
+    },
+    methods: {
+      generateDate({ header, results }) {
+
+        console.log(header)
+        console.log(results)
+
+        this.excelData.header = header
+        this.excelData.results = results
+
+        this.onSuccess && this.onSuccess(this.excelData)
+      },
+      handleDrop(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        if (this.loading) return
+        const files = e.dataTransfer.files
+        if (files.length !== 1) {
+          this.$message.error('Only support uploading one file!')
+          return
+        }
+        const rawFile = files[0] // only use files[0]
+
+        if (!this.isExcel(rawFile)) {
+          this.$message.error('Only supports upload .xlsx, .xls, .csv suffix files')
+          return false
+        }
+        this.upload(rawFile)
+        e.stopPropagation()
+        e.preventDefault()
+      },
+      handleDragover(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        e.dataTransfer.dropEffect = 'copy'
+      },
+      handleUpload() {
+        this.msgTipVisible = false
+        console.log("1111111")
+        document.getElementById('excel-upload-input').click()
+      },
+      handleClick(e) {
+        console.log("1111")
+        const files = e.target.files
+        const rawFile = files[0] // only use files[0]
+        console.log(rawFile)
+
+        if (!rawFile) return
+        this.upload(rawFile)
+      },
+      upload(rawFile) {
+        this.$refs['excel-upload-input'].value = null // fix can't select the same excel
+        console.log("12121212")
+        if (!this.beforeUpload) {
+          this.readerData(rawFile)
+          return
+        }
+        const before = this.beforeUpload(rawFile)
+        if (before) {
+          this.readerData(rawFile)
+        }
+      },
+      readerData(rawFile) {
+        console.log("2222222")
+
+        this.loading = true
+        return new Promise((resolve, reject) => {
+          const reader = new FileReader()
+          reader.onload = e => {
+            const data = e.target.result
+            const fixedData = this.fixdata(data)
+            const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
+            const firstSheetName = workbook.SheetNames[0]
+            const worksheet = workbook.Sheets[firstSheetName]
+            const header = this.get_header_row(worksheet)
+            const results = XLSX.utils.sheet_to_json(worksheet)
+            this.generateDate({ header, results })
+            this.loading = false
+            resolve()
+          }
+          reader.readAsArrayBuffer(rawFile)
+        })
+      },
+      fixdata(data) {
+        let o = ''
+        let l = 0
+        const w = 10240
+        for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)))
+        o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)))
+        return o
+      },
+      get_header_row(sheet) {
+        const headers = []
+        const range = XLSX.utils.decode_range(sheet['!ref'])
+        let C
+        const R = range.s.r /* start in the first row */
+        for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
+          var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })] /* find the cell in the first row */
+          var hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+          if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+          headers.push(hdr)
+        }
+        return headers
+      },
+      isExcel(file) {
+        return /\.(xlsx|xls|csv)$/.test(file.name)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  #excel-upload-input {
+    display: none;
+    z-index: -9999;
+  }
+
+  #drop {
+    border: 2px dashed #bbb;
+    width: 600px;
+    height: 160px;
+    line-height: 160px;
+    margin: 0 auto;
+    font-size: 24px;
+    border-radius: 5px;
+    text-align: center;
+    color: #bbb;
+    position: relative;
+  }
+</style>

src/xt_pages/workforce/components/scheduleUploadExcel/index.vue

@@ -0,0 +1,166 @@
+<template>
+  <div>
+    <el-dialog
+      :visible.sync="msgTipVisible"
+      width="40%"
+    >
+      <span>如果导入成功,会将当前已有的排版会被全部清除,是否继续导入排版数据</span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="msgTipVisible = false">取 消</el-button>
+    <el-button type="primary" @click="handleUpload()">确 定</el-button>
+  </span>
+    </el-dialog>
+    <input id="excel-upload-input" ref="excel-upload-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
+    <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">点击导入
+    </el-button>
+  </div>
+</template>
+
+<script>
+  import XLSX from 'xlsx'
+
+  export default {
+    name: "scheduleUploadExcel",
+    props: {
+      beforeUpload: Function,
+      onSuccess: Function
+    },
+    data() {
+      return {
+        loading: false,
+        msgTipVisible:false,
+        excelData: {
+          header: null,
+          results: null
+        }
+      }
+    },
+    methods: {
+      generateDate({ header, results }) {
+
+        console.log(header)
+        console.log(results)
+
+        this.excelData.header = header
+        this.excelData.results = results
+
+        this.onSuccess && this.onSuccess(this.excelData)
+      },
+      handleDrop(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        if (this.loading) return
+        const files = e.dataTransfer.files
+        if (files.length !== 1) {
+          this.$message.error('Only support uploading one file!')
+          return
+        }
+        const rawFile = files[0] // only use files[0]
+
+        if (!this.isExcel(rawFile)) {
+          this.$message.error('Only supports upload .xlsx, .xls, .csv suffix files')
+          return false
+        }
+        this.upload(rawFile)
+        e.stopPropagation()
+        e.preventDefault()
+      },
+      handleDragover(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        e.dataTransfer.dropEffect = 'copy'
+      },
+      handleUpload() {
+        this.msgTipVisible = false
+        console.log("1111111")
+        document.getElementById('excel-upload-input').click()
+      },
+      handleClick(e) {
+        console.log("1111")
+        const files = e.target.files
+        const rawFile = files[0] // only use files[0]
+        console.log(rawFile)
+
+        if (!rawFile) return
+        this.upload(rawFile)
+      },
+      upload(rawFile) {
+        this.$refs['excel-upload-input'].value = null // fix can't select the same excel
+        console.log("12121212")
+        if (!this.beforeUpload) {
+          this.readerData(rawFile)
+          return
+        }
+        const before = this.beforeUpload(rawFile)
+        if (before) {
+          this.readerData(rawFile)
+        }
+      },
+      readerData(rawFile) {
+        console.log("2222222")
+
+        this.loading = true
+        return new Promise((resolve, reject) => {
+          const reader = new FileReader()
+          reader.onload = e => {
+            const data = e.target.result
+            const fixedData = this.fixdata(data)
+            const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
+            const firstSheetName = workbook.SheetNames[0]
+            const worksheet = workbook.Sheets[firstSheetName]
+            const header = this.get_header_row(worksheet)
+            const results = XLSX.utils.sheet_to_json(worksheet)
+            this.generateDate({ header, results })
+            this.loading = false
+            resolve()
+          }
+          reader.readAsArrayBuffer(rawFile)
+        })
+      },
+      fixdata(data) {
+        let o = ''
+        let l = 0
+        const w = 10240
+        for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)))
+        o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)))
+        return o
+      },
+      get_header_row(sheet) {
+        const headers = []
+        const range = XLSX.utils.decode_range(sheet['!ref'])
+        let C
+        const R = range.s.r /* start in the first row */
+        for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
+          var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })] /* find the cell in the first row */
+          var hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+          if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+          headers.push(hdr)
+        }
+        return headers
+      },
+      isExcel(file) {
+        return /\.(xlsx|xls|csv)$/.test(file.name)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  #excel-upload-input {
+    display: none;
+    z-index: -9999;
+  }
+
+  #drop {
+    border: 2px dashed #bbb;
+    width: 600px;
+    height: 160px;
+    line-height: 160px;
+    margin: 0 auto;
+    font-size: 24px;
+    border-radius: 5px;
+    text-align: center;
+    color: #bbb;
+    position: relative;
+  }
+</style>

src/xt_pages/workforce/components/template_table.vue

@@ -11,7 +11,7 @@
                 </div>
             </el-col>
         </el-row>
-      
+
       <div id="table_data" >
         <el-table :height="tableContainHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="table"   :data="opera_device_numbers" :span-method="spanMethod" row-class-name="table-row-new-class schedule-table-row" @cell-click="itemClick">
             <el-table-column label="分区" width="80" align="center" fixed style="width: 100px; background-color: red; display: block;">
@@ -61,7 +61,7 @@
                     </template>
                 </el-table-column>
             </el-table-column>
-            
+
             <el-table-column label="周三" width="215" align="center">
                 <el-table-column prop="3_1" label="上" width="70" align="center">
                     <template slot-scope="scope">
@@ -79,7 +79,7 @@
                     </template>
                 </el-table-column>
             </el-table-column>
-            
+
             <el-table-column label="周四" width="215" align="center">
                 <el-table-column prop="4_1" label="上" width="70" align="center">
                     <template slot-scope="scope">
@@ -97,7 +97,7 @@
                     </template>
                 </el-table-column>
             </el-table-column>
-            
+
             <el-table-column label="周五" width="215" align="center">
                 <el-table-column prop="5_1" label="上" width="70" align="center">
                     <template slot-scope="scope">
@@ -115,7 +115,7 @@
                     </template>
                 </el-table-column>
             </el-table-column>
-            
+
             <el-table-column label="周六" width="215" align="center">
                 <el-table-column prop="6_1" label="上" width="70" align="center">
                     <template slot-scope="scope">
@@ -151,7 +151,7 @@
                     </template>
                 </el-table-column>
             </el-table-column>
-            
+
             <el-table-column prop="total" label="总数" width="60" align="center" fixed="right">
                 <template slot-scope="scope">
                     {{ scope.row.total }}
@@ -159,7 +159,7 @@
             </el-table-column>
         </el-table>
       </div>
-      
+
         <schedule-selector-dialog ref="selector_dialog" :patients="patients" @did_selected="will_add_schedule_action" @did_cancel="cancel_schedule_action"></schedule-selector-dialog>
     </div>
 </template>
@@ -355,6 +355,8 @@ export default {
 
         maked_device_numbers.push(device)
       }
+
+      console.log(maked_device_numbers)
       return maked_device_numbers
     },
     spanMethod({ row, column, rowIndex, columnIndex }) {