huangbin 4 년 전
부모
커밋
70247012ba

+ 1 - 1
public/config/app.config.json

@@ -1,3 +1,3 @@
 {
-    "apiUrl": "http://192.168.31.136:8080/cfg?key=test_136"
+    "apiUrl": "http://218.17.158.45:21001/cfg?key=test_118"
 }

+ 1 - 0
src/services/go/wrtrade/index.ts

@@ -101,6 +101,7 @@ export function queryWrSpecialMatchOrder(req: QueryWrSpecialMatchOrderReq): Prom
  * 查询仓单成交明细 /WrTrade2/QueryWrTradeDetail
  */
 export function queryWrTradeDetail(req: QueryWrTradeDetailReq): Promise<WrTradeDetail[]> {
+    req.userid = getUsrId();
     return commonSearch_go('/WrTrade2/QueryWrTradeDetail', req).catch((err) => {
         throw new Error(`查询仓单成交明细: ${err}`);
     });

+ 5 - 5
src/services/request/serviceURL.ts

@@ -80,10 +80,10 @@ export const setServiceURL = (config: URL): void => {
     // console.log('URL', config);
     //外网环境(175),外包同事使用
     serviceURL = config;
-    // if (process.env.NODE_ENV === 'development') {
-    //     serviceURL.goCommonSearchUrl = 'http://218.17.158.45:21001/api';
-    //     serviceURL.quoteUrl = 'ws://218.17.158.45:21004';
-    //     serviceURL.tradeUrl = 'ws://218.17.158.45:21005';
-    // }
+    if (process.env.NODE_ENV === 'development') {
+        serviceURL.goCommonSearchUrl = 'http://218.17.158.45:21001/api';
+        serviceURL.quoteUrl = 'ws://218.17.158.45:21004';
+        serviceURL.tradeUrl = 'ws://218.17.158.45:21005';
+    }
     console.log(serviceURL);
 };

+ 24 - 26
src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_designated_deal/index.vue

@@ -1,29 +1,27 @@
 <template>
-    <!-- 指定成交 -->
-    <section>
-        <a-table
-            :columns="columns"
-            class="srcollYTable"
-            :scroll="{ x: '100%', y: '227px' }"
-            :pagination="false"
-            :loading="loading"
-            :expandedRowKeys="expandedRowKeys"
-            :customRow="Rowclick"
-            rowKey="key"
-            :data-source="tableList"
-        >
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <BtnList :btnList="btnList" :record="record" @click="openComponent" />
-            </template>
-        </a-table>
-        <component
-            :is="componentId"
-            v-if="componentId"
-            :selectedRow="selectedRow"
-            @cancel="closeComponent"
-        ></component>
-    </section>
+  <!-- 指定成交 -->
+  <section>
+    <a-table :columns="columns"
+             class="srcollYTable"
+             :scroll="{ x: '100%', y: '227px' }"
+             :pagination="false"
+             :loading="loading"
+             :expandedRowKeys="expandedRowKeys"
+             :customRow="Rowclick"
+             rowKey="key"
+             :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <BtnList :btnList="btnList"
+                 :record="record"
+                 @click="openComponent" />
+      </template>
+    </a-table>
+    <component :is="componentId"
+               v-if="componentId"
+               :selectedRow="selectedRow"
+               @cancel="closeComponent"></component>
+  </section>
 </template>
 
 <script lang="ts">
@@ -47,7 +45,7 @@ export default defineComponent({
             const param: QueryWrSpecialMatchOrderReq = {
                 haswr: 0,
             };
-            queryTable(queryWrSpecialMatchOrder, param);
+            queryTable(queryWrTradeDetail, param);
         };
         // 表格通用逻辑
         const param: ComposeOrderTableParam = {