diff --git a/src/api/manage/newSigning.js b/src/api/manage/newSigning.js
index f706f96..e1d5d45 100644
--- a/src/api/manage/newSigning.js
+++ b/src/api/manage/newSigning.js
@@ -7,4 +7,28 @@ export function addsign(data) {
         method: 'post',
         data
     })
+}
+// 回显
+export function getByRecordId(id) {
+    return request({
+        url: '/manage/signRecord/getByRecordId/' + id,
+        method: 'get'
+    })
+}
+// 修改签约信息
+
+export function updateSign(data) {
+    return request({
+        url: '/manage/signRecord/updateSign',
+        method: 'post',
+        data
+    })
+}
+// 撤销签约
+export function updateSignStatus(data) {
+    return request({
+        url: '/manage/signRecord/updateSignStatus',
+        method: 'post',
+        data
+    })
 }
\ No newline at end of file
diff --git a/src/api/manage/patientInfo.js b/src/api/manage/patientInfo.js
index 79d9e29..63e6601 100644
--- a/src/api/manage/patientInfo.js
+++ b/src/api/manage/patientInfo.js
@@ -52,3 +52,10 @@ export function getPatientList(query) {
         params: query
     })
 }
+// 撤销意向签约
+export function cancelIntentionalSign(patientId) {
+    return request({
+        url: '/manage/signRecord/cancelIntentionalSign/' + patientId,
+        method: 'get'
+    })
+}
diff --git a/src/api/manage/visit.js b/src/api/manage/visit.js
index ab5d303..dc384f4 100644
--- a/src/api/manage/visit.js
+++ b/src/api/manage/visit.js
@@ -18,6 +18,21 @@ export function updatePatientInfo(data) {
         data: data
     })
 }
+// 修改意向签约提交
+export function updateIntentionalSign(data) {
+    return request({
+        url: '/manage/signRecord/updateIntentionalSign',
+        method: 'post',
+        data: data
+    })
+}
+// 查询意向签约
+export function getIntentionalSign(signPatientRecordId) {
+    return request({
+        url: '/manage/signRecord/getIntentionalSign/' + signPatientRecordId,
+        method: 'post'
+    })
+}
 // 查询患者信息详细
 export function getPatientInfo(id) {
     return request({
diff --git a/src/views/manage/components/cardlist.vue b/src/views/manage/components/cardlist.vue
index 2b6a42c..1256828 100644
--- a/src/views/manage/components/cardlist.vue
+++ b/src/views/manage/components/cardlist.vue
@@ -19,9 +19,14 @@
               alt=""
               class="img"
             />
-            <div class="name">
-              {{ item.patientName }}
-            </div>
+            <el-tooltip
+              class="name"
+              effect="dark"
+              :content="item.patientName"
+              placement="top"
+            >
+              <span> {{ item.patientName }} </span>
+            </el-tooltip>
             <div class="agesex">
               {{ item.sex == "MALE" ? "男" : "" }}
               {{ item.sex == "FEMALE" ? "女" : "" }}
@@ -47,7 +52,9 @@
             <div class="diagnosi">诊断状态：111</div>
           </div>
           <div class="bottom">
-            <div class="formitembutton" @click.stop="handleedit(item)">画像编辑</div>
+            <div class="formitembutton" @click.stop="handleedit(item)">
+              画像编辑
+            </div>
             <div class="formitem">医生：{{ item.attendingPhysician }}</div>
             <div class="formitem">科室：{{ item.departmentName }}</div>
             <div class="formitem">就诊时间：{{ item.visitDate }}</div>
@@ -322,14 +329,6 @@ export default {
         overflow: hidden; /* 超出容器部分隐藏 */
         text-overflow: ellipsis; /* 超出部分显示省略号 */
       }
-
-      /* 鼠标悬停时通过title属性显示完整文本 */
-      .name:hover {
-        // cursor: default; /* 更改鼠标形状为默认指针 */
-        // text-overflow: inherit; /* 取消省略号显示全文 */
-        white-space: normal;
-        overflow: visible; /* 显示全部文本 */
-      }
     }
   }
 }
diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue
index 55096cf..2ea733f 100644
--- a/src/views/manage/newSigning/index.vue
+++ b/src/views/manage/newSigning/index.vue
@@ -2,6 +2,12 @@
   <div class="app-container">
     <div class="header">
       <div class="btns">
+        <el-button
+          type="danger"
+          @click="cancelback"
+          v-if="this.$route.query.signPatientRecordId"
+          >撤销签约</el-button
+        >
         <el-button @click="goback">取消</el-button>
         <el-button type="primary" @click="signupload">签约</el-button>
       </div>
@@ -101,7 +107,9 @@
             "
             v-if="signPackage.servicePackageName"
             :style="
-              signPackage.servicePackageName == '请选择服务包' ? 'color: #c0c4cc;' : ''
+              signPackage.servicePackageName == '请选择服务包'
+                ? 'color: #c0c4cc;'
+                : ''
             "
             >{{ signPackage.servicePackageName }}</el-button
           >
@@ -176,7 +184,7 @@
           <el-date-picker
             v-model="signPackage.serviceStartTime"
             type="date"
-            disabled
+            value-format="yyyy-MM-dd"
             placeholder="开始日期"
             style="width: 150px"
           >
@@ -185,6 +193,7 @@
           <el-input
             v-model="signPackage.serviceEndTime"
             style="width: 150px"
+            value-format="yyyy-MM-dd"
             disabled
             placeholder="结束日期"
           ></el-input>
@@ -313,9 +322,14 @@
         :headers="upload.headers"
         :on-success="handleSuccess"
         :auto-upload="false"
+        :file-list="fileList"
       >
         <i class="el-icon-plus"></i>
       </el-upload>
+      <!-- <div style="width:200px;height:200px">
+      
+        <img :src="baseUrl+imageUrl " alt="">
+      </div> -->
       <!-- 服务包弹框 -->
       <el-dialog
         title=""
@@ -364,10 +378,7 @@
               >
             </el-form-item>
           </el-form>
-          <el-table
-            :data="servicepackageList"
-            @cell-dblclick="nurseclick"
-          >
+          <el-table :data="servicepackageList" @cell-dblclick="nurseclick">
             <!-- <el-table :max-height="maxTableHeight" v-loading="loading" :data="servicepackageList"
             @selection-change="handleSelectionChange"> -->
             <el-table-column label="序号" align="center" type="index" />
@@ -444,12 +455,22 @@
                   @click="detail(scope.row)"
                   >详情</el-button
                 >
-                <el-button size="mini" type="text" @click="handleselect(scope.row)"
-                  v-if="signPackage.servicePackageId != scope.row.id">选择</el-button>
-                  <!-- {{ signPackage.servicePackageId }}
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="handleselect(scope.row)"
+                  v-if="signPackage.servicePackageId != scope.row.id"
+                  >选择</el-button
+                >
+                <!-- {{ signPackage.servicePackageId }}
                   {{ scope.row.id }} -->
-                <el-button size="mini" type="text" @click="nohandleselect(scope.row)"
-                  v-if="signPackage.servicePackageId == scope.row.id">取消选择</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="nohandleselect(scope.row)"
+                  v-if="signPackage.servicePackageId == scope.row.id"
+                  >取消选择</el-button
+                >
                 <!-- <el-button
                   size="mini"
                   type="text"
@@ -485,63 +506,109 @@
         <!-- <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
         :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" /> -->
       </el-dialog>
