商品信息详情界面修改

src/assets/styles/mixin.less

@@ -821,7 +821,9 @@
     .ant-col:last-child {
         border-right: 1px solid @m-grey20;
     }
-
+    .bt1 {
+        border-top: 1px solid @m-grey20 !important;
+    }
 }
 
 // 日期输入框 @m-grey21
@@ -1240,4 +1242,8 @@ input:-internal-autofill-selected {
             font-size: 14px;
         }
     }
+}
+
+.tc {
+    text-align: center;
 }

src/views/information/goods/components/hedgingDetail/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 套保品种详情 -->
-  <a-modal class="commonModal modify-custom"
+  <a-modal class="commonModal hedgingDetail"
            title="详情"
            v-if="visible"
            v-model:visible="visible"
@@ -9,14 +9,147 @@
            @cancel="cancel"
            width="890px">
 
-
     <template #footer>
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
                 @click="submit">完成</a-button>
     </template>
-
+    <a-form class="inlineForm"
+    ref="formRef">
+    <fieldset class="formFieldSet">
+        <legend>基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="套保品种名称"
+                         name="deliverygoodsname">
+              <span class="white">铜板</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="套保品种单位"
+                         name="deliverygoodscode">
+              <span class="white">吨</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>修改套保比例列表</legend>
+         <a-row :gutter="24"
+               class="dialogRowTitle">
+          <a-col :span="5">
+            <span>
+              修改时间
+            </span>
+          </a-col>
+          <a-col :span="5">
+            <span>
+              修改前比例
+            </span>
+          </a-col>
+          <a-col :span="5">
+            <span>
+              修改后比例
+            </span>
+          </a-col>
+          <a-col :span="5">
+            <span>
+              备注
+            </span>
+          </a-col>
+          <a-col :span="4" class="tc">
+            <span>
+              修改人
+            </span>
+          </a-col>
+         </a-row>
+         <a-row :gutter="24"
+               class="dialogRowTitle">
+          <a-col :span="5">
+            <span class="white">
+              20-12-03 09:40
+            </span>
+          </a-col>
+          <a-col :span="5">
+            <span class="white">
+              80%
+            </span>
+          </a-col>
+          <a-col :span="5">
+            <span class="white">
+              100%
+            </span>
+          </a-col>
+          <a-col :span="5">
+            <span class="white">
+              统一修改
+            </span>
+          </a-col>
+          <a-col :span="4" class="tc">
+            <span class="white">
+              王平
+            </span>
+          </a-col>
+         </a-row>
+         <a-row :gutter="24"
+               class="dialogRowTitle">
+          <a-col :span="5">
+            <span class="white">
+              20-12-03 09:40
+            </span>
+          </a-col>
+          <a-col :span="5">
+            <span class="white">
+              80%
+            </span>
+          </a-col>
+          <a-col :span="5">
+            <span class="white">
+              100%
+            </span>
+          </a-col>
+          <a-col :span="5">
+            <span class="white">
+              统一修改
+            </span>
+          </a-col>
+          <a-col :span="4" class="tc">
+            <span class="white">
+              王平
+            </span>
+          </a-col>
+         </a-row>
+         <a-row :gutter="24"
+               class="dialogRowTitle">
+          <a-col :span="5">
+            <span class="white">
+              20-12-03 09:40
+            </span>
+          </a-col>
+          <a-col :span="5">
+            <span class="white">
+              80%
+            </span>
+          </a-col>
+          <a-col :span="5">
+            <span class="white">
+              100%
+            </span>
+          </a-col>
+          <a-col :span="5">
+            <span class="white">
+              统一修改
+            </span>
+          </a-col>
+          <a-col :span="4" class="tc">
+            <span class="white">
+              王平
+            </span>
+          </a-col>
+         </a-row>
+      </fieldset>
+    </a-form>
   </a-modal>
 </template>
 
