样式调整

src/assets/styles/mixin.less

@@ -429,6 +429,7 @@
             position: absolute;
             font-size: 14px;
             color: @m-grey1;
+            width: 100%;
         }
         .ant-form-item-control {
             width: 200px;
@@ -609,6 +610,12 @@
         cursor: pointer;
     }
 }
+.fl {
+    float: left;
+}
+.fr {
+    float: right;
+}
 .ml10 {
     margin-left: 10px;
 }
@@ -630,6 +637,9 @@
 .mt30 {
     margin-top: 30px;
 }
+.mb40 {
+    margin-bottom: 40px;
+}
 .grey {
     color: @m-grey2;
 }

src/views/business/purchase/components/invoice/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>
@@ -44,97 +44,79 @@
             </a-form-item>
           </a-col>
         </a-row>
+      </a-form>
+    </fieldset>
+    <fieldset class="formFieldSet">
+      <legend>已登记信息</legend>
+      <a-form class="inlineForm">
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="合同签署量">
-              <span class="white">{{ formatValue(selectedRow.qty + selectedRow.enumdicname) }}</span>
+            <a-form-item label="贷款总额">
+              <span class="white">499999000.00元</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="合同暂定价">
-              <span class="white">{{ formatValue(selectedRow.price) }}</span>
+            <a-form-item label="保证金">
+              <span class="white">1000000元</span>
             </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 label="其他费用">
+              <span class="white">500.00元</span>
             </a-form-item>
           </a-col>
-        </a-row>
-      </a-form>
-    </fieldset>
-    <fieldset class="formFieldSet">
-      <legend>已登记信息</legend>
-      <a-form class="inlineForm">
-        <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="已定价量">
-              <span class="white">{{ selectedRow.pricedqty + selectedRow.enumdicname }}</span>
+            <a-form-item label="合计总额">
+              <span class="white">505990500.00元</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="已点均价">
-              <span class="white">{{ formatValue(selectedRow.pricedavg) }}</span>
+            <a-form-item label="已支付额 ">
+              <span class="white">500.00元</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="已收票额">
+              <span class="white">505990500.00元</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="预收票额">
+              <span class="white">--</span>
             </a-form-item>
           </a-col>
         </a-row>
       </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="点价价格"
+            <a-form-item label="收票金额"
+                         class="relative mb40"
                          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="点价数量"
-                         name="PricedQty"
-                         class="relative">
-              <a-input-number class="dialogInput"
+              <a-input class="dialogInput"
                               style="width: 200px"
-                              v-model:value="formState.PricedQty"
-                              :min="0"
-                              :max="selectedRow.unpricedqty"
-                              placeholder="请输入点价数量" />
+                              suffix="元"
+                              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>应收票额：4090500.00元</div>
+                <div><a class="blue fr">全部登记</a></div>
               </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 label="发票附件">
+              <div class="upload">
+                <a-upload action="">
+                  <a-button class="uploadBtn">上传</a-button>
+                </a-upload>
+                <div class="look">查看附件</div>
+              </div>
             </a-form-item>
           </a-col>
         </a-row>

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

@@ -104,7 +104,7 @@
                   <a-checkbox value="交收量">交收量</a-checkbox>
                 </template>
                 <a-input class="dialogInput" placeholder="请输入交收量" suffix="单位"/>
-                <div class="tip"><span>未定价量：40吨</span><a class="blue">全部登记</a></div>
+                <div class="tip"><span>未定价量：40吨</span><a class="blue fr">全部登记</a></div>
               </a-form-item>
             </a-col>
             <a-col :span="12">