Browse Source

有赞订单相关

xiaodai2022 2 năm trước cách đây
mục cha
commit
6c3cfd542c

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/js/0.js


+ 1 - 1
src/apis/service/youzan/othOrderCancelLog/index.js

@@ -3,7 +3,7 @@ import http from "@/apis/axios";
 export default {
  
   // 分页查询
-  list: (data, params) => http("youzan/yz_get_update_good_log_by_yz", data, "post", params),
+  list: (data, params) => http("youzan/yz_get_refund_order_list", data, "post", params),
   // 更新状态
   status: (data, params) => http(api + "goodexam", data, "post", params),
 };

+ 1 - 1
src/apis/service/youzan/othOrderModifyAddressLog/index.js

@@ -3,7 +3,7 @@ import http from "@/apis/axios";
 export default {
  
   // 分页查询
-  list: (data, params) => http("youzan/yz_get_update_good_log_by_yz", data, "post", params),
+  list: (data, params) => http("youzan/yz_get_change_address_list", data, "post", params),
   // 更新状态
   status: (data, params) => http(api + "goodexam", data, "post", params),
 };

+ 5 - 2
src/apis/service/youzan/othTransferOrderLog/index.js

@@ -1,9 +1,12 @@
 // 物业管理员
 import http from "@/apis/axios";
 export default {
- 
   // 分页查询
   list: (data, params) => http("youzan/yz_order_list", data, "post", params),
+  // 详情
+  detail: (data, params) =>
+    http("youzan/yz_order_detail", data, "post", params),
   // 更新状态
-  status: (data, params) => http("youzan/yz_check_status", data, "post", params),
+  status: (data, params) =>
+    http("youzan/yz_check_status", data, "post", params),
 };

+ 24 - 33
src/views/youzan/othOrderCancelLog/columns.js

@@ -5,50 +5,41 @@ const columns = [
     label: "记录ID",
   },
   {
-    prop: "msg_type",
-    label: "数据类型",
-    _slot_: "msg_type",
+    prop: "kdt_id",
+    label: "???",
   },
   {
-    prop: "key_item_id",
-    label: "有赞商品ID",
+    prop: "tid",
+    label: "订单ID",
   },
-  // {
-  //   prop: "key_alias",
-  //   label: "有赞商品别名",
-  // },
-  // {
-  //   prop: "key_kdt_id",
-  //   label: "有赞店铺ID",
-  // },
-  // {
-  //   prop: "key_is_display",
-  //   label: "推送前状态",
-  //   _slot_: "key_is_display",
-  // },
   {
-    prop: "key_title",
-    label: "有赞商品名称",
+    prop: "oids",
+    label: "子订单ID",
   },
   {
-    prop: "key_price",
-    label: "有赞价格",
+    prop: "refund_id",
+    label: "退款id",
   },
-  // {
-  //   prop: "key_channel",
-  //   label: "店铺类型", //0-网店,1:门店
-  // },
-  // {
-  //   prop: "key_barcode",
-  //   label: "有赞商品SKU码", //商品SKU维度的条形码,用于扫码快速搜索商品,使用场景如:扫码购、扫码搜索商品(只支持实物商品
-  // },
   {
-    prop: "key_goods_no",
-    label: "采销商品编码", //商品编码,商家可以自定义参数,支持英文和数字组合
+    prop: "refund_fee",
+    label: "退款金额", 
+  },
+  {
+    prop: "refund_reason_desc",
+    label: "退款原因描述", 
+  },
+  
+  {
+    prop: "refund_type",
+    label: "退款类型",
+  },
+  {
+    prop: "update_time",
+    label: "更新时间",
   },
   {
     prop: "addtime",
-    label: "创建时间",
+    label: "退款时间",
   },
 
 ];

+ 9 - 27
src/views/youzan/othOrderCancelLog/index.vue

@@ -24,7 +24,7 @@
         <template #table-header="{}">
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
-              <el-col :span="4" style="width: 140px">
+              <!-- <el-col :span="4" style="width: 140px">
                 <el-select
                   v-model="parmValue.msg_type"
                   filterable
@@ -45,7 +45,7 @@
                     :value="item.id"
                   />
                 </el-select>
-              </el-col>
+              </el-col> -->
               <el-col :span="6" style="width: 303px; padding: 0 0 0 10px">
                 <period-date-picker
                   :type="1"
@@ -56,37 +56,19 @@
                   @timeReturned="handleTime"
                 />
               </el-col>
-              <el-col :span="4" style="width: 450px">
+              <el-col :span="4" style="width: 450px; padding: 0 0 0 10px">
                 <el-input
                   :size="searchSize"
-                  v-model="sinput"
+                  v-model="parmValue.oid"
                   :maxlength="40"
                   @blur="
                     pageInfo.curr = 1;
                     parmValue.page = 1;
                     searchList();
                   "
-                  placeholder="关键字"
-                  ><el-select
-                    v-model="select"
-                    slot="prepend"
-                    :size="searchSize"
-                    style="width: 140px"
-                    @change="
-                      pageInfo.curr = 1;
-                      parmValue.page = 1;
-                      searchList();
-                    "
-                    placeholder="关键字类型"
-                  >
-                    <el-option label="平台订单号" value="1" />
-                    <el-option label="平台商品编号" value="2" />
-                    <el-option label="销售订单号" value="3" />
-                    <!-- <el-option label="平台编号" value="3" /> -->
-                    <!-- <el-option label="供应商编号" value="4" /> -->
-                    <el-option label="线上商品编号" value="4" />
-                    <el-option label="确认人" value="6" /> </el-select
-                ></el-input>
+                  placeholder="平台订单号"
+                >
+                </el-input>
               </el-col>
 
               <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
@@ -102,7 +84,7 @@
             </el-row>
           </div></template
         >
-        <template #key_is_display="{ scope }">
+        <!-- <template #key_is_display="{ scope }">
           <el-tag
             :size="tablebtnSize"
             :type="
@@ -134,7 +116,7 @@
                 .label || '--'
             "
           ></el-tag>
-        </template>
+        </template> -->
       </ex-table>
     </div>
     <no-auth v-else></no-auth>

+ 52 - 63
src/views/youzan/othOrderModifyAddressLog/columns.js

