xiaodai2022 2 rokov pred
rodič
commit
856bd34eae
1 zmenil súbory, kde vykonal 109 pridanie a 33 odobranie
  1. 109 33
      src/views/orderEntry/orderConfirm/index.vue

+ 109 - 33
src/views/orderEntry/orderConfirm/index.vue

@@ -28,30 +28,98 @@
                 <el-col :span="7">系统解析数据</el-col>
                 <el-col :span="10">确认后的数据</el-col>
               </el-row>
+              <div v-if="importSitem && importSitem.plat_code">
                 <el-row class="tab-title">
-                <el-col :span="3">平台订单号</el-col>
-                <el-col :span="4">文件导入数据</el-col>
-                <el-col :span="7">系统解析数据</el-col>
-                <el-col :span="10">确认后的数据</el-col>
-              </el-row>
+                  <el-col :span="3">平台订单号</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
                 <el-row class="tab-title">
-                <el-col :span="3">平台订单下单时间</el-col>
-                <el-col :span="4">文件导入数据</el-col>
-                <el-col :span="7">系统解析数据</el-col>
-                <el-col :span="10">确认后的数据</el-col>
-              </el-row>
+                  <el-col :span="3">平台订单下单时间</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
                 <el-row class="tab-title">
-                <el-col :span="3">平台商品编号</el-col>
-                <el-col :span="4">文件导入数据</el-col>
-                <el-col :span="7">系统解析数据</el-col>
-                <el-col :span="10">确认后的数据</el-col>
-              </el-row>
+                  <el-col :span="3">平台商品编号</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
                 <el-row class="tab-title">
-                <el-col :span="3">销售渠道</el-col>
-                <el-col :span="4">文件导入数据</el-col>
-                <el-col :span="7">系统解析数据</el-col>
-                <el-col :span="10">确认后的数据</el-col>
-              </el-row>
+                  <el-col :span="3">销售渠道</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
+                <el-row class="tab-title">
+                  <el-col :span="3">订单单价</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
+                <el-row class="tab-title">
+                  <el-col :span="3">销售数量</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
+                <el-row class="tab-title">
+                  <el-col :span="3">订单总金额</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
+                <el-row class="tab-title">
+                  <el-col :span="3">活动名称</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
+                <el-row class="tab-title">
+                  <el-col :span="3">优惠金额</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
+                <el-row class="tab-title">
+                  <el-col :span="3">优惠后的金额</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
+                <el-row class="tab-title">
+                  <el-col :span="3">收费模式</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
+                <el-row class="tab-title">
+                  <el-col :span="3">订单备注</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
+                <el-row class="tab-title">
+                  <el-col :span="3">收货人</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
+                <el-row class="tab-title">
+                  <el-col :span="3">收货电话</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
+                <el-row class="tab-title">
+                  <el-col :span="3">收货地址</el-col>
+                  <el-col :span="4">{{ importSitem.platform_code }}</el-col>
+                  <el-col :span="7">系统解析数据</el-col>
+                  <el-col :span="10">确认后的数据</el-col>
+                </el-row>
+              </div>
             </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
@@ -100,6 +168,8 @@ export default {
       finishStatus: "finish",
       activeNames: ["0", "1", "2", "3", "4", "5", "10"],
       sitem: null,
+      importSitem: null,
+      confirmSitem: null,
       status: "",
       newTime: "",
       loading: false,
@@ -112,7 +182,6 @@ export default {
     this.initData();
   },
   methods: {
-   
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
@@ -125,22 +194,19 @@ export default {
     },
     async initData() {
       this.loading = true;
-      const res = await asyncRequest.detail({ id: this.queryId });
-      if (res && res.code === 0 && res.data) {
-        this.sitem = res.data;
-        const { status, can, cgdNo } = this.sitem;
+      const { code, data, message } = await asyncRequest.detail({
+        id: this.queryId,
+      });
+      if (code === 0) {
+        const { status, import: simport, confirm } = data;
         this.status = status;
-        if (can && can.length > 0) {
-          this.sitem.class_cat = "";
-          can.forEach((x, i) => {
-            this.sitem.class_cat += i === 0 ? x.name : "/" + x.name;
-          });
-        }
+        this.importSitem = JSON.parse(JSON.stringify(simport));
+        this.confirmSitem = JSON.parse(JSON.stringify(confirm));
         this.getNewTime();
-      } else if (res && res.code >= 100 && res.code <= 104) {
+      } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
-        this.$message.warning(res.message);
+        this.$message.warning(message);
       }
       this.loading = false;
     },
@@ -178,6 +244,16 @@ export default {
 </script>
    <style lang="scss" scoped>
 .orderConfirm {
+  .tab-title {
+    border-left: 1px solid #eee;
+    border-top: 1px solid #eee;
+    display: flex;
+    align-items: stretch;
+    .el-col {
+      padding: 3px 5px;
+      border-right: 1px solid #eee;
+    }
+  }
 }
 </style>