Merge branch 'qin_26'

src/assets/scss/layout.scss

@@ -103,7 +103,7 @@ a{color: #409eff;text-decoration: none}
 }
 // 设置el-tooltip最大宽度
 .el-popper {
-  max-width: 400px;
+  max-width: 100%;
 }
 .fade-transform-leave-active,
 .fade-transform-enter-active {

src/components/DesignForm/app/index.vue

@@ -2056,7 +2056,7 @@ const isObject = (obj) => {
                 />
               </el-tooltip>
               <el-tooltip
-                v-if="viewPage.chart.status"
+                v-if="viewPage.chart&&viewPage.chart.status"
                 class="box-item"
                 effect="dark"
                 content="BI报表"

src/components/DesignForm/public/form/formGroup.vue

@@ -925,6 +925,7 @@ function optionsValue3GetTable(data: any, fieldName: string) {
             </el-button>
           </div>
         </template>
+      
         <!-- 创建人
 				<FounderForm v-else-if="element.type === 'founder' " :data="element" :tablekey="props.tableinfo" :numrun="props.numrun" />
 				创建时间

src/components/DesignForm/public/form/formItem.vue

@@ -646,12 +646,15 @@ const judgeIsShow = (key: string) => {
     props.purview != "" &&
     props.purview != ""
   ) {
+    
     if (props.purview.length < 1) {
       return true;
     } else {
       let isShow = false;
       if (Array.isArray(props.purview)) {
+       
         props.purview.forEach((item) => {
+          //  console.log("判断此组件是否可见--purview-->", item.nodeKey , props.nodeKey);
           if (item.nodeKey == props.nodeKey) {
             if (item.powerAry && item.powerAry.length > 0) {
               item.powerAry.forEach((itm) => {

src/components/DesignForm/tableListPage/formPageCont.vue

@@ -510,6 +510,7 @@ function optionsValue3Get3(data: any, fieldName: any) {
             </div>
           </el-header>
           <el-scrollbar class="scorllbarBox">
+    
             <RunFlowStep
               ref="runstep"
               v-model:flowary="flowAry"

src/components/DesignForm/tableListPage/index.vue

@@ -860,6 +860,7 @@ const selectionChange = (row: any) => {
 */
 const columnsFilter = computed(() => {
   console.log("获取表格头内容", props.data.columns);
+  getPageData()
   if (!state.columnsCheck?.length) {
     return props.data.columns;
   } else {
@@ -867,6 +868,7 @@ const columnsFilter = computed(() => {
       return state.columnsCheck.includes(item.prop || item.type);
     });
   }
+  
 });
 /**
 @ 作者: 秦东

src/views/hr/archives/basicinformation/editorg.vue

@@ -169,15 +169,15 @@ watch(
       chushihuaPost(props.usercont.adminorg);
       console.log("监听数据--2323232323->", editUsAboutOrg, props.usercont);
 
-      editUsAboutOrg.orgid = props.usercont.adminorg; //number;
-      editUsAboutOrg.position = props.usercont.position; //number;
-      editUsAboutOrg.teamid = props.usercont.teamid; //number;
-      editUsAboutOrg.jobid = props.usercont.jobid; //number;
-      editUsAboutOrg.jobleve = props.usercont.jobleve; //number;
+      editUsAboutOrg.orgid = props.usercont.adminorg!=0?props.usercont.adminorg:""; //number;
+      editUsAboutOrg.position = props.usercont.position!=0?props.usercont.position:""; //number;
+      editUsAboutOrg.teamid = props.usercont.teamid!=0?props.usercont.teamid:""; //number;
+      editUsAboutOrg.jobid = props.usercont.jobid!=0?props.usercont.jobid:""; //number;
+      editUsAboutOrg.jobleve = props.usercont.jobleve!=0?props.usercont.jobleve:""; //number;
       editUsAboutOrg.ruleid = props.usercont.ruleid; //string;
       editUsAboutOrg.personInCharge = props.usercont.personincharge.toString(); //number|string;
-      editUsAboutOrg.orgreslist = props.usercont.orgreslist; //any;
-      editUsAboutOrg.resallorg = props.usercont.resallorg; //any;
+      editUsAboutOrg.orgreslist = props.usercont.orgreslist!=0?props.usercont.orgreslist:""; //any;
+      editUsAboutOrg.resallorg = props.usercont.resallorg!=0?props.usercont.resallorg:""; //any;
       setPersonInCharge();
     }
   }
@@ -196,6 +196,10 @@ function submitAddJtnbgzjl() {
   addLoading.value = true;
   editUsOrgFormRef.value.validate((isValid: boolean) => {
     if (isValid) {
+     
+
+
+
       editUsAboutOrg.personInCharge = parseInt(editUsAboutOrg.personInCharge);
       editMyOrgUndertake(editUsAboutOrg)
         .then(() => {
@@ -225,6 +229,7 @@ function submitAddJtnbgzjl() {
       :model="editUsAboutOrg"
       :rules="editPwdRules"
       label-width="140px"
+      style="width: 100%;"
     >
       <el-form-item label="归属行政组织" prop="orgid">
         <el-tree-select
@@ -251,7 +256,7 @@ function submitAddJtnbgzjl() {
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="职务" prop="jobid">
+      <el-form-item label="职务" >
         <el-select
           v-model="editUsAboutOrg.jobid"
           clearable
@@ -267,7 +272,7 @@ function submitAddJtnbgzjl() {
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="职务等级" prop="jobleve">
+      <el-form-item label="职务等级" >
         <el-select v-model="editUsAboutOrg.jobleve" placeholder="请选择职务等级">
           <el-option
             v-for="item in positiongrade"
@@ -277,7 +282,7 @@ function submitAddJtnbgzjl() {
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="班组" prop="teamid">
+      <el-form-item label="班组" >
         <el-select v-model="editUsAboutOrg.teamid" placeholder="请选择班组">
           <el-option
             v-for="item in teamContAry"
@@ -287,7 +292,7 @@ function submitAddJtnbgzjl() {
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="排班类型" prop="ruleid">
+      <el-form-item label="排班类型" >
         <el-select v-model="editUsAboutOrg.ruleid" placeholder="请选择排班类型">
           <el-option
             v-for="item in teamList"