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

src/assets/styles/mixin.less

@@ -1252,4 +1252,8 @@ input:-internal-autofill-selected {
     .ant-col.ant-form-item-control-wrapper {
       max-width: calc(100% - 130px);
     }
-  }
+  }
+
+  .ant-spin-container::after,.ant-drawer-content {
+      background-color: transparent;
+  }

src/views/business/exposure/list/realTime/index.vue

@@ -21,7 +21,7 @@
               :get-container="false"
               :wrap-style="{ position: 'absolute' }"
               @close="closeDrawer">
-      <div>
+      <div class="bottomTable">
         <a-table :columns="detailColumns"
                  class="topTable hiddenFirstCol"
                  :pagination="false"
@@ -167,5 +167,16 @@ export default defineComponent({
 .exposure-real-time {
     position: relative;
     overflow: hidden;
+    .bottomTable {
+        width: 100%;
+        .flex;
+        flex-direction: column;
+        .topTable {
+            height: calc(100% - 46px);
+            .ant-table {
+                background-color: transparent;
+            }
+        }
+    }
 }
 </style>;

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

@@ -203,7 +203,6 @@ export default defineComponent({
                         cancel();
                         context.emit('refresh');
                     })
-                    .catch((err) => {});
             });
         }
 

src/views/business/sell/components/funds/index.vue

@@ -12,28 +12,200 @@
                 :loading="loading"
                 @click="submit">关闭</a-button>
     </template>
