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

src/views/business/exposure/list/history/index.vue

@@ -1,9 +1,8 @@
 <template>
-  <!-- 采购: 历史敞口-->
-  <div class="purchase-history">
-    <div class="chart-main"
-         id="main"></div>
-  </div>
+    <!-- 采购: 历史敞口-->
+    <div class="purchase-history">
+        <div class="chart-main" id="main"></div>
+    </div>
 </template>
 
 <script lang="ts">

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

@@ -1,11 +1,9 @@
 <template>
-  <!-- 过滤客户资料表格 -->
-  <div class="filterTable">
-    <FilterOption :selectList="selectList"
-                  :inputList="inputList"
-                  :fixedBtnList="fixedBtnList" />
-    <slot></slot>
-  </div>
+    <!-- 过滤客户资料表格 -->
+    <div class="filterTable">
+        <FilterOption :selectList="selectList" :inputList="inputList" :fixedBtnList="fixedBtnList" />
+        <slot></slot>
+    </div>
 </template>
 
 <script lang="ts">
@@ -37,7 +35,4 @@ export default defineComponent({
         };
     },
 });
-</script>
-
-<style lang="less">
-</style>;
+</script>

src/views/business/search/plan/setup.ts

@@ -5,16 +5,16 @@ import { getPlanContractType, getPlanStatusName } from '@/views/business/plan/se
  * 表头对应字段
  */
 export const columns: ColumnType[] = [
-    {
-        key: '0th',
-        dataIndex: 'index',
-        title: '序号',
-        align: 'center',
-        slots: {
-            customRender: 'index',
-        },
-        width: 120,
-    },
+    // {
+    //     key: '0th',
+    //     dataIndex: 'index',
+    //     title: '序号',
+    //     align: 'center',
+    //     slots: {
+    //         customRender: 'index',
+    //     },
+    //     width: 120,
+    // },
     {
         title: '状态',
         dataIndex: 'hedgeplanstatus',

src/views/business/search/spot/setup.ts

@@ -7,16 +7,16 @@ import { formatTime, formatValue } from '@/common/methods';
  * 表头对应字段
  */
 export const columns: ColumnType[] = [
-    {
-        key: '0th',
-        dataIndex: 'index',
-        title: '序号',
-        align: 'center',
-        slots: {
-            customRender: 'index',
-        },
-        width: 120,
-    },
+    // {
+    //     key: '0th',
+    //     dataIndex: 'index',
+    //     title: '序号',
+    //     align: 'center',
+    //     slots: {
+    //         customRender: 'index',
+    //     },
+    //     width: 120,
+    // },
     {
         title: '状态',
         dataIndex: 'contracctstatus',

src/views/iframe/setup.ts

@@ -51,10 +51,10 @@ const iframeCode: { code: string, tabIndex: number }[] = [
         code: 'spot_params_performance', // 风管审核-现货参数审核-已审核
         tabIndex: 2,
     },
-    // {
-    //     code: 'price_report_spot', // 统计报表-定价报表
-    //     tabIndex: 1,
-    // },
+    {
+        code: 'price_report_spot', // 统计报表-定价报表
+        tabIndex: 1,
+    },
 ]
 
 /**

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

@@ -166,6 +166,17 @@ export function handleFormRule(formState: UnwrapRef<FormState>) {
     async function v_Goods(rule: RuleObject, value: number) {
         return validateCommon(value, '请选择点价合约')
     }
+
+    // 验证业务员
+    async function v_SaleUserID(rule: RuleObject, value: number) {
+        return validateCommon(value, '请选择业务员')
+    }
+
+    // 验证交易用户
+    async function v_TradeUserID(rule: RuleObject, value: number) {
+        return validateCommon(value, '请选择交易用户')
+    }
+
     const rules = {
         ContractNo: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
         ContractType: [{ required: true, validator: v_ContractType, trigger: 'change' }],
@@ -183,6 +194,8 @@ export function handleFormRule(formState: UnwrapRef<FormState>) {
         Qty: [{ required: true, message: '请输入数量', trigger: 'blur' }],
         Price: [{ required: true, message: '请输入价格', trigger: 'blur' }],
         PriceMove: [{ required: true, message: '请输入升贴水', trigger: 'blur', type: 'number' }],
+        SaleUserID: [{ required: true, validator: v_SaleUserID, trigger: 'change' }],
+        TradeUserID: [{ required: true, validator: v_TradeUserID, trigger: 'change' }],
     };
     return { rules }
 }