Merge branch 'v20' of http://192.168.31.240:3000/MTP2.0_New/MTP20_WEB_GLOBAL into v20

src/packages/gstj/views/mine/Index.vue

@@ -100,7 +100,7 @@
                 </Cell>
                 <Cell is-link :to="{ name: 'hold-sign' }" v-if="authStatus === AuthStatus.Certified">
                     <template #title>
-                        <Iconfont icon="g-icon-signing"> 代扣签约</Iconfont>
+                        <Iconfont icon="g-icon-signing">代扣签约</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'hold-deposit' }" v-if="authStatus === AuthStatus.Certified">
@@ -182,7 +182,9 @@ const accountStore = useAccountStore()
 const { currentAccount } = accountStore.$toRefs()
 
 const headerRef = shallowRef<HTMLDivElement>()
-const authStatus = computed(() => userStore.userAccount.hasauth) // 实名认证状态
+// 实名认证状态
+const authStatus = computed(() => userStore.userAccount.hasauth) 
+// 代扣签约信息
 const signStatus = shallowRef(SignStatus.Unsigned)
 
 const onReady = (el: HTMLDivElement) => {

src/packages/pc/views/footer/performance/components/contracted/index.vue

@@ -6,7 +6,7 @@
                 <span>{{ handleNoneValue(selectedRow.relatedorderid) }}</span>
             </el-form-item>
             <el-form-item label="当前步骤">
-                <span>{{ handleNumberValue(getPerformanceStepStatusName(selectedRow.steptypeid)) }}</span>
+                <span>{{ handleNumberValue(selectedRow.curstepname) }}</span>
             </el-form-item>
             <el-form-item label="备注" prop="ApplyRemark">
                 <el-input type="textarea" :rows="4" v-model="formData.ApplyRemark" />
@@ -26,7 +26,6 @@
 import { ref, PropType } from 'vue'
 import { ElMessage, FormInstance, FormRules } from 'element-plus'
 import { handleNoneValue, handleNumberValue, handleRequestBigNumber } from '@/filters'
-import { getPerformanceStepStatusName } from '@/constants/order'
 import { usePerformanceContractedApply } from '@/business/performance'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppUpload from '@pc/components/base/upload/index.vue'

src/packages/pc/views/footer/performance/components/delay/index.vue

@@ -6,7 +6,7 @@
                 <span>{{ handleNoneValue(selectedRow.relatedorderid) }}</span>
             </el-form-item>
             <el-form-item label="当前步骤">
-                <span>{{ handleNumberValue(getPerformanceStepStatusName(selectedRow.steptypeid)) }}</span>
+                <span>{{ handleNumberValue(selectedRow.curstepname) }}</span>
             </el-form-item>
             <el-form-item label="申请延期天数" prop="delaydays">
                 <el-input type="number" placeholder="请输入" v-model="formData.delaydays" />
@@ -26,7 +26,6 @@
 import { ref, PropType } from 'vue'
 import { ElMessage, FormInstance, FormRules } from 'element-plus'
 import { handleNoneValue, handleNumberValue, handleRequestBigNumber } from '@/filters'
-import { getPerformanceStepStatusName } from '@/constants/order'
 import { usePerformanceDelayApply } from '@/business/performance'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 

src/packages/pc/views/footer/performance/components/manual/index.vue

@@ -3,7 +3,7 @@
     <app-drawer title="手动执行" :width="480" v-model:show="show" :loading="loading" :refresh="refresh">
         <el-form class="el-form--vertical" ref="formRef" label-width="60px" :model="confirmFormData" :rules="formRules">
             <el-form-item>
-                <span>是否执行当前步骤【{{ handleNumberValue(getPerformanceStepStatusName(selectedRow.steptypeid)) }}】？</span>
+                <span>是否执行当前步骤【{{ handleNumberValue(selectedRow.curstepname) }}】？</span>
             </el-form-item>
             <el-form-item label="备注" prop="StepRemark">
                 <el-input type="textarea" :rows="3" v-model="confirmFormData.StepRemark" />
@@ -20,7 +20,6 @@
 import { ref, PropType } from 'vue'
 import { ElMessage, FormInstance, FormRules } from 'element-plus'
 import { handleNumberValue, handleRequestBigNumber } from '@/filters'
-import { getPerformanceStepStatusName } from '@/constants/order'
 import { usePerformanceManualConfirm } from '@/business/performance'
 import AppDrawer from '@pc/components/base/drawer/index.vue'