-       <!-- 详情弹框 -->
-    <el-dialog title="详情" :visible.sync="detailshow" width="60%" :before-close="handleClose">
-      <el-form ref="form" :model="formdetail" label-width="150px" :inline="true">
-        <el-form-item label="病种名称:" prop="packageVersion">
-          <div class="container">
-            <el-tooltip class="item" effect="dark" :content="formdetail.diseaseTypeName" placement="top-start">
-              <span>{{ formdetail.diseaseTypeName }}</span>
-            </el-tooltip>
-          </div>
-          <!-- <span style="display: inline-block; width: 120px">
+      <!-- 详情弹框 -->
+      <el-dialog
+        title="详情"
+        :visible.sync="detailshow"
+        width="60%"
+        :before-close="handleClose"
+      >
+        <el-form
+          ref="form"
+          :model="formdetail"
+          label-width="150px"
+          :inline="true"
+        >
+          <el-form-item label="病种名称:" prop="packageVersion">
+            <div class="container">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="formdetail.diseaseTypeName"
+                placement="top-start"
+              >
+                <span>{{ formdetail.diseaseTypeName }}</span>
+              </el-tooltip>
+            </div>
+            <!-- <span style="display: inline-block; width: 120px">
             {{ formdetail.diseaseTypeName }}</span> -->
-        </el-form-item>
-        <el-form-item label="服务包名称:" prop="packageVersion">
-          <div class="container">
-            <el-tooltip class="item" effect="dark" :content="formdetail.packageName" placement="top-start">
-              <span>{{ formdetail.packageName }}</span>
-            </el-tooltip>
-          </div>
-        </el-form-item>
-        <el-form-item label="价格:" prop="packageVersion">
-          <span>{{ formdetail.packagePrice }}元</span>
-        </el-form-item>
-        <br />
-        <el-form-item label="服务期限:" prop="packageVersion">
-          <span style="display: inline-block; width: 120px">
-            {{ formdetail.packageTermAndUnit }}
-          </span>
-        </el-form-item>
-        <el-form-item label="硬件类型:" prop="packageVersion">
-          <span>
-            {{ formdetail.hardwareType == "BLOOD_PRESSURE" ? "血压仪" : "" }}
-          </span>
-          <span>
-            {{ formdetail.hardwareType == "GLUCOSE_METER" ? "血糖仪" : "" }}
-          </span>
-          <span>
-            {{ formdetail.hardwareType == "ELECTROCARDIOGRA" ? "心电仪" : "" }}
-          </span>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="loading" :data="datailList">
-        <el-table-column label="序号" type="index" />
-        <el-table-column label="服务方式" align="center" prop="serviceWayName" />
-        <el-table-column label="服务内容" align="center" prop="serviceContent" :show-overflow-tooltip="true" />
-        <el-table-column label="服务频次" align="center" prop="serviceFrequencyText" />
-      </el-table>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="detailshow = false">关闭</el-button>
-      </span>
-    </el-dialog>
+          </el-form-item>
+          <el-form-item label="服务包名称:" prop="packageVersion">
+            <div class="container">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="formdetail.packageName"
+                placement="top-start"
+              >
+                <span>{{ formdetail.packageName }}</span>
+              </el-tooltip>
+            </div>
+          </el-form-item>
+          <el-form-item label="价格:" prop="packageVersion">
+            <span>{{ formdetail.packagePrice }}元</span>
+          </el-form-item>
+          <br />
+          <el-form-item label="服务期限:" prop="packageVersion">
+            <span style="display: inline-block; width: 120px">
+              {{ formdetail.packageTermAndUnit }}
+            </span>
+          </el-form-item>
+          <el-form-item label="硬件类型:" prop="packageVersion">
+            <span>
+              {{ formdetail.hardwareType == "BLOOD_PRESSURE" ? "血压仪" : "" }}
+            </span>
+            <span>
+              {{ formdetail.hardwareType == "GLUCOSE_METER" ? "血糖仪" : "" }}
+            </span>
+            <span>
+              {{
+                formdetail.hardwareType == "ELECTROCARDIOGRA" ? "心电仪" : ""
+              }}
+            </span>
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="datailList">
+          <el-table-column label="序号" type="index" />
+          <el-table-column
+            label="服务方式"
+            align="center"
+            prop="serviceWayName"
+          />
+          <el-table-column
+            label="服务内容"
+            align="center"
+            prop="serviceContent"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="服务频次"
+            align="center"
+            prop="serviceFrequencyText"
+          />
+        </el-table>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="detailshow = false">关闭</el-button>
+        </span>
+      </el-dialog>
+      <el-dialog :visible.sync="dialogVisible" title="查看图片">
+        <img width="60%" :src=" dialogImageUrl"  alt="" />
+      </el-dialog>
     </div>
   </div>
 </template>
 
 <script>