@@ -1,95 +1,84 @@
 //列表
 const columns = [
+  // {
+  //   prop: "id",
+  //   label: "记录ID",
+  //   width: "120px",
+  // },
+
   {
-    prop: "id",
-    label: "记录ID",
+    prop: "tid",
+    label: "平台订单号",
+    width: "200px",
   },
   {
-    prop: "msg_type",
-    label: "数据类型",
-    _slot_: "msg_type",
+    prop: "type",
+    label: "修改来源",
+    _slot_: "type",
+    width: "90px",
   },
   {
-    prop: "key_item_id",
-    label: "有赞商品ID",
+    prop: "is_del",
+    label: "是否删除",
+    _slot_: "is_del",
+    width: "90px",
   },
-  // {
-  //   prop: "key_alias",
-  //   label: "有赞商品别名",
-  // },
-  // {
-  //   prop: "key_kdt_id",
-  //   label: "有赞店铺ID",
-  // },
-  // {
-  //   prop: "key_is_display",
-  //   label: "推送前状态",
-  //   _slot_: "key_is_display",
-  // },
   {
-    prop: "key_title",
-    label: "有赞商品名称",
+    prop: "receiver_name",
+    label: "收件人",
+    width: "90px",
   },
   {
-    prop: "key_price",
-    label: "有赞价格",
+    prop: "receiver_tel",
+    label: "收件电话",
+    width: "120px",
   },
-  // {
-  //   prop: "key_channel",
-  //   label: "店铺类型", //0-网店,1:门店
-  // },
-  // {
-  //   prop: "key_barcode",
-  //   label: "有赞商品SKU码", //商品SKU维度的条形码,用于扫码快速搜索商品,使用场景如:扫码购、扫码搜索商品(只支持实物商品
-  // },
   {
-    prop: "key_goods_no",
-    label: "采销商品编码", //商品编码,商家可以自定义参数,支持英文和数字组合
+    prop: "delivery_province",
+    label: "省",
+    width: "80px",
   },
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: "delivery_city",
+    label: "市",
+    width: "80px",
   },
-];
-//详情
-const costArr = [
   {
-    prop: "spuCode",
-    label: "商品成本编号",
-    span: 6,
+    prop: "delivery_district",
+    label: "区",
+    width: "80px",
   },
   {
-    prop: "addtime",
-    label: "下线时间",
-    span: 6,
+    prop: "delivery_address",
+    label: "详细地址",
   },
   {
-    prop: "creater",
-    label: "申请人",
-    span: 6,
+    prop: "addtime",
+    label: "创建时间",
+    width: "145px",
   },
+];
+const type_list = [
   {
-    prop: "result",
-    label: "下线原因",
-    span: 6,
+    value: "1",
+    label: "用户提交",
   },
-
   {
-    prop: "good_name",
-    label: "商品名称",
-    span: 24,
+    value: "2",
+    label: "卖家提交",
   },
+];
+const is_del_list = [
   {
-    prop: "offline_remark",
-    label: "下线备注",
-    span: 24,
+    value: "1",
+    label: "删除",
+    type: "danger",
   },
   {
-    prop: "children_list",
-    label: "下线商品信息",
-    span: 24,
-    _slot_: "children_list",
+    value: "0",
+    label: "正常",
+    type: "success",
   },
 ];
 
-export { columns, costArr };
+export { columns, type_list, is_del_list };

+ 17 - 79
src/views/youzan/othOrderModifyAddressLog/index.vue

@@ -24,29 +24,7 @@
         <template #table-header="{}">
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
-              <el-col :span="4" style="width: 140px">
-                <el-select
-                  v-model="parmValue.msg_type"
-                  filterable
-                  clearable
-                  :size="searchSize"
-                  placeholder="消息类型"
-                  style="width: 100%"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-option
-                    v-for="item in msg_typeList"
-                    :key="'msg_type' + item.id"
-                    :label="item.label"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-col>
-              <el-col :span="6" style="width: 303px; padding: 0 0 0 10px">
+              <el-col :span="6" style="width: 293px">
                 <period-date-picker
                   :type="1"
                   :width="'135px'"
@@ -56,37 +34,18 @@
                   @timeReturned="handleTime"
                 />
               </el-col>
-              <el-col :span="4" style="width: 450px">
+              <el-col :span="4" style="width: 380px; padding: 0 0 0 10px">
                 <el-input
                   :size="searchSize"
-                  v-model="sinput"
+                  v-model="parmValue.tid"
                   :maxlength="40"
                   @blur="
                     pageInfo.curr = 1;
                     parmValue.page = 1;
                     searchList();
                   "
-                  placeholder="关键字"
-                  ><el-select
-                    v-model="select"
-                    slot="prepend"
-                    :size="searchSize"
-                    style="width: 140px"
-                    @change="
-                      pageInfo.curr = 1;
-                      parmValue.page = 1;
-                      searchList();
-                    "
-                    placeholder="关键字类型"
-                  >
-                    <el-option label="平台订单号" value="1" />
-                    <el-option label="平台商品编号" value="2" />
-                    <el-option label="销售订单号" value="3" />
-                    <!-- <el-option label="平台编号" value="3" /> -->
-                    <!-- <el-option label="供应商编号" value="4" /> -->
-                    <el-option label="线上商品编号" value="4" />
-                    <el-option label="确认人" value="6" /> </el-select
-                ></el-input>
+                  placeholder="平台订单号"
+                />
               </el-col>
 
               <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
@@ -102,35 +61,25 @@
             </el-row>
           </div></template
         >
-        <template #key_is_display="{ scope }">
+        <template #type="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="
-              (
-                is_display_list.find(
-                  (item) => item.id == scope.row.key_is_display + ''
-                ) || {}
-              ).type || 'info'
-            "
+            :type="''"
             v-text="
-              (
-                is_display_list.find(
-                  (item) => item.id == scope.row.key_is_display + ''
-                ) || {}
-              ).label || '--'
+              (type_list.find((item) => item.value == scope.row.type + '') || {}).label ||
+              '--'
             "
           ></el-tag>
         </template>
-
-        <template #msg_type="{ scope }">
+        <template #is_del="{ scope }">
           <el-tag
             :size="tablebtnSize"
             :type="
-              (msg_typeList.find((item) => item.id == scope.row.msg_type + '') || {})
+              (is_del_list.find((item) => item.value == scope.row.is_del + '') || {})
                 .type || '--'
             "
             v-text="
-              (msg_typeList.find((item) => item.id == scope.row.msg_type + '') || {})
+              (is_del_list.find((item) => item.value == scope.row.is_del + '') || {})
                 .label || '--'
             "
           ></el-tag>
@@ -142,11 +91,10 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/youzan/othOrderModifyAddressLog";
-import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
-import { columns } from "./columns";
+import { columns, type_list, is_del_list } from "./columns";
 export default {
   name: "othOrderModifyAddressLog",
   mixins: [mixinPage, resToken],
@@ -168,18 +116,6 @@ export default {
   },
   data() {
     return {
-      msg_typeList: [
-        { id: "1", label: "商品上架", type: "success" },
-        { id: "2", label: "商品下架", type: "primary" },
-        // { id: "3", label: "生成订单", type: "info" },
-        { id: "4", label: "商品删除", type: "danger" },
-        { id: "5", label: "商品编辑", type: "warning" },
-      ],
-      is_display_list: [
-        { id: "0", label: "上架", type: "success" },
-        { id: "1", label: "下架", type: "primary" },
-      ],
-      roleLevel: roleLevel,
       loading: false,
       sitem: {},
       showRateModel: false,
@@ -190,7 +126,7 @@ export default {
       parmValue: {
         page: 1, // 页码
         size: 15, // 每页显示条数
-        msg_type: "",
+        tid: "",
         start_date: "",
         end_date: "",
       },
@@ -210,6 +146,8 @@ export default {
       },
       // 表格 - 列参数
       columns,
+      type_list,
+      is_del_list,
     };
   },
   mounted() {
@@ -226,7 +164,7 @@ export default {
       this.parmValue = {
         page: 1, // 页码
         size: 15, // 每页显示条数
-        msg_type: "",
+        tid: "",
         start_date: "",
         end_date: "",
       };

+ 200 - 41
src/views/youzan/othTransferOrderLog/columns.js

@@ -21,6 +21,12 @@ const columns = [
     label: "平台商品编码",
     width: "160px",
   },
+  {
+    prop: "pay_type",
+    label: "支付类型",
+    _slot_: "pay_type",
+    width: "100px",
+  },
   {
     prop: "status",
     label: "状态",
@@ -49,7 +55,7 @@ const columns = [
     width: "160px",
   },
   {
-    prop: "orderCode",
+    prop: "skuCode",
     label: "线上商品单号",
     width: "160px",
   },
@@ -72,46 +78,7 @@ const columns = [
     width: "50px",
   },
 ];
-//详情
-const costArr = [
-  {
-    prop: "spuCode",
-    label: "商品成本编号",
-    span: 6,
-  },
-  {
-    prop: "addtime",
-    label: "下线时间",
-    span: 6,
-  },
-  {
-    prop: "creater",
-    label: "申请人",
-    span: 6,
-  },
-  {
-    prop: "result",
-    label: "下线原因",
-    span: 6,
-  },
 
-  {
-    prop: "good_name",
-    label: "商品名称",
-    span: 24,
-  },
-  {
-    prop: "offline_remark",
-    label: "下线备注",
-    span: 24,
-  },
-  {
-    prop: "children_list",
-    label: "下线商品信息",
-    span: 24,
-    _slot_: "children_list",
-  },
-];
 const status_list = [
   {
     value: "0",
@@ -141,6 +108,10 @@ const status_list = [
     value: "6",
     label: "成功转单",
   },
+  {
+    value: "7",
+    label: "订单取消",
+  },
 ];
 const pay_type_list = [
   {
@@ -364,4 +335,192 @@ const pay_type_list = [
     label: "保证金账户",
   },
 ];
-export { columns, costArr, pay_type_list, status_list };
+//详情
+const detail_columns = [
+  {
+    prop: "tid",
+    label: "有赞订单编号",
+    span: 7,
+  },
+  {
+    prop: "oid",
+    label: "订单子订单编号",
+    span: 6,
+  },
+  {
+    prop: "item_id",
+    label: "有赞商品编号",
+    span: 6,
+  },
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    span: 5,
+  },
+  {
+    prop: "tax_total",
+    label: "税费",
+    span: 4,
+  },
+  {
+    prop: "goods_cost_price",
+    label: "成本价",
+    span: 4,
+  },
+  {
+    prop: "price",
+    label: "单商品原价",
+    span: 4,
+  },
+  {
+    prop: "goods_cost_price",
+    label: "成本价",
+    span: 4,
+  },
+
+  {
+    prop: "num",
+    label: "商品数量",
+    span: 4,
+  },
+
+  {
+    prop: "discount_price",
+    label: "优惠后单价",
+    span: 4,
+  },
+  {
+    prop: "total_fee",
+    label: "售后商品总价",
+    span: 6,
+  },
+  {
+    prop: "addtime",
+    label: "下线时间",
+    span: 6,
+  },
+
+  {
+    prop: "plat_code",
+    label: "平台商品编码",
+    span: 6,
+  },
+
+  {
+    prop: "skuCode",
+    label: "线上商品编号",
+    span: 6,
+  },
+  {
+    prop: "orderCode",
+    label: "销售订单编号",
+    span: 6,
+  },
+  {
+    prop: "reason",
+    label: "驳回原因",
+    span: 18,
+  },
+
+  {
+    prop: "title",
+    label: "商品名称",
+    _slot_: "title",
+    span: 24,
+  },
+  {
+    prop: "buyer_messages",
+    label: "买家留言",
+    span: 24,
+  },
+];
+const pay_info_columns = [
+  {
+    prop: "real_payment",
+    label: "实付金额",
+    span: 6,
+  },
+  {
+    prop: "total_fee",
+    label: "商品总价",
+    span: 6,
+  },
+  // {
+  //   prop: "payment",
+  //   label: "整单应付金额",
+  //   span: 6,
+  // },
+
+  {
+    prop: "post_fee",
+    label: "邮费",
+    span: 6,
+  },
+  {
+    prop: "pay_type",
+    label: "支付类型",
+    _slot_: "pay_type",
+    span: 6,
+  },
+  {
+    prop: "addtime",
+    label: "支付时间",
+    span: 6,
+  },
+  {
+    prop: "transaction",
+    label: "支付流水号",
+    _slot_: "transaction",
+    span: 18,
+  },
+];
+const address_info_columns = [
+  {
+    prop: "receiver_name",
+    label: "收货人",
+    span: 8,
+  },
+  {
+    prop: "receiver_tel",
+    label: "收货电话",
+    span: 8,
+  },
+  {
+    prop: "addtime",
+    label: "添加时间",
+    span: 8,
+  },
+  {
+    prop: "delivery_province",
+    label: "收货地址",
+    _slot_: "delivery_province",
+    span: 24,
+  },
+];
+const express_columns = [
+  {
+    prop: "out_stype",
+    label: "物流ID",
+    span: 8,
+  },
+  {
+    prop: "oids",
+    label: "子订单号",
+    span: 8,
+  },
+  {
+    prop: "out_sid",
+    label: "物流单号",
+    span: 8,
+  },
+];
+export {
+  columns,
+  detail_columns,
+  pay_info_columns,
+  address_info_columns,
+  express_columns,
+  pay_type_list,
+  status_list,
+};

+ 141 - 42
src/views/youzan/othTransferOrderLog/detail.vue

@@ -8,29 +8,48 @@
               <show-data-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
-                :sitem="sitem"
-                :columns="costArr"
+                :sitem="detail"
+                :columns="detail_columns"
               >
-                <template slot="children_list">
-                  <el-table :data="sitem.children_list" size="mini" style="width: 100%">
-                    <el-table-column prop="skuCode" label="商品上线编号" min-width="140">
-                    </el-table-column>
-                    <el-table-column
-                      prop="platform_name"
-                      label="平台名称"
-                      min-width="140"
-                    >
-                    </el-table-column>
-                    <el-table-column prop="purchease" label="采购人" min-width="90">
-                    </el-table-column>
-                    <el-table-column prop="creater" label="创建人" min-width="90">
-                    </el-table-column>
-                  </el-table>
+                <template slot="status">
+                  <el-tag
+                    :size="tablebtnSize"
+                    :type="''"
+                    v-text="
+                      (status_list.find((item) => item.value == detail.status + '') || {})
+                        .label || '--'
+                    "
+                  ></el-tag>
+                </template>
+
+                <template slot="title">
+                  <div
+                    v-if="detail.pic_path"
+                    style="width: 20px; height: 20px"
+                    class="hover fl"
+                    v-viewer
+                  >
+                    <img
+                      :src="detail.pic_path"
+                      style="display: inline-block; width: 100%; height: 100%"
+                      alt=""
+                    />
+                  </div>
+                  <span>{{ detail.title }}</span>
                 </template>
               </show-data-table>
             </el-collapse-item>
-            <el-collapse-item title="商品信息" name="1"> 商品信息</el-collapse-item>
-            <el-collapse-item title="产品审核" name="2">
+            <el-collapse-item title="商品信息" name="1">
+              <div v-if="detail && detail.skuCode">
+                <good_detail
+                  :newTime="newTime"
+                  v-if="newTime !== ''"
+                  :id="detail.skuCode"
+                />
+              </div>
+              <div v-else>暂无商品信息</div>
+            </el-collapse-item>
+            <el-collapse-item title="产品审核" name="2" v-if="status + '' === '2'">
               <exam-form
                 :statusList="statusList"
                 :newTime="newTime"
@@ -39,7 +58,7 @@
                 @searchChange="examForm($event, 0)"
               />
             </el-collapse-item>
-            <el-collapse-item title="财务审核" name="3">
+            <el-collapse-item title="财务审核" name="3" v-if="status + '' === '4'">
               <exam-form
                 :statusList="statusList"
                 :newTime="newTime"
@@ -47,14 +66,63 @@
                 :isMust="false"
                 @searchChange="examForm($event, 1)"
             /></el-collapse-item>
-            <el-collapse-item title="财务审核" name="3">
-              <exam-form
-                :statusList="statusList"
+          </el-collapse>
+        </el-tab-pane>
+        <el-tab-pane label="订单其他信息" name="3">
+          <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
+            <el-collapse-item title="支付信息" name="0">
+              <show-data-table
                 :newTime="newTime"
-                :disabled="false"
-                :isMust="false"
-                @searchChange="examForm($event, 1)"
-            /></el-collapse-item>
+                v-if="newTime !== ''"
+                :sitem="pay_info"
+                :columns="pay_info_columns"
+              >
+                <template slot="pay_type">
+                  <el-tag
+                    :size="tablebtnSize"
+                    :type="''"
+                    v-text="
+                      (
+                        pay_type_list.find(
+                          (item) => item.value == pay_info.pay_type + ''
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                </template>
+
+                <template slot="transaction">
+                  <span v-for="(si, sii) in pay_info.transaction" :key="sii + si"
+                    >{{ si }}{{ sii === 0 ? "" : "," }}</span
+                  >
+                </template>
+              </show-data-table>
+            </el-collapse-item>
+            <el-collapse-item title="收货信息" name="1">
+              <show-data-table
+                :newTime="newTime"
+                v-if="newTime !== ''"
+                :sitem="address_info"
+                :columns="address_info_columns"
+              >
+                <template slot="delivery_province">
+                  <span>{{ address_info.delivery_province }}</span>
+                  <span>{{ address_info.delivery_city }}</span>
+                  <span>{{ address_info.delivery_district }}</span>
+                  <span>{{ address_info.delivery_address }}</span>
+                </template>
+              </show-data-table>
+            </el-collapse-item>
+            <el-collapse-item title="发货信息" name="1">
+              <el-table :data="express" size="mini" style="width: 100%" border>
+                <el-table-column
+                  v-for="(si, sii) in express_columns"
+                  :key="sii.prop + sii + 'prop'"
+                  :prop="si.prop"
+                  :label="si.label"
+                />
+              </el-table>
+            </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="2">22</el-tab-pane>
@@ -70,12 +138,22 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/youzan/othTransferOrderLog";
-import { costArr } from "./columns";
+import good_detail from "./good_detail";
+import {
+  detail_columns,
+  pay_info_columns,
+  address_info_columns,
+  express_columns,
+  pay_type_list,
+  status_list,
+} from "./columns";
 import { mapGetters } from "vuex";
 export default {
   name: "othTransferOrderLogDetail",
   mixins: [mixinPage, resToken],
-  components: {},
+  components: {
+    good_detail,
+  },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
@@ -93,16 +171,24 @@ export default {
   data() {
     return {
       activeNames: ["0", "1", "2", "3", "4", "5", "6", "7"],
-      statusList: [],
       loading: false,
-      //数据
-      sitem: null,
+
       parmValue: {
         id: this.$route.query.id,
       },
+      status: "",
       activeName: "1",
       newTime: "",
-      costArr,
+      detail_columns,
+      pay_info_columns,
+      address_info_columns,
+      express_columns,
+      pay_type_list,
+      status_list,
+      detail: null,
+      pay_info: null,
+      address_info: null,
+      express: null,
     };
   },
   mounted() {
@@ -114,7 +200,7 @@ export default {
       this.queryId = id;
       this.queryType = type;
       this.loading = true;
-      // await this.initData();
+      await this.initData();
 
       this.loading = false;
     },
@@ -127,16 +213,16 @@ export default {
       switch (state) {
         case "1":
           if (type === 1) {
-            status = "a";
+            status = "6";
           } else {
-            status = "b";
+            status = "5";
           }
           break;
         case "0":
           if (type === 1) {
-            status = "c";
+            status = "4";
           } else {
-            status = "d";
+            status = "3";
           }
           break;
       }
@@ -173,15 +259,28 @@ export default {
     },
     async initData() {
       this.loading = true;
-      const { code, data, message } = await asyncRequest.goodoffdetail(this.parmValue);
+      this.status = "";
+      const { code, data, message } = await asyncRequest.detail(this.parmValue);
       if (code === 0) {
-        this.sitem = data;
+        const { detail, pay_info, address_info, express } = data ?? {};
+        this.detail = detail ?? null;
+        const { status } = detail ?? {};
+        this.status = status ?? "";
+        this.pay_info = pay_info ?? null;
+        this.address_info = address_info ?? null;
+        this.express = express ?? null;
       } else if (code >= 100 && code <= 104) {
-        this.sitem = null;
+        this.detail = null;
+        this.pay_info = null;
+        this.address_info = null;
+        this.express = null;
         await this.logout();
       } else {
         this.$message.warning(message);
-        this.sitem = null;
+        this.detail = null;
+        this.pay_info = null;
+        this.address_info = null;
+        this.express = null;
       }
       this.getNewTime();
       this.loading = false;

+ 474 - 0
src/views/youzan/othTransferOrderLog/good_columns.js

@@ -0,0 +1,474 @@
+
+//是否定制
+const options1 = [
+  { id: "0", name: "否" },
+  { id: "1", name: "是" },
+]
+//专属类型
+const options2 = [
+  { id: "0", name: "非泰康" },
+  { id: "1", name: "泰康" },
+]
+//销售权限
+const options3 = [
+  { id: "0", name: "无销售权限" },
+  { id: "1", name: "有销售权限" },
+]
+
+//是否库存品
+const options4 = [
+  { id: "0", name: "非库存品" },
+  { id: "1", name: "库存品" },
+]
+//是否启用实时金价
+const options5 = [
+  { id: "0", name: "否" },
+  { id: "1", name: "是" },
+]
+//供货区域
+const options6 = [
+  { id: "1", name: "全国" },
+  { id: "2", name: "全国除偏远" },
+]
+//是否启用阶梯
+const options7 = [
+  { id: "0", name: "否" },
+  { id: "1", name: "是" },
+]
+const options8 = [
+  { id: "0", name: "待产品审核" },
+  { id: "1", name: "待执行上线" },
+  { id: "2", name: "审核驳回" },
+  { id: "6", name: "上线成功" },
+  { id: "7", name: "上线失败" },
+  { id: "8", name: "已下线" },
+]
+const listCol = [
+  {
+    prop: "skuCode",
+    label: "上线商品编号",
+    fixed: "left",
+    width: "160px",
+  },
+  {
+    prop: "spuCode",
+    label: "成本商品编号",
+    width: "160px",
+  },
+  {
+    prop: "good_thumb_img",
+    label: "图片",
+    _slot_: "good_thumb_img",
+    width: "45px",
+  },
+  {
+    prop: "good_name",
+    label: "名称",
+    "min-width": "160px",
+  },
+  // {
+  //   prop: "platform_code_en",
+  //   label: "平台编号",
+  //   width: "170px",
+  // },
+  {
+    prop: "platform_name",
+    label: "平台名称",
+    width: "100px",
+  },
+
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "118px",
+  },
+  {
+    prop: "cat_name",
+    label: "分类",
+    width: "118px",
+  },
+  {
+    prop: "good_type",
+    label: "是否定制",
+    _slot_: "good_type",
+    width: "70px",
+  },
+  {
+    prop: "brand_name",
+    label: "品牌",
+  },
+  {
+    prop: "companyNo",
+    label: "业务公司编号",
+    width: "160px",
+  },
+  {
+    prop: "company",
+    label: "业务公司名称",
+    width: "150px",
+  },
+  {
+    prop: "plat_code",
+    label: "平台商品编号",
+    width: "150px",
+  },
+  {
+    prop: "purchase",
+    label: "采购员",
+    width: "70px",
+  },
+  {
+    prop: "company_name",
+    label: "创建人部门",
+    minWidth: "150px",
+  },
+  {
+    prop: "creater",
+    label: "创建人",
+    width: "70px",
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    width: "140px",
+  },
+  {
+    prop: "",
+    label: "操作",
+    fixed: "right",
+    _noset_: true,
+    width: "110px",
+    _slot_: "operation",
+  },
+]
+const rules = {
+  platform: [
+    {
+      required: true,
+      message: "请选择所属平台",
+      trigger: "change",
+    },
+  ],
+  online_reason: [
+    {
+      required: true,
+      message: "上线原因不能为空",
+      trigger: "blur",
+    },
+  ],
+  online_remark: [
+    {
+      required: true,
+      message: "上线备注不能为空",
+      trigger: "blur",
+    },
+  ],
+
+}
+const public_listCol = [
+  {
+    prop: "good_name",
+    label: "商品名称",
+    _slot_: "good_name",
+    span: 24,
+  },
+  {
+    prop: "company",
+    label: "业务企业名称",
+    _slot_: "company",
+  },
+  {
+    prop: "good_info_img",
+    _slot_: "good_info_img",
+    label: "详情图",
+  },
+  {
+    prop: "cat",
+    label: "分类",
+    span: 8,
+  },
+
+
+
+  {
+    prop: "creater",
+    label: "申请人",
+    span: 4,
+  },
+  {
+    prop: "platform_name",
+    label: "上线平台",
+    span: 6,
+  },
+  {
+    prop: "online_time",
+    label: "上线时间",
+    span: 6,
+  },
+  {
+    prop: "online_reason",
+    label: "上线原因",
+  },
+
+  {
+    prop: "online_remark",
+    label: "上线备注",
+    span: 12,
+  },
+  {
+    prop: "brand_name",
+    label: "品牌",
+    span: 6,
+  },
+
+
+
+  {
+    prop: "exclusive",
+    label: "专属类型",
+    _slot_: "exclusive",
+    span: 6,
+  },
+  {
+    prop: "weight",
+    label: "商品总克重",
+    append: 'g',
+    span: 6,
+  },
+
+
+  {
+    prop: "packing_list",
+    label: "包装清单",
+    span: 6,
+  },
+  {
+    prop: "packing_way",
+    label: "包装方式",
+    span: 6,
+  },
+  {
+    prop: "packing_spec",
+    label: "装箱规格",
+    span: 6,
+  },
+  {
+    prop: "packing_weight",
+    label: "装箱重量",
+    append: 'g',
+    span: 6,
+  },
+  {
+    prop: "packing_size",
+    label: "装箱尺寸",
+    span: 6,
+  },
+  {
+    prop: "origin_place_cn",
+    label: "产地",
+    span: 8,
+  },
+  {
+    prop: "unit",
+    label: "单位",
+    span: 4,
+  },
+  {
+    prop: "good_bar",
+    label: "商品条形码",
+    span: 6,
+  },
+  {
+    prop: "supply_area",
+    label: "供货区域",
+    _slot_: "supply_area",
+    span: 6,
+  },
+  {
+    prop: "delivery_place_cn",
+    label: "发货地",
+    span: 8,
+  },
+  {
+    prop: "is_stock",
+    label: "是否库存品",
+    _slot_: "is_stock",
+    span: 4,
+  },
+  {
+    prop: "exam_status",
+    label: "状态",
+    _slot_: "exam_status",
+    span: 6,
+  },
+  {
+    prop: "good_type",
+    label: "是否定制",
+    _slot_: "good_type",
+    span: 6
+  },
+
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 8,
+  },
+  {
+    prop: "tax",
+    label: "税点",
+    append: '%',
+    span: 4,
+  },
+
+  {
+    prop: "delivery_day",
+    label: "物流时间",
+    append: '天',
+    span: 4,
+  },
+  {
+    prop: "lead_time",
+    label: "供货周期",
+    append: '天',
+    span: 4
+  },
+  {
+    prop: "sample_day",
+    label: "调样周期",
+    append: '天',
+    span: 4,
+  },
+
+  {
+    prop: "noble",
+    label: "贵金属信息",
+    _slot_: "noble",
+    span: 24,
+  },
+  {
+    prop: "good_remark",
+    label: "商品备注",
+    span: 24,
+  },
+
+
+  {
+    prop: "after_sales",
+    label: "售后说明",
+    span: 24,
+  },
+  {
+    prop: "craft_desc",
+    label: "工艺说明",
+    span: 24,
+  },
+]
+const sale_listCol=[
+  {
+    prop: "yz_cat_info",
+    label: "有赞公有分类",
+    _slot_: "yz_cat_info",
+    span: 6,
+  },
+  {
+    prop: "is_support_barter",
+    label: "是否支持退货",
+    _slot_: "is_support_barter",
+    span: 6,
+  },
+  {
+    prop: "reject_reason",
+    label: "驳回原因",
+    span: 12,
+  },
+  {
+    prop: "nakelist",
+    label: "销售起订量",
+    _slot_: "nakelist",
+    span: 24,
+  },
+]
+const  is_support_barter_list= [
+  {
+    value: "1",
+    label: "支持",
+  },
+  {
+    value: "0",
+    label: "不支持",
+  },
+]
+const item_type_options=[
+  {
+    value: "0",
+    label: "普通商品", 
+    status:'1'
+  },
+  {
+    value: "3",
+    label: "UMP降价拍", 
+    status:'0'
+  },
+  {
+    value: "5",
+    label: "外卖商品", 
+    status:'0'
+  },
+  {
+    value: "10",
+    label: "分销商品", 
+    status:'0'
+  },
+  {
+    value: "20",
+    label: "会员卡商品", 
+    status:'0'
+  },
+  {
+    value: "21",
+    label: "礼品卡商品", 
+    status:'0'
+  },
+  {
+    value: "22",
+    label: "团购券", 
+    status:'0'
+  },
+  {
+    value: "25",
+    label: "批发商品", 
+    status:'0'
+  },
+  {
+    value: "30",
+    label: "收银台商品", 
+    status:'0'
+  },
+  {
+    value: "31",
+    label: "知识付费商品", 
+    status:'0'
+  },
+  {
+    value: "35",
+    label: "酒店商品", 
+    status:'0'
+  },
+  {
+    value: "40",
+    label: "美业商品", 
+    status:'0'
+  },
+  {
+    value: "60",
+    label: "虚拟商品", 
+    status:'0'
+  },
+  {
+    value: "61",
+    label: "电子卡券", 
+    status:'0'
+  }
+]
+export { options1, options2, options3, options4, options5, options6, options7, options8, listCol, rules,public_listCol,sale_listCol,is_support_barter_list,item_type_options }

+ 512 - 0
src/views/youzan/othTransferOrderLog/good_detail.vue

@@ -0,0 +1,512 @@
+<template>
+  <div class="good_detail">
+    <show-data-table
+      :newTime="newTime"
+      v-if="newTime !== ''"
+      :sitem="sitem"
+      :columns="public_listCol"
+    >
+      <template slot="good_name">
+        <img
+          v-viewer
+          style="width: 23px; height: 23px; margin: 0 5px 0 0"
+          class="fl"
+          v-if="sitem.good_thumb_img"
+          :src="sitem.good_thumb_img"
+          alt=""
+        />
+        <span>{{ sitem.good_name }}</span>
+        <span v-for="(si, i) in sitem.speclist" :key="si.spec_id + i">
+          <span v-if="i !== 0">-</span>
+          <span v-else>_</span>
+          <span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
+        </span>
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>上线商品编号:</span><span>{{ sitem.skuCode }}</span>
+            </li>
+            <li
+              v-if="
+                newTime !== '' &&
+                private_field &&
+                private_field.length > 0 &&
+                private_field.some((item) => item == '1')
+              "
+            >
+              <span>成本商品编号:</span><span>{{ sitem.spuCode }}</span>
+            </li>
+            <li>
+              <span>平台商品编码:</span><span>{{ sitem.plat_code }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+      <template slot="company">
+        <span>{{ sitem.company }}</span>
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>业务企业编号:</span><span>{{ sitem.companyNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+      <template slot="good_info_img">
+        <img
+          class="fl"
+          style="width: 23px; height: 23px; margin: 0 5px 0 0"
+          v-viewer
+          v-for="(si, i) in sitem.good_info_img"
+          :src="si"
+          :key="si + i"
+        />
+      </template>
+      <template slot="exclusive">
+        <span v-for="(si, sii) in sitem.exclusive" :key="si.id">
+          <span v-if="sii !== 0">/</span> <span>{{ si.name }}</span>
+        </span>
+      </template>
+      <template slot="supply_area">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (options6.find((item) => item.id == sitem.supply_area) || {}).name || '--'
+          "
+        />
+      </template>
+      <template slot="is_stock">
+        <el-tag
+          :size="'mini'"
+          v-text="(options4.find((item) => item.id == sitem.is_stock) || {}).name || '--'"
+        />
+      </template>
+      <template slot="exam_status">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (options8.find((item) => item.id == sitem.exam_status) || {}).name || '--'
+          "
+        />
+      </template>
+      <template slot="good_type">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (options1.find((item) => item.id == sitem.good_type) || {}).name || '--'
+          "
+        />
+        <span v-if="sitem.good_type === '1'" style="padding: 0 0 0 5px"
+          >{{ sitem.moq }}起订/工期{{ sitem.customized }}天</span
+        >
+      </template>
+      <template slot="noble">
+        <span v-if="sitem.noble_metal"
+          >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{ sitem.noble_name }}-{{
+            sitem.gold_price ? sitem.gold_price : "0"
+          }}元/g-{{ sitem.is_gold_price === "0" ? "不" : "" }}启用实时金价-{{
+            sitem.is_diff === "1" ? "有" : "无"
+          }}工差-{{ sitem.config }}-{{ sitem.other_config }}</span
+        >
+      </template>
+    </show-data-table>
+
+    <show-data-table
+      :newTime="newTime"
+      v-if="
+        newTime !== '' &&
+        private_field &&
+        private_field.length > 0 &&
+        private_field.some((item) => item == '2') &&
+        nakelist &&
+        nakelist.length > 0 &&
+        status !== '0'
+      "
+      :sitem="sitem"
+      :columns="sale_listCol"
+    >
+      <template slot="yz_cat_info">
+        <span v-for="(si, sii) in sitem.yz_cat_info" :key="si.yz_cat_id">
+          <span v-if="sii !== 0">/</span> <span>{{ si.yz_cat_name }}</span>
+        </span>
+      </template>
+      <template slot="is_support_barter">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (
+              is_support_barter_list.find(
+                (item) => item.value == sitem.is_support_barter
+              ) || {}
+            ).label || '--'
+          "
+        />
+      </template>
+      <template slot="nakelist">
+        <el-table
+          :data="nakelist"
+          :size="'mini'"
+          border
+          stripe
+          style="width: 99%; margin: 10px 10px 10px 0"
+        >
+          <el-table-column label="系统阶梯" width="80px">
+            <template slot-scope="scope">
+              <i
+                v-if="sitem.good_ladder_id === scope.row.id"
+                class="el-icon-check"
+                style="color: #1890ff; font-size: 16px; font-weight: bolder"
+              /> </template
+          ></el-table-column>
+          <el-table-column prop="min_num" label="采购起订量" />
+          <el-table-column label="销售">
+            <el-table-column prop="start_sale_num" label="起订量">
+              <template slot-scope="scope">
+                <span v-if="sitem.good_ladder_id === scope.row.id">
+                  {{ sitem.start_sale_num }}
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="sale_good_price" label="系统售价" />
+            <el-table-column prop="sale_cost_fee" label="系统工艺费" />
+            <el-table-column prop="final_price" label="最终售价">
+              <template slot-scope="scope">
+                <span v-if="sitem.good_ladder_id === scope.row.id">
+                  {{ sitem.final_price }}
+                </span>
+              </template></el-table-column
+            >
+          </el-table-column>
+        </el-table>
+      </template>
+    </show-data-table>
+  </div>
+</template>
+
+<script>
+import asyncRequest from "@/apis/service/youzan/othgoodsOnline";
+import resToken from "@/mixins/resToken";
+import { mapGetters } from "vuex";
+import {
+  options1,
+  options2,
+  options3,
+  options4,
+  options5,
+  options6,
+  options7,
+  options8,
+  public_listCol,
+  sale_listCol,
+  is_support_barter_list,
+} from "./good_columns";
+import { isArray } from "@/utils/validate";
+export default {
+  name: "othgoodsOnlineDetail",
+  mixins: [resToken],
+  props: ["id"],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "private_field"]),
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "othgoodsOnlineDetail"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
+
+  data() {
+    return {
+      platform_id: "",
+      public_listCol,
+      sale_listCol,
+      is_support_barter_list,
+      options1,
+      options2,
+      options3,
+      options4,
+      options5,
+      options6,
+      options7,
+      options8,
+      ladderlist: [],
+      nakelist: [],
+      spuCode: "",
+      size: "small",
+      activeTabs: "1",
+      activeNames: ["0", "1", "2", "3", "4", "5", "6", "7"],
+      newTime: "",
+      loading: false,
+      queryType: "",
+      status: "",
+      sitem: null,
+    };
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    async initForm() {
+      await this.initData();
+
+      this.loading = false;
+    },
+    // 点击业务审核的按钮
+    async examForm(e) {
+      console.log(e);
+      if (!this.loading) {
+        let model = {
+          skuCode: this.queryId,
+          exam_status: e.numStatus,
+          online_time: e.online_time,
+          remark: e.remark,
+        };
+
+        if ((e.numStatus ?? "") == "") {
+          //驳回重新审核
+          await this.setstatus("提交产品部门审核结果", model);
+        } else if (e.numStatus == "3") {
+          //点击保存
+          // return;
+          await this.setstatus("提交产品部门审核结果", model);
+        } else {
+          //驳回下线
+          await this.setstatus("驳回下线吗", model);
+        }
+      }
+    },
+    // 点击财务定价的驳回按钮
+    async examForm1(e) {
+      if ((e.numStatus ?? "") == "") {
+        if (!this.loading) {
+          let model = {
+            skuCode: this.queryId,
+            exam_status: e.numStatus,
+            remark: e.remark,
+          };
+          await this.setstatus("驳回重新审核吗", model);
+        }
+      } else {
+        // return;
+        if (!this.loading) {
+          let model = {
+            skuCode: this.queryId,
+            exam_status: e.numStatus,
+            remark: e.remark,
+          };
+          await this.setstatus("驳回下线吗", model);
+        }
+      }
+    },
+    // 财务审核的保存按钮
+    async examForm2(e) {
+      console.log(e);
+      if (!this.loading) {
+        let model = {
+          skuCode: this.queryId,
+          exam_status: e.numStatus,
+          remark: e.remark,
+        };
+
+        if ((e.numStatus ?? "") == "") {
+          //驳回重新审核
+          await this.setstatus("驳回重新审核吗", model);
+        } else if (e.numStatus == "5") {
+          //点击保存
+          // return;
+          await this.setstatus("提交财务审核结果", model);
+        } else {
+          //驳回下线
+          await this.setstatus("驳回下线吗", model);
+        }
+      }
+    },
+    // 操作上线的保存按钮
+    async examForm3(e) {
+      console.log(e);
+      if (!this.loading) {
+        let model = {
+          skuCode: this.queryId,
+          exam_status: e.numStatus,
+          plat_code: e.plat_code,
+          remark: e.remark || "",
+        };
+
+        if ((e.numStatus ?? "") == "") {
+          //驳回重新审核
+          await this.setstatus("驳回重新审核吗", model);
+        } else if (e.numStatus == "6") {
+          //点击保存
+          // return;
+          await this.setstatus("提交商品上线结果", model);
+        } else {
+          //驳回下线
+          await this.setstatus("驳回下线吗", model);
+        }
+      }
+    },
+
+    async setstatus(detail, model) {
+      await this.$confirm(`确定要${detail}?`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          let res = null;
+          if (model.exam_status == "") {
+            res = await asyncRequest.goodupreject(model);
+          } else {
+            res = await asyncRequest.status(model);
+          }
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "提交成功!",
+              message: "",
+            });
+            await this.initForm();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+
+    refresh(e) {
+      const { spuCode } = e;
+      let model = {
+        id: this.queryType === "add" ? spuCode : this.queryId,
+        type: "view",
+      };
+      this.routeReGoto("othgoodsOnlineDetail", model);
+    },
+    async initData() {
+      this.loading = true;
+      const { code, message, data } = await asyncRequest.detail({
+        skuCode: this.id,
+      });
+      this.loading = false;
+      if (code === 0) {
+        this.sitem = JSON.parse(JSON.stringify(data));
+        const {
+          exam_status,
+          cat_info,
+          ladderlist,
+          nakelist,
+          spuCode,
+          platform_id,
+        } = this.sitem;
+        this.spuCode = spuCode;
+        this.platform_id = platform_id;
+        // this.ladderlist = JSON.parse(JSON.stringify(ladderlist));
+        this.nakelist = JSON.parse(JSON.stringify(nakelist));
+        // console.log(this.ladderlist);
+        let cat = "";
+        if (cat_info && cat_info.length > 0) {
+          cat_info.forEach((e, i) => {
+            cat += i === 0 ? e.name : "/" + e.name;
+          });
+        }
+        this.sitem.cat = cat;
+        this.sitem.platform_youzan_id = this.queryId;
+
+        if (!isArray(this.sitem.good_info_img)) {
+          this.sitem.good_info_img = this.sitem.good_info_img.split(",");
+        }
+        this.nakelist.forEach(async (si, sii) => {
+          si.start_sale_num = si.min_num;
+          let { isok, price, sale_cost_fee } = await this.get_new(sii);
+          if (isok === 0) {
+            this.nakelist[sii].sale_good_price = price;
+            this.nakelist[sii].sale_cost_fee = sale_cost_fee;
+            this.nakelist[sii].newTime = new Date().valueOf() + "";
+          } else if (isok >= 100 && isok <= 104) {
+            await this.logout();
+          } else {
+            this.nakelist[sii].sale_good_price = price;
+            this.nakelist[sii].sale_cost_fee = sale_cost_fee;
+            this.nakelist[sii].newTime = new Date().valueOf() + "";
+          }
+          this.$set(this.nakelist, sii, this.nakelist[sii]);
+        });
+
+        this.status = exam_status;
+        this.getNewTime();
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+    },
+    async get_new(index) {
+      const { min_num } = this.nakelist[index];
+      const { code, data, message } = await asyncRequest.goodupprice({
+        min_num: min_num,
+        platform_id: this.platform_id,
+        spuCode: this.spuCode,
+      });
+      const { sale_price, new_cost_fee } = data || {};
+      const resModel = {
+        isok: code,
+        price: code === 0 ? sale_price : "0",
+        sale_cost_fee: code === 0 ? new_cost_fee : "0",
+        message: message,
+      };
+      return resModel;
+    },
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.othgoodsOnlineDetail {
+  width: 100%;
+  box-sizing: border-box;
+  .othgoodsOnlineDetail-main {
+    padding: 10px 16px 200px 16px;
+    width: 100%;
+  }
+  .othgoodsOnlineDetail-title {
+    border-top: 1px solid #ebeef5;
+    span {
+      height: 50px;
+      line-height: 50px;
+      font-family: "微软雅黑", sans-serif;
+      font-weight: 400;
+      font-style: normal;
+      font-size: 16fpx;
+      text-align: left;
+    }
+  }
+  /deep/ .ddiv {
+    border-top: 1px solid #dcdfe6;
+  }
+  /deep/ .dtitle {
+    width: 40px;
+    text-align: center;
+    height: 100%;
+    min-height: 100%;
+    ul {
+      padding: 12px 0 0 0;
+    }
+  }
+  /deep/ .dmain {
+    padding: 20px 0 0 0;
+    width: calc(100% - 40px);
+    border-left: 1px solid #dcdfe6;
+  }
+}
+</style>

+ 12 - 15
src/views/youzan/othTransferOrderLog/index.vue

@@ -118,21 +118,7 @@
                   <span>{{ scope.row.address }}</span>
                 </el-form-item></el-col
               >
-              <el-col :span="6">
-                <el-form-item label="支付类型">
-                  <el-tag
-                    :size="tablebtnSize"
-                    :type="''"
-                    v-text="
-                      (
-                        pay_type_list.find(
-                          (item) => item.value == scope.row.pay_type + ''
-                        ) || {}
-                      ).label || '--'
-                    "
-                  ></el-tag> </el-form-item
-              ></el-col>
-              <el-col :span="18">
+              <el-col :span="24" v-if="scope.row.buyer_messages">
                 <el-form-item label="订单备注">
                   <span>{{ scope.row.buyer_messages }}</span>
                 </el-form-item>
@@ -140,6 +126,17 @@
             </el-row>
           </el-form>
         </template>
+
+        <template #pay_type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="''"
+            v-text="
+              (pay_type_list.find((item) => item.value == scope.row.pay_type + '') || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác