1

pages/ledger/editTable.vue

@@ -15,7 +15,7 @@
                 </zb-tooltip>
             </hc-nav-back-bar>
         </template>
-        <view id="title-bar" class="title-bar">
+        <view id="title-bar" class="title-bar z-24">
             <button type="primary" class="title-bar-btn" @click="editTypeClick">切换表单</button>
             <button type="primary" class="title-bar-btn" @click="linkTabClick">+ 关联工序</button>
             <button type="primary" class="title-bar-btn" @click="delCurrentPage" v-if="currentPage > 1">删除当前页</button>

pages/ledger/index.vue

@@ -190,7 +190,7 @@ const calendarChange = ({fulldate, year}) => {
 const timeFormData = ref([])
 const queryLogTimeTreeList = async () => {
     const { data } = await mainApi.queryLogTimeTreeList({
-        contractId: contractId.value || '',
+        contractId: contractId.value,
         nodePrimaryKeyId: tabKey.value,
         time: fullDate.value,
     })
@@ -206,13 +206,13 @@ const handleTableQuery = async (item) => {
     uni.showLoading({title: '获取pdf文件中...', mask: true});
     const {excelId, primaryKeyId} = tabItem.value
     const { error, code, data } = await mainApi.getBussPdfInfo({
-        contractId: contractId.value || '',
+        contractId: contractId.value,
         pkeyId: excelId,
         nodePrimaryKeyId: primaryKeyId,
         recordTime: fullDate.value,
         theLogId: ""
     })
-    const resData = isString(data) ? data || '' : ''
+    const resData = isString(data) ? data ?? '' : ''
     uni.hideLoading();
     if (!error && code === 200 && resData) {
         toPdfPreview(resData).then()

pages/report/report.vue

@@ -206,7 +206,6 @@ const formRules = {
 
 //选择任务人
 const userTasksClick = () => {
-    const { type, typeData, projectId, contractId } = props.value
     uni.navigateTo({
         url: '/pages/report/tasks-user',
         events:{
@@ -215,6 +214,7 @@ const userTasksClick = () => {
             }
         },
         success: function(res){
+            const { type, typeData, projectId, contractId } = props.value
             const {userTasks} = formData.value
             res.eventChannel.emit('flowUserData', {
                 type: type,

pages/report/tasks-user.vue

@@ -35,9 +35,8 @@ const instance = getCurrentInstance().proxy
 const props = ref({})
 
 //渲染完成
-onLoad(async () => {
-    await getEventChannel();
-    queryAllRoleList().then()
+onLoad(() => {
+    getEventChannel();
 })
 
 //页面传参数据
@@ -47,6 +46,7 @@ const getEventChannel = async () => {
     eventChannel = instance.getOpenerEventChannel();
     eventChannel.on('flowUserData', (data) => {
         props.value = getObjValue(data);
+        queryAllRoleList().then()
     })
 }
 
@@ -59,6 +59,7 @@ const queryAllRoleList = async () => {
         projectId: projectId,
         contractId: contractId,
     })
+    console.log(data)
     const res = getArrValue(data)
     const selected_data = getArrValue(selectedData)
     res.forEach((item)=>{