添加异常订单查看详情

src/api/ecw/orderException.js

@@ -113,3 +113,11 @@ export function exportExcel(params) {
     responseType: 'arraybuffer'
   })
 }
+// 根据订ID获取订单异常结果
+export function getOrderExcptionResult(query) {
+  return request({
+    url: '/ecw/order-exception-result/page',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

src/views/ecw/order/pending.vue

@@ -110,7 +110,8 @@
           </el-table-column>
         <el-table-column :label="$t('操作')" align="center">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.orderExceptionStatus==2">{{$t('已完成')}}</el-tag>
+            <el-button v-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType!='order_no_quote_exception'" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
+            <el-tag style="margin-left:10px" v-if="scope.row.orderExceptionStatus==2">{{$t('已完成')}}</el-tag>
             <el-button v-else-if="scope.row.orderExceptionType=='order_superfluous_box_exception'" v-hasPermi="['ecw:exception:superfluousBox']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionType=='order_lack_box_exception'" v-hasPermi="['ecw:exception:lackBox']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionType=='order_pay_exception'" v-hasPermi="['ecw:exception:pay']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>

src/views/ecw/order/weightDeal.vue

@@ -107,17 +107,33 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('最后操作时间')" scope="handlerTime" />
-
       </el-table>
 
+    </el-card>
+    <el-card>
+      <div slot="header" class="card-title">{{$t('处理结果')}}</div>
+      <el-descriptions :column="1">
+          <el-descriptions-item :label="$t('处理时间')">
+              {{parseTime(handlerParams.handlerTime)}}
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('处理结果')">
+              {{handlerParams.handlerResult=='general_cargo'?$t('设为普货'):$t('设为已处理')}}
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('备注')">
+            {{handlerParams.handlerRemark||"无"}}
+          </el-descriptions-item>
+      </el-descriptions>
     </el-card>
       <div slot="footer" class="dialog-footer">
-        <div>
+        <div v-if="list.orderExceptionStatus!=2">
           <el-button  type="primary" @click="submit('general_cargo')">{{$t('设为普货')}}</el-button>
           <el-button plain type="primary" @click="submit('process')">{{$t('设为已处理')}}</el-button>
         </div>
+        <div v-else>
+          <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
+        </div>
       </div>
-      <el-form  :model="handlerParams" ref="queryForms" size="small" label-width="50px" class="card">
+      <el-form v-if="list.orderExceptionStatus!=2"  :model="handlerParams" ref="queryForms" size="small" label-width="50px" class="card">
         <el-form-item :label="$t('备注')+':'" size="medium">
           <el-input style="width: 500px;"  type="textarea" v-model="handlerParams.orderExceptionHandlerRemark"  />
         </el-form-item>
@@ -127,7 +143,7 @@
 </template>
 
 <script>
-import {getExceptionById,handlerExceptionByExceptionId} from "@/api/ecw/orderException"
+import {getExceptionById,handlerExceptionByExceptionId,getOrderExcptionResult} from "@/api/ecw/orderException"
 import {DICT_TYPE} from  '@/utils/dict'
 import {getOrder} from '@/api/ecw/order'
 import {getProductBrankPage} from '@/api/ecw/productBrank'
@@ -171,6 +187,7 @@ export default {
       getExceptionById(this.id).then(response => {
         this.list = response.data;
         this.loading = false;
+        this.getOrderExcptionResult()
         this.getOrders()
       });
     },
@@ -178,6 +195,14 @@ export default {
       var brank = this.branklist.find(item=>item.id==id)
       return brank.titleZh||''
     },
+    //获取异常结果
+    getOrderExcptionResult(){
+      getOrderExcptionResult({orderExceptionId:this.id}).then(res=>{
+        this.handlerParams = res.data.list[0]
+        console.log(this.handlerParams)
+      })
+
+    },
     checkCode(data){
       if(data.indexOf('+')==-1){
       	return '+'+data