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

src/api/common/common.js

@@ -45,3 +45,35 @@ export function getConfigurationList(limit, page) {
     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) {
+  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: 'post',
+    params: params
+  })
+}

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -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.$index, scope.row)">删除</el-button>
+              <el-button size="mini" type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -88,42 +88,45 @@
           <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>
@@ -137,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() {
@@ -150,6 +153,7 @@ export default {
       tabActiveName: "control",
       InspectionMajor:[],
       InspectionMinor:[],
+      InspectionMinorTwo:[],
       configuraData: [],
       newDialog: false,
       editDialog: false,
@@ -161,6 +165,14 @@ export default {
         large_range: "",
         sort:"",
       },
+      editform:{
+         id:0,
+         inspectionMajor: "",
+         inspectionMinor: "",
+         min_range: "",
+         large_range: "",
+         sort:"",
+      },
       rules: {
         inspectionMajor: [{ required: true, message: "检查大项不能为空" }],
         inspectionMinor: [{ required: true, message: "检查小项不能为空" }],
@@ -177,10 +189,20 @@ export default {
         this.$router.push({ path: "/qcd/patientanalysis/checkStatistical" });
       }
     },
+
+    //编辑
     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
+           this.editform.sort = configurationdetail.sort
          }
       })
     },
@@ -190,23 +212,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=>{
@@ -261,7 +292,49 @@ export default {
           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){
+       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()
+        }
+      })
+    },
+   handleDelete(id) {
+      this.$confirm(
+        "确认要删除所选记录吗? <br>删除后,该信息将无法恢复",
+        "删除提示",
+        {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      ).then(() => {
+        DeleteConfiguration(id).then(response => {
+          if (response.data.state === 1) {
+            
+          }
+        });
+      });
+    },
   },
   components: {
     PieChart,
@@ -272,7 +345,10 @@ export default {
        this.getInspectionMajor()
     //获取表格里面的数据
     this.getConfigurationList()
+    //获取所有小项的数据
+    this.getAllInspectionMinor()
    },
+
 };
 </script>
 <style lang="scss">