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

src/api/common/common.js

@@ -77,3 +77,56 @@ export function DeleteConfiguration(id, params) {
     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
+  })
+}

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="getPartName(predialysis.blood_access_part_id).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="getPartName(predialysis.blood_access_part_id).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="getPartName(predialysis.blood_access_part_id).indexOf('股') > -1 ? true : false" showValue="股"></label-box>
           &nbsp;
-          <label-box :isChecked="['内瘘-左','内瘘-右','中心静脉置管-左','中心静脉置管-右','颈内','锁骨下','股'].indexOf(predialysis.blood_access_part_opera_name) == -1? true : false" showValue="其他"></label-box>
+          <label-box :isChecked="getPartName(predialysis.blood_access_part_id).indexOf('其他') > -1? true : false" showValue="其他"></label-box>
           &nbsp;
         </div>
       </div>
@@ -1202,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: {
@@ -1249,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/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="检验检查项" width="180">
+              <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_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,146 @@ 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
+           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){
+       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

@@ -18,7 +18,7 @@
           <el-table-column prop="date" label="检验检查大项" width="180">
               <template slot-scope="scope">{{ scope.row.project_name }}</template>
           </el-table-column>
-          <el-table-column prop="name" label="检查小项" width="180">
+          <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="范围">
@@ -33,7 +33,7 @@
           <el-table-column label="操作" width="180">
             <template slot-scope="scope">
               <el-button size="mini" type="primary" @click="handleEdit(scope.row.id)">编辑</el-button>
-              <el-button size="mini" type="danger" @click="handleDelete(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>
@@ -53,7 +53,7 @@
       <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"
@@ -64,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"
@@ -85,7 +85,7 @@
         </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>
 
@@ -94,7 +94,7 @@
       <el-dialog title="编辑" :visible.sync="editDialog">
         <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-select v-model="editform.inspectionMajor" placeholder="请选择检查大项" @change="changeInspectionTwo">
               <el-option
                   v-for="patient in InspectionMajor"
                   :key="patient.project_id"
@@ -105,7 +105,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="检查小项" :label-width="formLabelWidth" required prop="inspectionMinor">
-            <el-select v-model="editform.inspectionMinor" placeholder="请选择活动区域"  @change="changeInspectionMonior">
+            <el-select v-model="editform.inspectionMinor" placeholder="请选择检查小项"  @change="changeInspectionMonior">
                <el-option
                   v-for="item in InspectionMinorTwo"
                   :key="item.id"
@@ -126,7 +126,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="editDialog = false">取 消</el-button>
-          <el-button type="primary" @click="EditConfiguration('editform')">保存</el-button>
+          <el-button type="primary" @click="EditConfiguration('editform')">保 存</el-button>
         </div>
       </el-dialog>
     </div>
@@ -317,7 +317,7 @@ export default {
         }
       })
     },
-   handleDelete(id) {
+   handleDelete(id,index) {
       this.$confirm(
         "确认要删除所选记录吗? <br>删除后,该信息将无法恢复",
         "删除提示",
@@ -328,7 +328,7 @@ export default {
           type: "warning"
         }
       ).then(() => {
-        DeleteConfiguration(id).then(response => {
+        DeleteConfiguration(id,index).then(response => {
           if (response.data.state === 1) {
            var msg =  response.data.data.msg
            console.log("msg",msg)