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

src/assets/styles/mixin.less

@@ -908,4 +908,67 @@
 
 .has-error .ant-input:not(.has-error .ant-input-disabled), -has-error .ant-input:not(.has-error .ant-input-disabled), .has-error .ant-input:not(-has-error .ant-input-disabled), -has-error .ant-input:not(-has-error .ant-input-disabled) {
     background: @m-grey21;
+}
+
+.ant-modal-confirm-confirm {
+    top: 50%;
+    padding-bottom: 0;
+    margin-top: -64px;
+    .ant-modal-content {
+        background: @m-grey11;
+        .ant-modal-close {
+            .ant-modal-close-x {
+                width: 40px;
+                height: 40px;
+                line-height: 40px;
+                .ant-modal-close-icon {
+                    color: @m-blue11;
+                }
+            }
+        }
+        .ant-modal-body {
+            padding: 24px;
+            .ant-modal-confirm-body-wrapper {
+                .ant-modal-confirm-body {
+                    .ant-modal-confirm-title {
+                        color: @m-white0;
+                        text-align: center;
+                    }
+                }
+                .ant-modal-confirm-btns {
+                    float: none;
+                    text-align: center;
+                    .ant-btn {
+                        width: 100px;
+                        height: 34px;
+                        line-height: 32px;
+                        border: 1px solid @m-blue10;
+                        border-radius: 3px;
+                        background: transparent;
+                        font-size: 16px;
+                        color: @m-blue10;
+                        margin-right: 20px;
+                        &:hover {
+                            border-color: rgba(@m-blue10, .8);
+                        }
+                    }
+                    .ant-btn-primary {
+                        margin-left: 20px;
+                        width: 100px;
+                        height: 34px;
+                        line-height: 32px;
+                        border: 0;
+                        background: linear-gradient(0deg, @m-blue8 0%, @m-blue9 100%);
+                        border-radius: 3px;
+                        font-size: 16px;
+                        color: @m-white0;
+                        &:hover {
+                            background: linear-gradient(0deg, @m-blue8-hover 0%, @m-blue9-hover 100%);
+                            color: @m-white0-hover;
+                        }
+                    }
+                }
+            }
+        }
+    }
 }

src/assets/styles/variables.less

@@ -62,8 +62,9 @@
 @m-blue8: #3163BA;
 @m-blue8-hover: rgba(@m-blue8, .8);
 @m-blue9: #4179DB;
-@m-blue10: #0C95FF;
 @m-blue9-hover: rgba(@m-blue9, .8);
+@m-blue10: #0C95FF;
+@m-blue11: #1271BA;
 @body-bg: #e9eef3;
 @m-white0: #ffffff;
 @m-white0-hover: rgba(@m-white0, .8);

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

