修改getPriceTypeName 位置

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,23 @@ 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
+}

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/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/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/someprice/index.vue

@@ -56,7 +56,7 @@ 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 { getPriceTypeName } from '@/common/constants/enumsName';
 import { getApplyStatusName } from '@/views/manage/business-review/setup';
 import { getAnalogueName, getContractStatusName, getContractTypeName } from '@/views/information/spot-contract/setup';
 import { Column, ColumnType } from '@/common/setup/table';

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>
@@ -99,7 +99,7 @@ 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 { 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,7 +92,7 @@ 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 { getPriceTypeName } from '@/common/constants/enumsName';
 import { getContractTypeName } from '@/views/information/spot-contract/setup';
 
 export default defineComponent({

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

@@ -158,7 +158,7 @@ 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 { getPriceTypeName } from '@/common/constants/enumsName';
 import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 import { getApplyStatusName } from '@/views/manage/business-review/setup';
 import { Modal } from 'ant-design-vue';

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

@@ -152,7 +152,7 @@ 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 { getPriceTypeName } from '@/common/constants/enumsName';
 import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 import { getApplyStatusName } from '@/views/manage/business-review/setup';
 import { Modal } from 'ant-design-vue';

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

@@ -147,7 +147,7 @@ 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 { getPriceTypeName } from '@/common/constants/enumsName';
 import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 import { getApplyStatusName } from '@/views/manage/business-review/setup';
 

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

@@ -151,7 +151,7 @@ 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 { getPriceTypeName } 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';

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

@@ -157,7 +157,7 @@ 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 { getPriceTypeName } from '@/common/constants/enumsName';
 import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 import { getApplyStatusName } from '@/views/manage/business-review/setup';