huangbin пре 4 година
родитељ
комит
b4cb54abba
24 измењених фајлова са 111 додато и 132 уклоњено
  1. 2 2
      src/views/business/exposure/list/futures/index.vue
  2. 2 2
      src/views/business/exposure/list/realTime/index.vue
  3. 2 2
      src/views/business/exposure/list/spot/index.vue
  4. 1 1
      src/views/business/plan/list/audit/index.vue
  5. 1 1
      src/views/business/plan/list/running/index.vue
  6. 1 1
      src/views/business/plan/list/uncommitted/index.vue
  7. 0 0
      src/views/business/purchase/components/setup.ts
  8. 7 7
      src/views/business/purchase/list/all/index.vue
  9. 2 2
      src/views/business/purchase/list/pending/index.vue
  10. 1 1
      src/views/business/purchase/list/performance/index.vue
  11. 1 1
      src/views/business/sell/list/all/index.vue
  12. 1 1
      src/views/business/sell/list/pending/index.vue
  13. 1 1
      src/views/business/sell/list/performance/index.vue
  14. 3 3
      src/views/information/custom/list/stop-use/index.vue
  15. 16 20
      src/views/information/spot-contract/list/finished/index.vue
  16. 18 21
      src/views/information/spot-contract/list/performance/index.vue
  17. 44 58
      src/views/information/warehouse-info/list/normal-use/index.vue
  18. 2 2
      src/views/information/warehouse-info/list/stop-use/index.vue
  19. 1 1
      src/views/manage/business-review/list/settlement/index.vue
  20. 1 1
      src/views/manage/business-review/list/someprice/index.vue
  21. 1 1
      src/views/manage/finance-review/list/funds/index.vue
  22. 1 1
      src/views/manage/finance-review/list/invoice/index.vue
  23. 1 1
      src/views/manage/inventory-review/list/checkin/index.vue
  24. 1 1
      src/views/manage/inventory-review/list/checkout/index.vue

+ 2 - 2
src/views/business/exposure/list/futures/index.vue

@@ -7,7 +7,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                :pagination="false"
@@ -23,7 +23,7 @@
               @close="closeDrawer">
       <div>
         <a-table :columns="detailColumns"
-                 class="topTable"
+                 class="topTable hiddenFirstCol"
                  :pagination="false"
                  rowKey="key"
                  :data-source="detailTableList">

+ 2 - 2
src/views/business/exposure/list/realTime/index.vue

@@ -7,7 +7,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                :pagination="false"
@@ -23,7 +23,7 @@
               @close="closeDrawer">
       <div>
         <a-table :columns="detailColumns"
-                 class="topTable"
+                 class="topTable hiddenFirstCol"
                  :pagination="false"
                  rowKey="key"
                  :data-source="detailTableList">

+ 2 - 2
src/views/business/exposure/list/spot/index.vue

@@ -7,7 +7,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                :pagination="false"
@@ -23,7 +23,7 @@
               @close="closeDrawer">
       <div>
         <a-table :columns="detailColumns"
-                 class="topTable"
+                 class="topTable hiddenFirstCol"
                  :pagination="false"
                  rowKey="key"
                  :data-source="detailTableList">

+ 1 - 1
src/views/business/plan/list/audit/index.vue

@@ -7,7 +7,7 @@
     </Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"

+ 1 - 1
src/views/business/plan/list/running/index.vue

@@ -7,7 +7,7 @@
     </Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"

+ 1 - 1
src/views/business/plan/list/uncommitted/index.vue

@@ -7,7 +7,7 @@
     </Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"

+ 0 - 0
src/views/business/purchase/components/setup.ts


+ 7 - 7
src/views/business/purchase/list/all/index.vue

@@ -7,7 +7,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
@@ -26,17 +26,17 @@
       </a-table>
     </contextMenu>
     <!-- 详情 -->
-    <Detail  :selectedRow="selectedRow"/>
+    <Detail :selectedRow="selectedRow" />
     <!-- 采购点价登记 -->
-    <SomePrice  :selectedRow="selectedRow"/>
+    <SomePrice :selectedRow="selectedRow" />
     <!-- 交收登记 -->
