导出

src/api/data.js

@@ -10,6 +10,7 @@ export function createConfig(params) {
 }
 
 export function createChildConfig(params) {
+  console.log("parasms22222",params)
   return request({
     url: '/api/createchildconfig',
     method: 'post',

src/api/manage.js

@@ -97,7 +97,7 @@ export function getAllEquimentName(params) {
 }
 
 export function savePlan(data, id) {
-  console.log('data====', data)
+ 
   return request({
     url: '/api/management/saveplan?id=' + id,
     method: 'Post',
@@ -150,7 +150,7 @@ export function EditPlanDetail(id, params) {
 }
 
 export function UpdatePlanInfo(data) {
-  console.log('data', data)
+  
   return request({
     url: '/api/manage/updateplaninfo',
     method: 'Post',
@@ -167,7 +167,7 @@ export function getComprehensive(params) {
 }
 
 export function SaveInformation(eid, data) {
-  console.log('data--', data)
+
   return request({
     url: '/api/manage/saveinformation?eid=' + eid,
     method: 'Post',
@@ -393,7 +393,7 @@ export function EditRepair(id, params) {
 }
 
 export function UpdateRepair(data) {
-  console.log('data-----', data)
+  
   return request({
     url: '/api/manage/updaterepair',
     method: 'Post',
@@ -460,7 +460,7 @@ export function queryInfo(zone, bed, startime, endtime, limit, page) {
     limit: limit,
     page: page
   }
-  console.log('params', params)
+
   return request({
     url: '/api/manage/queryinfo',
     method: 'Get',
@@ -538,7 +538,7 @@ export function getTimeWarning(id, params) {
 }
 
 export function SaveManageInfoTwo(data, beds) {
-  console.log('data', beds)
+
   return request({
     url: '/api/manage/savemanageinfotwo?beds=' + beds,
     method: 'post',
@@ -730,10 +730,10 @@ export function deleteManageMent(id) {
   const params = {
     id: id
   }
-  console.log('params', params)
   return request({
     url: '/api/manage/deletemanagement',
     method: 'get',
     params: params
   })
 }
+

src/xt_pages/data/components/table.vue

@@ -57,6 +57,8 @@
           </el-input>
         </el-form-item>
       </el-form>
+
+      
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">{{
           $t("table.cancel")
@@ -201,6 +203,7 @@ export default {
       if (currentRow != undefined) {
         this.currentId = currentRow.id;
         bus.$emit("parentChangeId", currentRow);
+        
       }
     },
     getList() {

src/xt_pages/data/components/tableson.vue

@@ -68,6 +68,14 @@
         label-position="right"
         label-width="70px"
       >
+        <el-row v-if="showType"> 
+           <el-col :span="12">
+            <el-form-item label="血管通路类型" label-width="150">
+              <el-radio v-model="temp.field_type" label="1">内瘘</el-radio>
+               <el-radio v-model="temp.field_type" label="2">导管</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('data_config.config_name')" prop="name">
@@ -203,7 +211,8 @@ export default {
         field_name: undefined,
         value: "",
         remark: "",
-        orders: 0
+        orders: 0,
+        field_type:""
       },
       dialogFormVisible: false,
       dialogStatus: "",
@@ -223,7 +232,10 @@ export default {
       },
       downloadLoading: false,
       parentConfig: undefined,
-      addState: true
+      addState: true,
+      showType:false,
+      typeName:"",
+      showName:""
     };
   },
   computed: {
@@ -255,11 +267,21 @@ export default {
     }
   },
   created() {
-    // this.getList()
+  
   },
   mounted() {
     var _this = this;
     bus.$on("parentChangeId", function(parentData) {
+       console.log("parentData",parentData)
+      _this.showName = parentData.name
+      console.log("22222",_this.showName)
+      if(parentData.name == "血管通路" || parentData.name == "血管通路部位"){
+        
+        _this.showType = true
+
+      }else{
+        _this.showType = false
+      }
       _this.parentConfig = parentData;
       // _this.list = parentData.childs
       _this.temp = {
@@ -271,7 +293,8 @@ export default {
         field_name: undefined,
         value: "",
         remark: "",
-        orders: ""
+        orders: "",
+        field_type:parentData.field_type
       };
     });
   },
@@ -351,7 +374,8 @@ export default {
         field_name: undefined,
         value: "",
         remark: "",
-        orders: 0
+        orders: 0,
+        field_type:this.parentConfig.field_type
       };
     },
     handleCreate() {
@@ -370,15 +394,18 @@ export default {
       //    return false;
       //  }
       // }
-
+      
       this.dialogFormVisible = true;
       this.$nextTick(() => {
         this.$refs["dataForm"].clearValidate();
       });
     },
     createData() {
+       
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
+          this.temp.field_type = parseInt(this.temp.field_type)
+          console.log("2222",this.temp.field_name)
           createChildConfig(this.temp).then(response => {
             if (!response.data) {
               // 由于mockjs 不支持自定义状态码只能这样hack
@@ -391,10 +418,7 @@ export default {
 
             // this.list.unshift(tempval)
             // 更新store
-            store
-              .dispatch("updateChildConfigList", [result, "create"])
-              .then(() => {});
-
+            store.dispatch("updateChildConfigList", [result, "create"]).then(() => {});
             this.dialogFormVisible = false;
             this.$message.success("创建成功");
           });
@@ -402,6 +426,11 @@ export default {
       });
     },
     handleUpdate(row) {
+      console.log("3333333334",this.showType)
+      console.log("rwo222222",row)
+      console.log("showname,",this.showName)
+      row.field_type = row.field_type.toString()
+    
       if (
         row.name == "无肝素" ||
         row.name == "普通肝素" ||
@@ -425,6 +454,7 @@ export default {
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           const tempData = Object.assign({}, this.temp);
+          tempData.field_type = parseInt(tempData.field_type)
           console.log("tempData", tempData);
           updateChildConfig(tempData).then(response => {
             if (!response.data) {

src/xt_pages/device/airDisinfect.vue

@@ -6,31 +6,78 @@
     <div class="app-container">
         <div style="float:right;margin-bottom:10px;">
             <el-button type="primary" @click="dialogFormVisible = true">新增</el-button>
-            <el-button type="danger">删除</el-button>
+            <!-- <el-button type="danger">删除</el-button> -->
         </div>
-        <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
+        <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" >
             <el-table-column type="selection" width="55" align="center"></el-table-column>
-            <el-table-column label="时间" width="120"></el-table-column>
-            <el-table-column label="班次" width="120"></el-table-column>
-            <el-table-column label="创建日期" width="120"></el-table-column>
-            <el-table-column label="消毒方式" width="120"></el-table-column>
-            <el-table-column label="消毒液" width="120"></el-table-column>
-            <el-table-column label="顺序号" width="80"></el-table-column>
-            <el-table-column label="创建人" width="80"></el-table-column>
-            <el-table-column label="检查结果" width="180"></el-table-column>
-            <el-table-column label="检查时间" width="120"></el-table-column>
-            <el-table-column label="数据上传时间" width="120"></el-table-column>
-            <el-table-column label="修改标志" width="90"></el-table-column>
+            <el-table-column label="时间" width="120">
+               <template slot-scope="scope">
+                   {{getTime(scope.row.start_time)}}
+               </template>
+            </el-table-column>
+            <el-table-column label="班次" width="120">
+                <template slot-scope="scope">
+                   <span v-if="scope.row.class == 1">上午</span>
+                   <span v-if="scope.row.class == 2">中午</span>
+                   <span v-if="scope.row.class == 3">下午</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="创建日期" width="120">
+                <template slot-scope="scope">
+                  {{getTime(scope.row.created_ime)}}
+                </template>
+            </el-table-column>
+            <el-table-column label="消毒方式" width="120">
+                <template slot-scope="scope">
+                  {{scope.row.disinfection_methods}}
+                </template>
+            </el-table-column>
+            <el-table-column label="消毒液" width="120">
+                <template slot-scope="scope">
+                   {{scope.row.disinfection_fluid}}
+                </template>
+            </el-table-column>
+            <el-table-column label="顺序号" width="80">
+               <template slot-scope="scope">
+                  {{scope.row.sort}}
+                </template>
+            </el-table-column>
+            <el-table-column label="创建人" width="80">
+               <template slot-scope="scope">
+                  {{getName(scope.row.creator)}}
+                </template>
+            </el-table-column>
+            <el-table-column label="检查结果" width="180">
+                <template slot-scope="scope">
+                   {{scope.row.detection_result}}
+                </template>
+            </el-table-column>
+            <el-table-column label="检查时间" width="120">
+                <template slot-scope="scope">
+                   {{getTime(scope.row.detection_time)}}
+                </template>
+            </el-table-column>
+            <el-table-column label="数据上传时间" width="120">
+                <template slot-scope="scope">
+                   {{getTime(scope.row.upload_time)}}
+                </template>
+            </el-table-column>
+            <el-table-column label="修改标志" width="90">
+               <template slot-scope="scope">
+                   <span v-if="scope.row.modifications == 1">正常</span>
+                   <span v-if="scope.row.modifications == 2">撤消</span>
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                     <el-button
                     size="mini"
                     type="primary"
-                    @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                    @click="handleEdit(scope.row.id)">编辑</el-button>
                     <el-button
                     size="mini"
                     type="danger"
-                    @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+                    @click="handleDelete(scope.row.id)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -51,171 +98,182 @@
         width="1000px"
         title="新增空气消毒表"
         :visible.sync="dialogFormVisible">
-            <el-form :model="form" class="airForm">
-                <el-form-item label="时间" label-width="110px">
+            <el-form :model="form" ref="form" class="airForm" :rules="airRules">
+                <el-form-item label="时间" label-width="110px" required prop="start_time">
                     <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                     value-format="yyyy-MM-dd"
+                    v-model="form.start_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="班次" label-width="110px">
-                    <el-select v-model="form.region" placeholder="请选择活动区域">
-                        <el-option label="区域一" value="shanghai"></el-option>
-                        <el-option label="区域二" value="beijing"></el-option>
+                <el-form-item label="班次" label-width="110px" required prop="class">
+                    <el-select v-model="form.class" placeholder="请选择活动区域">
+                        <el-option label="上午" value="1"></el-option>
+                        <el-option label="下午" value="2"></el-option>
+                        <el-option label="晚上" value="3"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="创建日期" label-width="110px">
-                    <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                <el-form-item label="创建日期" label-width="110px" required prop="created_time">
+                  <el-date-picker
+                    value-format="yyyy-MM-dd"
+                    v-model="form.created_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="消毒方式" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.disinfection_methods"></el-input>
                 </el-form-item>
                 <el-form-item label="消毒液" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.disinfection_fluid"></el-input>
                 </el-form-item>
-                <el-form-item label="顺序号" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                <el-form-item label="顺序号" label-width="110px" required prop="sort">
+                    <el-input v-model="form.sort"></el-input>
                 </el-form-item>
-                <el-form-item label="创建人" label-width="110px">
-                    <el-select v-model="value" placeholder="请选择">
+                <el-form-item label="创建人" label-width="110px" required prop="creator">
+                    <el-select v-model="form.creator" placeholder="请选择">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="(item,index) in docList"
+                        :key="index"
+                        :label="item.user_name"
+                        :value="item.admin_user_id">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="检测时间" label-width="110px">
-                    <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                <el-form-item label="检测时间" label-width="110px" required prop="detection_time">
+                   <el-date-picker
+                    value-format="yyyy-MM-dd"
+                    v-model="form.detection_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="检测结果" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.detection_result"></el-input>
                 </el-form-item>
                 <el-form-item label="上传时间" label-width="110px">
                     <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                    value-format="yyyy-MM-dd"
+                    v-model="form.upload_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="检测合格" label-width="110px">
+                <el-form-item label="检测合格" label-width="110px" required prop="check_out">
                     <div>
-                        <el-radio v-model="radio" label="1">备选项</el-radio>
-                        <el-radio v-model="radio" label="2">备选项</el-radio>
+                        <el-radio v-model="form.check_out" label="1">是</el-radio>
+                        <el-radio v-model="form.check_out" label="2">否</el-radio>
                     </div>
                 </el-form-item>
-                <el-form-item label="修改标志" label-width="110px">
-                    <el-select v-model="value" placeholder="请选择">
+                <el-form-item label="修改标志" label-width="110px" required prop="modifications">
+                    <el-select v-model="form.modifications" placeholder="请选择">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="(item,index) in options"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item> 
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click="dialogFormVisible = false">取 消</el-button>
-                <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+                <el-button type="primary" @click="saveAirDisinfect('form')">保 存</el-button>
             </div>
         </el-dialog>
 
-
-        <el-dialog
+       
+      <el-dialog
         class="centerDialog"
         width="1000px"
         title="编辑空气消毒表"
         :visible.sync="editDialogFormVisible">
-            <el-form :model="form" class="airForm">
-                <el-form-item label="时间" label-width="110px">
+            <el-form :model="form" ref="form" class="airForm" :rules="airRules">
+                <el-form-item label="时间" label-width="110px" required prop="start_time">
                     <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                     value-format="yyyy-MM-dd"
+                    v-model="form.start_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="班次" label-width="110px">
-                    <el-select v-model="form.region" placeholder="请选择活动区域">
-                        <el-option label="区域一" value="shanghai"></el-option>
-                        <el-option label="区域二" value="beijing"></el-option>
+                <el-form-item label="班次" label-width="110px" required prop="class">
+                    <el-select v-model="form.class" placeholder="请选择活动区域">
+                        <el-option label="上午" value="1"></el-option>
+                        <el-option label="下午" value="2"></el-option>
+                        <el-option label="晚上" value="3"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="创建日期" label-width="110px">
-                    <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                <el-form-item label="创建日期" label-width="110px" required prop="created_time">
+                  <el-date-picker
+                    value-format="yyyy-MM-dd"
+                    v-model="form.created_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="消毒方式" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.disinfection_methods"></el-input>
                 </el-form-item>
                 <el-form-item label="消毒液" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.disinfection_fluid"></el-input>
                 </el-form-item>
-                <el-form-item label="顺序号" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                <el-form-item label="顺序号" label-width="110px" required prop="sort">
+                    <el-input v-model="form.sort"></el-input>
                 </el-form-item>
-                <el-form-item label="创建人" label-width="110px">
-                    <el-select v-model="value" placeholder="请选择">
+                <el-form-item label="创建人" label-width="110px" required prop="creator">
+                    <el-select v-model="form.creator" placeholder="请选择">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="(item,index) in docList"
+                        :key="index"
+                        :label="item.user_name"
+                        :value="item.admin_user_id">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="检测时间" label-width="110px">
-                    <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                <el-form-item label="检测时间" label-width="110px" required prop="detection_time">
+                   <el-date-picker
+                    value-format="yyyy-MM-dd"
+                    v-model="form.detection_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="检测结果" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.detection_result"></el-input>
                 </el-form-item>
                 <el-form-item label="上传时间" label-width="110px">
                     <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                    value-format="yyyy-MM-dd"
+                    v-model="form.upload_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="检测合格" label-width="110px">
+                <el-form-item label="检测合格" label-width="110px" required prop="check_out">
                     <div>
-                        <el-radio v-model="radio" label="1">备选项</el-radio>
-                        <el-radio v-model="radio" label="2">备选项</el-radio>
+                        <el-radio v-model="form.check_out" label="1">是</el-radio>
+                        <el-radio v-model="form.check_out" label="2">否</el-radio>
                     </div>
                 </el-form-item>
-                <el-form-item label="修改标志" label-width="110px">
-                    <el-select v-model="value" placeholder="请选择">
+                <el-form-item label="修改标志" label-width="110px" required prop="modifications">
+                    <el-select v-model="form.modifications" placeholder="请选择">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="(item,index) in options"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item> 
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button @click="editDialogFormVisible = false">取 消</el-button>
-                <el-button type="primary" @click="editDialogFormVisible = false">确 定</el-button>
+                <el-button @click="dialogFormVisible = false">取 消</el-button>
+                <el-button type="primary" @click="updateAirDisinfect('form')">保 存</el-button>
             </div>
         </el-dialog>
+       
     </div>
   </div>
 
@@ -223,7 +281,8 @@
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-
+  import { getAllDoctorList,saveAirDisinfect,getAirList,getAirDisinfectDetail,updateAirDisinfect,deleteAirDisinfect } from "@/api/device"
+  import { uParseTime } from '@/utils/tools'
   export default {
     name: 'airDisinfect',
     components: {
@@ -237,34 +296,217 @@
         ],
         dialogFormVisible:false,
         editDialogFormVisible:false,
-        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 弄'
-        }],
-        form: {},
-        value1:''
+        tableData: [],
+        form: {
+          id:0,
+          start_time:"", 
+          created_time:"",
+          class:"",
+          disinfection_methods:"",
+          disinfection_fluid:"",
+          sort:"",
+          creator:"",
+          detection_time:"",
+          detection_result:"",
+          upload_time:"",
+          check_out:"1",
+          modifications:"",  
+        },
+        value1:'',
+        docList:[],
+        options:[
+          {id:1,name:"正常"},
+          {id:2,name:"撤销"}  
+        ],
+       airRules: {
+        start_time: [{ required: true, message: "请选择时间", trigger: "blur" }],
+        class:[{required:true,message:"请选择班次",trigger:"blur"}],
+        created_time:[{required:true,message:"请选择创建时间",trigger:"blur"}],
+        sort:[{required:true,message:"请填写顺序号",trigger:"blur"}],
+        detection_time:[{required:true,message:"请选择检测时间",trigger:"blur"}],
+        check_out:[{required:true,message:"请选择检验合格",trigger:"blur"}],
+        modifications:[{required:true,message:"请选择修改标志",trigger:"blur"}],
+        creator:[{required:true,message:"请选择创建人",trigger:"blur"}]
+       },
+       limit:20,
+       page:1,
+       total:0,
+
       }
     },
     created(){
-
+      this.getlist()
+      this.getAirList()
     },
     methods: {
-        handleEdit(){
-            this.editDialogFormVisible = true
+      
+        getlist(){
+          getAllDoctorList().then(response=>{
+            if(response.data.state == 1){
+               var list = response.data.data.list
+               console.log("list222222",list)
+               this.docList = list
+            }
+          })  
+        },
+        saveAirDisinfect(formName){
+           this.$refs[formName].validate(valid=>{
+             if(valid){
+                 var params = {
+                   start_time:this.form.start_time,
+                   class:parseInt(this.form.class),
+                   created_time:this.form.created_time,
+                   disinfection_methods:this.form.disinfection_methods,
+                   disinfection_fluid:this.form.disinfection_fluid,
+                   sort:this.form.sort,
+                   creator:this.form.creator,
+                   detection_time:this.form.detection_time,
+                   detection_result:this.form.detection_result,
+                   upload_time:this.form.upload_time,
+                   check_out:parseInt(this.form.check_out),
+                   modifications:parseInt(this.form.modifications),
+                 }
+                 console.log("params",params)
+               saveAirDisinfect(params).then(response=>{
+                  if(response.data.state == 1){
+                     var list = response.data.data.list
+                     console.log("list",list)
+                     this.$message.success("保存成功!")
+                     this.dialogFormVisible = false
+                     this.getAirList()
+                     this.form.class = ""
+                     this.form.start_time = ""
+                     this.form.created_ime = ""
+                     this.form.disinfection_fluid = ""
+                     this.form.disinfection_methods = ""
+                     this.form.sort = ""
+                     this.form.creator = ""
+                     this.form.detection_time = ""
+                     this.form.detection_result = ""
+                     this.form.upload_time = ""
+                  }
+               })
+             }
+           })  
+        },
+
+        getAirList(){
+            var params = {
+               limit:this.limit,
+               page:this.page,
+            }
+          getAirList(params).then(response=>{
+             if(response.data.state == 1){
+               var list = response.data.data.list
+               var total = response.data.data.total
+               this.tableData = list
+               this.total = total
+               console.log("list222",list)
+               console.log("total",total)
+             }
+          })
+        },
+      getTime(val) {
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+      getName(id){
+        var name = ""
+        for(let i=0;i<this.docList.length;i++){
+           if(id == this.docList[i].admin_user_id){
+               name = this.docList[i].user_name
+           }
         }
+        return name
+      },
+     handleCurrentChange(val) {
+       this.page = val
+       this.getAirList()
+     },
+     handleSizeChange(val){
+        this.limit =val
+        this.getAirList()
+     },
+     
+     handleEdit(id){
+       this.editDialogFormVisible = true
+        getAirDisinfectDetail(id).then(response=>{
+            if(response.data.state ==1){
+               var detail =  response.data.data.detail
+               console.log("detail",detail)
+               this.form.id = detail.id
+               this.form.start_time = this.getTime(detail.start_time)
+               this.form.class = detail.class.toString()
+               this.form.created_ime = this.getTime(detail.created_time)
+               this.form.disinfection_methods = detail.disinfection_methods
+               this.form.disinfection_fluid = detail.disinfection_fluid
+               this.form.sort = detail.sort
+               this.form.creator = detail.creator
+               this.form.detection_time = this.getTime(detail.detection_time)
+               this.form.detection_result = detail.detection_result
+               this.form.upload_time = this.getTime(detail.upload_time)
+               this.form.check_out = detail.check_out.toString()
+               this.form.modifications = detail.modifications
+
+            }
+        })
+      },
+
+      updateAirDisinfect(formName){
+          
+        this.$refs[formName].validate(valid=>{
+          if(valid){
+                var params = {
+                   id:this.form.id,
+                   start_time:this.form.start_time,
+                   class:parseInt(this.form.class),
+                   created_time:this.form.created_time,
+                   disinfection_methods:this.form.disinfection_methods,
+                   disinfection_fluid:this.form.disinfection_fluid,
+                   sort:this.form.sort,
+                   creator:this.form.creator,
+                   detection_time:this.form.detection_time,
+                   detection_result:this.form.detection_result,
+                   upload_time:this.form.upload_time,
+                   check_out:parseInt(this.form.check_out),
+                   modifications:parseInt(this.form.modifications),
+                 }
+               console.log("params",params)
+              updateAirDisinfect(params).then(response=>{
+                  if(response.data.state ==1){
+                    var detection = response.data.data.detection
+                    this.editDialogFormVisible = false
+                    this.$message.success("修改成功!")
+                    this.getAirList()
+                  }
+              })
+            }
+        })
+      },
+
+       handleDelete(id,index) {
+        this.$confirm('确认删除这条记录?', '删除记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            deleteAirDisinfect(id).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.tableData.splice(index, 1)
+                this.$message.success('厂家已经删除')
+              }
+            })
+          })
+          .catch(() => {
+          })
+      },
     }
   }
 </script>

src/xt_pages/device/objectTableDisinfect.vue

@@ -6,31 +6,78 @@
     <div class="app-container">
         <div style="float:right;margin-bottom:10px;">
             <el-button type="primary" @click="dialogFormVisible = true">新增</el-button>
-            <el-button type="danger">删除</el-button>
+            <!-- <el-button type="danger">删除</el-button> -->
         </div>
-        <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
+        <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" >
             <el-table-column type="selection" width="55" align="center"></el-table-column>
-            <el-table-column label="时间" width="120"></el-table-column>
-            <el-table-column label="班次" width="120"></el-table-column>
-            <el-table-column label="创建日期" width="120"></el-table-column>
-            <el-table-column label="消毒方式" width="120"></el-table-column>
-            <el-table-column label="消毒液" width="120"></el-table-column>
-            <el-table-column label="顺序号" width="80"></el-table-column>
-            <el-table-column label="创建人" width="80"></el-table-column>
-            <el-table-column label="检查结果" width="180"></el-table-column>
-            <el-table-column label="检查时间" width="120"></el-table-column>
-            <el-table-column label="数据上传时间" width="120"></el-table-column>
-            <el-table-column label="修改标志" width="90"></el-table-column>
+            <el-table-column label="时间" width="120">
+               <template slot-scope="scope">
+                   {{getTime(scope.row.start_time)}}
+               </template>
+            </el-table-column>
+            <el-table-column label="班次" width="120">
+                <template slot-scope="scope">
+                   <span v-if="scope.row.class == 1">上午</span>
+                   <span v-if="scope.row.class == 2">中午</span>
+                   <span v-if="scope.row.class == 3">下午</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="创建日期" width="120">
+                <template slot-scope="scope">
+                  {{getTime(scope.row.created_ime)}}
+                </template>
+            </el-table-column>
+            <el-table-column label="消毒方式" width="120">
+                <template slot-scope="scope">
+                  {{scope.row.disinfection_methods}}
+                </template>
+            </el-table-column>
+            <el-table-column label="消毒液" width="120">
+                <template slot-scope="scope">
+                   {{scope.row.disinfection_fluid}}
+                </template>
+            </el-table-column>
+            <el-table-column label="顺序号" width="80">
+               <template slot-scope="scope">
+                  {{scope.row.sort}}
+                </template>
+            </el-table-column>
+            <el-table-column label="创建人" width="80">
+               <template slot-scope="scope">
+                  {{getName(scope.row.creator)}}
+                </template>
+            </el-table-column>
+            <el-table-column label="检查结果" width="180">
+                <template slot-scope="scope">
+                   {{scope.row.detection_result}}
+                </template>
+            </el-table-column>
+            <el-table-column label="检查时间" width="120">
+                <template slot-scope="scope">
+                   {{getTime(scope.row.detection_time)}}
+                </template>
+            </el-table-column>
+            <el-table-column label="数据上传时间" width="120">
+                <template slot-scope="scope">
+                   {{getTime(scope.row.upload_time)}}
+                </template>
+            </el-table-column>
+            <el-table-column label="修改标志" width="90">
+               <template slot-scope="scope">
+                   <span v-if="scope.row.modifications == 1">正常</span>
+                   <span v-if="scope.row.modifications == 2">撤消</span>
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                     <el-button
                     size="mini"
                     type="primary"
-                    @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                    @click="handleEdit(scope.row.id,scope.$index)">编辑</el-button>
                     <el-button
                     size="mini"
                     type="danger"
-                    @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+                    @click="handleDelete(scope.row.id,scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -49,173 +96,184 @@
         <el-dialog
         class="centerDialog"
         width="1000px"
-        title="新增空气消毒表"
+        title="新增物表消毒表"
         :visible.sync="dialogFormVisible">
-            <el-form :model="form" class="airForm">
-                <el-form-item label="时间" label-width="110px">
+            <el-form :model="form" ref="form" class="airForm" :rules="airRules">
+                <el-form-item label="时间" label-width="110px" required prop="start_time">
                     <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                     value-format="yyyy-MM-dd"
+                    v-model="form.start_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="班次" label-width="110px">
-                    <el-select v-model="form.region" placeholder="请选择活动区域">
-                        <el-option label="区域一" value="shanghai"></el-option>
-                        <el-option label="区域二" value="beijing"></el-option>
+                <el-form-item label="班次" label-width="110px" required prop="class">
+                    <el-select v-model="form.class" placeholder="请选择活动区域">
+                        <el-option label="上午" value="1"></el-option>
+                        <el-option label="下午" value="2"></el-option>
+                        <el-option label="晚上" value="3"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="创建日期" label-width="110px">
-                    <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                <el-form-item label="创建日期" label-width="110px" required prop="created_time">
+                  <el-date-picker
+                    value-format="yyyy-MM-dd"
+                    v-model="form.created_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="消毒方式" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.disinfection_methods"></el-input>
                 </el-form-item>
                 <el-form-item label="消毒液" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.disinfection_fluid"></el-input>
                 </el-form-item>
-                <el-form-item label="顺序号" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                <el-form-item label="顺序号" label-width="110px" required prop="sort">
+                    <el-input v-model="form.sort"></el-input>
                 </el-form-item>
-                <el-form-item label="创建人" label-width="110px">
-                    <el-select v-model="value" placeholder="请选择">
+                <el-form-item label="创建人" label-width="110px" required prop="creator">
+                    <el-select v-model="form.creator" placeholder="请选择">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="(item,index) in docList"
+                        :key="index"
+                        :label="item.user_name"
+                        :value="item.admin_user_id">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="检测时间" label-width="110px">
-                    <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                <el-form-item label="检测时间" label-width="110px" required prop="detection_time">
+                   <el-date-picker
+                    value-format="yyyy-MM-dd"
+                    v-model="form.detection_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="检测结果" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.detection_result"></el-input>
                 </el-form-item>
                 <el-form-item label="上传时间" label-width="110px">
                     <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                    value-format="yyyy-MM-dd"
+                    v-model="form.upload_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="检测合格" label-width="110px">
+                <el-form-item label="检测合格" label-width="110px" required prop="check_out">
                     <div>
-                        <el-radio v-model="radio" label="1">备选项</el-radio>
-                        <el-radio v-model="radio" label="2">备选项</el-radio>
+                        <el-radio v-model="form.check_out" label="1">是</el-radio>
+                        <el-radio v-model="form.check_out" label="2">否</el-radio>
                     </div>
                 </el-form-item>
-                <el-form-item label="修改标志" label-width="110px">
-                    <el-select v-model="value" placeholder="请选择">
+                <el-form-item label="修改标志" label-width="110px" required prop="modifications">
+                    <el-select v-model="form.modifications" placeholder="请选择">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="(item,index) in options"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item> 
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click="dialogFormVisible = false">取 消</el-button>
-                <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+                <el-button type="primary" @click="saveBodyDisinfect('form')">保 存</el-button>
             </div>
         </el-dialog>
 
-
-        <el-dialog
+       
+      <el-dialog
         class="centerDialog"
         width="1000px"
-        title="编辑空气消毒表"
+        title="编辑物表消毒表"
         :visible.sync="editDialogFormVisible">
-            <el-form :model="form" class="airForm">
-                <el-form-item label="时间" label-width="110px">
+            <el-form :model="form" ref="form" class="airForm" :rules="airRules">
+                <el-form-item label="时间" label-width="110px" required prop="start_time">
                     <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                     value-format="yyyy-MM-dd"
+                    v-model="form.start_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="班次" label-width="110px">
-                    <el-select v-model="form.region" placeholder="请选择活动区域">
-                        <el-option label="区域一" value="shanghai"></el-option>
-                        <el-option label="区域二" value="beijing"></el-option>
+                <el-form-item label="班次" label-width="110px" required prop="class">
+                    <el-select v-model="form.class" placeholder="请选择活动区域">
+                        <el-option label="上午" value="1"></el-option>
+                        <el-option label="下午" value="2"></el-option>
+                        <el-option label="晚上" value="3"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="创建日期" label-width="110px">
-                    <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                <el-form-item label="创建日期" label-width="110px" required prop="created_time">
+                  <el-date-picker
+                    value-format="yyyy-MM-dd"
+                    v-model="form.created_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="消毒方式" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.disinfection_methods"></el-input>
                 </el-form-item>
                 <el-form-item label="消毒液" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.disinfection_fluid"></el-input>
                 </el-form-item>
-                <el-form-item label="顺序号" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                <el-form-item label="顺序号" label-width="110px" required prop="sort">
+                    <el-input v-model="form.sort"></el-input>
                 </el-form-item>
-                <el-form-item label="创建人" label-width="110px">
-                    <el-select v-model="value" placeholder="请选择">
+                <el-form-item label="创建人" label-width="110px" required prop="creator">
+                    <el-select v-model="form.creator" placeholder="请选择">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="(item,index) in docList"
+                        :key="index"
+                        :label="item.user_name"
+                        :value="item.admin_user_id">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="检测时间" label-width="110px">
-                    <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                <el-form-item label="检测时间" label-width="110px" required prop="detection_time">
+                   <el-date-picker
+                    value-format="yyyy-MM-dd"
+                    v-model="form.detection_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="检测结果" label-width="110px">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.detection_result"></el-input>
                 </el-form-item>
                 <el-form-item label="上传时间" label-width="110px">
                     <el-date-picker
-                    v-model="value1"
-                    type="datetime"
+                    value-format="yyyy-MM-dd"
+                    v-model="form.upload_time"
+                    type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="检测合格" label-width="110px">
+                <el-form-item label="检测合格" label-width="110px" required prop="check_out">
                     <div>
-                        <el-radio v-model="radio" label="1">备选项</el-radio>
-                        <el-radio v-model="radio" label="2">备选项</el-radio>
+                        <el-radio v-model="form.check_out" label="1">是</el-radio>
+                        <el-radio v-model="form.check_out" label="2">否</el-radio>
                     </div>
                 </el-form-item>
-                <el-form-item label="修改标志" label-width="110px">
-                    <el-select v-model="value" placeholder="请选择">
+                <el-form-item label="修改标志" label-width="110px" required prop="modifications">
+                    <el-select v-model="form.modifications" placeholder="请选择">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="(item,index) in options"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item> 
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button @click="editDialogFormVisible = false">取 消</el-button>
-                <el-button type="primary" @click="editDialogFormVisible = false">确 定</el-button>
+                <el-button @click="dialogFormVisible = false">取 消</el-button>
+                <el-button type="primary" @click="updateBodyDisinfect('form')">保 存</el-button>
             </div>
         </el-dialog>
+       
     </div>
   </div>
 
@@ -223,7 +281,8 @@
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-
+  import { getAllDoctorList,saveBodyDisinfect,getBodyList,getBodyDisinfectDetail,updateBodyDisinfect,deleteBodyDisinfect } from "@/api/device"
+  import { uParseTime } from '@/utils/tools'
   export default {
     name: 'airDisinfect',
     components: {
@@ -233,38 +292,221 @@
       return {
         crumbs: [
           { path: false, name: '院感管理' },
-          { path: false, name: '透析室空气消毒记录表' }
+          { path: false, name: '透析室物表记录表' }
         ],
         dialogFormVisible:false,
         editDialogFormVisible:false,
-        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 弄'
-        }],
-        form: {},
-        value1:''
+        tableData: [],
+        form: {
+          id:0,
+          start_time:"", 
+          created_time:"",
+          class:"",
+          disinfection_methods:"",
+          disinfection_fluid:"",
+          sort:"",
+          creator:"",
+          detection_time:"",
+          detection_result:"",
+          upload_time:"",
+          check_out:"1",
+          modifications:"",  
+        },
+        value1:'',
+        docList:[],
+        options:[
+          {id:1,name:"正常"},
+          {id:2,name:"撤销"}  
+        ],
+       airRules: {
+        start_time: [{ required: true, message: "请选择时间", trigger: "blur" }],
+        class:[{required:true,message:"请选择班次",trigger:"blur"}],
+        created_time:[{required:true,message:"请选择创建时间",trigger:"blur"}],
+        sort:[{required:true,message:"请填写顺序号",trigger:"blur"}],
+        detection_time:[{required:true,message:"请选择检测时间",trigger:"blur"}],
+        check_out:[{required:true,message:"请选择检验合格",trigger:"blur"}],
+        modifications:[{required:true,message:"请选择修改标志",trigger:"blur"}],
+        creator:[{required:true,message:"请选择创建人",trigger:"blur"}]
+       },
+       limit:20,
+       page:1,
+       total:0,
+
       }
     },
     created(){
-
+      this.getlist()
+      this.getBodyList()
     },
     methods: {
-        handleEdit(){
-            this.editDialogFormVisible = true
+      
+        getlist(){
+          getAllDoctorList().then(response=>{
+            if(response.data.state == 1){
+               var list = response.data.data.list
+               console.log("list222222",list)
+               this.docList = list
+            }
+          })  
+        },
+        saveBodyDisinfect(formName){
+           this.$refs[formName].validate(valid=>{
+             if(valid){
+                 var params = {
+                   start_time:this.form.start_time,
+                   class:parseInt(this.form.class),
+                   created_time:this.form.created_time,
+                   disinfection_methods:this.form.disinfection_methods,
+                   disinfection_fluid:this.form.disinfection_fluid,
+                   sort:this.form.sort,
+                   creator:this.form.creator,
+                   detection_time:this.form.detection_time,
+                   detection_result:this.form.detection_result,
+                   upload_time:this.form.upload_time,
+                   check_out:parseInt(this.form.check_out),
+                   modifications:parseInt(this.form.modifications),
+                 }
+                 console.log("params",params)
+               saveBodyDisinfect(params).then(response=>{
+                  if(response.data.state == 1){
+                     var list = response.data.data.list
+                     console.log("list",list)
+                     this.$message.success("保存成功!")
+                     this.dialogFormVisible = false
+                     this.getBodyList()
+                     this.form.class = ""
+                     this.form.start_time = ""
+                     this.form.created_ime = ""
+                     this.form.disinfection_fluid = ""
+                     this.form.disinfection_methods = ""
+                     this.form.sort = ""
+                     this.form.creator = ""
+                     this.form.detection_time = ""
+                     this.form.detection_result = ""
+                     this.form.upload_time = ""
+                  }
+               })
+             }
+           })  
+        },
+
+        getBodyList(){
+            var params = {
+               limit:this.limit,
+               page:this.page,
+            }
+          getBodyList(params).then(response=>{
+             if(response.data.state == 1){
+               var list = response.data.data.list
+               var total = response.data.data.total
+               this.tableData = list
+               this.total = total
+               console.log("list222",list)
+               console.log("total",total)
+             }
+          })
+        },
+      getTime(val) {
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+      getName(id){
+        var name = ""
+        for(let i=0;i<this.docList.length;i++){
+           if(id == this.docList[i].admin_user_id){
+               name = this.docList[i].user_name
+           }
         }
+        return name
+      },
+     handleCurrentChange(val) {
+       this.page = val
+       this.getBodyList()
+     },
+     handleSizeChange(val){
+        this.limit =val
+        this.getBodyList()
+     },
+     
+     handleEdit(id){
+       this.editDialogFormVisible = true
+        getBodyDisinfectDetail(id).then(response=>{
+            if(response.data.state ==1){
+               var detail =  response.data.data.detail
+               console.log("detail",detail)
+               this.form.id = detail.id
+               this.form.start_time = this.getTime(detail.start_time)
+               this.form.class = detail.class.toString()
+               this.form.created_ime = this.getTime(detail.created_time)
+               this.form.disinfection_methods = detail.disinfection_methods
+               this.form.disinfection_fluid = detail.disinfection_fluid
+               this.form.sort = detail.sort
+               this.form.creator = detail.creator
+               this.form.detection_time = this.getTime(detail.detection_time)
+               this.form.detection_result = detail.detection_result
+               this.form.upload_time = this.getTime(detail.upload_time)
+               this.form.check_out = detail.check_out.toString()
+               this.form.modifications = detail.modifications
+
+            }
+        })
+      },
+
+      updateBodyDisinfect(formName){
+          
+        this.$refs[formName].validate(valid=>{
+          if(valid){
+                var params = {
+                   id:this.form.id,
+                   start_time:this.form.start_time,
+                   class:parseInt(this.form.class),
+                   created_time:this.form.created_time,
+                   disinfection_methods:this.form.disinfection_methods,
+                   disinfection_fluid:this.form.disinfection_fluid,
+                   sort:this.form.sort,
+                   creator:this.form.creator,
+                   detection_time:this.form.detection_time,
+                   detection_result:this.form.detection_result,
+                   upload_time:this.form.upload_time,
+                   check_out:parseInt(this.form.check_out),
+                   modifications:parseInt(this.form.modifications),
+                 }
+               console.log("params",params)
+              updateBodyDisinfect(params).then(response=>{
+                  if(response.data.state ==1){
+                    var detection = response.data.data.detection
+                    this.editDialogFormVisible = false
+                    this.$message.success("修改成功!")
+                    this.getBodyList()
+                  }
+              })
+            }
+        })
+      },
+
+       handleDelete(id,index) {
+        this.$confirm('确认删除这条记录?', '删除记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            deleteBodyDisinfect(id).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.tableData.splice(index, 1)
+                this.$message.success('厂家已经删除')
+              }
+            })
+          })
+          .catch(() => {
+          })
+      },
     }
   }
 </script>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -112,7 +112,7 @@
           label="处方编号"
           width="120">
           <template slot-scope="scope">
-            <span>处方编号</span>
+            <span>处方 {{scope.$index + 1}}</span>
           </template>
         </el-table-column>
         <el-table-column label="处方号">
@@ -1363,6 +1363,7 @@
           if (response.data.state == 1) {
             this.centerDialogVisible = true
             var list = response.data.data.list
+           
             this.tableData = list
           }
         })

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -35,7 +35,7 @@
           <template slot-scope="scope">{{scope.row.info?scope.row.info.doctor:''}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="诊断">
-          <template slot-scope="scope">{{ scope.row.info?scope.row.info.diagnosis :''}}</template>
+          <template slot-scope="scope">{{getDiagnosis(scope.row.info.diagnosis)}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="状态" width="100">
           <template slot-scope="scope">
@@ -71,7 +71,7 @@
   import inquiriesDetail from './components/inquiriesDetail'
   import { getHisPrescriptionList } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
-
+  import { getInitData} from '@/api/his/his'
   export default {
     components: {
       BreadCrumb,
@@ -88,23 +88,8 @@
           { path: false, name: '门诊医生站' },
           { path: false, name: '既往查询' }
         ],
-        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 弄'
-        }]
+        tableData: [],
+        diagnoses:[]
       }
     },
     methods: {
@@ -161,6 +146,26 @@
           }
         })
 
+      },
+       getInitData() {
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.diagnoses = response.data.data.diagnose
+            console.log("诊断列表",this.diagnoses)
+          }
+        })
+      },
+      getDiagnosis(id){
+        var name = ""
+        for(let i=0;i<this.diagnoses.length;i++){
+           if(id == this.diagnoses[i].id){
+              name = this.diagnoses[i].class_name
+           }
+        }
+        return name
       }
     }, created() {
       var nowDate = new Date()
@@ -176,6 +181,7 @@
 
 
       this.getHisPrescriptionList()
+      this.getInitData()
 
     }
   }

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -2,7 +2,7 @@
   <div id='prescriptionPrint'>
     <div v-for="(item,index) in advicePrint" :key="index">
       <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
-          <div class="printTitle">血液透析中心处方笺</div>
+          <div class="printTitle">{{orgname}}处方笺</div>
           <div class="infoTitle">
               <p>姓名：{{item.patient.name?item.patient.name:""}}</p>
               <p>性别：
@@ -84,7 +84,8 @@ export default {
         hisPatient:{},
         department:[],
         prescriptions:[],
-        projectList:[]
+        projectList:[],
+        orgname:""
       }
     },
    methods:{
@@ -227,7 +228,8 @@ export default {
       this.getInitData()
       this.getPrescriptionPrint()
       this.getHisPatientDetail()
-
+      var xtuser = this.$store.getters.xt_user;
+      this.orgname = xtuser.org.org_name;
      
    },
    watch:{

src/xt_pages/outpatientDoctorStation/template/printTwo.vue

@@ -1,6 +1,6 @@
 <template>
     <div id='prescription-print' class="prescription-print">
-        <div class="printTitle">血液透析中心处方笺</div>
+        <div class="printTitle">{{orgname}}处方笺</div>
         <div class="infoTitle">
             <p>姓名：{{patient.name}}</p>
             <p>性别：
@@ -57,7 +57,8 @@ export default {
         tableData:[],
         prescriptionInfo:[],
         hisPatient:{},
-        department:[]
+        department:[],
+        orgname:""
       }
     },
    methods:{
@@ -150,6 +151,8 @@ export default {
    created(){
       this.getAllDoctorList()
       this.getInitData()
+      var xtuser = this.$store.getters.xt_user;
+      this.orgname = xtuser.org.org_name;
    },
    watch:{
      patient_id:function(val){

src/xt_pages/user/components/PatientDetail.vue

@@ -244,7 +244,7 @@
 
             <el-col :span="24">
               <el-form-item label="传染病 : " required prop="is_infectious">
-                <el-radio-group v-model="form.is_infectious" disabled>
+                <el-radio-group v-model="form.is_infectious" disabled >
                   <el-radio :label="1">阴性</el-radio>
                   <el-radio :label="2">阳性</el-radio>
                 </el-radio-group>
@@ -1238,6 +1238,7 @@ export default {
           if (response.data.state === 1) {
             this.$emit("tran-patient-info", response.data.data.patient);
             var patietInfo = response.data.data.patient;
+            console.log("触发了吗无222222",patietInfo)
             this.form.avatar = patietInfo.avatar;
             this.form.name = patietInfo.name;
             this.form.alias = patietInfo.alias;
@@ -1246,9 +1247,15 @@ export default {
             this.form.dialysisNo = patietInfo.dialysis_no;
             this.form.gender = patietInfo.gender;
             this.form.is_infectious = patietInfo.is_infectious;
+           
             // this.form.record_date = patietInfo.is_infectious
             this.form.response_result = patietInfo.response_result;
             this.form.remind_cycle = patietInfo.remind_cycle;
+            if(patietInfo.is_infectious == 1){
+               this.form.remind_cycle = 0 
+
+            }
+            console.log("222222",this.form.remind_cycle)
             this.form.user_sys_before_count = patietInfo.user_sys_before_count;
 
             this.infections = response.data.data.infections;

src/xt_pages/user/components/PatientForm.vue

@@ -1698,7 +1698,9 @@ export default {
             this.form.response_result = patietInfo.response_result;
             this.form.remind_cycle = patietInfo.remind_cycle;
             this.form.is_infectious = patietInfo.is_infectious;
-
+            if(this.form.is_infectious == 1){
+              this.form.remind_cycle = 0
+            }
             this.form.tell_phone = patietInfo.tell_phone;
             this.form.dialysis_age = patietInfo.dialysis_age;
             this.form.contact_name = patietInfo.contact_name;

src/xt_pages/user/inspectionInfectious.vue

@@ -40,10 +40,8 @@
           <div class="filter-container">
             <el-button class="filter-item" type="text" style="color:#000"
               >{{ itemName }}
-              <span v-if="itemDate"
-                >（检查日期：{{ itemDate }}）</span
-              ></el-button
-            >
+              <span v-if="itemDate">（检查日期：{{ itemDate }}）</span></el-button>
+              <span style="color:red">次数:{{total}}</span>
           </div>
           <el-table
             :header-cell-style="{
@@ -264,7 +262,8 @@ export default {
         patient: 0,
         project_id: 0,
         page: 1
-      }
+      },
+      total:""
     }
   },
   methods: {
@@ -436,6 +435,7 @@ export default {
                     }
                   }
                   this.items.push(item)
+                  this.total = this.items.length
                 }
               }
 

src/xt_pages/user/vascularAccess.vue

@@ -27,9 +27,9 @@
            <span>{{scope.row.blood_access_part_id}}</span>  
         </template>
      </el-table-column>
-      <el-table-column prop="inflow_pass" label="流入-流出道" width="100" align="center">
+      <el-table-column prop="inflow_pass" label="血管通路部位(其他)" width="100" align="center">
          <template slot-scope="scope">
-            <span>{{scope.row.inflow_pass}}</span>
+            <span>{{scope.row.other_vascular}}</span>
          </template>
       </el-table-column>
       <el-table-column prop="date" label="首次启用日期" width="120" align="center">
@@ -108,14 +108,16 @@
      <el-dialog
          title="新增通路"
          :visible.sync="dialogVisible"
-         width="60%"
+         width="65%"
          center>
       <el-form label-width="120px" :model="form" ref="form" :rules="rules" >
          <el-row :gutter="24">
             <el-col :span="24">
-                <el-form-item label="通路项目:" :required="true" prop="access_project">
-                    <el-radio v-model="form.access_project" label="1">内瘘</el-radio>
-                    <el-radio v-model="form.access_project" label="2">导管</el-radio>
+                <el-form-item label="通路项目:" :required="true" prop="access_project"  > 
+                    <el-radio-group style="padding: 10px;" v-model="form.access_project" @change="changeRadio">
+                        <el-radio  label="1">内瘘</el-radio>
+                        <el-radio  label="2">导管</el-radio>
+                   </el-radio-group>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -153,15 +155,16 @@
          </el-row>
           <el-row :gutter="24">
             <el-col :span="8">
-               <el-form-item label="流入-流出道:" :required="true" prop="inflow_pass">
-                 <el-select v-model="form.inflow_pass" placeholder="请选择" style="width:150px">
+               <el-form-item label="血管通路部位(其他):"  prop="inflow_pass">
+                 <!-- <el-select v-model="form.inflow_pass" placeholder="请选择" style="width:150px">
                     <el-option
                         v-for="item in optionsPass"
                         :key="item.id"
                         :label="item.name"
                         :value="item.id">
                     </el-option>
-                  </el-select>
+                  </el-select> -->
+                  <el-input v-model="form.other_vascular" style="width:200"></el-input>
                </el-form-item>
             </el-col>
              <el-col :span="8">
@@ -236,8 +239,10 @@
          <el-row :gutter="24">
             <el-col :span="24">
                 <el-form-item label="通路项目:" :required="true" prop="access_project">
-                    <el-radio v-model="form.access_project" label="1">内瘘</el-radio>
-                    <el-radio v-model="form.access_project" label="2">导管</el-radio>
+                  <el-radio-group style="padding: 10px;" v-model="form.access_project" @change="changeRadio">
+                        <el-radio  label="1">内瘘</el-radio>
+                        <el-radio  label="2">导管</el-radio>
+                  </el-radio-group>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -284,15 +289,16 @@
          </el-row>
           <el-row :gutter="24">
             <el-col :span="8">
-               <el-form-item label="流入-流出道:" :required="true" prop="inflow_pass">
-                 <el-select v-model="form.inflow_pass" placeholder="请选择" style="width:150px">
+               <el-form-item label="血管通路部位(其他):" :required="true" prop="inflow_pass">
+                 <!-- <el-select v-model="form.inflow_pass" placeholder="请选择" style="width:150px">
                     <el-option
                         v-for="item in optionsPass"
                         :key="item.id"
                         :label="item.name"
                         :value="item.id">
                     </el-option>
-                  </el-select>
+                  </el-select> -->
+                  <el-input v-model="form.other_vascular"></el-input>
                </el-form-item>
             </el-col>
              <el-col :span="8">
@@ -369,7 +375,7 @@
   const moment = require('moment')
   import PatientSidebar from './components/PatientSidebar'
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
-  import { saveVasularAccess,getAllVascularAccessList,getVascularAccessByDetail,updatedVasularAccess,DeleteVascularAccess } from '@/api/patient'
+  import { saveVasularAccess,getAllVascularAccessList,getVascularAccessByDetail,updatedVasularAccess,DeleteVascularAccess,getAccessList } from '@/api/patient'
 
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import { getDataConfig } from '@/utils/data'
@@ -393,7 +399,6 @@
           access_project: [{ required: true, message: '请选择通路项目' }],
           blood_access_part_opera_id:[{required:true,message:'请选择血管通路类型'}],
           blood_access_part_id:[{required:true,message:"请选择血管通路"}],
-          inflow_pass:[{required:true,message:"请选择流入-流出道"}],
           first_start_time:[{required:true,message:"请选择首次启用日期"}],
           user_status:[{required:true,message:"请选择使用状态"}]
         },
@@ -411,6 +416,7 @@
          user_status:1,
          remark:"",
          stop_time:"",
+         other_vascular:""
         },
         options:[
          {id:1,name:"启用"},
@@ -432,6 +438,8 @@
           titles: '',
           type: '' // 不同弹框类型，用来匹配数据
         },
+        new_blood_access_part_opera:[],
+        new_blood_access_part:[],
       }
     },
     methods: {
@@ -492,7 +500,8 @@
                 user_status:this.form.user_status,
                 stop_reason:this.form.stop_reason,
                 remark:this.form.remark,
-                stop_time:this.form.stop_time
+                stop_time:this.form.stop_time,
+                other_vascular:this.form.other_vascular,
               }
               console.log("params",params)
              saveVasularAccess(params).then(response=>{
@@ -548,11 +557,50 @@
              console.log("accessDetail",accessDetail)
              this.form.id = accessDetail.id
              this.form.access_project = accessDetail.access_project.toString()
-             
-            
+             var arr = []
+             var arrOne = []
+             var arrThree = []
+             var arrFour = []
+
+              if(accessDetail.access_project == "1"){
+               for(let i=0;i<this.new_blood_access_part_opera.length;i++){ 
+                 if(this.new_blood_access_part_opera[i].field_type == 1){
+                     arr.push(this.new_blood_access_part_opera[i])     
+                 }
+                }
+                this.blood_access_part_opera = arr
+
 
+              for(let j=0;j<this.new_blood_access_part.length;j++){
+                 if(this.new_blood_access_part[j].field_type == 1){
+                     arrThree.push(this.new_blood_access_part[j])
+                 }
+                 
+                }
+                this.blood_access_part = arrThree
+              }
+
+              if(accessDetail.access_project == "2"){
+               for(let i=0;i<this.new_blood_access_part_opera.length;i++){ 
+                  if(this.new_blood_access_part_opera[i].field_type == 2){
+                     arrOne.push(this.new_blood_access_part_opera[i])  
+                  }
+                
+                }
+                this.blood_access_part_opera = arrOne
+
+                for(let j=0;j<this.new_blood_access_part.length;j++){
+                   if(this.new_blood_access_part[j].field_type == 2){
+                     arrFour.push(this.new_blood_access_part[j])
+                   }    
+                }
+                this.blood_access_part = arrFour
+              } 
+            
+           
              this.form.blood_access_part_id = accessDetail.blood_access_part_id
              
+
               var blood_part = 0
               for(let i=0;i<this.blood_access_part_opera.length;i++){
                  if(accessDetail.blood_access_part_opera_id == this.blood_access_part_opera[i].name){
@@ -560,6 +608,7 @@
                  }
               }
              this.form.blood_access_part_opera_id = blood_part
+
              this.form.first_start_time = this.getTime(accessDetail.first_start_time,"{y}-{m}-{d}")
 
              var inflow_id = 0
@@ -573,8 +622,9 @@
              this.form.start_time = this.getTime(accessDetail.start_time,"{y}-{m}-{d}")
              this.form.stop_reason = accessDetail.stop_reason
              this.form.stop_time = this.getTime(accessDetail.stop_time,"{y}-{m}-{d}")
-
+ 
              this.form.user_status = accessDetail.user_status
+             this.form.other_vascular = accessDetail.other_vascular
              if(accessDetail.user_status == 1){
                this.show = false
              }
@@ -647,7 +697,8 @@
                 stop_reason:this.form.stop_reason,
                 remark:this.form.remark,
                 stop_time:this.form.stop_time,
-                patient_id:this.patientID
+                patient_id:this.patientID,
+                other_vascular:this.form.other_vascular
               }
               console.log("编辑",params)
               updatedVasularAccess(params).then(response=>{
@@ -694,20 +745,85 @@
       innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
       },
+      getAccessList(){
+        getAccessList().then(response=>{
+           if(response.data.state == 1){
+             var blood_access_part_opera = response.data.data.blood_access_part_opera
+             console.log("blood_access_part_operahhahs",blood_access_part_opera)
+             this.new_blood_access_part_opera = blood_access_part_opera
+             var blood_access_part = response.data.data.blood_access_part
+             console.log("blood_access",blood_access_part)
+             this.new_blood_access_part = blood_access_part
+
+             console.log("通路项目",this.form.access_project)
+             
+             var arr = []
+             var arrOne = []
+             if(this.form.access_project == 1 ){
+               for(let i=0;i<this.new_blood_access_part_opera.length;i++){
+                  if(this.new_blood_access_part_opera[i].field_type == 1){
+                     arr.push(this.new_blood_access_part_opera[i])
+                  }
+
+               }
+  
+               for(let i=0;i<this.new_blood_access_part.length;i++){
+                  if(this.new_blood_access_part[i].field_type == 1){
+                     arrOne.push(this.new_blood_access_part[i])
+                  }
+               }
+             }
+            this.blood_access_part_opera = arr
+            this.blood_access_part = arrOne
+           }
+        })
+      },
+      changeRadio(val){
+        console.log("val",val)
+        var arr = []
+        var arrOne = []
+        var arrTwo = []
+        var arrThree = []
+        for(let i=0;i<this.new_blood_access_part_opera.length;i++){
+           if(this.new_blood_access_part_opera[i].field_type == 1){
+              arr.push(this.new_blood_access_part_opera[i])
+           }
+           if(this.new_blood_access_part_opera[i].field_type == 2){
+             arrOne.push(this.new_blood_access_part_opera[i])
+           }
+        } 
+
+        for(let i=0;i<this.new_blood_access_part.length;i++){
+          if(this.new_blood_access_part[i].field_type == 1){
+             arrTwo.push(this.new_blood_access_part[i])
+          }
+          if(this.new_blood_access_part[i].field_type == 2){
+             arrThree.push(this.new_blood_access_part[i])
+          }
+        }
+
+        if(val == 1){
+           this.blood_access_part_opera = arr
+           this.blood_access_part = arrTwo
+          
+        }
+        if(val == 2){
+          this.blood_access_part_opera = arrOne
+          this.blood_access_part = arrThree
+        }
+        
+        console.log("arr",arr)
+        console.log("arrOne",arrOne)
+      }
     },
     created() {
       const id = this.$route.params && this.$route.params.id
-      console.log('id是设么', id)
       this.patientID = parseInt(id)
-      
-      //血管通路
-      this.blood_access_part_opera = getDataConfig('hemodialysis', 'vascular_access_desc')
-      console.log("血管通路",this.blood_access_part_opera)
-      //血管通路部位
-      this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
-      console.log("血管通路部位",this.blood_access_part)
       this.getlist()
-    }
+      //获取血管通路
+      this.getAccessList()
+    },
+   
   }
 </script>