-import { addsign } from "@/api/manage/newSigning.js";
-import { listServicepackage,getServicepackage } from "@/api/manage/servicepackage";
+import {
+  addsign,
+  updateSign,
+  getByRecordId,
+  updateSignStatus,
+} from "@/api/manage/newSigning.js";
+import {
+  listServicepackage,
+  getServicepackage,
+} from "@/api/manage/servicepackage";
 
 import { servicepackageinfo } from "@/api/manage/signRecord.js";
 import { getToken } from "@/utils/auth";
@@ -555,9 +622,12 @@ export default {
   data() {
     return {
       formdetail: {},
-      handleselectId:'',
-      handleselectName:'',
-      detailshow:false,
+      baseUrl: process.env.VUE_APP_BASE_API,
+      dialogImageUrl: "",
+      dialogVisible: false,
+      handleselectId: "",
+      handleselectName: "",
+      detailshow: false,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -640,42 +710,57 @@ export default {
       packagelist: [],
       attendingPhysicianlist: [],
       servicepackageList: [],
-      servicePackageName:'',
-      innerVisibleshow:false,
-      datailList:[],
+      servicePackageName: "",
+      innerVisibleshow: false,
+      datailList: [],
+      patientId: "",
+      id: "",
+      fileList: [],
     };
   },
   created() {
     this.form.record = this.$route.query;
+    // console.log(this.$route.query, "this.$route.query;");
     this.signPackage.packagePaymentStatus = this.form.record.paymentStatus;
     this.getList();
     this.usergetListinfo();
+    if (this.form.record.signPatientRecordId) {
+      this.infolist();
+    }
   },
-//   mounted() {
-//     this.handleselectId = this.routeId
-//     this.handleselectName = this.routeName
-//   },
-//   watch: {
-//     routeId(newValue, oldValue) {
-//       this.handleselectId = newValue;
-//     },
-//     // servicePackageId(newValue, oldValue) {
-//     //   if (newValue) {
-//     //     this.queryParams.servicePackageId = newValue;
-//     //     this.getList();
-//     //   }
-//     // },
-//     routeName(newValue, oldValue) {
-//       this.handleselectName = newValue;
-//     }
-//   },
   methods: {
+    infolist() {
+      getByRecordId(this.form.record.signPatientRecordId).then((res) => {
+        // console.log(res, "res");
+        this.patientId = res.data.patientId;
+        this.id = res.data.id;
+        this.form.record = res.data;
+        this.form.devices = res.data.signDevices;
+        this.signPackage.packagePrice = res.data.packagePrice;
+        this.signPackage.serviceCycle = res.data.serviceCycle;
+        this.signPackage.serviceStartTime =
+          res.data.serviceStartTime.slice(0.1);
+        this.signPackage.serviceEndTime = res.data.serviceEndTime.slice(0, 10);
+        this.signPackage.servicePackageId = res.data.servicePackageId;
+        this.signPackage.servicePackageName = res.data.packageName;
+        this.signPackage.packageTerm = res.data.packageTerm;
+        this.signPackage.packageTermUnit = res.data.packageTermUnit;
+        this.signPackage.packagePaymentStatus = res.data.packagePaymentStatus;
+        this.route.routeName = res.data.routeName;
+        this.route.routeId = res.data.routeId;
+        if (res.data.signPatientInformeds) {
+          res.data.signPatientInformeds.map((t) => {
+            var obj = {};
+            obj.url = this.baseUrl + t.informedFilePath;
+            this.fileList.push(obj);
+          });
+        }
+      });
+    },
     handleselect(row) {
-        console.log(row,'item11')
-        this.signPackage.servicePackageId = row.id;
+      this.signPackage.servicePackageId = row.id;
       this.signPackage.servicePackageName = row.packageName;
       let item = this.servicepackageList.find((e) => e.id == row.id);
-      console.log(item,'item')
       this.signPackage = { ...this.signPackage, ...item };
       let datetime = new Date();
       let year = datetime.getFullYear();
@@ -688,48 +773,38 @@ export default {
         this.signPackage.serviceStartTime,
         item
       );
-      console.log(this.signPackage.servicePackageName,'this.signPackage.servicePackageName')
-
-    //   this.handleselectId = row.id
-    //   this.handleselectName = row.packageName
-    //   this.$emit("on-template", { routeId: item.id, routeName: item.routeName });
-      this.innerVisibleshow = false
+      this.innerVisibleshow = false;
     },
     nohandleselect() {
-        this.signPackage.servicePackageId = ''
-        this.signPackage.servicePackageName = ''
-        // this.$set(  this.form,'servicePackageName','')
-        // this.$set(  this.form,'servicePackageId','')
-
-        console.log(this.signPackage.servicePackageName,'this.signPackage.servicePackageName')
-        this.innerVisibleshow = false
-
-        this.signPackage.packageTerm=''
-        this.signPackage.serviceStartTime=''
-        this.signPackage.serviceEndTime=''
-    //   this.$emit("on-template", { routeId: '', routeName: '' });
+      this.signPackage.servicePackageId = "";
+      this.signPackage.servicePackageName = "";
+      this.innerVisibleshow = false;
+      this.signPackage.packageTerm = "";
+      this.signPackage.serviceStartTime = "";
+      this.signPackage.serviceEndTime = "";
     },
-     // 详情关闭
-     handleClose() {
-      this.detailshow = false
+    // 详情关闭
+    handleClose() {
+      this.detailshow = false;
     },
-     // 详情
-     detail(row) {
-      this.detailshow = true
-      getServicepackage(row.id).then(response => {
+    // 详情
+    detail(row) {
+      this.detailshow = true;
+      getServicepackage(row.id).then((response) => {
         this.formdetail = response.data;
-        this.datailList = response.data.voList
-        this.datailList.forEach(el => {
+        this.datailList = response.data.voList;
+        this.datailList.forEach((el) => {
           if (el.serviceFrequencyEnd) {
-            el.serviceFrequencyText = el.serviceFrequencyStart + '~' + el.serviceFrequencyEnd
+            el.serviceFrequencyText =
+              el.serviceFrequencyStart + "~" + el.serviceFrequencyEnd;
           } else {
-            el.serviceFrequencyText = el.serviceFrequencyText
+            el.serviceFrequencyText = el.serviceFrequencyText;
           }
-        })
+        });
       });
     },
-     // 科室名称重置
-     addresetQuerylist() {
+    // 科室名称重置
+    addresetQuerylist() {
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
@@ -741,15 +816,14 @@ export default {
     innerVisiblecancel() {
       this.innerVisibleshow = false;
     },
-       // 科室名称圆点按钮
-       nurseclick(row) {
-        this.signPackage.servicePackageId = row.id;
+    // 科室名称圆点按钮
+    nurseclick(row) {
+      this.signPackage.servicePackageId = row.id;
       this.signPackage.servicePackageName = row.packageName;
       this.servicePackageName = row.packageName;
-           this.route.routeId = "";
+      this.route.routeId = "";
       this.route.routeName = "";
       let item = this.servicepackageList.find((e) => e.id == row.id);
-      console.log(item,'item')
       this.signPackage = { ...this.signPackage, ...item };
       let datetime = new Date();
       let year = datetime.getFullYear();
@@ -762,8 +836,7 @@ export default {
         this.signPackage.serviceStartTime,
         item
       );
-      
-     
+
       this.innerVisibleshow = false;
     },
     /** 查询服务包基础信息列表 */
@@ -787,8 +860,7 @@ export default {
         whetherRelease: 1,
       }).then((res) => {
         this.packagelist = res.data;
-        this.totaldepartment=res.data.length
-        console.log(res.data,'res.data.length')
+        this.totaldepartment = res.data.length;
       });
     },
     // 点击科室
@@ -810,22 +882,22 @@ export default {
     },
     tappackage() {
       this.innerVisibleshow = true;
-this.getList()
-    //   this.route.routeId = "";
-    //   this.route.routeName = "";
-    //   let item = this.packagelist.find((e) => e.id == id);
-    //   this.signPackage = { ...this.signPackage, ...item };
-    //   let datetime = new Date();
-    //   let year = datetime.getFullYear();
-    //   let month = datetime.getMonth() + 1;
-    //   let day = datetime.getDate();
-    //   month >= 1 && month <= 9 ? (month = "0" + month) : "";
-    //   day >= 0 && day <= 9 ? (day = "0" + day) : "";
-    //   this.signPackage.serviceStartTime = `${year}-${month}-${day}`;
-    //   this.signPackage.serviceEndTime = obtainendtime(
-    //     this.signPackage.serviceStartTime,
-    //     item
-    //   );
+      this.getList();
+      //   this.route.routeId = "";
+      //   this.route.routeName = "";
+      //   let item = this.packagelist.find((e) => e.id == id);
+      //   this.signPackage = { ...this.signPackage, ...item };
+      //   let datetime = new Date();
+      //   let year = datetime.getFullYear();
+      //   let month = datetime.getMonth() + 1;
+      //   let day = datetime.getDate();
+      //   month >= 1 && month <= 9 ? (month = "0" + month) : "";
+      //   day >= 0 && day <= 9 ? (day = "0" + day) : "";
+      //   this.signPackage.serviceStartTime = `${year}-${month}-${day}`;
+      //   this.signPackage.serviceEndTime = obtainendtime(
+      //     this.signPackage.serviceStartTime,
+      //     item
+      //   );
     },
     //签约
     signupload() {
@@ -854,33 +926,65 @@ this.getList()
             (e) => e.userId == this.form.record.healthManageId
           )?.nickName;
         }
+        if (this.signPackage.serviceEndTime) {
+          this.signPackage.serviceEndTime =
+            this.signPackage.serviceEndTime.slice(0, 10);
+        }
+        if (this.signPackage.serviceStartTime) {
+          this.signPackage.serviceStartTime =
+            this.signPackage.serviceStartTime.slice(0, 10);
+        }
         this.form.signPackage = this.signPackage;
         this.form.route = this.route;
-        console.log( this.form,' this.form')
-        // return
-        addsign(this.form).then((res) => {
-          this.$confirm("签约成功, 是否返回上一页?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "success",
-          })
-            .then(() => {
-              this.$store
-                .dispatch("tagsView/delView", this.$route)
-                .then(({ visitedViews }) => {
-                  this.$router.push({
-                    path: "/patient/signRecord",
-                  });
-                });
+        this.form.record.signPatientRecordId = Number(
+          this.$route.query.signPatientRecordId
+        );
+        if (!this.form.record.signPatientRecordId) {
+          addsign(this.form).then((res) => {
+            this.$confirm("签约成功, 是否返回上一页?", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "success",
             })
-            .catch(() => {
-              this.$modal.msgSuccess("签约成功");
-            });
-        });
+              .then(() => {
+                this.$store
+                  .dispatch("tagsView/delView", this.$route)
+                  .then(({ visitedViews }) => {
+                    this.$router.push({
+                      path: "/patient/signRecord",
+                    });
+                  });
+              })
+              .catch(() => {
+                this.$modal.msgSuccess("签约成功");
+              });
+          });
+        } else {
+          updateSign(this.form).then((res) => {
+            this.$confirm("修改签约成功, 是否返回上一页?", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "success",
+            })
+              .then(() => {
+                this.$store
+                  .dispatch("tagsView/delView", this.$route)
+                  .then(({ visitedViews }) => {
+                    this.$router.push({
+                      path: "/patient/visitout",
+                    });
+                  });
+              })
+              .catch(() => {
+                this.$modal.msgSuccess("签约成功");
+              });
+          });
+        }
       });
     },
     //文件上传完成
     handleSuccess(response, file, fileList) {
+      // this.fileList = fileList;
       this.form.informeds = [];
       fileList.forEach((e) => {
         this.form.informeds.push({
@@ -900,17 +1004,55 @@ this.getList()
       this.form.devices.splice(index, 1);
     },
     handleRemove(file, fileList) {
-      console.log(file, fileList);
     },
-    handlePictureCardPreview(file) {},
-    goback() {
-      this.$store
-        .dispatch("tagsView/delView", this.$route)
-        .then(({ visitedViews }) => {
-          this.$router.push({
-            path: "/patient/signRecord",
-          });
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible=true
+    },
+    // 撤销签约
+    cancelback() {
+      this.$prompt("原因", "取消签约", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+      }).then(({ value }) => {
+        const query = {
+          id: this.id,
+          patientId: this.patientId,
+          signStatus: "SEPARATE_SIGN",
+          separateReason: value,
+          serviceStatus: "SERVICE_END",
+        };
+        updateSignStatus(query).then((res) => {
+          this.infolist();
+          this.$modal.msgSuccess("取消签约成功");
+          this.$store
+            .dispatch("tagsView/delView", this.$route)
+            .then(({ visitedViews }) => {
+              this.$router.push({
+                path: "/patient/visitout",
+              });
+            });
         });
+      });
+    },
+    goback() {
+      if (!this.$route.query.signPatientRecordId) {
+        this.$store
+          .dispatch("tagsView/delView", this.$route)
+          .then(({ visitedViews }) => {
+            this.$router.push({
+              path: "/patient/signRecord",
+            });
+          });
+      } else {
+        this.$store
+          .dispatch("tagsView/delView", this.$route)
+          .then(({ visitedViews }) => {
+            this.$router.push({
+              path: "/patient/visitout",
+            });
+          });
+      }
     },
     noservicePackageId() {
       this.$message.error("请先选择服务包！！");
diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue
index 5cfda87..abb98fd 100644
--- a/src/views/manage/visitout/index.vue
+++ b/src/views/manage/visitout/index.vue
@@ -463,8 +463,8 @@
 
 <script>
 import SearchFilter from '../../components/SearchForm.vue'
-import { listPatientInfo, delPatientInfo } from "@/api/manage/patientInfo";
-import { addPatientInfo, updatePatientInfo, getPatientInfo, intentionalSign } from "@/api/manage/visit";
+import { listPatientInfo, delPatientInfo,cancelIntentionalSign } from "@/api/manage/patientInfo";
+import { addPatientInfo, updatePatientInfo,getIntentionalSign, updateIntentionalSign,getPatientInfo, intentionalSign } from "@/api/manage/visit";
 import { getAge } from "@/utils/age";
 import { selectAgencyList, getDepartmentList, getAgencyList } from "@/api/manage/selectAgencyList";
 import { getToken } from '@/utils/auth'
@@ -634,6 +634,7 @@ export default {
         intentionalSource: '',
         patientId: '',
       },
+      patientId:''
     };
   },
   created() {
@@ -650,43 +651,109 @@ export default {
       this.queryParams.pageSize = size
       this.getList();
     },
-    cancelupload(){},
+    cancelupload(){
+      cancelIntentionalSign(this.patientId).then(response => {
+        console.log(response,'response')
+        if(response.code==200){
+          this.$modal.msgSuccess("撤销意向签约成功");
+        this.addsignopen = false
+        }
+    
+
+
+      })
+    },
+    // 修改意向签约
     addsignupload() {
       if (this.addsignform.billingDoctorId && this.addsignattendingPhysicianlist?.length > 0) {
         this.addsignform.billingDoctorName = this.addsignattendingPhysicianlist.find(e => e.userId == this.addsignform.billingDoctorId)?.nickName
       }
-      intentionalSign(this.addsignform).then(res => {
-        this.$modal.msgSuccess("意向签约成功");
-        this.addsignopen = false
-      })
+      
+      this.$refs["addsignform"].validate(valid => {
+        if (valid) {
+          // console.log(this.addsignform,'addsignform')
+
+          if (this.addsignform.id != null) {
+            // return
+            updateIntentionalSign(this.addsignform).then(response => {
+              this.$modal.msgSuccess("修改意向成功");
+              this.addsignopen = false
+              this.getList();
+            });
+          } else {
+            // return
+
+            intentionalSign(this.addsignform).then(response => {
+              this.$modal.msgSuccess("意向签约成功");
+
+              this.addsignopen = false
+              this.getList();
+            });
+          }
+        }
+      });
+      // intentionalSign(this.addsignform).then(res => {
+      
+      // })
     },
     // 修改意向
     updatesign(item){
-      console.log(item,'row')
       this.addsignform = {
         billingDoctorId: '',
         billingDoctorName: '',
         intentionalSource: '',
         patientId: item.id,
       }
+      console.log(item,'row')
+      this.patientId=item.id
+      getIntentionalSign(item.signPatientRecordId).then(response => {
+        // console.log(response,'response')
+        this.addsignform=response.data
+       this.addsignopen = true
+
+      })
+  
       this.usergetListinfotwo(item.hospitalAgencyId)
       this.resetForm("addsignform");
       this.title='修改意向'
 
-      this.addsignopen = true
     },
     // 重新签约
-    newsign(item){
-      this.addsignform = {
-        billingDoctorId: '',
-        billingDoctorName: '',
-        intentionalSource: '',
-        patientId: item.id,
-      }
-      this.title='重新签约'
-      this.usergetListinfotwo(item.hospitalAgencyId)
-      this.resetForm("addsignform");
-      this.addsignopen = true
+    newsign(row){
+      console.log(row,'row')
+      // return
+      this.$router.push({
+        path: "/patient/newSigning",
+          query: {
+          path: "/patient/visitout",
+          departmentId: row.departmentId,
+          patientName: row.patientName,
+          patientPhone: row.patientPhone,
+          visitMethod: row.visitMethod,
+          signDiagnosis: row.signDiagnosis,
+          signPatientRecordId:row.signPatientRecordId,
+          visitSerialNumber: row.visitSerialNumber,
+          hospitalAgencyName: row.hospitalAgencyName,
+          hospitalAgencyId: row.hospitalAgencyId,
+          inHospitalNumber: row.inHospitalNumber,
+          departmentName: row.departmentName,
+          paymentStatus: row.paymentStatus,
+          sex: row.sex,
+          age: row.birthDate ? getAge(row.birthDate) : "",
+          patientId: row.patientId,
+          createTime: row.createTime,
+        },
+      });
+      // this.addsignform = {
+      //   billingDoctorId: '',
+      //   billingDoctorName: '',
+      //   intentionalSource: '',
+      //   patientId: item.id,
+      // }
+      // this.title='重新签约'
+      // this.usergetListinfotwo(item.hospitalAgencyId)
+      // this.resetForm("addsignform");
+      // this.addsignopen = true
     },
     addsign(item) {
       this.addsignform = {