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

src/assets/styles/mixin.less

@@ -223,6 +223,7 @@
 }
 
 .tableConditionInput {
+    margin-left:10px;
     width      : 140px;
     height     : 30px;
     line-height: 30px;
@@ -3113,6 +3114,7 @@ input:-internal-autofill-selected {
     position: sticky;
     position: -webkit-sticky;
     right   : 2px;
+    margin-top:7px;
 }
 
 // 步骤条

src/common/components/btnList/index.vue

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

src/common/components/filter/index.vue

@@ -73,26 +73,25 @@ export default defineComponent({
 }
 .filter-custom-table {
     display: inline-flex;
-    padding-top: 4px;
-    height: 34px;
-    .conditionSelect:first-child {
-        margin-right: 10px;
-    }
+    padding-top: 7px;
+    padding-bottom: 7px;
+    height: 46px;
     .btnDeafault.ant-btn,
     .operBtn.ant-btn {
         height: 26px !important;
         line-height: 26px !important;
     }
-
+ant-btn operBtn
     .ant-select-single:not(.ant-select-customize-input) + .ant-select-single:not(.ant-select-customize-input),
     .ant-select + .ant-space.ant-space-vertical {
         margin-left: 10px;
+        margin-top: 0px;
     }
     .ant-select-single:not(.ant-select-customize-input) {
         height: 26px;
         line-height: 26px !important;
         .ant-select-selector {
-            height: 26px;
+            height: 30px;
             border-color: @m-grey46 !important;
             background: @m-grey47;
             .rounded-corners(3px);

src/layout/components/bottom.vue

@@ -108,7 +108,7 @@ export default defineComponent({
         .ant-select-selector {
             background-color: @m-grey6;
             border: none;
-            height: 28px;
+            height: 30px;
         }
         .ant-select-arrow {
             top: 15px;

src/services/go/ermcp/spot-contract/interface.ts

@@ -2,7 +2,7 @@
  * 现货合同请求
  */
 export interface Ermcp3ContractReq {
-    querytype: number    //  查询类型 1-未提交 2-待审核 3-履约中 4-已完成
+    querytype: string    //  查询类型 1-未提交 2-待审核 3-履约中 4-已完成
     usertype?: number    //  用户类型 2-机构 7-企业成员
     contractid?: string  //  合同ID(SpotContractId)
     contracttype?: number  // 合同类型 1-采购, -1-销售

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

@@ -1,12 +1,12 @@
 <template>
     <!-- 采购: 历史敞口-->
     <div class="purchase-history">
-        <div class="chart-main" id="main"></div>
+        <div ref="chart" class="chart-main" id="main"></div>
     </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted } from 'vue';
+import { defineComponent, onMounted, ref } from 'vue';
 import { initData } from '@/common/methods';
 import * as echarts from 'echarts/core';
 import {
@@ -34,14 +34,13 @@ export default defineComponent({
     name: 'purchase-history',
     components: {},
     setup() {
+        const chart = ref();
         const option = {
             xAxis: {
                 type: 'category',
                 data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
             },
-            yAxis: {
-                type: 'value',
-            },
+            yAxis: {},
             series: [
                 {
                     data: [820, 932, 901, 934, 1290, 1330, 1320],
@@ -51,14 +50,18 @@ export default defineComponent({
             ],
         };
         onMounted(() => {
-            const ele = document.getElementById('main') as HTMLElement;
-            const myChart = echarts.init(ele);
-            myChart.setOption(option);
+            setTimeout(() => {
+                const ele = chart.value as HTMLElement;
+                const myChart = echarts.init(ele);
+                myChart.setOption(option);
+            }, 0);
         });
         initData(() => {
             option;
         });
-        return {};
+        return {
+            chart,
+        };
     },
 });
 </script>

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

@@ -27,6 +27,9 @@
                 <template #middlegoodsname="{ record }" v-if="!isPingAnOem()">
                     <span>{{ record.middlegoodsname + '/' + record.middlegoodscode }}</span>
                 </template>
+                <template #convertfactor="{record}">
+                    <span>{{record.convertratio}}</span>
+                </template>
                 <template #goodsname="{ record }" v-if="!isPingAnOem()">
                     <span>{{ record.goodsname + '/' + record.goodscode }}</span>
                 </template>

src/views/business/plan/components/cancel/index.vue

@@ -55,7 +55,7 @@
                     </a-col>
                     <a-col :span="12">
                         <a-form-item label="结算币种">
-                            <span class="white">{{ formatValue(selectedRow.enumdicname) }}</span>
+                            <span class="white">{{ formatValue(selectedRow.currencyname) }}</span>
                         </a-form-item>
                     </a-col>
                 </a-row>

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

@@ -1,233 +1,222 @@
 <template>
-    <!-- 交收登记-->
-    <a-modal class="commonModal paddingDialog settlement" :title="selectedRow.contracttype === 1 ? '采购合同-交收登记' : '销售合同-交收登记'" v-model:visible="visible" centered @cancel="cancel" width="890px">
-        <template #footer>
-            <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
-            <a-button key="submit" type="primary" :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 + ' 元' }}</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-col :span="24">
-                        <a-form-item label="其他费用">
-                            <span class="white">{{ selectedRow.reckonotheramount + ' 元' }}</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" :min="0" :max="selectedRow.unsureqty" placeholder="请输入交收量" suffix="单位" />
-                                    <div class="tip mt10">
-                                        <span>待交收量：{{ selectedRow.unsureqty }}{{ selectedRow.enumdicname }}</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" :min="0" placeholder="请输入交收量" suffix="单位" />
-                                    <div class="tip mt10"
-                                        ><span class="fl">未定价量：--{{ selectedRow.enumdicname }}</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" :min="0" placeholder="请输入其他费用" suffix="元" />
-                                </a-form-item>
-                                <a-form-item v-else>
-                                    <a-input-number readonly class="dialogInput" style="width: 200px" :min="0" 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" :min="0" 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" :min="0" 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" :min="0" 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="
+  <!-- 交收登记-->
+  <a-modal class="commonModal paddingDialog settlement" :title="selectedRow.contracttype === 1 ? '采购合同-交收登记' : '销售合同-交收登记'" v-model:visible="visible" centered @cancel="cancel" width="890px">
+    <template #footer>
+      <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
+      <a-button key="submit" type="primary" :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">{{ handlePrice() }}</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 + ' 元' }}</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-col :span="24">
+            <a-form-item label="其他费用">
+              <span class="white">{{ selectedRow.reckonotheramount + ' 元' }}</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" :min="0" :max="selectedRow.unsureqty" placeholder="请输入交收量" suffix="单位" />
+                  <div class="tip mt10">
+                    <span>待交收量：{{ selectedRow.unsureqty }}{{ selectedRow.enumdicname }}</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" :min="0" placeholder="请输入交收量" suffix="单位" />
+                  <div class="tip mt10"><span class="fl">未定价量：--{{ selectedRow.enumdicname }}</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" :min="0" placeholder="请输入其他费用" suffix="元" />
+                </a-form-item>
+                <a-form-item v-else>
+                  <a-input-number readonly class="dialogInput" style="width: 200px" :min="0" 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" :min="0" 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" :min="0" 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" :min="0" 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="
+                                                    ">
+                          增加</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" :min="0" 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" :min="0" 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" :min="0" 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-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" :min="0" 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" :min="0" 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-checkbox-group>
-                <a-form-item name="IsChecked"></a-form-item>
-            </a-form>
-        </fieldset>
-    </a-modal>
+                  </a-radio-group>
+                  <div class="tip mt10">
+                    <a-input-number disabled class="dialogInput" style="width: 200px" :min="0" 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">
@@ -255,6 +244,20 @@ export default defineComponent({
         const loading = ref<boolean>(false);
         const { rules, formState, formRef, checkedObj } = handleForm();
 
+        // 处理价格显示
+        const handlePrice = () => {
+            const { pricetype, price, pricedavg } = props.selectedRow;
+            //商品价格：如果是一口价合同，显示合同价；如果是点价合同，显示已点均价，如果没有点价，则显示0；如果是暂定价合同，优先显示已点均价，若没有点价，则显示暂定价；
+            switch (pricetype) {
+                case 1:
+                case 3:
+                    return formatValue(price + ' 元');
+                case 2:
+                    return formatValue(pricedavg + ' 元');
+            }
+            return 0 + ' 元';
+        };
+
         function submit() {
             const wrapEl = unref(formRef);
             wrapEl.validate().then((nameList: any) => {
@@ -315,6 +318,7 @@ export default defineComponent({
             rules,
             getPriceTypeName,
             checkedObj,
+            handlePrice,
         };
     },
 });

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

@@ -1,20 +1,10 @@
 <template>
   <!-- 采购 点价登记-->
-  <a-modal class="commonModal someprice"
-           :title="selectedRow.contracttype===1? '采购合同-点价登记': '销售合同-点价登记'"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           width="890px">
+  <a-modal class="commonModal someprice" :title="selectedRow.contracttype===1? '采购合同-点价登记': '销售合同-点价登记'" v-model:visible="visible" @cancel="cancel" centered width="890px">
     <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                @click="cancel">取消
+      <a-button key="submit" class="cancelBtn" @click="cancel">取消
       </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">点价登记
+      <a-button key="submit" type="primary" :loading="loading" @click="submit">点价登记
       </a-button>
     </template>
     <fieldset class="formFieldSet">
@@ -47,8 +37,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="合同签署量">
-              <span
-                    class="white">{{ formatValue(selectedRow.qty + selectedRow.enumdicname) }}</span>
+              <span class="white">{{ formatValue(selectedRow.qty + selectedRow.enumdicname) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -60,8 +49,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="点价合约">
-              <span
-                    class="white">{{ formatValue(selectedRow.goodsname) + selectedRow.currencyname }}</span>
+              <span class="white">{{ formatValue(selectedRow.goodsname) + selectedRow.currencyname }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -86,19 +74,11 @@
     </fieldset>
     <fieldset class="formFieldSet">
       <legend>本次点价信息</legend>
-      <a-form class="inlineForm"
-              ref="formRef"
-              :model="formState"
-              :rules="rules">
+      <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 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">
@@ -111,27 +91,18 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="商品价格">
-              <span class="white">{{
-                                    (Number(selectedRow.pricemove) + Number(formState.PricedPrice)).toFixed(2)
-                                }}</span>
+              <span class="white">
+                {{(Number(selectedRow.pricemove) + Number(formState.PricedPrice)).toFixed(2)}}
+              </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="请输入点价数量" />
+            <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 mt10">
-                <span>未定价量<span
-                        class="white">{{ selectedRow.unpricedqty }}{{ selectedRow.enumdicname }}</span>
+                <span>未定价量<span class="white">{{ selectedRow.unpricedqty }}{{ selectedRow.enumdicname }}</span>
                 </span>
-                <a class="blue ml10"
-                   @click="formState.PricedQty = selectedRow.unpricedqty"> 全部登记</a>
+                <a class="blue ml10" @click="formState.PricedQty = selectedRow.unpricedqty"> 全部登记</a>
               </div>
             </a-form-item>
           </a-col>

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

@@ -60,7 +60,7 @@
                 <legend>本次入库信息</legend>
                 <a-row :gutter="24">
                     <a-col :span="12">
-                        <a-form-item label="品类">
+                        <a-form-item label="商品">
                             <a-select class="inlineFormSelect" style="width: 200px" placeholder="请选择品类" v-model:value="selectedRow.wrstandardid" readonly>
                                 <a-select-option v-for="option in gmlist" :key="option.wrstandardid" :value="option.wrstandardid">{{ option.wrstandardname }} </a-select-option>
                             </a-select>

src/views/business/purchase/list/all/index.vue

@@ -1,41 +1,41 @@
 <template>
-    <!-- 采购合同: 特点价合同-待交收合同-->
-    <div class="purchase-peddding" :loading="loading">
-        <filterCustomTable @search="updateColumn"></filterCustomTable>
-        <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
-            </template>
-            <template #pricedqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #unsureqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #qty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #unpricedqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #unpayamount="{ record }">
-                <span>{{ record.unpayamount.toFixed(2) }}</span>
-            </template>
-            <template #daikaiamount="{ record }">
-                <span>{{ record.daikaiamount.toFixed(2) }}</span>
-            </template>
-            <template #deliverystartdate,deliveryenddate="{ record }">
-                <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
-            </template>
-            <template #startdate,enddate="{ record }">
-                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
+  <!-- 采购合同: 特点价合同-待交收合同-->
+  <div class="purchase-peddding" :loading="loading">
+    <filterCustomTable @search="updateColumn"></filterCustomTable>
+    <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
+      </template>
+      <template #pricedqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #unsureqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #qty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #unpricedqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #unpayamount="{ record }">
+        <span>{{ record.unpayamount.toFixed(2) }}</span>
+      </template>
+      <template #daikaiamount="{ record }">
+        <span>{{ record.daikaiamount.toFixed(2) }}</span>
+      </template>
+      <template #deliverystartdate,deliveryenddate="{ record }">
+        <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
+      </template>
+      <template #startdate,enddate="{ record }">
+        <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -68,7 +68,7 @@ export default defineComponent({
         // 权限按钮
         const buttons = getTableButton();
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<Ermcp3SellBuyContract>();
+        const { loading, tableList, queryTable } = queryTableList<Ermcp3SellBuyContract>(true, 2);
 
         // 获取列表数据
         const queryTableAction = () => {

src/views/business/search/plan/index.vue

@@ -31,7 +31,7 @@ export default defineComponent({
         const { loading, tableList, queryTable } = queryTableList<Ermcp3HedgePlan>();
 
         // 获取列表数据
-        const queryTableAction = () => queryTable(QueryHedgePlan, '0,1,2,3,4,5,6');
+        const queryTableAction = () => queryTable(QueryHedgePlan, '2,3');
 
         // 表格通用逻辑
         const param: ComposeTableParam = {

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

@@ -1,229 +1,219 @@
 <template>
-    <!-- 交收登记-->
-    <a-modal class="commonModal paddingDialog settlement" title="交收登记" v-model:visible="visible" @cancel="cancel" centered width="890px">
-        <template #footer>
-            <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
-            <a-button key="submit" type="primary" :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 + ' 元' }}</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-col :span="24">
-                        <a-form-item label="其他费用">
-                            <span class="white">{{ selectedRow.reckonotheramount + ' 元' }}</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" :min="0" :max="selectedRow.unsureqty" 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" :min="0" 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="请输入其他费用" :min="0" suffix="元" />
-                                </a-form-item>
-                                <a-form-item v-else>
-                                    <a-input-number readonly class="dialogInput" style="width: 200px" placeholder="请输入其他费用" :min="0" 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" :min="0" placeholder="请输入调整保证金" suffix="元" />
-                                        </a-form-item>
-                                        <a-form-item name="DecMargin" v-else>
-                                            <a-input-number v-model:value="formState.DecMargin" class="dialogInput" :min="0" 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" :min="0" 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="
+  <!-- 交收登记-->
+  <a-modal class="commonModal paddingDialog settlement" title="交收登记" v-model:visible="visible" @cancel="cancel" centered width="890px">
+    <template #footer>
+      <a-button key="submit" class="cancelBtn" @click="cancel">取消 </a-button>
+      <a-button key="submit" type="primary" :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">{{ handlePrice() }}</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 + ' 元' }}</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-col :span="24">
+            <a-form-item label="其他费用">
+              <span class="white">{{ selectedRow.reckonotheramount + ' 元' }}</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" :min="0" :max="selectedRow.unsureqty" 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" :min="0" 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="请输入其他费用" :min="0" suffix="元" />
+                </a-form-item>
+                <a-form-item v-else>
+                  <a-input-number readonly class="dialogInput" style="width: 200px" placeholder="请输入其他费用" :min="0" 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" :min="0" placeholder="请输入调整保证金" suffix="元" />
+                    </a-form-item>
+                    <a-form-item name="DecMargin" v-else>
+                      <a-input-number v-model:value="formState.DecMargin" class="dialogInput" :min="0" 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" :min="0" 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="
+                                                    ">
+                          增加</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="请输入调整金额" :min="0" suffix="元" v-if="checkedObj.adjustAmount === 1" />
-                                            <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount = -1 * Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" :min="0" 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="请输入调整金额" :min="0" 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-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="请输入调整金额" :min="0" suffix="元" v-if="checkedObj.adjustAmount === 1" />
+                      <a-input-number v-model:value="formState.ReckonAdjustAmount" @change="formState.ReckonAdjustAmount = -1 * Math.abs(formState.ReckonAdjustAmount)" class="dialogInput" :min="0" 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-checkbox-group>
-                <a-form-item name="IsChecked"></a-form-item>
-            </a-form>
-        </fieldset>
-    </a-modal>
+                  </a-radio-group>
+                  <div class="tip mt10">
+                    <a-input-number disabled class="dialogInput" style="width: 200px" placeholder="请输入调整金额" :min="0" 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">
@@ -250,6 +240,21 @@ export default defineComponent({
         const { visible, cancel } = _closeModal(context);
         const loading = ref<boolean>(false);
         const { rules, formState, formRef, checkedObj } = handleForm();
+
+        // 处理价格显示
+        const handlePrice = () => {
+            const { pricetype, price, pricedavg } = props.selectedRow;
+            //商品价格：如果是一口价合同，显示合同价；如果是点价合同，显示已点均价，如果没有点价，则显示0；如果是暂定价合同，优先显示已点均价，若没有点价，则显示暂定价；
+            switch (pricetype) {
+                case 1:
+                case 3:
+                    return formatValue(price + ' 元');
+                case 2:
+                    return formatValue(pricedavg + ' 元');
+            }
+            return 0 + ' 元';
+        };
+
         function submit() {
             const wrapEl = unref(formRef);
             wrapEl.validate().then((nameList: any) => {
@@ -309,6 +314,7 @@ export default defineComponent({
             rules,
             getPriceTypeName,
             checkedObj,
+            handlePrice,
         };
     },
 });

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

@@ -1,35 +1,35 @@
 <template>
-    <!-- 销售合同: 特点价合同-待交收合同-->
-    <div class="sell-peddding" :loading="loading">
-        <filterCustomTable @search="updateColumn"></filterCustomTable>
-        <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
-            </template>
-            <template #pricedqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #unsureqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #qty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #unpricedqty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-            <template #deliverystartdate,deliveryenddate="{ record }">
-                <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
-            </template>
-            <template #startdate,enddate="{ record }">
-                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
+  <!-- 销售合同: 特点价合同-待交收合同-->
+  <div class="sell-peddding" :loading="loading">
+    <filterCustomTable @search="updateColumn"></filterCustomTable>
+    <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
+      </template>
+      <template #pricedqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #unsureqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #qty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #unpricedqty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+      <template #deliverystartdate,deliveryenddate="{ record }">
+        <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
+      </template>
+      <template #startdate,enddate="{ record }">
+        <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -62,7 +62,7 @@ export default defineComponent({
         // 权限按钮
         const buttons = getTableButton();
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<Ermcp3SellBuyContract>();
+        const { loading, tableList, queryTable } = queryTableList<Ermcp3SellBuyContract>(true, 2);
 
         // 获取列表数据
         const queryTableAction = () => {

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

@@ -1,17 +1,8 @@
 <template>
   <!-- 删除客户资料-->
-  <a-modal class="commonModal recover-custom"
-           title="删除客户资料"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           width="890px">
+  <a-modal class="commonModal recover-custom" title="删除客户资料" v-model:visible="visible" @cancel="cancel" centered width="890px">
     <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit">删除客户资料 </a-button>
+      <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit">删除客户资料 </a-button>
     </template>
     <Detail :selectedRow="selectedRow" />
   </a-modal>
@@ -65,10 +56,4 @@ export default defineComponent({
         };
     },
 });
-</script>
-
-<style lang="less">
-.recover-custom {
-}
-</style
->;
+</script>

src/views/information/custom/index.vue

@@ -1,32 +1,31 @@
 <template>
-    <!-- 客户资料 -->
-    <div class="plan_uncommitted" :loading="loading">
-        <Filter @search="updateColumn">
-            <mtp-table-button class="btn-list-sticky" :buttons="addButton" @click="openComponent" />
-        </Filter>
-        <a-table :columns="getColumns(columns)" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
-            </template>
-            <template #status="{ text }">
-                <a>{{ getStatusName(text) }}</a>
-            </template>
-            <template #userinfotype="{ text }">
-                <a>{{ getUserInfoTypeName(text) }}</a>
-            </template>
-            <template #attachment1="{ text, record }">
-                <a>{{ text }}</a
-                ><a>{{ record.attachment2 }}</a>
-            </template>
-            <template #cardtype="{ text }">
-                <a>{{ getCardTypeEnumItemName(text) }}</a>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"> </component>
-    </div>
+  <!-- 客户资料 -->
+  <div class="plan_uncommitted" :loading="loading">
+    <Filter @search="updateColumn">
+      <mtp-table-button class="btn-list-sticky" :buttons="addButton" @click="openComponent" />
+    </Filter>
+    <a-table :columns="getColumns(columns)" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="handleBtnList(buttons,record)" :record="record" @click="openComponent" />
+      </template>
+      <template #status="{ text }">
+        <a>{{ getStatusName(text) }}</a>
+      </template>
+      <template #userinfotype="{ text }">
+        <a>{{ getUserInfoTypeName(text) }}</a>
+      </template>
+      <template #attachment1="{ text, record }">
+        <a>{{ text }}</a><a>{{ record.attachment2 }}</a>
+      </template>
+      <template #cardtype="{ text }">
+        <a>{{ getCardTypeEnumItemName(text) }}</a>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"> </component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -41,6 +40,7 @@ import Filter from './compoments/filterTable/index.vue';
 import { pingan_custom_column } from './setup';
 import { ColumnType } from '@/common/methods/table';
 import { getTableColumns } from '@/common/setup/table';
+import { BtnListType } from '@/common/components/btnList/interface';
 
 export default defineComponent({
     name: EnumRouterName.plan_audit,
@@ -80,6 +80,18 @@ export default defineComponent({
             }
         };
 
+        // 处理根据状态显示对应按钮
+        const handleBtnList = (btnList: BtnListType[], item: QueryCustomInfoType) => {
+            switch (item.status) {
+                case 2: // 待审核
+                    return btnList.filter((e) => e.code !== 'modify');
+                case 5: // 拒绝审核
+                    return btnList.filter((e) => e.code !== 'check');
+                default:
+                    return btnList;
+            }
+        };
+
         // 表头
         const getColumns = (columns: ColumnType[]) => {
             if (isPingAnOem()) {
@@ -115,6 +127,7 @@ export default defineComponent({
             getUserInfoTypeName,
             getCardTypeEnumItemName,
             getColumns,
+            handleBtnList,
         };
     },
 });

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

@@ -1,246 +1,249 @@
 <template>
-    <!-- 新增现货合同 -->
-    <a-modal class="commonModal add-spot-contract" title="新增现货合同" v-model:visible="visible" centered :maskClosable="false" @cancel="closeAction" width="890px">
-        <template #footer>
-            <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="submit(1)">保存草稿</a-button>
-            <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit(2)">提交审核</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="ContractNo">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.ContractNo" placeholder="请输入合同编号" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="合同类型" name="ContractType">
-                            <a-select class="inlineFormSelect" style="width: 200px" @change="contractChange" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.ContractType" placeholder="请选择合同类型">
-                                <a-select-option v-for="item in contractType" :key="item.key" :value="item.key">
-                                    {{ item.value }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="业务类型" name="BizType">
-                            <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.BizType" placeholder="请选择业务类型">
-                                <a-select-option v-for="item in businessType" :key="item.key" :value="item.key">
-                                    {{ item.value }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <template v-if="isSell">
-                        <a-col :span="12">
-                            <a-form-item label="采购方" name="BuyUserID">
-                                <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.BuyUserID" placeholder="请选择客户">
-                                    <!-- 客户资料列表 正常 -->
-                                    <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
-                                        {{ item.customername }}
-                                    </a-select-option>
-                                </a-select>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="销售方">
-                                <span class="white">{{ getRootUserInfo().accountname }}</span>
-                            </a-form-item>
-                        </a-col>
-                    </template>
-                    <template v-else>
-                        <a-col :span="12">
-                            <a-form-item label="采购方">
-                                <span class="white">{{ getRootUserInfo().accountname }}</span>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="销售方" name="SellUserID">
-                                <a-select class="inlineFormSelect" v-model:value="formState.SellUserID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择客户">
-                                    <!-- 客户资料列表 正常 -->
-                                    <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
-                                        {{ item.customername }}
-                                    </a-select-option>
-                                </a-select>
-                            </a-form-item>
-                        </a-col>
-                    </template>
-                    <a-col :span="12">
-                        <a-form-item label="合同附件" class="checkboxGroupItem" name="ContractAttachment">
-                            <UploadImg :visible="visible" @upload="uploadImgAction" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="交易主体" name="SubjectID">
-                            <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.SubjectID" placeholder="请选择主体">
-                                <a-select-option :value="item.subjectid" v-for="item in subjectList" :key="item.subjectid">
-                                    {{ item.subjectname }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-            <fieldset class="formFieldSet">
-                <legend>现货信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="现货品种" name="DeliveryGoodsID">
-                            <a-select class="inlineFormSelect" style="width: 200px" @change="deliveryGoodsChange" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.DeliveryGoodsID" placeholder="请选择现货品种">
-                                <a-select-option v-for="item in deliveryGoodsList" :key="item.deliverygoodsid" :value="item.deliverygoodsid">
-                                    {{ item.deliverygoodsname }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="商品" name="WrStandardID">
-                            <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" @change="WrStandardChange" v-model:value="formState.WrStandardID" placeholder="请选择商品">
-                                <a-select-option v-for="item in gmlist" :key="item.wrstandardid" :value="item.wrstandardid">
-                                    {{ item.wrstandardname }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="品牌" name="SpotGoodsBrandID">
-                            <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.SpotGoodsBrandID" placeholder="请选择品牌">
-                                <a-select-option v-for="item in gblist" :key="item.brandid" :value="item.brandid">
-                                    {{ item.brandname }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="商品规格" name="SpotGoodsDesc">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.SpotGoodsDesc" placeholder="请输入商品规格" />
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-            <fieldset class="formFieldSet">
-                <legend>价格信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="定价类型" name="PriceType">
-                            <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.PriceType" placeholder="请选择定价类型">
-                                <a-select-option v-for="item in priceType" :key="item.key" :value="item.key">
-                                    {{ item.value }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="结算币种" name="CurrencyID">
-                            <a-select class="inlineFormSelect" v-model:value="formState.CurrencyID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择结算币种">
-                                <a-select-option v-for="item in payCurrency" :key="item.enumitemname" :value="item.enumitemname">
-                                    {{ item.enumdicname }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="数量" name="Qty">
-                            <a-input class="dialogInput suffixGrey" v-model:value="formState.Qty" style="width: 200px" @change="getAmout" placeholder="请输入数量" :suffix="numberUnit" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12" v-if="formState.PriceType === 3">
-                        <a-form-item label="暂定价">
-                            <a-input class="dialogInput suffixGrey" style="width: 200px" :suffix="payCurrencyUnit" placeholder="请输入暂定价" />
-                        </a-form-item>
-                    </a-col>
-                    <!-- 以下是点价的价格信息 start -->
-                    <template v-if="formState.PriceType === 2 || formState.PriceType === 3">
-                        <a-col :span="12">
-                            <a-form-item label="点价合约" name="GoodsID">
-                                <a-select class="inlineFormSelect" v-model:value="formState.GoodsID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择点价合约">
-                                    <a-select-option v-for="item in goodsList" :key="item.goodsid" :value="item.goodsid">
-                                        {{ item.goodsname }}
-                                    </a-select-option>
-                                </a-select>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="升贴水" name="PriceMove">
-                                <a-input-number class="dialogInput suffixGrey" v-model:value="formState.PriceMove" placeholder="请输入升贴水" :min="0" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="点价期">
-                                <a-range-picker v-model:value="priceDate" class="commonPicker" :disabled-date="disabledDate" style="width: 200px" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="交收期">
-                                <a-range-picker v-model:value="deliveryDate" class="commonPicker" style="width: 200px" :disabled-date="disabledDate" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
-                            </a-form-item>
-                        </a-col>
-                    </template>
-                    <!-- 以上是点价的价格信息 end -->
-                    <template v-if="formState.PriceType === 1">
-                        <a-col :span="12">
-                            <a-form-item label="价格" name="Price">
-                                <a-input class="dialogInput suffixGrey" v-model:value="formState.Price" @change="getAmout" placeholder="请输入价格" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="金额" class="relative" name="Amount">
-                                <a-input class="dialogInput suffixGrey" v-model:value="formState.Amount" readonly placeholder="输入数量和价格后自动算" :suffix="payCurrencyUnit" style="width: 200px" />
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="24">
-                            <a-form-item label="交收期">
-                                <a-range-picker v-model:value="deliveryDate" style="width: 200px" class="commonPicker" :disabled-date="disabledDate" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
-                            </a-form-item>
-                        </a-col>
-                    </template>
-                </a-row>
-            </fieldset>
-            <fieldset class="formFieldSet">
-                <legend>其他信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="保证金" name="ContractMargin">
-                            <a-input class="dialogInput suffixGrey" placeholder="请输入保证金" v-model:value="formState.ContractMargin" style="width: 200px" :suffix="payCurrencyUnit" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="业务员" name="SaleUserID">
-                            <a-select class="inlineFormSelect" v-model:value="formState.SaleUserID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择业务员">
-                                <a-select-option v-for="item in businesserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="跟单员" name="MerUserID">
-                            <a-select class="inlineFormSelect" v-model:value="formState.MerUserID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择跟单员">
-                                <a-select-option v-for="item in merchandiserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="交易用户" name="TradeUserID">
-                            <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.TradeUserID" placeholder="请选择交易用户">
-                                <a-select-option v-for="item in traderList" :key="item.roleid" :value="item.roleid">
-                                    {{ item.rolename }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="24">
-                        <a-form-item label="备注" name="Remark">
-                            <a-input class="dialogInput" style="width: 608px" v-model:value="formState.Remark" placeholder="请输入备注" />
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-        </a-form>
-    </a-modal>
+  <!-- 新增合同 -->
+  <a-modal class="commonModal add-spot-contract" :title="formState.ContractType === 1 ? '新增现货合同' : '新增销售合同'" v-model:visible="visible" centered :maskClosable="false" @cancel="closeAction" width="890px">
+    <template #footer>
+      <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="submit(1)">保存草稿</a-button>
+      <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit(2)">提交审核</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="ContractNo">
+              <a-input class="dialogInput" style="width: 200px" v-model:value="formState.ContractNo" placeholder="请输入合同编号" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <!-- <a-form-item label="合同类型" name="ContractType">
+              <a-select class="inlineFormSelect" style="width: 200px" @change="contractChange" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.ContractType" placeholder="请选择合同类型">
+                <a-select-option v-for="item in contractType" :key="item.key" :value="item.key">
+                  {{ item.value }}
+                </a-select-option>
+              </a-select>
+            </a-form-item> -->
+            <a-form-item label="合同类型">
+              <span class="white">{{ getContractTypeName(formState.ContractType) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="业务类型" name="BizType">
+              <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.BizType" placeholder="请选择业务类型">
+                <a-select-option v-for="item in businessType" :key="item.key" :value="item.key">
+                  {{ item.value }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <template v-if="isSell">
+            <a-col :span="12">
+              <a-form-item label="采购方" name="BuyUserID">
+                <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.BuyUserID" placeholder="请选择客户">
+                  <!-- 客户资料列表 正常 -->
+                  <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
+                    {{ item.customername }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="销售方">
+                <span class="white">{{ getRootUserInfo().accountname }}</span>
+              </a-form-item>
+            </a-col>
+          </template>
+          <template v-else>
+            <a-col :span="12">
+              <a-form-item label="采购方">
+                <span class="white">{{ getRootUserInfo().accountname }}</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="销售方" name="SellUserID">
+                <a-select class="inlineFormSelect" v-model:value="formState.SellUserID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择客户">
+                  <!-- 客户资料列表 正常 -->
+                  <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
+                    {{ item.customername }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :span="12">
+            <a-form-item label="合同附件" class="checkboxGroupItem" name="ContractAttachment">
+              <UploadImg :visible="visible" @upload="uploadImgAction" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="交易主体" name="SubjectID">
+              <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.SubjectID" placeholder="请选择主体">
+                <a-select-option :value="item.subjectid" v-for="item in subjectList" :key="item.subjectid">
+                  {{ item.subjectname }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>现货信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="现货品种" name="DeliveryGoodsID">
+              <a-select class="inlineFormSelect" style="width: 200px" @change="deliveryGoodsChange" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.DeliveryGoodsID" placeholder="请选择现货品种">
+                <a-select-option v-for="item in deliveryGoodsList" :key="item.deliverygoodsid" :value="item.deliverygoodsid">
+                  {{ item.deliverygoodsname }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="商品" name="WrStandardID">
+              <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" @change="WrStandardChange" v-model:value="formState.WrStandardID" placeholder="请选择商品">
+                <a-select-option v-for="item in gmlist" :key="item.wrstandardid" :value="item.wrstandardid">
+                  {{ item.wrstandardname }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="品牌" name="SpotGoodsBrandID">
+              <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.SpotGoodsBrandID" placeholder="请选择品牌">
+                <a-select-option v-for="item in gblist" :key="item.brandid" :value="item.brandid">
+                  {{ item.brandname }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="商品规格" name="SpotGoodsDesc">
+              <a-input class="dialogInput" style="width: 200px" v-model:value="formState.SpotGoodsDesc" placeholder="请输入商品规格" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>价格信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="定价类型" name="PriceType">
+              <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.PriceType" placeholder="请选择定价类型">
+                <a-select-option v-for="item in priceType" :key="item.key" :value="item.key">
+                  {{ item.value }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="结算币种" name="CurrencyID">
+              <a-select class="inlineFormSelect" v-model:value="formState.CurrencyID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择结算币种">
+                <a-select-option v-for="item in payCurrency" :key="item.enumitemname" :value="item.enumitemname">
+                  {{ item.enumdicname }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="数量" name="Qty">
+              <a-input class="dialogInput suffixGrey" v-model:value="formState.Qty" style="width: 200px" @change="getAmout" placeholder="请输入数量" :suffix="numberUnit" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12" v-if="formState.PriceType === 3">
+            <a-form-item label="暂定价">
+              <a-input class="dialogInput suffixGrey" style="width: 200px" :suffix="payCurrencyUnit" placeholder="请输入暂定价" />
+            </a-form-item>
+          </a-col>
+          <!-- 以下是点价的价格信息 start -->
+          <template v-if="formState.PriceType === 2 || formState.PriceType === 3">
+            <a-col :span="12">
+              <a-form-item label="点价合约" name="GoodsID">
+                <a-select class="inlineFormSelect" v-model:value="formState.GoodsID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择点价合约">
+                  <a-select-option v-for="item in goodsList" :key="item.goodsid" :value="item.goodsid">
+                    {{ item.goodsname }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="升贴水" name="PriceMove">
+                <a-input-number class="dialogInput suffixGrey" v-model:value="formState.PriceMove" placeholder="请输入升贴水" :min="0" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="点价期">
+                <a-range-picker v-model:value="priceDate" class="commonPicker" :disabled-date="disabledDate" style="width: 200px" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="交收期">
+                <a-range-picker v-model:value="deliveryDate" class="commonPicker" style="width: 200px" :disabled-date="disabledDate" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
+              </a-form-item>
+            </a-col>
+          </template>
+          <!-- 以上是点价的价格信息 end -->
+          <template v-if="formState.PriceType === 1">
+            <a-col :span="12">
+              <a-form-item label="价格" name="Price">
+                <a-input class="dialogInput suffixGrey" v-model:value="formState.Price" @change="getAmout" placeholder="请输入价格" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="金额" class="relative" name="Amount">
+                <a-input class="dialogInput suffixGrey" v-model:value="formState.Amount" readonly placeholder="输入数量和价格后自动算" :suffix="payCurrencyUnit" style="width: 200px" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="交收期">
+                <a-range-picker v-model:value="deliveryDate" style="width: 200px" class="commonPicker" :disabled-date="disabledDate" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
+              </a-form-item>
+            </a-col>
+          </template>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>其他信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="保证金" name="ContractMargin">
+              <a-input class="dialogInput suffixGrey" placeholder="请输入保证金" v-model:value="formState.ContractMargin" style="width: 200px" :suffix="payCurrencyUnit" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="业务员" name="SaleUserID">
+              <a-select class="inlineFormSelect" v-model:value="formState.SaleUserID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择业务员">
+                <a-select-option v-for="item in businesserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="跟单员" name="MerUserID">
+              <a-select class="inlineFormSelect" v-model:value="formState.MerUserID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择跟单员">
+                <a-select-option v-for="item in merchandiserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="交易用户" name="TradeUserID">
+              <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.TradeUserID" placeholder="请选择交易用户">
+                <a-select-option v-for="item in traderList" :key="item.roleid" :value="item.roleid">
+                  {{ item.rolename }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <a-form-item label="备注" name="Remark">
+              <a-input class="dialogInput" style="width: 608px" v-model:value="formState.Remark" placeholder="请输入备注" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -260,6 +263,7 @@ import { handlerManagerList } from '@/common/setup/user';
 import { getUploadImg } from '@/common/setup/upload';
 import UploadImg from '@/common/components/uploadImg/index.vue';
 import { _closeModal } from '@/common/setup/modal/modal';
+import { getContractTypeName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'add-spot-contract',
@@ -270,6 +274,10 @@ export default defineComponent({
             type: Object as PropType<Ermcp3ContractRsp>,
             default: {},
         },
+        contractType: {
+            type: Number,
+            required: true,
+        },
     },
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
@@ -278,13 +286,13 @@ export default defineComponent({
 
         // 表单
         const formRef = ref();
-        const { formState, businessType, initFormData } = handleFromState();
+        const { formState, businessType, initFormData } = handleFromState(props.contractType);
         const { rules } = handleFormRule(formState);
         // 合同类型
         const { contractType, isSell, contractChange, customList, queryCustomList } = handleContract(formState);
 
         //  处理现货商品
-        const { deliveryGoodsList,goodsList, gblist, gmlist, numberUnit, WrStandardChange, getDeliveryGoods, deliveryGoodsChange } = handleDeliveryGoods(formState);
+        const { deliveryGoodsList, goodsList, gblist, gmlist, numberUnit, WrStandardChange, getDeliveryGoods, deliveryGoodsChange } = handleDeliveryGoods(formState);
         // 价格信息
         const { priceType, payCurrency, payCurrencyUnit, parCurrencyChange } = handlePrice(formState);
         // 日期
@@ -388,6 +396,7 @@ export default defineComponent({
             uploadImgAction,
             getRootUserInfo,
             subjectList,
+            getContractTypeName,
         };
     },
 });

src/views/information/spot-contract/components/check/setup.ts

@@ -12,10 +12,6 @@ export function handleForm() {
         SaleUserID: undefined, // uint64 业务员ID
         Remark: ''
     })
-    // 验证跟单员
-    async function v_MerUser(rule: RuleObject, value: number) {
-        return validateCommon(value, '请选择跟单员')
-    }
     // 验证交易员
     async function v_TradeUser(rule: RuleObject, value: number) {
         return validateCommon(value, '请选择交易用户')
@@ -25,7 +21,6 @@ export function handleForm() {
         return validateCommon(value, '请选择业务员')
     }
     const rules = {
-        MerUserID: [{ required: true, validator: v_MerUser, trigger: 'blur' }],
         TradeUserID: [{ required: true, validator: v_TradeUser, trigger: 'blur' }],
         SaleUserID: [{ required: true, validator: v_SaleUser, trigger: 'blur' }],
     }

src/views/information/spot-contract/components/common-detail/index.vue

@@ -74,6 +74,7 @@ export default defineComponent({
                     { label: '销售方', value: formatValue(data.sellusername) },
                     { label: '合同附件', value: formatValue(getImgName(data.attachment)) },
                     { label: '状态', value: getContractStatusName(data.contracctstatus), className: 'green' },
+                    { label: "交易主体",value:formatValue(data.subjectname)}
                 ];
                 getBaseInfo(base);
                 // 现货信息
@@ -81,7 +82,6 @@ export default defineComponent({
                     { label: '现货品种', value: formatValue(data.deliverygoodsname) },
                     { label: '商品', value: formatValue(data.wrstandardname) },
                     { label: '品牌', value: formatValue(data.brandname) },
-                    { label: '标仓系数', value: formatValue(data.convertfactor) },
                     { label: '商品规格', value: formatValue(data.spotgoodsdesc) },
                 ];
                 getSpotInfo(spot);

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

@@ -1,27 +1,12 @@
 <template>
-  <!-- 删除现货合同--->
-  <a-modal class="recover-custom commonModal addSpotVariety"
-           title="删除现货合同"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                :loading="loading"
-                :disabled="loading"
-                @click="cancel">取消</a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                :disabled="loading"
-                @click="submit">确认删除</a-button>
-    </template>
-    <InfoDetail :selectedRow="selectedRow" />
-
-  </a-modal>
+    <!-- 删除现货合同--->
+    <a-modal class="recover-custom commonModal addSpotVariety" title="撤销现货合同" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
+        <template #footer>
+            <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="cancel">取消</a-button>
+            <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit">确认撤销</a-button>
+        </template>
+        <InfoDetail :selectedRow="selectedRow" />
+    </a-modal>
 </template>
 
 <script lang="ts">
@@ -52,8 +37,8 @@ export default defineComponent({
         // 获取 业务账户
         function submit() {
             Modal.confirm({
-                title: '是否确认删除',
-                okText: '确认删除',
+                title: '是否确认撤销',
+                okText: '确认撤销',
                 cancelText: '取消',
                 onOk() {
                     let params: GldErmcpSpotContractOperateReq = {
@@ -81,10 +66,4 @@ export default defineComponent({
         };
     },
 });
-</script>
-
-<style lang="less">
-.recover-custom {
-}
-</style
->;
+</script>

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

@@ -17,15 +17,6 @@ export default defineComponent({
         const select: SelectList[] = [
             {
                 value: undefined,
-                key: 'contracttype',
-                placeholder: '全部合同类型',
-                list: [
-                    { value: 1, lable: '采购' },
-                    { value: -1, lable: '销售' },
-                ],
-            },
-            {
-                value: undefined,
                 key: 'pricetype',
                 placeholder: '全部定价类型',
                 list: [

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

@@ -1,248 +1,248 @@
 <template>
-    <!-- 重新提交现货合同-->
-    <a-modal class="commonModal modify-custom" title="重新提交现货合同" v-if="visible" v-model:visible="visible" @cancel="cancel" centered width="890px">
-        <template #footer>
-            <a-button key="submit" type="primary" :loading="loading" :disabled="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="ContractNo">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.ContractNo" placeholder="请输入合同编号" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="合同类型" name="ContractType">
-                            <a-select class="inlineFormSelect" style="width: 200px" @change="contractChange" v-model:value="formState.ContractType" placeholder="请选择合同类型">
-                                <a-select-option v-for="item in contractType" :key="item.key" :value="item.key">
-                                    {{ item.value }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="业务类型" name="BizType">
-                            <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.BizType" placeholder="请选择业务类型">
-                                <a-select-option v-for="item in businessType" :key="item.key" :value="item.key">
-                                    {{ item.value }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <template v-if="isSell">
-                        <a-col :span="12">
-                            <a-form-item label="采购方" name="BuyUserID">
-                                <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.BuyUserID" placeholder="请选择客户">
-                                    <!-- 客户资料列表 正常 -->
-                                    <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
-                                        {{ item.customername }}
-                                    </a-select-option>
-                                </a-select>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="销售方">
-                                <span class="white">{{ getUserName() }}</span>
-                            </a-form-item>
-                        </a-col>
-                    </template>
-                    <template v-else>
-                        <a-col :span="12">
-                            <a-form-item label="采购方">
-                                <span class="white">{{ getUserName() }}</span>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="销售方" name="SellUserID">
-                                <a-select class="inlineFormSelect" v-model:value="formState.SellUserID" style="width: 200px" placeholder="请选择客户">
-                                    <!-- 客户资料列表 正常 -->
-                                    <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
-                                        {{ item.customername }}
-                                    </a-select-option>
-                                </a-select>
-                            </a-form-item>
-                        </a-col>
-                    </template>
-                    <a-col :span="12">
-                        <a-form-item label="合同附件" name="ContractAttachment">
-                            <UploadImg :visible="visible" :imgList="uploadImgList" @upload="uploadImgAction" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="交易主体" name="SubjectID">
-                            <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.SubjectID" placeholder="请选择主体">
-                                <a-select-option :value="item.subjectid" v-for="item in subjectList" :key="item.subjectid">
-                                    {{ item.subjectname }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-            <fieldset class="formFieldSet">
-                <legend>现货信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="现货品种" name="DeliveryGoodsID">
-                            <a-select class="inlineFormSelect" style="width: 200px" @change="deliveryGoodsChange" v-model:value="formState.DeliveryGoodsID" placeholder="请选择现货品种">
-                                <a-select-option v-for="item in deliveryGoodsList" :key="item.deliverygoodsid" :value="item.deliverygoodsid">
-                                    {{ item.deliverygoodsname }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="商品" name="WrStandardID">
-                            <a-select class="inlineFormSelect" style="width: 200px" @change="WrStandardChange" v-model:value="formState.WrStandardID" placeholder="请选择商品">
-                                <a-select-option v-for="item in gmlist" :key="item.wrstandardid" :value="item.wrstandardid">
-                                    {{ item.wrstandardname }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="品牌" name="SpotGoodsBrandID">
-                            <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.SpotGoodsBrandID" placeholder="请选择品牌">
-                                <a-select-option v-for="item in gblist" :key="item.brandid" :value="item.brandid">
-                                    {{ item.brandname }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="商品规格" name="SpotGoodsDesc">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.SpotGoodsDesc" placeholder="请输入商品规格" />
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-            <fieldset class="formFieldSet">
-                <legend>价格信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="定价类型" name="PriceType">
-                            <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.PriceType" placeholder="请选择定价类型">
-                                <a-select-option v-for="item in priceType" :key="item.key" :value="item.key">
-                                    {{ item.value }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="结算币种" name="CurrencyID">
-                            <a-select class="inlineFormSelect" v-model:value="formState.CurrencyID" style="width: 200px" placeholder="请选择结算币种">
-                                <a-select-option v-for="item in payCurrency" :key="item.enumitemname" :value="item.enumitemname">
-                                    {{ item.enumdicname }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="数量" name="Qty">
-                            <a-input class="dialogInput suffixGrey" v-model:value="formState.Qty" style="width: 200px" @change="getAmout" placeholder="请输入数量" :suffix="numberUnit" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12" v-if="formState.PriceType === 3">
-                        <a-form-item label="暂定价">
-                            <a-input class="dialogInput suffixGrey" style="width: 200px" :suffix="payCurrencyUnit" placeholder="请输入暂定价" />
-                        </a-form-item>
-                    </a-col>
-                    <!-- 以下是点价的价格信息 start -->
-                    <template v-if="formState.PriceType === 2 || formState.PriceType === 3">
-                        <a-col :span="12">
-                            <a-form-item label="点价合约" name="GoodsID">
-                                <a-select class="inlineFormSelect" v-model:value="formState.GoodsID" style="width: 200px" placeholder="请选择点价合约">
-                                    <a-select-option v-for="item in goodsList" :key="item.goodsid" :value="item.goodsid">
-                                        {{ item.goodsname }}
-                                    </a-select-option>
-                                </a-select>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="升贴水" name="PriceMove">
-                                <a-input-number class="dialogInput suffixGrey" v-model:value="formState.PriceMove" placeholder="请输入升贴水" :min="0" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="点价期">
-                                <a-range-picker v-model:value="priceDate" class="commonPicker" :disabled-date="disabledDate" style="width: 200px" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="交收期">
-                                <a-range-picker v-model:value="deliveryDate" class="commonPicker" style="width: 200px" :disabled-date="disabledDate" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
-                            </a-form-item>
-                        </a-col>
-                    </template>
-                    <!-- 以上是点价的价格信息 end -->
-                    <template v-if="formState.PriceType === 1">
-                        <a-col :span="12">
-                            <a-form-item label="价格" name="Price">
-                                <a-input class="dialogInput suffixGrey" v-model:value="formState.Price" @change="getAmout" placeholder="请输入价格" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="金额" class="relative" name="Amount">
-                                <a-input class="dialogInput suffixGrey" v-model:value="formState.Amount" readonly placeholder="输入数量和价格后自动算" :suffix="payCurrencyUnit" style="width: 200px" />
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="24">
-                            <a-form-item label="交收期">
-                                <a-range-picker v-model:value="deliveryDate" style="width: 200px" class="commonPicker" :disabled-date="disabledDate" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
-                            </a-form-item>
-                        </a-col>
-                    </template>
-                </a-row>
-            </fieldset>
-            <fieldset class="formFieldSet">
-                <legend>其他信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="保证金" name="ContractMargin">
-                            <a-input class="dialogInput suffixGrey" placeholder="请输入保证金" v-model:value="formState.ContractMargin" style="width: 200px" :suffix="payCurrencyUnit" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="业务员" name="SaleUserID">
-                            <a-select class="inlineFormSelect" v-model:value="formState.SaleUserID" style="width: 200px" placeholder="请选择业务员">
-                                <a-select-option v-for="item in businesserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="跟单员" name="MerUserID">
-                            <a-select class="inlineFormSelect" v-model:value="formState.MerUserID" style="width: 200px" placeholder="请选择跟单员">
-                                <a-select-option v-for="item in merchandiserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="交易用户" name="TradeUserID">
-                            <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.TradeUserID" placeholder="请选择期货账户">
-                                <a-select-option v-for="item in traderList" :key="item.roleid" :value="item.roleid">
-                                    {{ item.rolename }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="24">
-                        <a-form-item label="备注" name="Remark">
-                            <a-input class="dialogInput" style="width: 608px" v-model:value="formState.Remark" placeholder="请输入备注" />
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-        </a-form>
-        <a-modal :visible="previewVisible" :footer="null" @cancel="cancelImg">
-            <img alt="预览附件" style="width: 100%" :src="previewImage" />
-        </a-modal>
+  <!-- 重新提交现货合同-->
+  <a-modal class="commonModal modify-custom" title="重新提交现货合同" v-if="visible" v-model:visible="visible" @cancel="cancel" centered width="890px">
+    <template #footer>
+      <a-button key="submit" type="primary" :loading="loading" :disabled="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="ContractNo">
+              <a-input class="dialogInput" style="width: 200px" v-model:value="formState.ContractNo" placeholder="请输入合同编号" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同类型" name="ContractType">
+              <a-select class="inlineFormSelect" style="width: 200px" @change="contractChange" v-model:value="formState.ContractType" placeholder="请选择合同类型">
+                <a-select-option v-for="item in contractType" :key="item.key" :value="item.key">
+                  {{ item.value }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="业务类型" name="BizType">
+              <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.BizType" placeholder="请选择业务类型">
+                <a-select-option v-for="item in businessType" :key="item.key" :value="item.key">
+                  {{ item.value }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <template v-if="isSell">
+            <a-col :span="12">
+              <a-form-item label="采购方" name="BuyUserID">
+                <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.BuyUserID" placeholder="请选择客户">
+                  <!-- 客户资料列表 正常 -->
+                  <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
+                    {{ item.customername }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="销售方">
+                <span class="white">{{ getUserName() }}</span>
+              </a-form-item>
+            </a-col>
+          </template>
+          <template v-else>
+            <a-col :span="12">
+              <a-form-item label="采购方">
+                <span class="white">{{ getUserName() }}</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="销售方" name="SellUserID">
+                <a-select class="inlineFormSelect" v-model:value="formState.SellUserID" style="width: 200px" placeholder="请选择客户">
+                  <!-- 客户资料列表 正常 -->
+                  <a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
+                    {{ item.customername }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :span="12">
+            <a-form-item label="合同附件" name="ContractAttachment">
+              <UploadImg :visible="visible" :imgList="uploadImgList" @upload="uploadImgAction" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="交易主体" name="SubjectID">
+              <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.SubjectID" placeholder="请选择主体">
+                <a-select-option :value="item.subjectid" v-for="item in subjectList" :key="item.subjectid">
+                  {{ item.subjectname }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>现货信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="现货品种" name="DeliveryGoodsID">
+              <a-select class="inlineFormSelect" style="width: 200px" @change="deliveryGoodsChange" v-model:value="formState.DeliveryGoodsID" placeholder="请选择现货品种">
+                <a-select-option v-for="item in deliveryGoodsList" :key="item.deliverygoodsid" :value="item.deliverygoodsid">
+                  {{ item.deliverygoodsname }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="商品" name="WrStandardID">
+              <a-select class="inlineFormSelect" style="width: 200px" @change="WrStandardChange" v-model:value="formState.WrStandardID" placeholder="请选择商品">
+                <a-select-option v-for="item in gmlist" :key="item.wrstandardid" :value="item.wrstandardid">
+                  {{ item.wrstandardname }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="品牌" name="SpotGoodsBrandID">
+              <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.SpotGoodsBrandID" placeholder="请选择品牌">
+                <a-select-option v-for="item in gblist" :key="item.brandid" :value="item.brandid">
+                  {{ item.brandname }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="商品规格" name="SpotGoodsDesc">
+              <a-input class="dialogInput" style="width: 200px" v-model:value="formState.SpotGoodsDesc" placeholder="请输入商品规格" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>价格信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="定价类型" name="PriceType">
+              <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.PriceType" placeholder="请选择定价类型">
+                <a-select-option v-for="item in priceType" :key="item.key" :value="item.key">
+                  {{ item.value }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="结算币种" name="CurrencyID">
+              <a-select class="inlineFormSelect" v-model:value="formState.CurrencyID" style="width: 200px" placeholder="请选择结算币种">
+                <a-select-option v-for="item in payCurrency" :key="item.enumitemname" :value="item.enumitemname">
+                  {{ item.enumdicname }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="数量" name="Qty">
+              <a-input class="dialogInput suffixGrey" v-model:value="formState.Qty" style="width: 200px" @change="getAmout" placeholder="请输入数量" :suffix="numberUnit" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12" v-if="formState.PriceType === 3">
+            <a-form-item label="暂定价">
+              <a-input class="dialogInput suffixGrey" style="width: 200px" :suffix="payCurrencyUnit" placeholder="请输入暂定价" />
+            </a-form-item>
+          </a-col>
+          <!-- 以下是点价的价格信息 start -->
+          <template v-if="formState.PriceType === 2 || formState.PriceType === 3">
+            <a-col :span="12">
+              <a-form-item label="点价合约" name="GoodsID">
+                <a-select class="inlineFormSelect" v-model:value="formState.GoodsID" style="width: 200px" placeholder="请选择点价合约">
+                  <a-select-option v-for="item in goodsList" :key="item.goodsid" :value="item.goodsid">
+                    {{ item.goodsname }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="升贴水" name="PriceMove">
+                <a-input-number class="dialogInput suffixGrey" v-model:value="formState.PriceMove" placeholder="请输入升贴水" :min="0" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="点价期">
+                <a-range-picker v-model:value="priceDate" class="commonPicker" :disabled-date="disabledDate" style="width: 200px" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="交收期">
+                <a-range-picker v-model:value="deliveryDate" class="commonPicker" style="width: 200px" :disabled-date="disabledDate" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
+              </a-form-item>
+            </a-col>
+          </template>
+          <!-- 以上是点价的价格信息 end -->
+          <template v-if="formState.PriceType === 1">
+            <a-col :span="12">
+              <a-form-item label="价格" name="Price">
+                <a-input class="dialogInput suffixGrey" v-model:value="formState.Price" @change="getAmout" placeholder="请输入价格" :suffix="`${payCurrencyUnit}/${numberUnit}`" style="width: 200px" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="金额" class="relative" name="Amount">
+                <a-input class="dialogInput suffixGrey" v-model:value="formState.Amount" readonly placeholder="输入数量和价格后自动算" :suffix="payCurrencyUnit" style="width: 200px" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="交收期">
+                <a-range-picker v-model:value="deliveryDate" style="width: 200px" class="commonPicker" :disabled-date="disabledDate" :show-time="{ hideDisabledOptions: true }" format="YYYY-MM-DD" />
+              </a-form-item>
+            </a-col>
+          </template>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>其他信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="保证金" name="ContractMargin">
+              <a-input class="dialogInput suffixGrey" placeholder="请输入保证金" v-model:value="formState.ContractMargin" style="width: 200px" :suffix="payCurrencyUnit" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="业务员" name="SaleUserID">
+              <a-select class="inlineFormSelect" v-model:value="formState.SaleUserID" style="width: 200px" placeholder="请选择业务员">
+                <a-select-option v-for="item in businesserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="跟单员" name="MerUserID">
+              <a-select class="inlineFormSelect" v-model:value="formState.MerUserID" style="width: 200px" placeholder="请选择跟单员">
+                <a-select-option v-for="item in merchandiserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="交易用户" name="TradeUserID">
+              <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.TradeUserID" placeholder="请选择期货账户">
+                <a-select-option v-for="item in traderList" :key="item.roleid" :value="item.roleid">
+                  {{ item.rolename }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <a-form-item label="备注" name="Remark">
+              <a-input class="dialogInput" style="width: 608px" v-model:value="formState.Remark" placeholder="请输入备注" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+    </a-form>
+    <a-modal :visible="previewVisible" :footer="null" @cancel="cancelImg">
+      <img alt="预览附件" style="width: 100%" :src="previewImage" />
     </a-modal>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -272,13 +272,17 @@ export default defineComponent({
             type: Object as PropType<Ermcp3ContractRsp>,
             default: {},
         },
+        contractType: {
+            type: Number,
+            required: true,
+        },
     },
     components: { UploadImg },
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
         const loading = ref<boolean>(false);
         const { sendReq } = addContractReq();
-        const { formState, businessType } = handleFromState();
+        const { formState, businessType } = handleFromState(props.contractType);
         // 表单
         const formRef = ref();
 

src/views/information/spot-contract/components/setup.ts

@@ -69,11 +69,11 @@ export function orderContractOperateControl(reqs: SpotContractOperateReq, loadin
  * 新增和修改的表单数据
  * @returns
  */
-export function handleFromState() {
+export function handleFromState(contractType: number) {
     function initFormData() {
         return {
             ContractNo: '', // 现货合同编号
-            ContractType: 1, // int32 现货合同类型-1:采购-1:销售
+            ContractType: contractType, // int32 现货合同类型-1:采购-1:销售
             BizType: 1, // uint32 业务类型 - 1:套保 2:套利
             BuyUserID: undefined, // uint64 采购方ID
             SellUserID: undefined,// uint64 客户ID
@@ -212,7 +212,7 @@ export function handleContract(formState: UnwrapRef<FormState>) {
         { key: 1, value: '采购' },
         { key: -1, value: '销售' },
     ];
-    const isSell = ref<boolean>(false)  // true => 销售 false => 采购
+    const isSell = ref<boolean>(formState.ContractType === -1)  // true => 销售 false => 采购
     /**
      * 合同类型变更
      */

src/views/information/spot-contract/list/audit/index.vue

@@ -61,6 +61,7 @@ import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getTableButton } from '@/common/setup/table/button';
 import { useRoute } from 'vue-router';
+import moment from "moment"
 
 export default defineComponent({
     name: EnumRouterName.spot_contract_checkpending,
@@ -84,7 +85,11 @@ export default defineComponent({
         const queryTableAction = () => {
             switch (routeName) {
                 case 'contract_checkpending':
-                    queryTable(QuerySpotContract, { querytype: 2 });
+                    queryTable(QuerySpotContract, { querytype: 2 }).then((res)=>{
+                        tableList.value.sort((a,b)=>{
+                            return moment(b.createtime).valueOf()-moment(a.createtime).valueOf()
+                        })
+                    })
                     break;
                 case 'contract_performance':
                     queryTable(QuerySpotContract, { querytype: 3 });

src/views/information/spot-contract/list/purchase/index.vue

@@ -1,56 +1,56 @@
 <template>
-    <!-- 采购合同: 新增合同-已完结合同-->
-    <div class="spot-contract-not-commit" :loading="loading">
-        <filterCustomTable @search="updateColumn">
-            <mtp-table-button :buttons="firstBtn" @click="openComponent" />
-        </filterCustomTable>
-        <a-table :columns="columns" class="srcollYTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
-            <!-- 额外的展开行 -->
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="secondBtn" :record="record" @click="openComponent" />
-            </template>
-            <template #biztype="{ text }">
-                <a>{{ getBizTypeName(text) }}</a>
-            </template>
-            <template #pricetype="{ text }">
-                <span>{{ getPriceTypeName(text) }}</span>
-            </template>
-            <template #contracctstatus="{ text }">
-                <a>{{ getContractStatusName(text) }}</a>
-            </template>
-            <template #contracttype="{ text }">
-                <a>{{ getContractTypeName(text) }}</a>
-            </template>
-            <!-- 对手方 -->
-            <template #negative="{ record }">
-                <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
-            </template>
-            <!-- 点假期 -->
-            <template #startdate="{ record }">
-                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
-            </template>
-            <!-- 交收期 -->
-            <template #deliverystartdate="{ record }">
-                <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
-            </template>
-            <!-- 业务员 -->
-            <template #saleuserid="{ record }">
-                <span>{{ findManagerName(record.saleuserid) }}</span>
-            </template>
-            <!-- 跟单员 -->
-            <template #meruserid="{ record }">
-                <span>{{ findManagerName(record.meruserid) }}</span>
-            </template>
-            <!-- 合同量 -->
-            <template #qty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
+  <!-- 采购合同: 新增合同-已完结合同-->
+  <div class="spot-contract-not-commit" :loading="loading">
+    <filterCustomTable @search="updateColumn">
+      <mtp-table-button :buttons="firstBtn" @click="openComponent" />
+    </filterCustomTable>
+    <a-table :columns="columns" class="srcollYTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+      <!-- 额外的展开行 -->
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="handleBtnList(secondBtn,record)" :record="record" @click="openComponent" />
+      </template>
+      <template #biztype="{ text }">
+        <a>{{ getBizTypeName(text) }}</a>
+      </template>
+      <template #pricetype="{ text }">
+        <span>{{ getPriceTypeName(text) }}</span>
+      </template>
+      <template #contracctstatus="{ text }">
+        <a>{{ getContractStatusName(text) }}</a>
+      </template>
+      <template #contracttype="{ text }">
+        <a>{{ getContractTypeName(text) }}</a>
+      </template>
+      <!-- 对手方 -->
+      <template #negative="{ record }">
+        <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
+      </template>
+      <!-- 点假期 -->
+      <template #startdate="{ record }">
+        <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
+      </template>
+      <!-- 交收期 -->
+      <template #deliverystartdate="{ record }">
+        <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
+      </template>
+      <!-- 业务员 -->
+      <template #saleuserid="{ record }">
+        <span>{{ findManagerName(record.saleuserid) }}</span>
+      </template>
+      <!-- 跟单员 -->
+      <template #meruserid="{ record }">
+        <span>{{ findManagerName(record.meruserid) }}</span>
+      </template>
+      <!-- 合同量 -->
+      <template #qty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" :contractType="1" @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -63,6 +63,7 @@ import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getTableButton } from '@/common/setup/table/button';
+import { BtnListType } from '@/common/components/btnList/interface';
 import { useRoute } from 'vue-router';
 
 export default defineComponent({
@@ -73,7 +74,8 @@ export default defineComponent({
         detail: defineAsyncComponent(() => import('../../components/detail/index.vue')),
         add: defineAsyncComponent(() => import('../../components/add/index.vue')),
         resubmit: defineAsyncComponent(() => import('../../components/modify/index.vue')),
-        cancel: defineAsyncComponent(() => import('../../components/delete/index.vue')),
+        cancel: defineAsyncComponent(() => import('../../components/cancel/index.vue')),
+        delete: defineAsyncComponent(() => import('../../components/delete/index.vue')),
         MtpTableButton,
     },
     setup() {
@@ -89,23 +91,38 @@ export default defineComponent({
             switch (routeName) {
                 // 新增合同
                 case 'purchase_contract':
-                    queryTable(QuerySpotContract, { contracttype: 1 });
+                    queryTable(QuerySpotContract, { contracttype: 1, querytype: '1,2' });
                     break;
                 // 已完结合同
                 case 'purchase_finish':
-                    queryTable(QuerySpotContract, { contracttype: 1, querytype: 4 });
+                    queryTable(QuerySpotContract, { contracttype: 1, querytype: '4' });
                     break;
             }
             // 获取 业务账户
             queryBusinessManager();
         };
 
+        // 处理根据状态显示对应按钮
+        const handleBtnList = (btnList: BtnListType[], item: Ermcp3ContractRsp) => {
+            switch (item.contracctstatus) {
+                case 1: // 待审核
+                case 2: // 执行中
+                case 3: // 正常完结
+                case 5: // 异常完结
+                    return btnList.filter((e) => e.code !== 'delete');
+                case 6: // 已撤回
+                    return btnList.filter((e) => e.code !== 'cancel');
+                default:
+                    return btnList;
+            }
+        };
+
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
             menuType: EnumRouterName.spot_contract_unsubmitted,
             tableName: 'table_pcweb_delivery',
-            tableFilterKey: ['contracttype', 'pricetype', 'contractno'],
+            tableFilterKey: ['pricetype', 'contractno'],
             tableFilterCB,
             isDetail: true,
         };
@@ -124,6 +141,7 @@ export default defineComponent({
             handleEnumdic,
             firstBtn,
             secondBtn,
+            handleBtnList,
         };
     },
 });

src/views/information/spot-contract/list/sell/index.vue

@@ -1,56 +1,56 @@
 <template>
-    <!-- 销售合同: 新增合同-已完结合同-->
-    <div class="spot-contract-not-commit" :loading="loading">
-        <filterCustomTable @search="updateColumn">
-            <mtp-table-button :buttons="firstBtn" @click="openComponent" />
-        </filterCustomTable>
-        <a-table :columns="columns" class="srcollYTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
-            <!-- 额外的展开行 -->
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="secondBtn" :record="record" @click="openComponent" />
-            </template>
-            <template #biztype="{ text }">
-                <a>{{ getBizTypeName(text) }}</a>
-            </template>
-            <template #pricetype="{ text }">
-                <span>{{ getPriceTypeName(text) }}</span>
-            </template>
-            <template #contracctstatus="{ text }">
-                <a>{{ getContractStatusName(text) }}</a>
-            </template>
-            <template #contracttype="{ text }">
-                <a>{{ getContractTypeName(text) }}</a>
-            </template>
-            <!-- 对手方 -->
-            <template #negative="{ record }">
-                <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
-            </template>
-            <!-- 点假期 -->
-            <template #startdate="{ record }">
-                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
-            </template>
-            <!-- 交收期 -->
-            <template #deliverystartdate="{ record }">
-                <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
-            </template>
-            <!-- 业务员 -->
-            <template #saleuserid="{ record }">
-                <span>{{ findManagerName(record.saleuserid) }}</span>
-            </template>
-            <!-- 跟单员 -->
-            <template #meruserid="{ record }">
-                <span>{{ findManagerName(record.meruserid) }}</span>
-            </template>
-            <!-- 合同量 -->
-            <template #qty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
+  <!-- 销售合同: 新增合同-已完结合同-->
+  <div class="spot-contract-not-commit" :loading="loading">
+    <filterCustomTable @search="updateColumn">
+      <mtp-table-button :buttons="firstBtn" @click="openComponent" />
+    </filterCustomTable>
+    <a-table :columns="columns" class="srcollYTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+      <!-- 额外的展开行 -->
+      <!-- 额外的展开行 -->
+      <template #expandedRowRender="{ record }">
+        <mtp-table-button class="btn-list-sticky" :buttons="secondBtn" :record="record" @click="openComponent" />
+      </template>
+      <template #biztype="{ text }">
+        <a>{{ getBizTypeName(text) }}</a>
+      </template>
+      <template #pricetype="{ text }">
+        <span>{{ getPriceTypeName(text) }}</span>
+      </template>
+      <template #contracctstatus="{ text }">
+        <a>{{ getContractStatusName(text) }}</a>
+      </template>
+      <template #contracttype="{ text }">
+        <a>{{ getContractTypeName(text) }}</a>
+      </template>
+      <!-- 对手方 -->
+      <template #negative="{ record }">
+        <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
+      </template>
+      <!-- 点假期 -->
+      <template #startdate="{ record }">
+        <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
+      </template>
+      <!-- 交收期 -->
+      <template #deliverystartdate="{ record }">
+        <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
+      </template>
+      <!-- 业务员 -->
+      <template #saleuserid="{ record }">
+        <span>{{ findManagerName(record.saleuserid) }}</span>
+      </template>
+      <!-- 跟单员 -->
+      <template #meruserid="{ record }">
+        <span>{{ findManagerName(record.meruserid) }}</span>
+      </template>
+      <!-- 合同量 -->
+      <template #qty="{ text, record }">
+        <span>{{ handleEnumdic(text, record) }}</span>
+      </template>
+    </a-table>
+    <!-- 右键 -->
+    <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"> </contextMenu>
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" :contractType="-1" @cancel="closeComponent"></component>
+  </div>
 </template>
 
 <script lang="ts">
@@ -89,11 +89,11 @@ export default defineComponent({
             switch (routeName) {
                 // 新增合同
                 case 'sell_contract':
-                    queryTable(QuerySpotContract, { contracttype: -1, querytype: 1 });
+                    queryTable(QuerySpotContract, { contracttype: -1, querytype: '1,2' });
                     break;
                 // 已完结合同
                 case 'sell_finish':
-                    queryTable(QuerySpotContract, { contracttype: -1, querytype: 4 });
+                    queryTable(QuerySpotContract, { contracttype: -1, querytype: '4' });
                     break;
             }
             // 获取 业务账户

src/views/information/spot-contract/list/setup.ts

@@ -6,7 +6,7 @@ import { message } from 'ant-design-vue';
 import { ref } from 'vue';
 
 // 1-未提交 2-待审核 3-履约中 4-已完成
-type EnumType = 1 | 2 | 3 | 4;
+type EnumType = '1' | '2' | '3' | '4';
 
 /**
  * 获取表格列表数据

src/views/manage/business-review/components/somepriceDetail/index.vue

@@ -43,26 +43,26 @@
                     </a-col>
                     <a-col :span="12">
                         <a-form-item label="点价价格">
-                            <span class="white">{{ formatValue(selectedRow.pricedPrice) }}</span>
+                            <span class="white">{{ formatValue(selectedRow.pricedPrice)+'元/吨' }}</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.pricemove) }}</span>
+                            <span class="white">{{ formatValue(selectedRow.pricemove)+'元/吨' }}</span>
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
                         <a-form-item label="点价数量">
-                            <span class="white">{{ formatValue(selectedRow.pricedQty) }}</span>
+                            <span class="white">{{ formatValue(selectedRow.pricedQty)+'吨' }}</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.amount) }}</span>
+                            <span class="white">{{ formatValue(selectedRow.amount)+'元' }}</span>
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">

src/views/manage/business-review/list/someprice/index.vue

@@ -41,6 +41,8 @@ import { getTableButton } from '@/common/setup/table/button';
 import { QueryBusinessDj } from '@/services/go/ermcp/business-review';
 import { QryBusinessDjRsp } from '@/services/go/ermcp/business-review/interface';
 import { useRoute } from 'vue-router';
+import moment from "moment"
+
 
 export default defineComponent({
     name: 'business-review-dj',
@@ -66,11 +68,18 @@ export default defineComponent({
         const queryTableAction = () => {
             switch (routeName) {
                 case 'someprice_checkpending':
-                    queryTable(QueryBusinessDj, { applystatus: '1' });
+                    queryTable(QueryBusinessDj, { applystatus: '1' }).then(res => {
+                        tableList.value.sort((a,b)=>{
+                            return moment(b.audittime).valueOf()-moment(a.audittime).valueOf()
+                        })
+                    });
                     break;
                 case 'someprice_performance':
-                    queryTable(QueryBusinessDj, { applystatus: '2' });
-                    break;
+                    queryTable(QueryBusinessDj, { applystatus: '2' }).then(res => {
+                        tableList.value.sort((a,b)=>{
+                            return moment(b.audittime).valueOf()-moment(a.audittime).valueOf()
+                        })
+                    });
             }
         };
 
@@ -123,7 +132,6 @@ export default defineComponent({
                 return [];
             }
         }
-
         return {
             ...handleComposeTable<QryBusinessDjRsp>(param),
             handlePermissionBtn,

src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_swap/index.vue

@@ -145,9 +145,6 @@ export default defineComponent({
     display: inline-flex;
     padding-top: 4px;
     height: 34px;
-    .conditionSelect:first-child {
-        margin-right: 10px;
-    }
     .btnDeafault.ant-btn,
     .operBtn.ant-btn {
         height: 26px !important;
@@ -186,6 +183,7 @@ export default defineComponent({
         height: 26px !important;
         border: 1px solid @m-grey46 !important;
         .ant-calendar-picker-input.ant-input {
+
             height: 26px;
             line-height: 26px;
             &::placeholder {