908ef79a by lihua

去掉资源名称;编辑维度时传guid

1 parent 2d0b4959
......@@ -92,7 +92,7 @@ const productConfigFormItems = ref([{
label: '数据产品名称',
type: 'input',
placeholder: '请输入',
field: 'damName',
field: 'dataResourceGuid',
default: '',
required: true,
maxlength: 50,
......@@ -113,7 +113,7 @@ const productConfigFormRules = ref({
companyName: [required('请填写企业名称')],
contactPerson: [required('请填写联系人')],
contactInformation: [required('请填写联系方式')],
damName: [required('请填写产品名称')],
dataResourceGuid: [required('请填写数据产品名称')],
productDesc: [required('请填写产品简介')],
});
......@@ -135,16 +135,16 @@ const baseConfigFormItems: any = ref([
filterable: true,
required: true
},
{
label: '数据资源名称',
type: 'input',
placeholder: '请输入',
field: 'dataResourceGuid',
maxlength: 50,
default: '',
clearable: true,
required: true
},
// {
// label: '数据资源名称',
// type: 'input',
// placeholder: '请输入',
// field: 'dataResourceGuid',
// maxlength: 50,
// default: '',
// clearable: true,
// required: true
// },
// {
// label: '数据资源',
// type: 'select',
......@@ -751,7 +751,7 @@ const selectChange = async (val, row, info) => {
val && getModelInfo(val);
currModelGuid.value = val || '';
qualityScoreData.value = {};
baseConfigFormItems.value[1].default = '';
// baseConfigFormItems.value[1].default = '';
// changeDatasource();
}
// else if (row.field == 'dataResourceGuid') {
......@@ -856,8 +856,8 @@ const getCalculateParams = (baseConfigFormObj, baseConfigFormInfo) => {
dataTransactionPrice: dataTransactionPrice.value,
modelGuid: baseConfigFormInfo.modelGuid,
modelName,
dataResourceGuid: baseConfigFormInfo.dataResourceGuid,
dataResourceName: baseConfigFormInfo.dataResourceGuid,
dataResourceGuid: companyInfo.dataResourceGuid,
dataResourceName: companyInfo.dataResourceGuid,
belongingEntityGuid: companyInfo.companyName,
belongingTheme: baseConfigFormInfo.belongingTheme,
diseaseGuid,
......
......@@ -1105,6 +1105,7 @@ const drawerBtnClick = async (btn, info) => {
pricingTargetRSVOS: []
})
} else if (drawerInfo.value.type == 'edit-signatory') {// 编辑维度
params.guid = currTableData.value.guid;
setSignatoryTableInfo(params, true);
} else if (drawerInfo.value.type == 'add-target') {// 新增指标
let factorFull = true;
......@@ -1140,6 +1141,7 @@ const drawerBtnClick = async (btn, info) => {
!sData && signatoryParams.pricingTargetRSVOS.push({ ...params, dictionaryJson: dictionaryData, dictionaryName })
}
} else if (drawerInfo.value.type == 'edit-target') {// 编辑指标
params.guid = currTableData.value.guid;
let factorFull = true;
const dictionaryData = tableData.value.map((d: any) => {
if (dictionaryType.value && !d.factor) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!