@@ -11,60 +11,63 @@ export interface Ermcp3ContractReq {
  * 现货合同返回
  */
 export interface Ermcp3ContractRsp {
-    accountid: string;//期货账户id
-    amount: number;//金额 [1:一口价、3:暂定价]
-    attachment: string;//附件
-    auditremark: string;//审核意见
-    audittime: string;//审核时间
-    biztype: number;//业务类型 1-套保 2-套利
-    brandname: string;//品牌名称
-    buynickname: string;//销售方昵称
-    buyuserid: number;//采购方ID
-    buyusername: string;//采购方名称
-    contracctstatus: number;//合同状态 - number;
-    //:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
-    contractmargin: number;//合同保证金
-    contractno: string;//现货合同编号
-    contracttype: number;//现货合同类型 - 1:采购 -1:销售
-    convertfactor: number;//标仓系数(品类)
-    createtime: string;//创建时间
-    deliveryenddate: string;//交收期(结束)
-    deliverygoodscode: string;//现货品种代码
-    deliverygoodsid: number;//现货品种ID
-    deliverygoodsname: string;//现货品种名称
-    deliverystartdate: string;//交收期(开始)
-    enddate: string;//点价结束日期 [2:点价 3:暂定价]
-    enumdicname: string;//单位名称
-    goodscode: string;//点价合约代码
-    goodsid: number;//点价合约ID - number;
-    //:为现货，其它为期货商品合约ID [2:点价 3:暂定价]
-    goodsname: string;//点价商品名称
-    margin: number;//当前保证金
-    meruserid: number;//跟单员id
-    meruserlogincode: string;//跟单员登录代码
-    price: number;//价格\暂定价 [1:一口价、3:暂定价]
-    pricemove: number;//升贴水 [2:点价 3:暂定价]
-    pricetype: number;//定价类型 - 1:一口价 2:点价 3:暂定价
-    producttype: number;//产品类型 - 1:标准仓单 2:等标 3:非标
-    qty: number;//数量
-    remark: string;//备注
-    saleuserid: number;//业务员id
-    saleuserlogincode: string;//业务员登录代码
-    sellnickname: string;//采购方昵称
-    selluserid: number;//销售方ID
-    sellusername: string;//销售方名称
-    spotcontractid: string;//现货合同ID(6number;
-    //2+Unix秒时间戳(1number;
-    //位)+xxxxxx)
-    spotgoodsbrandid: number;//现货品牌ID(DGFactoryItem表的ID)
-    spotgoodsdesc: string;//商品型号
-    startdate: string;//点价开始日期 [2:点价 3:暂定价]
-    tradeuserid: number;//交易员id
-    tradeuserlogincode: string;//交易员登录代码
-    unitid: number;//单位id(取品类上的单位id)
-    updatetime: string;//更新时间
-    userid: number;//所属机构ID
-    wrstandardcode: string;//品类代码
-    wrstandardid: number;//品类ID
-    wrstandardname: string;//品类名称
+    accountid	:string;//期货账户id
+    amount	:number;//金额 [1:一口价、3:暂定价]
+    attachment	:string;//附件
+    auditremark	:string;//审核意见
+    audittime	:string;//审核时间
+    biztype	:number;//业务类型 1-套保 2-套利
+    brandname	:string;//品牌名称
+    buynickname	:string;//销售方昵称
+    buyuserid	:number;//采购方ID
+    buyusername	:string;//采购方名称
+    contracctstatus	:number;//合同状态 - number;
+//:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
+    contractmargin	:number;//合同保证金
+    contractno	:string;//现货合同编号
+    contracttype	:number;//现货合同类型 - 1:采购 -1:销售
+    convertfactor	:number;//标仓系数(品类)
+    createtime	:string;//创建时间
+    currencyid	:number;//币种id
+    currencyname	:string;//币种名称
+    deliveryenddate	:string;//交收期(结束)
+    deliverygoodscode	:string;//现货品种代码
+    deliverygoodsid	:number;//现货品种ID
+    deliverygoodsname	:string;//现货品种名称
+    deliverystartdate	:string;//交收期(开始)
+    enddate	:string;//点价结束日期 [2:点价 3:暂定价]
+    enumdicname	:string;//单位名称
+    goodscode	:string;//点价合约代码
+    goodsid	:number;//点价合约ID - number;
+//:为现货，其它为期货商品合约ID [2:点价 3:暂定价]
+    goodsname	:string;//点价商品名称
+    margin	:number;//当前保证金
+    meruserid	:number;//跟单员id
+    meruserlogincode	:string;//跟单员登录代码
+    price	:number;//价格\暂定价 [1:一口价、3:暂定价]
+    pricemove	:number;//升贴水 [2:点价 3:暂定价]
+    pricetype	:number;//定价类型 - 1:一口价 2:点价 3:暂定价
+    producttype	:number;//产品类型 - 1:标准仓单 2:等标 3:非标
+    qty	:number;//数量
+    remark	:string;//备注
+    saleuserid	:number;//业务员id
+    saleuserlogincode	:string;//业务员登录代码
+    sellnickname	:string;//采购方昵称
+    selluserid	:number;//销售方ID
+    sellusername	:string;//销售方名称
+    spotcontractid	:string;//现货合同ID(6number;
+//2+Unix秒时间戳(1number;
+//位)+xxxxxx)
+    spotgoodsbrandid	:number;//现货品牌ID(DGFactoryItem表的ID)
+    spotgoodsdesc	:string;//商品型号
+    startdate	:string;//点价开始日期 [2:点价 3:暂定价]
+    tradeuserid	:number;//交易员id
+    tradeuserlogincode	:string;//交易员登录代码
+    tradeusername	:string;//交易员名称
+    unitid	:number;//单位id(取品类上的单位id)
+    updatetime	:string;//更新时间
+    userid	:number;//所属机构ID
+    wrstandardcode	:string;//品类代码
+    wrstandardid	:number;//品类ID
+    wrstandardname	:string;//品类名称
 }

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

@@ -261,11 +261,12 @@ export default defineComponent({
                 onOk() {
                     formRef.value.validate().then(() => {
                         const param = toRaw(formState);
+
                         const reqs: GldErmcpSpotContractOperateReq = {
                             SpotContractID: props.selectedRow.spotcontractid,
                             OperateType: 4,
                             Remark: param.Remark,
-                            Info: param,
+                            Info: {BizType: props.selectedRow.biztype, CurrencyID: props.selectedRow.currencyid, ...param},
                         };
                         // 审核通过
                         orderContractControl(reqs, loading).then(() => {

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

@@ -212,7 +212,7 @@ export default defineComponent({
                 cancelText: '取消',
                 onOk() {
                     let params: GldErmcpSpotContractOperateReq = {
-                        SpotContractID: Long.fromString(props.selectedRow.spotcontractid),
+                        SpotContractID: props.selectedRow.spotcontractid,
                         OperateType: 3,
                         Remark: "",
                     }

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

@@ -212,7 +212,7 @@ export default defineComponent({
                 cancelText: '取消',
                 onOk() {
                     const params: SpotContractOperateReq = {
-                        SpotContractID: Long.fromString(props.selectedRow.spotcontractid),
+                        SpotContractID: props.selectedRow.spotcontractid,
                         OperateType: 6,
                         Remark: '',
                     }

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

@@ -10,7 +10,7 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
+                :loading="loading"
                 @click="submit">关闭</a-button>
     </template>
 

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

@@ -1,28 +1,106 @@
 <template>
-  <!-- 点价审核-->
-  <a-modal class="business_review_someprice_audit custom-detail"
-           title="点价审核"
-           v-model:visible="visible"
-           centered
-           :maskClosable="maskClosableFlag"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading.loading"
-                @click="submit">关闭</a-button>
-    </template>
-
-  </a-modal>
+    <!-- 点价审核-->
+    <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.sellusername) }}</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.auditname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ref } from 'vue';
-import { closeModal } from '@/common/setup/modal/index';
-import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { getStatusName } from '@/views/information/custom/setup';
-import { formatValue, formatTime } from '@/common/methods';
+import {defineComponent, PropType, ref} from 'vue';
+import {closeModal} from '@/common/setup/modal/index';
+import {QueryCustomInfoType} from '@/services/go/ermcp/customInfo/interface';
+import {getStatusName} from '@/views/information/custom/setup';
+import {formatValue, formatTime} from '@/common/methods';
+import {getPriceTypeName} from "@/views/business/purchase/setup";
 
 export default defineComponent({
     name: 'business_review_someprice_audit',
@@ -34,9 +112,10 @@ export default defineComponent({
         },
     },
     setup(props) {
-        const { visible, cancel } = closeModal('business_review_someprice_audit');
+        const {visible, cancel} = closeModal('business_review_someprice_audit');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
+
         function submit() {
             loading.value = true;
             setTimeout(() => {
@@ -44,6 +123,7 @@ export default defineComponent({
                 cancel();
             }, 2000);
         }
+
         return {
             visible,
             cancel,
@@ -52,6 +132,7 @@ export default defineComponent({
             formatValue,
             getStatusName,
             maskClosableFlag,
+            getPriceTypeName,
         };
     },
 });

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 撤销点价登记-->
-  <a-modal class="business_review_someprice_cancel custom-detail"
+  <a-modal class="add-custom custom-detail"
            title="撤销点价登记"
            v-model:visible="visible"
            centered
@@ -10,58 +10,136 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
-                @click="submit">关闭</a-button>
+                :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.sellusername) }}</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.auditname) }}</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 { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { mergeObj } from '@/utils/objHandle';
-import { getStatusName } from '@/views/information/custom/setup';
-import { formatValue, formatTime } from '@/common/methods';
+import {defineComponent, PropType, reactive, ref, watchEffect} from 'vue';
+import {closeModal} from '@/common/setup/modal/index';
+import {QueryCustomInfoType} from '@/services/go/ermcp/customInfo/interface';
+import {mergeObj} from '@/utils/objHandle';
+import {getStatusName} from '@/views/information/custom/setup';
+import {formatValue, formatTime} from '@/common/methods';
+import {getPriceTypeName} from "@/views/information/spot-contract/setup";
+import {QryBusinessDjRsp} from "@/services/go/ermcp/business-review/interface";
 
 export default defineComponent({
-    name: 'business_review_someprice_cancel',
-    components: {},
-    props: {
-        selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
-            default: {},
-        },
-    },
-    setup(props) {
-        const { visible, cancel } = closeModal('business_review_someprice_cancel');
-        const loading = ref<boolean>(false);
-        const maskClosableFlag = ref<boolean>(false);
-        function submit() {
-            loading.value = true;
-            setTimeout(() => {
-                loading.value = false;
-                cancel();
-            }, 2000);
-        }
-        return {
-            visible,
-            cancel,
-            submit,
-            loading,
-            formatValue,
-            getStatusName,
-            maskClosableFlag,
-        };
+  name: 'business_review_someprice_cancel',
+  components: {},
+  props: {
+    selectedRow: {
+      type: Object as PropType<QryBusinessDjRsp>,
+      default: {},
     },
+  },
+  setup(props) {
+    const {visible, cancel} = closeModal('business_review_someprice_cancel');
+    const loading = ref<boolean>(false);
+    const maskClosableFlag = ref<boolean>(false);
+
+    function submit() {
+
+    }
+
+    return {
+      visible,
+      cancel,
+      submit,
+      loading,
+      formatValue,
+      getStatusName,
+      maskClosableFlag,
+      getPriceTypeName,
+    };
+  },
 });
 </script>
 
 <style lang="less">
 .business_review_someprice_cancel {
-    .ant-form.inlineForm {
-        margin-top: 20px;
-    }
+  .ant-form.inlineForm {
+    margin-top: 20px;
+  }
 }
 </style>;

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

@@ -1,50 +1,126 @@
 <template>
-  <!-- 点价记录详情-->
-  <a-modal class="someprice-detail custom-detail"
-           title="点价记录详情"
-           v-model:visible="visible"
-           centered
-           :maskClosable="maskClosableFlag"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="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-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.sellusername) }}</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.auditname) }}</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 { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { mergeObj } from '@/utils/objHandle';
-import { getStatusName } from '@/views/information/custom/setup';
-import { formatValue, formatTime } from '@/common/methods';
+import {defineComponent, PropType, reactive, ref, watchEffect} from 'vue';
+import {closeModal} from '@/common/setup/modal/index';
+import {getStatusName} from '@/views/information/custom/setup';
+import {formatValue, formatTime} from '@/common/methods';
+import {QryBusinessDjRsp} from "@/services/go/ermcp/business-review/interface";
+import {getPriceTypeName} from "@/views/business/purchase/setup";
 
 export default defineComponent({
     name: 'someprice-detail',
     components: {},
     props: {
         selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
+            type: Object as PropType<QryBusinessDjRsp>,
             default: {},
         },
     },
     setup(props) {
-        const { visible, cancel } = closeModal('detail');
+        const {visible, cancel} = closeModal('detail');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
+
         function submit() {
-            loading.value = true;
-            setTimeout(() => {
-                loading.value = false;
-                cancel();
-            }, 2000);
+
         }
+
         return {
             visible,
             cancel,
@@ -53,6 +129,7 @@ export default defineComponent({
             formatValue,
             getStatusName,
             maskClosableFlag,
+            getPriceTypeName,
         };
     },
 });

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

@@ -1,45 +1,50 @@
 <template>
-  <!-- 管理-业务审核-交收 -->
-  <div class="business-review-js"
-       :loading="loading">
-    <Filter @search="search">
-      <BtnList :btnList="commonBtn" />
-    </Filter>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{  }">
-          <BtnList :btnList="forDataBtn" />
-        </template>
-        <template #warehousetype="{ text }">
-          <span>{{ getWareHouseType(text) }}</span>
-        </template>
-        <template #warehousestatus="{ text }">
-          <span>{{ getWareHouseStatus(text) }}</span>
-        </template>
-      </a-table>
-    </contextMenu>
-    <!-- 点价记录详情 -->
-    <SettlementDetail />
-    <!-- 交收审核 -->
-    <SettlementAudit />
-    <!-- 撤销点价登记 -->
-    <SettlementCancel />
-  </div>
+    <!-- 管理-业务审核-交收 -->
+    <div class="business-review-js"
+         :loading="loading">
+        <Filter @search="search">
+            <BtnList :btnList="commonBtn"/>
+        </Filter>
+        <contextMenu :contextMenuList="forDataBtn">
+            <a-table :columns="columns"
+                     class="topTable hiddenFirstCol"
+                     :pagination="false"
+                     :expandedRowKeys="expandedRowKeys"
+                     :customRow="Rowclick"
+                     rowKey="key"
+                     :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{  }">
+                    <BtnList :btnList="forDataBtn"/>
+                </template>
+
+
+            </a-table>
+        </contextMenu>
+        <!-- 点价记录详情 -->
+        <SettlementDetail/>
+        <!-- 交收审核 -->
+        <SettlementAudit/>
+        <!-- 撤销点价登记 -->
+        <SettlementCancel/>
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+import {
+    defineComponent,
+    initData,
+    getTableColumns,
+    getTableEvent,
+    getBtnList,
+    contextMenu,
+    BtnList
+} from '@/common/export/table';
 
-import { SettlementDetail, SettlementAudit, SettlementCancel, Filter } from '../../components';
+import {SettlementDetail, SettlementAudit, SettlementCancel, Filter} from '../../components';
 
-import { queryTableList, getFilterTableCB, QryBussinessJsRsp } from './setup';
+import {queryTableList, getFilterTableCB, QryBussinessJsRsp} from './setup';
+import {getPriceTypeName} from "@/views/information/spot-contract/setup";
 
 export default defineComponent({
     name: 'business-review-js',
@@ -53,25 +58,27 @@ export default defineComponent({
     },
     setup() {
         // 表头数据
-        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
+        const {columns, registerColumn, updateColumn, filteredInfo} = getTableColumns();
         // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QryBussinessJsRsp>({});
+        const {expandedRowKeys, selectedRow, Rowclick} = getTableEvent<QryBussinessJsRsp>({});
         // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('business_review_settlement', true);
+        const {commonBtn, forDataBtn} = getBtnList('business_review_settlement', true);
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList({});
+        const {loading, tableList, queryTable} = queryTableList({});
         initData(() => {
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
             registerColumn('table_pcweb_business_aduit_js', getFilterTableCB);
         });
+
         // 查询
         function search(value: any) {
             filteredInfo.value = value;
             // 更新表信息
             updateColumn();
         }
+
         return {
             columns,
             filteredInfo,
@@ -83,6 +90,7 @@ export default defineComponent({
             loading,
             tableList,
             search,
+            getPriceTypeName,
         };
     },
 });

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

@@ -1,44 +1,68 @@
 <template>
-  <!-- 管理-业务审核-点价 -->
-  <div class="business-review-dj"
-       :loading="loading">
-    <Filter @search="search">
-      <BtnList :btnList="commonBtn" />
-    </Filter>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{  }">
-          <BtnList :btnList="forDataBtn" />
-        </template>
-        <template #warehousetype="{ text }">
-          <span>{{ getWareHouseType(text) }}</span>
-        </template>
-        <template #warehousestatus="{ text }">
-          <span>{{ getWareHouseStatus(text) }}</span>
-        </template>
-      </a-table>
-    </contextMenu>
-    <!-- 点价记录详情 -->
-    <SomepriceDetail />
-    <!-- 点价审核 -->
-    <SomepriceAudit />
-    <!-- 撤销点价登记 -->
-    <SomepriceCancel />
-  </div>
+    <!-- 管理-业务审核-点价 -->
+    <div class="business-review-dj"
+         :loading="loading">
+        <Filter @search="search">
+            <BtnList :btnList="commonBtn"/>
+        </Filter>
+        <contextMenu :contextMenuList="forDataBtn">
+            <a-table :columns="columns"
+                     class="topTable hiddenFirstCol"
+                     :pagination="false"
+                     :expandedRowKeys="expandedRowKeys"
+                     :customRow="Rowclick"
+                     rowKey="key"
+                     :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{  }">
+                    <BtnList :btnList="forDataBtn"/>
+                </template>
+
+                <template #pricetype="{ text }">
+                    <a>{{ getPriceTypeName(text) }}</a>
+                </template>
+
+                <template #applystatus="{ text }">
+                    <a>{{ getApplyStatusName(text) }}</a>
+                </template>
+
+                <template #contracttype="{ text }">
+                    <a>{{ getContractTypeName(text) }}</a>
+                </template>
+
+                <template #contractstatus="{ text }">
+                    <a>{{ getContractStatusName(text) }}</a>
+                </template>
+            </a-table>
+        </contextMenu>
+        <!-- 点价记录详情 -->
+        <SomepriceDetail :selectedRow="selectedRow"
+                         @refresh="queryTable"/>
+        <!-- 点价审核 -->
+        <SomepriceAudit :selectedRow="selectedRow"
+                        @refresh="queryTable"/>
+        <!-- 撤销点价登记 -->
+        <SomepriceCancel :selectedRow="selectedRow"
+                         @refresh="queryTable"/>
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+import {
+    defineComponent,
+    initData,
+    getTableColumns,
+    getTableEvent,
+    getBtnList,
+    contextMenu,
+    BtnList
+} from '@/common/export/table';
 
-import { Filter, SomepriceDetail, SomepriceAudit, SomepriceCancel } from '../../components';
-import { queryTableList, getFilterTableCB, QryBusinessDjRsp } from './setup';
+import {Filter, SomepriceDetail, SomepriceAudit, SomepriceCancel} from '../../components';
+import {queryTableList, getFilterTableCB, QryBusinessDjRsp} from './setup';
+import {getPriceTypeName} from "@/views/business/purchase/setup";
+import {getApplyStatusName} from "@/views/manage/business-review/setup";
+import {getContractStatusName, getContractTypeName} from "@/views/information/spot-contract/setup";
 
 export default defineComponent({
     name: 'business-review-dj',
@@ -52,25 +76,27 @@ export default defineComponent({
     },
     setup() {
         // 表头数据
-        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
+        const {columns, registerColumn, updateColumn, filteredInfo} = getTableColumns();
         // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QryBusinessDjRsp>({});
+        const {expandedRowKeys, selectedRow, Rowclick} = getTableEvent<QryBusinessDjRsp>({});
         // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('business_review_someprice', true);
+        const {commonBtn, forDataBtn} = getBtnList('business_review_someprice', true);
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList({});
+        const {loading, tableList, queryTable} = queryTableList({});
         initData(() => {
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
             registerColumn('table_pcweb_business_aduit_dj', getFilterTableCB);
         });
+
         // 查询
         function search(value: any) {
             filteredInfo.value = value;
             // 更新表信息
             updateColumn();
         }
+
         return {
             columns,
             filteredInfo,
@@ -82,6 +108,10 @@ export default defineComponent({
             loading,
             tableList,
             search,
+            getPriceTypeName,
+            getApplyStatusName,
+            getContractTypeName,
+            getContractStatusName,
         };
     },
 });

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

@@ -0,0 +1,25 @@
+/**
+ * 业务审核-点价-状态
+ * @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
+}