1

src/views/orderEntry/orderConfirm/index.vue

@@ -58,12 +58,12 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div>{{ importSitem.platform_code }}</div>
-                  <div>{{ importSitem.po_code }}</div>
+                  <div style="min-height: 26px">{{ importSitem.platform_code }}</div>
+                  <div style="min-height: 26px">{{ importSitem.po_code }}</div>
                 </el-col>
                 <el-col :span="9">
-                  <div>{{ confirmSitem.platform_code }}</div>
-                  <div>{{ confirmSitem.po_code }}</div>
+                  <div style="min-height: 26px">{{ confirmSitem.platform_code }}</div>
+                  <div style="min-height: 26px">{{ confirmSitem.po_code }}</div>
                 </el-col>
                 <el-col :span="11" class="nop">
                   <el-row>
@@ -100,12 +100,12 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div>{{ importSitem.platform_time }}</div>
-                  <div>{{ importSitem.plat_code }}</div>
+                  <div style="min-height: 26px">{{ importSitem.platform_time }}</div>
+                  <div style="min-height: 26px">{{ importSitem.plat_code }}</div>
                 </el-col>
                 <el-col :span="9"
-                  ><div>{{ confirmSitem.platform_time }}</div>
-                  <div>{{ confirmSitem.plat_code }}</div>
+                  ><div style="min-height: 26px">{{ confirmSitem.platform_time }}</div>
+                  <div style="min-height: 26px">{{ confirmSitem.plat_code }}</div>
                   <div v-if="conGoodData && conGoodData.good_thumb_img">
                     <show-data-table
                       :sitem="conGoodData"
@@ -358,12 +358,12 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div>{{ importSitem.mode }}</div>
-                  <div>{{ importSitem.sale_source }}</div>
+                  <div style="min-height: 26px">{{ importSitem.mode }}</div>
+                  <div style="min-height: 26px">{{ importSitem.sale_source }}</div>
                 </el-col>
                 <el-col :span="9">
-                  <div>{{ confirmSitem.mode }}</div>
-                  <div>{{ confirmSitem.sale_source }}</div></el-col
+                  <div style="min-height: 26px">{{ confirmSitem.mode }}</div>
+                  <div style="min-height: 26px">{{ confirmSitem.sale_source }}</div></el-col
                 >
                 <el-col :span="11" class="nop">
                   <el-row>
@@ -415,18 +415,18 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div>
+                  <div style="min-height: 26px">
                     {{ importSitem.contactor }}
                   </div>
-                  <div>
+                  <div style="min-height: 26px">
                     {{ importSitem.mobile }}
                   </div>
                 </el-col>
                 <el-col :span="9">
-                  <div>
+                  <div style="min-height: 26px">
                     {{ confirmSitem.contactor }}
                   </div>
-                  <div>
+                  <div style="min-height: 26px">
                     {{ confirmSitem.mobile }}
                   </div></el-col
                 >
@@ -467,13 +467,13 @@
               <el-row class="tab-title">
                 <el-col :span="4">
                   <div style="min-height: 26px">&nbsp;</div>
-                  <div>{{ importSitem.addr }}</div></el-col
+                  <div style="min-height: 26px">{{ importSitem.addr }}</div></el-col
                 >
                 <el-col :span="9">
                   <div style="min-height: 26px">
                     {{ confirmSitem.addr_name }}&nbsp;
                   </div>
-                  <div>{{ confirmSitem.addr }}</div>
+                  <div style="min-height: 26px">{{ confirmSitem.addr }}</div>
                 </el-col>
                 <el-col :span="11" class="nop">
                   <el-row>
@@ -510,8 +510,8 @@
             </div>
             <div class="tab-item-main">
               <el-row class="tab-title">
-                <el-col :span="4">{{ importSitem.order_remark }}</el-col>
-                <el-col :span="9">{{ confirmSitem.order_remark }}</el-col>
+                <el-col :span="4" style="min-height: 26px">{{ importSitem.order_remark }}</el-col>
+                <el-col :span="9" style="min-height: 26px">{{ confirmSitem.order_remark }}</el-col>
                 <el-col :span="11">
                   <el-form-item prop="order_remark">
                     <el-input
