样式修改

src/assets/styles/mixin.less

@@ -526,18 +526,6 @@
         color: @m-grey2;
     }
 }
-.white {
-    color: @m-white0;
-}
-.blue {
-    color: @m-blue0;
-}
-.green {
-    color: @m-green0;
-}
-.yellow {
-    color: @m-yellow0;
-}
 .formFieldSet {
     border: 1px solid @m-grey19;
     padding: 0 20px 20px;
@@ -595,6 +583,21 @@
 .grey {
     color: @m-grey2;
 }
+.white {
+    color: @m-white0;
+}
+.blue {
+    color: @m-blue0;
+}
+.green {
+    color: @m-green0;
+}
+.yellow {
+    color: @m-yellow0;
+}
+.orange {
+    color: @m-orange0;
+}
 .selectBtn.ant-btn {
     margin-left: 10px;
     width: 80px;
@@ -741,4 +744,62 @@
         border-right: 1px solid @m-grey20;
     }
 
-}
+}
+
+// 弹窗表格样式
+// .dialogTable {
+//     .ant-table {
+//         width: 100%;
+//         table {
+//             border: 0;
+//         }
+//         .ant-table-thead {
+//             tr {
+//                 box-shadow: 0px 1px 0px 0px #2E3539;
+//                 th {
+//                     line-height: 34px;
+//                     background: @m-black8;
+//                     padding-top: 0;
+//                     padding-bottom: 0;
+//                     color: @m-grey17;
+//                     font-size: 14px;
+//                     border-right: 1px solid @m-black9;
+//                     border-bottom: 1px solid @m-black9;
+//                     white-space: nowrap;
+//                     text-overflow: ellipsis;
+//                     overflow: hidden;
+//                 }
+//             }
+//         }
+//         .ant-table-tbody {
+//             tr {
+//                 td {
+//                     height: 34px;
+//                     line-height: 34px;
+//                     padding: 0 8px;
+//                     border-right: 1px solid @m-black9;
+//                     border-bottom: 1px solid @m-black9;
+//                     font-size: 16px;
+//                     color: @m-white1;
+//                     white-space: nowrap;
+//                     text-overflow: ellipsis;
+//                     overflow: hidden;
+//                 }
+//             }
+//             tr.ant-table-expanded-row:hover { //tr.ant-table-expanded-row, 
+//                 td {
+//                     background-color: @m-blue3;
+//                 }
+//             }
+//             tr.ant-table-expanded-row {
+//                 td {
+//                     text-align: right;
+//                 }
+//             }
+//         }
+//         .ant-table-placeholder {
+//             border: 0;
+//             background: @m-black2;
+//         }
+//     }
+// }

src/assets/styles/variables.less

@@ -43,6 +43,7 @@
 @m-black8: #212629;
 @m-black9: #161A1C;
 @m-black10: #121618;
+@m-black11: #0B1620;
 @m-blue0: #3a87f7;
 @m-blue0-hover: rgba(@m-blue0, .8);
 @m-blue1: #4885eb;
@@ -70,6 +71,7 @@
 @m-red1: #FB7F75;
 @m-red1-hover: rgba(@m-red1, .8);
 @m-yellow0: #FF9600;
+@m-orange0: #F52929;
 
 @font-family: system-ui, -apple-system, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
 

src/views/information/custom/compoments/add/index.vue

@@ -222,7 +222,7 @@
                 客户二
               </a-select-option>
             </a-select>
-            <a-select class="inlineFormSelect"
+            <a-select class="inlineFormSelect ml10"
                       style="width: 205px"
                       placeholder="请选择市">
               <a-select-option value="1">
@@ -232,7 +232,7 @@
                 客户二
               </a-select-option>
             </a-select>
-            <a-select class="inlineFormSelect"
+            <a-select class="inlineFormSelect ml10"
                       style="width: 205px"
                       placeholder="请选择县(区)">
               <a-select-option value="1">

src/views/information/custom/compoments/modify/index.vue

@@ -142,7 +142,7 @@
                 客户二
               </a-select-option>
             </a-select>
-            <a-select class="inlineFormSelect"
+            <a-select class="inlineFormSelect ml10"
                       style="width: 205px"
                       placeholder="请选择市">
               <a-select-option value="1">
@@ -152,7 +152,7 @@
                 客户二
               </a-select-option>
             </a-select>
-            <a-select class="inlineFormSelect"
+            <a-select class="inlineFormSelect ml10"
                       style="width: 205px"
                       placeholder="请选择县(区)">
               <a-select-option value="1">

src/views/information/spot-contract/components/add/interface.ts

