Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/utils/date.js

@@ -1,6 +1,6 @@
 // 时间戳转换为年月日时分秒
 export const timesTampChange = (timestamp, format = 'Y-M-D h:m:s') => {
-  if (timestamp === -28800000) return '至今'
+  // if (timestamp === null) return '至今'
   if (!timestamp) return ''
   const date = new Date(timestamp)
   const Y = date.getFullYear().toString()

src/utils/position.js

@@ -91,6 +91,7 @@ const getRation = async () => {
 getRation()
 
 export const commissionCalculation = (count, type) => {
+  if (count && type === 'realPay') return ((count - 0)/100) // 众聘发布需要支付金额（需要统一除以100）
   if (!data || !Object.keys(data).length) return
   const ratio = parseFloat(data[list[type]]) / 100
   const value = (count * ratio)/100 // 后端需要除100

src/views/recruit/enterprise/positionManagement/components/item.vue

@@ -106,7 +106,7 @@ const spuName = ref('')
 const toPay = (val) => {
   spuId.value = val.id || ''
   spuName.value = val.name || ''
-  cost.value = (val.hirePrice - 0) || 0
+  cost.value = commissionCalculation(val.hirePrice, 'realPay')
   // 打开支付弹窗
   showConfirmPaymentDialog.value = true
 }

src/views/recruit/personal/remuse/components/workExperience.vue

@@ -138,7 +138,8 @@ const formItems = ref({
       value: null,
       label: '结束时间 *',
       col: 6,
-      showSoFar: true,
+      // default: true, // 日期组件有showSoFar要给default: true不然给null会默认勾选上至今
+      // showSoFar: true,
       outlined: true,
       clearable: true,
       rules: [v => !!v || '请选择结束时间']