diff --git a/src/api/system/order.js b/src/api/system/order.js
index 4d3026e..8788007 100644
--- a/src/api/system/order.js
+++ b/src/api/system/order.js
@@ -77,3 +77,13 @@ export function getPersonInfo(nurseStationPersonId) {
         method: 'get'
     })
 }
+
+//xiugai
+
+export function edit(data) {
+    return request({
+        url: `/system/appointmentOrderDetails/updateAppointmentOrderInfo`,
+        method: "post",
+        data
+    })
+}
\ No newline at end of file
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index b20d213..9796ae4 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -73,7 +73,7 @@
           <el-button
             type="success"
             v-if="scope.row.orderStatus == 'WAIT_DISPATCH'&&scope.row.orderType=='COMPANION_IN_HOSPITAL'"
-          >已完成</el-button>
+          >已支付</el-button>
           <el-button
             type="primary"
             v-if="scope.row.orderStatus == 'WAIT_DISPATCH'&&scope.row.orderType!='COMPANION_IN_HOSPITAL'"
@@ -100,7 +100,7 @@
             icon="el-icon-edit"
             v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'"
             @click="seeedit(scope.row)"
-          >查看</el-button>
+          >编辑</el-button>
           <el-button
             size="mini"
             type="text"
@@ -459,28 +459,77 @@
     <el-dialog title="院内陪护订单信息" :visible.sync="editinnerVisible" append-to-body width="1280px">
       <el-form :inline="true" ref="form" :model="query" :rules="rules" label-width="130px">
         <el-form-item label="订单填写人姓名" prop="orderWriteName">
-          <div class="text">{{query.caregiverName}}</div>
+          <input
+            class="text"
+            type="text"
+            v-model="query.orderWriteName"
+            placeholder="请输入姓名"
+            maxlength="5"
+          />
         </el-form-item>
         <el-form-item label="姓名" prop="caregiverName">
-          <div class="text">{{query.caregiverName}}</div>
+          <input
+            class="text"
+            type="text"
+            v-model="query.caregiverName"
+            placeholder="请输入姓名"
+            maxlength="5"
+          />
         </el-form-item>
         <el-form-item label="电话" prop="caregiverPhone">
-          <div class="text">{{query.caregiverPhone}}</div>
+          <input
+            class="text"
+            type="text"
+            v-model="query.caregiverPhone"
+            placeholder="请输入电话"
+            maxlength="11"
+          />
         </el-form-item>
         <el-form-item label="医院名称" prop="hospitalName">
-          <div class="text">{{query.hospitalName}}</div>
+          <input
+            class="text"
+            type="text"
+            v-model="query.hospitalName"
+            placeholder="请输入医院名称"
+            maxlength="20"
+          />
         </el-form-item>
         <el-form-item label="科室名称" prop="departmentName">
-          <div class="text">{{query.departmentName}}</div>
+          <input
+            class="text"
+            type="text"
+            v-model="query.departmentName"
+            placeholder="请输入科室名称"
+            maxlength="20"
+          />
         </el-form-item>
         <el-form-item label="病床号" prop="hospitalBedNumber">
-          <div class="text">{{query.hospitalBedNumber}}</div>
+          <input
+            class="text"
+            type="text"
+            v-model="query.hospitalBedNumber"
+            placeholder="请输入病床号"
+            maxlength="20"
+          />
         </el-form-item>
         <el-form-item label="时间" prop="time">
+          <el-date-picker
+            v-if="query.companionDays==1"
+            v-model="timevalue"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            align="right"
+            @change="timechange"
+          ></el-date-picker>
           <div
+            v-else
             class="text"
           >{{query.companionStartDate}} {{query.companionEndDate?'至':'' }} {{ query.companionEndDate }}</div>
         </el-form-item>
+        <div class="text" style="border:none;display: inline-block;"></div>
+        <div class="text" style="border:none;display: inline-block;"></div>
         <el-form-item label="护理站名称" prop="nurseStationName">
           <div class="text">{{query.nurseStationName}}</div>
         </el-form-item>
@@ -559,7 +608,8 @@
         "
       ></div>
       <div slot="footer" class="dialog-footer" style="margin-right: 50px">
-        <el-button type="primary" @click="editinnerVisible = false">确 定</el-button>
+        <el-button @click="editinnerVisible = false">取 消</el-button>
+        <el-button type="primary" @click="editsubmitForm">确 定</el-button>
       </div>
     </el-dialog>
   </div>
diff --git a/src/views/system/order/indexjs.js b/src/views/system/order/indexjs.js
index 2a73e27..939b03b 100644
--- a/src/views/system/order/indexjs.js
+++ b/src/views/system/order/indexjs.js
@@ -6,13 +6,15 @@ import {
     dispatchsubmit,
     xylWeChatRefundNotify,
     appointmentOrderDetails,
-    getPersonInfo
+    getPersonInfo,
+    edit
 } from "@/api/system/order";
 import { getListByUser } from "@/api/system/userlist.js";
 export default {
     name: "order",
     data() {
         return {
+            timevalue: [],
             map: null,
             baseurl: process.env.VUE_APP_BASE_API,
             orderStatuslist: [{
@@ -128,6 +130,20 @@ export default {
     },
     mounted() { },
     methods: {
+        //时间确定
+        timechange(e) {
+            this.query.companionStartDate = this.formatDate(new Date(e[0]).getTime());
+            this.query.companionEndDate = this.formatDate(new Date(e[1]).getTime());
+        },
+        //修改提交
+        editsubmitForm() {
+            edit(this.query).then(res => {
+                if (res.code == 200) {
+                    this.$message.success("修改成功");
+                    this.editinnerVisible = false;
+                }
+            });
+        },
         init(query) {
             this.map = new AMap.Map("container", {
                 resizeEnable: true, //设置地图可缩放
@@ -217,6 +233,16 @@ export default {
                     break;
             }
         },
+        formatDate(time, timetype) {
+            let date = new Date(time); //13位时间戳
+            //let date = new Date(parseInt(time) * 1000); //10位时间戳
+            let y = date.getFullYear();
+            let MM = date.getMonth() + 1;
+            MM = MM < 10 ? "0" + MM : MM;
+            let d = date.getDate();
+            d = d < 10 ? "0" + d : d;
+            return y + "-" + MM + "-" + d;
+        },
         //编辑
         seeedit(row) {
             this.loading = true;