diff --git a/src/api/pick/exception.js b/src/api/pick/exception.js
index bc9da3a115a212b4103badc53ac5866e34dbb0b4..cee989ec97618cb70d312a02352b3b30c625c858 100644
--- a/src/api/pick/exception.js
+++ b/src/api/pick/exception.js
@@ -26,7 +26,7 @@ export function getExceptionRegisterList(data) {
     data: data
   })
 }
-// 异常查询
+// 异常查询-导出
 export function exportExcpList(data) {
   return fetch({
     url: '/OpManagement/exportExcpList',
@@ -34,3 +34,21 @@ export function exportExcpList(data) {
     data: data
   })
 }
+
+// 异常查询 页- 删除
+export function deleteException(data) {
+  return fetch({
+    url: '/OpManagement/deleteException',
+    method: 'post',
+    data: data
+  })
+}
+
+// 异常查询页 -新增
+export function saveException(data) {
+  return fetch({
+    url: '/OpManagement/saveException',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index c618f7d86de4f068b3373a3ace814ca09b6eb0df..1fb0b337c3c1e0260448b7ed275e91ee0fe5f800 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -27,3 +27,10 @@
     }
   }
 }
+ ///*web_form*/
+ .web_form_two{
+   display: flex;
+   justify-content: left;
+   align-items: flex-start;
+   flex-wrap: wrap;
+ }
diff --git a/src/views/pick/components/exceptionEdit.vue b/src/views/pick/components/exceptionEdit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..e2108594623be214c0969c5178f8274ef5be741f
--- /dev/null
+++ b/src/views/pick/components/exceptionEdit.vue
@@ -0,0 +1,154 @@
+<template>
+  <div style="margin-bottom: 20px;">
+    <el-dialog :title="edit_main_title" append-to-body v-dialogDrag :visible.sync="edit_flag"
+               width="800px"  @open="handleOpenConfig" :before-close="handleClose">
+      <!-- 表单 -->
+      <el-form label-width="120px" ref="objEditFrom" class="web_form_two"
+               :rules="objEditRules" :model="objEditData" :disabled="editMakeDisabled">
+        <el-form-item label="系统运单号" prop="orderRleaseGid">
+          <el-input type="textarea" :rows="2" style="width: 250px" clearable v-model="objEditData.orderRleaseGid" class="w184"></el-input>
+        </el-form-item>
+        <el-form-item label="是否异常可发运" prop="isCanSend">
+          <el-select class="w184" v-model="objEditData.isCanSend" clearable filterable remote reserve-keyword placeholder="请选择状态">
+            <el-option key="1" label="不可发运" value="N"></el-option>
+            <el-option key="2" label="可发运" value="Y"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="处理时间" prop="estimatedProcessingTime">
+          <el-date-picker
+            class="w184"
+            v-model="objEditData.estimatedProcessingTime"
+            type="datetime" clearable
+            :picker-options="pickerOptions"
+            value-format='yyyy-MM-dd HH:mm:ss'
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="异常原因" prop="exceptionReason">
+          <el-input type="textarea" :rows="2" style="width: 250px" clearable v-model="objEditData.exceptionReason" class="w184"></el-input>
+        </el-form-item>
+      </el-form>
+      <!--按钮-->
+      <el-row type="flex" justify="end">
+        <!--<el-button type="primary" @click="handleClose">关闭</el-button>-->
+        <el-button class="mr30" v-if="edit_main_title !== '查看'" type="primary" @click="confirmClick">提交</el-button>
+      </el-row>
+      <div style="height:20px"></div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import * as ExceptionAPI from '@/api/pick/exception'
+  // import * as Utils from '@/utils/index'
+  export default {
+    name: '',
+    props: ['edit_flag', 'edit_main_title', 'edit_select_row', 'edit_params'],
+    components: {},
+    data() {
+      return {
+        objEditData: {
+          orderRleaseGid: '', // 系统运单号（大文本框）
+          exceptionReason: '', // 异常原因
+          isCanSend: '', // 是否异常可以发运（N为不可发，Y为可发）
+          houseId: '', // 获取当前仓库houseId
+          estimatedProcessingTime: '' // 预计处理完成时间（时间做判断。不能早于当前时间，不能晚于当前时间30天）
+        },
+        objEditRules: {
+          orderRleaseGid: [{ required: true, message: '请选择', trigger: 'change' }],
+          exceptionReason: [{ required: true, message: '请选择', trigger: 'change' }],
+          isCanSend: [{ required: true, message: '请选择', trigger: 'change' }],
+          estimatedProcessingTime: [{ required: true, message: '请选择', trigger: 'change' }]
+        },
+        makeInputDisabled: false, // -input 禁用
+        editMakeDisabled: false, // 面板禁用
+        pickerOptions: {
+          disabledDate: (time) => {
+            return time.getTime() < (Date.now() - 8.64e7) || time.getTime() > (Date.now() + 3600 * 1000 * 24 * 30)
+          }
+        }
+      }
+    },
+    methods: {
+      // 弹窗页打开初始
+      handleOpenConfig(data) {
+        const that = this
+        console.log(that.$props.edit_main_title, 'that.$props', that.$props.edit_select_row, that.$props.edit_params)
+        // const { code, masslossStatus, creator, treatmentTime } = that.$props.edit_select_row // attachmentId
+        // const myDate = Utils.parseTime(Date.now(), '{y}-{m}-{d} {h}:{i}:{s}')
+        // 重置
+        that.editMakeDisabled = false
+        that.makeInputDisabled = false
+        that.objEditData = {
+          orderRleaseGid: '', // 系统运单号（大文本框）
+          exceptionReason: '', // 异常原因
+          isCanSend: '', // 是否异常可以发运（N为不可发，Y为可发）
+          houseId: '', // 获取当前仓库houseId
+          estimatedProcessingTime: ''
+        }
+        // 查看 新增 编辑
+        if (that.$props.edit_main_title === '新增') {
+          // that.getSelectListFunc()
+        } else if (that.$props.edit_main_title === '编辑') {
+          that.objEditData = { }
+          // that.getSelectListFunc()
+          that.editMakeDisabled = false
+          that.makeInputDisabled = true
+        } else if (that.$props.edit_main_title === '查看') {
+          that.objEditData = { }
+          that.editMakeDisabled = true
+        }
+      },
+      // 条件列表查询
+      getMasslossCodeListFunc(val) {
+        // ExceptionAPI.getMasslossCode({ code: val }).then(res => {
+        //   this.masslossCodeList = res.data
+        // }).catch(err => {
+        //   console.log('error', err)
+        // })
+      },
+      // 选择 设置名称导出 $event,scope.row,'modelNo'
+      selectCorp($event, value) {
+        console.log('selectCorp(value)', $event, value)
+        // const that = this
+        // if (value === 'driverName') {
+        //   that.fleetList.map(item => {
+        //     if ($event === item.name) {
+        //       that.objEditData.driverPhone = item.mobile
+        //       that.objEditData.transportationId = item.plate
+        //     }
+        //   })
+        // }
+      },
+      // 提交
+      confirmClick() {
+        const that = this
+        that.$refs['objEditFrom'].validate((valid) => {
+          if (valid) {
+            // const { masslossCode, masslossStatus, creator, treatmentTime } = that.objEditData
+            // const toParams = { masslossCode, masslossStatus, creator, treatmentTime: Date.parse(treatmentTime) }
+            that.objEditData.houseId = that.$store.getters.currentStorehouse.id
+            if (that.$props.edit_main_title === '新增') {
+              ExceptionAPI.saveException(that.objEditData).then(res => {
+                that.$message({
+                  message: '新增成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                that.$emit('edit-confirm', false)
+              }).catch(err => {
+                console.log('error', err)
+              })
+            }
+          }
+        })
+      },
+      handleClose() {
+        this.$emit('edit-close', false)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/pick/components/exceptionHandlingDemo.vue b/src/views/pick/components/exceptionHandlingDemo.vue
index c505253679ce75cce8f8d92dd81ec767c8c913da..a7e9b0776bbfc4e691ac100b6e02f7e229b80483 100644
--- a/src/views/pick/components/exceptionHandlingDemo.vue
+++ b/src/views/pick/components/exceptionHandlingDemo.vue
@@ -5,7 +5,10 @@
       <el-row type="flex" justify="space-between" style="padding: 10px 0">
         <el-col>
           <el-input style="width: 180px" v-model="page.condition.vin" @keyup.enter.native="search" placeholder="车架号"></el-input>
-          <el-button type="primary" @click="search">查询</el-button>
+          <el-button type="primary" style="margin-left: 10px;" @click="search">查询</el-button>
+          <el-button class="filter-item" size="small" style="margin-left: 10px;" type="primary"
+                      @click="statusChangeBtn('delete')">删除
+          </el-button>
         </el-col>
         <el-col style="text-align: right">
           <el-button type="primary" @click="handleShipping('10')">返厂维修</el-button>
@@ -40,7 +43,8 @@
         <el-table-column prop="registerUser" label="登记人"></el-table-column>
         <el-table-column prop="userModified" label="处理人"></el-table-column>
         <el-table-column prop="registerTime" label="登记时间" width="140"></el-table-column>
-        <el-table-column prop="dealResultDesc" label="处理结果"></el-table-column>
+        <el-table-column prop="dealResultDesc" label="处理结果"  width="140" ></el-table-column>
+        <el-table-column prop="remarks" label="异常备注" width="250"></el-table-column>
       </el-table>
       <!--<el-row type="flex" justify="end">-->
         <!--<el-button type="primary" @click="handleClose">取消</el-button>-->
@@ -59,7 +63,7 @@
 </template>
 
 <script type="text/javascript">
-  import * as ExceptionApi from '@/api/pick/exception'
+  import * as ExceptionAPI from '@/api/pick/exception'
   export default {
     name: '',
     components: {
@@ -105,6 +109,46 @@
           this.search()
         }
       },
+      // 状态 修改
+      statusChangeBtn(val) {
+        const that = this
+        if (that.checkSelect(that.selectRow)) {
+          let apiName = ''
+          let msgVal = ''
+          if (val === 'delete') {
+            apiName = 'deleteException'
+            msgVal = '删除'
+          }
+          console.log('this.selectRow', that.selectRow)
+          const ids = []
+          that.selectRow.map(item => {
+            ids.push(item.id)
+          })
+          that.$prompt('请输入删除的原因', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            inputPlaceholder: '请输入删除原因',
+            inputPattern: /\s*\S+?/,
+            inputErrorMessage: '请输入删除原因'
+          }).then(({ value }) => {
+            ExceptionAPI[apiName]({ ids: ids.length > 1 ? ids.join(',') : ids[0], remark: value }).then(res => {
+              that.$message({
+                message: msgVal + '成功',
+                type: 'success',
+                duration: 2000
+              })
+              that.search()
+            }).catch(err => {
+              console.log('error', err)
+            })
+          }).catch(() => {
+            that.$message({
+              type: 'info',
+              message: '取消输入'
+            })
+          })
+        }
+      },
       // 发运处理
       handleShipping(str) {
         if (this.checkSelect(this.selectRow)) {
@@ -122,7 +166,7 @@
             pictureId: pictureIds.length > 1 ? pictureIds.join(',') : pictureIds[0],
             houseId: this.$store.getters.currentStorehouse.id
           }
-          ExceptionApi.exceptionHandling(toParams).then(res => {
+          ExceptionAPI.exceptionHandling(toParams).then(res => {
             this.$message({
               message: '处理方式修改成功',
               type: 'success',
@@ -152,7 +196,7 @@
       // 获取table列表
       getList() {
         const that = this
-        ExceptionApi.getExceptionDetail(that.page).then(res => {
+        ExceptionAPI.getExceptionDetail(that.page).then(res => {
           const t = res.data
           that.table_data = t.records
           that.page.current = t.current
diff --git a/src/views/pick/exception.vue b/src/views/pick/exception.vue
index e80f8d31acc75f072e6d3c8d5ef3573efb7b24d7..82e9fa56b08897b8798e441757240105afd3a4d8 100644
--- a/src/views/pick/exception.vue
+++ b/src/views/pick/exception.vue
@@ -10,6 +10,9 @@
           <el-button class="filter-item" size="small" style="margin-left: 10px;" type="primary" v-waves
                      :loading="downloadLoading" icon="el-icon-edit" @click="exceptionHandling">异常处理
           </el-button>
+          <el-button class="filter-item" size="small" style="margin-left: 10px;" type="primary" v-waves
+                     icon="el-icon-edit" @click="editBtn('新增',selectOneRow)">新增
+          </el-button>
         </el-col>
         <el-col :span="16" style="text-align: right">
           <el-input size="small" style="width: 200px" class="filter-item fsc-search" placeholder="车架号-回车查询" v-model="listQuery.condition.vin" @keyup.enter.native="searchClick"></el-input>
@@ -49,7 +52,7 @@
       </el-row>
       <div style="clean:both"></div>
     </div>
-     <!--更多-->
+    <!--更多-->
     <div  v-show="searchFlag"  style="height: auto;margin-top: 10px;">
       <el-form ref="form" :model="listQuery.condition" label-width="80px" :inline="true">
         <el-form-item label=订单号:>
@@ -62,6 +65,7 @@
         <el-form-item label=异常分类:>
           <el-select v-model="listQuery.condition.taskNode" placeholder="请选择异常分类">
             <el-option label="指令" value="0"></el-option>
+            <el-option label="运单" value="1"></el-option>
             <el-option label="寻车" value="10"></el-option>
             <el-option label="移车" value="20"></el-option>
             <el-option label="提车" value="30"></el-option>
@@ -96,6 +100,7 @@
       </el-form>
     </div>
     <div style="clean:both"></div>
+    <!--图表-->
     <el-table ref="expectionTable" :data="exceptionList"
               @selection-change="handleSelectionChange"
               v-loading="listLoading" element-loading-text="加载中" border fit highlight-current-row style="width: 100%;margin-top:5px">
@@ -118,10 +123,12 @@
         </template>
       </el-table-column>
     </el-table>
+    <!--loading-->
     <div v-show="!listLoading" class="pagination-container">
       <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current" :page-sizes="[10,20,30,50]" :page-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="listQuery.total">
       </el-pagination>
     </div>
+    <!--图片查看-->
     <el-dialog title="异常图片" width="400px"
                ref="pictrueRef"
                :visible.sync="dialogVisible"
@@ -146,12 +153,23 @@
       ref="exceptionHandlingRef"
       @edit-close="exceptionHandlingHandleClose">
     </exception-handling-demo>
+    <!--新增/编辑/查看  面板-->
+    <exception-edit
+      :edit_flag="editFlag"
+      :edit_params="editParams"
+      :edit_main_title="editMainTitle"
+      :edit_select_row="editRowData"
+      ref="exceptionRef"
+      @edit-confirm="editConfirm"
+      @edit-close="editClose">
+    </exception-edit>
   </div>
 </template>
 <script>
-  import * as exceptionAPI from '@/api/pick/exception'
+  import * as ExceptionAPI from '@/api/pick/exception'
   import ExceptionHandlingDemo from './components/exceptionHandlingDemo'
   import * as Utils from '@/utils/util'
+  import ExceptionEdit from './components/exceptionEdit'
   import waves from '@/directive/waves' // 水波纹指令
   const defautlTableThead = [
     { key: 'omsOrderNo', title: '订单号', width: 200 },
@@ -171,12 +189,8 @@
   ]
   export default {
     name: 'exception',
-    directives: {
-      waves
-    },
-    components: {
-      ExceptionHandlingDemo
-    },
+    directives: { waves },
+    components: { ExceptionHandlingDemo, ExceptionEdit },
     data() {
       return {
         theadCheckVal: [
@@ -239,11 +253,16 @@
         exceptionHandlingFlag: false, // 异常处理组件 显示隐藏
         exceptionHandlingTitle: null, // 异常处理组件 标题
         exceptionHandlingSelectRow: null,
-        exceptionHandlingParams: null // 向 异常处理组件 传输参数
+        exceptionHandlingParams: null, // 向 异常处理组件 传输参数
+        selectOneRow: {},
+        editFlag: false, // 编辑面板 显示
+        editParams: {},
+        editRowData: {}, // 传入 编辑面板 的当前列
+        editMainTitle: '' // 编辑面板 标题
       }
     },
     created() {
-      this.list()
+      this.getList()
     },
     watch: {
       theadCheckVal(valArr) {
@@ -257,8 +276,25 @@
       }
     },
     methods: {
-      list() {
-        // 列表查询
+      // 新增  编辑  查看
+      editBtn(editTitle, row) {
+        const that = this
+        that.editRowData = row
+        that.editMainTitle = editTitle
+        that.editParams = {}
+        that.editFlag = true
+      },
+      // 编辑面板 确认
+      editConfirm() {
+        this.getList()
+        this.editFlag = false
+      },
+      // 编辑面板 弹窗关闭
+      editClose() {
+        this.editFlag = false
+      },
+      // 列表查询
+      getList() {
         this.listLoading = true
         // 处理是否展开更多
         let queryParam = {}
@@ -273,7 +309,7 @@
           }
         }
         // queryParam.condition.houseId = this.$store.getters.currentStorehouse.id
-        exceptionAPI.getExceptionRegisterList(queryParam).then(result => {
+        ExceptionAPI.getExceptionRegisterList(queryParam).then(result => {
           if (result.code === 0) {
             this.$data.exceptionList = result.data.records
             this.$data.imgList = result.data.records.picUrlInfoList
@@ -353,7 +389,7 @@
         queryParam = this.$data.listQuery.condition
         queryParam.houseId = this.$store.getters.currentStorehouse.id
         this.downloadLoading = true
-        exceptionAPI.exportExcpList(queryParam).then(result => {
+        ExceptionAPI.exportExcpList(queryParam).then(result => {
           this.downloadLoading = false
           if (result.code === 0) {
             this.downloadData = result.data
@@ -384,24 +420,45 @@
       handleSelectionChange(val) {
         this.selectRow = val
       },
+      // 分页size变化
       handleSizeChange(val) {
-        // 分页size变化
         this.$data.listQuery.size = val
-        this.list()
+        this.getList()
       },
+      // 分页当前页变化
       handleCurrentChange(val) {
-        // 分页当前页变化
         this.$data.listQuery.current = val
-        this.list()
+        this.getList()
+      },
+      // 检查是否选择单条
+      checkOneSelect(data) {
+        const l = data.length
+        if (l === 0) {
+          this.$message({
+            message: '未选择',
+            type: 'warning',
+            duration: 2000
+          })
+          return false
+        }
+        if (l > 1) {
+          this.$message({
+            message: '请只选择一条数据',
+            type: 'warning',
+            duration: 2000
+          })
+          return false
+        }
+        return true
       },
+      // 更多click
       moreClick() {
-        // 更多click
         this.$data.searchFlag = !this.$data.searchFlag
       },
       // 搜索
       searchClick() {
         if (this.checkTimeOver(this.$data.listQuery.condition.startDate, this.$data.listQuery.condition.endDate)) {
-          this.list()
+          this.getList()
         }
       },
       // 检查是否超过3个月
@@ -443,7 +500,7 @@
           startDate: Utils.parseTime((new Date()).getTime(), '{y}-{m}-{d} 00:00:00'),
           endDate: Utils.parseTime((new Date()).getTime(), '{y}-{m}-{d} {h}:{i}:{s}')
         }
-        this.list()
+        this.getList()
       },
       // 图片查看弹窗打开
       checkPic(value) {