bug修复

src/config/index.js

@@ -17,7 +17,7 @@ export default {
     statusWhiteList: [],    //http的status默认放行列表
     ossUrl: 'https://bladex-test-info.oss-cn-chengdu.aliyuncs.com', //oss地址
     smsPhone: '',  //测试接受短信验证码的手机号
-    dev_version: '202209281540',    //开发版本号
+    dev_version: '202209281625',    //开发版本号
     prod_host: 'http://47.110.251.215:8090',  //线上
     //dev_host: 'http://192.168.4.6', //黄键楠
     //dev_host: 'http://192.168.3.13', //祝炜

src/views/schedule/hc-table.vue

@@ -1,13 +1,13 @@
 <template>
     <div class="hc-layout-box">
-        <HcCard scrollbar>
+        <HcCard>
             <template #header>
                 <el-button type="primary" hc-btn @click="toBackClick">
                     <HcIcon name="arrow-go-back"/>
                     <span>返回上一级</span>
                 </el-button>
             </template>
-            <el-table :data="tableData" lazy :load="loadData" border height="100%" row-key="primaryKeyId">
+            <el-table :data="tableData" lazy :load="loadData" v-loading="isLoading" border height="100%" row-key="primaryKeyId">
                 <el-table-column prop="title" label="节点名称"></el-table-column>
                 <el-table-column label="施工台账" align="center">
                     <el-table-column prop="standingBookNotAmount" label="未开始" align="center" width="80"></el-table-column>
@@ -63,16 +63,16 @@ onMounted(() => {
 })
 
 //初始数据获取
-const tableLoading = ref(false)
+const isLoading = ref(false)
 const tableData = ref([])
 const getTableData = async () => {
-    tableLoading.value = true
+    isLoading.value = true
     const { error, code, data } = await DataApi.queryContractTreeMaterialProgress({
         projectId: projectId.value,
         contractId: contractId.value,
         parentId: ''
     });
-    tableLoading.value = false
+    isLoading.value = false
     if (!error && code === 200) {
         tableData.value = getArrValue(data['treeMaterialProgressList']);
     } else {

src/views/tentative/material/approach.vue

@@ -21,7 +21,7 @@
                     </el-button>
                 </HcTooltip>
                 <HcTooltip keys="tentative_material_approach_del">
-                    <el-button hc-btn>
+                    <el-button hc-btn @click="delModalClick">
                         <HcIcon name="delete-bin-2"/>
                         <span>删除</span>
                     </el-button>
@@ -140,7 +140,14 @@
 
         <!--复制材料登记信息-->
         <HcDialog :show="copyTableModal" title="复制材料登记信息" widths="60rem" isTable :loading="copyTableLoading" @close="copyTableModalClose" @save="copyTableClick">
-            123456
+            <HcTable :column="copyTableColumn" :datas="copyTableData">
+                <template #key1="{row}">
+                    <el-input v-model="row.key1" placeholder="请输入材料编号"/>
+                </template>
+                <template #action="{row}">
+                    <el-button type="danger" size="small" plain>删除</el-button>
+                </template>
+            </HcTable>
         </HcDialog>
 
     </div>
@@ -267,6 +274,18 @@ const copyTableModal = ref(false)
 const copyTableModalClick = () => {
     copyTableModal.value = true
 }
+
+//复制表格
+const copyTableColumn = ref([
+    {key:'key3', name: '材料名称'},
+    {key:'key1', name: '材料编号'},
+    {key:'action', name: '操作', width: 100},
+])
+const copyTableData = ref([
+    {key3: '名称', key1: '编号...'},
+    {key3: '名称1', key1: '编号1...'},
+])
+
 const copyTableModalClose = () => {
     copyTableModal.value = false
 }
@@ -274,7 +293,22 @@ const copyTableModalClose = () => {
 //复制 保存
 const copyTableLoading = ref(false)
 const copyTableClick = () => {
+    copyTableModal.value = false
+}
 
+//删除
+const delModalClick = () => {
+    window?.$messageBox?.alert('请谨慎考虑后，确认是否需要删除？', '删除提醒', {
+        showCancelButton: true,
+        confirmButtonText: '确认删除',
+        cancelButtonText: '取消',
+        type: 'warning',
+        callback: (action) => {
+            if (action === 'confirm') {
+                //removeContractTreeNode()
+            }
+        }
+    })
 }
 
 </script>