Commit b90ddcc4 authored by tianhongyang's avatar tianhongyang

fix bug

parent afaf8647
...@@ -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
});
}
});
} }
}, },
} }
......
...@@ -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.id) return; if (!row.actualId) return;
// 打开推送推送弹窗 // 打开推送推送弹窗
const _temp = { const _temp = {
...this.pushProjectUseTemp, ...{ ...this.pushProjectUseTemp, ...{
id: row.id, id: row.actualId,
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;
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment