需求117 后台-集运-异常包裹

src/api/ecw/consException.js

@@ -27,10 +27,11 @@ export function deleteConsException(id) {
 }
 
 // 获得集运异常
-export function getConsException(id) {
+export function getConsException(query) {
   return request({
-    url: '/ecw/cons-exception/get?id=' + id,
-    method: 'get'
+    url: '/ecw/cons-exception/get',
+    method: 'get',
+    params: query
   })
 }
 

src/utils/dict.js

@@ -289,6 +289,8 @@ export const DICT_TYPE = {
   CONS_INSPECT_STATUS: "cons_inspect_status", //验货状态
   CONS_SPECIAL_NEEDS_STATUS: "cons_special_needs_status",//特需状态
   ECW_CONS_FOLLOWUP_STATUS: "ecw_cons_followup_status",//跟进状态
+  CONS_EXCEPTION_TYPE: "cons_exception_type",//集运异常状态
+  CONS_EXCEPTION_STATUS: "cons_exception_status",//异常处理状态
 };
 
 /**

src/views/ecw/cons/components/Transmutation.vue

@@ -26,29 +26,23 @@
 <script>
 import imageUpload from "@/components/ImageUpload/index.vue"
 import { createConsException } from "@/api/ecw/consException"
+import { getSpecialListByConsId } from "@/api/ecw/consSpecialNeed"
 
 export default {
   name: "transmutation",
   components: { imageUpload },
   props: {
-    id: [Number],
-    showException: {
-      type: Boolean,
-      default: false
-    },
-    params: {
-      type: Object,
-      default: function() {
-        return {
-          exceptionType: null,
-          exceptionUrls: [],
-          exceptionRemark: null
-        }
-      }
-    }
+    id: Number,
+    showException: Boolean
   },
   data() {
-    return {}
+    return {
+      params: {
+        exceptionType: null,
+        exceptionUrls: [],
+        exceptionRemark: null
+      }
+    }
   },
   methods: {
     submitForm() {
@@ -63,13 +57,26 @@ export default {
             exceptionStatus: 0
           }
           createConsException(param).then(response => {
-            this.showException = false
+            this.$emit("update:showException", false)
             this.$emit("determine")
             this.$modal.msgSuccess("新增成功")
           })
         }
       })
     }
+  },
+  watch: {
+    showException(val) {
+      if (val) {
+
+      } else {
+        this.params = {
+          exceptionType: null,
+          exceptionUrls: [],
+          exceptionRemark: null
+        }
+      }
+    }
   }
 }
 </script>

src/views/ecw/cons/index.vue

@@ -198,6 +198,8 @@
           <el-button size="mini" type="text" icon="el-icon-edit" @click="specialNeedsConsLook(scope.row)">{{$t('特需查看')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="feeApplication(scope.row)">{{$t('费用申请')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="consFollowup(scope.row)">{{$t('跟进')}}</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="exceptionHandling(scope.row)">{{$t('处理异常')}}</el-button>
+
         </template>
       </el-table-column>
     </el-table>
@@ -663,6 +665,12 @@ export default {
     consFollowup(row) {
       this.id = row.id
       this.showConsFollowupEdit = true
+    },
+    //异常
+    exceptionHandling(row) {
+      this.$router.push({
+        path: "./consException?id=" + row.id
+      })
     }
   }
 };

src/views/ecw/consException/components/ExceptionHandling.vue

+<template>
+  <el-dialog :title="$t('异常')" :before-close="()=>{$emit('update:showException',false)}" center
+             :visible.sync="showException" fullscreen>
+    <el-form ref="form" :model="form" label-width="200">
+      <el-form-item :label="$t('包裹号')">
+        {{ form.consNum }}
+      </el-form-item>
+      <el-form-item :label="$t('运输路线')">
+        【
+        <dict-tag :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" :value="form.transportId" />
+        】
+        从【{{ form.startTitleZh }}】发往【{{ form.destTitleZh }}】
+      </el-form-item>
+      <el-form-item :label="$t('异常类型')">
+        <dict-tag :type="DICT_TYPE.CONS_EXCEPTION_TYPE" :value="form.exceptionType" />
+      </el-form-item>
+      <el-form-item :label="$t('异常描述')">
+        {{ form.exceptionRemark }}
+      </el-form-item>
+      <el-form-item :label="$t('创建时间')">
+        {{ form.createTime }}
+      </el-form-item>
+      <!--      <el-row>-->
+      <!--        <el-col :span="8">-->
+      <!--          <el-form-item :label="$t('跟进状态')">-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--        <el-col :span="8">-->
+      <!--          <el-form-item :label="$t('跟进人')">-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--        <el-col :span="8">-->
+      <!--          <el-form-item :label="$t('跟进时间')">-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-form-item :label="$t('跟进备注')">-->
+      <!--      </el-form-item>-->
+      <el-form-item :label="$t('处理时间')">
+        {{form.handlerTime}}
+      </el-form-item>
+      <el-form-item :label="$t('处理结果')" prop="handlerResult" :rules="[{ required: true}]">
+        <el-select
+          v-model="form.handlerResult"
+          :placeholder="$t('请选择')"
+          @change="handlerResultChange"
+          :disabled="look"
+          style="width: 240px"
+          clearable
+        >
+          <template
+            v-for="dict in getDictDatas(
+                  form.exceptionType + '_result'
+                )"
+          >
+            <el-option
+              :disabled="dict.value == 'pending'"
+              :key="dict.value"
+              :label="$l(dict, 'label')"
+              :value="dict.value"
+            />
+          </template>
+        </el-select>
+      </el-form-item>
+      <el-row v-if="form.handlerResult==='goods_exists'">
+        <el-col :span="8">
+          <el-form-item :label="$t('新增品名中文')">
+            {{ form.goodTitleZh }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="!look">
+          <el-form-item
+            label="中文品名"
+            :rules="{
+                required: true,
+                message: $t('请选择产品'),
+                trigger: 'blur',
+              }"
+          >
+            <product-selector
+              :status="0"
+              v-model="form.productId2"
+              @change="onProductChange($event)"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="form.handlerResult==='goods_exists'">
+        <el-col :span="8">
+          <el-form-item :label="$t('新增品名英文')">
+            {{ form.goodTitleEn }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="!look">
+          <el-form-item
+            label="英文品名"
+            :rules="{
+                required: true,
+                message: $t('请选择产品'),
+                trigger: 'blur',
+              }"
+          >
+            <product-selector
+              lang="En"
+              :status="0"
+              v-model="form.productId1"
+              @change="onProductChange($event)"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm" v-if="!look">{{ $t("确 定") }}</el-button>
+      <el-button @click="$emit('update:showException',false)">{{ $t("取 消") }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import imageUpload from "@/components/ImageUpload/index.vue"
+import {
+  getConsException,
+  updateConsException
+} from "@/api/ecw/consException"
+import ProductSelector from "@/components/ProductSelector/index.vue"
+
+export default {
+  name: "exceptionHandling",
+  components: { ProductSelector, imageUpload },
+  props: {
+    id: Number,
+    showException: Boolean,
+    look: Boolean
+  },
+  data() {
+    return {
+      form: {},
+      productId1: null,
+      productId2: null
+    }
+  },
+  methods: {
+    submitForm() {
+      this.$refs.form.validate(validate => {
+        if (validate) {
+          console.log(this.form.handlerResult)
+          if (this.form.handlerResult === "goods_absent") {
+            this.$redirect(
+              "/product/product-list?prodId=" + this.form.productId1
+            )
+          }
+          if (this.form.handlerResult === "goods_exists") {
+            this.form.exceptionStatus = 2
+            this.form.productId = this.productId1
+            this.form.mediaBusinessType = 1
+            updateConsException(this.form).then(response => {
+              this.$emit("update:showException", false)
+              this.$emit("determine")
+              this.$modal.msgSuccess("修改成功")
+            })
+          }
+        }
+      })
+    },
+    handlerResultChange(rows) {
+      this.form.productId1 = null
+      this.form.productId2 = null
+      this.form.handlerResult = rows
+    },
+    onProductChange(product) {
+      if (!product) {
+        this.form.productId1 = null
+        this.form.productId2 = null
+        return false
+      }
+      this.form.productId1 = product.id
+      this.form.productId2 = product.id
+      console.log(product)
+    }
+  },
+  watch: {
+    showException(val) {
+      if (val) {
+        getConsException({id:this.id}).then(response => {
+          this.form = response.data
+        })
+      } else {
+        this.form = {}
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ecw/consException/components/ExceptionOtherHandling.vue

+<template>
+  <el-dialog :title="$t('异常')" :before-close="()=>{$emit('update:showExceptionOther',false)}" center
+             :visible.sync="showExceptionOther" fullscreen>
+    <el-form ref="form" :model="form" label-width="200">
+      <el-descriptions :column="4" border class="card" :labelStyle="{ width: '110px' }"
+                       :contentStyle="{ width: '110px' }"
+                       style="margin-top: 10px">
+        <el-descriptions-item :label="$t('快递单号') + ':'">
+          {{ form.expressNo }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('发货人') + ':'">
+          {{ form.customerNumber }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('签收时间') + ':'">
+          {{ form.signedTime }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('在仓时间') + ':'">
+          ggggg
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('商品信息') + ':'">
+          {{ form.goodListName }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('运输方式') + ':'">
+          <dict-tag :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" :value="form.transportId" />
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('始发地') + ':'">
+          {{ form.startTitleZh }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('目的地') + ':'">
+          {{ form.destTitleZh }}
+        </el-descriptions-item>
+      </el-descriptions>
+
+      <h2>{{ $t("异常信息") }}</h2>
+
+      <el-form-item :label="$t('异常类型')">
+        <dict-tag :type="DICT_TYPE.CONS_EXCEPTION_TYPE" :value="form.exceptionType" />
+      </el-form-item>
+      <el-form-item :label="$t('异常描述')">
+        {{ form.exceptionRemark }}
+      </el-form-item>
+      <el-form-item :label="$t('附件')">
+        <image-upload v-model="form.exceptionUrls" :isShowEditButton="!look"></image-upload>
+      </el-form-item>
+      <!--      <el-row>-->
+      <!--        <el-col :span="8">-->
+      <!--          <el-form-item :label="$t('跟进状态')">-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--        <el-col :span="8">-->
+      <!--          <el-form-item :label="$t('跟进人')">-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--        <el-col :span="8">-->
+      <!--          <el-form-item :label="$t('跟进时间')">-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-form-item :label="$t('跟进备注')">-->
+      <!--      </el-form-item>-->
+      <el-form-item :label="$t('处理时间')">
+        {{ form.handlerTime }}
+      </el-form-item>
+      <el-form-item :label="$t('处理结果')">
+        <dict-tag :type="DICT_TYPE.CONS_EXCEPTION_STATUS" :value="form.exceptionStatus" />
+      </el-form-item>
+      <el-form-item :label="$t('备注')">
+        <el-input v-model="form.handlerRemark" :rows="3" type="textarea" style="width: 500px" v-if="!look"></el-input>
+        <template v-else>{{form.handlerRemark}}</template>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm" v-if="!look">{{ $t("确 定") }}</el-button>
+      <el-button @click="$emit('update:showExceptionOther',false)">{{ $t("取 消") }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import imageUpload from "@/components/ImageUpload/index.vue"
+import {
+  getConsException,
+  updateConsException
+} from "@/api/ecw/consException"
+import ProductSelector from "@/components/ProductSelector/index.vue"
+import Template from "@/views/cms/template/index.vue"
+
+export default {
+  name: "exceptionOtherHandling",
+  components: { Template, ProductSelector, imageUpload },
+  props: {
+    id: Number,
+    showExceptionOther: Boolean,
+    look: Boolean
+  },
+  data() {
+    return {
+      form: {}
+    }
+  },
+  methods: {
+    submitForm() {
+      this.$refs.form.validate(validate => {
+        if (validate) {
+          console.log(this.form.handlerResult)
+          this.form.exceptionStatus = 2
+          this.form.mediaBusinessType = 1
+          updateConsException(this.form).then(response => {
+            this.$emit("update:showExceptionOther", false)
+            this.$emit("determine")
+            this.$modal.msgSuccess("修改成功")
+          })
+        }
+      })
+    }
+  },
+  watch: {
+    showExceptionOther(val) {
+      if (val) {
+        getConsException({id:this.id}).then(response => {
+          this.form = response.data
+        })
+      } else {
+        this.form = {}
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ecw/consException/index.vue

+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="包裹id" prop="consId">
+        <el-input v-model="queryParams.consId" placeholder="请输入包裹id" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="包裹明细id" prop="consItemId">
+        <el-input v-model="queryParams.consItemId" placeholder="请输入包裹明细id" clearable
+                  @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="异常类型" prop="exceptionType">
+        <el-select v-model="queryParams.exceptionType" placeholder="请选择异常类型" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CONS_EXCEPTION_TYPE)"
+                     :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="异常状态" prop="exceptionStatus">
+        <el-select v-model="queryParams.exceptionStatus" placeholder="请选择异常状态" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CONS_EXCEPTION_STATUS)"
+                     :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="" prop="bpmId">
+        <el-input v-model="queryParams.bpmId" placeholder="请输入" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="">
+        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['ecw:cons-exception:create']">新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+                   :loading="exportLoading"
+                   v-hasPermi="['ecw:cons-exception:export']">导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="包裹id" align="center" prop="consId" />
+      <el-table-column label="包裹明细id" align="center" prop="consItemId" />
+      <el-table-column label="异常类型" align="center" prop="exceptionType">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.CONS_EXCEPTION_TYPE" :value="scope.row.exceptionType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="异常说明" align="center" prop="exceptionRemark" />
+      <el-table-column label="异常状态" align="center" prop="exceptionStatus">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.CONS_EXCEPTION_STATUS" :value="scope.row.exceptionStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="" align="center" prop="bpmId" />
+      <el-table-column label="" align="center" prop="bpmStatus" />
+      <el-table-column label="" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">处理</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList" />
+
+    <ExceptionHandling :showException.sync="showException" :id="id" @determine="getList"></ExceptionHandling>
+
+  </div>
+</template>
+
+<script>
+import {
+  createConsException,
+  updateConsException,
+  deleteConsException,
+  getConsExceptionPage,
+  exportConsExceptionExcel
+} from "@/api/ecw/consException"
+import ExceptionHandling from "@/views/ecw/consException/components/ExceptionHandling.vue"
+
+export default {
+  name: "ConsException",
+  components: {
+    ExceptionHandling
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 集运异常列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        consId: null,
+        consItemId: null,
+        exceptionType: null,
+        exceptionRemark: null,
+        exceptionStatus: null,
+        bpmId: null,
+        bpmStatus: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        consId: [{ required: true, message: "包裹id不能为空", trigger: "blur" }],
+        exceptionType: [{
+          required: true,
+          message: "异常类型，来自于字典表cons_exception_type不能为空",
+          trigger: "change"
+        }]
+      },
+      showException: true,
+      id: null
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true
+      // 处理查询参数
+      let params = { ...this.queryParams }
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime")
+      // 执行查询
+      getConsExceptionPage(params).then(response => {
+        this.list = response.data.list
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        consId: undefined,
+        consItemId: undefined,
+        exceptionType: undefined,
+        exceptionRemark: undefined,
+        exceptionStatus: undefined,
+        bpmId: undefined,
+        bpmStatus: undefined
+      }
+      this.resetForm("form")
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreateTime = []
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = "添加集运异常"
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateConsException(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功")
+            this.open = false
+            this.getList()
+          })
+          return
+        }
+        // 添加的提交
+        createConsException(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功")
+          this.open = false
+          this.getList()
+        })
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id
+      this.$modal.confirm("是否确认删除集运异常编号为\"" + id + "\"的数据项?").then(function() {
+        return deleteConsException(id)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams }
+      params.pageNo = undefined
+      params.pageSize = undefined
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime")
+      // 执行导出
+      this.$modal.confirm("是否确认导出所有集运异常数据项?").then(() => {
+        this.exportLoading = true
+        return exportConsExceptionExcel(params)
+      }).then(response => {
+        this.$download.excel(response, "${table.classComment}.xls")
+        this.exportLoading = false
+      }).catch(() => {
+      })
+    }
+  }
+}
+</script>

src/views/ecw/consException/list.vue

+<template>
+  <div class="app-container">
+    <el-descriptions :column="4" border class="card" :labelStyle="{ width: '110px' }" :contentStyle="{ width: '110px' }"
+                     style="margin-top: 10px">
+      <el-descriptions-item :label="$t('快递单号') + ':'">
+        {{ form.expressNo }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('发货人') + ':'">
+        {{ form.customerNumber }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('签收时间') + ':'">
+        {{ form.signedTime }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('在仓时间') + ':'">
+        ggggg
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('商品信息') + ':'">
+        {{ form.goodListName }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('运输方式') + ':'">
+        <dict-tag :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" :value="form.transportId" />
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('始发地') + ':'">
+        {{ form.startTitleZh }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('目的地') + ':'">
+        {{ form.destTitleZh }}
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <h2>{{ $t("异常信息") }}</h2>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="异常类型" align="center" prop="exceptionType">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.CONS_EXCEPTION_TYPE" :value="scope.row.exceptionType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="异常说明" align="center" prop="exceptionRemark" />
+      <el-table-column label="异常状态" align="center" prop="exceptionStatus">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.CONS_EXCEPTION_STATUS" :value="scope.row.exceptionStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row,false)"
+                     v-if="scope.row.exceptionStatus ===0">处理
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit"
+                     @click="handleUpdate(scope.row,true)" v-if="scope.row.exceptionStatus ===2">查看
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList" />
+
+    <ExceptionOtherHandling :showExceptionOther.sync="showExceptionOther" :id="id" :look="look"
+                            @determine="getList"></ExceptionOtherHandling>
+    <ExceptionHandling :showException.sync="showException" :id="id" :look="look"
+                       @determine="getList"></ExceptionHandling>
+
+  </div>
+</template>
+
+<script>
+import {
+  getConsException,
+  getConsExceptionPage
+} from "@/api/ecw/consException"
+import ExceptionHandling from "@/views/ecw/consException/components/ExceptionHandling.vue"
+import ExceptionOtherHandling from "@/views/ecw/consException/components/ExceptionOtherHandling.vue"
+
+export default {
+  name: "ConsException",
+  components: {
+    ExceptionOtherHandling,
+    ExceptionHandling
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        consId: null,
+        consItemId: null,
+        exceptionType: null,
+        exceptionRemark: null,
+        exceptionStatus: null,
+        bpmId: null,
+        bpmStatus: null
+      },
+      list: [],
+      showExceptionOther: false,
+      showException: false,
+      form: {},
+      total: 0,
+      id: null,
+      look: false
+    }
+  },
+  created() {
+    this.getList()
+    console.log(this.$route.query.id)
+    getConsException({consId:this.$route.query.id}).then(response => {
+      this.form = response.data
+    })
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true
+      // 处理查询参数
+      let params = { ...this.queryParams }
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime")
+      params.consId = this.$route.query.id
+      // 执行查询
+      getConsExceptionPage(params).then(response => {
+        this.list = response.data.list
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row, look) {
+      this.id = row.id
+      this.look = look
+      if (row.exceptionType === "order_other_exception") {
+        this.showExceptionOther = true
+      } else if (row.exceptionType === "goods_add_exception") {
+        this.showException = true
+      }
+    }
+  }
+}
+</script>

src/views/ecw/consFollowup/index.vue

@@ -179,6 +179,7 @@ export default {
       this.loading = true
       // 处理查询参数
       let params = { ...this.queryParams }
+      params.consNum = params.consNum?.trim()
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime")
       this.addBeginAndEndTime(params, this.dateRangeFollowTime, "followTime")
       this.addBeginAndEndTime(params, this.dateRangeNextFollowTime, "nextFollowTime")