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

src/common/components/thirdMenu/index.vue

@@ -1,10 +1,10 @@
 <template>
-    <div class="thirdMenu">
-        <a-tabs v-model:activeKey="current" @change="menuClick">
-            <a-tab-pane :key="String(index)" v-for="(item, index) in list" :tab="item[value]"></a-tab-pane>
-        </a-tabs>
-        <slot></slot>
-    </div>
+  <div class="thirdMenu">
+    <a-tabs v-model:activeKey="current" @change="menuClick">
+      <a-tab-pane :key="String(index)" v-for="(item, index) in list" :tab="item[value]"></a-tab-pane>
+    </a-tabs>
+    <slot></slot>
+  </div>
 </template>
 
 <script lang="ts">

src/views/business/plan/components/audit/index.vue

@@ -39,11 +39,6 @@
                             <span class="white">{{ formatValue(selectedRow.planqty) }}</span>
                         </a-form-item>
                     </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="标仓系数">
-                            <span class="white">{{ formatValue(selectedRow.convertfactor) }}</span>
-                        </a-form-item>
-                    </a-col>
                 </a-row>
                 <a-row :gutter="24">
                     <a-col :span="12">

src/views/business/plan/components/delete/index.vue

@@ -38,11 +38,6 @@
               <span class="white">{{ formatValue(selectedRow.planqty) }}</span>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-item label="标仓系数">
-              <span class="white">{{ formatValue(selectedRow.convertfactor) }}</span>
-            </a-form-item>
-          </a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">

src/views/business/plan/components/detail/index.vue

@@ -48,11 +48,6 @@
               <span class="white">{{ formatValue(selectedRow.planqty) }}</span>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-item label="标仓系数">
-              <span class="white">{{ formatValue(selectedRow.convertfactor) }}</span>
-            </a-form-item>
-          </a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">

src/views/business/plan/components/recommit/index.vue

@@ -39,11 +39,6 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="标仓系数" name="">
-            <a-input class="dialogInput ConvertFactor" v-model:value="formState.ConvertFactor" readonly style="width: 200px" placeholder="请输入标仓系数" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
           <a-form-item label="计划量" class="relative" name="PlanQty">
             <a-input class="dialogInput" style="width: 200px" v-model:value="formState.PlanQty" placeholder="请输入计划量" />
           </a-form-item>

src/views/business/plan/list/audit/index.vue

@@ -1,23 +1,23 @@
 <template>
-    <!-- 计划: 审核中-->
-    <div class="plan_uncommitted" :loading="loading">
-        <Filter @search="updateColumn"></Filter>
-        <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
-            </template>
-            <template #contracttype="{ text }">
-                <a>{{ getPlanContractType(text) }}</a>
-            </template>
-            <template #hedgeplanstatus="{ text }">
-                <a>{{ getPlanStatusName(text) }}</a>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"> </component>
-    </div>
+  <!-- 计划: 审核中-->
+  <div class="plan_uncommitted" :loading="loading">
+    <Filter @search="updateColumn"></Filter>
+    <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
+      </template>
+      <template #contracttype="{ text }">
+        <a>{{ getPlanContractType(text) }}</a>
+      </template>
+      <template #hedgeplanstatus="{ text }">
+        <a>{{ getPlanStatusName(text) }}</a>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"> </component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -55,7 +55,7 @@ export default defineComponent({
                     queryTable(QueryHedgePlan, '1');
                     break;
                 case 'plan_performance':
-                    queryTable(QueryHedgePlan, '2');
+                    queryTable(QueryHedgePlan, '2,4');
                     break;
             }
         };

src/views/business/sell/components/storage/index.vue

@@ -113,7 +113,7 @@
                         v-model:value="formState.WarehouseInfo">
                 <a-select-option v-for="option in wareHouseList"
                                  :key="option.autoid"
-                                 :value="option.autoid">{{option.warehousename}}
+                                 :value="option.autoid">{{option.warehousecode}}
                 </a-select-option>
               </a-select>
             </a-form-item>

src/views/information/account_info/compoments/managers-permission-detail/index.vue

@@ -1,6 +1,6 @@
 <template>
     <!-- 角色详情 -->
-    <a-modal class="commonModal add-roles" title="角色详情" v-model:visible="visible" @cancel="cancel" centered :maskClosable="false" width="100%">
+    <a-modal class="commonModal add-roles" title="角色详情" v-model:visible="visible" @cancel="cancel" centered :maskClosable="false">
         <template #footer>
             <a-button key="cancel" type="primary" :loading="loading" @click="cancel">完成</a-button>
         </template>
@@ -14,24 +14,8 @@
                 <a-col :span="24">
                     <a-form-item label="权限功能" name></a-form-item>
                 </a-col>
-                <a-col :span="24">
-                    <div class="powerTable">
-                        <div class="powerRow" v-for="(item, i) in tableList" :key="i + '0'">
-                            <div class="powerLeft">
-                                <a-checkbox v-model:checked="item.Menu.ishadrole" disabled>{{ item.Menu.resourcename }}</a-checkbox>
-                            </div>
-                            <div class="powerRight">
-                                <div class="line" v-for="(sub, j) in item.SubMenu" :key="j + '1'">
-                                    <div class="left">
-                                        <a-checkbox v-model:checked="sub.Menu.ishadrole" @change="secondChange(item, sub)" :value="sub.Menu.resourcecode" disabled>{{ sub.Menu.resourcename }}</a-checkbox>
-                                    </div>
-                                    <div class="right">
-                                        <a-checkbox v-for="(subNext, l) in sub.SubMenu" :key="l + '3'" v-model:checked="subNext.Menu.ishadrole" @change="thirdChange(item, sub, subNext)" :value="subNext.Menu.resourcecode" disabled>{{ subNext.Menu.resourcename }}</a-checkbox>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+                <a-col :span="24" class="powerTable">
+                        <a-tree checkable :tree-data="tableList" v-model:checkedKeys="checkedKeys" :replace-fields="replaceFields" disabled> </a-tree>
                 </a-col>
             </a-row>
         </a-form>