@@ -54,31 +187,8 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.modify-custom {
-    .upload {
-        display: inline-flex;
-        .ant-btn.uploadBtn {
-            width: 60px;
-            height: 30px;
-            background: @m-blue0;
-            border: 0;
-            padding: 0;
-            text-align: center;
-            font-size: 14px;
-            color: @m-white0;
-            .rounded-corners(3px);
-            &:hover {
-                background: rgba(@m-blue0, 0);
-                color: rgba(@m-white0, 0.8);
-            }
-        }
-        .look {
-            color: @m-blue0;
-            font-size: 14px;
-            margin-left: 10px;
-            cursor: pointer;
-        }
-    }
+.hedgingDetail {
+    
 }
 </style
 >;

src/views/information/goods/components/spotDetail/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 现货品种详情 -->
-  <a-modal class="commonModal modify-custom"
+  <a-modal class="commonModal spot-detail"
            title="详情"
            v-if="visible"
            v-model:visible="visible"
@@ -14,7 +14,145 @@
                 :loading="loading"
                 @click="submit">完成</a-button>
     </template>
-
+    <a-form class="inlineForm"
+            ref="formRef"
+            :model="formState"
+            :rules="rules">
+      <fieldset class="formFieldSet">
+        <legend>基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="现货品种名称"
+                         name="deliverygoodsname">
+              <span class="white">铜板</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种代码"
+                         name="deliverygoodscode">
+              <span class="white">CU</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="单位"
+                         name="unitid">
+              <span class="white">吨</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="状态"
+                         name="unitid">
+              <span class="green">正常</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <a-form-item label="备注"
+                         name="remark">
+              <span class="white">铜板的采购价按上海有色网AMMA00铜2021-2-8号均价计价</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>品类信息</legend>
+        <a-row :gutter="24"
+               class="dialogRowTitle">
+          <a-col :span="8">
+            <span>
+              品类
+            </span>
+          </a-col>
+          <a-col :span="8">
+            <span>
+              单位
+            </span>
+          </a-col>
+          <a-col :span="8">
+            <span>
+              标仓系数
+            </span>
+          </a-col>
+        <a-col :span="8" class="bt1">
+            <div class="white">TWX-1</div>
+        </a-col>
+        <a-col :span="8">
+            <div class="white">吨</div>
+        </a-col>
+        <a-col :span="8">
+            <div class="white">1.0</div>
+        </a-col>
+        <a-col :span="8">
+            <div class="white">TWX-2</div>
+        </a-col>
+        <a-col :span="8">
+            <div class="white">吨</div>
+        </a-col>
+        <a-col :span="8">
+            <div class="white">1.1</div>
+        </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>品牌信息</legend>
+        <a-row :gutter="24"
+               class="dialogRowTitle dialogRowTitle2">
+          <a-col :span="24">
+            <span>
+              品牌
+            </span>
+          </a-col>
+        <a-col :span="24" class="bt1">
+            <div class="white">江铜</div>
+        </a-col>
+        <a-col :span="24" class="bt1">
+            <div class="white">云铜</div>
+        </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>套保品种信息</legend>
+        <a-row :gutter="24"
+               class="dialogRowTitle">
+          <a-col :span="8">
+            <span>
+              套保品种
+            </span>
+          </a-col>
+          <a-col :span="8">
+            <span>
+              单位
+            </span>
+          </a-col>
+          <a-col :span="8">
+            <span>
+              套保系数
+            </span>
+          </a-col>
+            <a-col :span="8"  class="bt1">
+                <div class="white">标准铜</div>
+            </a-col>
+            <a-col :span="8">
+                <div class="white">吨</div>
+            </a-col>
+            <a-col :span="8">
+                <div class="white">1.0</div>
+            </a-col>
+            <a-col :span="8">
+                <div class="white">标准银</div>
+            </a-col>
+            <a-col :span="8">
+                <div class="white">吨</div>
+            </a-col>
+            <a-col :span="8">
+                <div class="white">1.1</div>
+            </a-col>
+        </a-row>
+      </fieldset>
+    </a-form>
   </a-modal>
 </template>
 
@@ -52,7 +190,10 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.modify-custom {
+.spot-detail {
+    fieldset {
+        padding-right: 170px;
+    }
     .upload {
         display: inline-flex;
         .ant-btn.uploadBtn {
@@ -77,6 +218,10 @@ export default defineComponent({
             cursor: pointer;
         }
     }
+    div.white {
+        width: 100%;
+        text-align: center;
+    }
 }
 </style
 >;