bug修复

src/views/WDLY/jd/abnormalDetails/index.vue

@@ -29,13 +29,13 @@
     <!--详情-->
     <el-dialog :z-index="1500" title="异常处理" v-if="dialogVisible" v-model="formData.data"  width="500px" v-loading="loading" @close="closeHandleAction">
       <el-steps :active="stepsActiveindex" align-center>
-        <el-step title="选择异常状态" ></el-step>
+        <el-step title="选择异常场景" ></el-step>
         <el-step title="处理异常明细" ></el-step>
       </el-steps>
       <el-divider></el-divider>
       <el-form class="stepsActive1" :model="formData.data" ref="submitform" :rules="rules"  style="margin-top: 0px;height: auto"
                label-position="top" label-width="100px"  v-if="stepsActiveindex == 1">
-            <el-form-item label="异常状态明细" prop="abnormalStatus">
+            <el-form-item label="异常场景" prop="abnormalStatus">
                 <el-select v-model="formData.data.abnormalStatus" style="width: 100%;" @change="treeChange" :disabled="isViewFlag">
                     <el-option v-for="item in abnormalHandleTypeDict" :key="item.value" :label="item.label" :value="item.value"/>
                 </el-select>
@@ -144,24 +144,29 @@ const addProductList = ref([])
 const abnormalHandleTypeDict = ref([])
 const abnormalHandleTypeChileDict = ref([])
 
-const abnormalStatusDictAll = ref([
-    {value: '10',label: '仓库多发',chile:[{value: '101',label: '补单（扣库存）'}]},
-    {value: '20',label: '仓库已发',chile:[{  value: '201',label: '报损'},
-        {  value: '202',label: '补单（不扣库存）'},
-        {  value: '203',label: '索赔理赔'}]},
-    {value: '30',label: '仓库少发',chile:[{  value: '301',label: '退回库存'}]},
-    {value: '40',label: '仓库发错货物',chile:[{  value: '401',label: '货物退回'},
-        {  value: '402',label: '补单'},
-        {  value: '403',label: '报损'}]},
-    {value: '50',label: '条码错误',chile:[{  value: '501',label: '货物退回'},
-        {  value: '502',label: '补单'},
-        {  value: '503',label: '报损'}]}
+const abnormalStatusDictAll = ref([]);
+
+const abnormalStatusDictDh = ref([
+    {value: '10',label: '仓库多发',chile:[{value: '101',label: '补单（扣库存）'}]}
+])
+
+const abnormalStatusDictSh = ref([
+  {value: '20',label: '仓库已发',chile:[{  value: '201',label: '报损'},
+      {  value: '202',label: '补单（不扣库存）'},
+      {  value: '203',label: '索赔理赔'}]},
+  {value: '30',label: '仓库少发',chile:[{  value: '301',label: '退回库存'}]},
+  {value: '40',label: '仓库发错货物',chile:[{  value: '401',label: '货物退回'},
+      {  value: '402',label: '补单'},
+      {  value: '403',label: '报损'}]},
+  {value: '50',label: '条码错误',chile:[{  value: '501',label: '货物退回'},
+      {  value: '502',label: '补单'},
+      {  value: '503',label: '报损'}]}
 ])
 const abnormalStatusDict = ref([
   {value: '101',label: '仓库多发-补单（扣库存）'},
   {  value: '201',label: '仓库已发-报损'},
-  {  value: '202',label: '仓库已发-补单（不扣库存）'},
   {  value: '203',label: '仓库已发-索赔理赔'},
+  {  value: '202',label: '仓库已发-补单（不扣库存）'},
   {  value: '301',label: '仓库少发-退回库存'},
     {  value: '401',label: '仓库发错货物-货物退回'},
       {  value: '402',label: '仓库发错货物-补单'},
@@ -266,6 +271,32 @@ const config = computed(() => {
         align: "left",
         width: 175,
       },
+      // renderHTML(row) {
+      //   return [
+      //     {
+      //       attrs: {
+      //         label: row.orderId,
+      //         type: "primary",
+      //         text: true,
+      //       },
+      //       el: "button",
+      //       click() {
+      //         openHandleAction(row, true);
+      //       },
+      //     },
+      //   ];
+      // },
+    },
+    {
+      attrs: {
+        label: "处理状态",
+        prop: "handleStatus",
+        align: "left",
+        width: 180,
+      },
+      render(type) {
+        return type == '2' ? '已处理' : '未处理';
+      },
     },
     {
       attrs: {
@@ -514,7 +545,11 @@ const openHandleAction = (row,isView) => {
 
     let absoluteValue = Math.abs(Number(row.confirmNum) - Number(row.actualNum))
 
-
+    if(row.exDesc == '1'){
+      abnormalStatusDictAll.value = abnormalStatusDictDh.value
+    }else if(row.exDesc == '2') {
+      abnormalStatusDictAll.value = abnormalStatusDictSh.value
+    }
 
     abnormalHandleTypeDict.value = abnormalStatusDictAll.value.map(x =>{
       return {

src/views/WDLY/jd/order/index.vue

@@ -598,7 +598,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "操作",
-        width: "150",
+        width: "200",
         align: "center",
         fixed: "right",
       },