|
|
@@ -94,10 +94,11 @@
|
|
|
<project-select v-model="form.xmId" :params="{ yearAndMonth: params.yearAndMonth }" :noDetail="true" @change="handleProjectChange"></project-select>
|
|
|
</template>
|
|
|
|
|
|
- <template slot="assetIdForm">
|
|
|
+ <template slot="zcbm_formForm">
|
|
|
<asset-select
|
|
|
- v-model="form.assetId"
|
|
|
+ v-model="form.zcbm_form"
|
|
|
:params="{ yearAndMonth: params.yearAndMonth, zclb: '软件,专利权,非专利技术,其他' }"
|
|
|
+ valueKey="zcbm"
|
|
|
@change="handleAssetChange"
|
|
|
></asset-select>
|
|
|
</template>
|
|
|
@@ -236,17 +237,17 @@ export default window.$crudCommon({
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- handleAssetChange({ zcbm }) {
|
|
|
- this.form = { ...this.form, zcbm };
|
|
|
+ handleAssetChange({ assetId }) {
|
|
|
+ this.form = { ...this.form, assetId };
|
|
|
},
|
|
|
getFormData() {
|
|
|
- const { id, xmId, assetId, zcbm, userUnicode } = this.form;
|
|
|
+ const { id, xmId, assetId, zcbm_form, 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 };
|
|
|
+ return { id, xmId, assetId, zcbm: zcbm_form, userUnicode, userName, yearAndMonth: this.params.yearAndMonth };
|
|
|
},
|
|
|
handleProjectChange(data) {
|
|
|
this.getCyPersonListFunc(data.xmmc);
|
|
|
@@ -273,6 +274,7 @@ export default window.$crudCommon({
|
|
|
name: 'yfCostManage/basicDataSetting/wxzcDetail',
|
|
|
res: ({ data }) => {
|
|
|
data.records = data.records.map(item => {
|
|
|
+ item.zcbm_form = item.zcbm;
|
|
|
item.zcmc = item.asset ? item.asset.zcmc : '';
|
|
|
item.zclb = item.asset ? item.asset.zclb : '';
|
|
|
item.gl = item.asset ? item.asset.gl : '';
|
|
|
@@ -286,6 +288,7 @@ export default window.$crudCommon({
|
|
|
item.status = item.asset ? item.asset.status : '';
|
|
|
return item;
|
|
|
});
|
|
|
+ console.log(data.records)
|
|
|
return data;
|
|
|
},
|
|
|
});
|