Merge branch 'sit'

src/views/youzan/othTransferOrderLog/columns.js

@@ -52,7 +52,7 @@ const columns = [
   {
     prop: "orderCode",
     label: "销售订单号",
-    minWidth:"160px",
+    minWidth: "160px",
   },
   {
     prop: "skuCode",
@@ -346,11 +346,6 @@ const detail_columns = [
     label: "有赞订单编号",
     span: 7,
   },
-  {
-    prop: "oid",
-    label: "订单子订单编号",
-    span: 6,
-  },
   {
     prop: "item_id",
     label: "有赞商品编号",
@@ -362,20 +357,32 @@ const detail_columns = [
     _slot_: "status",
     span: 5,
   },
+
+  {
+    prop: "oid",
+    label: "订单子订单编号",
+    span: 6,
+  },
+
+  // {
+  //   prop: "goods_cost_price",
+  //   label: "成本价",
+  //   span: 4,
+  // },
   {
     prop: "tax_total",
     label: "税费",
     span: 4,
   },
   {
-    prop: "goods_cost_price",
-    label: "成本价",
+    prop: "num",
+    label: "商品数量",
     span: 4,
   },
   {
     prop: "price",
     label: "单商品原价",
-    span: 4,
+    span: 5,
   },
   // {
   //   prop: "goods_cost_price",
@@ -383,17 +390,12 @@ const detail_columns = [
   //   span: 4,
   // },
 
-  {
-    prop: "num",
-    label: "商品数量",
-    span: 4,
-  },
-
   {
     prop: "discount_price",
     label: "优惠后单价",
-    span: 4,
+    span: 5,
   },
+
   {
     prop: "total_fee",
     label: "优惠后总价",
@@ -421,17 +423,17 @@ const detail_columns = [
     label: "销售订单编号",
     span: 6,
   },
-  {
-    prop: "reason",
-    label: "驳回原因",
-    span: 18,
-  },
 
   {
     prop: "title",
     label: "商品名称",
     _slot_: "title",
-    span: 24,
+    span: 12,
+  },
+  {
+    prop: "reason",
+    label: "驳回原因",
+    span: 12,
   },
   {
     prop: "buyer_messages",

src/views/youzan/othTransferOrderLog/detail.vue

@@ -49,7 +49,11 @@
               </div>
               <div v-else>暂无商品信息</div>
             </el-collapse-item>
-            <el-collapse-item title="产品审核" name="2" v-if="status + '' === '2'">
+            <el-collapse-item
+              title="产品审核"
+              name="2"
+              v-if="status + '' === '2' && powers.some((item) => item == '056')"
+            >
               <exam-form
                 :statusList="statusList"
                 :newTime="newTime"
@@ -58,7 +62,11 @@
                 @searchChange="examForm($event, 0)"
               />
             </el-collapse-item>
-            <el-collapse-item title="财务审核" name="3" v-if="status + '' === '4'">
+            <el-collapse-item
+              title="财务审核"
+              name="3"
+              v-if="status + '' === '4' && powers.some((item) => item == '059')"
+            >
               <exam-form
                 :statusList="statusList"
                 :newTime="newTime"