Merge branch 'v3.0' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into v3.0

src/views/goodStore/goodsOnline/detail.vue

@@ -143,10 +143,11 @@
               <show-data-table
                 :newTime="newTime"
                 v-if="
-                  newTime !== '' &&
-                  private_field &&
-                  private_field.length > 0 &&
-                  private_field.some((item) => item == '1')
+                  // newTime !== '' &&
+                  // private_field &&
+                  // private_field.length > 0 &&
+                  // private_field.some((item) => item == '1')
+                  isDisplayPrivateField('1')
                 "
                 :sitem="sitem"
                 :columns="purchase_listCol"
@@ -310,9 +311,10 @@ import {
   options7,
   options8,
 } from "./columns";
+import privateField from "@/mixins/privateField";
 export default {
   name: "goodsOnlineDetail",
-  mixins: [resToken],
+  mixins: [resToken,privateField],
   components: {
     onlineForm,
     processRemarkTimeLine,

src/views/youzan/othgoodsOnline/index.vue

@@ -374,9 +374,10 @@ import { mapGetters } from "vuex";
 import urlConfig from "@/apis/url-config";
 import resToken from "@/mixins/resToken";
 import { listCol, options1, options8 } from "./columns";
+import companyHelper from "@/mixins/companyHelper";
 export default {
   name: "othgoodsOnline",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken,companyHelper],
   computed: {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube"]),
@@ -804,7 +805,10 @@ export default {
       model.company_name = this.select === "9" ? this.sinput : ""; // 部门
       model.online_creater = this.select === "10" ? this.sinput : ""; // 上线创建人
 
-      const { code, data, message } = await asyncRequest.list(model);
+      const { code, data, message } = await asyncRequest.list({
+        ...model,
+        needRela: true
+      });
       if (code === 0) {
         const { list, count } = data ?? {};
         this.tableData = list ?? [];