fix bug

dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/components/PushProjectUseDialog.vue

@@ -13,15 +13,15 @@
           <el-input v-model="pushForm.pushQuantities" @input="pushQuantitiesIpt" placeholder="请填写需推送工程量"></el-input>
         </el-form-item>
         <!-- ipm项目编码 -->
-        <el-form-item label="IPM项目编码">
+        <el-form-item label="IPM项目编码" prop="ipmProjectCode">
           <el-input v-model="pushForm.ipmProjectCode" placeholder="请输入IPM项目编码"></el-input>
         </el-form-item>
         <!-- ipm合同编码 -->
-        <el-form-item label="IPM合同编码">
+        <el-form-item label="IPM合同编码" prop="ipmContractCode">
           <el-input v-model="pushForm.ipmContractCode" placeholder="请输入IPM合同编码"></el-input>
         </el-form-item>
         <!-- ipm作业编码 -->
-        <el-form-item label="IPM作业编码">
+        <el-form-item label="IPM作业编码" prop="ipmBizCode">
           <el-input v-model="pushForm.ipmBizCode" placeholder="请输入IPM作业编码"></el-input>
         </el-form-item>
       </el-form>
@@ -29,7 +29,7 @@
     <!-- 底部按钮 -->
     <div class="dialog-footer-content">
       <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>
   </el-dialog>
 </template>
@@ -87,7 +87,17 @@ export default {
         ipmContractCode: "",
         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属性
@@ -133,6 +143,21 @@ export default {
     },
     cancelSubmit() {
       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

@@ -87,7 +87,7 @@
 
     <!-- 推送工程量 ， 推送物资 -->
     <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"
@@ -674,15 +674,15 @@ export default {
     },
     // 推送工程用量
     pushProjectUse(row) {
-      if (!row.id) return;
+      if (!row.actualId) return;
       // 打开推送推送弹窗
       const _temp = {
         ...this.pushProjectUseTemp, ...{
-          id: row.id,
+          id: row.actualId,
           projectName: this.projectDetailInfo.projectName,
           totalQuantities: row.totalQuantities,
           pushQuantities: "",
-          ipmProjectCode: "",
+          ipmProjectCode: this.projectDetailInfo.ipmProjectNo,
           ipmContractCode: "",
           ipmBizCode: ""
         }
@@ -694,6 +694,14 @@ export default {
     dialogClose() {
       this.pushProjectUseTemp = this.$options.data.call(this).pushProjectUseTemp;
     },
+    // 确定推送
+    async submitPushData(pushForm) {
+      try {
+        const result = await pushFeedSummaryRowsApi(pushForm);
+      } catch (error) {
+
+      }
+    },
     differentCompare() {
       const originData = this.originTableDataList;
       /**