Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fulixin
dsk-operate-sys-cscec
Commits
b90ddcc4
Commit
b90ddcc4
authored
Apr 01, 2024
by
tianhongyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
afaf8647
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
9 deletions
+42
-9
PushProjectUseDialog.vue
...omponents/FeedSummary/components/PushProjectUseDialog.vue
+30
-5
index.vue
...projectCostLedger/detail/components/FeedSummary/index.vue
+12
-4
No files found.
dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/components/PushProjectUseDialog.vue
View file @
b90ddcc4
...
@@ -13,15 +13,15 @@
...
@@ -13,15 +13,15 @@
<el-input
v-model=
"pushForm.pushQuantities"
@
input=
"pushQuantitiesIpt"
placeholder=
"请填写需推送工程量"
></el-input>
<el-input
v-model=
"pushForm.pushQuantities"
@
input=
"pushQuantitiesIpt"
placeholder=
"请填写需推送工程量"
></el-input>
</el-form-item>
</el-form-item>
<!-- ipm项目编码 -->
<!-- ipm项目编码 -->
<el-form-item
label=
"IPM项目编码"
>
<el-form-item
label=
"IPM项目编码"
prop=
"ipmProjectCode"
>
<el-input
v-model=
"pushForm.ipmProjectCode"
placeholder=
"请输入IPM项目编码"
></el-input>
<el-input
v-model=
"pushForm.ipmProjectCode"
placeholder=
"请输入IPM项目编码"
></el-input>
</el-form-item>
</el-form-item>
<!-- ipm合同编码 -->
<!-- ipm合同编码 -->
<el-form-item
label=
"IPM合同编码"
>
<el-form-item
label=
"IPM合同编码"
prop=
"ipmContractCode"
>
<el-input
v-model=
"pushForm.ipmContractCode"
placeholder=
"请输入IPM合同编码"
></el-input>
<el-input
v-model=
"pushForm.ipmContractCode"
placeholder=
"请输入IPM合同编码"
></el-input>
</el-form-item>
</el-form-item>
<!-- ipm作业编码 -->
<!-- ipm作业编码 -->
<el-form-item
label=
"IPM作业编码"
>
<el-form-item
label=
"IPM作业编码"
prop=
"ipmBizCode"
>
<el-input
v-model=
"pushForm.ipmBizCode"
placeholder=
"请输入IPM作业编码"
></el-input>
<el-input
v-model=
"pushForm.ipmBizCode"
placeholder=
"请输入IPM作业编码"
></el-input>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
<!-- 底部按钮 -->
<!-- 底部按钮 -->
<div
class=
"dialog-footer-content"
>
<div
class=
"dialog-footer-content"
>
<div
class=
"footer-btn cancel-submit"
@
click=
"cancelSubmit"
>
取消
</div>
<div
class=
"footer-btn cancel-submit"
@
click=
"cancelSubmit"
>
取消
</div>
<div
class=
"footer-btn ok-submit"
>
确定推送
</div>
<div
class=
"footer-btn ok-submit"
@
click=
"pushResult"
>
确定推送
</div>
</div>
</div>
</el-dialog>
</el-dialog>
</
template
>
</
template
>
...
@@ -87,7 +87,17 @@ export default {
...
@@ -87,7 +87,17 @@ export default {
ipmContractCode
:
""
,
ipmContractCode
:
""
,
ipmBizCode
:
""
,
ipmBizCode
:
""
,
},
},
rules
:
{}
rules
:
{
ipmProjectCode
:
[
{
required
:
true
,
trigger
:
[
"blur"
,
"change"
],
message
:
"请输入IPM项目编码"
,
whitespace
:
true
}
],
ipmContractCode
:
[
{
required
:
true
,
trigger
:
[
"blur"
,
"change"
],
message
:
"请输入IPM合同编码"
,
whitespace
:
true
}
],
ipmBizCode
:
[
{
required
:
true
,
trigger
:
[
"blur"
,
"change"
],
message
:
"请输入IPM作业编码"
,
whitespace
:
true
}
]
}
};
};
},
},
//可访问data属性
//可访问data属性
...
@@ -133,6 +143,21 @@ export default {
...
@@ -133,6 +143,21 @@ export default {
},
},
cancelSubmit
()
{
cancelSubmit
()
{
this
.
comPushProjectUseDialog
=
false
;
this
.
comPushProjectUseDialog
=
false
;
},
//推送工程量
pushResult
()
{
this
.
$refs
[
"pushForm"
].
validate
(
flag
=>
{
if
(
flag
)
{
const
{
id
,
pushQuantities
,
ipmProjectCode
,
ipmContractCode
,
ipmBizCode
}
=
cloneDeep
(
this
.
pushForm
);
this
.
$emit
(
"submitPushData"
,
{
id
,
pushQuantities
,
ipmProjectCode
,
ipmContractCode
,
ipmBizCode
});
}
});
}
}
},
},
}
}
...
...
dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/index.vue
View file @
b90ddcc4
...
@@ -87,7 +87,7 @@
...
@@ -87,7 +87,7 @@
<!-- 推送工程量 , 推送物资 -->
<!-- 推送工程量 , 推送物资 -->
<push-project-use-dialog
v-model=
"pushProjectUseDialog"
:is-entity-materials=
"isEntityMaterials"
:row-data=
"pushProjectUseTemp"
<push-project-use-dialog
v-model=
"pushProjectUseDialog"
:is-entity-materials=
"isEntityMaterials"
:row-data=
"pushProjectUseTemp"
@
dialogClose=
"dialogClose"
></push-project-use-dialog>
@
dialogClose=
"dialogClose"
@
submitPushData=
"submitPushData"
></push-project-use-dialog>
<!-- 单位换算弹窗 -->
<!-- 单位换算弹窗 -->
<unit-conversion
v-if=
"showUnitConversion"
:isVisible=
"showUnitConversion"
:dataList=
"unitConversionList"
<unit-conversion
v-if=
"showUnitConversion"
:isVisible=
"showUnitConversion"
:dataList=
"unitConversionList"
...
@@ -674,15 +674,15 @@ export default {
...
@@ -674,15 +674,15 @@ export default {
},
},
// 推送工程用量
// 推送工程用量
pushProjectUse
(
row
)
{
pushProjectUse
(
row
)
{
if
(
!
row
.
i
d
)
return
;
if
(
!
row
.
actualI
d
)
return
;
// 打开推送推送弹窗
// 打开推送推送弹窗
const
_temp
=
{
const
_temp
=
{
...
this
.
pushProjectUseTemp
,
...{
...
this
.
pushProjectUseTemp
,
...{
id
:
row
.
i
d
,
id
:
row
.
actualI
d
,
projectName
:
this
.
projectDetailInfo
.
projectName
,
projectName
:
this
.
projectDetailInfo
.
projectName
,
totalQuantities
:
row
.
totalQuantities
,
totalQuantities
:
row
.
totalQuantities
,
pushQuantities
:
""
,
pushQuantities
:
""
,
ipmProjectCode
:
""
,
ipmProjectCode
:
this
.
projectDetailInfo
.
ipmProjectNo
,
ipmContractCode
:
""
,
ipmContractCode
:
""
,
ipmBizCode
:
""
ipmBizCode
:
""
}
}
...
@@ -694,6 +694,14 @@ export default {
...
@@ -694,6 +694,14 @@ export default {
dialogClose
()
{
dialogClose
()
{
this
.
pushProjectUseTemp
=
this
.
$options
.
data
.
call
(
this
).
pushProjectUseTemp
;
this
.
pushProjectUseTemp
=
this
.
$options
.
data
.
call
(
this
).
pushProjectUseTemp
;
},
},
// 确定推送
async
submitPushData
(
pushForm
)
{
try
{
const
result
=
await
pushFeedSummaryRowsApi
(
pushForm
);
}
catch
(
error
)
{
}
},
differentCompare
()
{
differentCompare
()
{
const
originData
=
this
.
originTableDataList
;
const
originData
=
this
.
originTableDataList
;
/**
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment