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

src/assets/styles/mixin.less

@@ -407,6 +407,9 @@
                     line-height: 21px;
                     color: @m-red1;
                 }
+                label {
+                    padding-left: 0;
+                }
             }
         }
         .ant-form-item-control-wrapper {
@@ -416,6 +419,13 @@
 
         }
     }
+    .pl40 {
+        .ant-form-item-label {
+            label {
+                padding-left: 40px;
+            }
+        }
+    }
     .relative.ant-form-item {
         position: relative;
         // .itemTip {
@@ -608,6 +618,18 @@
 .ml5{
     margin-left: 5px;
 }
+.mt5 {
+    margin-top: 5px;
+}
+.mt10 {
+    margin-top: 10px;
+}
+.mt20 {
+    margin-top: 20px;
+}
+.mt30 {
+    margin-top: 30px;
+}
 .grey {
     color: @m-grey2;
 }

src/views/business/purchase/components/settlement/index.vue

@@ -34,7 +34,7 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item :label="selectedRow.contracttype===1? '采购方': '销售方'">
+            <a-form-item :label="'销售方'">
               <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
             </a-form-item>
           </a-col>
@@ -56,13 +56,6 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="点价合约">
-              <span class="white">{{ formatValue(selectedRow.goodsname) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
       </a-form>
     </fieldset>
     <fieldset class="formFieldSet">
@@ -75,13 +68,13 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="调整金额">
-              <span class="white">{{ selectedRow.reckonadjustamount + selectedRow.currencyname }}</span>
+            <a-form-item label="已交收量">
+              <span class="white">{{ selectedRow.reckonrealqty + selectedRow.enumdicname }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="已交收量">
-              <span class="white">{{ selectedRow.reckonrealqty + selectedRow.enumdicname }}</span>
+            <a-form-item label="调整金额">
+              <span class="white">{{ selectedRow.reckonadjustamount + selectedRow.currencyname }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -89,7 +82,7 @@
               <span class="white">{{ selectedRow.margin + selectedRow.currencyname }}</span>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="24">
             <a-form-item label="其他费用">
               <span class="white">{{ selectedRow.reckonotheramount + selectedRow.currencyname }}</span>
             </a-form-item>
@@ -98,61 +91,80 @@
       </a-form>
     </fieldset>
     <fieldset class="formFieldSet">
-      <legend>本次点价信息</legend>
+      <legend>本次交收信息</legend>
       <a-form class="inlineForm"
               ref="formRef"
               :model="formState"
               :rules="rules">
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="点价价格"
-                         name="PricedPrice">
-              <a-input-number class="dialogInput"
-                              style="width: 200px"
-                              v-model:value="formState.PricedPrice"
-                              :min="0"
-                              placeholder="请输入点价价格" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="升贴水">
-              <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="商品价格">
-              <span class="white">{{ Number(selectedRow.pricemove) + Number(formState.PricedPrice) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="点价数量"
-                         class="relative"
-                         name="PricedQty">
-              <a-input-number class="dialogInput"
-                              style="width: 200px"
-                              v-model:value="formState.PricedQty"
-                              :min="0"
-                              :max="selectedRow.unpricedqty"
-                              placeholder="请输入点价数量" />
-              <div class="tip">
-                <span>未定价量<span class="white">{{selectedRow.unpricedqty}}{{selectedRow.enumdicname}} </span></span>
-                <a class="blue ml10"
-                   @click="formState.PricedQty = selectedRow.unpricedqty"> 全部登记</a>
-              </div>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="点价金额">
-              <span class="white">{{( Number(selectedRow.pricemove) + Number(formState.PricedPrice)) * formState.PricedQty }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
+        <a-checkbox-group class="commonCheckboxGroup">
+          <a-row>
+            <a-col :span="12">
+              <a-form-item class="relative">
+                <template #label>
+                  <a-checkbox value="交收量">交收量</a-checkbox>
+                </template>
+                <a-input class="dialogInput" placeholder="请输入交收量" suffix="单位"/>
+                <div class="tip"><span>未定价量：40吨</span><a class="blue">全部登记</a></div>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item>
+                <template #label>
+                  <a-checkbox value="其他费用">其他费用</a-checkbox>
+                </template>
+                <a-input class="dialogInput" style="width: 200px" placeholder="请输入其他费用" suffix="元"/>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item class="relative mt10">
+                <template #label>
+                  <a-checkbox value="调整保证金">调整保证金</a-checkbox>
+                </template>
+                    <a-radio-group class="commonRadioGroup">
+                      <a-row style="width: 200px">
+                        <a-col :span="12">
+                          <a-radio :value="1">追加</a-radio>
+                        </a-col>
+                        <a-col :span="12">
+                          <a-radio :value="2">退还</a-radio>
+                        </a-col>
+                      </a-row>
+                    </a-radio-group>
+                <div class="tip mt5">
+                  <a-input class="dialogInput" style="width: 200px;" placeholder="请输入调整保证金" suffix="元"/>
+                </div>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item class="relative mt5">
+                <template #label>
+                  <a-checkbox value="调整金额">调整金额</a-checkbox>
+                </template>
+                    <a-radio-group class="commonRadioGroup">
+                      <a-row style="width: 200px">
+                        <a-col :span="12">
+                          <a-radio :value="1">增加</a-radio>
+                        </a-col>
+                        <a-col :span="12">
+                          <a-radio :value="2">减少</a-radio>
+                        </a-col>
+                      </a-row>
+                    </a-radio-group>
+                <div class="tip mt10">
+                  <a-input class="dialogInput" style="width: 200px;" placeholder="请输入调整金额" suffix="元"/>
+                </div>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="备注"
+                          class="relative mt30 pl40">
+                <a-input class="dialogInput"
+                                style="width: 600px"
+                                placeholder="请输入备注信息" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-checkbox-group>
       </a-form>
     </fieldset>
   </a-modal>