合并代码，解决冲突

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,142 @@
         border-right: 1px solid @m-grey20;
     }
 
+}
+
+// 日期输入框 @m-grey21
+.commonPicker.ant-calendar-picker {
+    width: 200px !important;
+    .ant-input {
+        background: @m-grey21;
+        border-color: @m-grey14;
+        .ant-calendar-range-picker-input {
+            color: @m-white0;
+            font-size: 14px;
+            &::placeholder {
+                color: @m-grey10;
+            }
+        }
+        .ant-calendar-picker-clear {
+            background: @m-white0;
+        }
+        .ant-calendar-range-picker-separator {
+            font-size: 14px;
+            color: @m-grey2;
+        }
+    }
+}
+
+.ant-popover {
+    .ant-popover-content {
+        border: 1px solid @m-grey22;
+        .rounded-corners(5px);
+        .ant-popover-arrow {
+            border-top-color: @m-grey22;
+            border-left-color: @m-grey22;
+        }
+        .ant-popover-inner {
+            .ant-popover-inner-content {
+                border-image-width: 0;
+                background: @m-grey22;
+                color: @m-white0;
+                padding: 5px 15px;
+                &:hover {
+                    color: @m-blue0;
+                }
+            }
+        }
+    }
+}
+
+.ant-calendar-picker-container {
+    .ant-calendar-range {
+        background: @m-grey22;
+        border-color: @m-grey22;
+        .ant-calendar-panel {
+            .ant-calendar-date-panel {
+                .ant-calendar-range-part {
+                    .ant-calendar-input-wrap {
+                        border-bottom-color: @m-grey23;
+                        .ant-calendar-input {
+                            background: transparent;
+                            border: 1px solid @m-grey1;
+                            color: @m-white0;
+                            &::placeholder {
+                                color: @m-grey1;
+                            }
+                        }
+                    }
+                    .ant-calendar-header {
+                        .ant-calendar-prev-year-btn,.ant-calendar-prev-month-btn {
+                            color: @m-grey1;
+                            &::before,&::after {
+                                border-color: @m-grey2;
+                            }
+                        }
+                        .ant-calendar-month-select,.ant-calendar-year-select {
+                            color: @m-grey1;
+                        }
+                    }
+                    .ant-calendar-body {
+                        border-top-color: @m-grey1;
+                        .ant-calendar-column-header-inner {
+                            color: @m-grey1;
+                        }
+                        .ant-calendar-cell {
+                            .ant-calendar-date {
+                                background: transparent;
+                                color: @m-white0;
+                            }
+                        }
+                        .ant-calendar-last-day-of-month,.ant-calendar-next-month-btn-day {
+                            .ant-calendar-date {
+                                color: @m-white1;
+                            }
+                        }
+                        .ant-calendar-disabled-cell {
+                            .ant-calendar-date {
+                                color: @m-grey1;
+                            }
+                        }
+                        .ant-calendar-selected-day {
+                            .ant-calendar-date {
+                                color: @m-blue0;
+                            }
+                        }
+                        .ant-calendar-active-week {
+                            .ant-calendar-cell {
+                                .ant-calendar-date {
+                                    background: transparent;
+                                }
+                            }
+                        }
+                    }
+                }
+                .ant-calendar-range-middle {
+                    color: @m-white1;
+                }
+            }
+        }
+        .ant-calendar-footer {
+            border-top-color: @m-grey1;
+            .ant-calendar-time-picker-btn {
+                color: @m-grey1;
+            }
+            .ant-calendar-ok-btn {
+                background-color: @m-blue0;
+                border-color: @m-blue0;
+                color: @m-white0;
+                &:hover {
+                    background-color: @m-blue0-hover;
+                    border-color: @m-blue0-hover;
+                    color: @m-white0-hover;
+                }
+            }
+        }
+    }
+}
+.ant-calendar-range {
+    .ant-calendar-in-range-cell::before {
+        background: @m-grey22-hover;
+    }
 }

src/assets/styles/variables.less

@@ -28,6 +28,9 @@
 @m-grey19: #162534;
 @m-grey20: #1B2A38;
 @m-grey21: #15202B;
+@m-grey22: #424E59;
+@m-grey22-hover: rgba(@m-grey22, .8);
+@m-grey23: #48545F;
 @m-red0: #ff4d4f;
 @m-red1: #FF2B2B;
 @m-white: #fff;