@@ -68,17 +52,48 @@ export default defineComponent({
         const loading = ref<boolean>(false);
         const tableList = ref<ErmcpRoleMenuEx[]>([]);
         const name = ref<string>('');
+        const replaceFields = {
+            children: 'SubMenu',
+            title: 'resourcename',
+            key: 'resourcecode',
+        };
+        const checkedKeys = ref<string[]>([]);
         watchEffect(() => {
             if (visible.value) {
                 const { rolename, areauserid, autoid } = props.selectedData;
                 name.value = rolename;
                 const param = { userid: areauserid, roleid: autoid.toString() };
                 queryResultLoadingAndInfo(QueryAccMgrRoleMenu, loading, param).then((res) => {
+                    checkedKeys.value = getMenuCheckedKeys(res)
+                    const fn = (arr: any[]) => {
+                        arr.forEach((el) => {
+                            Object.assign(el, el.Menu);
+                            if (el.SubMenu.length) {
+                                fn(el.SubMenu);
+                            }
+                        });
+                    };
+                    fn(res);
                     tableList.value = res;
                 });
             }
         });
 
+
+        // 返回树形菜单选中项
+        const getMenuCheckedKeys = (menus: ErmcpRoleMenuEx[]): string[] => {
+            let result: string[] = [];
+            menus.forEach((parent) => {
+                if (parent.Menu.ishadrole) {
+                    result.push(parent.Menu.resourcecode);
+                }
+                if (parent.SubMenu && parent.SubMenu.length) {
+                    result = [...result, ...getMenuCheckedKeys(parent.SubMenu)]; // 递归调用
+                }
+            });
+            return result;
+        };
+
         function submit() {
             const result: string[] = [];
             // 处理已经勾选的数据
@@ -148,12 +163,17 @@ export default defineComponent({
             thirdChange,
             loading,
             tableList,
+            replaceFields,
+            checkedKeys
         };
     },
 });
 </script>
 
 <style lang="less">
+.ant-tree-title{
+    color:@m-white0 !important;
+}
 .add-roles {
     .ant-modal-content {
         .ant-modal-body {

src/views/information/custom/index.vue

@@ -26,6 +26,12 @@
       <template #status="{ text }">
         <a>{{ getStatusName(text) }}</a>
       </template>
+      <template #customername="{record}">
+        {{record.username}}
+      </template>
+      <template #nickname="{record}">
+        {{record.username}}
+      </template>
       <template #userinfotype="{ text }">
         <a>{{ getUserInfoTypeName(text) }}</a>
       </template>

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

@@ -100,7 +100,7 @@
           <a-col :span="12">
             <a-form-item label="商品" name="WrStandardID">
               <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" @change="WrStandardChange" v-model:value="formState.WrStandardID" placeholder="请选择商品">
-                <a-select-option v-for="item in gmlist" :key="item.wrstandardid" :value="item.wrstandardid">
+                <a-select-option v-for="item in wdlst" :key="item.wrstandardid" :value="item.wrstandardid">
                   {{ item.wrstandardname }}
                 </a-select-option>
               </a-select>
@@ -109,7 +109,7 @@
           <a-col :span="12">
             <a-form-item label="品牌" name="SpotGoodsBrandID">
               <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.SpotGoodsBrandID" placeholder="请选择品牌">
-                <a-select-option v-for="item in gblist" :key="item.brandid" :value="item.brandid">
+                <a-select-option v-for="item in bdlst" :key="item.brandid" :value="item.brandid">
                   {{ item.brandname }}
                 </a-select-option>
               </a-select>
@@ -158,7 +158,7 @@
             <a-col :span="12">
               <a-form-item label="点价合约" name="GoodsID">
                 <a-select class="inlineFormSelect" v-model:value="formState.GoodsID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择点价合约">
-                  <a-select-option v-for="item in goodsList" :key="item.goodsid" :value="item.goodsid">
+                  <a-select-option v-for="item in gdlist" :key="item.goodsid" :value="item.goodsid">
                     {{ item.goodsname }}
                   </a-select-option>
                 </a-select>
@@ -247,7 +247,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ref } from 'vue';
+import { defineComponent, PropType, ref  } from 'vue';
 import { addContractReq } from './setup';
 import { getRootUserInfo, getUserName, getUserId } from '@/services/bus/user';
 import { FormState } from '../interface';
@@ -279,7 +279,7 @@ export default defineComponent({
             required: true,
         },
     },
-    setup(props, context) {
+     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
         const { sendReq } = addContractReq();
         const loading = ref<boolean>(false);
@@ -292,7 +292,7 @@ export default defineComponent({
         const { contractType, isSell, contractChange, customList, queryCustomList } = handleContract(formState);
 
         //  处理现货商品
-        const { deliveryGoodsList, goodsList, gblist, gmlist, numberUnit, WrStandardChange, getDeliveryGoods, deliveryGoodsChange } = handleDeliveryGoods(formState);
+        const { deliveryGoodsList, gdlist, bdlst, wdlst, numberUnit, WrStandardChange, getDeliveryGoods, deliveryGoodsChange ,GetDeliveryGoodsDetail} = handleDeliveryGoods(formState);
         // 价格信息
         const { priceType, payCurrency, payCurrencyUnit, parCurrencyChange } = handlePrice(formState);
         // 日期
@@ -314,6 +314,7 @@ export default defineComponent({
             subjectList.value = res;
         });
 
+        GetDeliveryGoodsDetail()
         queryCustomList();
         getDeliveryGoods();
         queryTradeManager();
@@ -375,8 +376,9 @@ export default defineComponent({
             contractChange,
             customList,
             deliveryGoodsList,
-            gblist,
-            gmlist,
+            gdlist, 
+            bdlst, 
+            wdlst,
             deliveryGoodsChange,
             WrStandardChange,
             priceType,
@@ -388,7 +390,6 @@ export default defineComponent({
             deliveryDate,
             priceDate,
             disabledDate,
-            goodsList,
             getAmout,
             traderList,
             businesserList,
@@ -408,4 +409,4 @@ export default defineComponent({
         padding: 0 20px;
     }
 }
-</style>;
+</style>;

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

@@ -96,7 +96,7 @@
           <a-col :span="12">
             <a-form-item label="商品" name="WrStandardID">
               <a-select class="inlineFormSelect" style="width: 200px" @change="WrStandardChange" v-model:value="formState.WrStandardID" placeholder="请选择商品">
-                <a-select-option v-for="item in gmlist" :key="item.wrstandardid" :value="item.wrstandardid">
+                <a-select-option v-for="item in wdlst" :key="item.wrstandardid" :value="item.wrstandardid">
                   {{ item.wrstandardname }}
                 </a-select-option>
               </a-select>
@@ -105,7 +105,7 @@
           <a-col :span="12">
             <a-form-item label="品牌" name="SpotGoodsBrandID">
               <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.SpotGoodsBrandID" placeholder="请选择品牌">
-                <a-select-option v-for="item in gblist" :key="item.brandid" :value="item.brandid">
+                <a-select-option v-for="item in bdlst" :key="item.brandid" :value="item.brandid">
                   {{ item.brandname }}
                 </a-select-option>
               </a-select>
@@ -154,7 +154,7 @@
             <a-col :span="12">
               <a-form-item label="点价合约" name="GoodsID">
                 <a-select class="inlineFormSelect" v-model:value="formState.GoodsID" style="width: 200px" placeholder="请选择点价合约">
-                  <a-select-option v-for="item in goodsList" :key="item.goodsid" :value="item.goodsid">
+                  <a-select-option v-for="item in gdsList" :key="item.goodsid" :value="item.goodsid">
                     {{ item.goodsname }}
                   </a-select-option>
                 </a-select>
@@ -291,7 +291,7 @@ export default defineComponent({
         const { contractType, isSell, contractChange, customList, queryCustomList } = handleContract(formState);
 
         //  处理现货商品
-        const { deliveryGoodsList, goodsList, gblist, gmlist, numberUnit, WrStandardChange, getDeliveryGoods, deliveryGoodsChange } = handleDeliveryGoods(formState);
+        const { deliveryGoodsList, bdlst,wdlst,gdlist, numberUnit, WrStandardChange, getDeliveryGoods, deliveryGoodsChange } = handleDeliveryGoods(formState);
         // 价格信息
         const { priceType, payCurrency, payCurrencyUnit, parCurrencyChange } = handlePrice(formState);
         // 日期
@@ -401,8 +401,9 @@ export default defineComponent({
             contractChange,
             customList,
             deliveryGoodsList,
-            gblist,
-            gmlist,
+            bdlst,
+            wdlst,
+            gdlist,
             deliveryGoodsChange,
             WrStandardChange,
             priceType,
@@ -414,7 +415,6 @@ export default defineComponent({
             deliveryDate,
             priceDate,
             disabledDate,
-            goodsList,
             getAmout,
             traderList,
             businesserList,

src/views/information/spot-contract/components/setup.ts

@@ -2,12 +2,10 @@ import { getPayCurrencyTypeEnumList } from "@/common/constants/enumsList";
 import { getGoodsUnitEnumItemName } from "@/common/constants/enumsName";
 import { commonResultInfo, getRequestResultInfo } from "@/common/methods/request";
 import { validateCommon } from "@/common/setup/validate";
-import APP from '@/services';
 import { QueryCustomInfo } from "@/services/go/ermcp/customInfo";
 import { QueryCustomInfoType } from "@/services/go/ermcp/customInfo/interface";
 import { QueryDeliveryGoods, GetDeliveryGoodsDetail } from "@/services/go/ermcp/goodsInfo";
-import { TBGoods } from "@/services/go/ermcp/goodsInfo/interface/deliverygoodsdetail";
-import { Ermcp3Brand, Ermcp3Wrstandard, ErmcpDeliveryGoodsDetailEx, ErmcpDeliveryGoodsRsp } from "@/services/go/ermcp/goodsInfo/interface";
+import { ErmcpDeliveryGoodsRsp } from "@/services/go/ermcp/goodsInfo/interface";
 import { orderContract, spotContractStatus } from "@/services/proto/spotcontract";
 import {
     GldErmcpSpotContractOperateReq,
@@ -20,6 +18,7 @@ import Long from 'long';
 import moment, { Moment } from "moment";
 import { reactive, ref, Ref, UnwrapRef } from "vue";
 import { FormState } from './interface';
+import { Ermcp3DeliveryGoodsDetail, XHBRAND, XHWrstandard, TBGoods } from '@/services/go/ermcp/goodsInfo/interface/deliverygoodsdetail'
 
 
 /**
@@ -249,12 +248,14 @@ export function handleContract(formState: UnwrapRef<FormState>) {
 export function handleDeliveryGoods(formState: UnwrapRef<FormState>) {
     // 现货品种
     const deliveryGoodsList = ref<ErmcpDeliveryGoodsRsp[]>([])
+    // 现货商品详情
+    let goodsDetailList: Ermcp3DeliveryGoodsDetail[] = [];
     // 品牌
-    const gblist = ref<Ermcp3Brand[]>([])
+    const bdlst = ref<XHBRAND[]>([])
     // 品类列表
-    const gmlist = ref<Ermcp3Wrstandard[]>([])
+    const wdlst = ref<XHWrstandard[]>([])
     // 合约列表
-    const goodsList = ref<TBGoods[]>([]);
+    const gdlist = ref<TBGoods[]>([]);
 
     // 查询现货商品
     function getDeliveryGoods() {
@@ -266,72 +267,55 @@ export function handleDeliveryGoods(formState: UnwrapRef<FormState>) {
         })
     }
 
+
+    GetDeliveryGoodsDetail().then((res) => {
+        goodsDetailList=res
+    })
     // 查询商品列表
-    function getGoodsList(deliverygoodsid: number, wrstandardid: number) {
-        goodsList.value.length = 0;
-        GetDeliveryGoodsDetail(deliverygoodsid).then((res) => {
-            res.forEach((deliverygoods) => {
-                // 查询现货商品
-                const wrstandard = deliverygoods.wdlst.find((e) => e.wrstandardid === wrstandardid);
-                if (wrstandard) {
-                    // 套保品种列表
-                    wrstandard.mglst.forEach((middlegoods) => {
-                        // 期货品种列表
-                        middlegoods.GPLST.forEach((item) => {
-                            goodsList.value.push(...item.GDLST);
-                        })
-                    })
-                }
-            })
-        })
+    function getGoodsList(value:number) {
+        gdlist.value.length = 0;
+        const obj=goodsDetailList.find(itme=>itme.deliverygoodsid===value)
+        if(obj){
+            bdlst.value=obj.bdlst
+            wdlst.value=obj.wdlst
+        } 
     }
-
+  
     // 切换现货商品
     function deliveryGoodsChange(value: number | undefined) {
         if (value !== undefined) {
-            getDeliveryGoodsDetail(value)
+            getGoodsList(value)
         } else {
-            gblist.value.length = 0
-            gmlist.value.length = 0
+            bdlst.value.length = 0
+            wdlst.value.length = 0
         }
         formState.WrStandardID = undefined;
         formState.SpotGoodsBrandID = undefined;
         formState.ConvertFactor = undefined;
-    }
-
-    // 查询现货商品详情
-    function getDeliveryGoodsDetail(deliverygoodsid: number) {
-        const temp = APP.get('DeliveryGoodsList').find((e: ErmcpDeliveryGoodsDetailEx) => e.data.deliverygoodsid === deliverygoodsid)
-        if (temp) {
-            gblist.value = temp.gblist
-            gmlist.value = temp.gmlist
-        }
+        formState.GoodsID = undefined;
     }
 
     const numberUnit = ref<string>('')
 
     // 品类变更
     function WrStandardChange(value: number) {
-        const obj = gmlist.value.find((e) => e.wrstandardid === value);
-        if (obj) {
-            //标仓系数
-            formState.ConvertFactor = obj.convertfactor;
-            // 单位
-            numberUnit.value = getGoodsUnitEnumItemName(obj.unitid);
-            getGoodsList(obj.deliverygoodsid, obj.wrstandardid);
+        const obj=wdlst.value.find(item=>item.wrstandardid===value)
+        if(obj){
+            gdlist.value=obj.mglst[0].GPLST[0].GDLST
         }
+        formState.GoodsID = undefined;
     }
 
     return {
         deliveryGoodsList,
-        gblist,
-        gmlist,
-        goodsList,
+        bdlst,
+        wdlst,
+        gdlist,
         numberUnit,
         WrStandardChange,
         getDeliveryGoods,
-        getDeliveryGoodsDetail,
-        deliveryGoodsChange
+        deliveryGoodsChange,
+        GetDeliveryGoodsDetail
     }
 }
 

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

@@ -1,32 +1,32 @@
 <template>
-    <!-- 管理-业务审核-交收 -->
-    <div class="business-review-js" :loading="loading">
-        <Filter @search="updateColumn"></Filter>
-        <a-table :columns="columns" class="topTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :data-source="tableList">
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="handlePermissionBtn(buttons, record)" :record="record" @click="openComponent" />
-            </template>
-            <template #operateapplytype="{ text }">
-                <a>{{ getPriceTypeName(text) }}</a>
-            </template>
-            <template #contracttype="{ text }">
-                <a>{{ getContractTypeName(text) }}</a>
-            </template>
-            <template #applystatus="{ text }">
-                <a>{{ getApplyStatusName(text) }}</a>
-            </template>
-            <template #buyusernameOrsellusername="{ record }">
-                <a>{{ getAnalogueName(record.contracttype, record.buyusername, record.sellusername) }}</a>
-            </template>
-            <template #addmargin||decmargin="{ record }">
-                <a>{{ record.addmargin !== 0 && record.addmargin !== undefined ? '+' + record.addmargin : record.decmargin === 0 || record.decmargin === undefined ? '' : '-' + record.decmargin }} </a>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="handlePermissionBtn(buttons, selectedRow)"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
+  <!-- 管理-业务审核-交收 -->
+  <div class="business-review-js" :loading="loading">
+    <Filter @search="updateColumn"></Filter>
+    <a-table :columns="columns" class="topTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="handlePermissionBtn(buttons, record)" :record="record" @click="openComponent" />
+      </template>
+      <template #operateapplytype="{ text }">
+        <a>{{ getPriceTypeName(text) }}</a>
+      </template>
+      <template #contracttype="{ text }">
+        <a>{{ getContractTypeName(text) }}</a>
+      </template>
+      <template #applystatus="{ text }">
+        <a>{{ getApplyStatusName(text) }}</a>
+      </template>
+      <template #buyusernameOrsellusername="{ record }">
+        <a>{{ getAnalogueName(record.contracttype, record.buyusername, record.sellusername) }}</a>
+      </template>
+      <template #addmargin||decmargin="{ record }">
+        <a>{{ record.addmargin !== 0 && record.addmargin !== undefined ? '+' + record.addmargin : record.decmargin === 0 || record.decmargin === undefined ? '' : '-' + record.decmargin }} </a>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="handlePermissionBtn(buttons, selectedRow)"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -68,12 +68,11 @@ export default defineComponent({
                     queryTable(QueryBusinessJs, { applystatus: '1' });
                     break;
                 case 'settlement_performance':
-                    queryTable(QueryBusinessJs, { applystatus: '2' });
+                    queryTable(QueryBusinessJs, { applystatus: '2,3' });
                     break;
             }
         };
 
-
         // 获取表头名称
         const getTableName = () => {
             switch (routeName) {

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

@@ -1,32 +1,32 @@
 <template>
-    <!-- 管理-业务审核-点价 -->
-    <div class="business-review-dj" :loading="loading">
-        <Filter @search="updateColumn"></Filter>
-        <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="handlePermissionBtn(buttons, record)" :record="record" @click="openComponent" />
-            </template>
-            <template #pricetype="{ text }">
-                <a>{{ getPriceTypeName(text) }}</a>
-            </template>
-            <template #applystatus="{ text }">
-                <a>{{ getApplyStatusName(text) }}</a>
-            </template>
-            <template #contracttype="{ text }">
-                <a>{{ getContractTypeName(text) }}</a>
-            </template>
-            <template #contractstatus="{ text }">
-                <a>{{ getContractStatusName(text) }}</a>
-            </template>
-            <template #buyusernameOrsellusername="{ record }">
-                <a>{{ getAnalogueName(record.contracttype, record.buyusername, record.sellusername) }}</a>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="handlePermissionBtn(buttons, selectedRow)"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
+  <!-- 管理-业务审核-点价 -->
+  <div class="business-review-dj" :loading="loading">
+    <Filter @search="updateColumn"></Filter>
+    <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="handlePermissionBtn(buttons, record)" :record="record" @click="openComponent" />
+      </template>
+      <template #pricetype="{ text }">
+        <a>{{ getPriceTypeName(text) }}</a>
+      </template>
+      <template #applystatus="{ text }">
+        <a>{{ getApplyStatusName(text) }}</a>
+      </template>
+      <template #contracttype="{ text }">
+        <a>{{ getContractTypeName(text) }}</a>
+      </template>
+      <template #contractstatus="{ text }">
+        <a>{{ getContractStatusName(text) }}</a>
+      </template>
+      <template #buyusernameOrsellusername="{ record }">
+        <a>{{ getAnalogueName(record.contracttype, record.buyusername, record.sellusername) }}</a>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="handlePermissionBtn(buttons, selectedRow)"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -41,8 +41,7 @@ import { getTableButton } from '@/common/setup/table/button';
 import { QueryBusinessDj } from '@/services/go/ermcp/business-review';
 import { QryBusinessDjRsp } from '@/services/go/ermcp/business-review/interface';
 import { useRoute } from 'vue-router';
-import moment from "moment"
-
+import moment from 'moment';
 
 export default defineComponent({
     name: 'business-review-dj',
@@ -68,17 +67,17 @@ export default defineComponent({
         const queryTableAction = () => {
             switch (routeName) {
                 case 'someprice_checkpending':
-                    queryTable(QueryBusinessDj, { applystatus: '1' }).then(res => {
-                        tableList.value.sort((a,b)=>{
-                            return moment(b.audittime).valueOf()-moment(a.audittime).valueOf()
-                        })
+                    queryTable(QueryBusinessDj, { applystatus: '1' }).then((res) => {
+                        tableList.value.sort((a, b) => {
+                            return moment(b.audittime).valueOf() - moment(a.audittime).valueOf();
+                        });
                     });
                     break;
                 case 'someprice_performance':
-                    queryTable(QueryBusinessDj, { applystatus: '2' }).then(res => {
-                        tableList.value.sort((a,b)=>{
-                            return moment(b.audittime).valueOf()-moment(a.audittime).valueOf()
-                        })
+                    queryTable(QueryBusinessDj, { applystatus: '2,3' }).then((res) => {
+                        tableList.value.sort((a, b) => {
+                            return moment(b.audittime).valueOf() - moment(a.audittime).valueOf();
+                        });
                     });
             }
         };

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

@@ -1,45 +1,45 @@
 <template>
-    <!-- 管理 - 财务审核 - 款项 -->
-    <div class="business-review-js" :loading="loading">
-        <Filter @search="updateColumn"></Filter>
-        <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="handlePermissionBtn(buttons, record)" :record="record" @click="openComponent" />
-            </template>
-            <!-- 现货合同类型 -->
-            <template #contractstatus="{ record }">
-                <a>{{ getApplyStatusName(record.applystatus) }}</a>
-            </template>
-            <!-- 合同类型-->
-            <template #contracttype="{ record }">
-                <a>{{ getContractTypeName(record.contracttype) }}</a>
-            </template>
-            <!-- 状态 -->
-            <template #applystatus="{ text }">
-                <a>{{ getApplyStatusName(text) }}</a>
-            </template>
-            <!-- 点价类型 -->
-            <template #operateapplytype="{ text }">
-                <a>{{ operateApplyTypeName(text) }}</a>
-            </template>
-            <!-- 款项类型 -->
-            <template #kxtype="{ record }">
-                <a>{{ stateName(record.deductamount, record.contracttype) }}</a>
-            </template>
-            <!-- 对手方 -->
-            <template #buyusernameOrsellusername="{ record }">
-                <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
-            </template>
-            <!-- 金额 如果是退款 则使用deductamount  如果是付款则使用payamount-->
-            <template #payamount="{ record }">
-                <a>{{ record.deductamount === undefined || record.deductamount === 0 ? record.payamount : record.deductamount }}</a>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="handlePermissionBtn(buttons, selectedRow)"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
+  <!-- 管理 - 财务审核 - 款项 -->
+  <div class="business-review-js" :loading="loading">
+    <Filter @search="updateColumn"></Filter>
+    <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="handlePermissionBtn(buttons, record)" :record="record" @click="openComponent" />
+      </template>
+      <!-- 现货合同类型 -->
+      <template #contractstatus="{ record }">
+        <a>{{ getApplyStatusName(record.applystatus) }}</a>
+      </template>
+      <!-- 合同类型-->
+      <template #contracttype="{ record }">
+        <a>{{ getContractTypeName(record.contracttype) }}</a>
+      </template>
+      <!-- 状态 -->
+      <template #applystatus="{ text }">
+        <a>{{ getApplyStatusName(text) }}</a>
+      </template>
+      <!-- 点价类型 -->
+      <template #operateapplytype="{ text }">
+        <a>{{ operateApplyTypeName(text) }}</a>
+      </template>
+      <!-- 款项类型 -->
+      <template #kxtype="{ record }">
+        <a>{{ stateName(record.deductamount, record.contracttype) }}</a>
+      </template>
+      <!-- 对手方 -->
+      <template #buyusernameOrsellusername="{ record }">
+        <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
+      </template>
+      <!-- 金额 如果是退款 则使用deductamount  如果是付款则使用payamount-->
+      <template #payamount="{ record }">
+        <a>{{ record.deductamount === undefined || record.deductamount === 0 ? record.payamount : record.deductamount }}</a>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="handlePermissionBtn(buttons, selectedRow)"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -80,7 +80,7 @@ export default defineComponent({
                     queryTable(QueryBusinessKx, { applystatus: '1' });
                     break;
                 case 'funds_performance':
-                    queryTable(QueryBusinessKx, { applystatus: '2' });
+                    queryTable(QueryBusinessKx, { applystatus: '2,3' });
                     break;
             }
         };

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

@@ -1,37 +1,41 @@
 <template>
-    <!-- 管理 - 财务审核 - 发票 -->
-    <div class="finance_review_invoice" :loading="loading">
-        <Filter @search="updateColumn"> </Filter>
-        <a-table :columns="columns" class="topTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :data-source="tableList">
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="handlePermissionBtn(buttons, record)" :record="record" @click="openComponent" />
-            </template>
-            <!-- 现货合同类型 -->
-            <template #contracttype="{ text }">
-                <a>{{ getContractTypeName(text) }}</a>
-            </template>
-            <!-- 发票类型-->
-            <template #invoicetype="{ record }">
-                <a>{{ invoiceStatusName(record.contracttype) }}</a>
-            </template>
-            <!-- 状态 -->
-            <template #applystatus="{ text }">
-                <a>{{ getApplyStatusName(text) }}</a>
-            </template>
-            <!-- 点价类型 -->
-            <template #operateapplytype="{ text }">
-                <a>{{ operateApplyTypeName(text) }}</a>
-            </template>
-            <!-- 对手方 -->
-            <template #buyusernameOrsellusername="{ record }">
-                <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="handlePermissionBtn(buttons, selectedRow)"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
+  <!-- 管理 - 财务审核 - 发票 -->
+  <div class="finance_review_invoice" :loading="loading">
+    <Filter @search="updateColumn"> </Filter>
+    <a-table :columns="columns" class="topTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="handlePermissionBtn(buttons, record)" :record="record" @click="openComponent" />
+      </template>
+      <!-- 现货合同类型 -->
+      <template #contracttype="{ text }">
+        <a>{{ getContractTypeName(text) }}</a>
+      </template>
+      <!-- 发票类型-->
+      <template #invoicetype="{ record }">
+        <a>{{ invoiceStatusName(record.contracttype) }}</a>
+      </template>
+      <!-- 状态 -->
+      <template #applystatus="{ text }">
+        <a>{{ getApplyStatusName(text) }}</a>
+      </template>
+      <!-- 发票附件 -->
+      <template #attachurl="{text}" class="attachurl">
+          {{text}}
+      </template>
+      <!-- 点价类型 -->
+      <template #operateapplytype="{ text }">
+        <a>{{ operateApplyTypeName(text) }}</a>
+      </template>
+      <!-- 对手方 -->
+      <template #buyusernameOrsellusername="{ record }">
+        <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="handlePermissionBtn(buttons, selectedRow)"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -72,7 +76,7 @@ export default defineComponent({
                     queryTable(QueryBusinessFp, { applystatus: '1' });
                     break;
                 case 'invoice_performance':
-                    queryTable(QueryBusinessFp, { applystatus: '2' });
+                    queryTable(QueryBusinessFp, { applystatus: '2,3' });
                     break;
             }
         };
@@ -140,4 +144,9 @@ export default defineComponent({
         };
     },
 });
-</script>
+</script>
+<style scoped>
+.attachurl{
+    white-space:nowrap
+}
+</style>

src/views/manage/inventory-review/list/audit/index.vue

@@ -1,37 +1,37 @@
 <template>
-    <!-- 库存审核 入库-->
-    <div class="inventory_review_checkin" :loading="loading">
-        <Filter @search="updateColumn" :inOrOut="'in'"></Filter>
-        <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="handlePermissionBtn(buttons, record)" :record="record" @click="openComponent" />
-            </template>
-            <!-- 状态 -->
-            <template #applystatus="{ text }">
-                <a>{{ getApplyStatusName(text) }}</a>
-            </template>
-            <!-- 现货合同类型 -->
-            <template #contracttype="{ text }">
-                <a>{{ getContractTypeName(text) }}</a>
-            </template>
-            <!-- 点价类型 -->
-            <template #pricetype="{ text }">
-                <a>{{ getPriceTypeName(text) }}</a>
-            </template>
-            <!-- 出入库类型 -->
-            <template #inouttype="{ text }">
-                <a>{{ InOutTypeName(text) }}</a>
-            </template>
-            <!-- 对手方 -->
-            <template #buynicknameOrsellusername="{ record }">
-                <a>{{ handleName(record) }}</a>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="handlePermissionBtn(buttons, selectedRow)"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
+  <!-- 库存审核 入库-->
+  <div class="inventory_review_checkin" :loading="loading">
+    <Filter @search="updateColumn" :inOrOut="'in'"></Filter>
+    <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="handlePermissionBtn(buttons, record)" :record="record" @click="openComponent" />
+      </template>
+      <!-- 状态 -->
+      <template #applystatus="{ text }">
+        <a>{{ getApplyStatusName(text) }}</a>
+      </template>
+      <!-- 现货合同类型 -->
+      <template #contracttype="{ text }">
+        <a>{{ getContractTypeName(text) }}</a>
+      </template>
+      <!-- 点价类型 -->
+      <template #pricetype="{ text }">
+        <a>{{ getPriceTypeName(text) }}</a>
+      </template>
+      <!-- 出入库类型 -->
+      <template #inouttype="{ text }">
+        <a>{{ InOutTypeName(text) }}</a>
+      </template>
+      <!-- 对手方 -->
+      <template #buynicknameOrsellusername="{ record }">
+        <a>{{ handleName(record) }}</a>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="handlePermissionBtn(buttons, selectedRow)"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -74,7 +74,7 @@ export default defineComponent({
                     break;
                 // 已审核
                 case 'stock_performance':
-                    queryTable(QueryAreaStockApply, { applystatus: '2' });
+                    queryTable(QueryAreaStockApply, { applystatus: '2,3' });
                     break;
             }
         };

src/views/market/futures/compoments/futures-trade/index.less

@@ -0,0 +1,168 @@
+.futures_trade {
+    display: flex;
+    height : 100%;
+
+    &__left {
+        flex: 1;
+    }
+}
+
+.post_buying {
+    width : 100%;
+    height: 100%;
+    .flex;
+    flex-direction: column;
+    position      : relative;
+    overflow      : hidden;
+
+    .ant-form {
+        height: 100%;
+    }
+
+    .condition {
+        width        : 100%;
+        height       : 48px;
+        margin       : 0 16px;
+        padding      : 10px 0;
+        border-bottom: 1px solid @m-black6;
+        .inlineflex;
+
+        .conditionBtn {
+            align-self : center;
+            align-items: center;
+            border     : 0;
+            min-width  : 80px;
+            height     : 28px;
+            line-height: 28px;
+            background : @m-black7;
+            .rounded-corners(3px);
+            font-size: 14px;
+            color    : @m-blue0;
+
+            &:hover {
+                background: @m-black7-hover;
+                color     : @m-blue0-hover;
+            }
+        }
+
+        .conditionBtn+.conditionBtn {
+            margin-left: 10px;
+        }
+    }
+}
+
+.unit {
+    margin-left: 70px;
+    width      : 260px;
+    .flex;
+    justify-content: space-between;
+    font-size      : 14px;
+    color          : @m-grey41;
+    height         : 14px;
+    line-height    : 14px;
+}
+
+.listedBtn {
+    width        : 120px;
+    height       : 30px;
+    line-height  : 30px;
+    background   : linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
+    border-radius: 3px;
+    color        : @m-white0;
+    font-size    : 14px;
+    text-align   : center;
+    border       : 0;
+
+    &:hover {
+        background: linear-gradient(0deg, @m-blue0-hover 0%, @m-blue2-hover 100%);
+        color     : @m-white0-hover;
+    }
+}
+
+.cancelBtn:extend(.listedBtn) {
+    background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%) !important;
+
+    &:hover {
+        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 100%) !important;
+        color     : @m-white0-hover;
+    }
+}
+
+.ml10 {
+    margin-left: 10px;
+}
+
+.ant-form.dialogForm .ant-row.ant-form-item {
+    margin-bottom: 14px;
+}
+
+.mt20 {
+    margin-top: 20px;
+}
+
+.mt-10 {
+    margin-top: -10px;
+}
+
+.ant-input-suffix {
+    position: absolute;
+    right   : -25px;
+}
+
+.minusBtn,
+.plusBtn {
+    width      : 15px;
+    height     : 32px;
+    line-height: 32px;
+    font-size  : 15px;
+    color      : @m-blue15;
+    cursor     : pointer;
+}
+
+.minusBtn {
+    position: absolute;
+    top     : -6px;
+    left    : 14px;
+    z-index : 1;
+}
+
+.plusBtn {
+    position: absolute;
+    top     : -6px;
+    right   : 14px;
+    z-index : 1;
+}
+
+.stepper {
+    padding-left : 30px;
+    padding-right: 30px;
+    text-align   : center;
+    color        : @m-yellow1;
+    font-size    : 16px;
+}
+
+.ant-slider.formSlider {
+    width      : 260px !important;
+    margin-left: 70px;
+
+    .ant-slider-rail {
+        margin-right    : 0;
+        padding-right   : 0;
+        height          : 3px !important;
+        border-radius   : 2px !important;
+        background-color: @m-blue14;
+    }
+
+    .ant-slider-track {
+        height          : 3px;
+        background-color: @m-blue0;
+    }
+
+    .ant-slider-step {
+        height: 3px;
+    }
+
+    .ant-progress-text {
+        display: none;
+    }
+}

src/views/market/futures/compoments/futures-trade/index.vue

@@ -1,8 +1,40 @@
 <template>
-  <!-- 挂牌求购 -->
-  <Drawer :title="'挂牌求购'" :placement="'right'" :visible="visible" @cancel="cancel" class="top">
-    <div class="post_buying">
-      <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
+  <!-- 期货交易 -->
+  <Drawer :title="'期货交易'" :placement="'right'" :visible="visible" @cancel="cancel" class="top">
+    <div class="futures_trade">
+      <div class="futures_trade__left">
+        <a-form class="inlineForm">
+          <a-form-item label="账号">
+            <a-select class="inlineFormSelect" placeholder="请选择" v-model:value="formState.accountid">
+              <a-select-option v-for="item in accountList" :value="item.accountid" :key="item.accountid">{{ item.accountid }}</a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="合约">
+            <a-select class="inlineFormSelect" placeholder="请选择"></a-select>
+          </a-form-item>
+          <a-form-item label="交易价格">
+            <a-input-number class="commonInput" />
+            <MinusOutlined @click="decreaseNumber" />
+            <PlusOutlined @click="increaseNumber" />
+            <a-select class="inlineFormSelect" placeholder="请选择"></a-select>
+          </a-form-item>
+          <a-form-item label="交易数量">
+            <a-input-number class="commonInput" />
+            <MinusOutlined @click="decreaseNumber" />
+            <PlusOutlined @click="increaseNumber" />
+            <a-button>复位</a-button>
+          </a-form-item>
+        </a-form>
+        <div>
+          <a-button>买入</a-button>
+          <a-button>卖出</a-button>
+          <a-button>平仓</a-button>
+        </div>
+      </div>
+      <div class="futures_trade__right">
+
+      </div>
+      <!-- <a-form class="inlineForm dialogForm" ref="formRef" :model="formState" :rules="rules">
         <div class="formBar">
           <a-row :gutter="24">
             <a-col :span="24">
@@ -19,7 +51,7 @@
             </a-col>
             <a-col :span="24">
               <a-form-item label="挂牌数量" name="OrderQty">
-                <a-input-number class="commonInput" style="width: 260px" :min="0" :max="getMaxNum()" v-model:value="formState.OrderQty" />
+                <a-input-number class="commonInput" style="width: 260px" :min="0" v-model:value="formState.OrderQty" />
                 <span class="input-enumdicname">{{ selectedRow.enumdicname }}</span>
               </a-form-item>
             </a-col>
@@ -33,7 +65,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-      </a-form>
+      </a-form> -->
     </div>
   </Drawer>
 </template>
@@ -41,8 +73,6 @@
 <script lang="ts">
 import { Des } from '@/common/components/commonDes';
 import Drawer from '@/common/components/drawer/index.vue';
-import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { ModalEnum } from '@/common/constants/modalNameEnum';
 import { _closeModal } from '@/common/setup/modal/modal';
 import { getAccountTypeList } from '@/services/bus/account';
 import { MinusOutlined, PlusOutlined } from '@ant-design/icons-vue';
@@ -60,20 +90,12 @@ export default defineComponent({
             type: Object as PropType<TempWrOrderQuoteDetail>,
             default: {},
         },
-        enumName: {
-            default: '',
-            type: String as PropType<EnumRouterName>,
-        },
-        time: {
-            type: Object as PropType<Moment>,
-            default: moment(),
-        },
     },
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
         const { rules, formState, formRef } = handleForm(props.selectedRow);
         const loading = ref<boolean>(false);
-        const accountList = getAccountTypeList([2]);
+        const accountList = getAccountTypeList([1]);
         if (accountList.length) {
             formState.accountid = accountList[0].accountid;
         }
@@ -103,140 +125,5 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.post_buying {
-    width: 100%;
-    height: 100%;
-    .flex;
-    flex-direction: column;
-    position: relative;
-    overflow: hidden;
-    .ant-form {
-        height: 100%;
-    }
-    .condition {
-        width: 100%;
-        height: 48px;
-        margin: 0 16px;
-        padding: 10px 0;
-        border-bottom: 1px solid @m-black6;
-        .inlineflex;
-        .conditionBtn {
-            align-self: center;
-            align-items: center;
-            border: 0;
-            min-width: 80px;
-            height: 28px;
-            line-height: 28px;
-            background: @m-black7;
-            .rounded-corners(3px);
-            font-size: 14px;
-            color: @m-blue0;
-            &:hover {
-                background: @m-black7-hover;
-                color: @m-blue0-hover;
-            }
-        }
-        .conditionBtn + .conditionBtn {
-            margin-left: 10px;
-        }
-    }
-}
-
-.unit {
-    margin-left: 70px;
-    width: 260px;
-    .flex;
-    justify-content: space-between;
-    font-size: 14px;
-    color: @m-grey41;
-    height: 14px;
-    line-height: 14px;
-}
-.listedBtn {
-    width: 120px;
-    height: 30px;
-    line-height: 30px;
-    background: linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
-    border-radius: 3px;
-    color: @m-white0;
-    font-size: 14px;
-    text-align: center;
-    border: 0;
-    &:hover {
-        background: linear-gradient(0deg, @m-blue0-hover 0%, @m-blue2-hover 100%);
-        color: @m-white0-hover;
-    }
-}
-.cancelBtn:extend(.listedBtn) {
-    background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%) !important;
-    &:hover {
-        background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 100%) !important;
-        color: @m-white0-hover;
-    }
-}
-.ml10 {
-    margin-left: 10px;
-}
-.ant-form.dialogForm .ant-row.ant-form-item {
-    margin-bottom: 14px;
-}
-.mt20 {
-    margin-top: 20px;
-}
-.mt-10 {
-    margin-top: -10px;
-}
-.ant-input-suffix {
-    position: absolute;
-    right: -25px;
-}
-.minusBtn,
-.plusBtn {
-    width: 15px;
-    height: 32px;
-    line-height: 32px;
-    font-size: 15px;
-    color: @m-blue15;
-    cursor: pointer;
-}
-.minusBtn {
-    position: absolute;
-    top: -6px;
-    left: 14px;
-    z-index: 1;
-}
-.plusBtn {
-    position: absolute;
-    top: -6px;
-    right: 14px;
-    z-index: 1;
-}
-.stepper {
-    padding-left: 30px;
-    padding-right: 30px;
-    text-align: center;
-    color: @m-yellow1;
-    font-size: 16px;
-}
-.ant-slider.formSlider {
-    width: 260px !important;
-    margin-left: 70px;
-    .ant-slider-rail {
-        margin-right: 0;
-        padding-right: 0;
-        height: 3px !important;
-        border-radius: 2px !important;
-        background-color: @m-blue14;
-    }
-    .ant-slider-track {
-        height: 3px;
-        background-color: @m-blue0;
-    }
-    .ant-slider-step {
-        height: 3px;
-    }
-    .ant-progress-text {
-        display: none;
-    }
-}
+@import './index.less';
 </style>

src/views/market/futures/index.vue

@@ -55,7 +55,7 @@ import { getShowBottomValue } from '@/common/config/constrolBottom';
 import { handleModalComponent } from '@/common/setup/asyncComponent';
 import { handleQuotePriceColor, handleSubcriteOnDemandQuote, quoteAmplitude, quoteAmplituOfVibration, quoteChange } from '@/common/setup/table/tableQuote';
 import { QueryQuoteDayRsp } from '@/services/go/quote/interface';
-import { ref } from 'vue';
+import { ref, reactive, Ref, toRefs } from 'vue';
 import { getColumnsList, useExternalexchange } from './setup';
 import { getTableButton } from '@/common/setup/table/button';
 import { contextMenu, defineAsyncComponent, defineComponent } from '@/common/export/commonTable';
@@ -64,6 +64,9 @@ import { TableEventCB } from '@/common/setup/table/interface';
 import { getTableEvent } from '@/common/export/table';
 import { ContextMenuTemp } from '@/common/components/contextMenu/interface';
 import { BtnListType } from '@/common/components/btnList/interface';
+import APP from '@/services';
+import { Goods } from '@/services/go/ermcp/goodsInfo/interface';
+import { getQuoteDayInfoByCode } from '@/services/bus/goods';
 
 export default defineComponent({
     name: 'spot_trade_order_transaction_swap',
@@ -73,22 +76,54 @@ export default defineComponent({
         trade: defineAsyncComponent(() => import('./compoments/futures-trade/index.vue')),
     },
     setup() {
+        interface Quote {
+            goodscode: string;
+            goodsname: string;
+            decimalplace: number;
+            last?: Ref;
+            presettle?: Ref;
+        }
+
+        const goodsList = APP.get('Goods') as Goods[];
+        const tableList = reactive<Quote[]>([]);
+        const quoteList = ref<QueryQuoteDayRsp[]>([]);
+
+        goodsList.forEach((el) => {
+            const quote = getQuoteDayInfoByCode(el.goodscode);
+            if (quote) {
+                quoteList.value.push(quote);
+            }
+            tableList.push({
+                goodscode: el.goodscode,
+                goodsname: el.goodsname,
+                decimalplace: el.decimalplace,
+            });
+        });
+
         const isBottom = getShowBottomValue();
-        const selectedRow = ref<QueryQuoteDayRsp>();
         const buttons = getTableButton();
         console.log('buttons', buttons);
-        const { index, loading, tabList, tableList, hanldeQuoteData } = useExternalexchange();
+        const { index, loading, tabList, hanldeQuoteData } = useExternalexchange();
         // 行情按需订阅
-        let stopSubcribe = handleSubcriteOnDemandQuote<QueryQuoteDayRsp>(tableList);
+        let stopSubcribe = handleSubcriteOnDemandQuote<QueryQuoteDayRsp>(quoteList);
         function changeTab(index: number, current: TabList) {
             hanldeQuoteData(index);
             console.log(index, current);
             // 停止上次订阅
             stopSubcribe();
             // 重新发起订阅
-            stopSubcribe = handleSubcriteOnDemandQuote<QueryQuoteDayRsp>(tableList);
+            stopSubcribe = handleSubcriteOnDemandQuote<QueryQuoteDayRsp>(quoteList);
         }
 
+        quoteList.value.forEach((item) => {
+            const refs = toRefs(item);
+            const index = tableList.findIndex((e) => e.goodscode === item.goodscode);
+            if (index > -1) {
+                tableList[index].last = refs.last;
+                tableList[index].presettle = refs.presettle;
+            }
+        });
+
         // 右键逻辑
         const { contextMenu, closeContext: closeContextAction } = handleContextMenu();
         // 右键回调函数
@@ -99,7 +134,7 @@ export default defineComponent({
             },
         };
         // 表格事件
-        const { Rowclick } = getTableEvent<QueryQuoteDayRsp>(eventsCB);
+        const { selectedRow, Rowclick } = getTableEvent<QueryQuoteDayRsp>(eventsCB);
         // 控制异步组件
         const { componentId, closeComponent, openComponent } = handleModalComponent(() => {}, selectedRow);
         // 关闭右键

src/views/market/futures/setup.ts

@@ -90,6 +90,133 @@ export const useExternalexchange = () => {
             const quote = getQuoteDayInfoByCode(el.goodscode);
             if (quote) {
                 tableList.value.push(quote)
+            } else {
+                tableList.value.push({
+                    ask: 0,
+                    ask1number: 0,
+                    ask2: 0,
+                    ask3: 0,
+                    ask4: 0,
+                    ask5: 0,
+                    ask6: 0,
+                    ask7: 0,
+                    ask8: 0,
+                    ask9: 0,
+                    askorderid: 0,
+                    askorderid2: 0,
+                    askorderid3: 0,
+                    askorderid4: 0,
+                    askorderid5: 0,
+                    askordervolume: 0,
+                    askordervolume1number: 0,
+                    askordervolume2: 0,
+                    askordervolume3: 0,
+                    askordervolume4: 0,
+                    askordervolume5: 0,
+                    askordervolume6: 0,
+                    askordervolume7: 0,
+                    askordervolume8: 0,
+                    askordervolume9: 0,
+                    askqueueinfo: '',
+                    askvolume: 0,
+                    askvolume1number: 0,
+                    askvolume2: 0,
+                    askvolume3: 0,
+                    askvolume4: 0,
+                    askvolume5: 0,
+                    askvolume6: 0,
+                    askvolume7: 0,
+                    askvolume8: 0,
+                    askvolume9: 0,
+                    averageprice: 0,
+                    bid: 0,
+                    bid1number: 0,
+                    bid2: 0,
+                    bid3: 0,
+                    bid4: 0,
+                    bid5: 0,
+                    bid6: 0,
+                    bid7: 0,
+                    bid8: 0,
+                    bid9: 0,
+                    bidorderid: 0,
+                    bidorderid2: 0,
+                    bidorderid3: 0,
+                    bidorderid4: 0,
+                    bidorderid5: 0,
+                    bidordervolume: 0,
+                    bidordervolume1number: 0,
+                    bidordervolume2: 0,
+                    bidordervolume3: 0,
+                    bidordervolume4: 0,
+                    bidordervolume5: 0,
+                    bidordervolume6: 0,
+                    bidordervolume7: 0,
+                    bidordervolume8: 0,
+                    bidordervolume9: 0,
+                    bidqueueinfo: '',
+                    bidvolume: 0,
+                    bidvolume1number: 0,
+                    bidvolume2: 0,
+                    bidvolume3: 0,
+                    bidvolume4: 0,
+                    bidvolume5: 0,
+                    bidvolume6: 0,
+                    bidvolume7: 0,
+                    bidvolume8: 0,
+                    bidvolume9: 0,
+                    calloptionpremiums: 0,
+                    calloptionpremiums2: 0,
+                    calloptionpremiums3: 0,
+                    calloptionpremiums4: 0,
+                    calloptionpremiums5: 0,
+                    cleartime: 0,
+                    exchangecode: 0,
+                    exchangedate: 0,
+                    goodscode: '',
+                    refgoodscode: '',
+                    grepmarketprice: 0,
+                    highest: 0,
+                    holdincrement: 0,
+                    holdvolume: 0,
+                    iep: 0,
+                    iev: 0,
+                    inventory: 0,
+                    iscleared: 0,
+                    issettled: 0,
+                    last: 0,
+                    lastlot: 0,
+                    lasttime: '',
+                    lastturnover: 0,
+                    lastvolume: 0,
+                    limitdown: 0,
+                    limitup: 0,
+                    lowest: 0,
+                    nontotalholdervolume: 0,
+                    nontotallot: 0,
+                    nontotalturnover: 0,
+                    nontotalvolume: 0,
+                    opened: 0,
+                    opentime: '',
+                    orderid: 0,
+                    preclose: 0,
+                    preholdvolume: 0,
+                    presettle: 0,
+                    publictradetype: '',
+                    putoptionpremiums: 0,
+                    putoptionpremiums2: 0,
+                    putoptionpremiums3: 0,
+                    putoptionpremiums4: 0,
+                    putoptionpremiums5: 0,
+                    settle: 0,
+                    strikeprice: 0,
+                    totalaskvolume: 0,
+                    totalbidvolume: 0,
+                    totallot: 0,
+                    totalturnover: 0,
+                    totalvolume: 0,
+                    utclasttime: '',
+                })
             }
         })
     }

src/views/report/components/filter/index.vue

@@ -16,7 +16,7 @@
                     {{ item.lable }}
                 </a-select-option>
             </a-select>
-            <slot></slot>
+            <slot :reset="reset" :search="search"></slot>
         </div>
     </div>
 </template>
@@ -42,10 +42,26 @@ export default defineComponent({
     },
     setup(props, context) {
         const { selectedReportType, reportType, reportTypeChange, isMonth, timeChange, dateFormat, time, selectedUser, userChange } = handleReprotType(context);
+        const oldSelectedReportType=selectedReportType.value
+        const oldSelectedUser=selectedUser.value
+        const oldTime=time.value
         const loading = ref<boolean>(false);
         // 交易用户
         const userList = ref<SelectOption[]>([]);
         const { queryTable } = handlerManagerList(loading, 2);
+        function reset() { //重置
+            selectedReportType.value=oldSelectedReportType
+            selectedUser.value=oldSelectedUser
+            time.value=oldTime
+            userChange()
+            timeChange()
+            reportTypeChange()
+        }
+        function search() {
+
+
+        }
+
         initData(() => {
             // 处理刷新
             selectedUser.value.key = getUserId();
@@ -79,6 +95,8 @@ export default defineComponent({
             isMonth,
             time,
             userList,
+            reset,
+            search
         };
     },
 });

src/views/report/setup.ts

@@ -11,12 +11,15 @@ import { Value } from "./interface"
 
 export function handleReprotType(context: SetupContext) {
     // 选中的周期类型
+    // 
     const selectedReportType = ref<Value>({ key: reportCycleType.day })
     // 时间格式化类型
     const dateFormat = ref<reportCyleTimeType>(reportCyleTimeType.day)
     // 时间
+    // 
     const time = ref<Moment>(getInitTime());
     // 交易用户
+    // 
     const selectedUser = ref<Value>({ key: getUserId() })
     // 周期类型与时间类型 一对一的关系
     const timeMap = new Map([

src/views/report/spot-report/components/filterTable/index.vue

@@ -1,6 +1,6 @@
 <template>
     <!-- 过滤客户资料表格 -->
-    <Filter @update="update">
+    <Filter @update="update" ref="filter" v-slot="{search,reset}">
         <a-select label-in-value class="conditionSelect ml10" style="width: 120px" v-model:value="selectedDG" @change="DGChange" placeholder="全部现货品种">
             <a-select-option v-for="item in DGList" :key="item.data.deliverygoodsname">
                 {{ item.data.deliverygoodsname }}
@@ -17,14 +17,14 @@
             </a-select-option>
         </a-select>
         <a-button class="selectBtn">查询</a-button>
-        <a-button class="selectBtn" @click="reset">重置</a-button>
+        <a-button class="selectBtn" @click="resetAction(search,reset)">重置</a-button>
     </Filter>
 </template>
 
 <script lang="ts">
 import FilterOption from '@/common/components/filter/index.vue';
 import { defineComponent } from 'vue';
-import { ref } from 'vue';
+import { ref ,onMounted } from 'vue';
 import { handleFilter, SelectList } from '@/common/setup/filter';
 import { handlerManagerList } from '@/common/setup/user';
 import { QueryMiddleGoodsDetail } from '@/services/go/ermcp/goodsInfo';
@@ -40,8 +40,18 @@ export default defineComponent({
         function update(value: TypeAndTime) {
             context.emit('update', value);
         }
+
+        let filter = ref(null);
+        onMounted(()=>{
+        console.log(filter.value)
+        });
         const { DGList, gblist, gmlist, selectedDG, selectedGB, selectedGM, DGChange, GBOrGMChange, reset } = handleDG(context);
+        function resetAction(search:Function,Nreset:Function) {
+            Nreset()
+            reset()
+        }
         return {
+            filter,
             DGList,
             gblist,
             gmlist,
@@ -52,6 +62,7 @@ export default defineComponent({
             selectedGB,
             selectedGM,
             update,
+            resetAction,
         };
     },
 });

src/views/report/spot-report/list/spot_report/index.vue

@@ -3,7 +3,9 @@
   <div class="table-detail-container table-height"
        :loading="loading">
     <Filter @update="search"
-            @filter="updateColumn"></Filter>
+            @filter="updateColumn"
+            :tableList="tableList"
+            ></Filter>
     <a-table :columns="columns"
              class="srcollYTable"
              :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"

src/views/report/sum_pl_report/list/sum_pl_report/index.vue

@@ -1,16 +1,8 @@
 <template>
   <!-- 汇总损益报表 -->
-  <div class="table-detail-container table-height"
-       :loading="loading">
+  <div class="table-detail-container table-height" :loading="loading">
     <Filter @update="search"></Filter>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="customRow"
-             rowKey="key"
-             :data-source="tableList">
+    <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="customRow" rowKey="key" :data-source="tableList">
       <!-- 出现浮点失真  强行处理-->
       <template #spotactualpl="{ record }">
         <span>{{ record.spotactualpl.toFixed(2) }}</span>
@@ -29,16 +21,8 @@
       </template>
     </a-table>
     <!-- 明细 -->
-    <Description v-if="visible"
-                 @close="closeDrawer"
-                 @changeTab="changeTab"
-                 :tabList="tabList">
-      <a-table :columns="columnsDetail"
-               class="topTable"
-               :pagination="false"
-               rowKey="key"
-               :data-source="detailTableList"
-               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+    <Description v-if="visible" @close="closeDrawer" @changeTab="changeTab" :tabList="tabList">
+      <a-table :columns="columnsDetail" class="topTable" :pagination="false" rowKey="key" :data-source="detailTableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
         <!-- 出现浮点失真  强行处理 * 2-->
         <template #spotactualpl="{ record }">
           <span>{{ record.spotactualpl.toFixed(2) }}</span>
@@ -87,7 +71,7 @@ export default defineComponent({
         // 周期类型
         const cycletype = ref(0);
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<Ermcp3ArealSumPL>();
+        const { loading, tableList, queryTable } = queryTableList<Ermcp3ArealSumPL>(true, 2);
         // 获取列表数据
         const queryTableAction = () => {
             const { getInitTime, getInitType } = handleInitTypeAndTime();