-    <Settlement  :selectedRow="selectedRow"/>
+    <Settlement :selectedRow="selectedRow" />
     <!-- 款项登记 -->
-    <Funds  :selectedRow="selectedRow"/>
+    <Funds :selectedRow="selectedRow" />
     <!-- 发票登记 -->
-    <Invoice  :selectedRow="selectedRow"/>
+    <Invoice :selectedRow="selectedRow" />
     <!-- 入库登记 -->
-    <Storage  :selectedRow="selectedRow"/>
+    <Storage :selectedRow="selectedRow" />
   </div>
 </template>
 

+ 2 - 2
src/views/business/purchase/list/pending/index.vue

@@ -7,7 +7,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
@@ -28,7 +28,7 @@
     <!-- 详情 -->
     <Detail :selectedRow="selectedRow" />
     <!-- 采购点价登记 -->
-    <SomePrice :selectedRow="selectedRow"/>
+    <SomePrice :selectedRow="selectedRow" />
   </div>
 </template>
 

+ 1 - 1
src/views/business/purchase/list/performance/index.vue

@@ -7,7 +7,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"

+ 1 - 1
src/views/business/sell/list/all/index.vue

@@ -7,7 +7,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"

+ 1 - 1
src/views/business/sell/list/pending/index.vue

@@ -7,7 +7,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"

+ 1 - 1
src/views/business/sell/list/performance/index.vue

@@ -7,7 +7,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                :pagination="false"

+ 3 - 3
src/views/information/custom/list/stop-use/index.vue

@@ -7,7 +7,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                :pagination="false"
@@ -32,13 +32,13 @@
     <AddCustom />
     <!-- 详情 -->
     <CustomDetail :selectedRow="selectedRow"
-                  @refresh="queryTable"/>
+                  @refresh="queryTable" />
     <!-- 删除 -->
     <DeleteCustom :selectedRow="selectedRow"
                   @refresh="queryTable" />
     <!-- 恢复客户资料 -->
     <RecoverCustom :selectedRow="selectedRow"
-                   @refresh="queryTable"/>
+                   @refresh="queryTable" />
   </div>
 </template>
 

+ 16 - 20
src/views/information/spot-contract/list/finished/index.vue

@@ -7,7 +7,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
@@ -20,27 +20,28 @@
         <!-- <template #userinfotype="{ text }">
           <a>{{ text === '2' ? '企业' : '个人'}}</a>
         </template> -->
-          <template #biztype="{ text }">
-              <a>{{ getBizTypeName(text) }}</a>
-          </template>
+        <template #biztype="{ text }">
+          <a>{{ getBizTypeName(text) }}</a>
+        </template>
 
-          <template #pricetype="{ text }">
-              <a>{{ getPriceTypeName(text) }}</a>
-          </template>
+        <template #pricetype="{ text }">
+          <a>{{ getPriceTypeName(text) }}</a>
+        </template>
 
-          <template #contracctstatus="{ text }">
-              <a>{{ getContractStatusName(text) }}</a>
-          </template>
+        <template #contracctstatus="{ text }">
+          <a>{{ getContractStatusName(text) }}</a>
+        </template>
 
-          <template #contracttype="{ text }">
-              <a>{{ getContractTypeName(text) }}</a>
-          </template>
+        <template #contracttype="{ text }">
+          <a>{{ getContractTypeName(text) }}</a>
+        </template>
       </a-table>
     </contextMenu>
     <!-- 新增现货合同 -->
     <AddSpotContract />
     <!-- 现货合同: 详情 -->
-    <SpotContractDeatil :selectedRow="selectedRow" @refresh="queryTable"/>
+    <SpotContractDeatil :selectedRow="selectedRow"
+                        @refresh="queryTable" />
   </div>
 </template>
 
@@ -49,12 +50,7 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 import { AddSpotContract, SpotContractDeatil, filterCustomTable } from '../../components';
 
 import { queryTableList, getFilterTableCB, Ermcp3ContractRsp } from '../index';
