diff --git a/src/views/repair/tickets/Components/TicketManagerItem.vue b/src/views/repair/tickets/Components/TicketManagerItem.vue
index b5c43a2..d9550d7 100644
--- a/src/views/repair/tickets/Components/TicketManagerItem.vue
+++ b/src/views/repair/tickets/Components/TicketManagerItem.vue
@@ -56,7 +56,7 @@
                      @click="handleVoid(scope.row)">
             作废
           </el-button>
-          <el-button v-if="userRole === 'service_advisor' && isFinish" size="mini" type="text" icon="el-icon-refresh"
+          <el-button size="mini" type="text" icon="el-icon-refresh" v-hasPermi="['repair:tkm:editRecord']"
                      @click="handleEditRecord(scope.row)">
             维修记录设置
           </el-button>
@@ -114,11 +114,6 @@
                 command="handleReTake" size="mini" type="text" icon="el-icon-refresh"
               >重新指派
               </el-dropdown-item>
-              <el-dropdown-item
-                v-if="userRole === 'service_advisor'  && !isFinish && scope.row.ticketsWorkStatus !== '01'"
-                command="handleEditRecord" size="mini" type="text" icon="el-icon-refresh"
-              >维修记录设置
-              </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
diff --git a/src/views/repair/tickets/form/RecordSetting.vue b/src/views/repair/tickets/form/RecordSetting.vue
index 1b3192e..6556cf0 100644
--- a/src/views/repair/tickets/form/RecordSetting.vue
+++ b/src/views/repair/tickets/form/RecordSetting.vue
@@ -23,6 +23,11 @@
            <span>{{ scope.$index + 1 }}</span>
          </template>
        </el-table-column>
+       <el-table-column label="操作人" align="center" prop="dealUserName">
+         <template slot-scope="scope">
+           <span>{{scope.row.dealUserName}}</span>
+         </template>
+       </el-table-column>
        <el-table-column label="记录类型" align="center" prop="type" width="180">
          <template slot-scope="scope">
            <dict-tag :type="DICT_TYPE.REPAIR_RECORDS_TYPE" :value="scope.row.type" />
diff --git a/src/views/repair/tickets/form/TicketFinishManager.vue b/src/views/repair/tickets/form/TicketFinishManager.vue
index be84783..4a9ad24 100644
--- a/src/views/repair/tickets/form/TicketFinishManager.vue
+++ b/src/views/repair/tickets/form/TicketFinishManager.vue
@@ -102,19 +102,19 @@
       <el-form :model="noticeData" ref="noticeRef" :rules="noticeRules" v-loading="noticeLoading" :inline="true" label-width="20rem">
         <el-row :gutter="1">
           <el-col :span="24">
-            <el-form-item label="联系人" prop="name">
-              <el-input v-model="noticeData.name" style="width: 20rem"/>
+            <el-form-item :label="isNoticeChoose ? '客户姓名' : '联系人'" prop="name">
+              <el-input :disabled="isNoticeChoose" v-model="noticeData.name" style="width: 20rem"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="1">
           <el-col :span="24">
             <el-form-item label="联系电话" prop="mobile">
-              <el-input v-model="noticeData.mobile" style="width: 20rem"/>
+              <el-input :disabled="isNoticeChoose" v-model="noticeData.mobile" style="width: 20rem"/>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="1">
+        <el-row :gutter="1" v-if="!isNoticeChoose">
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input type="textarea" style="width: 35rem" :autosize="{ minRows: 2, maxRows: 4}" v-model="noticeData.remark" />
@@ -123,7 +123,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="doNotice">确定</el-button>
+        <el-button type="primary" @click="doNotice" v-if="!isNoticeChoose">确定</el-button>
         <el-button @click="noticeDialog = false">取消</el-button>
       </div>
     </el-dialog>
@@ -179,6 +179,7 @@ export default {
       },
       noticeLoading: false,
       noticeDialog: false,
+      isNoticeChoose: false
     }
   },
   mounted() {
@@ -247,23 +248,36 @@ export default {
       this.$refs.updateRepair.open(row)
     },
     async noticeCus(row){
-      this.noticeData = {
-        time: [],
-        name: null,
-        mobile: null,
-        id: null,
-        remark: null,
-      }
-      this.noticeDialog = true
-      this.noticeData.id = row.id
-      try {
-        this.noticeLoading = true
-        const res = await getUserProfile()
-        this.noticeData.name = res.data.nickname
-        this.noticeData.mobile = res.data.mobile
-      }finally {
-        this.noticeLoading = false
-      }
+      this.$confirm('请选择使用什么方式通知客户?', '选择', {
+        confirmButtonText: '短信通知',
+        cancelButtonText: '拨打电话',
+        type: 'info'
+      }).then(async () => {
+        this.isNoticeChoose = false
+        this.noticeData = {
+          time: [],
+          name: null,
+          mobile: null,
+          id: null,
+          remark: null,
+        }
+        this.noticeDialog = true
+        this.noticeData.id = row.id
+        try {
+          this.noticeLoading = true
+          const res = await getUserProfile()
+          this.noticeData.name = res.data.nickname
+          this.noticeData.mobile = res.data.mobile
+        } finally {
+          this.noticeLoading = false
+        }
+      }).catch(() => {
+        this.isNoticeChoose = true
+        this.noticeDialog = true
+        this.noticeData.name = row.userName
+        this.noticeData.mobile = row.userMobile
+      })
+
     },
     async doNotice(){
       try {