diff --git a/src/views/basicData/jobTransferManagement.vue b/src/views/basicData/jobTransferManagement.vue
index a73018e..c898063 100644
--- a/src/views/basicData/jobTransferManagement.vue
+++ b/src/views/basicData/jobTransferManagement.vue
@@ -47,16 +47,16 @@
个人信息
- {{ scope.row.dataBirth ?scope.row.dataBirth.substring(0, 10) : ''}}
+ {{ scope.row.dataBirth ? scope.row.dataBirth.substring(0, 10) : '' }}
- {{ scope.row.contractDuration ?scope.row.contractDuration.substring(0, 10) : ''}}
+ {{ scope.row.contractDuration ? scope.row.contractDuration.substring(0, 10) : '' }}
-
- {{ scope.row.joinJobDate ?scope.row.joinJobDate.substring(0, 10) : ''}}
+
+ {{ scope.row.joinJobDate ? scope.row.joinJobDate.substring(0, 10) : '' }}
-
- {{ scope.row.inJobDate ?scope.row.inJobDate.substring(0, 10) : ''}}
+
+ {{ scope.row.inJobDate ? scope.row.inJobDate.substring(0, 10) : '' }}
@@ -103,7 +103,14 @@
-
+
@@ -579,7 +586,7 @@ export default {
labelWidth: 150,
search: false,
width: 200,
- addDisplay: false,
+ addDisplay: false,
editDisplay: false,
type: 'date',
format: 'YYYY-MM-DD HH:mm:ss',
@@ -718,7 +725,6 @@ export default {
this.showDialog = false;
this.onLoad(this.page, this.query);
});
-
} else {
console.log('error submit!!');
return false;
@@ -862,10 +868,8 @@ export default {
}
const ids = idArr.join(',');
regularization({ ids: ids }).then(res => {
- if (res.code == 200) {
- this.$message.success('转正成功');
- this.onLoad(this.page);
- }
+ this.$message.success('转正成功');
+ this.onLoad(this.page, this.query);
});
});
},
diff --git a/src/views/changeJobManagement/trainingRecordManagement.vue b/src/views/changeJobManagement/trainingRecordManagement.vue
index e4baac7..6ff9a4a 100644
--- a/src/views/changeJobManagement/trainingRecordManagement.vue
+++ b/src/views/changeJobManagement/trainingRecordManagement.vue
@@ -78,7 +78,7 @@
- 资料下载
+ 资料下载
@@ -210,7 +210,7 @@ export default {
addBtn: false,
labelWidth: 120,
menu: true,
- menuWidth: 200,
+ menuWidth: 140,
dialogWidth: 600,
dialogClickModal: false,
searchEnter: true,
diff --git a/src/views/processManagement/bathRefine/components/addPeriodicalClassDialog.vue b/src/views/processManagement/bathRefine/components/addPeriodicalClassDialog.vue
index 9c6191e..94e1eb2 100644
--- a/src/views/processManagement/bathRefine/components/addPeriodicalClassDialog.vue
+++ b/src/views/processManagement/bathRefine/components/addPeriodicalClassDialog.vue
@@ -69,6 +69,7 @@
style="width: 100%"
clearable
filterable
+ @change="batchNoChange(scope.row, scope.$index)"
>
row.id == this.form.tableData[index].batchNo
+ );
+ console.log(select, 'select');
+ this.form.tableData[index].batchNoName = select[0].name;
+ },
// 切换作业中心
changeWorkCenter(index) {
this.form.batchNo = '';
diff --git a/src/views/processManagement/bathRefine/workCenterDevice.vue b/src/views/processManagement/bathRefine/workCenterDevice.vue
index c282abb..8be0be0 100644
--- a/src/views/processManagement/bathRefine/workCenterDevice.vue
+++ b/src/views/processManagement/bathRefine/workCenterDevice.vue
@@ -61,11 +61,11 @@ export default {
delBtnIcon: ' ',
editBtnIcon: ' ',
viewBtnText: '详情',
- labelWidth: 120,
+ labelWidth: 100,
searchLabelWidth: 120,
menu: true,
menuWidth: 120,
- dialogWidth: 1200,
+ dialogWidth: 450,
dialogClickModal: false,
searchEnter: true,
excelBtn: false,
@@ -82,7 +82,7 @@ export default {
searchSpan: 6,
searchMenuPosition: 'right',
align: 'center',
-
+ span:24,
column: [
{
label: '作业中心',
@@ -116,6 +116,7 @@ export default {
type: 'select',
filterable: true,
clearable: true,
+ span:24,
// multiple: true,
search: false,
sortable: true,
diff --git a/src/views/workLicense/personnelEquipment.vue b/src/views/workLicense/personnelEquipment.vue
index 11aca80..f1aeefa 100644
--- a/src/views/workLicense/personnelEquipment.vue
+++ b/src/views/workLicense/personnelEquipment.vue
@@ -16,30 +16,28 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
-
:row-class-name="rowClassName"
>
-
+
- 批量删除
设备维护
+ 批量删除
导 入
- {{ scope.row.equipmentDate ?scope.row.equipmentDate.substring(0, 10) : ''}}
+ {{ scope.row.equipmentDate ? scope.row.equipmentDate.substring(0, 10) : '' }}
-
- {{ scope.row.deviceDueDate ?scope.row.deviceDueDate.substring(0, 10) : ''}}
+
+ {{ scope.row.deviceDueDate ? scope.row.deviceDueDate.substring(0, 10) : '' }}
- {{ scope.row.dataBirth ?scope.row.dataBirth.substring(0, 10) : ''}}
+ {{ scope.row.dataBirth ? scope.row.dataBirth.substring(0, 10) : '' }}
- {{ scope.row.validityPeriodExpire ?scope.row.validityPeriodExpire.substring(0, 10) : ''}}
+ {{ scope.row.validityPeriodExpire ? scope.row.validityPeriodExpire.substring(0, 10) : '' }}
-
!item.certificateTypeId || item.certificateTypeId === ''
);
diff --git a/src/views/workLicense/workLicense.vue b/src/views/workLicense/workLicense.vue
index 3f57576..2887ec3 100644
--- a/src/views/workLicense/workLicense.vue
+++ b/src/views/workLicense/workLicense.vue
@@ -19,8 +19,8 @@
>
- 批量删除
证书维护
+ 批量删除
导 入
@@ -42,16 +42,24 @@
- {{ scope.row.airworthinessDateExpire ? scope.row.airworthinessDateExpire.substring(0, 10) : '' }}
+ {{
+ scope.row.airworthinessDateExpire
+ ? scope.row.airworthinessDateExpire.substring(0, 10)
+ : ''
+ }}
{{ scope.row.astronautDate ? scope.row.astronautDate.substring(0, 10) : '' }}
-
+
{{ scope.row.astronautDateExpire ? scope.row.astronautDateExpire.substring(0, 10) : '' }}
- {{ scope.row.astronautValidityPeriod ? scope.row.astronautValidityPeriod.substring(0, 10) : '' }}
+ {{
+ scope.row.astronautValidityPeriod
+ ? scope.row.astronautValidityPeriod.substring(0, 10)
+ : ''
+ }}
@@ -349,7 +357,7 @@ export default {
},
],
},
- {
+ {
label: '宇航有效期(年)',
prop: 'astronautValidityPeriod',
span: 24,