Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package.json
#	yarn.lock

src/views/debit-pay/admin/components/certificate/editModal.vue

@@ -106,14 +106,12 @@ onMounted(() => {
 const dataId = ref(props.ids)
 watch(() => props.ids, (id) => {
     dataId.value = id
-}, { immediate: true })
-
-//监听
-watch(isShow, (val) => {
-    if (val) {
+    if (id) {
         getDataDetail()
     }
-})
+}, { immediate: true })
+
+
 
 //获取合同计量期
 const allPeriodData = ref([])

src/views/debit-pay/material/book.vue

@@ -169,16 +169,12 @@ const delCilck = async (row)=>{
         text: '请谨慎考虑后，确认是否需要删除？',
         confirmText: '确认删除',
         cancelText: '取消操作',
-    }, (instance, resolve) => {
+    }, async (instance, resolve) => {
         instance.confirmButtonLoading = true
         instance.confirmButtonText = 'Loading...'
-        removeProPay(row.id)
-        setTimeout(() => {
-            resolve() //关闭弹窗的回调
-            setTimeout(() => {
-                instance.confirmButtonLoading = false
-            }, 300)
-        }, 300)
+         await removeProPay(row.id)
+         instance.confirmButtonLoading = false
+         resolve()
     })
 }
 //查看报表

src/views/debit-pay/material/contract.vue

@@ -199,16 +199,12 @@ const delRowClick = async (row)=>{
         text: '请谨慎考虑后，确认是否需要删除？',
         confirmText: '确认删除',
         cancelText: '取消操作',
-    }, (instance, resolve) => {
+    }, async (instance, resolve) => {
         instance.confirmButtonLoading = true
         instance.confirmButtonText = 'Loading...'
-        removeCon(row.id)
-        setTimeout(() => {
-            resolve() //关闭弹窗的回调
-            setTimeout(() => {
-                instance.confirmButtonLoading = false
-            }, 300)
-        }, 300)
+         await removeCon(row.id)
+         instance.confirmButtonLoading = false
+         resolve()
     })
 }
 const removeCon = async (id) => {

src/views/debit-pay/material/order.vue

@@ -248,16 +248,12 @@ const delRowClick = async (row)=>{
         text: '请谨慎考虑后，确认是否需要删除？',
         confirmText: '确认删除',
         cancelText: '取消操作',
-    }, (instance, resolve) => {
+    }, async (instance, resolve) => {
         instance.confirmButtonLoading = true
         instance.confirmButtonText = 'Loading...'
-        removeProPay(row.id)
-        setTimeout(() => {
-            resolve() //关闭弹窗的回调
-            setTimeout(() => {
-                instance.confirmButtonLoading = false
-            }, 300)
-        }, 300)
+         await removeProPay(row.id)
+         instance.confirmButtonLoading = false
+         resolve()
     })
 }
 const removeProPay = async (id) => {

src/views/debit-pay/start-work/book.vue

@@ -173,16 +173,12 @@ const delCilck = async (row)=>{
         text: '请谨慎考虑后，确认是否需要删除？',
         confirmText: '确认删除',
         cancelText: '取消操作',
-    }, (instance, resolve) => {
+    }, async (instance, resolve) => {
         instance.confirmButtonLoading = true
         instance.confirmButtonText = 'Loading...'
-        removeProPay(row.id)
-        setTimeout(() => {
-            resolve() //关闭弹窗的回调
-            setTimeout(() => {
-                instance.confirmButtonLoading = false
-            }, 300)
-        }, 300)
+         await removeProPay(row.id)
+         instance.confirmButtonLoading = false
+         resolve()
     })
 }
 

src/views/debit-pay/start-work/order.vue

@@ -215,17 +215,14 @@ const delRowClick = async (row)=>{
         text: '请谨慎考虑后，确认是否需要删除？',
         confirmText: '确认删除',
         cancelText: '取消操作',
-    }, (instance, resolve) => {
+    }, async (instance, resolve) => {
         instance.confirmButtonLoading = true
         instance.confirmButtonText = 'Loading...'
-        removeProPay(row.id)
-        setTimeout(() => {
-            resolve() //关闭弹窗的回调
-            setTimeout(() => {
-                instance.confirmButtonLoading = false
-            }, 300)
-        }, 300)
+         await removeProPay(row.id)
+         instance.confirmButtonLoading = false
+         resolve()
     })
