Merge branch 'vue_statistics_branch'

config/dev.env.js

@@ -6,8 +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://localhost:9531"',
+  // 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"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -19,8 +19,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    // host:'localhost',
+    // host: 'xt.test.sgjyun.com',
+    host:'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/api/common/common.js

@@ -34,10 +34,112 @@ export function saveConfiguration(data) {
   })
 }
 
-export function getConfigurationList(params) {
+export function getConfigurationList(limit, page) {
+  const params = {
+    limit: limit,
+    page: page
+  }
   return request({
     url: 'com/api/getconfigurationlist',
     method: 'get',
     params: params
   })
 }
+
+export function getConfigurationDetail(id, params) {
+  return request({
+    url: 'com/api/getconfigurationdetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAllInspectionMinor(params) {
+  return request({
+    url: 'com/api/getallinspectionminor',
+    method: 'get',
+    params: params
+  })
+}
+
+export function UpdateConfiguration(id, data) {
+  console.log('data', data)
+  return request({
+    url: 'com/api/updateconfiguration?id=' + id,
+    method: 'post',
+    data: data
+  })
+}
+
+export function DeleteConfiguration(id, params) {
+  return request({
+    url: 'com/api/deleteconfiguration?id=' + id,
+    method: 'delete',
+    params: params
+  })
+}
+
+export function getAllInspectionData(params) {
+  return request({
+    url: 'com/api/getallinspectiondata',
+    method: 'get',
+    params: params
+  })
+}
+
+export function SaveCheckConfiguration(data) {
+  console.log('data', data)
+  return request({
+    url: '/com/api/savecheckconfiguration',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getAllCheckList(page, limit) {
+  const params = {
+    page: page,
+    limit: limit
+  }
+  return request({
+    url: '/com/api/getallchecklist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getCheckDetail(id, params) {
+  return request({
+    url: '/com/api/getcheckdetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function UpdateCheck(id, data) {
+  return request({
+    url: '/com/api/updatecheck?id=' + id,
+    method: 'post',
+    data: data
+  })
+}
+
+export function DeleteCheck(id, params) {
+  return request({
+    url: '/com/api/deletecheck?id=' + id,
+    method: 'delete',
+    params: params
+  })
+}
+
+export function getDialysisModeType(startime, endtime) {
+  const params = {
+    startime: startime,
+    endtime: endtime
+  }
+  return request({
+    url: '/com/api/getdialysismodetype',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/data/prescription.vue

@@ -813,7 +813,6 @@ export default {
       row.index = rowIndex;
     },
     onRowClicks(row, event, column) {
-      console.log("row------", row.id);
       this.current_select = row.id;
       this.mode_name = row.name;
       this.isEdit = false;
@@ -883,13 +882,19 @@ export default {
       );
 
       getSystemPrescription(params).then(response => {
+        
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          if (response.data.data.prescription.id > 0) {
-            for (const key in response.data.data.prescription) {
-              this.addPlan[key] = response.data.data.prescription[key];
+           var prescription =  response.data.data.prescription
+           if(prescription.anticoagulant == 3){
+              prescription.anticoagulant = "低分子肝素"
+           }
+          if (prescription.id > 0) {
+            
+            for (const key in prescription) {
+              this.addPlan[key] = prescription[key];
             }
 
             this.dialysisTimeShow = new Date(
@@ -922,6 +927,8 @@ export default {
           return false;
         } else {
           this.system_prescription = response.data.data.prescriptions;
+          console.log("为什么",this.system_prescription)
+          
           for (let i = 0; i < this.system_prescription.length; i++) {
             if (this.system_prescription[i].mode == 1) {
               this.isEdit = true;
@@ -931,12 +938,6 @@ export default {
       });
     },
     selectnDialysisTime(val) {
-      console.log(val);
-
-      console.log(this.addPlan.dialysis_duration);
-      console.log(this.addPlan.dialysis_duration_hour);
-      console.log(this.addPlan.dialysis_duration_minute);
-
       var valTime = val.split(":");
       this.addPlan.dialysis_duration =
         parseFloat(valTime[0]) + parseFloat((valTime[1] / 60).toFixed(2));
@@ -945,7 +946,7 @@ export default {
     },
     changeThisAnticoagulant() {
       var thismode = parseInt(this.addPlan.anticoagulant);
-      console.log("------", thismode);
+     
       if (isNaN(thismode) || thismode <= 0) {
         return false;
       }
@@ -974,6 +975,7 @@ export default {
             this.isEdit = true;
             this.system_prescription = [];
             this.system_prescription = response.data.data.prescriptions;
+            console.log("触发了吗",this.system_prescription)
             this.addPlan.id = response.data.data.prescription.id;
             return false;
           }

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -86,13 +86,13 @@
           （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左') > -1 ? true : false" showValue="左"></label-box>
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右') > -1 ? true : false" showValue="右"></label-box>）部位
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内') > -1 ? true : false" showValue="颈内"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_id ? (getPartName(predialysis.blood_access_part_id).indexOf('颈内') > -1 ? true : false) : false" showValue="颈内"></label-box>
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('锁骨下') > -1 ? true : false" showValue="锁骨下"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_id ? (getPartName(predialysis.blood_access_part_id).indexOf('锁骨下') > -1 ? true : false) : false" showValue="锁骨下"></label-box>
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股') > -1 ? true : false" showValue="股"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_id ? (getPartName(predialysis.blood_access_part_id).indexOf('股') > -1 ? true : false) : false" showValue="股"></label-box>
           &nbsp;
-          <label-box :isChecked="['内瘘-左','内瘘-右','中心静脉置管-左','中心静脉置管-右','颈内','锁骨下','股'].indexOf(predialysis.blood_access_part_opera_name) == -1? true : false" showValue="其他"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_id ? (getPartName(predialysis.blood_access_part_id).indexOf('其他') > -1? true : false) :false" showValue="其他"></label-box>
           &nbsp;
         </div>
       </div>
@@ -187,6 +187,31 @@
               </div>kg
           </div>
       </div>
+      <div class="row">
+        透前评估 
+        <div class="inline_block under_line" style="width:93%;text-align: left;">
+          <div class="inline_block" style="margin-right:30px;">
+            体温
+            <div class="inline_block" style="width:50px;text-align:center">
+              {{ predialysis.temperature ? predialysis.temperature : "" }}
+            </div>℃
+          </div>
+          <div class="inline_block" style="margin-right:30px;">
+            血压
+            <div class="inline_block" style="width:100px;text-align:center">
+              {{ predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : "" }}/
+              {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : "" }}
+            </div>mmHg
+          </div>
+          <div class="inline_block" style="margin-right:30px;">
+            脉搏
+            <div class="inline_block" style="width:50px;text-align:center">
+              {{ predialysis.pulse_frequency ? predialysis.pulse_frequency : "" }}
+            </div>次/分
+          </div>
+ 
+        </div>
+      </div>
 
       <table class="print-table" border="1">
         <tr>
@@ -283,6 +308,53 @@
         </tbody>
       </table>
 
+      <table class="print-table" border="1">
+        <tbody>
+          <tr>
+            <td width="50" style="padding-left:5px;border:none;border-right:1px solid #000;">
+              透后评估
+            </td>
+
+            <td width="30" style="border:none;padding-left:5px;">
+              体温:
+            </td>
+            <td width="50" style="text-align:left;border:none;">
+              <div>
+                <span class="under_line" style="width:50px;display:inline-block;">
+                  {{ afterdialysis.temperature ? afterdialysis.temperature : "" }}
+                </span>℃
+              </div>
+            </td>
+            <!-- <td width="10" style="border:none;"></td> -->
+
+            <td width="30" style="border:none;padding-left:5px;">血压:</td>
+            <td width="100" style="text-align:left;border:none;line-height: 30px;">
+              <div>
+                <span class="under_line" style="width:100px;display:inline-block">
+                  {{ afterdialysis.systolic_blood_pressure ? afterdialysis.systolic_blood_pressure : "" }}/
+                  {{ afterdialysis.diastolic_blood_pressure ? afterdialysis.diastolic_blood_pressure : "" }}
+                </span>mmHg
+              </div>
+            </td>
+            <td width="30" style="border:none;padding-left:5px">脉搏:</td>
+            <td width="50" style="text-align:left;border:none;">
+              <div>
+                <span class="under_line" style="width:50px;display:inline-block">
+                  {{ predialysis.pulse_frequency ? predialysis.pulse_frequency : "" }}
+                </span>次/分
+              </div>
+            </td>
+            <td width="50" style="border:none;padding-left:5px">透析器凝血:</td>
+            <td width="120" style="text-align:left;border:none;">
+              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-0度') > -1 ? true : false" showValue="0"></label-box>
+              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false" showValue="+"></label-box>
+              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1" showValue="+ +"></label-box>
+              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false" showValue="+ + +"></label-box>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+
       <table class="print-table" border="1">
         <tr style="height:36px;text-align:left;border:none;">
           <td style="padding-left:5px;border:none">
@@ -1130,6 +1202,13 @@ export default {
           // checker: 0,
         }
       );
+    },
+    getPartName(id) {
+      for (let i = 0; i < this.vascularAccess.length; i++) {
+        if (this.vascularAccess[i].id == id) {
+          return this.vascularAccess[i].name;
+        }
+      }
     }
   },
   watch: {
@@ -1177,6 +1256,13 @@ export default {
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
     this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
+    var vascularAccess = getDataConfig("hemodialysis", "vascular_access");
+    this.vascularAccess = vascularAccess;
+    //console.log("hhe", vascularAccess);
+    console.log(
+      "血管通路部位",
+      getDataConfig("hemodialysis", "vascular_access")
+    );
 
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -53,25 +53,14 @@
             <div class="infoOne">
               <div class="titleBox">
                 <span class="point"></span>
-                <p class="infoTitle">透析总量(100次)</p>
+                <p class="infoTitle">透析总量({{total}}次)</p>
               </div>
+            
               <div class="borderBox">
-                <p>HD:64次(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>HD:64次(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>HD:64次(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>HD:64次(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>HD:64次(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>HD:64次(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>HD:64次(64%)</p>
-                <el-progress :percentage="70"></el-progress>
-                <p>HD:64次(64%)</p>
+               <div v-for="(item,index) in modetype" :key="index">
+                <p>{{item.mode_id}}:{{getTotalCount(item.mode_id)}}次(64%)</p>
                 <el-progress :percentage="70"></el-progress>
+               </div>
                 <p>HD:64次(64%)</p>
                 <el-progress :percentage="70"></el-progress>
               </div>
@@ -158,10 +147,12 @@
 
 
 <script>
+const moment = require('moment')
 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 {getDialysisModeType} from "@/api/common/common"
 export default {
   name: "dialysisTotal",
   components: {
@@ -186,11 +177,16 @@ export default {
         { value: 1, label: "近三个月", state: 1 },
         { value: 2, label: "近半年", state: 2 },
         { value: 3, label: "近一年", state: 3 }
-      ]
+      ],
+      modetype:[],
+      total:0,
     };
   },
-  created() {},
   methods: {
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     changeTime() {},
     changeEndTime(val) {
       var time =
@@ -204,8 +200,79 @@ export default {
     selectLapseTo(state) {
       this.stateType = state;
       this.listQuery.state = state;
+    },
+    getDialysisModeType(startDate,endDate){
+      getDialysisModeType(startDate,endDate).then(response=>{
+         if(response.data.state == 1){
+           var modetype =  response.data.data.modetype
+            var total =  response.data.data.total
+            console.log("total",total)
+            this.total = total
+           for(let i=0;i<modetype.length;i++){
+             if(modetype[i].mode_id == 1){
+               modetype[i].mode_id = "HD"
+             }
+             if(modetype[i].mode_id == 2){
+               modetype[i].mode_id = "HDF"
+             }
+             if(modetype[i].mode_id == 3){
+               modetype[i].mode_id = "HD+HP"
+             }
+              if(modetype[i].mode_id == 4){
+               modetype[i].mode_id = "HP"
+             }
+              if(modetype[i].mode_id == 5){
+               modetype[i].mode_id = "HF"
+             }
+             if(modetype[i].mode_id == 6){
+               modetype[i].mode_id = "SCUF"
+             }
+             if(modetype[i].mode_id == 7){
+               modetype[i].mode_id = "IUF"
+             }
+              if(modetype[i].mode_id == 8){
+               modetype[i].mode_id = "HFHD"
+             }
+             if(modetype[i].mode_id == 9){
+               modetype[i].mode_id = "HFHD+HP"
+             }
+             if(modetype[i].mode_id == 10){
+               modetype[i].mode_id = "PHF"
+             }
+             if(modetype[i].mode_id == 11){
+               modetype[i].mode_id = "HFR"
+             }
+            if(modetype[i].mode_id == 12){
+               modetype[i].mode_id = "HDF+HP"
+             }
+              if(modetype[i].mode_id == 13){
+               modetype[i].mode_id = "HFHD+HP"
+             }
+              if(modetype[i].mode_id == 14){
+               modetype[i].mode_id = "腹水回输"
+             }
+            if(modetype[i].mode_id == 19){
+               modetype[i].mode_id = "IUF+HD"
+             }
+           }
+           this.modetype = modetype
+           console.log("modetype",modetype)
+           
+         }
+      })
+    },
+    getTotalCount(id){
+      console.log("id",id)
     }
-  }
+  },
+  created() {
+     //获取本月当前机构的透析模式
+      const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
+      console.log("开始时间",startDate)
+      const endDate = moment(new Date()).format('YYYY-MM-DD')
+      console.log("结束时间",endDate)
+      this.getDialysisModeType(startDate,endDate)
+  },
 };
 </script>
 

src/xt_pages/qcd/checkStatistical.vue

@@ -14,57 +14,87 @@
         </el-col>
       </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 :data="checkList" border style="width: 100%">
+          <el-table-column prop="date" label="检验检查项">
+              <template slot-scope="scope">{{ scope.row.project_name }}</template>
+          </el-table-column>
+          <el-table-column prop="name" label="检查频次(天)">
+              <template slot-scope="scope">{{ scope.row.inspection_frequency }}</template>
+          </el-table-column>
+          <el-table-column prop="address" label="排序">
+             <template slot-scope="scope">{{ scope.row.sort }}</template>
+          </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>
-              <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              <el-button size="mini" type="primary" @click="handleEdit(scope.row.id)">编辑</el-button>
+              <el-button size="mini" type="danger" @click="handleDelete(scope.row.id,scope.$index)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
+
+          <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :page-sizes="[10, 20, 30, 100]"
+              :page-size="10"
+              background
+              style="margin-top:20px;float: right"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total">
+          </el-pagination>
       </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="请选择检查大项">
+                <el-option
+                  v-for="it in InspectionMajor"
+                  :key="it.project_id"
+                  :value="it.project_id"
+                  :label="it.project_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>
+          <el-form-item label="检查频次(天)" :label-width="formLabelWidth" required prop="frequency">
+            <el-input style="width:200px" v-model="form.frequency"></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="SaveCheckConfiguration('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-form :model="editform" ref="editform" :rules="rules">
+          <el-form-item label="检查大项" :label-width="formLabelWidth" required prop="inspectionMajor">
+            <el-select v-model="editform.inspectionMajor" placeholder="请选择检查大项">
+                <el-option
+                  v-for="it in InspectionMajor"
+                  :key="it.project_id"
+                  :value="it.project_id"
+                  :label="it.project_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>
+          <el-form-item label="检查频次(天)" :label-width="formLabelWidth" required prop="frequency">
+            <el-input style="width:200px" v-model="editform.frequency"></el-input>
           </el-form-item>
-          <el-form-item label="排序" :label-width="formLabelWidth">
-            <el-input style="width:200px" v-model="form.name"></el-input>
+          <el-form-item label="排序" :label-width="formLabelWidth" >
+            <el-input style="width:200px" v-model="editform.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="UpdateCheck('editform')">保 存</el-button>
         </div>
       </el-dialog>
     </div>
@@ -78,6 +108,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 {getAllInspectionData,SaveCheckConfiguration,getAllCheckList,getCheckDetail,UpdateCheck,DeleteCheck} from "@/api/common/common"
 export default {
   name: "dialysisTotal",
   data() {
@@ -88,52 +119,156 @@ export default {
         { path: false, name: "检验检查统计配置" }
       ],
       tabActiveName: "query",
-      tableData: [
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄"
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1517 弄"
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1519 弄"
-        },
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1516 弄"
-        }
-      ],
       newDialog: false,
       editDialog: false,
       formLabelWidth: "120px",
       form: {
-        name: "",
-        region: "",
-        date1: "",
-        date2: "",
-        delivery: false,
-        type: [],
-        resource: "",
-        desc: ""
-      }
+        inspectionMajor:"",
+        frequency:"",
+        sort:"",
+      },
+      editform:{
+        id:0,
+        inspectionMajor:"",
+        frequency:"",
+        sort:"",
+      },
+     InspectionMajor:[],
+     rules: {
+        inspectionMajor: [{ required: true, message: "检查大项不能为空" }],
+        frequency: [{ required: true, message: "检查频次不能为空" }],
+      },
+      limit:10,
+      page:1,
+      total:0,
+      checkList:[],
     };
   },
-  created() {},
+  created() {
+    //获取大项
+    this.getAllInspectionData(),
+    this.getAllCheckList()
+  },
   methods: {
     handleTabClick(tab, event) {
       if (this.tabActiveName == "control") {
         this.$router.push({ path: "/qcd/patientanalysis/statisticalConfig" });
       }
     },
-    handleEdit() {
+    handleEdit(id) {
       this.editDialog = true;
+       getCheckDetail(id).then(response=>{
+         if(response.data.state == 1){
+           var checkdetail = response.data.data.checkdetail
+           console.log("checkdetail",checkdetail)
+           this.editform.id = checkdetail.id
+           this.editform.inspectionMajor = checkdetail.inspection_major
+           this.editform.frequency = checkdetail.inspection_frequency
+           if(checkdetail.sort == 0){
+             this.editform.sort = ""
+             return 
+           }
+           this.editform.sort = checkdetail.sort
+         }
+       })
+    },
+    getAllInspectionData(){
+      getAllInspectionData().then(response=>{
+        if(response.data.state == 1){
+          var inspection =  response.data.data.inspection
+          //console.log("列表",inspection)
+          this.InspectionMajor = inspection
+        }
+      })
+    },
+    //新增
+    SaveCheckConfiguration(formName){
+       this.$refs[formName].validate(valid=>{
+         if(valid){
+           SaveCheckConfiguration(this.form).then(response=>{
+              if(response.data.state === 1){
+                var configuration =  response.data.data.configuration
+                this.$message.success("保存成功")
+                this.newDialog = false
+                this.form.inspectionMajor = ""
+                this.form.frequency = ""
+                this.form.sort = ""
+              }else{
+                this.$message.error("检验检查项已存在,不能重复添加")
+              }
+           })
+         }
+       })
+    },
+    handleSizeChange(limit) {
+      this.limit = limit;
+      this.getAllCheckList()
+    },
+    handleCurrentChange(page) {
+      this.page = page;
+      this.getAllCheckList()
+    },
+    getAllCheckList(){
+      getAllCheckList(this.page,this.limit).then(response=>{
+        if(response.data.state == 1){
+          var checklist = response.data.data.checklist
+          for(let i=0;i<checklist.length;i++){
+            if(checklist[i].sort == 0){
+              checklist[i].sort = ""
+            }
+          }
+          console.log("列表",checklist)
+          this.checkList = checklist
+          this.total = response.data.data.total
+          console.log("total",this.total)
+        }
+      })
+    },
+    UpdateCheck(formName){
+       if(this.editform.sort == ""){
+         this.editform.sort = 0
+       }
+       if(this.editform.sort !=""){
+         var sort = this.editform.sort 
+         var sorts = parseInt(sort)
+         this.editform.sort = sorts
+       }
+     
+      this.$refs[formName].validate(valid=>{
+        if(valid){
+          UpdateCheck(this.editform.id,this.editform).then(response=>{
+           
+            if(response.data.state == 1){
+              var configuration =  response.data.data.configuration
+               this.editDialog = false
+               this.getAllCheckList()
+               this.$message.success("保存成功")
+            }else{
+              this.$message.error("检验检查项已存在")
+            }
+          })
+        }
+      })
+    },
+    handleDelete(id,index){
+        this.$confirm(
+        "确认要删除所选记录吗? <br>删除后,该信息将无法恢复",
+        "删除提示",
+        {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      ).then(() => {
+        DeleteCheck(id,index).then(response => {
+          if (response.data.state === 1) {
+           var msg =  response.data.data.msg
+           console.log("msg",msg)
+           this.checkList.splice(index,1)
+          }
+        });
+      });
     }
   },
   components: {

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue

@@ -64,12 +64,7 @@
               <line-chart :options="chart"></line-chart>
             </div>
             <div class="cell clearfix" style="margin:0;margin-bottom:10px">
-              <div class="tableTitle" style="margin:0 20px 0 0;">统计表</div>
-              <el-input v-model="input" placeholder="收缩压" style="width: 80px;"></el-input>&nbsp;-&nbsp;
-              <el-input v-model="input" placeholder="收缩压" style="width: 80px;"></el-input>&nbsp;/&nbsp;
-              <el-input v-model="input" placeholder="舒张压" style="width: 80px;"></el-input>&nbsp;-&nbsp;
-              <el-input v-model="input" placeholder="舒张压" style="width: 80px;"></el-input>
-              <el-button type="primary">查询</el-button>
+              <div class="tableTitle">统计表</div>
             </div>
             <div>
               <el-table :data="tableData1" style="width: 100%" border>

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -16,31 +16,44 @@
       <div class="configTable">
         <el-table :data="configuraData" border style="width: 100%">
           <el-table-column prop="date" label="检验检查大项" width="180">
-              <template slot-scope="scope">{{ scope.row.inspection_major }}</template>
+              <template slot-scope="scope">{{ scope.row.project_name }}</template>
           </el-table-column>
-          <el-table-column prop="name" label="检查小项" width="180">
-             <template slot-scope="scope">{{ scope.row.inspection_minor }}</template>
+          <el-table-column prop="name" label="检查小项" width="300">
+             <template slot-scope="scope">{{ scope.row.item_name }}</template>
           </el-table-column>
           <el-table-column prop="address" label="范围">
              <template slot-scope="scope">{{ scope.row.min_range }} - {{scope.row.large_range}}</template>
           </el-table-column>
            <el-table-column prop="address" label="单位">
-              <template slot-scope="scope">{{ scope.row.min_range }}</template>
+              <template slot-scope="scope">{{ scope.row.unit }}</template>
+            </el-table-column>
+            <el-table-column prop="address" label="排序">
+                <template slot-scope="scope">{{ scope.row.sort }}</template>
             </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>
-              <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              <el-button size="mini" type="primary" @click="handleEdit(scope.row.id)">编辑</el-button>
+              <el-button size="mini" type="danger" @click="handleDelete(scope.row.id,scope.$index)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
+
+          <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :page-sizes="[10, 20, 30, 100]"
+              :page-size="10"
+              background
+              style="margin-top:20px;float: right"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total">
+          </el-pagination>
       </div>
 
       <el-dialog title="新增" :visible.sync="newDialog">
         <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-select v-model="form.inspectionMajor" placeholder="请选择检查大项" @change="changeInspection">
                <el-option
                   v-for="item in InspectionMajor"
                   :key="item.project_id"
@@ -51,7 +64,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="检查小项" :label-width="formLabelWidth" required prop="inspectionMinor">
-            <el-select v-model="form.inspectionMinor" placeholder="请选择活动区域" @change="changeInspectionMonior">
+            <el-select v-model="form.inspectionMinor" placeholder="请选择检查小项" @change="changeInspectionMonior">
                 <el-option
                   v-for="it in InspectionMinor"
                   :key="it.id"
@@ -72,45 +85,48 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="newDialog = false">取 消</el-button>
-          <el-button type="primary" @click="saveInspection('form')">保存</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.inspectionMajor" placeholder="请选择活动区域">
+        <el-form :model="editform" ref="editform" :rules="rules">
+          <el-form-item label="检查大项" :label-width="formLabelWidth" required prop="inspectionMajor">
+            <el-select v-model="editform.inspectionMajor" placeholder="请选择检查大项" @change="changeInspectionTwo">
               <el-option
                   v-for="patient in InspectionMajor"
-                  :key="patient.id"
-                  :value="patient.id"
+                  :key="patient.project_id"
+                  :value="patient.project_id"
                   :label="patient.project_name"
                   >
                </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="检查小项" :label-width="formLabelWidth">
-            <el-select v-model="form.inspectionMinor" placeholder="请选择活动区域">
+          <el-form-item label="检查小项" :label-width="formLabelWidth" required prop="inspectionMinor">
+            <el-select v-model="editform.inspectionMinor" placeholder="请选择检查小项"  @change="changeInspectionMonior">
                <el-option
-                  v-for="item in InspectionMinor"
-                  :key="item.project_id"
-                  :value="item.project_id"
+                  v-for="item in InspectionMinorTwo"
+                  :key="item.id"
+                  :value="item.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.min_range"></el-input>&nbsp;
+          <el-form-item label="指控范围" :label-width="formLabelWidth" required prop="large_range">
+            <el-input style="width:200px" v-model="editform.min_range"></el-input>&nbsp;
             -
-            <el-input style="width:200px" v-model="form.large_range"></el-input>
+            <el-input style="width:200px" v-model="editform.large_range"></el-input>
           </el-form-item>
           <el-form-item label="排序" :label-width="formLabelWidth">
-            <el-input style="width:200px" v-model="form.sort"></el-input>
+            <el-input style="width:200px" v-model="editform.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="EditConfiguration('editform')">保 存</el-button>
         </div>
       </el-dialog>
     </div>
@@ -124,7 +140,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,saveConfiguration,getConfigurationList }from "@/api/common/common";
+import { getInspectionMajor,getInspectionMinor,getInspectionRange,saveConfiguration,getConfigurationList,getConfigurationDetail,getAllInspectionMinor,UpdateConfiguration,DeleteConfiguration }from "@/api/common/common";
 export default {
   name: "dialysisTotal",
   data() {
@@ -137,6 +153,7 @@ export default {
       tabActiveName: "control",
       InspectionMajor:[],
       InspectionMinor:[],
+      InspectionMinorTwo:[],
       configuraData: [],
       newDialog: false,
       editDialog: false,
@@ -148,11 +165,22 @@ export default {
         large_range: "",
         sort:"",
       },
+      editform:{
+         id:0,
+         inspectionMajor: "",
+         inspectionMinor: "",
+         min_range: "",
+         large_range: "",
+         sort:"",
+      },
       rules: {
         inspectionMajor: [{ required: true, message: "检查大项不能为空" }],
         inspectionMinor: [{ required: true, message: "检查小项不能为空" }],
         large_range:[{required:true,message:"指控范围不能为空"}]
-      }
+      },
+      page:1,
+      limit:10,
+      total:0,
     };
   },
   methods: {
@@ -161,8 +189,26 @@ export default {
         this.$router.push({ path: "/qcd/patientanalysis/checkStatistical" });
       }
     },
-    handleEdit() {
+
+    //编辑
+    handleEdit(id) {
       this.editDialog = true;
+      getConfigurationDetail(id).then(response=>{
+         if(response.data.state == 1){
+           var configurationdetail = response.data.data.configurationdetail
+           console.log("详情",configurationdetail)
+           this.editform.id = configurationdetail.id
+           this.editform.inspectionMajor = configurationdetail.inspection_major
+           this.editform.inspectionMinor = configurationdetail.inspection_minor
+           this.editform.large_range = configurationdetail.large_range
+           this.editform.min_range = configurationdetail.min_range
+           if(configurationdetail.sort == 0){
+            this.editform.sort = ""
+            return
+           }
+           this.editform.sort = configurationdetail.sort
+         }
+      })
     },
     
     //获取大项数据来源
@@ -170,23 +216,32 @@ export default {
       getInspectionMajor().then(response=>{
         if(response.data.state == 1){
           var inspection =  response.data.data.inspection
-          console.log("inspection",inspection)
+          console.log("大项",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)
+         console.log("小项",inspection)
          this.InspectionMinor = inspection
         }
       })
     },
+    changeInspectionTwo(id){
+      this.InspectionMinorTwo = []
+       getInspectionMinor(id).then(response=>{
+        if(response.data.state == 1){
+         var inspection =  response.data.data.inspection
+         console.log("小项",inspection)
+         this.InspectionMinorTwo = inspection
+        }
+      })
+    },
     // 获取指控范围
     changeInspectionMonior(id){
        getInspectionRange(id).then(response=>{
@@ -211,20 +266,91 @@ export default {
              this.form.large_range = ""
              this.form.min_range = ""
              this.form.sort = ""
+             this.getConfigurationList()
+            }else{
+             this.$message.error("检查小项已存在")
             }
           })
         }
       })
     },
+   handleSizeChange(limit) {
+      this.limit = limit;
+      this.getConfigurationList();
+    },
+    handleCurrentChange(page) {
+      this.page = page;
+      this.getConfigurationList();
+    },
     getConfigurationList(){
-      getConfigurationList().then(response=>{
+      getConfigurationList(this.limit,this.page).then(response=>{
         if(response.data.state === 1){
           var configurationlist = response.data.data.configurationlist
+          for(let i=0;i<configurationlist.length;i++){
+            if(configurationlist[i].sort === 0){
+              configurationlist[i].sort = ""
+            }
+          }
           console.log("列表",configurationlist)
           this.configuraData = configurationlist
+          var total = response.data.data.total
+          console.log("total",total)
+          this.total = total
         }
       })
-    }
+    },
+    //获取小项
+    getAllInspectionMinor(){
+      getAllInspectionMinor().then(response=>{
+        if(response.data.state == 1){
+          var minor =  response.data.data.minor
+          this.InspectionMinorTwo = minor
+          console.log("minor",minor)
+        }
+      })
+    },
+    EditConfiguration(formName){
+       if(this.editform.sort == ""){
+         this.editform.sort = 0
+       }
+       if(this.editform.sort!=""){
+        var sorts =  this.editform.sort
+        var sort = parseInt(sorts)
+        this.editform.sort = sort
+       }
+     
+      UpdateConfiguration(this.editform.id,this.editform).then(response=>{
+        if(response.data.state == 1){
+         var standard =  response.data.data.standard
+         console.log("standard",standard)
+         this.$message.success("保存成功")
+         this.editDialog = false
+         this.getConfigurationList()
+        }else{
+         this.$message.error("检查小项已存在")
+        }
+      })
+    },
+   handleDelete(id,index) {
+      this.$confirm(
+        "确认要删除所选记录吗? <br>删除后,该信息将无法恢复",
+        "删除提示",
+        {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      ).then(() => {
+        DeleteConfiguration(id,index).then(response => {
+          if (response.data.state === 1) {
+           var msg =  response.data.data.msg
+           console.log("msg",msg)
+           this.configuraData.splice(index,1)
+          }
+        });
+      });
+    },
   },
   components: {
     PieChart,
@@ -235,7 +361,10 @@ export default {
        this.getInspectionMajor()
     //获取表格里面的数据
     this.getConfigurationList()
+    //获取所有小项的数据
+    this.getAllInspectionMinor()
    },
+
 };
 </script>
 <style lang="scss">

src/xt_pages/user/dialysisSolution.vue

@@ -1248,9 +1248,9 @@ export default {
       this.fetchPatientDialysisSolutions();
     },
     openEdit(index, row) {
-      console.log(row);
+     
       this.current_index = index;
-
+     
       this.addPlan.id = row.id;
       this.addPlan.mode = row.mode_id;
       this.addPlan.mode_name = row.mode_name;
@@ -1262,7 +1262,12 @@ export default {
       this.addPlan.hemodialysis_machine = row.hemodialysis_machine + "";
       this.addPlan.perfusion_apparatus = row.perfusion_apparatus + "";
       this.addPlan.blood_flow_volume = row.blood_flow_volume.toString();
-      this.addPlan.anticoagulant = row.anticoagulant;
+      if(row.anticoagulant == 3){
+        this.addPlan.anticoagulant = "低分子肝素"
+      }
+      if(row.anticoagulant != 3){
+         this.addPlan.anticoagulant = row.anticoagulant;
+      }
       this.addPlan.replacement_total = row.replacement_total;
 
       this.addPlan.target_ktv = row.target_ktv.toString();
@@ -1292,7 +1297,7 @@ export default {
       this.addPlan.displace_liqui_value = row.displace_liqui_value.toString();
       this.addPlan.ultrafiltration = row.ultrafiltration.toString();
       this.addPlan.blood_access = row.blood_access;
-
+     
       this.addPlan.registrars_id = row.registrars_id;
 
       this.dialogVisible = true;
@@ -1655,6 +1660,7 @@ export default {
     // this.fetchAllDoctorAndNurse();
     this.fetchAllAdminUsers();
     this.fetchPatientDialysisSolutions();
+   
   }
 };
 </script>

src/xt_pages/user/patients.vue

@@ -590,6 +590,7 @@
         isIndeterminate: true,
         dialogVisible: false,
         exportLogVisible: false,
+        exportVisible:false,
         phoneVisible:false,
         idCardNoVisible:false,
         wechatbindimg: '',
@@ -1023,7 +1024,6 @@
               }
 
 
-              console.log(this.export_date)
 
               var tempExportDate = this.export_date
               var tempExportDateOne = this.export_date
@@ -1068,15 +1068,11 @@
                 return cur
               }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
-
-
               if (tempExportDateTwo.length < this.export_date.length){
                 this.idCardNoVisible = true
                 return
               }
 
-
-
               // this.exportVisible = true
               this.$alert('您提交的患者名单已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
                 confirmButtonText: '确定',
@@ -1084,7 +1080,6 @@
 
                 }
               });
-
               this.isShow = false
               let params = {
                 'patients': this.export_date
@@ -1110,7 +1105,6 @@
 
       },
       getCount(row) {
-        console.log(row)
         return row.total_dialysis + row.user_sys_before_count
       },
       EditLapseto() {

src/xt_pages/workforce/appointment.vue

@@ -1,5 +1,22 @@
 <template>
   <div class="main-contain">
+    <el-dialog
+      title="提示"
+      :visible.sync="exportVisible"
+      width="40%"
+    >
+
+      <div>
+        您提交的排班信息已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="exportVisible = false">取 消</el-button>
+    <el-button type="primary" @click="exportVisible = false">确 定</el-button>
+  </span>
+    </el-dialog>
+
+
     <el-dialog
       title="提示"
       :visible.sync="exportLogVisible"
@@ -11,8 +28,8 @@
         <br/>
         <br/>
         <span>{{getContent(item)}}</span>
-        <span style="color:blue" @click="generateTxt(item)">点击</span>
-        <span>查看详情</span>
+        <span >点击</span>
+        <span style="color:blue" @click="generateTxt(item)">查看详情</span>
         <br/>
         <br/>
       </div>
@@ -123,6 +140,7 @@
         msgTipVisible: false,
         dialogVisible: false,
         isExistRepeatVisible: false,
+        exportVisible:false,
         exportLogVisible: false,
         theWeek: {
           lastWeek: 0,
@@ -158,7 +176,7 @@
         }
         const aLink = document.createElement('a')
         aLink.href = url
-        aLink.download = this.timestampToTime(log.export_time) + '错误日志.txt'
+        aLink.download = this.timestampToTime(log.export_time) + '临时排班导入日志.txt'
         aLink.click()
 
       },
@@ -472,57 +490,29 @@
         }
         return isShow
       }, handleSuccess({ results, header }) {
-
+        let headers = []
+        for (let key in results[0]) {
+          headers.push(key)
+        }
+        console.log(headers)
         if (results.length > 0) {
-          let headers = []
-          for (let key in results[0]) {
-            headers.push(key)
-          }
+
 
           var isHas_1 = headers.includes('区号')
-          console.log(isHas_1)
           var isHas_2 = headers.includes('机号')
-          console.log(isHas_2)
-
           var isHas_3 = headers.includes('周一')
-          console.log(isHas_3)
-
           var isHas_4 = headers.includes('')
-          console.log(isHas_4)
-
           var isHas_5 = headers.includes('_1')
-          console.log(isHas_5)
-
           var isHas_6 = headers.includes('周二')
-          console.log(isHas_6)
-
           var isHas_7 = headers.includes('_2')
-          console.log(isHas_7)
-
           var isHas_8 = headers.includes('_3')
-          console.log(isHas_8)
-
           var isHas_9 = headers.includes('周三')
-          console.log(isHas_9)
-
           var isHas_10 = headers.includes('_4')
-          console.log(isHas_1)
-
           var isHas_11 = headers.includes('_5')
-          console.log(isHas_1)
-
           var isHas_12 = headers.includes('周四')
-          console.log(isHas_1)
-
           var isHas_13 = headers.includes('_6')
-          console.log(isHas_1)
-
           var isHas_14 = headers.includes('_7')
-          console.log(isHas_1)
-
           var isHas_15 = headers.includes('周五')
-          console.log(isHas_1)
-
           var isHas_16 = headers.includes('_8')
           console.log(isHas_1)
 
@@ -603,10 +593,13 @@
             isHas_51 && isHas_52 && isHas_53 && isHas_54 && isHas_55 &&
             isHas_56 && isHas_57 && isHas_58 && isHas_59 && isHas_60 &&
             isHas_61 && isHas_62 && isHas_63 && isHas_64 && isHas_65)) {
+            console.log("1111111")
             this.dialogVisible = true
             return
           }
         } else {
+          console.log("2222222222")
+
           this.dialogVisible = true
           return
         }
@@ -617,10 +610,10 @@
         let deviceNumber = []
 
         for (let i = 0; i < results.length; i++) {
-          if (results[i + 1] && results[i + 1]['区号'] != undefined) {
+          if (results[i + 1]) {
             zones.push(results[i + 1]['区号'])
           }
-          if (results[i + 1] && results[i + 1]['机号'] != undefined) {
+          if (results[i + 1]) {
             deviceNumber.push(results[i + 1]['机号'])
           }
 
@@ -638,6 +631,8 @@
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
+
+
         var total_zones = []
         var total_device_number = []
 
@@ -647,7 +642,6 @@
 
         for (let key in this.partitions) {
           var jihaos = this.partitions[key].jihaos
-          console.log(jihaos)
 
           for (let i = 0; i < jihaos.length; i++) {
             total_device_number.push(jihaos[i].number)
@@ -660,8 +654,7 @@
           }
         }
 
-        console.log(deviceNumber)
-        console.log(total_device_number)
+
 
         for (let i = 0; i < deviceNumber.length; i++) {
           if (!total_device_number.includes(deviceNumber[i])) {
@@ -678,6 +671,8 @@
         }
 
         let datas = []
+        let failed_datas = []
+
         for (let i = 0; i < results.length; i++) {
           for (let key in results[i + 1]) {
             let tempObjTwo = { partition_name: '', device_number_name: '' }
@@ -713,11 +708,11 @@
               var m_month = current_date.getMonth() + 1
               m_month = m_month < 10 ? '0' + m_month.toString() : m_month.toString()
               var m_date = current_date.getDate() < 10 ? '0' + current_date.getDate().toString() : current_date.getDate().toString()
-
               var current_date_two = new Date(m_year + '-' + m_month + '-' + m_date)
-
-              if (new Date(tempObjTwo['schedule_date']).getTime() >= new Date(current_date_two).getTime()) {
+              if (new Date(tempObjTwo['schedule_date']).getTime() > new Date(current_date_two).getTime()) {
                 datas.push(tempObjTwo)
+              }else{
+                failed_datas.push(tempObjTwo)
               }
             }
           }
@@ -799,11 +794,8 @@
           }
         }
 
-        console.log(header.length)
-        console.log(is_system_zone)
-        console.log(is_device_number)
 
-        if (header.length > 65 || !is_system_zone || !is_device_number) {
+        if (headers.length > 65 || !is_system_zone || !is_device_number) {
           this.dialogVisible = true
           return
         } else {
@@ -811,8 +803,20 @@
             this.isExistRepeatVisible = true
             return
           } else {
+            // this.exportVisible = true
+
+            this.$alert('您提交的排班信息已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
+              confirmButtonText: '确定',
+              callback: action => {
+
+              }
+            });
+
+
             let params = {
-              schedule: datas
+              schedule: datas,
+              failed_schedule: failed_datas
+
             }
 
             //今天的时间
@@ -820,7 +824,6 @@
             day2.setTime(day2.getTime())
             var month = day2.getMonth() + 1 < 10 ? '0' + (day2.getMonth() + 1).toString() : (day2.getMonth() + 1).toString()
             var day = day2.getDate() < 10 ? '0' + (day2.getDate()).toString() : (day2.getMonth() + 1).toString()
-
             var date = day2.getFullYear() + '-' + month + '-' + day
             exportSchedule(params, date).then(response => {
               if (response.data.state == 0) {

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

@@ -16,7 +16,7 @@
       :visible.sync="msgTipVisible"
       width="40%"
     >
-      <span>如果导入成功,会将当前已有的排版模版会被全部清除,是否继续导入排版模版数据</span>
+      <span>若执行排班导入,系统将会清除当前已有排班模板数据,是否继续导入？</span>
       <span slot="footer" class="dialog-footer">
     <el-button @click="msgTipVisible = false">取 消</el-button>
     <el-button type="primary" @click="handleUpload()">确 定</el-button>

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

@@ -4,7 +4,7 @@
       :visible.sync="msgTipVisible"
       width="40%"
     >
-      <span>如果导入成功,会将当前已有的排版会被全部清除,是否继续导入排版数据</span>
+      <span>若执行排班导入,系统将会清除当前已有临时排班数据,是否继续导入？</span>
       <span slot="footer" class="dialog-footer">
     <el-button @click="msgTipVisible = false">取 消</el-button>
     <el-button type="primary" @click="handleUpload()">确 定</el-button>

src/xt_pages/workforce/components/tableData.vue

@@ -1020,8 +1020,7 @@ export default {
                 }
               });
             }
-            console.log("hhhh", that.scheduleZone);
-            console.log(theSchedules);
+
           });
         } else {
           this.$message.error("网络错误");

src/xt_pages/workforce/template.vue

@@ -1,5 +1,23 @@
 <template>
   <div class="main-contain">
+
+    <el-dialog
+      title="提示"
+      :visible.sync="exportVisible"
+      width="40%"
+    >
+
+      <div>
+        您提交的排班信息已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="exportVisible = false">取 消</el-button>
+    <el-button type="primary" @click="exportVisible = false">确 定</el-button>
+  </span>
+    </el-dialog>
+
+
     <el-dialog
       title="提示"
       :visible.sync="exportLogVisible"
@@ -11,8 +29,8 @@
         <br/>
         <br/>
         <span>{{getContent(item)}}</span>
-        <span style="color:blue"  @click="generateTxt(item)">点击</span>
-        <span>查看详情</span>
+        <span>点击</span>
+        <span  style="color:blue" @click="generateTxt(item)">查看详情</span>
         <br/>
         <br/>
       </div>
@@ -76,6 +94,7 @@
           class="filter-item"
           type="primary"
           size="small"
+          v-loading="generateLoading"
         >下载日志
         </el-button>
 
@@ -146,8 +165,9 @@
         downloadLoading: false,
         isExistRepeatVisible:false,
         exportLogVisible:false,
+        exportVisible:false,
         logs:[],
-
+        generateLoading:false,
 
         days:[],
         msgTipVisible: false,
@@ -238,7 +258,7 @@
         }
         const aLink = document.createElement('a')
         aLink.href = url
-        aLink.download = this.timestampToTime(log.export_time)+'错误日志.txt'
+        aLink.download = this.timestampToTime(log.export_time)+'排班模板导入日志.txt'
         aLink.click()
 
       },
@@ -256,19 +276,26 @@
         return '您导入的文档共' + log.total_num + '条患者数据' + '，' + '已成功导入' + log.success_num + '条，导入失败' + log.fail_num + '条,'
       },
       generateLog() {
+        this.generateLoading = true
         let params = {
           'log_type': 3
         }
         generateLog(params).then(
           response => {
             if (response.data.state === 1) {
+              this.generateLoading = false
+
               this.logs = response.data.data.logs
               this.exportLogVisible = true
             } else {
               this.$message.error(response.data.msg)
+              this.generateLoading = false
+
             }
           }
-        )
+        ).catch(error => {
+          this.generateLoading = false
+        })
 
       },
       getInitDate(){
@@ -285,13 +312,13 @@
       },
       handleSuccess({ results, header }) {
 
-        console.log(this.template_mode.mode)
+        let headers = []
+        for (let key in results[0]) {
+          headers.push(key)
+        }
         if (this.template_mode.mode == 1) {
           if(results.length > 0) {
-            let headers = []
-            for (let key in results[0]) {
-              headers.push(key)
-            }
+
             var isHas_1 = headers.includes('区号')
             console.log(isHas_1)
             var isHas_2 = headers.includes('机号')
@@ -375,12 +402,7 @@
           }
 
         }else if(this.template_mode.mode == 2){
-
           if(results.length > 0) {
-            let headers = []
-            for (let key in results[0]) {
-              headers.push(key)
-            }
 
             var isHas_1 = headers.includes('区号')
             console.log(isHas_1)
@@ -505,10 +527,10 @@
         let deviceNumber = []
 
         for (let i = 0; i < results.length; i++) {
-          if (results[i + 1] && results[i + 1]['区号'] != undefined) {
+          if (results[i + 1] ) {
             zones.push(results[i + 1]['区号'])
           }
-          if (results[i + 1] && results[i + 1]['机号'] != undefined) {
+          if (results[i + 1] ) {
             deviceNumber.push(results[i + 1]['机号'])
           }
 
@@ -525,6 +547,9 @@
           obj2[next] ? '' : obj2[next] = true && cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+        console.log("1111111111")
+        console.log(deviceNumber)
+        console.log("1111111111")
 
         var total_zones = []
         var total_device_number = []
@@ -676,7 +701,21 @@
           }
         }
 
-        if (!is_system_zone || !is_device_number) {
+        let isHeader = true
+
+        if(this.template_mode.mode == 1){
+          if(headers.length > 23){
+            isHeader = false
+          }
+
+        }else if(this.template_mode.mode == 2){
+          if(headers.length > 44){
+            isHeader = false
+          }
+
+        }
+
+        if (!isHeader || !is_system_zone || !is_device_number) {
           this.dialogVisible = true
           return
         } else {
@@ -684,6 +723,14 @@
             this.isExistRepeatVisible = true
             return
           } else {
+
+            this.$alert('您提交的排班信息已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
+              confirmButtonText: '确定',
+              callback: action => {
+
+              }
+            });
+
             let params = {
               schedule: datas
             }
@@ -692,6 +739,7 @@
             day2.setTime(day2.getTime())
             var month = day2.getMonth() + 1 < 10 ? '0' + (day2.getMonth() + 1).toString() : (day2.getMonth() + 1).toString()
             var day = day2.getDate() < 10 ? '0' + (day2.getDate()).toString() : (day2.getMonth() + 1).toString()
+
             exportScheduleTemplate(params).then(response => {
               if (response.data.state == 0) {
                 return false