用户信息导出功能、页面展示信息调整

src/api/sys/RoleService.js

@@ -40,6 +40,14 @@ export default class RoleService {
       params: params
     })
   }
+
+  usableDataList (params) {
+    return request({
+      url: '/sys/role/usableDataList',
+      method: 'get',
+      params: params
+    })
+  }
   assign (params) {
     return request({
       url: '/sys/role/assign',

src/views/modules/flowable/task/HistoryList.vue

@@ -59,7 +59,9 @@
                 <vxe-column  title="流程名称" field="processDefinitionName" align="center"> </vxe-column>
                 <vxe-column  title="办理状态" field="status" align="center">
                    <template slot-scope="scope">
-                      <el-tag :type="scope.row.level"   effect="dark" size="small">{{scope.row.status}} </el-tag>
+                     <div v-if="commonJS.isNotEmpty( scope.row.status)">
+                       <el-tag :type="scope.row.level"   effect="dark" size="small">{{scope.row.status}} </el-tag>
+                     </div>
                   </template>
                 </vxe-column>
                 <vxe-column  title="流程发起人" field="vars.userName" align="center"></vxe-column>
@@ -68,7 +70,7 @@
                 <vxe-column title="操作" width="100px" fixed="right" align="center">
                   <template slot-scope="scope">
                     <div v-if="scope.row.belongProject === 'ccpm'">
-                      <el-button type="text" size="small" @click="hisCcpm(scope.row)">ccpm历史</el-button>
+                      <el-button type="text" size="small" @click="hisCcpm(scope.row)">项目系统历史</el-button>
                     </div>
                     <div v-else>
                       <el-button  type="text" size="small" @click="detail(scope.row)">历史</el-button>

src/views/modules/flowable/task/TodoList.vue

@@ -72,7 +72,7 @@
                 <vxe-column title="操作" width="130px" fixed="right" align="center">
                   <template slot-scope="scope">
                     <div v-if="scope.row.belongProject === 'ccpm'">
-                      <el-button type="text" size="small" @click="todoCcpm(scope.row)">ccpm审核</el-button>
+                      <el-button type="text" size="small" @click="todoCcpm(scope.row)">项目系统审核</el-button>
                     </div>
                     <div v-else>
                       <el-button type="text" size="small" @click="todo(scope.row)">办理</el-button>

src/views/modules/form/GenerateForm.vue

@@ -5,11 +5,11 @@
     :close-on-click-modal="false"
      v-dialogDrag
     :visible.sync="visible">
-        <fm-generate-form 
+        <fm-generate-form
             v-if="visible"
               :edit="method !== 'view'"
-              :data="options" 
-              :value="initData" 
+              :data="options"
+              :value="initData"
               v-loading="loading"
               :class="method==='view'?'readonly':''"
               ref="generateForm"
@@ -141,7 +141,7 @@
              this.loading = false
              this.$message.success(data)
              this.$emit('refreshDataList')
-   
+
             // 自定义js 保存后执行
              if (this.options.config.eventType === '2') {
           // eslint-disable-next-line no-new-func
@@ -153,4 +153,4 @@
        }
      }
 }
-</script>
+</script>

src/views/modules/materialManagement/supplier/SupplierForm.vue

@@ -159,7 +159,6 @@
       </el-row>
       <!--    联系人信息-->
       <el-divider content-position="left">
-        <span style="color: red;border-top: 20px;margin-right: 5px">*</span>
         <i class="el-icon-document"></i>
         联系人信息
         <el-button style="margin-left: 20px" type="primary" :disabled="method==='view'" size="mini" @click="insertEvent('link')" plain>
@@ -353,7 +352,8 @@
         this.$refs['inputForm'].validate(async (valid) => {
           if (valid) {
             if (this.commonJS.isEmpty(this.inputForm.materialSupplierLinkDTOList)) {
-              this.$message.error('联系人信息至少填写一条')
+              // this.$message.error('联系人信息至少填写一条')
+              this.saveTrue()
             } else {
               const errMap = await this.$refs.linkTable.validate(true).catch(errMap => errMap)
               if (errMap) {

src/views/modules/reimbursement/ReimbursementFormCcpm.vue

@@ -147,10 +147,10 @@
       <MaterialManagementDialog ref="materialManagementDialog" @getUpload="getUpload"></MaterialManagementDialog>
 
     </div>
-  </div>
 </template>
 
 <script>
+  // import MakeFormService from '@/api/form/MakeFormService'
   import CommonApi from '@/api/cw/common/CommonApi'
   import ReimbursementApprovalTypeService from '@/api/cw/reimbursementApproval/ReimbursementApprovalTypeService'
   import ReimbursementTypeService from '@/api/sys/ReimbursementTypeService'
@@ -235,6 +235,7 @@
         comment: ''
       }
     },
+    // makeFormService: null,
     reimbursementApprovalTypeService: null,
     reimbursementTypeService: null,
     userService: null,
@@ -242,6 +243,7 @@
     materialManagementService: null,
     reimbursementService: null,
     created () {
+      // this.makeFormService = new MakeFormService()
       this.reimbursementApprovalTypeService = new ReimbursementApprovalTypeService()
       this.userService = new UserService()
       this.commonApi = new CommonApi()
@@ -250,7 +252,7 @@
       this.reimbursementService = new ReimbursementService()
     },
     activated () {
-      // this.init('view', this.businessId)
+      // this.createForm()
     },
     props: {
       businessId: {
@@ -1053,6 +1055,17 @@
           this.$router.push('/sys/dashboard/workBench/Pending')
         }
         this.close()
+      },
+      createForm () {
+        console.log(1442846239199617026)
+        this.makeFormService.queryById('1442846239199617026').then(({data}) => {
+          if (data.source) {
+            // this.options = JSON.parse(data.source)
+          } else {
+            // this.options = {'list': [], 'config': {'labelWidth': 100, 'labelPosition': 'right', 'size': 'small', 'customClass': ''}}
+          }
+          // this.generateModel(this.options.list)
+        })
       }
     }
   }

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

@@ -287,7 +287,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.inputForm.resetFields()
         this.inputForm.oldLoinName = ''
-        this.roleService.list({current: 1, size: -1}).then(({data}) => {
+        this.roleService.usableDataList({current: 1, size: -1}).then(({data}) => {
           this.roleList = data.records
         })
         this.postService.list({current: 1, size: -1}).then(({data}) => {