diff --git a/public/data.js b/public/data.js index 6964b3d..dcdd78a 100644 --- a/public/data.js +++ b/public/data.js @@ -8,7 +8,7 @@ let data1 = { fee: 10000, scaleCost: 100000,// scale的cost的合计数 overview: '项目概况××××', - desc: ' 在履行造价咨询服务时,宜根据咨询服务质量情况分级确定相应的处罚金额。其中考评得分在大于及等于85和小于90分时,处罚金额为预算费用的10%;其中考评得分在大于及等于80和小于85分时,处罚金额为预算费用的20%;其中考评得分在大于及等于75和小于80分时,处罚金额为预算费用的30%;其中考评得分在大于及等于70和小于75分时,处罚金额为预算费用的40%;其中考评得分小于70分时,处罚金额为预算费用的50%以上。', + desc: '在履行造价咨询服务时,宜根据咨询服务质量情况分级确定相应的处罚金额。其中考评得分在大于及等于85和小于90分时,处罚金额为预算费用的10%;其中考评得分在大于及等于80和小于85分时,处罚金额为预算费用的20%;其中考评得分在大于及等于75和小于80分时,处罚金额为预算费用的30%;其中考评得分在大于及等于70和小于75分时,处罚金额为预算费用的40%;其中考评得分小于70分时,处罚金额为预算费用的50%以上。', scale: [// 规模信息 { major: 0, @@ -93,15 +93,15 @@ let data1 = { services: [ { id: 0, - fee: 100000, - finalFee: 100000, + fee: 250000,//小计 + finalFee: 250000,//确认金额 process: 0,// 工作环节,0为编制,1为审核 method1: { // 投资规模法 cost: 100000, basicFee: 200, basicFee_basic: 200, basicFee_optional: 0, - fee: 250000, + fee: 250000, //小计 proAmount: 3, det: [ { @@ -195,7 +195,9 @@ let data1 = { }, ], }, - tasks: [{ serviceid: 0, process: 0, text: ['abc', 'efg'] }, { serviceid: 1, process: 0, text: ['abc', 'efg'] }],// 工作内容 + tasks: [{ serviceid: 0, text: ['abc', 'efg'] }, + { serviceid: 2,text: ['abc', 'efg'] } //tasks不分组的时候传单对象[{text: ['abc', 'efg']}],分组的时候传分组的serviceid + ],// 工作内容 }, ], addtional: {// 附加工作费 @@ -252,6 +254,7 @@ let data1 = { }, ], }, + tasks:[] }, { id: 1, @@ -306,6 +309,7 @@ let data1 = { }, ], }, + tasks:[] }, ] }, @@ -313,6 +317,7 @@ let data1 = { ref: { richText: [{ font: { charset: 134, color: { theme: 1 }, italic: true, name: '宋体', size: 10 }, text: 'Y' }, { font: { charset: 134, color: { theme: 1 }, italic: true, name: 'Calibri', size: 10, vertAlign: 'subscript' }, text: 'B' }] }, name: '预备费', fee: 10000, + tasks:[], m0: { coe: 0.03, fee: 10000, diff --git a/src/components/ht/Ht.vue b/src/components/ht/Ht.vue index 64e4035..3cef0f2 100644 --- a/src/components/ht/Ht.vue +++ b/src/components/ht/Ht.vue @@ -1469,7 +1469,7 @@ watch(budgetRefreshSignature, (next, prev) => { { v-if="!isListLayout" :class="[ 'px-6 text-xs text-muted-foreground', - 'space-y-1 ' + 'space-y-1 pb-1' ]" >
ID:{{ element.id }}
diff --git a/src/components/ht/HtFeeRateMethodForm.vue b/src/components/ht/HtFeeRateMethodForm.vue index c85c113..933a0c6 100644 --- a/src/components/ht/HtFeeRateMethodForm.vue +++ b/src/components/ht/HtFeeRateMethodForm.vue @@ -211,7 +211,7 @@ onBeforeUnmount(() => { @@ -231,3 +231,8 @@ onBeforeUnmount(() => { + diff --git a/src/components/shared/HourlyFeeGrid.vue b/src/components/shared/HourlyFeeGrid.vue index f2be4c7..6187999 100644 --- a/src/components/shared/HourlyFeeGrid.vue +++ b/src/components/shared/HourlyFeeGrid.vue @@ -1,5 +1,5 @@ @@ -602,6 +648,8 @@ onBeforeUnmount(() => { :undoRedoCellEditing="true" :undoRedoCellEditingLimit="20" @grid-ready="handleGridReady" + @grid-size-changed="onGridSizeChanged" + @column-resized="onColumnResized" /> diff --git a/src/components/shared/HtFeeMethodGrid.vue b/src/components/shared/HtFeeMethodGrid.vue index 6a9082d..cc1b689 100644 --- a/src/components/shared/HtFeeMethodGrid.vue +++ b/src/components/shared/HtFeeMethodGrid.vue @@ -219,7 +219,7 @@ const hydrateRowsFromMethodStores = async (rows: FeeMethodRow[]): Promise { - +
+ +