报销功能调整

src/views/modules/cw/reimbursementApproval/info/ReimbursementForm.vue

@@ -86,7 +86,7 @@
             @edit-closed=""
             highlight-current-row
           >
-            <vxe-table-column field="purchaser" title="采购人" :edit-render="{}" :rules="[{required: true, message:'请选择采购人', trigger:'blur'}]"></vxe-table-column>
+            <vxe-table-column field="purchaserAgent" title="采购人" :edit-render="{}" :rules="[{required: true, message:'请选择采购人', trigger:'blur'}]"></vxe-table-column>
             <vxe-table-column field="procurementOffice" title="采购部门" :edit-render="{}"></vxe-table-column>
             <vxe-table-column field="procurementType" title="采购类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]"></vxe-table-column>
             <vxe-table-column field="tradeName" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]"></vxe-table-column>

src/views/modules/reimbursement/info/InfoList.vue

@@ -20,13 +20,13 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="经办人" prop="handled">
+      <el-form-item v-if="showHideItem" label="经办人" prop="handled">
         <UserSelect :limit='1' :userName="searchForm.handled" @getValue='(value, label) => {searchForm.handled = label}'></UserSelect>
       </el-form-item>
-      <el-form-item label="报销人" prop="remiBy">
-        <UserSelect :limit='1' :userName="searchForm.remiBy" @getValue='(value, label) => {searchForm.remiBy = label}'></UserSelect>
+      <el-form-item v-if="showHideItem" label="报销人" prop="reimBy">
+        <UserSelect :limit='1' :userName="searchForm.reimBy" @getValue='(value, label) => {searchForm.reimBy = label}'></UserSelect>
       </el-form-item>
-      <el-form-item label="报销状态" prop="type">
+      <el-form-item v-if="showHideItem" label="报销状态" prop="type">
         <el-select v-model="searchForm.type" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in $dictUtils.getDictList('status')"
@@ -36,7 +36,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="报销部门" prop="department">
+      <el-form-item v-if="showHideItem" label="报销部门" prop="department">
         <SelectTree
           ref="officeTree"
           :props="{
@@ -50,7 +50,7 @@
           :accordion="true"
           @getValue="(value,label) => {searchForm.department=label}"/>
       </el-form-item>
-      <el-form-item label="报销类别" prop="remiType">
+      <el-form-item v-if="showHideItem" label="报销类别" prop="remiType">
         <SelectTree
           ref="areaTree"
           :props="{
@@ -64,14 +64,15 @@
           :accordion="true"
           @getValue="(value, label) => {searchForm.remiType=label}"/>
       </el-form-item>
-      <el-form-item label="报销金额" prop="amounts">
+      <el-form-item v-if="showHideItem" label="报销金额" prop="amounts">
         <InputNumber :disabled="false" :precision="num" v-model="searchForm.amounts"></InputNumber>
       </el-form-item>
-      <el-form-item label="报告号" prop="reportNumber">
+      <el-form-item v-if="showHideItem" label="报告号" prop="reportNumber">
         <el-input size="small" v-model="searchForm.reportNumber" placeholder="请输入报告号" clearable></el-input>
       </el-form-item>
 
       <el-form-item>
+        <el-button type="default" @click="showHide" size="small" :icon="showHideIcon">{{showHideName}}</el-button>
         <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
         <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
       </el-form-item>
@@ -110,34 +111,45 @@
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
-          <vxe-column width="200" title="报销编号" field="no" align="left">
+          <vxe-column min-width="200" title="报销编号" field="no" align="center">
             <template slot-scope="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('reimbursement:info:view')" @click="view(scope.row.id)">{{scope.row.no}}</el-link>
               <el-link  type="primary" :underline="false" v-else-if="hasPermission('reimbursement:info:view')" @click="view(scope.row.id)">{{scope.row.no}}</el-link>
               <span v-else>{{scope.row.no}}</span>
             </template>
           </vxe-column>
-          <vxe-column width="200" title="报销类别" field="typeName"></vxe-column>
-          <vxe-column width="200" title="报销项目" field="projectName">
+          <vxe-column width="130" title="报销类型" field="sourceType"align="center">
             <template slot-scope="scope">
-              <el-link  type="primary" :underline="false" v-if="hasPermission('reimbursement:info:view') && scope.row.projectId != undefined" @click="viewProject(scope.row.projectId)">{{scope.row.projectName}}</el-link>
-              <el-link  type="primary" :underline="false" v-else-if="hasPermission('reimbursement:info:view') && scope.row.projectId != undefined" @click="viewProject(scope.row.projectId)">{{scope.row.projectName}}</el-link>
-              <span v-else>{{scope.row.projectName}}</span>
+              {{$dictUtils.getDictLabel('pg_reimbursement_source_type', scope.row.sourceType, '')}}
             </template>
           </vxe-column>
-          <vxe-column width="200" title="报告号" field="reportNumber"></vxe-column>
-          <vxe-column width="100" title="经办人" field="userName"></vxe-column>
-          <vxe-column width="100" title="报销人" field="name"></vxe-column>
-          <vxe-column width="100" title="报销部门" field="deptName"></vxe-column>
-          <vxe-column width="100" title="报销日期" field="reimDate"></vxe-column>
-          <vxe-column width="150" title="报销金额(元)" field="number"></vxe-column>
-          <vxe-column width="100" title="状态" fixed="right" align="center" field="type">
+          <vxe-column min-width="200" title="报销类别" field="typeName" align="center"></vxe-column>
+          <vxe-column min-width="200" title="报销项目" field="projectName"align="center">
+            <template slot-scope="scope">
+              <el-link  type="primary" :underline="false" v-if="hasPermission('reimbursement:info:view') && scope.row.projectId != undefined" @click="viewProject(scope.row.projectId)">{{scope.row.sourceType === '2' ? '' : scope.row.projectName}}</el-link>
+              <el-link  type="primary" :underline="false" v-else-if="hasPermission('reimbursement:info:view') && scope.row.projectId != undefined" @click="viewProject(scope.row.projectId)">{{scope.row.sourceType === '2' ? '' : scope.row.projectName}}</el-link>
+              <span v-else>{{scope.row.sourceType === '2' ? '' : scope.row.projectName}}</span>
+            </template>
+          </vxe-column>
+          <vxe-column width="180" title="报销合同" field="projectName"align="center">
+            <template slot-scope="scope">
+              <el-link  type="primary" :underline="false" v-if="hasPermission('reimbursement:info:view') && scope.row.projectId != undefined" @click="viewContract(scope.row.projectId)">{{scope.row.sourceType === '2' ? scope.row.projectName : ''}}</el-link>
+              <span v-else>{{scope.row.sourceType === '2' ? scope.row.projectName : ''}}</span>
+            </template>
+          </vxe-column>
+          <vxe-column min-width="200" title="报告号" field="reportNumber" align="center"></vxe-column>
+          <vxe-column min-width="100" title="经办人" field="userName" align="center"></vxe-column>
+          <vxe-column min-width="100" title="报销人" field="name" align="center"></vxe-column>
+          <vxe-column min-width="100" title="报销部门" field="deptName" align="center"></vxe-column>
+          <vxe-column min-width="100" title="报销日期" field="reimDate" align="center"></vxe-column>
+          <vxe-column min-width="150" title="报销金额(元)" field="number" align="center"></vxe-column>
+          <vxe-column min-width="100" title="状态" fixed="right" align="center" field="type">
             <template slot-scope="scope">
               <el-button type="text" @click="detail(scope.row)" :type="$dictUtils.getDictLabel('status_info', scope.row.type, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("status", scope.row.type, '未开始')}} </el-button>
             </template>
           </vxe-column>
 
-          <vxe-column title="操作" width="130px" fixed="right" align="center">
+          <vxe-column title="操作" min-width="130px" fixed="right" align="center">
             <template  slot-scope="scope">
               <el-button v-if="hasPermission('reimbursement:info:edit')&& scope.row.createId === $store.state.user.id && (scope.row.type === '1' || scope.row.type === '3')" type="text"  size="small" @click="edit(scope.row)">修改</el-button>
               <el-button v-if="hasPermission('reimbursement:info:edit')&& scope.row.createId === $store.state.user.id && (scope.row.type === '2')" type="text"  size="small" @click="reback(scope.row)">撤回</el-button>
@@ -160,6 +172,7 @@
         <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>
         <InfoForm ref="infoForm" @refreshDataList="refreshList"></InfoForm>
         <ProjectForm ref="projectForm" @refreshDataList="refreshList"></ProjectForm>
+        <ContractNameForm ref="contractNameForm"></ContractNameForm>
       </div>
     </div>
   </div>
@@ -177,9 +190,13 @@
   import ProcessService from '@/api/flowable/ProcessService'
   import pick from 'lodash.pick'
   import ProjectForm from '@/views/modules/program/registered/ProjectForm'