@@ -43,6 +46,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 +74,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/services/request/serviceURL.ts

@@ -73,10 +73,10 @@ export const commonSearchUrl = (url: string): string => {
 export const setServiceURL = (config: URL): void => {
     // console.log('URL', config);
     // 外网环境（175），外包同事使用
-    // if (process.env.NODE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
         serviceURL.goCommonSearchUrl = 'http://218.17.158.45:21001/api';
         serviceURL.quoteUrl = 'ws://218.17.158.45:21004';
         serviceURL.tradeUrl = 'ws://218.17.158.45:21005';
-    // }
-    // serviceURL = config;
+    }
+    serviceURL = config;
 };

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/index.vue

@@ -231,9 +231,11 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="数量"
-                         name="Qty">
+                         name="Qty"
+                         >
               <a-input class="dialogInput suffixGrey"
                        v-model:value="formState.Qty"
+                       style="width: 200px"
                        placeholder="请输入数量"
                        :suffix="numberUnit" />
             </a-form-item>
@@ -335,6 +337,7 @@
             <a-col :span="24">
               <a-form-item label="交收期">
                 <a-range-picker v-model:value="deliveryDate"
+                                class="commonPicker"
                                 :disabled-date="disabledDate"
                                 :show-time="{hideDisabledOptions: true}"
                                 format="YYYY-MM-DD" />

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

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

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

@@ -13,7 +13,17 @@
                 :loading="loading"
                 @click="submit">关闭</a-button>
     </template>
+     <a-tabs v-model:activeKey="activeKey">
+      <a-tab-pane key="1" tab="合同详情"></a-tab-pane>
+      <a-tab-pane key="2" tab="点价记录"></a-tab-pane>
+      <a-tab-pane key="3" tab="交收记录"></a-tab-pane>
+      <a-tab-pane key="4" tab="款项记录"></a-tab-pane>
+      <a-tab-pane key="5" tab="发票记录"></a-tab-pane>
+      <a-tab-pane key="6" tab="入库记录"></a-tab-pane>
+      <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">
@@ -170,6 +180,14 @@
         </a-row>
       </fieldset>
     </a-form>
+    <div class="tableDatas" v-if="activeKey == 2">
+      <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>
 
@@ -207,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,
@@ -220,6 +330,9 @@ export default defineComponent({
             maskClosableFlag,
             getContractTypeName,
             getBizTypeName,
+            activeKey: ref('1'),
+            columns,
+            data
         };
     },
 });
@@ -227,18 +340,56 @@ export default defineComponent({
 
 <style lang="less">
 .custom-detail {
-}
-.ant-form.inlineForm {
-    margin-top: 20px;
-}
-.white {
-    color: @m-white0;
-}
-.blue {
-    color: @m-blue0;
-}
-.green {
-    color: @m-green0;
+  .ant-modal-body {
+    padding-top: 0;
+    padding-left: 0;
+    padding-right: 0;
+    .ant-tabs {
+      background: @m-black11;
+      width: 100%;
+      padding: 0 24px;
+      .ant-tabs-bar {
+        margin-bottom: 0;
+        border-bottom: 0;
+      }
+      .ant-tabs-nav-container {
+        .ant-tabs-nav-wrap {
+          .ant-tabs-nav {
+            .ant-tabs-tab {
+              width: 70px;
+              margin-right: 43px;
+              text-align: center;
+              font-size: 16px;
+              color: #88A0AE;
+              padding: 0;
+              line-height: 45px; 
+            }
+            .ant-tabs-tab-active.ant-tabs-tab {
+              color: #3A87F7;
+            }
+            .ant-tabs-ink-bar {
+              width: 70px !important;
+              background: #3A87F7;
+              .rounded-corners(1px);
+            }
+          }
+        }
+      }
+    }
+  }
+  .tableDatas {
+    margin-top: 26px;
+    padding: 0 24px;
+    overflow: hidden;
+    .dialogTable {
+      width: 100%;
+      overflow: overlay;
+    }
+  }
+  .ant-form.inlineForm {
+      margin-top: 20px;
+      padding: 0 24px;
+  }
 }
 </style
 >;

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 重新提交现货合同-->
-  <a-modal class="modify-custom"
+  <a-modal class="commonModal modify-custom"
            title="重新提交现货合同"
            v-model:visible="visible"
            @cancel="cancel"