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

src/assets/styles/mixin.less

@@ -386,14 +386,22 @@
     .ant-row.ant-form-item {
         margin-bottom: 21px;
         .ant-form-item-label {
+            position: relative;
             width: 130px;
             line-height: 30px;
             text-align: left;
             label {
                 color: @m-grey1;
+                padding-left: 16px;
                 &::after {
                     content: ''
                 }
+                &::before {
+                    .position(absolute, 0, auto, auto, 0);
+                    font-size: 16px;
+                    line-height: 21px;
+                    color: @m-red1;
+                }
             }
         }
         .ant-form-item-control-wrapper {
@@ -609,6 +617,10 @@
         border: 0;
     }
 }
+.operBtn.ant-btn {
+    margin-top: 9px;
+    margin-bottom: 6px;
+}
 .ant-table-expanded-row {
     .btn-list {
         padding-right: 10px;
@@ -683,4 +695,36 @@
     color: @m-grey2;
     margin-left: -8px;
     margin-right: 2px;
+}
+
+.filterTable {
+    display: inline-flex;
+    width: 100%;
+}
+
+.ant-row.dialogRowTitle {
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+    border: 1px solid @m-grey20;
+    .ant-col {
+        border-top: 1px solid @m-grey20;
+        border-right: 1px solid @m-grey20;
+        padding-left: 0 !important;
+        padding-right: 0 !important;
+        height: 34px;
+        line-height: 34px;
+        font-size: 16px;
+        color: @m-grey2;
+        .red {
+            color: @m-red1;
+        }
+    }
+    .ant-col:nth-child(1),.ant-col:nth-child(2),.ant-col:nth-child(3),.ant-col:nth-child(4){
+        border-top: 0;
+        text-align: center;
+    }
+    .ant-col:last-child {
+        border-right: 1px solid @m-grey20;
+    }
+
 }

src/common/components/buttonList/index.vue

@@ -26,7 +26,5 @@ export default defineComponent({
 <style lang="less">
 .btn-list {
   display: inline-flex;
-  padding-top: 9px;
-  padding-bottom: 6px;
 }
 </style>

src/services/request/serviceURL.ts

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

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

@@ -44,8 +44,5 @@ export default defineComponent({
 </script>
 
 <style lang="less">
-.filterTable {
-    display: inline-flex;
-    width: 100%;
-}
+
 </style>;

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

@@ -63,7 +63,7 @@
                          name="remark">
               <a-input class="dialogInput"
                        v-model:value="formState.remark"
-                       style="width: 562px"
+                       style="width: 588px"
                        placeholder="请输入备注" />
             </a-form-item>
           </a-col>
@@ -71,7 +71,7 @@
       </fieldset>
       <fieldset class="formFieldSet">
         <legend>品类信息</legend>
-        <a-row :gutter="24">
+        <a-row :gutter="24"  class="dialogRowTitle">
           <a-col :span="6">
             <span>
               <span class="red">*</span>
@@ -109,7 +109,6 @@
               <a-form-item :name="['gldwrstandards',index,'unitid' ]"
                            :rules="rules.gldwrstandards.unitid">
                 <a-select class="inlineFormSelect"
-                          style="width: 200px"
                           v-model:value="domain.unitid"
                           placeholder="请选择单位">
                   <a-select-option v-for="item in unitList"
@@ -129,7 +128,7 @@
                          placeholder="请输入标仓系数"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :span="6" class="tc">
               <a-button class="plusBtn"
                         @click="deleteOne('gldwrstandards', index)"
                         v-if="index > 0">
@@ -203,7 +202,7 @@
       </fieldset>
       <fieldset class="formFieldSet">
         <legend>品牌信息</legend>
-        <a-row :gutter="24">
+        <a-row :gutter="24" class="dialogRowTitle dialogRowTitle2">
           <a-col :span="12">
             <span>
               <span class="red">*</span>
@@ -272,7 +271,7 @@
       </fieldset>
       <fieldset class="formFieldSet">
         <legend>套保品种信息</legend>
-        <a-row :gutter="24">
+        <a-row :gutter="24"  class="dialogRowTitle">
           <a-col :span="6">
             <span>
               <span class="red">*</span>
@@ -302,7 +301,6 @@
               <a-form-item :name="['wrsconvertdetails',index,'middlegoodsid']"
                            :rules="rules.wrsconvertdetails.middlegoodsid">
                 <a-select class="inlineFormSelect"
-                          style="width: 200px"
                           @change="middleChange(domain.middlegoodsid, domain)"
                           v-model:value="domain.middlegoodsid"
                           placeholder="请选择套保品种">
@@ -331,7 +329,7 @@
                          placeholder="请输入套保系数"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :span="6" class="tc">
               <a-button class="plusBtn"
                         @click="deleteOne('wrsconvertdetails', index)"
                         v-if="index > 0">
@@ -720,5 +718,51 @@ export default defineComponent({
             }
         }
     }
+    .ant-form.inlineForm {
+      .ant-row.dialogRowTitle {
+        .ant-col {
+          .ant-row.ant-form-item {
+              .ant-col.ant-form-item-control-wrapper {
+                width: 100%;
+                .ant-form-item-control {
+                  .ant-form-item-children {
+                    .ant-input.dialogInput {
+                      border-radius: 0;
+                      margin-top: 1px;
+                      // margin-left: -1px;
+                      // width: calc(100% + 2px);
+                    }
+                    .ant-select.inlineFormSelect {
+                      margin-top: 1px;
+                      .ant-select-selector {
+                        text-align: left;
+                      }
+                    }
+                  }
+                }
+                .ant-form-item-control.has-error {
+                  text-align: left;
+                  .ant-form-item-children {
+                    .ant-input.dialogInput {
+                      background: @m-grey21;
+                    }
+                  }
+                  .ant-form-explain {
+                    color: @m-red1;
+                  }
+                }
+              }
+          }
+        }
+        .ant-col.tc {
+          text-align: center;
+        }
+      }
+      .ant-row.dialogRowTitle2 {
+        .ant-col:nth-child(3),.ant-col:nth-child(4) {
+          border-top: 1px solid @m-grey20;
+        }
+      }
+  }
 }
 </style>

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 过滤现货品种表格 -->
-  <div>
+  <div class="filterTable">
     <FilterOption :selectList="selectList"
                   :inputList="inputList"
                   :fixedBtnList="fixedBtnList" />

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

@@ -416,7 +416,7 @@
           <a-col :span="24">
             <a-form-item label="备注">
               <a-input class="dialogInput"
-                       style="width: 620px"
+                       style="width: 608px"
                        placeholder="请输入备注" />
             </a-form-item>
           </a-col>
@@ -513,5 +513,7 @@ export default defineComponent({
 
 <style lang="less">
 .add-spot-contract {
+ 
+
 }
 </style>;

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 过滤客户资料表格 -->
-  <div>
+  <div class="filterTable">
     <FilterOption :selectList="selectList"
                   :inputList="inputList"
                   :fixedBtnList="fixedBtnList" />

src/views/information/warehouse-info/compoments/filterTable/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 过滤仓库信息表格 -->
-  <div>
+  <div class="filterTable">
     <FilterOption :selectList="selectList"
                   :inputList="inputList"
                   :fixedBtnList="fixedBtnList" />