admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修改BUG by cjp

Browse Source
This commit is contained in:
jxj_yjl 2023-07-05 14:17:17 +08:00
parent 438e2593db
commit d60e4a85dd
14 changed files with 71 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/i18n/langs/cn/laborManage/personManage.js
View File

@ -88,7 +88,7 @@ export default {
termOfContract: '合同期限',
fixedTermContract: '固定期限合同',
certainAmountOfWork: '以完成一定工作为期限的合同',
effectiveDate: '生效日期',
effectiveDate: '身份证有效日期',
expiryDate: '失效日期',
wageVerificationMethod: '工资核定方式',
perDiem: '按天',

4
src/views/equipmentCenter/waterManage/devManage.vue
View File

@ -25,12 +25,12 @@
align="center"
></el-table-column>
<el-table-column
prop="gateStatus"
prop="online"
:label="$t('message.alarmValueSet.isClosed')"
align="center"
>
<template slot-scope="scope">{{
$t('message.deviceManage.isClosedArr')[scope.row.gateStatus - 1]
$t('message.deviceManage.isClosedArr')[scope.row.online - 1]
}}</template>
</el-table-column>
<el-table-column

12
src/views/projectFront/configManage/sysConfig.vue
View File

@ -130,9 +130,15 @@
<!-- 短信推送人 -->
<el-form-item :label="$t('message.projectInfo.messagePushPeople')" >
<div v-for="(item,index) in form.raisePeopleList" :key="index" class="personItem">
<el-input v-model="item.phone" :placeholder="$t('message.projectInfo.placeholder')+$t('message.projectInfo.phoneNo')" class="phone"></el-input>
<el-input v-model="item.name" :placeholder="$t('message.projectInfo.placeholder')+$t('message.projectInfo.name')" class="name"></el-input>
<i class="redText el-icon-remove" style="margin-left: 10px" @click="operateAddPerson(1,false,index)"></i>
<el-input
v-model="item.phone"
:placeholder="$t('message.projectInfo.placeholder')+$t('message.projectInfo.phoneNo')"
class="phone"
type="number"
oninput="if(value.length>11)value=value.slice(0,11)"
></el-input>
<el-input v-model="item.name" :placeholder="$t('message.projectInfo.placeholder')+$t('message.projectInfo.name')" class="name"></el-input>
<i class="redText el-icon-remove" style="margin-left: 10px" @click="operateAddPerson(1,false,index)"></i>
</div>
<el-button plain type="primary" size="mini" style="margin: 10px 0" @click="operateAddPerson(1,true)">
<!-- 新增人员 -->

7
src/views/projectFront/laborManage/Payoff/index.vue
View File

@ -288,6 +288,8 @@
placeholder="请输入应发工资"
clearable
:style="{ width: '100%' }"
type="number"
oninput="if(value.length>11)value=value.slice(0,11)"
>
</el-input>
</el-form-item>
@ -297,6 +299,8 @@
placeholder="请输入实发工资"
clearable
:style="{ width: '100%' }"
type="number"
oninput="if(value.length>11)value=value.slice(0,11)"
>
</el-input>
</el-form-item>
@ -445,7 +449,7 @@ export default {
payrollRecord(this.queryParams).then(({ result }) => {
console.log('查询用户数据: ', result);
this.userList = result.records;
this.total = result.total;
this.total = result.total - 0;
this.loading = false;
})
},
@ -524,6 +528,7 @@ export default {
handleUploadSuccess(res) {
if (res.code == 200) {
this.$message.success(res.message);
this.getEnterpriseList()
} else {
this.$message.error(res.message);
}

4
src/views/projectFront/laborManage/attendanceManage/attendanceRules.vue
View File

@ -108,12 +108,14 @@
<el-input
v-model="workerInfo.notLater"
:placeholder="$t('message.workType.placeholder')"
type="number"
></el-input>
</el-form-item>
<el-form-item :label="$t('message.workType.workInfo.yesLater')">
<el-input
v-model="workerInfo.yesLater"
:placeholder="$t('message.workType.placeholder')"
type="number"
></el-input>
</el-form-item>
@ -121,12 +123,14 @@
<el-input
v-model="workerInfo.notAdvance"
:placeholder="$t('message.workType.placeholder')"
type="number"
></el-input>
</el-form-item>
<el-form-item :label="$t('message.workType.workInfo.yesAdvance')">
<el-input
v-model="workerInfo.yesAdvance"
:placeholder="$t('message.workType.placeholder')"
type="number"
></el-input>
</el-form-item>
<el-form-item

5
src/views/projectFront/laborManage/electronicFence.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="fullHeight">
<vue-scroll>
<div class="container-box">
<el-button type="primary" @click="showDialogFn" size="medium">
{{
$t("message.laborMange.add") + $t("message.laborMange.attendanceArea")
@ -204,6 +205,7 @@
</div>
</el-dialog>
</div>
</vue-scroll>
</template>
<script>
import {
@ -524,6 +526,7 @@ export default {
};
</script>
<style lang="less" scoped>
.fence-info {
border: 1px solid #e6e6e6;
border-radius: 4px;

4
src/views/projectFront/laborManage/penalize.vue
View File

@ -289,6 +289,7 @@
maxlength="10"
@input="transformFn"
v-model="dialogForm.finePrice"
type="number"
>
</el-input>
<span v-else>{{ dialogForm.finePrice }}</span>
@ -604,7 +605,7 @@ export default {
//小写转大写
transformFn(number) {
if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(number)) return "";
if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(number)) return this.amountInWords = null;
var ret = "";
if (number != "" && number != null && number != "0") {
var unit = this.$t("message.laborMange.moneyUnit"),
@ -629,6 +630,7 @@ export default {
.replace(/元$/g, "元") + "整";
}
this.amountInWords = ret;
// console.log('number',number)
},
//上传之前

12
src/views/projectFront/laborManage/personDetails.vue
View File

@ -295,7 +295,7 @@
</el-col>
</el-row>
<el-row :gutter="24">
<!-- <el-row :gutter="24">
<el-col :span="12">
<el-form-item label="开户行" prop="payRollBankName">
<el-input
@ -319,7 +319,7 @@
<span v-else>{{ workerInfo.payRollBankNumber }}</span>
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<el-row :gutter="24">
<el-col :span="12">
@ -1415,6 +1415,8 @@
size="small"
v-model="scope.row.personHeight"
:placeholder="$t('message.laborMange.placeholder2')"
type="number"
oninput="if(value.length>3)value=value.slice(0,3)"
></el-input>
<span v-else>{{ scope.row.personHeight }}</span>
</template>
@ -1429,6 +1431,8 @@
size="small"
v-model="scope.row.personWeight"
:placeholder="$t('message.laborMange.placeholder2')"
type="number"
oninput="if(value.length>3)value=value.slice(0,3)"
></el-input>
<span v-else>{{ scope.row.personWeight }}</span>
</template>
@ -1824,7 +1828,7 @@
>
</el-table-column>
<el-table-column
prop="reason"
prop="eventTitle"
:label="$t('message.laborMange.eventReason')"
>
</el-table-column>
@ -1878,7 +1882,7 @@
>
</el-table-column>
<el-table-column
prop="reason"
prop="eventTitle"
:label="$t('message.laborMange.eventReason')"
>
</el-table-column>

3
src/views/projectFront/laborManage/personModule/administration.vue
View File

@ -2063,6 +2063,9 @@ export default {
if (file.code == 200) {
this.$message.success(file.message) //导入成功
this.refreshBtn()
this.getTeamList()
}else {
this.$message.error(file.message)
}
this.$nextTick(() => {
this.refreshPage = true

2
src/views/projectFront/laborManage/personModule/laborComponent.vue
View File

@ -2336,6 +2336,8 @@ export default {
this.$message.success(file.message) //导入成功
this.refreshBtn()
this.getTeamList()
}else {
this.$message.error(file.message)
}
this.$nextTick(() => {
this.refreshPage = true

22
src/views/projectFront/laborManage/personModule/temporary.vue
View File

@ -253,6 +253,7 @@
style="width: 210px"
:placeholder="$t('message.laborMange.placeholder2')"
maxlength="18"
@input="handleIdCardInput($event)"
></el-input>
</el-form-item>
</el-col>
@ -694,6 +695,27 @@ export default {
this.getInfoList();
},
methods: {
// 输入框输入后触发(输入身份证号码，自动产生出生日期)
handleIdCardInput(idCard) {
// console.log('身份证输入',idCard)
// 自动产生出生日期
if (idCard.length >= 14) {
const bornStr = idCard.substr(6, 4) + '-' + idCard.substr(10, 2) + '-' + idCard.substr(12, 2)
this.addForm.birthday = bornStr
}
// 自动判定性别
// if (idCard.length >= 17) {
// const sexStr = idCard.substr(16, 1)
// const sexInt = parseInt(sexStr)
// if (sexInt % 2 === 0) { // 女
// this.form.sex = 2
// } else { // 男
// this.form.sex = 1
// }
// }
},
parseCode(code) {
if (code == 0) {
return ["info", this.$t("message.laborMange.codeless")];

3
src/views/projectFront/projectSummary/baseInfo.vue
View File

@ -459,6 +459,7 @@
<el-input
v-model="addProjectForm.projectAcreage"
:placeholder="$t('message.companyDiagram.PleaseEnter')"
type="number"
></el-input>
</el-form-item>
<el-form-item
@ -523,9 +524,9 @@
prop="saleAcreage"
>
<el-input
type="digit"
v-model="addProjectForm.saleAcreage"
:placeholder="$t('message.companyDiagram.PleaseEnter')"
type="number"
></el-input>
</el-form-item>
<el-form-item

3
src/views/projectFront/projectSummary/manageTeam.vue
View File

@ -120,6 +120,8 @@
<el-input
v-model="addEditForm.phone"
:placeholder="$t('message.deviceManage.placeholder')"
type="number"
oninput="if(value.length>11)value=value.slice(0,11)"
></el-input>
</el-form-item>
<el-form-item :label="$t('message.manageTeam.imageUrl')">
@ -141,6 +143,7 @@
v-model="addEditForm.identityCard"
:disabled="Popup.type === 'edit'"
:placeholder="$t('message.deviceManage.placeholder')"
maxlength="18"
></el-input>
</el-form-item>
<div class="dialog-footer">

3
src/views/projectFront/towerCrane/basicInfo.vue
View File

@ -785,6 +785,7 @@
v-model="facilityForm.forearmLength"
:placeholder="$t('message.towerCrane.pleaseEnter')"
type="number"
oninput="if(value.length>11)value=value.slice(0,11)"
></el-input>
</el-form-item>
<!-- 工作时长判定时间(min) -->
@ -796,13 +797,13 @@
v-model="facilityForm.workingHoursJudge"
:placeholder="$t('message.towerCrane.pleaseEnter')"
type="number"
oninput="if(value.length>11)value=value.slice(0,11)"
></el-input>
</el-form-item>
<!-- 后臂长(m) -->
<el-form-item
:label="$t('message.towerCrane.rearArmLength') + '(m)'"
prop="posteriorArmLength"
type="number"
>
<el-input
v-model="facilityForm.posteriorArmLength"