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

src/api/common/common.js

@@ -4,7 +4,7 @@ import url from 'postcss-url'
 export function getInspectionMajor(params) {
   return request({
     url: '/com/api/getinspectionmajor',
-    methods: 'get',
+    method: 'get',
     params: params
   })
 }
@@ -12,7 +12,7 @@ export function getInspectionMajor(params) {
 export function getInspectionMinor(id, params) {
   return request({
     url: '/com/api/getinspectionminor?id=' + id,
-    methods: 'get',
+    method: 'get',
     params: params
   })
 }
@@ -20,16 +20,24 @@ export function getInspectionMinor(id, params) {
 export function getInspectionRange(id, params) {
   return request({
     url: '/com/api/getinspectionrange?id=' + id,
-    methods: 'get',
+    method: 'get',
     params: params
   })
 }
 
-export function saveInspection(data) {
+export function saveConfiguration(data) {
   console.log('data', data)
   return request({
-    url: '/com/api/saveinspction',
-    methods: 'post',
+    url: '/com/api/saveconfiguration',
+    method: 'post',
     data: data
   })
 }
+
+export function getConfigurationList(params) {
+  return request({
+    url: 'com/api/getconfigurationlist',
+    method: 'get',
+    params: params
+  })
+}

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

@@ -1712,6 +1712,7 @@ export default {
         this.add_weight = parseFloat(weight_before - last_weight_after).toFixed(
           2
         );
+        console.log("体重增加",this.add_weight)
       }
 
       this.isVisibility = true;

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -14,11 +14,19 @@
         </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-column prop="address" label="单位"></el-table-column>
+        <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>
+          </el-table-column>
+          <el-table-column prop="name" label="检查小项" width="180">
+             <template slot-scope="scope">{{ scope.row.inspection_minor }}</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>
+            </el-table-column>
             <el-table-column prop="address" label="排序"></el-table-column>
           <el-table-column label="操作" width="180">
             <template slot-scope="scope">
@@ -116,7 +124,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";
+import { getInspectionMajor,getInspectionMinor,getInspectionRange,saveConfiguration,getConfigurationList }from "@/api/common/common";
 export default {
   name: "dialysisTotal",
   data() {
@@ -129,28 +137,7 @@ export default {
       tabActiveName: "control",
       InspectionMajor:[],
       InspectionMinor:[],
-      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 弄"
-        }
-      ],
+      configuraData: [],
       newDialog: false,
       editDialog: false,
       formLabelWidth: "120px",
@@ -214,10 +201,29 @@ export default {
     saveInspection(formName){
       this.$refs[formName].validate(valid=>{
         if(valid){
-          saveInspection(this.form).then(response=>{
+          saveConfiguration(this.form).then(response=>{
+            if(response.data.state == 1){
+             var standard = response.data.data.standard
+             this.$message.success("保存成功")
+             this.newDialog = false
+             this.form.inspectionMajor = ""
+             this.form.inspectionMinor = ""
+             this.form.large_range = ""
+             this.form.min_range = ""
+             this.form.sort = ""
+            }
           })
         }
       })
+    },
+    getConfigurationList(){
+      getConfigurationList().then(response=>{
+        if(response.data.state === 1){
+          var configurationlist = response.data.data.configurationlist
+          console.log("列表",configurationlist)
+          this.configuraData = configurationlist
+        }
+      })
     }
   },
   components: {
@@ -227,6 +233,8 @@ export default {
    created() {
      //获取检查大项数据来源
        this.getInspectionMajor()
+    //获取表格里面的数据
+    this.getConfigurationList()
    },
 };
 </script>

src/xt_pages/user/patients.vue

@@ -832,6 +832,9 @@
                       var month = parseInt(results[i][key].replace(/\s/g,"").split('/')[0])
                       var day = parseInt(results[i][key].replace(/\s/g,"").split('/')[1])
                       var year = parseInt(results[i][key].replace(/\s/g,"").split('/')[2])
+                      if (year < 10) {
+                        year = '0' + year
+                      }
 
                       if (day < 10) {
                         day = '0' + day
@@ -839,7 +842,7 @@
                       if (month < 10) {
                         month = '0' + month
                       }
-                      obj['first_treatment_date'] = '20' + year + '/' + month + '/' + day
+                      obj['first_treatment_date'] = '20' + year.toString() + '/' + month.toString() + '/' + day.toString()
                     }
                   }