+  import ContractNameForm from '@/views/modules/sys/workContract/WorkContractForm2'
   export default {
     data () {
       return {
+        showHideItem: false,
+        showHideIcon: 'el-icon-arrow-down',
+        showHideName: '展示',
         num: 0,
         visable: false,
         gridData: [],
@@ -187,7 +204,7 @@
           project: '',
           dates: [],
           handled: '',
-          remiBy: '',
+          reimBy: '',
           type: [],
           department: '',
           remiType: '',
@@ -219,7 +236,8 @@
       ProgramPageForm,
       InfoForm,
       ProjectForm,
-      UserSelect
+      UserSelect,
+      ContractNameForm
     },
     mounted () {
       this.refreshList()
@@ -238,6 +256,17 @@
       }
     },
     methods: {
+      showHide () {
+        if (this.showHideItem === false) {
+          this.showHideItem = true
+          this.showHideIcon = 'el-icon-arrow-up'
+          this.showHideName = '隐藏'
+        } else {
+          this.showHideItem = false
+          this.showHideIcon = 'el-icon-arrow-down'
+          this.showHideName = '展示'
+        }
+      },
       // 新增
       add () {
         // 读取流程表单
@@ -356,6 +385,9 @@
       viewProject (id) {
         this.$refs.projectForm.init('view', id)
       },
+      viewContract (id) {
+        this.$refs.contractNameForm.init('view', id)
+      },
       // 获取数据列表
       refreshList () {
         this.loading = true

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

@@ -0,0 +1,173 @@
+<template>
+  <div>
+    <el-dialog
+      title="选择合同"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      width="1300px"
+      height="500px"
+      @close="close"
+      append-to-body
+      @keyup.enter.native=""
+      :visible.sync="visible">
+      <div style="height: calc(100% - 80px);">
+        <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @submit.native.prevent>
+          <!-- 搜索框-->
+          <el-form-item label="客户名称" prop="clientName">
+            <el-input size="small" v-model="searchForm.clientName" placeholder="请输入客户名称" clearable></el-input>
+          </el-form-item>
+
+          <el-form-item label="合同名称" prop="name">
+            <el-input size="small" v-model="searchForm.name" placeholder="请输入合同名称" clearable></el-input>
+          </el-form-item>
+
+
+          <el-form-item>
+            <el-button type="primary" @click="list()" size="small" icon="el-icon-search">查询</el-button>
+            <el-button @click="resetSearch()" size="small" 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="workContractTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :menu-config="{}"
+          :print-config="{}"
+          @sort-change=""
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :row-config="{isCurrent: true}"
+          :radio-config="{trigger: 'row'}"
+        >
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
+          <vxe-column type="radio" width="40px"></vxe-column>
+          <vxe-column min-width="200px" title="合同编号" field="no" align="center"></vxe-column>
+          <vxe-column min-width="200px" title="合同名称" field="name" align="center"></vxe-column>
+          <vxe-column min-width="100px" title="案卷号" field="filedNo" align="center"></vxe-column>
+          <vxe-column min-width="200px" title="客户名称" field="clientName" align="center"></vxe-column>
+          <vxe-column min-width="100px" title="合同金额(元)" field="contractAmount" align="center"></vxe-column>
+          <vxe-column min-width="100px" title="创建人" field="createBy" align="center"></vxe-column>
+          <vxe-column min-width="150px" title="签订日期" field="contractDate" align="center"></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>
+      </div>
+      <span slot="footer" class="dialog-footer">
+      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+      <el-button size="small" type="primary" v-if="method != 'view'" @click="getContract()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+    </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import InputNumber from '@/views/modules/sys/workContract/InputNumber.vue'
+  import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  import ContractInfoService from '@/api/sys/WorkContractService'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        dataList: [],
+        searchForm: {
+          clientName: '',
+          name: '',
+          contractDates: [],
+          type: '',
+          filedType: '',
+          contractAmounts: [],
+          createBy: '',
+          procInsId: '',
+          processDefinitionId: ''
+        }
+      }
+    },
+    contractInfoService: null,
+    created () {
+      this.contractInfoService = new ContractInfoService()
+    },
+    components: {
+      SelectUserTree,
+      InputNumber
+    },
+    methods: {
+      init (rowIndex) {
+        // if (!this.commonJS.isEmpty(id)) {
+        //   this.$refs.workContractTable.setCurrentRow(id)
+        // }
+        this.visible = true
+        this.rowIndex = rowIndex
+        this.list()
+      },
+      projectInit (rowIndex) {
+        this.visible = true
+        this.rowIndex = rowIndex
+        this.projectList()
+      },
+      // 表单提交
+      getContract () {
+        let row = this.$refs.workContractTable.getRadioRecord()
+        if (this.commonJS.isEmpty(row)) {
+          this.$message.error('请选择一条数据')
+          return
+        }
+        this.close()
+        this.$emit('getContract', row, this.rowIndex)
+      },
+      list () {
+        this.loading = true
+        this.searchForm.statusList = '2,3,4,5'
+        this.contractInfoService.list({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then(({data}) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.loading = false
+        })
+      },
+      // 当前页
+      currentChangeHandle ({currentPage, pageSize}) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.list()
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.list()
+      },
+      close () {
+        this.$refs.searchForm.resetFields()
+        this.visible = false
+      }
+    }
+  }
+</script>