build

src/views/sellOut/sellOutOrder/columns.js

@@ -110,14 +110,14 @@ const columns = [
     label: '联系电话',
     width: '100'
   },
-  // {
-  //   prop: 'post_name',
-  //   label: '物流公司'
-  // },
-  // {
-  //   prop: 'post_code',
-  //   label: '物流单号'
-  // },
+  {
+    prop: 'post_name',
+    label: '物流公司'
+  },
+  {
+    prop: 'post_code',
+    label: '物流单号'
+  },
   {
     prop: 'post_fee',
     label: '物流费用'
@@ -219,17 +219,22 @@ const showColumns = [
     label: '创建时间',
     span: 6
   },
-  // {
-  //   prop: 'post_name',
-  //   label: '快递公司',
-  //   span: 6
-  // },
+  {
+    prop: 'post_code',
+    label: '物流编号',
+    span: 12
+  },
+  {
+    prop: 'post_name',
+    label: '快递公司',
+    span: 6
+  },
 
-  // {
-  //   prop: 'post_fee',
-  //   label: '物流费用',
-  //   span: 8
-  // },
+  {
+    prop: 'post_fee',
+    label: '物流费用',
+    span: 6
+  },
   {
     prop: 'contactor',
     label: '收货联系人',
@@ -246,11 +251,6 @@ const showColumns = [
     span: 12
   }
   // {
-  //   prop: 'post_code',
-  //   label: '物流编号',
-  //   span: 12
-  // },
-  // {
   //   prop: 'remark',
   //   label: '发货备注',
   //   span: 24

src/views/sellOut/sellOutOrder/detail.vue

@@ -59,7 +59,7 @@
                     "
                   ></el-tag>
                 </template>
-                <!-- <template slot="order_type">
+                <template slot="order_type">
                   <el-tag
                     :size="'mini'"
                     v-text="
@@ -70,7 +70,7 @@
                       ).label || '--'
                     "
                   ></el-tag>
-                </template> -->
+                </template>
                 <template slot="sale_price">
                   <!-- <span>{{
                     private_field &&
@@ -83,26 +83,11 @@
                 </template>
                 <template slot="total_price">
                   <span>
-                    <!-- {{private_field &&
-                    private_field.length > 0 &&
-                    private_field.some((item) => item == "2")
-                      ? sitem.total_price
-                      : "***"}} -->
                       {{displayPrivateField(isDisplayPrivateField('2'), sitem.sale_price)}}
                  </span>
                 </template>
 
-                <!-- <template slot="saleinfo">
-                  <el-table :data="sitem.saleinfo" size="mini" border>
-                    <el-table-column prop="bnCode" label="批次号" width="160" show-overflow-tooltip/>
-                    <el-table-column prop="wsm_code" label="仓库编号" width="170" show-overflow-tooltip/>
-                    <el-table-column prop="wsm_name" label="仓库名称" width="260" show-overflow-tooltip/>
-                    <el-table-column prop="num" label="批次数量" show-overflow-tooltip/>
-                    <el-table-column prop="send_num" label="可发货数量" width="100px" show-overflow-tooltip/>
-                    <el-table-column prop="th_num" label="退货数量" show-overflow-tooltip/>
-                    <el-table-column prop="origin_price" label="成本" show-overflow-tooltip/>
-                  </el-table>
-                </template> -->
+   
               </show-data-table>
             </el-collapse-item>
 

src/views/serviceParam/platformGrossProfit/index.vue

@@ -50,7 +50,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" style="width: 140px">
+            <!-- <el-col :span="4" style="width: 140px">
               <el-select
                 v-model="parmValue.status"
                 filterable
@@ -71,7 +71,7 @@
                   :value="item.code"
                 />
               </el-select>
-            </el-col>
+            </el-col> -->
             <el-col :span="4" style="width: 390px; padding: 0 0 0 10px">
               <search-terrace
                 :value="parmValue.platform_id"
@@ -213,7 +213,6 @@
         <el-tooltip
           v-if="powers.some((i) => i == '004') && scope.row.status + '' !== '1'"
           effect="dark"
-          content="启用"
           placement="top"
         >
           <i
@@ -331,12 +330,12 @@ export default {
           label: "分类等级",
           width: "80px",
         },
-        {
-          prop: "status",
-          label: "状态",
-          _slot_: "status",
-          width: "70px",
-        },
+        // {
+        //   prop: "status",
+        //   label: "状态",
+        //   _slot_: "status",
+        //   width: "70px",
+        // },
         // {
         //   prop: "platform_name",
         //   label: "平台名称",