-import {
-    getBizTypeName,
-    getContractStatusName,
-    getContractTypeName,
-    getPriceTypeName
-} from "@/views/information/spot-contract/setup";
+import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 
 export default defineComponent({
     name: 'spot-contract-done',

+ 18 - 21
src/views/information/spot-contract/list/performance/index.vue

@@ -7,7 +7,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
@@ -20,27 +20,29 @@
         <!-- <template #userinfotype="{ text }">
           <a>{{ text === '2' ? '企业' : '个人'}}</a>
         </template> -->
-          <template #biztype="{ text }">
-              <a>{{ getBizTypeName(text) }}</a>
-          </template>
+        <template #biztype="{ text }">
+          <a>{{ getBizTypeName(text) }}</a>
+        </template>
 
-          <template #pricetype="{ text }">
-              <a>{{ getPriceTypeName(text) }}</a>
-          </template>
+        <template #pricetype="{ text }">
+          <a>{{ getPriceTypeName(text) }}</a>
+        </template>
 
-          <template #contracctstatus="{ text }">
-              <a>{{ getContractStatusName(text) }}</a>
-          </template>
+        <template #contracctstatus="{ text }">
+          <a>{{ getContractStatusName(text) }}</a>
+        </template>
 
-          <template #contracttype="{ text }">
-              <a>{{ getContractTypeName(text) }}</a>
-          </template>
+        <template #contracttype="{ text }">
+          <a>{{ getContractTypeName(text) }}</a>
+        </template>
       </a-table>
     </contextMenu>
     <!-- 现货合同: 详情 -->
-    <SpotContractDeatil :selectedRow="selectedRow" @refresh="queryTable"/>
+    <SpotContractDeatil :selectedRow="selectedRow"
+                        @refresh="queryTable" />
     <!-- 现货合同: 正常完结 -->
-    <Finish :selectedRow="selectedRow" @refresh="queryTable"/>
+    <Finish :selectedRow="selectedRow"
+            @refresh="queryTable" />
   </div>
 </template>
 
@@ -49,12 +51,7 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 import { AddSpotContract, SpotContractDeatil, filterCustomTable, Finish } from '../../components';
 
 import { queryTableList, getFilterTableCB, Ermcp3ContractRsp } from '../index';
-import {
-    getBizTypeName,
-    getContractStatusName,
-    getContractTypeName,
-    getPriceTypeName
-} from "@/views/information/spot-contract/setup";
+import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 
 export default defineComponent({
     name: 'spot-contract-performance',

+ 44 - 58
src/views/information/warehouse-info/list/normal-use/index.vue

@@ -1,61 +1,47 @@
 <template>
-    <!-- 仓库信息: 正常 -->
-    <div class="warehouse-info-normal"
-         :loading="loading">
-        <filterCustomTable @search="search">
-            <BtnList :btnList="commonBtn"/>
-        </filterCustomTable>
-        <contextMenu :contextMenuList="forDataBtn">
-            <a-table :columns="columns"
-                     class="topTable"
-                     :pagination="false"
-                     :expandedRowKeys="expandedRowKeys"
-                     :customRow="Rowclick"
-                     rowKey="key"
-                     :data-source="tableList">
-                <!-- 额外的展开行 -->
-                <template #expandedRowRender="{  }">
-                    <BtnList :btnList="forDataBtn"/>
-                </template>
-                <template #warehousetype="{ text }">
-                    <span>{{ getWareHouseTypeName(text) }}</span>
-                </template>
-                <template #warehousestatus="{ text }">
-                    <span>{{ gerWareHouseStatusName(text) }}</span>
-                </template>
-            </a-table>
-        </contextMenu>
-        <!-- 新增仓库信息 -->
-        <Add/>
-        <!-- 停用仓库信息 -->
-        <Disable :selectedRow="selectedRow"
-                 @refresh="queryTable"/>
-        <!-- 仓库信息详情 -->
-        <Detail :selectedRow="selectedRow"
-                @refresh="queryTable"/>
-        <!-- 修改仓息库信 -->
-        <Modify/>
-    </div>
+  <!-- 仓库信息: 正常 -->
+  <div class="warehouse-info-normal"
+       :loading="loading">
+    <filterCustomTable @search="search">
+      <BtnList :btnList="commonBtn" />
+    </filterCustomTable>
+    <contextMenu :contextMenuList="forDataBtn">
+      <a-table :columns="columns"
+               class="topTable hiddenFirstCol"
+               :pagination="false"
+               :expandedRowKeys="expandedRowKeys"
+               :customRow="Rowclick"
+               rowKey="key"
+               :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{  }">
+          <BtnList :btnList="forDataBtn" />
+        </template>
+        <template #warehousetype="{ text }">
+          <span>{{ getWareHouseTypeName(text) }}</span>
+        </template>
+        <template #warehousestatus="{ text }">
+          <span>{{ gerWareHouseStatusName(text) }}</span>
+        </template>
+      </a-table>
+    </contextMenu>
+    <!-- 新增仓库信息 -->
+    <Add />
+    <!-- 停用仓库信息 -->
+    <Disable :selectedRow="selectedRow"
+             @refresh="queryTable" />
+    <!-- 仓库信息详情 -->
+    <Detail :selectedRow="selectedRow"
+            @refresh="queryTable" />
+    <!-- 修改仓息库信 -->
+    <Modify />
+  </div>
 </template>
 
 <script lang="ts">
-import {
-    defineComponent,
-    initData,
-    getTableColumns,
-    getTableEvent,
-    getBtnList,
-    contextMenu,
-    BtnList
-} from '@/common/export/table';
-import {filterCustomTable, Add, Disable, Detail, Modify} from '../../compoments';
-import {
-    gerWareHouseStatusName,
-    getWareHouseTypeName,
-    queryTableList,
-    getFilterTableCB,
-    ErmcpWareHouseInfo
-} from '../index';
+import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+import { filterCustomTable, Add, Disable, Detail, Modify } from '../../compoments';
+import { gerWareHouseStatusName, getWareHouseTypeName, queryTableList, getFilterTableCB, ErmcpWareHouseInfo } from '../index';
 
 export default defineComponent({
     name: 'warehouse-info-normal',
@@ -70,13 +56,13 @@ export default defineComponent({
     },
     setup() {
         // 表头数据
-        const {columns, registerColumn, updateColumn, filteredInfo} = getTableColumns();
+        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
         // 表格事件
-        const {expandedRowKeys, selectedRow, Rowclick} = getTableEvent<ErmcpWareHouseInfo>({});
+        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<ErmcpWareHouseInfo>({});
         // 表格操作按钮列表
-        const {commonBtn, forDataBtn} = getBtnList('warehouse_info_normal', true);
+        const { commonBtn, forDataBtn } = getBtnList('warehouse_info_normal', true);
         // 表格列表数据
-        const {loading, tableList, queryTable} = queryTableList('1');
+        const { loading, tableList, queryTable } = queryTableList('1');
         initData(() => {
             // 获取列表数据
             queryTable();

+ 2 - 2
src/views/information/warehouse-info/list/stop-use/index.vue

@@ -6,7 +6,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
@@ -28,7 +28,7 @@
     <Add />
     <!-- 恢复仓库信息 -->
     <Recover :selectedRow="selectedRow"
-             @refresh="queryTable"/>
+             @refresh="queryTable" />
   </div>
 </template>
 

+ 1 - 1
src/views/manage/business-review/list/settlement/index.vue

@@ -7,7 +7,7 @@
     </Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"

+ 1 - 1
src/views/manage/business-review/list/someprice/index.vue

@@ -7,7 +7,7 @@
     </Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"

+ 1 - 1
src/views/manage/finance-review/list/funds/index.vue

@@ -7,7 +7,7 @@
     </Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"

+ 1 - 1
src/views/manage/finance-review/list/invoice/index.vue

@@ -7,7 +7,7 @@
     </Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"

+ 1 - 1
src/views/manage/inventory-review/list/checkin/index.vue

@@ -8,7 +8,7 @@
     </Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"

+ 1 - 1
src/views/manage/inventory-review/list/checkout/index.vue

@@ -8,7 +8,7 @@
     </Filter>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable"
+               class="topTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"