|
|
@@ -89,7 +89,7 @@
|
|
|
</template>
|
|
|
|
|
|
<template slot="xmIdForm">
|
|
|
- <project-select v-model="form.xmId" :params="{ yearAndMonth: params.yearAndMonth }"></project-select>
|
|
|
+ <project-select v-model="form.xmId" :params="{ yearAndMonth: params.yearAndMonth }" :noDetail="true" @change="handleProjectChange"></project-select>
|
|
|
</template>
|
|
|
|
|
|
<template slot="assetIdForm">
|
|
|
@@ -99,6 +99,22 @@
|
|
|
@change="handleAssetChange"
|
|
|
></asset-select>
|
|
|
</template>
|
|
|
+
|
|
|
+ <template slot="userUnicodeForm">
|
|
|
+ <el-select
|
|
|
+ v-model="form.userUnicode"
|
|
|
+ filterable
|
|
|
+ placeholder="请选择 使用人"
|
|
|
+ style="width: 100%;"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in cyPersonList"
|
|
|
+ :key="item.unicode"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.unicode">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
|
|
|
</avue-crud>
|
|
|
|
|
|
@@ -116,7 +132,8 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { fetchDeviceData } from "@/api/yfCostManage/basicDataSetting/wxzcDetail"
|
|
|
+import { fetchDeviceData } from "@/api/yfCostManage/basicDataSetting/wxzcDetail";
|
|
|
+import { getList as getCyPersonList } from "@/api/techPerson/cyPersonSumList"
|
|
|
import YearMonthSelect from "@/components/year-month-select";
|
|
|
import UploadExcelDialog from "@/components/upload-excel-dialog";
|
|
|
import projectSelect from "@/components/project-select";
|
|
|
@@ -138,6 +155,8 @@ export default window.$crudCommon({
|
|
|
},
|
|
|
isSelAnnual: false,
|
|
|
|
|
|
+ cyPersonList: [],
|
|
|
+
|
|
|
wideTableColumns: [],
|
|
|
printTitle: "",
|
|
|
};
|
|
|
@@ -152,7 +171,7 @@ export default window.$crudCommon({
|
|
|
}
|
|
|
this.page.currentPage = 1;
|
|
|
this.getList(this.page);
|
|
|
- }
|
|
|
+ },
|
|
|
},
|
|
|
computed: {
|
|
|
permissionList() {
|
|
|
@@ -164,17 +183,16 @@ export default window.$crudCommon({
|
|
|
},
|
|
|
},
|
|
|
methods: {
|
|
|
- loadData() {},
|
|
|
handleImport() {
|
|
|
let excelParams = { yearAndMonth: this.params.yearAndMonth };
|
|
|
- this.$refs.uploadExcelDialog.open('/api/kd-scientific/asset/wxzc/import', excelParams);
|
|
|
+ this.$refs.uploadExcelDialog.open('/api/kd-scientific/asset/intangible/import', excelParams);
|
|
|
},
|
|
|
uploadAfter() {
|
|
|
this.page.currentPage = 1;
|
|
|
this.getList(this.page);
|
|
|
},
|
|
|
handleExport() {
|
|
|
- exportBloByPost(`/api/kd-scientific/asset/wxzc/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
|
|
|
+ exportBloByPost(`/api/kd-scientific/asset/intangible/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
|
|
|
downloadXls(res.data, `科研无形资产明细表${this.params.yearAndMonth}.xlsx`);
|
|
|
});
|
|
|
},
|
|
|
@@ -204,9 +222,25 @@ export default window.$crudCommon({
|
|
|
this.form = { ...this.form, zcbm };
|
|
|
},
|
|
|
getFormData() {
|
|
|
- const { xmId, assetId, zcbm } = this.form;
|
|
|
- return { xmId, assetId, zcbm, yearAndMonth: this.params.yearAndMonth };
|
|
|
+ const { id, xmId, assetId, zcbm, userUnicode } = this.form;
|
|
|
+ let userName;
|
|
|
+ if (!!userUnicode) {
|
|
|
+ let personObj = this.cyPersonList.find(item => item.unicode === userUnicode);
|
|
|
+ userName = personObj ? personObj.name : undefined;
|
|
|
+ }
|
|
|
+ return { id, xmId, assetId, zcbm, userUnicode, userName, yearAndMonth: this.params.yearAndMonth };
|
|
|
+ },
|
|
|
+ handleProjectChange(data) {
|
|
|
+ this.getCyPersonListFunc(data.xmmc);
|
|
|
},
|
|
|
+ // 获取项目参研人员列表
|
|
|
+ getCyPersonListFunc(xmmc) {
|
|
|
+ getCyPersonList(1, 99999, { xmmc, yearAndMonth: this.params.yearAndMonth }).then(({ data }) => {
|
|
|
+ if (data.code == 200) {
|
|
|
+ this.cyPersonList = data.data.records && data.data.records.length ? data.data.records[0].technicianList : [];
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
},
|
|
|
}, {
|
|
|
// 模块路径
|