duy 1 年之前
父節點
當前提交
e45bb39e2c
共有 3 個文件被更改,包括 14 次插入5 次删除
  1. 10 3
      src/views/patrol/add.vue
  2. 2 2
      src/views/patrol/manage.vue
  3. 2 0
      src/views/patrol/safe.vue

+ 10 - 3
src/views/patrol/add.vue

@@ -227,7 +227,7 @@
                                 :default-checked-keys="defaultChecked"
                                 :auto-expand-keys="TreeAutoExpandKeys"
                                 check-strictly
-                              
+                                @check-change="divisionTreeCheckChange"
                                 @check="divisionTreeCheck"
                                 @load="treeLoadNode"
                                 @nodeTap="wbsElTreeClick"
@@ -682,10 +682,17 @@ const treeLoadNode = async ({ node, item, level }, resolve) => {
     resolve(getArrValue(data))
 }
 
-const divisionTreeCheck = () => {
-
+const divisionTreeCheck = (data, { checkedNodes, checkedKeys }) => {
+    // console.log(data, 'data')
+    // console.log(checkedNodes, 'checkedNodes')
+    // console.log(checkedKeys, 'checkedKeys')
 
 }
+const divisionTreeCheckChange = (data, ischeck, data1)=>{
+    console.log(data)
+    console.log(ischeck)
+    console.log(data1)
+}
 
 
 const defaultChecked = ref([]) //默认选中

+ 2 - 2
src/views/patrol/manage.vue

@@ -11,8 +11,8 @@
                     <span v-else>不需要</span>
                 </template>
                 <template #action="{ row }">
-                    <el-link v-if="row.submitRectify == 1" type="primary" @click="changeRow(row)">整改</el-link>
-                    <el-link v-else type="primary" @click="cancleSubmit(row)">撤回提交</el-link>
+                    <el-link v-if="row.submitRectify == 1" type="primary" :disabled="row.isRectifyUser === 0" @click="changeRow(row)">整改</el-link>
+                    <el-link v-else type="primary" :disabled="row.isRectifyUser === 0" @click="cancleSubmit(row)">撤回提交</el-link>
                 </template>
             </HcTable>
             <template #action>

+ 2 - 0
src/views/patrol/safe.vue

@@ -32,6 +32,7 @@ import { getArrValue } from 'js-fast-way'
 import { delMessageV2 } from '~com/message/index.js'
 const useAppState = useAppStore()
 const projectId = ref(useAppState.getProjectId)
+const contractId = ref(useAppState.contractId)
 //初始变量
 const router = useRouter()
 const tableColumn = [
@@ -61,6 +62,7 @@ const getTableData = async () => {
     const { error, code, data } = await patrolApi.queryPage({
         ...searchForm.value,
         projectId: projectId.value,
+        contractId:contractId.value,
 
     })
     //判断状态