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

src/common/constants/enumsName.ts

@@ -693,7 +693,7 @@ export function getPerformanceStatusName(type: number) {
     let result = '--'
     switch (type) {
         case 1:
-            result = '初始化'
+            result = '待激活'
             break
         case 2:
             result = '正常'
@@ -918,14 +918,14 @@ export function getInterestSettleModeName(type: number) {
 }
 
 //    interestratemode: number;//利率方式 - 1:年利率 2:日利率 3:日固定值
-export function getInterestrateModeName(mode: number ,value: number) {
+export function getInterestrateModeName(mode: number, value: number) {
     let result = "--"
     switch (mode) {  // 1:年利率
         case 1:
             result = (value * 100).toFixed(2).toString()
             break
         case 2: //  2:日利率
-            result =  (value * 10000).toFixed(2).toString()
+            result = (value * 10000).toFixed(2).toString()
             break
         case 3: // 日固定值
             result = value.toFixed(2).toString()

src/views/order/performance_information/components/components/breach_contract/index.vue

@@ -36,14 +36,14 @@
                 <span class="white">{{selectedRow.relatedorderid}}</span>
               </a-form-item>
             </a-col>
-<!--            <a-col :span="24">-->
-<!--              <a-form-item label="附件"-->
-<!--                           name="url">-->
-<!--                <UploadImg :visible="visible"-->
-<!--                           :imgList="uploadImgList"-->
-<!--                           @upload="uploadImgAction" />-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
+            <!--            <a-col :span="24">-->
+            <!--              <a-form-item label="附件"-->
+            <!--                           name="url">-->
+            <!--                <UploadImg :visible="visible"-->
+            <!--                           :imgList="uploadImgList"-->
+            <!--                           @upload="uploadImgAction" />-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :span="24">
               <a-form-item label="备注"
                            name="remark">
@@ -82,13 +82,13 @@ import { validateAction } from '@/common/setup/form';
 import { FormState } from './interface';
 import UploadImg from '@/common/components/uploadImg/index.vue';
 import { getUploadImg } from '@/common/setup/upload';
-import {PerformanceContractedApplyReq, PerformanceDelayApplyReq} from '@/services/proto/performance/interface';
-import {getSelectedAccount, getSelectedAccountId, getUserId} from '@/services/bus/account';
+import { PerformanceContractedApplyReq, PerformanceDelayApplyReq } from '@/services/proto/performance/interface';
+import { getSelectedAccount, getSelectedAccountId, getUserId } from '@/services/bus/account';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { performanceContractedApply, performanceDelayApply } from '@/services/proto/performance';
 import { BuyOrSell } from '@/common/constants/enumCommon';
 import { handlePerformancePlanStep } from '../setup';
-import Long from "long";
+import Long from 'long';
 
 export default defineComponent({
     name: ModalEnum.performance_information_buy_performance_breach_contract,
@@ -115,12 +115,12 @@ export default defineComponent({
                 // 违约申请
                 const paramReq: PerformanceContractedApplyReq = {
                     PerformancePlanID: Long.fromString(props.selectedRow.performanceplanid), // uint64 履约计划ID
-                    BreachType: props.selectedRow.buyaccountid === getSelectedAccountId() ? 2: 1, // uint32 违约方类型 买履约是2 卖履约是1 （刘工说是黄工说的 ）
+                    BreachType: props.selectedRow.buyaccountid === getSelectedAccountId() ? 2 : 1, // uint32 违约方类型 买履约是2 卖履约是1 （刘工说是黄工说的 ）
                     Applicant: getUserId(), // uint64 违约申请人
                     ApplyRemark: param.remark, // string 申请备注
-                    Attachment: "" // string 附件
+                    Attachment: '', // string 附件
                 };
-                requestResultLoadingAndInfo(performanceContractedApply, paramReq, loading, ['违约成功', '违约失败:']).then(() => {
+                requestResultLoadingAndInfo(performanceContractedApply, paramReq, loading, ['申请违约成功', '申请违约失败:']).then(() => {
                     cancel(true);
                 });
             });