Merge remote-tracking branch 'origin/master'

src/assets/styles/mixin.less

@@ -545,6 +545,14 @@
                 float: right;
                 color: @m-grey2;
             }
+            .backUnit {
+                position: absolute;
+                right: -20px;
+                top: -7px;
+                line-height: 32px;
+                height: 32px;
+                color: @m-grey2;
+            }
         }
     }
     .tc.ant-form-item {

src/common/constants/enumsName.ts

@@ -81,7 +81,7 @@ export function getStatusName(state: number): string {
  * 获取现货品种状态
  * @param type :未激活 1:正常
  */
-export function getValidName(type: number){
+export function getValidName(type: number) {
     let result = "--";
     switch (type) {
         case 0:
@@ -93,3 +93,116 @@ export function getValidName(type: number){
     }
     return result
 }
+
+/**
+ * 定价类型 - 1:一口价 2:点价 3:暂定价
+ * @param pricetype 定价类型
+ */
+export function getPriceTypeName(pricetype: number): string {
+    let result = "--";
+    switch (pricetype) {
+        case 1:
+            result = "一口价";
+            break
+        case 2:
+            result = "点价";
+            break
+        case 3:
+            result = "暂定价";
+            break
+    }
+    return result
+}
+
+/**
+ * 现货合同状态返回
+ * @param state
+ * //合同状态 - number;
+ //0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
+ */
+export function getContractStatusName(state: number): string {
+    let result = "--";
+    switch (state) {
+        case 0:
+            result = "未提交";
+            break;
+        case 1:
+            result = "待审核";
+            break
+        case 2:
+            result = "执行中";
+            break
+        case 3:
+            result = "正常完结";
+            break
+        case 4:
+            result = "审核拒绝";
+            break
+        case 5:
+            result = "异常完结";
+            break
+        case 6:
+            result = "已撤回";
+            break
+    }
+    return result
+}
+
+/**
+ * 业务类型返回 业务类型 1-套保 2-套利
+ * @param state
+ */
+export function getBizTypeName(state: number): string {
+    let result = "--";
+    switch (state) {
+        case 1:
+            result = "套保";
+            break
+        case 2:
+            result = "套利";
+            break
+    }
+    return result
+}
+
+/**
+ * 获取合同类型名称 现货合同类型 - 1:采购 -1:销售
+ */
+export function getContractTypeName(type: number): string {
+    let result = "--";
+    switch (type) {
+        case 1:
+            result = "采购"
+            break;
+        case -1:
+            result = "销售"
+            break;
+    }
+    return result
+}
+
+/**
+ * 业务审核-点价-状态
+ * @param type 申请状态 - 1:待审核 2:审核通过 3:审核拒绝 4:处理失败 5:已撤回
+ */
+export function getApplyStatusName(type: number): string {
+    let result = "--";
+    switch (type) {
+        case 1:
+            result = "待审核";
+            break
+        case 2:
+            result = "审核通过";
+            break
+        case 3:
+            result = "审核拒绝";
+            break
+        case 4:
+            result = "处理失败";
+            break
+        case 5:
+            result = "已撤回";
+            break
+    }
+    return result
+}

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

@@ -21,7 +21,7 @@
               :get-container="false"
               :wrap-style="{ position: 'absolute' }"
               @close="closeDrawer">
-      <div>
+      <div class="bottomTable">
         <a-table :columns="detailColumns"
                  class="topTable hiddenFirstCol"
                  :pagination="false"

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

@@ -43,12 +43,7 @@ import { getBtnList } from '@/common/setup/contextMenu/index';
 import contextMenu from '@/common/components/contextMenu/index.vue';
 import { getColumsAndSearch } from '../setup';
 import { QueryActualExposure, QueryActualExposureDetail, QueryAutualExposurePosition } from '@/services/go/ermcp/exposure/index';
-import {
-    ErmcpRealExposureModel,
-    Ermcp3ExposureDetail,
-    ErmcpExposurePostion,
-    ErmcpExposurePostionReq, Ermcp3ExposureReq
-} from '@/services/go/ermcp/exposure/interface';
+import { ErmcpRealExposureModel, Ermcp3ExposureDetail, ErmcpExposurePostion, ErmcpExposurePostionReq, Ermcp3ExposureReq } from '@/services/go/ermcp/exposure/interface';
 import { message } from 'ant-design-vue';
 import { handleTableEvent } from '@/common/setup/event/index';
 import ThridMenu from '@/common/components/thirdMenu/index.vue';
@@ -93,11 +88,11 @@ function handleDeatil(loading: Ref<boolean>, selectedRow: ErmcpRealExposureModel
     const detailColumns = ref<ColumnType[]>([]);
     // 切换明细
     function selectMenu(index: number) {
-        let tableKey: keyof TableKey = 'table_pcweb_exposure_spotposition';
+        let tableKey: keyof TableKey = 'table_pcweb_exposure_detail';
         if (index) {
-            AutualExposurePosition();
+            AutualExposurePosition(); // 现货明细
         } else {
-            ActualExposureDetail();
+            ActualExposureDetail(); // 期货明细
             tableKey = 'table_pcweb_exposure_futures_detail';
         }
         const { columns, getColumns } = getColumsAndSearch(tableKey, false);
@@ -109,9 +104,9 @@ function handleDeatil(loading: Ref<boolean>, selectedRow: ErmcpRealExposureModel
     function ActualExposureDetail() {
         loading.value = true;
         let param: Ermcp3ExposureReq = {
-            middlegoodsid: unref(selectedRow).MiddleGoodsID
-        }
-        if(undefined !== unref(selectedRow).MiddleGoodsID) {
+            middlegoodsid: unref(selectedRow).MiddleGoodsID,
+        };
+        if (undefined !== unref(selectedRow).MiddleGoodsID) {
             QueryActualExposureDetail(param)
                 .then((res) => {
                     detailTableList.value = res.map((e, i) => {
@@ -129,12 +124,12 @@ function handleDeatil(loading: Ref<boolean>, selectedRow: ErmcpRealExposureModel
     function AutualExposurePosition() {
         loading.value = true;
         let param: ErmcpExposurePostionReq = {
-            middlegoodsid: unref(selectedRow).MiddleGoodsID
-        }
-        if(undefined !== unref(selectedRow).MiddleGoodsID) {
+            middlegoodsid: unref(selectedRow).MiddleGoodsID,
+        };
+        if (undefined !== unref(selectedRow).MiddleGoodsID) {
             QueryAutualExposurePosition(param).then((res) => {
                 detailTableList.value = res.map((e, i) => {
-                    return {...e, key: String(i)};
+                    return { ...e, key: String(i) };
                 });
                 loading.value = false;
             });

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

@@ -21,7 +21,7 @@
               :get-container="false"
               :wrap-style="{ position: 'absolute' }"
               @close="closeDrawer">
-      <div>
+      <div class="bottomTable">
         <a-table :columns="detailColumns"
                  class="topTable hiddenFirstCol"
                  :pagination="false"

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

@@ -98,7 +98,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { formatValue } from '@/common/methods';
 import { Ermcp3SellBuyContract } from '@/services/go/ermcp/purchase/interface';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getPriceTypeName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'purchase_pending-detail',
@@ -114,7 +114,6 @@ export default defineComponent({
         const loading = ref<boolean>(false);
 
         function submit() {
-
             cancel();
         }
 

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

@@ -167,7 +167,7 @@ import { defineComponent, PropType, reactive, ref, unref, watch, watchEffect } f
 import { closeModal } from '@/common/setup/modal/index';
 import { formatValue, initData } from '@/common/methods';
 import { Ermcp3SellBuyContract } from '@/services/go/ermcp/purchase/interface';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getPriceTypeName } from '@/common/constants/enumsName';
 import { fundsReq } from '@/views/business/purchase/components/setup';
 import { handleForm } from './setup';
 

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

@@ -132,7 +132,7 @@ import { defineComponent, PropType, reactive, ref, unref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { formatValue } from '@/common/methods';
 import { Ermcp3SellBuyContract } from '@/services/go/ermcp/purchase/interface';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getPriceTypeName } from '@/common/constants/enumsName';
 import { operationContractReq } from '@/services/proto/contract';
 import { message } from 'ant-design-vue';
 import { objectToUint8Array } from '@/utils/objHandle';

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

@@ -301,7 +301,7 @@ import { defineComponent, PropType, ref, unref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { formatValue } from '@/common/methods';
 import { Ermcp3SellBuyContract } from '@/services/go/ermcp/purchase/interface';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getPriceTypeName } from '@/common/constants/enumsName';
 import { settlementReq } from '@/views/business/purchase/components/setup';
 import { SettlementReq } from '@/services/proto/contract/interface';
 import { handleForm } from './setup';
@@ -321,32 +321,32 @@ export default defineComponent({
         const { rules, formState, formRef, checkedObj } = handleForm();
         function submit() {
             const wrapEl = unref(formRef);
-            wrapEl.validate().then((nameList:any) => {
+            wrapEl.validate().then((nameList: any) => {
                 delete nameList.IsChecked;
-                const param: SettlementReq =  {};
-                const {ReckonRealQty, ReckonOtherAmount, AddMargin, ReckonAdjustAmount, DecMargin, Remark } = formState
+                const param: SettlementReq = {};
+                const { ReckonRealQty, ReckonOtherAmount, AddMargin, ReckonAdjustAmount, DecMargin, Remark } = formState;
                 // 交收量
-                if(ReckonRealQty) {
-                  param.ReckonRealQty = ReckonRealQty
+                if (ReckonRealQty) {
+                    param.ReckonRealQty = ReckonRealQty;
                 }
-                 // 其它费用
-                if(ReckonOtherAmount) {
-                  param.ReckonOtherAmount = ReckonOtherAmount
+                // 其它费用
+                if (ReckonOtherAmount) {
+                    param.ReckonOtherAmount = ReckonOtherAmount;
                 }
                 // 追加保证金
-                if(AddMargin) {
-                  param.AddMargin = AddMargin
+                if (AddMargin) {
+                    param.AddMargin = AddMargin;
                 }
                 // 减少保证金
-                if(DecMargin) {
-                  param.DecMargin = DecMargin
+                if (DecMargin) {
+                    param.DecMargin = DecMargin;
                 }
-                // 调整金额 
-                if(ReckonAdjustAmount) {
-                  param.ReckonAdjustAmount = ReckonAdjustAmount
+                // 调整金额
+                if (ReckonAdjustAmount) {
+                    param.ReckonAdjustAmount = ReckonAdjustAmount;
                 }
-                if(Remark) {
-                  param.Remark = Remark
+                if (Remark) {
+                    param.Remark = Remark;
                 }
                 // const params: SettlementReq = checkedObj.value.adjustMargin === 1?{
                 //     ReckonRealQty: formState.ReckonRealQty!, // 交收量

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

@@ -153,7 +153,7 @@ import { defineComponent, PropType, reactive, ref, unref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { formatValue } from '@/common/methods';
 import { Ermcp3SellBuyContract } from '@/services/go/ermcp/purchase/interface';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getPriceTypeName } from '@/common/constants/enumsName';
 import { SomePriceReq } from '@/services/proto/contract/interface';
 import { somePriceReq } from '@/views/business/purchase/components/setup';
 import { handleForm } from './setup';

src/views/business/purchase/setup.ts

@@ -1,24 +1,5 @@
-import {ResultInfo} from "@/common/methods/request";
+import { ResultInfo } from "@/common/methods/request";
 
-/**
- * 定价类型 - 1:一口价 2:点价 3:暂定价
- * @param pricetype 定价类型
- */
-export function getPriceTypeName(pricetype: number): string {
-    let result = "--";
-    switch (pricetype) {
-        case 1:
-            result = "一口价";
-            break
-        case 2:
-            result = "点价";
-            break
-        case 3:
-            result = "暂定价";
-            break
-    }
-    return result
-}
 
 /************** 接口相关提示 **************** /
  *

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 采购详情-->
-  <a-modal  class="commonModal paddingDialog purchase-detail"
+  <a-modal class="commonModal paddingDialog purchase-detail"
            title="详情"
            v-model:visible="visible"
            @cancel="cancel"
@@ -12,92 +12,92 @@
                 :loading="loading"
                 @click="submit">关闭</a-button>
     </template>
-      <fieldset class="formFieldSet">
-          <legend>合同基本信息</legend>
-          <a-form class="inlineForm">
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="合同编号">
-                          <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="合同类型">
-                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="销售方">
-                          <span class="white">{{ formatValue(selectedRow.enumdicname) }}</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-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="点价合约">
-                          <span class="white">{{ formatValue(selectedRow.goodsname) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-          </a-form>
-      </fieldset>
-      <fieldset class="formFieldSet">
-          <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">{{ formatValue(selectedRow.pricedavg) }}</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">{{ formatValue(selectedRow.pricemove) }}</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">{{ formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="销售方">
+              <span class="white">{{ formatValue(selectedRow.enumdicname) }}</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-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="点价合约">
+              <span class="white">{{ formatValue(selectedRow.goodsname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </fieldset>
+    <fieldset class="formFieldSet">
+      <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">{{ formatValue(selectedRow.pricedavg) }}</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">{{ formatValue(selectedRow.pricemove) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </fieldset>
   </a-modal>
 </template>
 
 <script lang="ts">
-import {defineComponent, PropType, ref} from 'vue';
+import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import {formatValue} from "@/common/methods";
-import {getPriceTypeName} from "@/views/business/purchase/setup";
-import {Ermcp3SellBuyContract} from "@/services/go/ermcp/purchase/interface";
+import { formatValue } from '@/common/methods';
+import { getPriceTypeName } from '@/common/constants/enumsName';
+import { Ermcp3SellBuyContract } from '@/services/go/ermcp/purchase/interface';
 
 export default defineComponent({
     name: 'sell-detail',

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

@@ -167,7 +167,7 @@ import { defineComponent, PropType, reactive, ref, unref, watch, watchEffect } f
 import { closeModal } from '@/common/setup/modal/index';
 import { formatValue, initData } from '@/common/methods';
 import { Ermcp3SellBuyContract } from '@/services/go/ermcp/purchase/interface';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getPriceTypeName } from '@/common/constants/enumsName';
 import { fundsReq } from '@/views/business/purchase/components/setup';
 import { handleForm } from './setup';
 

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

@@ -131,7 +131,7 @@
 import { defineComponent, PropType, ref, unref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { Ermcp3SellBuyContract } from '@/services/go/ermcp/purchase/interface';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getPriceTypeName } from '@/common/constants/enumsName';
 import { formatValue } from '@/common/methods';
 import { handleForm } from '@/views/business/purchase/components/invoice/setup';
 import { InvoiceReq } from '@/services/proto/contract/interface';

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

@@ -297,14 +297,14 @@
 </template>
 
 <script lang="ts">
-import {defineComponent, PropType, ref, unref} from 'vue';
+import { defineComponent, PropType, ref, unref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import {Ermcp3SellBuyContract} from "@/services/go/ermcp/purchase/interface";
-import {SettlementReq} from "@/services/proto/contract/interface";
-import {settlementReq} from "@/views/business/purchase/components/setup";
-import {handleForm} from "@/views/business/purchase/components/settlement/setup";
-import {formatValue} from "@/common/methods";
-import {getPriceTypeName} from "@/views/business/purchase/setup";
+import { Ermcp3SellBuyContract } from '@/services/go/ermcp/purchase/interface';
+import { SettlementReq } from '@/services/proto/contract/interface';
+import { settlementReq } from '@/views/business/purchase/components/setup';
+import { handleForm } from '@/views/business/purchase/components/settlement/setup';
+import { formatValue } from '@/common/methods';
+import { getPriceTypeName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'sell_pending_settlement',
@@ -321,32 +321,32 @@ export default defineComponent({
         const { rules, formState, formRef, checkedObj } = handleForm();
         function submit() {
             const wrapEl = unref(formRef);
-            wrapEl.validate().then((nameList:any) => {
+            wrapEl.validate().then((nameList: any) => {
                 delete nameList.IsChecked;
-                 const param: SettlementReq =  {};
-                const {ReckonRealQty, ReckonOtherAmount, AddMargin, ReckonAdjustAmount, DecMargin, Remark } = formState
+                const param: SettlementReq = {};
+                const { ReckonRealQty, ReckonOtherAmount, AddMargin, ReckonAdjustAmount, DecMargin, Remark } = formState;
                 // 交收量
-                if(ReckonRealQty) {
-                  param.ReckonRealQty = ReckonRealQty
+                if (ReckonRealQty) {
+                    param.ReckonRealQty = ReckonRealQty;
                 }
-                 // 其它费用
-                if(ReckonOtherAmount) {
-                  param.ReckonOtherAmount = ReckonOtherAmount
+                // 其它费用
+                if (ReckonOtherAmount) {
+                    param.ReckonOtherAmount = ReckonOtherAmount;
                 }
                 // 追加保证金
-                if(AddMargin) {
-                  param.AddMargin = AddMargin
+                if (AddMargin) {
+                    param.AddMargin = AddMargin;
                 }
                 // 减少保证金
-                if(DecMargin) {
-                  param.DecMargin = DecMargin
+                if (DecMargin) {
+                    param.DecMargin = DecMargin;
                 }
-                // 调整金额 
-                if(ReckonAdjustAmount) {
-                  param.ReckonAdjustAmount = ReckonAdjustAmount
+                // 调整金额
+                if (ReckonAdjustAmount) {
+                    param.ReckonAdjustAmount = ReckonAdjustAmount;
                 }
-                if(Remark) {
-                  param.Remark = Remark
+                if (Remark) {
+                    param.Remark = Remark;
                 }
                 // const params: SettlementReq = checkedObj.value.adjustMargin === 1?{
                 //     ReckonRealQty: formState.ReckonRealQty!, // 交收量

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

@@ -7,156 +7,156 @@
            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>
+      <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="定价.
+    <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-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="点价合约">
-                          <span class="white">{{ formatValue(selectedRow.goodsname) + selectedRow.currencyname }}</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">{{ formatValue(selectedRow.pricedavg)  + selectedRow.currencyname }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-          </a-form>
-      </fieldset>
-      <fieldset class="formFieldSet">
-          <legend>本次点价信息</legend>
-          <a-form class="inlineForm"
-                  ref="formRef"
-                  :model="formState"
-                  :rules="rules">
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="点价价格"
-                                   name="PricedPrice">
-                          <a-input-number class="dialogInput"
-                                          style="width: 200px"
-                                          v-model:value="formState.PricedPrice"
-                                          :min="0"
-                                          placeholder="请输入点价价格" />
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="升贴水">
-                          <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
+              <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-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="点价合约">
+              <span class="white">{{ formatValue(selectedRow.goodsname) + selectedRow.currencyname }}</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">{{ formatValue(selectedRow.pricedavg)  + selectedRow.currencyname }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </fieldset>
+    <fieldset class="formFieldSet">
+      <legend>本次点价信息</legend>
+      <a-form class="inlineForm"
+              ref="formRef"
+              :model="formState"
+              :rules="rules">
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="点价价格"
+                         name="PricedPrice">
+              <a-input-number class="dialogInput"
+                              style="width: 200px"
+                              v-model:value="formState.PricedPrice"
+                              :min="0"
+                              placeholder="请输入点价价格" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="升贴水">
+              <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
 
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="商品价格">
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="商品价格">
               <span class="white">{{
                       Number(selectedRow.pricemove) + Number(formState.PricedPrice)
                   }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="点价数量"
-                                   class="relative"
-                                   name="PricedQty">
-                          <a-input-number class="dialogInput"
-                                          style="width: 200px"
-                                          v-model:value="formState.PricedQty"
-                                          :min="0"
-                                          :max="selectedRow.unpricedqty"
-                                          placeholder="请输入点价数量" />
-                          <div class="tip mt10">
-                              <span>未定价量<span class="white">{{ selectedRow.unpricedqty }}{{ selectedRow.enumdicname }}</span> </span>
-                              <a class="blue ml10"
-                                 @click="formState.PricedQty = selectedRow.unpricedqty"> 全部登记</a>
-                          </div>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="点价数量"
+                         class="relative"
+                         name="PricedQty">
+              <a-input-number class="dialogInput"
+                              style="width: 200px"
+                              v-model:value="formState.PricedQty"
+                              :min="0"
+                              :max="selectedRow.unpricedqty"
+                              placeholder="请输入点价数量" />
+              <div class="tip mt10">
+                <span>未定价量<span class="white">{{ selectedRow.unpricedqty }}{{ selectedRow.enumdicname }}</span> </span>
+                <a class="blue ml10"
+                   @click="formState.PricedQty = selectedRow.unpricedqty"> 全部登记</a>
+              </div>
+            </a-form-item>
+          </a-col>
+        </a-row>
 
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="点价金额">
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="点价金额">
               <span class="white">{{
                       (Number(selectedRow.pricemove) + Number(formState.PricedPrice)) * formState.PricedQty
                   }}{{selectedRow.currencyname}}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-          </a-form>
-      </fieldset>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </fieldset>
   </a-modal>
 </template>
 
 <script lang="ts">
-import {defineComponent, PropType, ref, unref} from 'vue';
+import { defineComponent, PropType, ref, unref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import {Ermcp3SellBuyContract} from "@/services/go/ermcp/purchase/interface";
-import {SomePriceReq} from "@/services/proto/contract/interface";
-import {somePriceReq} from "@/views/business/purchase/components/setup";
-import {handleForm} from "@/views/business/purchase/components/someprice/setup";
-import {formatValue} from "@/common/methods";
-import {getPriceTypeName} from "@/views/business/purchase/setup";
+import { Ermcp3SellBuyContract } from '@/services/go/ermcp/purchase/interface';
+import { SomePriceReq } from '@/services/proto/contract/interface';
+import { somePriceReq } from '@/views/business/purchase/components/setup';
+import { handleForm } from '@/views/business/purchase/components/someprice/setup';
+import { formatValue } from '@/common/methods';
+import { getPriceTypeName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'sell_pending_someprice',
@@ -167,7 +167,7 @@ export default defineComponent({
             default: {},
         },
     },
-    setup(props , context) {
+    setup(props, context) {
         const { visible, cancel } = closeModal('sell_pending_someprice');
         const loading = ref<boolean>(false);
         const { rules, formState, formRef } = handleForm();

src/views/information/account_info/list/setup.ts

@@ -44,7 +44,7 @@ export function getRoleTypeName(type: number) {
     let result = '--'
     switch (type) {
         case 1:
-            result = '启用'
+            result = '正常'
             break;
         case 2:
             result = '停用'

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

@@ -4,6 +4,7 @@
            title="修改套保品种"
            v-if="visible"
            v-model:visible="visible"
+           :loading="loading"
            centered
            :maskClosable="maskClosableFlag"
            @cancel="cancel"
@@ -14,51 +15,55 @@
                 :loading="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="套保品种名称">
-              <span class="white">{{selctedMG.mg.middlegoodsname}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="单位">
-              <span class="white">{{getGoodsUnitEnumItemName(selctedMG.mg.goodsunitid)}}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="当前套保比例">
-              <span class="white">{{(selctedMG.mg.needhedgeratio * 100).toFixed(2)}}%</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="修改后套保比例"
-                         name="needhedgeratio">
-              <a-input-number class="dialogInput"
-                              style="width: 200px"
-                              type="number"
-                              placeholder="请输入套保比例"
-                              v-model:value="formState.needhedgeratio" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>其他信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <a-form-item label="备注">
-              <span class="white">{{selctedMG.mg.remark}}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
-    </a-form>
+    <a-spin :spinning="loading">
+      <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="套保品种名称">
+                <span class="white">{{selctedMG.mg.middlegoodsname}}</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="单位">
+                <span class="white">{{getGoodsUnitEnumItemName(selctedMG.mg.goodsunitid)}}</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="当前套保比例">
+                <span class="white">{{(selctedMG.mg.needhedgeratio * 100).toFixed(2)}}%</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="修改后套保比例"
+                           name="needhedgeratio"
+                           class="relative">
+                <a-input-number class="dialogInput"
+                                style="width: 200px"
+                                type="number"
+                                placeholder="请输入套保比例"
+                                v-model:value="formState.needhedgeratio" />
+                                <div class="backUnit">%</div>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </fieldset>
+        <fieldset class="formFieldSet">
+          <legend>其他信息</legend>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="备注">
+                <span class="white">{{selctedMG.mg.remark}}</span>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </fieldset>
+      </a-form>
+    </a-spin>
   </a-modal>
 </template>
 
@@ -103,7 +108,7 @@ export default defineComponent({
                     qtydecimalplace, // int32 数量小数位
                     // modifierid,// uint64 修改人
                     relatedgoodstype, // int32 关联商品类型 - 1:期货合约 2:现货品种
-                    needhedgeratio: formState.needhedgeratio as number, // double 套保比率
+                    needhedgeratio: (formState.needhedgeratio as number) / 100, // double 套保比率
                     // areauserid?,// uint64 机构用户ID
                     goodsgroupid, // uint64 关联期货品种ID
                     remark, // string 备注

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

@@ -135,7 +135,8 @@
       </a-collapse>
     </div>
     <HedgingDetail :selctedMG="selctedMG" />
-    <HedgingModify :selctedMG="selctedMG" />
+    <HedgingModify @refresh="refresh"
+                   :selctedMG="selctedMG" />
 
   </div>
 </template>
@@ -177,9 +178,11 @@ export default defineComponent({
         }
 
         const { forDataBtn } = handleBtnList(list, 'goods_info_hedge_normal', true);
-
+        function refresh() {
+            context.emit('refresh');
+        }
         initData(() => {});
-        return { getGoodsUnitEnumItemName, forDataBtn };
+        return { getGoodsUnitEnumItemName, forDataBtn, refresh };
     },
 });
 </script>

src/views/information/goods/list/hedging-variety/index.vue

@@ -12,7 +12,9 @@
       </div>
       <div class="rightCont">
         <RightHedging :selctedMG="selctedMG"
-                      :isNormal="isNormal"></RightHedging>
+                      @refresh="updateDG"
+                      :isNormal="isNormal">
+        </RightHedging>
       </div>
     </div>
   </div>
@@ -37,23 +39,23 @@ export default defineComponent({
         AddGoods,
     },
     setup() {
-        const { loading, menuList, isNormal, selctedMG, queryMG, chooseDG } = handleMG();
+        const { loading, menuList, isNormal, selctedMG, queryMG, chooseDG, updateDG } = handleMG();
 
         initData(() => {
             // 加载数据在这里
             queryMG();
         });
-        return { loading, selctedMG, chooseDG, isNormal, menuList };
+        return { loading, selctedMG, chooseDG, isNormal, menuList, updateDG };
     },
 });
 </script>
 
 <style lang="less">
 .hedging-variety {
-  height: 100%;
-  .flex;
-  flex-direction: column;
-  .spotTableCont {
+    height: 100%;
+    .flex;
+    flex-direction: column;
+    .spotTableCont {
         width: 100%;
         height: calc(100% - 45px);
         overflow-y: auto;

src/views/information/goods/list/hedging-variety/setup.ts

@@ -42,37 +42,53 @@ export function handleMG() {
     // 选中的具体某一天套保品种数据
     const selctedMG = reactive<Ermcp3MiddleGoodsDetailEx>(initMG())
     const isNormal = ref<boolean>(true) // true => 正常； false => 停用
-    // 获取套保品种数据
-    function queryMG(param?: number) {
+    function getMG(param?: number) {
         loading.value = true;
-        QueryMiddleGoodsDetail(param).then(res => {
+        return QueryMiddleGoodsDetail(param).then(res => {
+            MGList.value.length = 0;
             MGList.value = res;
-            res.forEach(e => {
-                const { isvalid, middlegoodsname, middlegoodsid } = e.mg
-                const normal = 'goods_info_hedge_normal', disable = 'goods_info_hedge_disable';
-                const result = { key: middlegoodsid.toString(), title: middlegoodsname }
-                if (isvalid) { //1-有效(正常)
-                    if (menuMap.has(normal)) {
-                        const index = menuMap.get(normal) as number;
-                        menuList.value[index].children?.push(result)
-                    }
-                } else {    // 0:无效(停用)
-                    if (menuMap.has(disable)) {
-                        const index = menuMap.get(disable) as number;
-                        menuList.value[index].children?.push(result)
-                    }
-                }
-            })
-            // 获取默认第一条数据
-            if (menuList.value[0].children?.length) {
-                chooseDG({ key: menuList.value[0].children[0].key, is: true })
-            } else if (menuList.value[1].children?.length) {
-                chooseDG({ key: menuList.value[1].children[0].key, is: false })
-            }
         }).catch(err => {
             message.error(err)
         }).finally(() => loading.value = false)
     }
+    // 获取套保品种数据
+    async function queryMG(param?: number) {
+        await getMG(param)
+        classfiyMG()
+        // 获取默认第一条数据
+        getFirstData()
+    }
+    function classfiyMG() {
+        menuList.value.forEach(el => {
+            if (el.children) {
+                el.children.length = 0
+            }
+        });
+        MGList.value.forEach(e => {
+            const { isvalid, middlegoodsname, middlegoodsid } = e.mg
+            const normal = 'goods_info_hedge_normal', disable = 'goods_info_hedge_disable';
+            const result = { key: middlegoodsid.toString(), title: middlegoodsname }
+            if (isvalid) { //1-有效(正常)
+                if (menuMap.has(normal)) {
+                    const index = menuMap.get(normal) as number;
+                    menuList.value[index].children?.push(result)
+                }
+            } else {    // 0:无效(停用)
+                if (menuMap.has(disable)) {
+                    const index = menuMap.get(disable) as number;
+                    menuList.value[index].children?.push(result)
+                }
+            }
+        })
+    }
+    function getFirstData() {
+        // 获取默认第一条数据
+        if (menuList.value[0].children?.length) {
+            chooseDG({ key: menuList.value[0].children[0].key, is: true })
+        } else if (menuList.value[1].children?.length) {
+            chooseDG({ key: menuList.value[1].children[0].key, is: false })
+        }
+    }
     interface Value {
         key: string;
         is: boolean;
@@ -83,8 +99,17 @@ export function handleMG() {
         const obj = MGList.value.find(e => e.mg.middlegoodsid === Number(key))
         if (obj) {
             mergeObj(selctedMG, obj)
-            console.log('selctedMG', selctedMG);
         }
     }
-    return { loading, menuList, isNormal, selctedMG, queryMG, chooseDG }
+    /**
+ * 更新数据
+ */
+    function updateDG(param?: number) {
+        getMG(param).then(() => {
+            classfiyMG()
+            const findResult = MGList.value.find(e => e.mg.middlegoodsid === selctedMG.mg.middlegoodsid)
+            findResult && mergeObj(selctedMG, findResult)
+        })
+    }
+    return { loading, menuList, isNormal, selctedMG, queryMG, chooseDG, updateDG }
 }

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

@@ -232,7 +232,7 @@
 <script lang="ts">
 import { defineComponent, PropType, ref, toRaw, watchEffect } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { formatTime, formatValue } from '@/common/methods';
 import { orderContractControl, orderContractOperateControl } from '@/views/information/spot-contract/components/setup';
@@ -279,7 +279,6 @@ export default defineComponent({
                     okText: '审核通过',
                     cancelText: '取消',
                     onOk() {
-
                         // 为什么不删 因为以后可能又改回来
                         // const reqParam: SpotContractOperateReq = {
                         //     SpotContractID: props.selectedRow.spotcontractid,
@@ -306,7 +305,7 @@ export default defineComponent({
                                 TradeUserID: param.TradeUserID as number, //  交易员ID
                                 Remark: param.Remark,
                                 UserID: getUserId(),
-                                CurrencyID: props.selectedRow.currencyid,  // 币种id
+                                CurrencyID: props.selectedRow.currencyid, // 币种id
                             },
                         };
                         // Fixme 6/4 代码修改

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

@@ -70,7 +70,7 @@ import { QueryAreaStockApply } from '@/services/go/ermcp/inventory-review';
 import { QueryChangeLog } from '@/services/go/ermcp/spot-contract';
 import { ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
 import InfoDetail from '../infoDetail/index.vue';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
+import { getApplyStatusName } from '@/common/constants/enumsName';
 import { getTableColumns } from '@/common/setup/table';
 import { invoiceStatusName } from '@/views/manage/finance-review/setup';
 import { getPlanContractType } from '@/views/business/plan/setup';

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

@@ -169,7 +169,7 @@
 import { defineComponent, PropType, ref } from 'vue';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { formatTime, formatValue } from '@/common/methods';
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 import { handlerManagerList } from '@/common/setup/user';
 import { ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
 import { handlePreviewImg } from '@/common/setup/upload';

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

@@ -79,7 +79,7 @@
 import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
 import { AddSpotContract, SpotContractDeatil, Check, Cancel, filterCustomTable } from '../../components';
 import { queryTableList, Ermcp3ContractRsp } from '../index';
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 import { Column, ColumnType } from '@/common/setup/table';
 import { formatTime, formatValue } from '@/common/methods';
 import { handlerManagerList } from '@/common/setup/user';

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

@@ -73,7 +73,7 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 import { SpotContractDeatil, filterCustomTable } from '../../components';
 
 import { queryTableList, Ermcp3ContractRsp } from '../index';
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 import { Column, ColumnType } from '@/common/setup/table';
 import { formatTime, formatValue } from '@/common/methods';
 import { handlerManagerList } from '@/common/setup/user';

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

@@ -76,7 +76,7 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 import { AddSpotContract, SpotContractDeatil, filterCustomTable, Finish } from '../../components';
 
 import { queryTableList, Ermcp3ContractRsp } from '../index';
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 import { Column, ColumnType } from '@/common/setup/table';
 import { formatTime, formatValue } from '@/common/methods';
 import { handlerManagerList } from '@/common/setup/user';

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

@@ -81,11 +81,11 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 import { AddSpotContract, SpotContractDeatil, filterCustomTable, ModifySpotContract, DeleteSpotContract } from '../../components';
 
 import { queryTableList, Ermcp3ContractRsp } from '../index';
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 import { Column, ColumnType } from '@/common/setup/table';
 import { formatTime, formatValue } from '@/common/methods';
 import { handlerManagerList } from '@/common/setup/user';
 import { reactive } from '@vue/reactivity';
+import { getPriceTypeName, getBizTypeName, getContractStatusName, getContractTypeName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'spot-contract-not-commit',

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

@@ -1,91 +1,4 @@
-/**
- * 现货合同状态返回
- * @param state
- * //合同状态 - number;
- //0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
- */
-import {ResultInfo} from "@/common/methods/request/interface";
-
-export function getContractStatusName(state: number): string {
-    let result = "--";
-    switch (state) {
-        case 0:
-            result = "未提交";
-            break;
-        case 1:
-            result = "待审核";
-            break
-        case 2:
-            result = "执行中";
-            break
-        case 3:
-            result = "正常完结";
-            break
-        case 4:
-            result = "审核拒绝";
-            break
-        case 5:
-            result = "异常完结";
-            break
-        case 6:
-            result = "已撤回";
-            break
-    }
-    return result
-}
-
-/**
- * 定价类型返回 - 1:一口价 2:点价 3:暂定价
- * @param state
- */
-export function getPriceTypeName(state: number): string {
-    let result = "--";
-    switch (state) {
-        case 1:
-            result = "一口价";
-            break
-        case 2:
-            result = "点价";
-            break
-        case 3:
-            result = "暂定价";
-            break
-    }
-    return result
-}
-
-/**
- * 业务类型返回 业务类型 1-套保 2-套利
- * @param state
- */
-export function getBizTypeName(state: number): string {
-    let result = "--";
-    switch (state) {
-        case 1:
-            result = "套保";
-            break
-        case 2:
-            result = "套利";
-            break
-    }
-    return result
-}
-
-/**
- * 获取合同类型名称 现货合同类型 - 1:采购 -1:销售
- */
-export function getContractTypeName(type: number): string{
-    let result = "--";
-    switch (type){
-        case 1:
-            result = "采购"
-            break;
-        case -1:
-            result = "销售"
-            break;
-    }
-    return result
-}
+import { ResultInfo } from "@/common/methods/request/interface";
 
 /**
  * 获取对手方名称
@@ -93,9 +6,9 @@ export function getContractTypeName(type: number): string{
  * @param buyName 买方
  * @param sellName 卖方
  */
-export function getAnalogueName(type: number, buyName: string, sellName: string){
+export function getAnalogueName(type: number, buyName: string, sellName: string) {
     let result = "--";
-    switch (type){
+    switch (type) {
         case 1:
             result = sellName
             break;

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

@@ -69,12 +69,12 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
-              <a-form-item label="调整保证金">
+            <a-form-item label="调整保证金">
               <span class="white">{{
                                   formatValue(selectedRow.addmargin !== 0 && selectedRow.addmargin !== undefined ?
                   "+" + formatValue(selectedRow.addmargin) : (selectedRow.decmargin === 0 ? 0.0 : "-" + formatValue(selectedRow.decmargin)))
                               }}</span>
-              </a-form-item>
+            </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="调整金额">
@@ -111,7 +111,7 @@ import { Modal } from 'ant-design-vue';
 import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
 import Long from 'long';
 import { somePriceControl } from '@/views/manage/business-review/components/setup';
-import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 import { isShowContractCheck } from '@/views/manage/inventory-review/setup';
 
 export default defineComponent({

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

@@ -67,12 +67,12 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
-              <a-form-item label="调整保证金">
+            <a-form-item label="调整保证金">
               <span class="white">{{
                                   formatValue(selectedRow.addmargin !== 0 && selectedRow.addmargin !== undefined ?
                   "+" + formatValue(selectedRow.addmargin) : (selectedRow.decmargin === 0 ? 0.0 : "-" + formatValue(selectedRow.decmargin)))
                               }}</span>
-              </a-form-item>
+            </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="调整金额">
@@ -105,7 +105,7 @@ import { mergeObj } from '@/utils/objHandle';
 import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { QryBussinessJsRsp } from '@/services/go/ermcp/business-review/interface';
-import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 import { Modal } from 'ant-design-vue';
 import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
 import Long from 'long';

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

@@ -94,7 +94,7 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { mergeObj } from '@/utils/objHandle';
 import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
-import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 import { QryBusinessDjRsp, QryBussinessJsRsp } from '@/services/go/ermcp/business-review/interface';
 
 export default defineComponent({
@@ -115,7 +115,7 @@ export default defineComponent({
             }
         });
         function submit() {
-            console.log(props.selectedRow.addmargin)
+            console.log(props.selectedRow.addmargin);
             context.emit('refresh');
             cancel();
         }

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

@@ -112,7 +112,7 @@ import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getPriceTypeName } from '@/common/constants/enumsName';
 import { Modal } from 'ant-design-vue';
 import { somePriceControl } from '@/views/manage/business-review/components/setup';
 import { ContractOperateApplyReq } from '@/services/proto/contract/interface';

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

@@ -107,7 +107,7 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { mergeObj } from '@/utils/objHandle';
 import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
-import { getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getPriceTypeName } from '@/common/constants/enumsName';
 import { QryBusinessDjRsp } from '@/services/go/ermcp/business-review/interface';
 import { Modal } from 'ant-design-vue';
 import { ContractOperateApplyReq } from '@/services/proto/contract/interface';

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

@@ -1,107 +1,107 @@
 <template>
-    <!-- 点价记录详情-->
-    <a-modal class="add-custom custom-detail"
-             title="点价记录详情"
-             v-model:visible="visible"
-             centered
-             :maskClosable="maskClosableFlag"
-             @cancel="cancel"
-             width="890px">
-        <template #footer>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading"
-                      @click="submit">关闭
-            </a-button>
-        </template>
+  <!-- 点价记录详情-->
+  <a-modal class="add-custom custom-detail"
+           title="点价记录详情"
+           v-model:visible="visible"
+           centered
+           :maskClosable="maskClosableFlag"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">关闭
+      </a-button>
+    </template>
 
-        <a-form class="inlineForm"
-                :form="form"
-                @submit="handleSearch">
-            <fieldset class="formFieldSet">
-                <legend>合同基本信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="合同编号">
-                            <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="点价类型">
-                            <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="销售方">
-                            <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="现货品种">
-                            <span class="white">{{ formatValue(selectedRow.buyusername) }}</span>
-                        </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="点价合约">
-                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="点价价格">
-                            <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</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>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="点价数量">
-                            <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.pricedPrice) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="登记时间">
-                            <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-        </a-form>
-    </a-modal>
+    <a-form class="inlineForm"
+            :form="form"
+            @submit="handleSearch">
+      <fieldset class="formFieldSet">
+        <legend>合同基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="点价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="销售方">
+              <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.buyusername) }}</span>
+            </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="点价合约">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="点价价格">
+              <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</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>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="点价数量">
+              <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.pricedPrice) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记时间">
+              <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
-import {defineComponent, PropType, reactive, ref, watchEffect} from 'vue';
-import {closeModal} from '@/common/setup/modal/index';
+import { defineComponent, PropType, reactive, ref, watchEffect } from 'vue';
+import { closeModal } from '@/common/setup/modal/index';
 import { getStatusName } from '@/common/constants/enumsName';
-import {formatValue, formatTime} from '@/common/methods';
-import {QryBusinessDjRsp} from "@/services/go/ermcp/business-review/interface";
-import {getPriceTypeName} from "@/views/business/purchase/setup";
+import { formatValue, formatTime } from '@/common/methods';
+import { QryBusinessDjRsp } from '@/services/go/ermcp/business-review/interface';
+import { getPriceTypeName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'someprice-detail',
@@ -113,14 +113,13 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const {visible, cancel} = closeModal('detail');
+        const { visible, cancel } = closeModal('detail');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
 
         function submit() {
             context.emit('refresh');
-            cancel()
-
+            cancel();
         }
 
         return {

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

@@ -17,7 +17,9 @@
         <template #expandedRowRender="{ record }">
           <BtnList :btnList="record.btnList" />
         </template>
-
+        <template #operateapplytype="{ text }">
+          <a>{{ getPriceTypeName(text) }}</a>
+        </template>
         <template #contracttype="{ text }">
           <a>{{ getContractTypeName(text) }}</a>
         </template>
@@ -25,7 +27,9 @@
         <template #applystatus="{ text }">
           <a>{{ getApplyStatusName(text) }}</a>
         </template>
-
+        <template #buyusernameOrsellusername="{ record }">
+          <a>{{ getAnalogueName(record.contracttype, record.buyusername, record.sellusername) }}</a>
+        </template>
         <template #addmargin||decmargin="{ record }">
           <a>{{
                         (record.addmargin !== 0 && record.addmargin !== undefined ?
@@ -53,10 +57,10 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 import { SettlementDetail, SettlementAudit, SettlementCancel, Filter } from '../../components';
 
 import { queryTableList, QryBussinessJsRsp } from './setup';
-import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
 import { invoiceStatusName } from '@/views/manage/finance-review/setup';
 import { Column, ColumnType } from '@/common/setup/table';
+import { getPriceTypeName, getContractTypeName, getApplyStatusName } from '@/common/constants/enumsName';
+import { getAnalogueName } from '@/views/information/spot-contract/setup';
 
 export default defineComponent({
     name: 'business-review-js',
@@ -115,7 +119,7 @@ export default defineComponent({
 
         return {
             columns,
-
+            getAnalogueName,
             expandedRowKeys,
             selectedRow,
             Rowclick,

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

@@ -56,9 +56,8 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 
 import { Filter, SomepriceDetail, SomepriceAudit, SomepriceCancel } from '../../components';
 import { queryTableList, QryBusinessDjRsp } from './setup';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
-import { getAnalogueName, getContractStatusName, getContractTypeName } from '@/views/information/spot-contract/setup';
+import { getPriceTypeName, getContractStatusName, getContractTypeName, getApplyStatusName } from '@/common/constants/enumsName';
+import { getAnalogueName } from '@/views/information/spot-contract/setup';
 import { Column, ColumnType } from '@/common/setup/table';
 import { ref } from 'vue';
 

src/views/manage/business-review/setup.ts

@@ -1,30 +1,6 @@
-import {ResultInfo} from "@/common/methods/request";
+import { ResultInfo } from "@/common/methods/request";
+
 
-/**
- * 业务审核-点价-状态
- * @param type 申请状态 - 1:待审核 2:审核通过 3:审核拒绝 4:处理失败 5:已撤回
- */
-export function getApplyStatusName(type: number): string{
-    let result = "--";
-    switch (type) {
-        case 1:
-            result = "待审核";
-            break
-        case 2:
-            result = "审核通过";
-            break
-        case 3:
-            result = "审核拒绝";
-            break
-        case 4:
-            result = "处理失败";
-            break
-        case 5:
-            result = "已撤回";
-            break
-    }
-    return result
-}
 
 /************** 接口请求相关提示 ****************/
 

src/views/manage/finance-review/components/fundsAudit/index.vue

@@ -64,7 +64,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="登记金额">
-                <span class="white">{{(selectedRow.deductamount === undefined || selectedRow.deductamount === 0) ? formatValue(selectedRow.payamount): formatValue(selectedRow.deductamount)}}</span>
+              <span class="white">{{(selectedRow.deductamount === undefined || selectedRow.deductamount === 0) ? formatValue(selectedRow.payamount): formatValue(selectedRow.deductamount)}}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -98,8 +98,7 @@ import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
 import Long from 'long';
 import { financeControl } from '@/views/manage/finance-review/components/setup';
 import { kxtypeName, stateName } from '@/views/manage/finance-review/setup';
-import { getContractTypeName } from '@/views/information/spot-contract/setup';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 import { isShowContractCheck } from '@/views/manage/inventory-review/setup';
 
 export default defineComponent({

src/views/manage/finance-review/components/fundsCancel/index.vue

@@ -58,7 +58,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="登记金额">
-                <span class="white">{{(selectedRow.deductamount === undefined || selectedRow.deductamount === 0) ? formatValue(selectedRow.payamount): formatValue(selectedRow.deductamount)}}</span>
+              <span class="white">{{(selectedRow.deductamount === undefined || selectedRow.deductamount === 0) ? formatValue(selectedRow.payamount): formatValue(selectedRow.deductamount)}}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -92,8 +92,8 @@ import Long from 'long';
 import { financeControl } from '@/views/manage/finance-review/components/setup';
 import { QryBussinessKxRsp } from '@/services/go/ermcp/finance-review/interface';
 import { kxtypeName, stateName } from '@/views/manage/finance-review/setup';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
-import { getContractTypeName } from '@/views/information/spot-contract/setup';
+import { getPriceTypeName } from '@/common/constants/enumsName';
+import { getContractTypeName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'finance_review_funds_cancel',

src/views/manage/finance-review/components/fundsDetail/index.vue

@@ -79,8 +79,8 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { QryBussinessKxRsp } from '@/services/go/ermcp/finance-review/interface';
-import {kxtypeName, stateName} from '@/views/manage/finance-review/setup';
-import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { kxtypeName, stateName } from '@/views/manage/finance-review/setup';
+import { getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'finance_review_funds_detail',

src/views/manage/finance-review/components/invoiceAudit/index.vue

@@ -101,7 +101,7 @@ import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { QryBussinessFpRsp } from '@/services/go/ermcp/finance-review/interface';
 import { invoiceStatusName } from '@/views/manage/finance-review/setup';
-import { getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getPriceTypeName } from '@/common/constants/enumsName';
 import { Modal } from 'ant-design-vue';
 import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
 import Long from 'long';

src/views/manage/finance-review/components/invoiceCancel/index.vue

@@ -95,7 +95,7 @@ import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { QryBussinessFpRsp } from '@/services/go/ermcp/finance-review/interface';
 import { invoiceStatusName } from '@/views/manage/finance-review/setup';
-import { getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getPriceTypeName } from '@/common/constants/enumsName';
 import { Modal } from 'ant-design-vue';
 import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
 import Long from 'long';

src/views/manage/finance-review/components/invoiceDetail/index.vue

@@ -93,7 +93,7 @@ import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { QryBussinessFpRsp } from '@/services/go/ermcp/finance-review/interface';
 import { invoiceStatusName } from '@/views/manage/finance-review/setup';
-import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'finance_review_invoice_detail',
@@ -109,7 +109,7 @@ export default defineComponent({
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
 
-        function submit(){
+        function submit() {
             context.emit('refresh');
             cancel();
         }

src/views/manage/finance-review/list/funds/index.vue

@@ -67,8 +67,7 @@ import { Filter, FundsAudit, FundsCancel, FundsDetail } from '../../components';
 
 import { queryTableList, QryBussinessKxRsp } from './setup';
 import { invoiceStatusName, kxtypeName, operateApplyTypeName, stateName } from '@/views/manage/finance-review/setup';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
-import { getContractTypeName } from '@/views/information/spot-contract/setup';
+import { getContractTypeName, getApplyStatusName } from '@/common/constants/enumsName';
 import { Column, ColumnType } from '@/common/setup/table';
 
 export default defineComponent({

src/views/manage/finance-review/list/invoice/index.vue

@@ -57,10 +57,9 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 import { InvoiceAudit, InvoiceCancel, InvoiceDetail, Filter } from '../../components';
 
 import { queryTableList, QryBussinessFpRsp } from './setup';
-import { getContractTypeName } from '@/views/information/spot-contract/setup';
 import { invoiceStatusName, kxtypeName, operateApplyTypeName } from '@/views/manage/finance-review/setup';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
 import { Column, ColumnType } from '@/common/setup/table';
+import { getContractTypeName, getApplyStatusName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'finance_review_invoice',

src/views/manage/inventory-review/components/checkinAudit/index.vue

@@ -157,10 +157,8 @@ import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
 import { InOutTypeName, isShowContractCheck, isShowContractInfo } from '@/views/manage/inventory-review/setup';
-import { getContractTypeName } from '@/views/information/spot-contract/setup';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getContractTypeName, getPriceTypeName, getApplyStatusName } from '@/common/constants/enumsName';
 import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
 import { Modal } from 'ant-design-vue';
 import { AreaInOutApplyAuditPassReq, AuditERMCPAreaInOutStockApplyReq } from '@/services/proto/warehouse/interface';
 import Long from 'long';

src/views/manage/inventory-review/components/checkinCancel/index.vue

@@ -151,10 +151,8 @@ import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
 import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
-import { getContractTypeName } from '@/views/information/spot-contract/setup';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getContractTypeName, getPriceTypeName, getApplyStatusName } from '@/common/constants/enumsName';
 import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
 import { Modal } from 'ant-design-vue';
 import { AuditERMCPAreaInOutStockApplyReq } from '@/services/proto/warehouse/interface';
 import Long from 'long';

src/views/manage/inventory-review/components/checkinDetail/index.vue

@@ -146,10 +146,9 @@ import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
 import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
-import { getContractTypeName } from '@/views/information/spot-contract/setup';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
-import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
+import { getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
+
+import { getGoodsUnitEnumItemName, getApplyStatusName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'finance_review_funds_detail',

src/views/manage/inventory-review/components/checkoutAudit/index.vue

@@ -150,10 +150,8 @@ import { closeModal } from '@/common/setup/modal/index';
 import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { InOutTypeName, isShowContractCheck, isShowContractInfo } from '@/views/manage/inventory-review/setup';
-import { getContractTypeName } from '@/views/information/spot-contract/setup';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getContractTypeName, getPriceTypeName, getApplyStatusName } from '@/common/constants/enumsName';
 import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
 import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
 import { Modal } from 'ant-design-vue';
 import Long from 'long';

src/views/manage/inventory-review/components/checkoutCancel/index.vue

@@ -156,10 +156,8 @@ import { LongType } from '@/services/socket/login/interface';
 import moment from 'moment';
 import { refuseStockControl } from '@/views/manage/inventory-review/components/setup';
 import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
-import { getContractTypeName } from '@/views/information/spot-contract/setup';
-import { getPriceTypeName } from '@/views/business/purchase/setup';
-import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
+import { getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
+import { getGoodsUnitEnumItemName, getApplyStatusName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'inventory_review_checkout_cancel',

src/views/manage/inventory-review/components/checkoutDetail/index.vue

@@ -137,9 +137,8 @@ import { closeModal } from '@/common/setup/modal/index';
 import { formatValue } from '@/common/methods';
 import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
 import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
-import {getGoodsUnitEnumItemName, getStatusName} from '@/common/constants/enumsName';
-import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getGoodsUnitEnumItemName, getStatusName, getApplyStatusName } from '@/common/constants/enumsName';
+import { getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'finance_review_invoice_detail',

src/views/manage/inventory-review/list/checkin/index.vue

@@ -55,8 +55,7 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 import { Filter, CheckinAudit, CheckinCancel, CheckinDetail } from '../../components';
 
 import { queryTableList, Ermcp3AreaStockApply } from '../setup';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
-import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getContractTypeName, getPriceTypeName, getApplyStatusName } from '@/common/constants/enumsName';
 import { operateApplyTypeName } from '@/views/manage/finance-review/setup';
 import { InOutTypeName } from '@/views/manage/inventory-review/setup';
 import { Column, ColumnType } from '@/common/setup/table';

src/views/manage/inventory-review/list/checkout/index.vue

@@ -54,8 +54,7 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 import { CheckoutAudit, CheckoutCancel, CheckoutDetail, Filter } from '../../components';
 
 import { queryTableList, Ermcp3AreaStockApply } from '../setup';
-import { getApplyStatusName } from '@/views/manage/business-review/setup';
-import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getContractTypeName, getPriceTypeName, getApplyStatusName } from '@/common/constants/enumsName';
 import { operateApplyTypeName } from '@/views/manage/finance-review/setup';
 import { InOutTypeName } from '@/views/manage/inventory-review/setup';
 import { Column, ColumnType } from '@/common/setup/table';

src/views/search/inventory/list/inventory_applyrecord/index.vue

@@ -50,7 +50,7 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 import Filter from '../../components/filterTable/index.vue';
 import Add from '../../components/add/index.vue';
 
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 import { Ermcp3AreaStockApply, queryTableList } from './setup';
 
 export default defineComponent({

src/views/search/inventory/list/inventory_current/index.vue

@@ -29,7 +29,7 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 import Filter from '../../components/filterTable/index.vue';
 import Add from '../../components/add/index.vue';
 
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
 import { Ermcp3AreaStock, queryTableList } from './setup';
 
 export default defineComponent({