登录信息以及人员展示信息调整

src/views/modules/sys/dashboard/workBench/Pending.vue

@@ -198,7 +198,7 @@
         </div>
       </el-col>
 
-      <el-col :span="12">
+      <!--<el-col :span="12">
         <div class="page" style="height: 600px">
           <div class="top bg-white">
             <div style="height: 18px" >
@@ -255,11 +255,11 @@
                 @page-change="currentChangeHandle">
               </vxe-pager>
             </div>
-            <!-- 弹窗, 新增 / 修改 -->
+            &lt;!&ndash; 弹窗, 新增 / 修改 &ndash;&gt;
             <NotifyForm  ref="notifyForm" @refreshDataList="refreshList"></NotifyForm>
           </div>
         </div>
-      </el-col>
+      </el-col>-->
     </el-row>
   </div>
 </template>

src/views/modules/sys/user/UserInfo.vue

@@ -11,9 +11,12 @@
          <el-form-item label="签名" prop="sign">
           <el-input v-model="generalForm.sign"></el-input>
         </el-form-item>
-         <el-form-item label="公司" prop="companyDTO.name">
+         <el-form-item label="集团" prop="companyDTO.name">
           <el-input v-model="generalForm.companyDTO.name" :disabled="true"></el-input>
         </el-form-item>
+        <el-form-item label="公司" prop="corporationDTO.name">
+          <el-input v-model="generalForm.corporationDTO.name" :disabled="true"></el-input>
+        </el-form-item>
         <el-form-item label="部门" prop="officeDTO.name">
           <el-input v-model="generalForm.officeDTO.name" :disabled="true"></el-input>
         </el-form-item>
@@ -107,7 +110,8 @@
           <vxe-column title="耗时(毫秒)" field="recordTime" sortable></vxe-column>
           <vxe-column title="请求参数" field="params" sortable></vxe-column>
           <vxe-column title="返回结果" field="result" sortable></vxe-column>
-          <vxe-column title="公司" field="createBy.companyDTO.name" sortable></vxe-column>
+          <vxe-column title="集团" field="createBy.companyDTO.name" sortable></vxe-column>
+          <vxe-column title="公司" field="createBy.corporationDTO.name" sortable></vxe-column>
           <vxe-column title="部门" field="createBy.officeDTO.name" sortable></vxe-column>
           <vxe-column title="用户" field="createBy.name" sortable></vxe-column>
           <vxe-column title="IP地址" field="remoteAddr" sortable></vxe-column>
@@ -150,6 +154,9 @@
           companyDTO: {
             name: ''
           },
+          corporationDTO: {
+            name: ''
+          },
           officeDTO: {
             name: ''
           },
@@ -222,6 +229,7 @@
         })
       },
       submitConcatForm () {
+        console.log('submitConcatForm')
         this.$refs['concatForm'].validate((valid) => {
           if (valid) {
             const loading = this.$loading({
@@ -234,6 +242,7 @@
               this.$message.success(data)
               loading.close()
             })
+            loading.close()
           }
         })
       },

src/views/modules/sys/workClient/WorkClientForm.vue

@@ -238,7 +238,7 @@
           </vxe-table-column>
           <vxe-table-column field="bankNumber" title="开票账号" :edit-render="{}">
             <template v-slot:edit="scope" >
-              <el-input v-model="scope.row.bankNumber" maxlength="20"></el-input>
+              <el-input v-model="scope.row.bankNumber" maxlength="30"></el-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="remarks" title="备注信息" :edit-render="{}">
@@ -728,18 +728,18 @@
             let flag = true
             this.inputForm.workClientBank.forEach(item => {
               if (item.ourBank === null || item.ourBank === undefined || item.ourBank === '') {
-                this.$message.error('开户银行未填写')
+                this.$message.error('开票银行未填写')
                 this.loading = false
                 flag = false
                 return
               } else if (item.bankNumber === null || item.bankNumber === undefined || item.bankNumber === '') {
-                this.$message.error('开户账号未填写')
+                this.$message.error('开票账号未填写')
                 this.loading = false
                 flag = false
                 return
               }
               if (!this.validateXG.isBankNumber(item.bankNumber)) {
-                this.$message.error('请输入正确的开户行账号')
+                this.$message.error('请输入正确的开票账号')
                 this.loading = false
                 flag = false
               }

src/views/modules/sys/workContract/WorkContractList.vue

@@ -311,8 +311,8 @@
               path: '/flowable/task/TaskFormDetail',
               query: {
                 readOnly: true,
-                title: row.name + '流程详情',
-                formTitle: row.name + '流程详情',
+                title: '流程详情',
+                formTitle: '流程详情',
                 businessId: row.id,
                 ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId')}
             })
@@ -604,8 +604,8 @@
                   path: '/flowable/task/TaskFormDetail',
                   query: {
                     readOnly: true,
-                    title: row.name + '归档流程详情',
-                    formTitle: row.name + '归档流程详情',
+                    title: '归档流程详情',
+                    formTitle: '归档流程详情',
                     businessId: row.id,
                     ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId')}
                 })