@@ -19,7 +19,7 @@ export interface FormState {
     Amount: number | null// double 金额[1:一口价、3:暂定价]
     DeliveryStartDate: string// string 交收期(开始)
     DeliveryEndDate: string // string 交收期(结束)
-    GoodsID: number // uint64 点价合约ID-0:为现货，其它为期货商品合约ID[2:点价3:暂定价]
+    GoodsID: number | undefined // uint64 点价合约ID-0:为现货，其它为期货商品合约ID[2:点价3:暂定价]
     // PriceMove: number// double 升贴水[2:点价3:暂定价]
     // StartDate: string // string 点价开始日期[2:点价3:暂定价]
     // EndDate: string // string 点价结束日期[2:点价3:暂定价]

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

@@ -23,6 +23,7 @@
       <a-tab-pane key="7" tab="变更记录"></a-tab-pane>
     </a-tabs>
     <a-form class="inlineForm"
+            v-if="activeKey == 1"
             :form="form"
             @submit="handleSearch">
       <fieldset class="formFieldSet">
@@ -179,6 +180,14 @@
         </a-row>
       </fieldset>
     </a-form>
+    <div class="tableDatas">
+      <a-table class="dialogTable" :columns="columns" :data-source="data" :pagination="false">
+        <template #status="{ text }">
+          <span class="yellow">{{ text }}</span>  
+          <!-- 审核通过'green' 审核拒绝 'orange' 待审核'yellow'   -->
+        </template>
+      </a-table>
+    </div>
   </a-modal>
 </template>
 
@@ -216,7 +225,99 @@ export default defineComponent({
                 loading.value = false;
                 cancel();
             }, 200);
-        }
+        };
+        const columns = [
+          {
+            title: '序号',
+            dataIndex: 'no',
+            key: 'no',
+            align: 'center'
+          },
+          {
+            title: '点价登记时间',
+            dataIndex: 'time',
+            key: 'time',
+            align: 'center'
+          },
+          {
+            title: '点价审核时间',
+            dataIndex: 'adutTime',
+            key: 'adutTime',
+            align: 'center'
+          },
+          {
+            title: '点价价格',
+            dataIndex: 'price',
+            key: 'price',
+            align: 'center'
+          },
+          {
+            title: '升贴水',
+            dataIndex: 'money',
+            key: 'money',
+            align: 'center'
+          },
+          {
+            title: '点价数量',
+            dataIndex: 'num',
+            key: 'num',
+            align: 'center'
+          },
+          {
+            title: '点价金额',
+            dataIndex: 'pointAmount',
+            key: 'pointAmount',
+            align: 'center'
+          },
+          {
+            title: '申请人',
+            dataIndex: 'apply',
+            key: 'apply',
+            align: 'center'
+          },
+          {
+            title: '审核人',
+            dataIndex: 'adutPerson',
+            key: 'adutPerson',
+            align: 'center'
+          },
+          {
+            title: '状态',
+            dataIndex: 'status',
+            key: 'status',
+            align: 'center',
+            slots: { customRender: 'status' },
+          }
+        ];
+
+        const data = [
+          {
+            key: '1',
+            no: '1',
+            time: '20-12-01 19:37',
+            adutTime: '20-12-01 20:37',
+            price: '1000.00',
+            money: '100',
+            num: '1',
+            pointAmount: '10100.00',
+            apply: 'lishunli',
+            adutPerson: 'wamgping',
+            status: '审核通过'
+          },
+          {
+            key: '2',
+            no: '2',
+            time: '20-12-01 19:37',
+            adutTime: '20-12-01 20:37',
+            price: '1000.00',
+            money: '100',
+            num: '1',
+            pointAmount: '10100.00',
+            apply: 'lishunli',
+            adutPerson: 'wamgping',
+            status: '审核驳回'
+          },
+        ];
         return {
             visible,
             cancel,
@@ -230,6 +331,8 @@ export default defineComponent({
             getContractTypeName,
             getBizTypeName,
             activeKey: ref('1'),
+            columns,
+            data
         };
     },
 });
@@ -239,7 +342,12 @@ export default defineComponent({
 .custom-detail {
   .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;
@@ -269,18 +377,19 @@ export default defineComponent({
       }
     }
   }
-}
-.ant-form.inlineForm {
-    margin-top: 20px;
-}
-.white {
-    color: @m-white0;
-}
-.blue {
-    color: @m-blue0;
-}
-.green {
-    color: @m-green0;
+  .tableDatas {
+    margin-top: 26px;
+    padding: 0 24px;
+    overflow: hidden;
+    .dialogTable {
+      width: 100%;
+      overflow: overlay;
+    }
+  }
+  .ant-form.inlineForm {
+      margin-top: 20px;
+      padding: 0 24px;
+  }
 }
 </style
 >;