Browse Source

Merge remote-tracking branch 'origin/master'

ZaiZai 1 year ago
parent
commit
12c26772d3

+ 2 - 1
src/views/project/debit/contract/check-list.vue

@@ -359,7 +359,7 @@ const searchForm = ref({})
 
 //数据格式
 const treeProps = {
-    label: 'formName',
+    label: 'nodeName',
     children: 'children',
     isLeaf: function (data) {
           return !data.hasChild
@@ -706,6 +706,7 @@ const addsupply = ()=>{
         isFormNode:1,
         isSupplement:1,
         chapterNumber:treeItem.value?.chapterNumber,
+        formType:treeItem.value?.formType,
   
     }
     supplementsModalShow.value = true

+ 1 - 1
src/views/project/debit/contract/components/check-list/info-table1.vue

@@ -30,7 +30,7 @@
             <hc-info-table-td center is-title width="120px">变更后数量:</hc-info-table-td>
             <hc-info-table-td width="auto">{{ infoData?.changeTotal }}</hc-info-table-td>
             <hc-info-table-td center is-title width="120px">专项暂定金:</hc-info-table-td>
-            <hc-info-table-td width="auto">{{ infoData?.changePrice }}</hc-info-table-td>
+            <hc-info-table-td width="auto">{{ infoData?.isSpecialFund }}</hc-info-table-td>
         </tr>
         <tr>
             <hc-info-table-td center is-title width="120px">合同金额:</hc-info-table-td>

+ 1 - 1
src/views/project/debit/contract/unit.vue

@@ -141,7 +141,7 @@ const setTree = async ()=>{
     })
     setLoading.value = false
     if (!error && code === 200) {
-        window.$meaasge.sucess(msg)
+        window.$message.sucess(msg)
         ishowTree.value = false
         setTimeout(() => {
             ishowTree.value = true

+ 1 - 1
src/views/project/debit/project/unit.vue

@@ -172,7 +172,7 @@ const setTree = async ()=>{
     })
     setLoading.value = false
     if (!error && code === 200) {
-        window.$meaasge.sucess(msg)
+        window.$message.sucess(msg)
         ishowTree.value = false
         setTimeout(() => {
             ishowTree.value = true