duy 2 жил өмнө
parent
commit
e233d2e291

+ 4 - 3
src/views/project/cost/form.vue

@@ -339,6 +339,10 @@ watch(() => [
    if(val==='construction'){
     constructUnitData.value=table
     formBaseModel.value.constructUnit=table
+   }else if(val==='supervision'){
+    supervisorUnitData.value=table
+   }else if(val==='bulid'){
+    bulidUnitData.value=table
    }
 }, {deep: true})
 const tabTab = ref([
@@ -357,10 +361,7 @@ const tabChange = ({key}) => {
         formBaseModel.value.constructUnit=tableData.value
         console.log( formBaseModel.value.constructUnit,' formBaseModel.value.constructUnit');
     }else if(key=='bulid'){
-        console.log(bulidUnitData.value,'=bulidUnitData.value');
-      
         tableData.value=bulidUnitData.value.length>0?bulidUnitData.value:[{}]
-        console.log( originTableData.value,' originTableData.value.value');
         formBaseModel.value.buildUnit=tableData.value
     }
  

+ 3 - 3
src/views/task/logs/components/logs-content.vue

@@ -23,10 +23,10 @@
         </div>
 
         <div class="hc-logs-content-item" v-if="isEditState">
-            <div class="title">今日工作范围勾选</div>
-            <div class="extra-tip">提示:仅勾当日的工作内容,如果勾选项任务已完成,则点击【变更已完成】进行提交部门领导审批</div>
+            <div class="title">今日工作范围</div>
+            <div class="extra-tip">提示:如果该任务已完成,则点击【变更已完成】进行提交部门领导审批</div>
             <div class="content">
-                <HcTable :isIndex="false" isCheck :column="tableColumn" :datas="tableData" @selection-change="tableSelectionChange">
+                <HcTable :isIndex="false"  :column="tableColumn" :datas="tableData">
                     <template #action="{row, index}">
                         <!-- <el-button size="small" type="primary" @click="statusClick(row)">{{row.statusName === '未完成' ? '变更已完成': '已完成' }}</el-button> -->
                         <el-button size="small" type="primary" @click="statusClick(row)" :disabled="row.status===1||row.status==2">变更已完成</el-button>