+    
 }
 const removeProPay = async (id) => {
     const { error, code, msg } = await mainApi.remove({

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

@@ -449,16 +449,12 @@ const delRow = async (row, index) => {
         text: '请谨慎考虑后，确认是否需要删除？',
         confirmText: '确认删除',
         cancelText: '取消操作',
-    }, (instance, resolve) => {
+    }, async (instance, resolve) => {
         instance.confirmButtonLoading = true
         instance.confirmButtonText = 'Loading...'
-        removeCon(row.id, index)
-        setTimeout(() => {
-            resolve() //关闭弹窗的回调
-            setTimeout(() => {
-                instance.confirmButtonLoading = false
-            }, 300)
-        }, 300)
+         await removeCon(row.id, index)
+         instance.confirmButtonLoading = false
+         resolve()
     })
 }
 

src/views/project/debit/contract/pay.vue

@@ -226,16 +226,12 @@ const delRowClick = async (row) => {
         text: '请谨慎考虑后，确认是否需要删除？',
         confirmText: '确认删除',
         cancelText: '取消操作',
-    }, (instance, resolve) => {
+    }, async (instance, resolve) => {
         instance.confirmButtonLoading = true
         instance.confirmButtonText = 'Loading...'
-        removeProPay(row.id)
-        setTimeout(() => {
-            resolve() //关闭弹窗的回调
-            setTimeout(() => {
-                instance.confirmButtonLoading = false
-            }, 300)
-        }, 300)
+         await removeProPay(row.id)
+         instance.confirmButtonLoading = false
+         resolve()
     })
 }
 const removeProPay = async (id) => {
@@ -282,16 +278,12 @@ const delCollectRow = async (row) => {
         text: '请谨慎考虑后，确认是否需要删除？',
         confirmText: '确认删除',
         cancelText: '取消操作',
-    }, (instance, resolve) => {
+    }, async (instance, resolve) => {
         instance.confirmButtonLoading = true
         instance.confirmButtonText = 'Loading...'
-        removeCollectPay(row.id)
-        setTimeout(() => {
-            resolve() //关闭弹窗的回调
-            setTimeout(() => {
-                instance.confirmButtonLoading = false
-            }, 300)
-        }, 300)
+         await removeCollectPay(row.id)
+         instance.confirmButtonLoading = false
+         resolve()
     })
 }
 const removeCollectPay = async (id) => {

src/views/project/debit/contract/unit.vue

@@ -173,6 +173,19 @@
                 <el-table-column prop="k7" label="清单编号..." />
                 <el-table-column prop="k8" label="备注" />
             </el-table>
+            <el-table v-if="typevalue === '3'" :data="tableLeadData3" style="width: 100%;" row-key="id" border>
+                <el-table-column prop="k1" label="单位工程" />
+                <el-table-column prop="k2" label="子单位工程" />
+                <el-table-column prop="k3" label="分部工程" />
+                <el-table-column prop="k4" label="子分部工程" />
+                <el-table-column prop="k5" label="图册" />
+                <el-table-column prop="k6" label="图号" />
+                <el-table-column prop="k7" label="开始桩号" />
+                <el-table-column prop="k8" label="结束桩号" />
+                <el-table-column prop="k9" label="清单编号" />
+                <el-table-column prop="k10" label="清单名称" />
+                <el-table-column prop="k11" label="分解核实量" />
+            </el-table>
             <div v-if="typevalue === '1'" class="mt-3 text-orange font-400">温馨提示：清单编号需手动填写，清单编号列填写施工图数量，若有关联则填写数字，反之保留空白</div>
         </hc-new-dialog>
         <!-- 
@@ -431,16 +444,12 @@ const delModalClick = async () => {
         text: '请谨慎考虑后，确认是否需要删除？',
         confirmText: '确认删除',
         cancelText: '取消操作',
-    }, (instance, resolve) => {
+    }, async (instance, resolve) => {
         instance.confirmButtonLoading = true
         instance.confirmButtonText = 'Loading...'
-        removeContractTreeNode()
-        setTimeout(() => {
-            resolve() //关闭弹窗的回调
-            setTimeout(() => {
-                instance.confirmButtonLoading = false
-            }, 300)
-        }, 300)
+         await removeContractTreeNode()
+         instance.confirmButtonLoading = false
+         resolve()
     })
 }
 const removeContractTreeNode = async () => {
@@ -627,6 +636,12 @@ const tableLeadData1 = ref([
     { id: 2, k1: '0-A#桩基', k2: '', k3: '1', k4: '1', k5: '0', k6: '1', k7: '1', k8:'' },
     { id: 3, k1: '0-A#桩基', k2: '', k3: '', k4: '1', k5: '1', k6: '1', k7: '1', k8:'' },
    
+])
+const tableLeadData3 = ref([
+    { id: 1, k1: '总则', k2: '', k3: '工程保险费', k4:'', k5: '保险费', k6: '按合同条款规定，提供建筑工程一切险', k7: '', k8: '', k9:'K58+096', k10:'K64+249', k11:'101-1-1', k12:'按合同条款规定，提供建筑工程一切险', k13:1 },
+    { id: 2, k1: '总则', k2: '', k3: '工程保险费', k4:'', k5: '保险费', k6: '安全生产责任险', k7: '', k8: '', k9:'K58+096', k10:'K64+249', k11:'101-1-4', k12:'安全生产责任险', k13:1 },
+    { id: 3, k1: '路基工程', k2: '南城互通', k3: '场地清理', k4: '挖除旧路面', k5: '沥青混凝土面层', k6: '挖除及铣刨(含沥青砼桥面铺装)', k7: '第一册', k8:'S3-59', k9:'黄岩2号高架桥(左右幅新建)桥下道路挖除', k10:'', k11:'202-2-2', k12:'挖除及铣刨(含沥青砼桥面铺装)', k13:42221 },
+   
 ])
 
 const leadModalSave = async () => {
@@ -659,6 +674,10 @@ const typeoptions = ref([
     value: '2',
     label: '模板2',
   },
+  {
+    value: '3',
+    label: '模板3',
+  },
 ])
 const typevalue = ref('')
 //关联资料

src/views/project/debit/project/pay.vue

@@ -301,23 +301,18 @@ const addColloect = () => {
 }
 //删除汇总项
 const delCollectRow = async (row) => {
-
     await HcDelMsg({
         type: 'delete',
         title: '确认删除提醒',
         text: '请谨慎考虑后，确认是否需要删除？',
         confirmText: '确认删除',
         cancelText: '取消操作',
-    }, (instance, resolve) => {
+    }, async (instance, resolve) => {
         instance.confirmButtonLoading = true
         instance.confirmButtonText = 'Loading...'
-        removeCollectPay(row.id)
-        setTimeout(() => {
-            resolve() //关闭弹窗的回调
-            setTimeout(() => {
-                instance.confirmButtonLoading = false
-            }, 300)
-        }, 300)
+         await removeCollectPay(row.id)
+         instance.confirmButtonLoading = false
+         resolve()
     })
 }
 const removeCollectPay = async (id) => {

src/views/project/debit/project/unit.vue

@@ -362,16 +362,12 @@ const delModalClick = async () => {
         text: '请谨慎考虑后，确认是否需要删除？',
         confirmText: '确认删除',
         cancelText: '取消操作',
-    }, (instance, resolve) => {
+    }, async (instance, resolve) => {
         instance.confirmButtonLoading = true
         instance.confirmButtonText = 'Loading...'
-        removeContractTreeNode()
-        setTimeout(() => {
-            resolve() //关闭弹窗的回调
-            setTimeout(() => {
-                instance.confirmButtonLoading = false
-            }, 300)
-        }, 300)
+         await removeContractTreeNode()
+         instance.confirmButtonLoading = false
+         resolve()
     })
 }
 const removeContractTreeNode = async () => {