فهرست منبع

feat(data-fill):
- 修改了 collapse-form 组件中同步更新提示的显示逻辑,仅对特定角色显示

duy 1 ماه پیش
والد
کامیت
265657742f
2فایلهای تغییر یافته به همراه15 افزوده شده و 12 حذف شده
  1. 7 5
      src/views/data-fill/collapse-form/index.vue
  2. 8 7
      src/views/data-fill/wbs.vue

+ 7 - 5
src/views/data-fill/collapse-form/index.vue

@@ -17,8 +17,8 @@
                             >
                                 已填{{ item.realFillRate ?? 0 }}%
                             </div> -->
-                            <!-- <el-tooltip
-                                v-if="item.isSync === 1 && item.isBussShow !== 2"
+                            <el-tooltip
+                                v-if="userInfo?.role_id === '1123598816738675201' && item.isSync === 1 && item.isBussShow !== 2"
                                 class="box-item"
                                 effect="light"
                                 content="表单保存后更新"
@@ -28,7 +28,7 @@
                                     style="border:1px solid orange"
                                     class="h-5 w-5 inline-flex items-center justify-center border border-orange rounded-full bg-white text-xs text-orange"
                                 >同</span>
-                            </el-tooltip> -->
+                            </el-tooltip>
                             <el-tooltip
                                 v-if="item.dateIsComplete === 2 && item.isBussShow !== 2"
                                 class="box-item"
@@ -701,7 +701,8 @@
                 <el-form-item label=" " :prop="deviationModal.type === 1 ? 'g8pcfw' : 'g10pcfw'">
                     <el-input v-if="deviationModal.type === 1" v-model="deviationModal.g8pcfw" block placeholder="请输入高程偏差" />
                     <el-input v-else v-model="deviationModal.g10pcfw" block placeholder="请输入平面高差" />
-                    <div class="text-orange">格式要求:-n,n或者±n</div>
+                    <div v-if="deviationModal.type === 1" class="text-orange">格式要求:-n,n或者±n</div>
+                    <div v-else class="text-orange">格式要求:0,n</div>
                 </el-form-item>
             </div>
         </el-form>
@@ -836,6 +837,7 @@ const emit = defineEmits(['renew', 'offsetTop', 'getList'])
 const useAppState = useAppStore()
 
 //全局变量
+const userInfo = ref(useAppState.getUserInfo)
 const projectId = ref(useAppState.projectId)
 const contract_id = ref(props.contractId)
 const treeId = ref(props.primaryKeyId)
@@ -1056,7 +1058,7 @@ const isOpen = infos['isOpenRandomNumber'] ?? 0
         newArr.push({ label: '插入设计值/频率', key: 'design' })
     }
     newArr.push({ label: '插入编号', key: 'pushCode' })
-     newArr.push({ label: '测量偏差范围', key: 'deviation' })
+    newArr.push({ label: '测量偏差范围', key: 'deviation' })
     newArr.push({ label: '插入特殊字符', key: 'special' })
     newArr.push({ label: '关联试验数据', key: 'test' })
     newArr.push({ label: '关联试验文件', key: 'file' })

+ 8 - 7
src/views/data-fill/wbs.vue

@@ -66,16 +66,17 @@
                                 class="scroll-bar-right-16"
                             >
                                 <HcDataTree
-                                    is-load-menu
+                                    
                                     :datas="searchTreeData"
                                     :is-mark="TreeMark"
                                     :menus="ElTreeMenu"
-                                   
-                                    is-counts
-                                    is-type
+                                    
+                                    
+                                    
                                     :auto-expand-keys="TreeAutoExpandKeys"
-                                    default-expand-all
-                                    is-form-date
+                                    
+                                    is-load-menu is-counts is-type default-expand-all is-form-date 
+                                    :is-show-sync="userInfo?.role_id === '1123598816738675201'"
                                     @node-tap="wbsElTreeClick"
                                     @menu-tap="ElTreeMenuClick"
                                     @load-menu="loadMenu"
@@ -87,7 +88,7 @@
                             >
                                 <HcLazyTree
                                     ref="wbstree"
-                                  
+                                    :is-show-sync="userInfo?.role_id === '1123598816738675201'"
                                     is-form-date
                                     is-load-menu
                                     :auto-expand-keys="TreeAutoExpandKeys"