Merge branch 'mtp_v6' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB into mtp_v6

src/services/go/ermcp/goodsInfo/index.ts

@@ -14,7 +14,7 @@ import {
     Goods,
     Ermcp3MiddleGoodsDetail2
 } from './interface';
-import {Ermcp3MiddleGoodsDetail} from './interface/deliverygoodsdetail'
+import {Ermcp3MiddleGoodsDetail} from './interface/middlegoodsdetail'
 
 /**
  * 查询现货商品 /Ermcp3/QueryDeliveryGoods

src/services/go/ermcp/goodsInfo/interface/deliverygoodsdetail.ts

@@ -1,54 +1,37 @@
 /**
- * 查询套保品种详情
+ * 查询现货商品详情
  */
- export interface Ermcp3MiddleGoodsDetail {
-    areauserid:number //机构用户ID
-    enumdicname:string//单位名称
-    goodsunitid:number//套保品种单位id
-    gplst:TBGoodsGroup[]//期货品种列表
-    middlegoodscode:string//套保品种代码
-    middlegoodsid:number//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
-    middlegoodsnam:string//套保品种名称
-    needarbitrageratio:number//套利比率
-    needhedgeratio:number//套保比率
-    wdlst:TBWrstandard[]//商品信息列表(现货品类)
-    mg:ErmcpMiddleGoodsModel//套保品种
+ export interface Ermcp3DeliveryGoodsDetail {
+    areauserid:number//所属机构
+    bdlst:XHBRAND[]//品牌列表
+    deliverygoodscode:string//现货品种代码
+    deliverygoodsid:number//现货品种ID(SEQ_DELIVERYGOODS)
+    deliverygoodsname:string//现货品种名称
+    dgstatus:number//品种状态 - 作废 - 0:未激活 1:正常
+    isvalid:number//是否有效 - 0:无效 1:有效
+    remark:string//备注
+    unitid:number//单位id(目前看,数据库中是空值)
+    wdlst:XHWrstandard[]//品类(现货商品)列表
 }
 
 
-
 /**
- * 套保品种
+ * 品牌列表
  */
- export interface ErmcpMiddleGoodsModel {
-    areauserid: number;//机构用户ID
-    createtime: string;//修改时间
-    enumdicname: string;//单位名称
-    evaluateratio: number;//估价系数
-    goodsgroupid: number;//关联期货品种ID
-    goodsunitid: number;//单位ID
-    isvalid: number;//状态 number;
-    //-无效(停用) 1-有效(正常)
-    middlegoodscode: string;//套保品种代码
-    middlegoodsid: number;//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
-    middlegoodsname: string;//套保品种名称
-    modifytime: string;//修改时间
-    needhedgeratio: number;//套保比率
-    qtydecimalplace: number;//数量小数位
-    relatedgoodsid: number;//关联交易商品ID
-    relatedgoodstype: number;//关联商品类型 - 1:期货合约 2:现货品种
-    remark: string;//备注
+interface XHBRAND{
+    brandid:number//品牌id
+    brandname:string//品牌名称
+    isvalid:number//是否有效 0-无效 1-有效
 }
 
-
-
 /**
- * 商品信息列表(现货品类)
+ * 品类(现货商品)列表
  */
- interface TBWrstandard{
-    convertratio:number//折算系数
-    deliverygoodsname:string//品种名称
-    enumdicname:string//单位名称
+interface XHWrstandard{
+    deliverygoodsid:number//品种ID
+    enumdicnam:string//单位名称
+    mglst:XHMiddleGoods[]//套保品列表
+    unitid:number//单位id
     vatrate:number//增值税率
     wrstandardcode:string//现货商品代码
     wrstandardid:number//现货商品ID(SEQ_WRSTANDARD)
@@ -56,27 +39,41 @@
 }
 
 /**
- * 期货品种列表
+ * 套保品列表
  */
- interface TBGoodsGroup{
+interface XHMiddleGoods{
+    convertratio:number//拆算系数
+    costratio:number//成本权重
+    deliverygoodsid:number//现货商品id
+    enumdicname:string//单位名称
+    gplst:TBGoodsGroup[]//期货品种列表
+    middlegoodscode:string//套保品种代码
+    middlegoodsid:number//套保品种id
+    middlegoodsname:string//套保品种名称
+    unitid:number//单位id
+}
+
+/**
+ *期货品种列表
+ */
+interface TBGoodsGroup{
     convertratio:number//折算系数
     enumdicname:string//单位名称
     exexchangecode:string//交易所代码
     exexchangename:string//交易所名称
     gdlst:TBGoods[]//商品列表
-    goodsgroupid:Number//商品组ID(自增ID)
+    goodsgroupid:number//商品组ID(自增ID)
     goodsgroupname:string//商品组名称
     goodunitid:number//报价单位ID
 }
 
 /**
- * 商品列表
+ *商品列表
  */
- interface TBGoods{
+interface TBGoods{
     agreeunit:number//合约乘数
     enumdicname:string//单位名称
     goodscode:string//商品代码(内部)
     goodsid:number//商品ID(自增ID SEQ_GOODS)
     goodsname:string//商品名称
-
 }

src/services/go/ermcp/goodsInfo/interface/middlegoodsdetail.ts

@@ -0,0 +1,82 @@
+/**
+ * 查询套保品种详情
+ */
+ export interface Ermcp3MiddleGoodsDetail {
+    areauserid:number //机构用户ID
+    enumdicname:string//单位名称
+    goodsunitid:number//套保品种单位id
+    gplst:TBGoodsGroup[]//期货品种列表
+    middlegoodscode:string//套保品种代码
+    middlegoodsid:number//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+    middlegoodsnam:string//套保品种名称
+    needarbitrageratio:number//套利比率
+    needhedgeratio:number//套保比率
+    wdlst:TBWrstandard[]//商品信息列表(现货品类)
+    mg:ErmcpMiddleGoodsModel//套保品种
+}
+
+
+
+/**
+ * 套保品种
+ */
+ export interface ErmcpMiddleGoodsModel {
+    areauserid: number;//机构用户ID
+    createtime: string;//修改时间
+    enumdicname: string;//单位名称
+    evaluateratio: number;//估价系数
+    goodsgroupid: number;//关联期货品种ID
+    goodsunitid: number;//单位ID
+    isvalid: number;//状态 number;
+    //-无效(停用) 1-有效(正常)
+    middlegoodscode: string;//套保品种代码
+    middlegoodsid: number;//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+    middlegoodsname: string;//套保品种名称
+    modifytime: string;//修改时间
+    needhedgeratio: number;//套保比率
+    qtydecimalplace: number;//数量小数位
+    relatedgoodsid: number;//关联交易商品ID
+    relatedgoodstype: number;//关联商品类型 - 1:期货合约 2:现货品种
+    remark: string;//备注
+}
+
+
+
+/**
+ * 商品信息列表(现货品类)
+ */
+ interface TBWrstandard{
+    convertratio:number//折算系数
+    deliverygoodsname:string//品种名称
+    enumdicname:string//单位名称
+    vatrate:number//增值税率
+    wrstandardcode:string//现货商品代码
+    wrstandardid:number//现货商品ID(SEQ_WRSTANDARD)
+    wrstandardname:string//现货商品名称
+}
+
+/**
+ * 期货品种列表
+ */
+ interface TBGoodsGroup{
+    convertratio:number//折算系数
+    enumdicname:string//单位名称
+    exexchangecode:string//交易所代码
+    exexchangename:string//交易所名称
+    gdlst:TBGoods[]//商品列表
+    goodsgroupid:Number//商品组ID(自增ID)
+    goodsgroupname:string//商品组名称
+    goodunitid:number//报价单位ID
+}
+
+/**
+ * 商品列表
+ */
+ interface TBGoods{
+    agreeunit:number//合约乘数
+    enumdicname:string//单位名称
+    goodscode:string//商品代码(内部)
+    goodsid:number//商品ID(自增ID SEQ_GOODS)
+    goodsname:string//商品名称
+
+}

src/views/information/goods/list/hedging-variety/setup.ts

@@ -1,5 +1,5 @@
 import { QueryMiddleGoodsDetail } from '@/services/go/ermcp/goodsInfo';
-import { Ermcp3MiddleGoodsDetail } from '@/services/go/ermcp/goodsInfo/interface/deliverygoodsdetail';
+import { Ermcp3MiddleGoodsDetail } from '@/services/go/ermcp/goodsInfo/interface/middlegoodsdetail';
 import { mergeObj } from '@/utils/objHandle';
 import { message } from 'ant-design-vue';
 import { reactive, ref } from 'vue';

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

@@ -60,6 +60,8 @@ export default defineComponent({
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<QryBusinessDjRsp>();
 
+        // console.log(typeof tableList,11)
+        // console.log(tableList.value.applytime,11)
         // 获取列表数据
         const queryTableAction = () => {
             switch (routeName) {

src/views/platinum/platinum_agreement/list/tab/index.vue

@@ -2,8 +2,10 @@
   <!-- 协议管理 -->
   <div class="platinum_agreement_tab">
     <Filter @search="updateColumn">
-      <BtnList :btnList="firstBtn"
-               @click="openComponent" />
+      <mtp-table-button class="btn-list-sticky"
+                        :buttons="addBtn"
+                        :record="record"
+                        @click="openComponent" />
     </Filter>
     <a-table :columns="columns"
              class="srcollYTable"
@@ -16,10 +18,10 @@
              :data-source="filterTable()">
       <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">
-        <BtnList :btnList="handlePermissionBtn(secondBtn, record)"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
+        <mtp-table-button class="btn-list-sticky"
+                          :buttons="handleBtn(record)"
+                          :record="record"
+                          @click="openComponent" />
       </template>
       <!-- 协议类型-->,
       <template #isvalid="{ record }">
@@ -35,7 +37,7 @@
     <!-- 右键 -->
     <contextMenu :contextMenu="contextMenu"
                  @cancel="closeContext"
-                 :list="handlePermissionBtn(secondBtn, selectedRow)">
+                 :list="handleBtn(selectedRow)">
     </contextMenu>
     <component :is="componentId"
                v-if="componentId"
@@ -45,35 +47,31 @@
 </template>
 
 <script lang="ts">
-import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
+import { ComposeTableParam, contextMenu, defineAsyncComponent, defineComponent, handleComposeTable, MtpTableButton, queryTableList } from '@/common/export/commonTable';
 import { queryAgreementConfig } from '@/services/go/ermcp/qhj';
 import { QhjAgreementConfig } from '@/services/go/ermcp/qhj/interface';
 import Filter from '../../compoments/filter/index.vue';
 import { getAgreementStatus, getAgreementTypeName } from '@/common/constants/enumsName';
 import { handleArgreementType, handlePermissionBtn } from '../../setup';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-
-const Detail = defineAsyncComponent(() => import('../../compoments/detail/index.vue'));
-const Modify = defineAsyncComponent(() => import('../../compoments/modify/index.vue'));
-const Add = defineAsyncComponent(() => import('../../compoments/add/index.vue'));
-const Delete = defineAsyncComponent(() => import('../../compoments/delete/index.vue'));
-const Resume = defineAsyncComponent(() => import('../../compoments/resume/index.vue'));
-const Stop = defineAsyncComponent(() => import('../../compoments/stop/index.vue'));
+import { getTableButton } from '@/common/setup/table/button';
 
 export default defineComponent({
     name: EnumRouterName.platinum_agreement_tab,
     components: {
         Filter,
         contextMenu,
-        BtnList,
-        [ModalEnum.detail]: Detail,
-        [ModalEnum.platinum_agreement_modify]: Modify,
-        [ModalEnum.platinum_agreement_add]: Add,
-        [ModalEnum.platinum_agreement_delete]: Delete,
-        [ModalEnum.platinum_agreement_resume]: Resume,
-        [ModalEnum.platinum_agreement_stop]: Stop,
+        MtpTableButton,
+        detail: defineAsyncComponent(() => import('../../compoments/detail/index.vue')),
+        modify: defineAsyncComponent(() => import('../../compoments/modify/index.vue')),
+        add: defineAsyncComponent(() => import('../../compoments/add/index.vue')),
+        delete: defineAsyncComponent(() => import('../../compoments/delete/index.vue')),
+        resume: defineAsyncComponent(() => import('../../compoments/resume/index.vue')),
+        disable: defineAsyncComponent(() => import('../../compoments/stop/index.vue')),
     },
     setup() {
+        const addBtn = getTableButton(['add']);
+
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<QhjAgreementConfig>();
         // 获取列表数据
@@ -91,6 +89,20 @@ export default defineComponent({
         // 过滤注销数据
         const filterTable = () => tableList.value.filter((e) => e.isvalid !== 3);
 
+        function handleBtn(record: QhjAgreementConfig) {
+            if (!record) return [];
+            const buttons = getTableButton(['detail', 'modify', 'delete', 'resume', 'disable']);
+            const { isvalid } = record;
+            if (isvalid === 1) {
+                // 正常
+                return buttons.filter((e) => e.code !== 'resume');
+            } else if (isvalid === 2) {
+                // 停用
+                return buttons.filter((e) => e.code !== 'disable');
+            }
+            return [];
+        }
+
         return {
             ...handleComposeTable<QhjAgreementConfig>(param),
             getRateEnumName,
@@ -99,6 +111,8 @@ export default defineComponent({
             filterTable,
             getAgreementTypeName,
             getAgreementStatus,
+            addBtn,
+            handleBtn,
         };
     },
 });