|
|
@@ -119,7 +119,7 @@ export default window.$crudCommon({
|
|
|
this.option.column.forEach(item => {
|
|
|
if (item.prop == "technicianId") {
|
|
|
let startDate = this.selProject.xmkssj || new Date();
|
|
|
- let endDate = this.selProject.xmjssj || new Date();
|
|
|
+ let endDate = this.selProject.xmkssj || new Date();
|
|
|
item.dicUrl = '/api/kd-scientific/technician/page/date-interval';
|
|
|
item.dicQuery.startDate = moment(startDate).format("yyyyMM");
|
|
|
item.dicQuery.endDate = moment(endDate).format("yyyyMM");
|
|
|
@@ -141,6 +141,10 @@ export default window.$crudCommon({
|
|
|
this.selProject = data;
|
|
|
},
|
|
|
handleImport() {
|
|
|
+ if (!this.params.xmId) {
|
|
|
+ this.$message.warning("请选择项目!");
|
|
|
+ return;
|
|
|
+ }
|
|
|
let excelParams = {xmId: this.params.xmId };
|
|
|
this.$refs.uploadExcelDialog.open('/api/kd-scientific/ys-ryrgfy/import', excelParams);
|
|
|
},
|