Explorar el Código

项目登记前端

lizhenhao hace 2 años
padre
commit
1a33406228

+ 7 - 0
src/api/program/ProgramProjectListInfoService.js

@@ -29,4 +29,11 @@ export default class ProgramProjectListInfoService {
       params: {ids: ids}
     })
   }
+  findContractPageList (params) {
+    return request({
+      url: '/program/projectList/findContractPageList',
+      method: 'get',
+      params: params
+    })
+  }
 }

+ 14 - 1
src/views/modules/program/registered/ContactForm.vue

@@ -103,8 +103,21 @@
       // 表单提交
       getContact () {
         let rows = this.$refs.contactTable.getCheckboxRecords()
+        let list = []
+        if (!this.commonJS.isEmpty(rows)) {
+          rows.forEach(item => {
+            let p = {
+              contacts: item.name,
+              linkMobilePhoneFirst: item.linkPhone,
+              linkMobilePhoneSecoed: item.linkMobile,
+              job: '',
+              remarks: ''
+            }
+            list.push(p)
+          })
+        }
         this.close()
-        this.$emit('getContact', rows, this.searchForm.deputy)
+        this.$emit('getContact', list, this.searchForm.deputy)
       },
       list () {
         this.workClientService.findById(this.searchForm.id).then((data) => {

+ 18 - 15
src/views/modules/program/registered/ContractForm.vue

@@ -15,20 +15,20 @@
           <el-form-item label="合同名称" prop="name">
             <el-input size="small" v-model="searchForm.name" placeholder="请输入合同名称" clearable></el-input>
           </el-form-item>
-<!--          <el-form-item label="创建人" prop="createBy">-->
-<!--            <SelectUserTree-->
-<!--              ref="companyTree"-->
-<!--              :props="{-->
-<!--                  value: 'id',             // ID字段名-->
-<!--                  label: 'name',         // 显示名称-->
-<!--                  children: 'children'    // 子级字段名-->
-<!--                }"-->
-<!--              :url="`/sys/user/treeUserDataAllOffice?type=2`"-->
-<!--              :value="searchForm.createBy"-->
-<!--              :clearable="true"-->
-<!--              :accordion="true"-->
-<!--              @getValue="(value) => {searchForm.createBy=value}"/>-->
-<!--          </el-form-item>-->
+          <el-form-item label="创建人" prop="createBy">
+            <SelectUserTree
+              ref="companyTree"
+              :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+              :url="`/sys/user/treeUserDataAllOffice?type=2`"
+              :value="searchForm.createBy"
+              :clearable="true"
+              :accordion="true"
+              @getValue="(value) => {searchForm.createBy=value}"/>
+          </el-form-item>
 
           <el-form-item>
             <el-button type="primary" @click="list()" size="small" icon="el-icon-search">查询</el-button>
@@ -86,6 +86,7 @@
   import InputNumber from '@/views/modules/sys/workContract/InputNumber.vue'
   import WorkContractService from '@/api/sys/WorkContractService'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  import ProgramProjectListInfoService from '@/api/program/ProgramProjectListInfoService'
   export default {
     data () {
       return {
@@ -115,8 +116,10 @@
       }
     },
     workContractService: null,
+    programProjectListInfoService: null,
     created () {
       this.workContractService = new WorkContractService()
+      this.programProjectListInfoService = new ProgramProjectListInfoService()
     },
     components: {
       SelectUserTree,
@@ -138,7 +141,7 @@
       },
       list () {
         this.loading = true
-        this.workContractService.list({
+        this.programProjectListInfoService.findContractPageList({
           'current': this.tablePage.currentPage,
           'size': this.tablePage.pageSize,
           'orders': this.tablePage.orders,

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 413 - 167
src/views/modules/program/registered/ProjectForm.vue


+ 10 - 10
src/views/modules/program/registered/ProjectList.vue

@@ -117,16 +117,16 @@
             </template>
           </vxe-column>
         </vxe-table>
-<!--        <vxe-pager-->
-<!--          background-->
-<!--          size="small"-->
-<!--          :current-page="tablePage.currentPage"-->
-<!--          :page-size="tablePage.pageSize"-->
-<!--          :total="tablePage.total"-->
-<!--          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"-->
-<!--          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"-->
-<!--          @page-change="currentChangeHandle">-->
-<!--        </vxe-pager>-->
+        <vxe-pager
+          background
+          size="small"
+          :current-page="tablePage.currentPage"
+          :page-size="tablePage.pageSize"
+          :total="tablePage.total"
+          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+          @page-change="currentChangeHandle">
+        </vxe-pager>
       </div>
     </div>
     <ProjectForm  ref="projectForm" @refreshDataList="refreshList"></ProjectForm>