Parcourir la source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/cw/reportManagement/ReportReviewTakeNumberForm.vue
sangwenwei il y a 1 an
Parent
commit
42c298b775

+ 7 - 0
src/api/sys/ReimbursementService.js

@@ -58,6 +58,13 @@ export default class ReimbursementService {
 			params: {name: name}
 		})
 	}
+	userTreeSelectBySignatureScribe (name) {
+		return request({
+			url: prefix + '/reimbursement/info/userTreeSelectBySignatureScribe',
+			method: 'get',
+			params: {name: name}
+		})
+	}
   exportFile (params) {
     return request({
       url: prefix + '/reimbursement/info/exportFile',

+ 1 - 1
src/components/userSelect/UserSelectDialog.vue

@@ -254,7 +254,7 @@ export default {
 			// var allNode = { id: "", type: "1", name: "所有" };
 			// res.unshift(allNode);
 			this.group = res;
-			// this.searchForm.companyDTO.id = this.group[0].id;
+			this.searchForm.companyDTO.id = this.group[0].id;
 		},
 		//获取用户
 		async getUser() {

+ 2 - 2
src/views/cw/projectRecords/ProjectRecordsAddForm.vue

@@ -470,8 +470,8 @@
   import projectReportService from "@/api/cw/reportManagement/ProjectReportService";
   import cwFinanceInvoiceService from "@/api/cw/invoice/CwFinanceInvoiceService";
   import UserSelect1 from '@/views/utils/UserTreeSelect'
-  import UserSelect2 from '@/views/utils/UserTreeSelect2'
-  import UserSelect3 from '@/views/utils/UserTreeSelect2'
+  import UserSelect2 from '@/views/utils/UserTreeSelectBySignatureScribe'
+  import UserSelect3 from '@/views/utils/UserTreeSelectBySignatureScribe'
   export default {
     props: {
       businessId: {

+ 2 - 2
src/views/cw/projectRecords/ProjectRecordsList.vue

@@ -191,8 +191,8 @@
   import ContractNameForm from '../workContract/ContractNameForm'
   import ProjectRecordsAddForm from './ProjectRecordsAddForm'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
-	import UserSelect1 from '@/views/utils/UserTreeSelect2'
-	import UserSelect2 from '@/views/utils/UserTreeSelect2'
+	import UserSelect1 from '@/views/utils/UserTreeSelectBySignatureScribe'
+	import UserSelect2 from '@/views/utils/UserTreeSelectBySignatureScribe'
 	import UserSelect3 from '@/views/utils/UserTreeSelect'
 	export default {
     data () {

+ 2 - 2
src/views/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -271,8 +271,8 @@
   import XEUtils from 'xe-utils'
   import officeService from '@/api/sys/OfficeService'
 	import ProjectReportArchiveDia from "./ProjectReportArchiveDia";
-	import UserSelect1 from '@/views/utils/UserTreeSelect2'
-	import UserSelect2 from '@/views/utils/UserTreeSelect2'
+	import UserSelect1 from '@/views/utils/UserTreeSelectBySignatureScribe'
+	import UserSelect2 from '@/views/utils/UserTreeSelectBySignatureScribe'
 	import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     data () {

+ 2 - 2
src/views/cw/reportCancellApply/ReportCancellApplyList.vue

@@ -179,8 +179,8 @@
   import userService from '@/api/sys/UserService'
   import SelectUserTree from '@/views/utils/treeUserSelect'
   import UserSelect from '@/views/cw/workClientInfo/clientUserSelect'
-  import UserSelect1 from '@/views/utils/UserTreeSelect2'
-  import UserSelect2 from '@/views/utils/UserTreeSelect2'
+  import UserSelect1 from '@/views/utils/UserTreeSelectBySignatureScribe'
+  import UserSelect2 from '@/views/utils/UserTreeSelectBySignatureScribe'
   import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     data () {

+ 2 - 2
src/views/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList.vue

@@ -215,8 +215,8 @@
   import userService from '@/api/sys/userService'
   import SelectUserTree from '@/views/utils/treeUserSelect'
   import UserSelect from '@/views/cw/workClientInfo/clientUserSelect'
-  import UserSelect1 from '@/views/utils/UserTreeSelect2'
-  import UserSelect2 from '@/views/utils/UserTreeSelect2'
+  import UserSelect1 from '@/views/utils/UserTreeSelectBySignatureScribe'
+  import UserSelect2 from '@/views/utils/UserTreeSelectBySignatureScribe'
   import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     data () {

+ 2 - 2
src/views/cw/reportManagement/ReportManagementList.vue

@@ -448,8 +448,8 @@
   import projectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
   import UserSelect from '@/views/cw/workClientInfo/clientUserSelect'
   // import UserSelect2 from '@/components/userSelect2/UserSelectDialog';
-  import UserSelect1 from '@/views/utils/UserTreeSelect2'
-  import UserSelect2 from '@/views/utils/UserTreeSelect2'
+  import UserSelect1 from '@/views/utils/UserTreeSelectBySignatureScribe'
+  import UserSelect2 from '@/views/utils/UserTreeSelectBySignatureScribe'
   import UserSelect3 from '@/views/utils/UserTreeSelect'
   export default {
     data () {

+ 0 - 1
src/views/cw/reportManagement/ReportReviewTakeNumberForm.vue

@@ -1017,7 +1017,6 @@
 									this.inputForm.isCompleteInvoice = '1'
 									this.doSubmit('start', callback)
 								}).catch(async (action)=>{
-									console.log('action',action)
 									if (action === 'cancel'){
 										this.inputForm.isCompleteInvoice = '0'
 										this.doSubmit('start', callback)

+ 142 - 0
src/views/utils/UserTreeSelectBySignatureScribe.vue

@@ -0,0 +1,142 @@
+<template>
+  <div>
+    <el-dialog
+      :title="title"
+      :close-on-click-modal="false"
+	  draggable
+      width="500px"
+      height="700px"
+      @close="close"
+      append-to-body
+	  v-model="visible">
+      <div style="height: calc(100% - 80px);">
+        <el-form :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+          <!-- 搜索框-->
+          <el-form-item label="" prop="name">
+            <el-input v-model="searchForm.name" placeholder="请输入用户名称" clearable></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" @click="list()" size="medium" icon="el-icon-search">查询</el-button>
+            <el-button @click="resetSearch()" size="medium" icon="el-icon-refresh-right">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="400px"
+          :loading="loading"
+          size="small"
+          ref="userTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :menu-config="{}"
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :row-config="{isCurrent: true}"
+          :radio-config="{trigger: 'row'}"
+          :tree-config="{transform: true, rowField: 'id', parentField: 'parentId',expandAll: true}"
+          :checkbox-config="{}">
+<!--          <vxe-column type="seq" width="60" title="序号"></vxe-column>-->
+          <vxe-column type="radio" width="50" ></vxe-column>
+
+          <vxe-column title="姓名" min-width="180" field="name" align="left" tree-node></vxe-column>
+        </vxe-table>
+      </div>
+		<template #footer>
+			<span class="dialog-footer">
+			  <el-button @click="close()" size="medium" icon="el-icon-circle-close">关闭</el-button>
+			  <el-button type="primary" size="medium" v-if="method != 'view'" @click="getProgramForUser()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+			</span>
+		</template>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import ReimbursementService from '@/api/sys/ReimbursementService'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        dataList: [],
+        searchForm: {
+          name: ''
+        }
+      }
+    },
+    reimbursementService: null,
+    created () {
+      this.reimbursementService = new ReimbursementService()
+    },
+    components: {
+    },
+    methods: {
+      init () {
+        this.title = '人员选择'
+        this.visible = true
+        this.list()
+      },
+      // 表单提交
+      getProgramForUser () {
+        let rows = []
+        if (this.commonJS.isEmpty(this.$refs.userTable.getRadioRecord())) {
+          this.$message.error('请选择一条数据')
+          return
+        }
+        // if (this.$refs.userTable.getCheckboxRecords().length > 1) {
+        //   this.$message.error('最多选择一条数据')
+        //   return
+        // }
+        let row = this.$refs.userTable.getRadioRecord()
+        if (!row.isUser) {
+          this.$message.error('请选择子集数据')
+          return
+        }
+        this.close()
+        rows.push(row)
+        this.$emit('doSubmit', rows)
+      },
+      list () {
+        this.loading = true
+        this.reimbursementService.userTreeSelectBySignatureScribe(this.searchForm.name).then((data) => {
+          this.dataList = data
+          this.loading = false
+          this.$nextTick(() => {
+            this.$refs.userTable.setAllTreeExpand(true)
+          })
+        })
+      },
+      // 当前页
+      currentChangeHandle ({currentPage, pageSize}) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.list()
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.list()
+      },
+      close () {
+        this.detail = ''
+        this.visible = false
+      }
+    }
+  }
+</script>
+<style>
+  .messageZindex {
+    z-index:9999 !important;
+  }
+</style>
+<style scoped>
+  /deep/ .el-dialog__body {
+    padding-top: 0px;
+  }
+</style>