Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient

wupengfei

3 天以前 48c3524973a0fa618dd7f9f860dc2ff8bce26f9d

Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient

 src/views/EmploymentManage/components/AddOrEditEmploymentView.vue

@@ -69,7 +69,9 @@
                  prop="verifyWorkHours"
                  :check-rules="[{ message: '请输入核定工时' }]"
                >
                  <span v-if="isDetail && !form.verifyWorkHours"></span>
                  <ProFormInputNumber
                    v-else
                    :controls="false"
                    v-model="form.verifyWorkHours"
                    placeholder="请输入核定工时"
@@ -88,7 +90,9 @@
                  prop="timeoutServiceFee"
                  :check-rules="[{ message: '请输入超时服务费' }]"
                >
                  <span v-if="isDetail && !form.timeoutServiceFee"></span>
                  <ProFormInputNumber
                    v-else
                    :controls="false"
                    v-model="form.timeoutServiceFee"
                    placeholder="请输入超时服务费"