+      <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.contractno) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="定价类型">
+                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item :label="selectedRow.contracttype===1? '采购方': '销售方'">
+                          <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="现货品种">
+                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="暂定价货款总额">
+                          <span class="white">{{ selectedRow.pricetype === 3 ? formatValue(selectedRow.loanamount) : 0 }}</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.pricedamount }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="调整金额">
+                          <span class="white">{{ selectedRow.reckonadjustamount }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="货款总额">
+                          <span class="white">{{ selectedRow.pricedamount + selectedRow.reckonadjustamount }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="保证金">
+                          <span class="white">{{ selectedRow.margin }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="其他费用">
+                          <span class="white">{{ selectedRow.reckonotheramount }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="合计总额">
+                          <span class="white">{{ formatValue(selectedRow.pricedavg) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="已支付额">
+                          <span class="white">{{ selectedRow.payamount }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="预计款额">
+                          <span class="white">{{ selectedRow.prepayamount }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+          </a-form>
+      </fieldset>
+
+      <fieldset class="formFieldSet">
+          <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="unpayamount">
+                          <span class="white">10000000.00元</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="款项类型">
+                          <a-radio-group class="commonRadioGroup"  v-model:value="formState.payType" >
+                              <a-radio :value="1">付款申请</a-radio>
+                              <a-radio :value="2">退款通知</a-radio>
+                          </a-radio-group>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="登记金额" name="Amount">
+                          <a-input-number class="dialogInput"
+                                          style="width: 200px"
+                                          suffix="元"
+                                          type="number"
+                                          placeholder="请输入登记金额"
+                                          v-model:value="formState.Amount" />
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="24">
+                      <a-form-item label="备注"
+                                   name="PricedQty"
+                                   class="relative">
+                          <a-input class="dialogInput"
+                                   style="width: 608px"
+                                   placeholder="请输入备注信息"
+                                   v-model:value="formState.Remark"/>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+          </a-form>
+      </fieldset>
   </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import {defineComponent, PropType, ref, unref} from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
+import {Ermcp3SellBuyContract} from "@/services/go/ermcp/purchase/interface";
+import {formatValue} from "@/common/methods";
+import {getPriceTypeName} from "@/views/business/purchase/setup";
+import {handleForm} from "@/views/business/purchase/components/funds/setup";
+import {fundsReq} from "@/views/business/purchase/components/setup";
 
 export default defineComponent({
     name: 'sell_pending_funds',
     components: {},
-    setup() {
+    props: {
+        selectedRow: {
+            type: Object as PropType<Ermcp3SellBuyContract>,
+            default: {},
+        },
+    },
+    setup(props, context) {
         const { visible, cancel } = closeModal('sell_pending_funds');
         const loading = ref<boolean>(false);
+        const { rules, formState, formRef } = handleForm();
+
         function submit() {
-            cancel();
+            console.log(props.selectedRow)
+            const wrapEl = unref(formRef);
+            wrapEl.validate().then(() => {
+                loading.value = true
+                const params:any = {}
+                if(formState.payType === 1){
+                    params.PayAmount = Number(formState.Amount)
+                }else {
+                    params.DeductAmount = Number(formState.Amount)
+                }
+                // 发出发票登记
+                fundsReq(props.selectedRow.spotcontractid, params, loading,formState.Remark)
+                    .then(() => {
+                        cancel();
+                        context.emit('refresh');
+                    })
+            });
         }
         return {
             visible,
             cancel,
             submit,
             loading,
+            formState,
+            formatValue,
+            rules,
+            getPriceTypeName,
         };
     },
 });

src/views/business/sell/components/invoice/index.vue

@@ -12,28 +12,142 @@
                 :loading="loading"
                 @click="submit">关闭</a-button>
     </template>
-
+      <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.contractno) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="定价类型">
+                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.accountname) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="现货品种">
+                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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">499999000.00元</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="保证金">
+                          <span class="white">1000000元</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <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="12">
+                      <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>
+          <a-form class="inlineForm"
+                  ref="formRef"
+                  :model="formState"
+                  :rules="rules">
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item label="收票金额"
+                                   class="relative mb40"
+                                   name="PricedPrice">
+                          <a-input class="dialogInput"
+                                   style="width: 200px"
+                                   suffix="元"
+                                   placeholder="请输入收票金额" />
+                          <div class="tip">
+                              <div>应收票额：4090500.00元</div>
+                              <div><a class="blue fr">全部登记</a></div>
+                          </div>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="发票附件" class="mb40">
+                          <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>
+          </a-form>
+      </fieldset>
   </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import {defineComponent, PropType, ref} from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
+import {Ermcp3SellBuyContract} from "@/services/go/ermcp/purchase/interface";
+import {getPriceTypeName} from "@/views/business/purchase/setup";
 
 export default defineComponent({
     name: 'sell_pending_invoice',
     components: {},
-    setup() {
+    props: {
+        selectedRow: {
+            type: Object as PropType<Ermcp3SellBuyContract>,
+            default: {},
+        },
+    },
+    setup(props) {
         const { visible, cancel } = closeModal('sell_pending_invoice');
         const loading = ref<boolean>(false);
         function submit() {
-            cancel();
+            loading.value = true
+            props
         }
         return {
             visible,
             cancel,
             submit,
             loading,
+            getPriceTypeName,
         };
     },
 });

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

@@ -12,28 +12,272 @@
                 :loading="loading"
                 @click="submit">关闭</a-button>
     </template>
-
+      <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.contractno) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="定价类型">
+                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+              <a-row :gutter="24">
+                  <a-col :span="12">
+                      <a-form-item :label="selectedRow.contracttype===1? '采购方': '销售方'">
+                          <span class="white">{{ formatValue(selectedRow.accountname) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="现货品种">
+                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.qty + selectedRow.enumdicname) }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="合同暂定价">
+                          <span class="white">{{ formatValue(selectedRow.price) }}</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>
+                  </a-col>
+                  <a-col :span="12">
+                      <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.reckonadjustamount + selectedRow.currencyname }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="12">
+                      <a-form-item label="保证金">
+                          <span class="white">{{ selectedRow.margin + selectedRow.currencyname }}</span>
+                      </a-form-item>
+                  </a-col>
+                  <a-col :span="24">
+                      <a-form-item label="其他费用">
+                          <span class="white">{{ selectedRow.reckonotheramount + selectedRow.currencyname }}</span>
+                      </a-form-item>
+                  </a-col>
+              </a-row>
+          </a-form>
+      </fieldset>
+      <fieldset class="formFieldSet">
+          <legend>本次交收信息</legend>
+          <a-form class="inlineForm"
+                  ref="formRef"
+                  :model="formState"
+                  :rules="rules">
+              <a-checkbox-group class="commonCheckboxGroup">
+                  <a-row>
+                      <a-col :span="12">
+                          <a-form-item class="relative">
+                              <template #label>
+                                  <a-checkbox value="交收量" v-model:checked="checkedObj.qty" @change="()=>checkedObj.qty = !checkedObj.qty">交收量</a-checkbox>
+                              </template>
+                              <a-form-item class="relative" v-if="checkedObj.qty" name="ReckonRealQty">
+                                  <a-input-number  v-model:value="formState.ReckonRealQty" class="dialogInput" style="width: 200px" placeholder="请输入交收量" suffix="单位"/>
+                                  <div class="tip mt10"><span>待交收量：{{selectedRow.unsureqty}}吨</span><a class="blue fr" @click="formState.ReckonRealQty=selectedRow.unsureqty">全部登记</a></div>
+                              </a-form-item>
+                              <a-form-item class="relative" v-else>
+                                  <a-input-number disabled class="dialogInput" style="width: 200px" placeholder="请输入交收量" suffix="单位" />
+                                  <div class="tip mt10"><span class="fl">未定价量：--吨</span><a class="blue fr">全部登记</a></div>
+                              </a-form-item>
+                          </a-form-item>
+                      </a-col>
+                      <a-col :span="12">
+                          <a-form-item class="relative">
+                              <template #label>
+                                  <a-checkbox value="其他费用"  v-model:checked="checkedObj.amount" @change="()=>checkedObj.amount = !checkedObj.amount">其他费用</a-checkbox>
+                              </template>
+                              <a-form-item v-if="checkedObj.amount" name="ReckonOtherAmount">
+                                  <a-input-number v-model:value="formState.ReckonOtherAmount" class="dialogInput" style="width: 200px" placeholder="请输入其他费用" suffix="元"/>
+                              </a-form-item>
+                              <a-form-item v-else>
+                                  <a-input-number readonly class="dialogInput" style="width: 200px" placeholder="请输入其他费用" suffix="元"/>
+                              </a-form-item>
+                          </a-form-item>
+                      </a-col>
+                      <a-col :span="12" class="mt10">
+                          <a-form-item class="relative">
+                              <template #label>
+                                  <a-checkbox value="调整保证金" v-model:checked="checkedObj.margin" @change="()=>checkedObj.margin = !checkedObj.margin">调整保证金</a-checkbox>
+                              </template>
+                              <a-form-item class="relative" v-if="checkedObj.margin">
+                                  <a-radio-group class="commonRadioGroup"  v-model:value="checkedObj.adjustMargin">
+                                      <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-form-item  name="AddMargin"  v-if="checkedObj.adjustMargin === 1">
+                                          <a-input-number v-model:value="formState.AddMargin" class="dialogInput" style="width: 200px;" placeholder="请输入调整保证金" suffix="元"/>
+                                      </a-form-item >
+                                      <a-form-item  name="DecMargin" v-else>
+                                          <a-input-number  v-model:value="formState.DecMargin" class="dialogInput" style="width: 200px;" placeholder="请输入调整保证金" suffix="元" />
+                                      </a-form-item >
+                                  </div>
+                              </a-form-item >
+                              <a-form-item class="relative" v-else>
+                                  <a-radio-group class="commonRadioGroup" disabled>
+                                      <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-number disabled class="dialogInput" style="width: 200px;" placeholder="请输入调整保证金" suffix="元"/>
+                                  </div>
+                              </a-form-item>
+                          </a-form-item >
+                      </a-col>
+                      <a-col :span="12" class="mt10">
+                          <a-form-item class="relative">
+                              <template #label>
+                                  <a-checkbox value="调整金额" v-model:checked="checkedObj.justAmount" @change="()=>checkedObj.justAmount = !checkedObj.justAmount">调整金额</a-checkbox>
+                              </template>
+                              <a-form-item class="relative" v-if="checkedObj.justAmount">
+                                  <a-radio-group class="commonRadioGroup" v-model:value="checkedObj.adjustAmount">
+                                      <a-row style="width: 200px">
+                                          <a-col :span="12">
+                                              <a-radio :value="1" @focus="()=>{formState.ReckonAdjustAmount  ?formState.ReckonAdjustAmount= Math.abs(formState.ReckonAdjustAmount):0}">增加</a-radio>
+                                          </a-col>
+                                          <a-col :span="12">
+                                              <a-radio :value="2" @focus="()=>{formState.ReckonAdjustAmount  ?formState.ReckonAdjustAmount= -1* Math.abs(formState.ReckonAdjustAmount):0}">减少</a-radio>
+                                          </a-col>
+                                      </a-row>
+                                  </a-radio-group>
+                                  <div class="tip mt10">
+                                      <a-form-item  name="ReckonAdjustAmount">
+                                          <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount= Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" style="width: 200px;" placeholder="请输入调整金额" suffix="元" v-if="checkedObj.adjustAmount===1"/>
+                                          <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount= -1*Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" style="width: 200px;" placeholder="请输入调整金额" suffix="元" v-else/>
+                                      </a-form-item >
+                                  </div>
+                              </a-form-item>
+                              <a-form-item class="relative" v-else>
+                                  <a-radio-group class="commonRadioGroup" disabled>
+                                      <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-number disabled class="dialogInput" style="width: 200px;" placeholder="请输入调整金额" suffix="元"/>
+                                  </div>
+                              </a-form-item>
+                          </a-form-item>
+                      </a-col>
+                      <a-col :span="24">
+                          <a-form-item label="备注"
+                                       class="relative mt20 pl40">
+                              <a-input class="dialogInput"
+                                       style="width: 600px"
+                                       placeholder="请输入备注信息" v-model:value="formState.Remark"/>
+                          </a-form-item>
+                      </a-col>
+                  </a-row>
+              </a-checkbox-group>
+              <a-form-item name="IsChecked"></a-form-item>
+          </a-form>
+      </fieldset>
   </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import {defineComponent, PropType, ref, unref} from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
+import {Ermcp3SellBuyContract} from "@/services/go/ermcp/purchase/interface";
+import {SettlementReq} from "@/services/proto/contract/interface";
+import {settlementReq} from "@/views/business/purchase/components/setup";
+import {handleForm} from "@/views/business/purchase/components/settlement/setup";
+import {formatValue} from "@/common/methods";
+import {getPriceTypeName} from "@/views/business/purchase/setup";
 
 export default defineComponent({
     name: 'sell_pending_settlement',
     components: {},
-    setup() {
+    props: {
+        selectedRow: {
+            type: Object as PropType<Ermcp3SellBuyContract>,
+            default: {},
+        },
+    },
+    setup(props, context) {
         const { visible, cancel } = closeModal('sell_pending_settlement');
         const loading = ref<boolean>(false);
+        const { rules, formState, formRef, checkedObj } = handleForm();
         function submit() {
-            cancel();
+            const wrapEl = unref(formRef);
+            wrapEl.validate().then((nameList:any) => {
+                delete nameList.IsChecked;
+                loading.value = true;
+                const params: SettlementReq = checkedObj.value.adjustMargin === 1?{
+                    ReckonRealQty: formState.ReckonRealQty!, // 交收量
+                    ReckonOtherAmount: formState.ReckonOtherAmount!, // 其它费用
+                    AddMargin: formState.AddMargin!, // 追加保证金
+                    ReckonAdjustAmount: checkedObj.value.adjustAmount === 1 ? formState.ReckonRealQty! : -1*formState.ReckonRealQty!, // 调整金额 +-代表增减
+                }:{
+                    ReckonRealQty: formState.ReckonRealQty!, // 交收量
+                    ReckonOtherAmount: formState.ReckonOtherAmount!, // 其它费用
+                    DecMargin: formState.DecMargin!, // 减少保证金
+                    ReckonAdjustAmount: checkedObj.value.adjustAmount === 1 ? formState.ReckonRealQty! : -1*formState.ReckonRealQty!, // 调整金额 +-代表增减
+                };
+                // 发出交收请求
+                settlementReq(props.selectedRow.spotcontractid, params, loading)
+                    .then(() => {
+                        cancel();
+                        context.emit('refresh');
+                    })
+                    .catch((err) => {});
+            });
         }
         return {
             visible,
             cancel,
             submit,
             loading,
+            formRef,
+            formState,
+            formatValue,
+            rules,
+            getPriceTypeName,
+            checkedObj,
         };
     },
 });

src/views/business/sell/list/performance/index.vue

@@ -20,15 +20,20 @@
       </a-table>
     </contextMenu>
     <!-- 详情 -->
-    <Detail />
+    <Detail :selectedRow="selectedRow"
+            @refresh="queryTable" />
     <!-- 交收登记 -->
-    <Settlement />
+    <Settlement :selectedRow="selectedRow"
+                @refresh="queryTable" />
     <!-- 款项登记 -->
-    <Funds />
+    <Funds :selectedRow="selectedRow"
+           @refresh="queryTable" />
     <!-- 发票登记 -->
-    <Invoice />
+    <Invoice :selectedRow="selectedRow"
+              @refresh="queryTable" />
     <!-- 出库登记 -->
-    <Storage />
+    <Storage :selectedRow="selectedRow"
+             @refresh="queryTable" />
   </div>
 </template>
 

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

@@ -278,11 +278,13 @@ import { AllEnums } from '@/services/go/commonService/interface';
 import { FormState } from './interface';
 import { RuleObject, ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
 import { getAddress } from '@/services/go/adress';
+import {addUserInfo} from "@/views/information/custom/compoments/setup";
+import {AddUserInfoApplyReq} from "@/services/go/ermcp/customInfo/interface";
 
 export default defineComponent({
     name: 'add-custom',
     components: {},
-    setup() {
+    setup(name, context) {
         // 控制关闭弹窗
         const { visible, cancel } = closeModal('custom_info_btn_add');
         // 证件类型
@@ -290,7 +292,7 @@ export default defineComponent({
         // 表单
         const { formRef, formState, rules } = handleForm();
         // 下单方法
-        const { loading, applyAction } = handleApply();
+        const { loading, addCustomerInfo } = addUserInfo();
         // 地址
         const { cityList, districtList, provinceList, getCityList, getDistrictList } = getAddress();
         function isPersonal(): boolean {
@@ -301,6 +303,17 @@ export default defineComponent({
                 .validate()
                 .then(() => {
                     const param = toRaw(formState);
+
+                    const reqParam :AddUserInfoApplyReq = {
+
+                    }
+
+                    addCustomerInfo(reqParam)
+                        .then(res => {
+                            cancel()
+                            context.emit('refresh')
+                        })
+
                     // applyAction(param);
                     console.log('values', formState);
                 })

src/views/information/custom/compoments/setup.ts

@@ -1,5 +1,10 @@
-import {QueryDeleteUserInfoApply, QueryModifyUserInfo, UpdateUserAccountStatus} from "@/services/go/ermcp/customInfo";
-import {ModifyUserInfoReq} from "@/services/go/ermcp/customInfo/interface";
+import {
+    QueryAddUserInfoApply,
+    QueryDeleteUserInfoApply,
+    QueryModifyUserInfo,
+    UpdateUserAccountStatus
+} from "@/services/go/ermcp/customInfo";
+import {AddUserInfoApplyReq, ModifyUserInfoReq} from "@/services/go/ermcp/customInfo/interface";
 import {userInfoCheck} from "@/services/proto/accountinfo";
 import {UserInfoCheckMangeReq} from "@/services/proto/accountinfo/interface";
 import {message} from 'ant-design-vue';
@@ -100,4 +105,26 @@ export function deleteUserInfo() {
     return {loading, deleteCustomerInfo}
 }
 
+/**
+ * 新增用户申请
+ */
+export function addUserInfo(){
+    const loading = ref<boolean>(false);
+
+    function addCustomerInfo(userInfoApply: AddUserInfoApplyReq): Promise<string> {
+        loading.value = true
+        return QueryAddUserInfoApply(userInfoApply)
+            .then((res) => {
+                return Promise.resolve("新增成功")
+            })
+            .catch((err) => {
+                return Promise.reject("新增失败:" + err)
+            }).finally(() => {
+                loading.value = false
+            })
+    }
+
+    return {loading, addCustomerInfo}
+}
+