@@ -532,12 +532,12 @@
             <div class="tab-item-main">
               <el-row class="tab-title">
                 <el-col :span="4">
-                  <div>{{ importSitem.num }}</div>
-                  <div>{{ importSitem.price }}</div>
+                  <div style="min-height: 26px">{{ importSitem.num }}</div>
+                  <div style="min-height: 26px">{{ importSitem.price }}</div>
                 </el-col>
                 <el-col :span="9">
-                  <div>{{ confirmSitem.num }}</div>
-                  <div>{{ confirmSitem.price }}</div>
+                  <div style="min-height: 26px">{{ confirmSitem.num }}</div>
+                  <div style="min-height: 26px">{{ confirmSitem.price }}</div>
                 </el-col>
                 <el-col :span="11" class="nop">
                   <el-row>
@@ -587,8 +587,8 @@
             </div>
             <div class="tab-item-main">
               <el-row class="tab-title">
-                <el-col :span="4">{{ importSitem.activity_name }}</el-col>
-                <el-col :span="9">{{ confirmSitem.activity_name }}</el-col>
+                <el-col :span="4" style="min-height: 26px">{{ importSitem.activity_name }}</el-col>
+                <el-col :span="9" style="min-height: 26px">{{ confirmSitem.activity_name }}</el-col>
                 <el-col :span="11">
                   <el-form-item prop="activity_code">
                     <el-select
@@ -618,13 +618,13 @@
             </div>
             <div class="tab-item-main">
               <el-row class="tab-title">
-                <el-col :span="4">{{
+                <el-col :span="4" style="min-height: 26px">{{
                   importSitem.before_discount_all_price
                 }}</el-col>
-                <el-col :span="9">{{
+                <el-col :span="9" style="min-height: 26px">{{
                   confirmSitem.before_discount_all_price
                 }}</el-col>
-                <el-col :span="11">
+                <el-col :span="11" style="min-height: 26px">
                   {{ ruleForm.before_discount_all_price }}</el-col
                 >
               </el-row>

src/views/sellOut/sellReturn/detail.vue

@@ -147,7 +147,11 @@
               title="业务审核"
               name="3"
               v-if="
-                sitem  &&
+                !(
+                  (sitem.order_type === '1' || sitem.order_type === '2') &&
+                  is_stock === '1'
+                ) &&
+                sitem &&
                 powers.some((item) => item == '041') &&
                 status === '1'
               "
@@ -167,7 +171,11 @@
               name="4"
               v-if="
                 sitem &&
-                (status === '4' || status === '3' || status === '2')
+                (status === '4' || status === '3' || status === '2') &&
+                !(
+                  (sitem.order_type === '1' || sitem.order_type === '2') &&
+                  is_stock === '1'
+                )
               "
             >
               <com-exam-form
@@ -190,7 +198,11 @@
               v-if="
                 sitem &&
                 powers.some((item) => item == '036') &&
-                status === '3'
+                status === '3' &&
+                !(
+                  (sitem.order_type === '1' || sitem.order_type === '2') &&
+                  is_stock === '1'
+                )
               "
             >
               <exam-form
@@ -286,6 +298,7 @@ export default {
       ],
       newTime: "",
       loading: false,
+      is_stock: "",
       queryId: "",
     };
   },
@@ -346,15 +359,19 @@ export default {
       }
     },
     async initData() {
-      const res = await asyncRequest.detail({ returnCode: this.queryId });
-      if (res && res.code === 0 && res.data) {
-        this.status = res.data.status;
-        this.sitem = res.data;
+      const { code, data, message } = await asyncRequest.detail({
+        returnCode: this.queryId,
+      });
+      if (code === 0) {
+        const { is_stock, status } = data;
+        this.is_stock = is_stock;
+        this.status = status;
+        this.sitem = data;
         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);
       }
     },
   },