commit 出库详情

src/common/methods/table/interface.ts

@@ -49,6 +49,7 @@ export interface TableKey {
     table_pcweb_someprice_detail_js: "string; // 现货合同详情-交收记录"
     table_pcweb_someprice_detail_kx: "string; // 现货合同详情-款项记录"
     table_pcweb_someprice_detail_stock: "string; // 现货合同详情-入库记录"
+    table_pcweb_someprice_detail_stock_out: "string; // 现货合同详情-出库记录"
     table_pcweb_stock_aduit_in: "string; // 库存审核-入库"
     table_pcweb_stock_aduit_out: "string; // 库存审核-出库"
     table_pcweb_stock_manage_applylog: "string; // 库存管理-当前库存"

src/views/information/spot-contract/components/detail/index.vue

@@ -1,219 +1,252 @@
 <template>
-  <!-- 现货合同详情-->
-  <a-modal class="add-custom custom-detail"
-           title="现货合同详情"
-           v-model:visible="visible"
-           centered
-           :maskClosable="maskClosableFlag"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="cancel">关闭
-      </a-button>
-    </template>
-    <a-tabs v-model:activeKey="activeKey"
-            @change="tabClick">
-      <a-tab-pane v-for="item in tabList"
-                  :key="item.key"
-                  :tab="item.name">
-      </a-tab-pane>
-    </a-tabs>
-    <InfoDetail :selectedRow="selectedRow"
-                :businessManager="businessManager"
-                v-if="activeKey == 1" />
-    <div class="tableDatas"
-         v-else>
-      <a-table class="dialogTable"
-               :columns="columns"
-               :data-source="tableList"
-               :pagination="false">
-        <template #status="{ text }">
-          <span class="yellow">{{ text }}</span>
-          <!-- 审核通过'green' 审核拒绝 'orange' 待审核'yellow'   -->
+    <!-- 现货合同详情-->
+    <a-modal class="add-custom custom-detail"
+             title="现货合同详情"
+             v-model:visible="visible"
+             centered
+             :maskClosable="maskClosableFlag"
+             @cancel="cancel"
+             width="890px">
+        <template #footer>
+            <a-button key="submit"
+                      type="primary"
+                      :loading="loading"
+                      @click="cancel">关闭
+            </a-button>
         </template>
-
-        <template #applystatus="{ text }">
-          <a>{{ getApplyStatusName(text) }}</a>
-        </template>
-
-      </a-table>
-    </div>
-  </a-modal>
+        <a-tabs v-model:activeKey="activeKey"
+                @change="tabClick">
+            <a-tab-pane v-for="item in tabList"
+                        :key="item.key"
+                        :tab="item.name">
+            </a-tab-pane>
+        </a-tabs>
+        <InfoDetail :selectedRow="selectedRow"
+                    :businessManager="businessManager"
+                    v-if="activeKey == 1"/>
+        <div class="tableDatas"
+             v-else>
+            <a-table class="dialogTable"
+                     :columns="columns"
+                     :data-source="tableList"
+                     :pagination="false">
+                <template #status="{ text }">
+                    <span class="yellow">{{ text }}</span>
+                    <!-- 审核通过'green' 审核拒绝 'orange' 待审核'yellow'   -->
+                </template>
+
+                <template #applystatus="{ text }">
+                    <a>{{ getApplyStatusName(text) }}</a>
+                </template>
+
+                <!-- 发票金额-->
+                <template #invoicetype="{ text }">
+                    <a>{{ invoiceStatusName(text) }}</a>
+                </template>
+
+                <!-- 发票类型-->
+                <template #contracttype="{ text }">
+                    <a>{{ getPlanContractType(text) }}</a>
+                </template>
+
+                <!-- 出入库类型 -->
+                <template #inouttype="{ text }">
+                    <a>{{ InOutTypeName(text) }}</a>
+                </template>
+
+
+            </a-table>
+        </div>
+    </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ref } from 'vue';
-import { closeModal } from '@/common/setup/modal/index';
-import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
-import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { QueryBusinessFp, QueryBusinessKx } from '@/services/go/ermcp/finance-review';
-import { QueryBusinessDj, QueryBusinessJs } from '@/services/go/ermcp/business-review';
-import { QueryAreaStockApply } from '@/services/go/ermcp/inventory-review';
-import { QueryChangeLog } from '@/services/go/ermcp/spot-contract';
-import { ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
-import InfoDetail from '../infoDetail/index.vue';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
-import { getTableColumns } from '@/common/setup/table';
-
-export default defineComponent({
-    name: 'spot-contract-detail',
-    components: { InfoDetail },
-    props: {
-        selectedRow: {
-            type: Object as PropType<Ermcp3ContractRsp>,
-            default: {},
+    import {defineComponent, PropType, ref} from 'vue';
+    import {closeModal} from '@/common/setup/modal/index';
+    import {Ermcp3ContractRsp} from '@/services/go/ermcp/spot-contract/interface';
+    import {queryResultLoadingAndInfo} from '@/common/methods/request/resultInfo';
+    import {QueryBusinessFp, QueryBusinessKx} from '@/services/go/ermcp/finance-review';
+    import {QueryBusinessDj, QueryBusinessJs} from '@/services/go/ermcp/business-review';
+    import {QueryAreaStockApply} from '@/services/go/ermcp/inventory-review';
+    import {QueryChangeLog} from '@/services/go/ermcp/spot-contract';
+    import {ErmcpLoginUserEx} from '@/services/go/ermcp/account/interface';
+    import InfoDetail from '../infoDetail/index.vue';
+    import {getApplyStatusName} from '@/views/manage/business-review/setup';
+    import {getTableColumns} from '@/common/setup/table';
+    import {invoiceStatusName} from "@/views/manage/finance-review/setup";
+    import {getPlanContractType} from "@/views/business/plan/setup";
+    import {InOutTypeName} from "@/views/manage/inventory-review/setup";
+
+    export default defineComponent({
+        name: 'spot-contract-detail',
+        components: {InfoDetail},
+        props: {
+            selectedRow: {
+                type: Object as PropType<Ermcp3ContractRsp>,
+                default: {},
+            },
+            businessManager: {
+                type: Array as PropType<ErmcpLoginUserEx[]>,
+                default: [],
+            },
         },
-        businessManager: {
-            type: Array as PropType<ErmcpLoginUserEx[]>,
-            default: [],
-        },
-    },
-    setup: function(props, context) {
-        const { visible, cancel } = closeModal('detail');
-
-        const tabList = [
-            { key: 1, name: '合同详情' },
-            { key: 2, name: '点价记录' },
-            { key: 3, name: '交收记录' },
-            { key: 4, name: '款项记录' },
-            { key: 5, name: '发票记录' },
-            { key: 6, name: '入库记录' },
-            { key: 7, name: '变更记录' },
-        ];
-        const activeKey = ref<number>(1);
-
-        const loading = ref<boolean>(false);
-        const tableList = ref<any[]>([]);
-        // 表头数据
-        const { columns, registerColumn } = getTableColumns();
-        function tabClick() {
-            const relatedid = props.selectedRow.spotcontractid;
-            switch (activeKey.value) {
-                case 1:
-                    break;
-                case 2: // 点价记录
-                    registerColumn('table_pcweb_someprice_detail_dj', []);
-                    queryResultLoadingAndInfo(QueryBusinessDj, loading, { relatedid }).then((res) => {
-                        tableList.value = res;
-                    });
-                    break;
-                case 3: // 交收记录
-                    registerColumn('table_pcweb_someprice_detail_js', []);
-                    queryResultLoadingAndInfo(QueryBusinessJs, loading, { relatedid }).then((res) => {
-                        tableList.value = res;
-                    });
-                    break;
-                case 4: //款项记录
-                    registerColumn('table_pcweb_someprice_detail_kx', []);
-                    queryResultLoadingAndInfo(QueryBusinessKx, loading, { relatedid }).then((res) => {
-                        tableList.value = res;
-                    });
-                    break;
-                case 5: // 发票记录
-                    registerColumn('table_pcweb_someprice_detail_fp', []);
-                    queryResultLoadingAndInfo(QueryBusinessFp, loading, { relatedid }).then((res) => {
-                        tableList.value = res;
-                    });
-                    break;
-                case 6: // 入库记录
-                    registerColumn('table_pcweb_someprice_detail_stock', []);
-                    queryResultLoadingAndInfo(QueryAreaStockApply, loading, {
-                        spotcontractid: relatedid,
-                        inouttype: '1,3',
-                    }).then((res) => {
-                        tableList.value = res;
-                    });
-                    break;
-                case 7: // 变更记录
-                    registerColumn('table_pcweb_someprice_detail_change', []);
-                    queryResultLoadingAndInfo(QueryChangeLog, loading, { RelatedId: relatedid }).then((res) => {
-                        tableList.value = res;
-                    });
-                    break;
+        setup: function (props, context) {
+            const {visible, cancel} = closeModal('detail');
+
+            const tabList = [
+                {key: 1, name: '合同详情'},
+                {key: 2, name: '点价记录'},
+                {key: 3, name: '交收记录'},
+                {key: 4, name: '款项记录'},
+                {key: 5, name: '发票记录'},
+                {key: 6, name: '入库记录'},
+                {key: 7, name: '出库记录'},
+                {key: 8, name: '变更记录'},
+            ];
+            const activeKey = ref<number>(1);
+
+            const loading = ref<boolean>(false);
+            const tableList = ref<any[]>([]);
+            // 表头数据
+            const {columns, registerColumn} = getTableColumns();
+
+            function tabClick() {
+                const relatedid = props.selectedRow.spotcontractid;
+                switch (activeKey.value) {
+                    case 1:
+                        break;
+                    case 2: // 点价记录
+                        registerColumn('table_pcweb_someprice_detail_dj', []);
+                        queryResultLoadingAndInfo(QueryBusinessDj, loading, {relatedid}).then((res) => {
+                            tableList.value = res;
+                        });
+                        break;
+                    case 3: // 交收记录
+                        registerColumn('table_pcweb_someprice_detail_js', []);
+                        queryResultLoadingAndInfo(QueryBusinessJs, loading, {relatedid}).then((res) => {
+                            tableList.value = res;
+                        });
+                        break;
+                    case 4: //款项记录
+                        registerColumn('table_pcweb_someprice_detail_kx', []);
+                        queryResultLoadingAndInfo(QueryBusinessKx, loading, {relatedid}).then((res) => {
+                            tableList.value = res;
+                        });
+                        break;
+                    case 5: // 发票记录
+                        registerColumn('table_pcweb_someprice_detail_fp', []);
+                        queryResultLoadingAndInfo(QueryBusinessFp, loading, {relatedid}).then((res) => {
+                            tableList.value = res;
+                        });
+                        break;
+                    case 6: // 入库记录
+                        registerColumn('table_pcweb_someprice_detail_stock', []);
+                        queryResultLoadingAndInfo(QueryAreaStockApply, loading, {
+                            spotcontractid: relatedid,
+                            inouttype: '1,3',
+                        }).then((res) => {
+                            tableList.value = res;
+                        });
+                        break;
+                    case 7: // 出库记录
+                        registerColumn('table_pcweb_someprice_detail_stock_out', []);
+                        queryResultLoadingAndInfo(QueryAreaStockApply, loading, {
+                            spotcontractid: relatedid,
+                            inouttype: '2,4',
+                        }).then((res) => {
+                            tableList.value = res;
+                        });
+                        break;
+                    case 8: //// 变更记录
+                        registerColumn('table_pcweb_someprice_detail_change', []);
+                        queryResultLoadingAndInfo(QueryChangeLog, loading, {RelatedId: relatedid}).then((res) => {
+                            tableList.value = res;
+                        });
+                        break;
+                }
             }
-        }
 
-        return {
-            visible,
-            cancel,
-            loading,
-            maskClosableFlag: false,
-            activeKey,
-            columns,
-            tableList,
-            tabList,
-            tabClick,
-            getApplyStatusName,
-        };
-    },
-});
+            return {
+                visible,
+                cancel,
+                loading,
+                maskClosableFlag: false,
+                activeKey,
+                columns,
+                tableList,
+                tabList,
+                tabClick,
+                getApplyStatusName,
+                invoiceStatusName,
+                getPlanContractType,
+                InOutTypeName,
+            };
+        },
+    });
 </script>
 
 <style lang="less">
-.custom-detail {
-    .ant-modal-content {
-        .ant-modal-body {
-            padding-top: 0;
-            padding-left: 0;
-            padding-right: 0;
-
-            .ant-tabs {
-                background: @m-black11;
-                width: 100%;
-                padding: 0 24px;
-
-                .ant-tabs-bar {
-                    margin-bottom: 0;
-                    border-bottom: 0;
-                }
-
-                .ant-tabs-nav-container {
-                    .ant-tabs-nav-wrap {
-                        .ant-tabs-nav {
-                            .ant-tabs-tab {
-                                width: 70px;
-                                margin-right: 43px;
-                                text-align: center;
-                                font-size: 16px;
-                                color: #88a0ae;
-                                padding: 0;
-                                line-height: 45px;
-                            }
-
-                            .ant-tabs-tab-active.ant-tabs-tab {
-                                color: #3a87f7;
-                            }
+    .custom-detail {
+        .ant-modal-content {
+            .ant-modal-body {
+                padding-top: 0;
+                padding-left: 0;
+                padding-right: 0;
+
+                .ant-tabs {
+                    background: @m-black11;
+                    width: 100%;
+                    padding: 0 24px;
+
+                    .ant-tabs-bar {
+                        margin-bottom: 0;
+                        border-bottom: 0;
+                    }
 
-                            .ant-tabs-ink-bar {
-                                width: 70px !important;
-                                background: #3a87f7;
-                                .rounded-corners(1px);
+                    .ant-tabs-nav-container {
+                        .ant-tabs-nav-wrap {
+                            .ant-tabs-nav {
+                                .ant-tabs-tab {
+                                    width: 70px;
+                                    margin-right: 43px;
+                                    text-align: center;
+                                    font-size: 16px;
+                                    color: #88a0ae;
+                                    padding: 0;
+                                    line-height: 45px;
+                                }
+
+                                .ant-tabs-tab-active.ant-tabs-tab {
+                                    color: #3a87f7;
+                                }
+
+                                .ant-tabs-ink-bar {
+                                    width: 70px !important;
+                                    background: #3a87f7;
+                                    .rounded-corners(1px);
+                                }
                             }
                         }
                     }
                 }
             }
         }
-    }
 
-    .tableDatas {
-        margin-top: 26px;
-        padding: 0 24px;
-        overflow: hidden;
+        .tableDatas {
+            margin-top: 26px;
+            padding: 0 24px;
+            overflow: hidden;
 
-        .dialogTable {
-            width: 100%;
-            overflow: overlay;
+            .dialogTable {
+                width: 100%;
+                overflow: overlay;
+            }
         }
-    }
 
-    .ant-form.inlineForm {
-        margin-top: 20px;
-        padding: 0 24px;
+        .ant-form.inlineForm {
+            margin-top: 20px;
+            padding: 0 24px;
+        }
     }
-}
 </style
 >;

yarn.lock

@@ -1527,7 +1527,7 @@
     "@vue/compiler-core" "3.0.11"
     "@vue/shared" "3.0.11"
 
-"@vue/compiler-sfc@^3.0.0":
+"@vue/compiler-sfc@^3.0.11":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.11.tgz#cd8ca2154b88967b521f5ad3b10f5f8b6b665679"
   integrity sha512-7fNiZuCecRleiyVGUWNa6pn8fB2fnuJU+3AGjbjl7r1P5wBivfl02H4pG+2aJP5gh2u+0wXov1W38tfWOphsXw==
@@ -1599,7 +1599,7 @@
   dependencies:
     "@vue/shared" "3.0.11"
 
-"@vue/runtime-core@3.0.11":
+"@vue/runtime-core@3.0.11", "@vue/runtime-core@^3.0.11":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.11.tgz#c52dfc6acf3215493623552c1c2919080c562e44"
   integrity sha512-87XPNwHfz9JkmOlayBeCCfMh9PT2NBnv795DSbi//C/RaAnc/bGZgECjmkD7oXJ526BZbgk9QZBPdFT8KMxkAg==