xxxx

src/packages/mobile/views/spot/detail/Index.vue

@@ -87,6 +87,7 @@ import { queryOrderQuote, queryOrderQuoteDetail } from '@/services/api/goods'
 import eventBus from '@/services/bus'
 import AppList from '@mobile/components/base/list/index.vue'
 import Banner from '@mobile/components/base/banner/index.vue'
+import service from '@/services'
 
 const componentMap = new Map<string, unknown>([
     ['listing', defineAsyncComponent(() => import('./components/listing/index.vue'))], // 挂牌
@@ -97,7 +98,7 @@ const { getQueryString } = useNavigation()
 const { componentRef, componentId, openComponent, closeComponent } = useComponent()
 const quoteDetail = shallowRef<Model.OrderQuoteDetailRsp>() // 买卖详情
 const buyorsell = shallowRef(BuyOrSell.Buy) // 买卖方向
-
+const oem = service.getConfig('oem')
 const buyList = shallowRef<Model.OrderQuoteDetailRsp[]>([])
 const sellList = shallowRef<Model.OrderQuoteDetailRsp[]>([])
 const wrfactortypeid = getQueryString('wrfactortypeid')
@@ -123,11 +124,15 @@ const { runAsync: getOrderQuoteDetail } = useRequest(queryOrderQuoteDetail, {
     },
 })
 
-const columns: Model.TableColumn[] = [
+const columns: Model.TableColumn[] = oem != 'jyzx' ? [
     { prop: 'username', label: '挂牌方' },
     { prop: 'orderqty', label: '数量' },
     { prop: 'fixedprice', label: '价格' },
     { prop: 'operate', label: '操作' },
+] : [
+    { prop: 'orderqty', label: '数量' },
+    { prop: 'fixedprice', label: '价格' },
+    { prop: 'operate', label: '操作' },
 ]
 
 // 商品banner

src/packages/pc/components/modules/goods-detail/order/index.vue

@@ -35,6 +35,7 @@ import { useComposeTable } from '@pc/components/base/table'
 import { queryWrTradeOrderDetail } from '@/services/api/transfer'
 import { useLoginStore, useFuturesStore } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
+import service from '@/services'
 
 const props = defineProps({
     goodsId: {
@@ -50,6 +51,7 @@ const componentMap = new Map<string, unknown>([
 const loginStore = useLoginStore()
 const futuresStore = useFuturesStore()
 const quote = futuresStore.getGoodsQuote(props.goodsId)
+const oem = service.getConfig('oem')
 
 const { rowKey, expandKeys, selectedRow, rowClick } = useComposeTable<Model.WrTradeOrderDetailRsp>({ rowKey: 'orderid' })
 const { componentRef, componentId, openComponent, closeComponent } = useComponent()
@@ -70,17 +72,21 @@ const { dataList: sellList, run: getSellList } = useRequest(queryWrTradeOrderDet
     },
 })
 
-const buyColumns = shallowRef<Model.TableColumn[]>([
-    { prop: 'orderprice', label: '买价' },
-    { prop: 'orderqty', label: '买量' },
-    { prop: 'username', label: '购买方' },
-])
+const buyColumns = shallowRef<Model.TableColumn[]>(
+    oem != 'zrwyt' ? [{ prop: 'fixedprice', label: '买价' },
+                      { prop: 'orderqty', label: '买量' },
+                      { prop: 'username', label: '购买方' }] : 
+                      [{ prop: 'fixedprice', label: '买价' },
+                      { prop: 'orderqty', label: '买量' }]
+)
 
-const sellColumns = shallowRef<Model.TableColumn[]>([
-    { prop: 'orderprice', label: '卖价' },
-    { prop: 'orderqty', label: '卖量' },
-    { prop: 'username', label: '销售方' },
-])
+const sellColumns = shallowRef<Model.TableColumn[]>(
+    oem != 'zrwyt' ? [{ prop: 'fixedprice', label: '卖价' },
+                      { prop: 'orderqty', label: '卖量' },
+                      { prop: 'username', label: '销售方' }] : 
+                      [{ prop: 'fixedprice', label: '卖价' },
+                       { prop: 'orderqty', label: '卖量' }]
+)
 
 const showComponent = (componentName: string, row: Model.WrTradeOrderDetailRsp) => {
     selectedRow.value = row

src/packages/pc/views/footer/capital/summary/index.vue

@@ -88,7 +88,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
 /// 进行出入金操作判断
 const doInOutMoney = (code: string) => {
     /// 天津麦顿需要进行合同签署才能进行相关操作
-    if (oem === 'tjmd' && !canBankSign.value) {
+    if ( oem === 'tjmd' && !canBankSign.value && userStore.userInfo.usertype != 2 ) {
         ElMessage({ showClose: true, message: '请前往手机App进行合同签署操作!', })
         return
     }

src/packages/pc/views/market/trade/spot/order/index.vue

@@ -77,6 +77,7 @@ import { useComponent } from '@/hooks/component'
 import { useComposeTable } from '@pc/components/base/table'
 import { queryOrderQuote, queryOrderQuoteDetail } from '@/services/api/goods'
 import { useLoginStore } from '@/stores'
+import service from '@/services'
 import eventBus from '@/services/bus'
 import AppTable from '@pc/components/base/table/index.vue'
 
@@ -88,6 +89,7 @@ const props = defineProps({
 })
 
 const emit = defineEmits(['closed'])
+const oem = service.getConfig('oem')
 
 const componentMap = new Map<string, unknown>([
     ['listing', defineAsyncComponent(() => import('./listing/index.vue'))], // 挂牌
@@ -128,17 +130,21 @@ const { dataList: sellList, run: getSellList } = useRequest(queryOrderQuoteDetai
     },
 })
 
-const buyColumns = shallowRef<Model.TableColumn[]>([
-    { prop: 'fixedprice', label: '买价' },
-    { prop: 'orderqty', label: '买量' },
-    { prop: 'username', label: '购买方' },
-])
+const buyColumns = shallowRef<Model.TableColumn[]>(
+    oem != 'zrwyt' ? [{ prop: 'fixedprice', label: '买价' },
+                      { prop: 'orderqty', label: '买量' },
+                      { prop: 'username', label: '购买方' }] : 
+                      [{ prop: 'fixedprice', label: '买价' },
+                      { prop: 'orderqty', label: '买量' }]
+)
 
-const sellColumns = shallowRef<Model.TableColumn[]>([
-    { prop: 'fixedprice', label: '卖价' },
-    { prop: 'orderqty', label: '卖量' },
-    { prop: 'username', label: '销售方' },
-])
+const sellColumns = shallowRef<Model.TableColumn[]>(
+    oem != 'zrwyt' ? [{ prop: 'fixedprice', label: '卖价' },
+                      { prop: 'orderqty', label: '卖量' },
+                      { prop: 'username', label: '销售方' }] : 
+                      [{ prop: 'fixedprice', label: '卖价' },
+                       { prop: 'orderqty', label: '卖量' }]
+)
 
 const showComponent = (componentName: string, row: Model.OrderQuoteDetailRsp) => {
     quoteDetail.value = row

src/packages/sbyj/views/mine/index.vue

@@ -150,7 +150,7 @@ const onReady = (el: HTMLDivElement) => {
 const doInOutMoney = (tab: string) => {
     if (authStatus.value === AuthStatus.Certified) {
         /// 当前未签署合同
-        if (!canBankSign.value) {
+        if (!canBankSign.value && userStore.userInfo.usertype != 2) {
             dialog({
                 message: '请先去签署合同条例！',
                 showCancelButton: true,

src/packages/tjmd/views/mine/Index.vue

@@ -173,7 +173,7 @@ const onReady = (el: HTMLDivElement) => {
 const doInOutMoney = (tab: string) => {
     if (authStatus.value === AuthStatus.Certified) {
         /// 当前未签署合同
-        if (!canBankSign.value) {
+        if (!canBankSign.value && userStore.userInfo.usertype != 2) {
             dialog({
                 message: '请先去签署合同条例！',
                 showCancelButton: true,