Merge remote-tracking branch 'origin/master'

src/api/modules/alter/admin/order.js

@@ -45,8 +45,8 @@ export default {
     async getSelectForm(form, msg = false) {
         return HcApi({
             url: '/api/blade-meter/changeTokenForm/selectForm',
-            method: 'get',
-            params: form,
+            method: 'post',
+            data: form,
         }, msg)
     },
     //新增添加清单

src/api/modules/debit-pay/admin/middlepay.js

@@ -105,4 +105,12 @@ export default {
             params: form,
         }, msg)
     },
+    //获取当前节点下，当期未被计量的所有清单
+    async getCurrentNodeAllForm(form, msg = false) {
+        return HcApi({
+            url: '/api/blade-meter/middleMeterApply/getCurrentNodeAllForm',
+            method: 'post',
+            data: form,
+        }, msg)
+    },
 }

src/views/alter/admin/components/order/changeRequest.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-new-dialog is-table widths="90%" :show="isShow" title="变更清单添加" @save="addModalSave" @close="addModalClose">
+    <hc-new-dialog is-table widths="90%" :show="isShow" title="变更清单添加" :loading="addSaveLoad" @save="addModalSave" @close="addModalClose">
         <hc-card-item>
             <template #header>
                 <div class="w-60">
@@ -113,13 +113,16 @@ const tableCheckChange = (rows) => {
 }
 
 //保存
+const addSaveLoad = ref(false)
 const addModalSave = async () => {
     const ids = arrToKey(tableCheck.value, 'id')
+    addSaveLoad.value = true
     const { error, code, msg, data } = await mainApi.getSelectForm({
         ids: ids,
         nodeId: props.treeId,
         contractId: props.contractId,
     })
+    addSaveLoad.value = false
     if (!error && code === 200) {
         addModalClose()
         emit('finish', getArrValue(data))

src/views/debit-pay/admin/components/middlepay/addModal.vue

@@ -304,12 +304,19 @@ const treeNodeTap = ({ data }) => {
     nodeId.value = data.id
     baseForm.value.contractUnitId = data.id
     getNodeDivide(data.id)
+    getCurrentNodeAllFormData(data.id)
 }
 
 //获取工程划分
 const getNodeDivide = async (nodeId) => {
     const { data } = await mainApi.getNodeDivide({ nodeId: nodeId })
     baseForm.value.engineerDivide = data ?? ''
+}
+ //获取当前节点下，当期未被计量的所有清单
+ const getCurrentNodeAllFormData = async (nodeId) => {
+    const { data } = await mainApi.getCurrentNodeAllForm({ contractId:  cid.value, contractPeriodId:baseForm.value.contractPeriodId, contractUnitId:nodeId })
+ addTableData.value = getArrValue(data)
+ 
 }
 
 //获取变更令
@@ -349,6 +356,7 @@ const getNodeToken = async () => {
 //计量期被改变
 const periodChange = () => {
     setBasePeriodForm(baseForm.value.contractPeriodId)
+    getCurrentNodeAllFormData( nodeId.value)
 }
 
 //计量期相关的数据

src/views/project/debit/contract/components/unit/row-data.vue

@@ -316,10 +316,10 @@ const changeBuildPictureTotal = (row) => {
 
 const modalSave = async () => {
     isCanSave.value = isArrIndex(tableData.value, 'isCanSave', true)
-    if (isCanSave.value) {
-        window.$message.warning('累计分解量 > 合同变更后量,不允许修改')
-        return
-    }
+    // if (isCanSave.value) {
+    //     window.$message.warning('累计分解量 > 合同变更后量,不允许修改')
+    //     return
+    // }
     addNodeLoading.value = true
     formModel.value.decompositionList = tableData.value
     const { error, code, msg } = await unitApi.updateForm({