xiaodai2022 il y a 2 ans
Parent
commit
796788c772

+ 6 - 3
src/views/orderEntry/orderConfirm/index.vue

@@ -21,10 +21,13 @@
       <el-tabs v-model="activeTabs">
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
         <el-tab-pane label="业务详情" name="1">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item title="采购单信息" name="1">
-              11
+            <el-collapse-item title="平台订单信息" name="1">
+              <el-row>
+                <el-col :span="6"></el-col>
+                <el-col :span="9"></el-col>
+                <el-col :span="9"></el-col>
+              </el-row>
             </el-collapse-item>
             </el-collapse-item>
-            <el-collapse-item title="商品信息" name="2"> 11 </el-collapse-item>
           </el-collapse>
           </el-collapse>
         </el-tab-pane>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="2">
         <el-tab-pane label="审批记录" name="2">

+ 3 - 2
src/views/sellOut/sellReturn/detail.vue

@@ -140,6 +140,7 @@
                 :type="sitem.order_type"
                 :type="sitem.order_type"
                 :skucode="sitem.skuCode"
                 :skucode="sitem.skuCode"
                 :spucode="sitem.good_code"
                 :spucode="sitem.good_code"
+                :iscgd="false"
               />
               />
             </el-collapse-item>
             </el-collapse-item>
 
 
@@ -330,7 +331,7 @@ export default {
     },
     },
     async setstatus(type, message, remark = "") {
     async setstatus(type, message, remark = "") {
       let _model = {
       let _model = {
-        returnCode: this.qid,
+        returnCode: this.queryId,
         status: type,
         status: type,
         remark: remark,
         remark: remark,
       };
       };
@@ -348,7 +349,7 @@ export default {
       }
       }
     },
     },
     async initData() {
     async initData() {
-      const res = await asyncRequest.detail({ returnCode: this.qid });
+      const res = await asyncRequest.detail({ returnCode: this.queryId });
       if (res && res.code === 0 && res.data) {
       if (res && res.code === 0 && res.data) {
         this.status = res.data.status;
         this.status = res.data.status;
         this.sitem = res.data;
         this.sitem = res.data;