Merge remote-tracking branch 'origin/master'

src/api/materialManagement/WareHouseService.js

@@ -15,6 +15,13 @@ export default class WareHouseService {
       params: param
     })
   }
+  wareHouseHistoryList (param) {
+    return request({
+      url: '/material/management/wareHouse/wareHouseHistoryList',
+      method: 'get',
+      params: param
+    })
+  }
   wareHouseSummaryList (param) {
     return request({
       url: '/material/management/wareHouse/wareHouseSummaryList',

src/api/roster/RosterService.js

@@ -36,4 +36,18 @@ export default class RosterService {
       params: {ids: ids}
     })
   }
+  template () {
+    return request({
+      url: '/roster/base/import/template',
+      method: 'get',
+      responseType: 'blob'
+    })
+  }
+  importExcel (data) {
+    return request({
+      url: '/roster/base/import',
+      method: 'post',
+      data: data
+    })
+  }
 }

src/components/userSelect/UserSelectDialog.vue

@@ -315,6 +315,9 @@
       },
       // 获取数据列表
       refreshList () {
+        if (this.commonJS.isEmpty(this.searchForm.officeDTO.id) && this.commonJS.isEmpty(this.searchForm.companyDTO.id)) {
+          this.searchForm.selectAll = 'true'
+        }
         this.loading = true
         this.$http({
           url: '/sys/user/list',
@@ -326,6 +329,7 @@
             ...this.searchForm
           }
         }).then(({data}) => {
+          this.searchForm.selectAll = ''
           this.dataList = data.records
           this.total = data.total
           this.pageNo = data.current

src/components/userSelectButton/UserSelectDialog.vue

@@ -315,6 +315,9 @@
       },
       // 获取数据列表
       refreshList () {
+        if (this.commonJS.isEmpty(this.searchForm.officeDTO.id) && this.commonJS.isEmpty(this.searchForm.companyDTO.id)) {
+          this.searchForm.selectAll = 'true'
+        }
         this.loading = true
         this.$http({
           url: '/sys/user/list',

src/components/userSelectV2/UserSelectDialog.vue

@@ -315,6 +315,9 @@
       },
       // 获取数据列表
       refreshList () {
+        if (this.commonJS.isEmpty(this.searchForm.officeDTO.id) && this.commonJS.isEmpty(this.searchForm.companyDTO.id)) {
+          this.searchForm.selectAll = 'true'
+        }
         this.loading = true
         this.$http({
           url: '/sys/user/list',

src/views/modules/changes/dimission/DimissionList.vue

@@ -62,7 +62,40 @@
               <span v-else>{{!commonJS.isEmpty(scope.row.rosterBaseDTO.name)?scope.row.rosterBaseDTO.name:'--'}}</span>
             </template>
           </vxe-column>
-          <vxe-column width="120" title="离职审批" field="vettingStatus">
+
+          <vxe-column width="200" title="工号" field="rosterBaseDTO.jobNo"></vxe-column>
+          <vxe-column width="200" title="部门" field="soName"></vxe-column>
+          <vxe-column width="200" title="职位" field="jpName"></vxe-column>
+          <vxe-column width="200" title="手机号" field="rosterBaseDTO.mobile"></vxe-column>
+          <vxe-column width="200" title="入职日期" field="rosterBaseDTO.onboardingDate">
+            <template slot-scope="scope">
+              {{moment(scope.row.rosterBaseDTO.onboardingDate).format('YYYY-MM-DD')}}
+            </template>
+          </vxe-column>
+          <vxe-column width="200" title="最后工作日" field="lastWorkDate">
+            <template slot-scope="scope">
+              {{moment(scope.row.lastWorkDate).format('YYYY-MM-DD')}}
+            </template>
+          </vxe-column>
+          <vxe-column width="200" title="离职日期" field="dimissionDate">
+            <template slot-scope="scope">
+              {{moment(scope.row.dimissionDate).format('YYYY-MM-DD')}}
+            </template>
+          </vxe-column>
+          <vxe-column width="200" title="离职原因" field="changesDimissionReaDTOList">
+            <template slot-scope="scope">
+              {{getDimissionReaList(scope.row.changesDimissionReaDTOList)}}
+            </template>
+          </vxe-column>
+          <vxe-column width="200" title="原因说明" field="reasonDesc"></vxe-column>
+          <vxe-column width="200" title="离职类型" field="type">
+            <template slot-scope="scope">
+              {{$dictUtils.getDictLabel('dimission_type', scope.row.type, '-')}}
+            </template>
+          </vxe-column>
+          <vxe-column width="200" title="备注" field="remarks"></vxe-column>
+
+          <vxe-column width="120" title="离职审批" fixed="right" align="center" field="vettingStatus">
             <template slot-scope="scope">
               <el-button v-if="scope.row.vettingStatus === '4'" type="primary" @click="auditDetail(scope.row)" size="mini">
                 {{$dictUtils.getDictLabel("vetting_status", scope.row.vettingStatus, '-')}}
@@ -87,7 +120,7 @@
               </el-button>
             </template>
           </vxe-column>
-          <vxe-column width="120" title="离职交接" field="handoverStatus">
+          <vxe-column width="120" title="离职交接" fixed="right" align="center" field="handoverStatus">
             <template slot-scope="scope">
               <el-button v-if="scope.row.handoverStatus === '3'" type="primary"  @click="handoverDetail(scope.row)" size="mini">
                 {{$dictUtils.getDictLabel('handover_status', scope.row.handoverStatus, '-')}}
@@ -110,7 +143,7 @@
 
             </template>
           </vxe-column>
-          <vxe-column width="120" title="离职状态" field="status">
+          <vxe-column width="120" title="离职状态" fixed="right" align="center" field="status">
             <template slot-scope="scope">
               <el-button v-if="scope.row.status === '2'" type="success" size="mini">
                 {{$dictUtils.getDictLabel('dimission_status', scope.row.status, '-')}}
@@ -120,39 +153,6 @@
               </el-button>
             </template>
           </vxe-column>
-          <vxe-column width="200" title="工号" field="rosterBaseDTO.jobNo"></vxe-column>
-          <vxe-column width="200" title="部门" field="soName"></vxe-column>
-          <vxe-column width="200" title="职位" field="jpName"></vxe-column>
-          <vxe-column width="200" title="手机号" field="rosterBaseDTO.mobile"></vxe-column>
-          <vxe-column width="200" title="入职日期" field="rosterBaseDTO.onboardingDate">
-            <template slot-scope="scope">
-              {{moment(scope.row.rosterBaseDTO.onboardingDate).format('YYYY-MM-DD')}}
-            </template>
-          </vxe-column>
-          <vxe-column width="200" title="最后工作日" field="lastWorkDate">
-            <template slot-scope="scope">
-              {{moment(scope.row.lastWorkDate).format('YYYY-MM-DD')}}
-            </template>
-          </vxe-column>
-          <vxe-column width="200" title="离职日期" field="dimissionDate">
-            <template slot-scope="scope">
-              {{moment(scope.row.dimissionDate).format('YYYY-MM-DD')}}
-            </template>
-          </vxe-column>
-          <vxe-column width="200" title="离职原因" field="changesDimissionReaDTOList">
-            <template slot-scope="scope">
-              {{getDimissionReaList(scope.row.changesDimissionReaDTOList)}}
-            </template>
-          </vxe-column>
-          <vxe-column width="200" title="原因说明" field="reasonDesc"></vxe-column>
-          <vxe-column width="200" title="离职类型" field="type">
-            <template slot-scope="scope">
-              {{$dictUtils.getDictLabel('dimission_type', scope.row.type, '-')}}
-            </template>
-          </vxe-column>
-          <vxe-column width="200" title="备注" field="remarks"></vxe-column>
-
-
           <vxe-column title="操作" width="50px" fixed="right" align="center">
             <template  slot-scope="scope">
               <el-dropdown size="small"  @command="handleCommand">

src/views/modules/cw/invoice/InvoiceFormTask.vue

@@ -954,6 +954,9 @@
             this.loading = true
             this.inputForm.workAttachmentDtoList = this.$refs.uploadComponent.getDataList()
             this.financeInvoiceService.saveForm(this.inputForm).then(({data}) => {
+              if (status === 'start' || status === 'reapply') {
+                this.inputForm.title = `${this.$store.state.user.name} 发起了 ${data.no} [财务-发票申请]`
+              }
               callback(data.businessTable, data.businessId, this.inputForm)
               this.loading = false
             }).catch(() => {

src/views/modules/cw/projectRecords/ProjectRecordsList.vue

@@ -122,7 +122,8 @@
   import ProjectRecordsForm from './ProjectRecordsForm'
   import pick from 'lodash.pick'
   import UserService from '@/api/sys/UserService'
-  import UserSelect from '@/components/userSelect'
+  // import UserSelect from '@/components/userSelect'
+  import UserSelect from '@/views/modules/cw/workClientInfo/clientUserSelect'
   import ContractNameForm from '../workContract/ContractNameForm'
   import ProjectRecordsAddForm from './ProjectRecordsAddForm'
   export default {

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

@@ -1014,6 +1014,7 @@
             this.inputForm.files = this.$refs.uploadComponent.getDataList()
             this.inputForm.type = '2'
             this.reimbursementApprovalService.save(this.inputForm).then(({data}) => {
+              this.inputForm.title = `${this.$store.state.user.name} 发起了 [${data.no}] - [财务-报销审批]`
               callback(data.businessTable, data.businessId, this.inputForm)
               this.$refs.inputForm.resetFields()
               this.loading = false

src/views/modules/cw/reportCancellApply/ReportCancellApplyTaskForm.vue

@@ -313,6 +313,9 @@
               this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
             }
             this.reportCancellApplyService.saveForm(this.inputForm).then(({data}) => {
+              if (status === 'start' || status === 'reapply') {
+                this.inputForm.title = `${this.$store.state.user.name} 发起了 [${this.inputForm.reportNo}] - ${this.inputForm.projectName} [财务-报告作废]`
+              }
               callback(data.businessTable, data.businessId, this.inputForm)
               this.loading = false
             }).catch(() => {

src/views/modules/cw/reportManagement/ReportManagementAddForm.vue

@@ -164,7 +164,7 @@
                           {required: true, message:'报告实际制作人不能为空', trigger:'blur'},
                           {required: true, message:'报告实际制作人不能为空', trigger:'change'}
                    ]">
-              <UserSelect size="medium" :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelect>
+              <UserSelectAll size="medium" :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -501,6 +501,7 @@
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import UserSelect from '../workClientInfo/clientUserSelect'
+  import UserSelectAll from '@/components/userSelect'
   import ProjectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
   import ProjectReportService from '@/api/cw/reportManagement/ProjectReportService'
   import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
@@ -620,7 +621,8 @@
       SelectTree,
       UserSelect,
       ReportServiceUnitForm,
-      ProjectRecoredChooseCom
+      ProjectRecoredChooseCom,
+      UserSelectAll
     },
     methods: {
       getKeyWatch (keyWatch) {

src/views/modules/cw/reportManagement/ReportManagementForm.vue

@@ -164,7 +164,7 @@
                               {required: true, message:'报告实际制作人不能为空', trigger:'blur'},
                           {required: true, message:'报告实际制作人不能为空', trigger:'change'}
                    ]">
-                  <UserSelect size="medium" :readonly="true" :disabled="method === 'view'" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelect>
+                  <UserSelectAll size="medium" :readonly="true" :disabled="method === 'view'" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>
                 </el-form-item>
               </el-col>
 
@@ -849,6 +849,7 @@
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import UserSelect from '../workClientInfo/clientUserSelect'
+  import UserSelectAll from '@/components/userSelect'
   import ProjectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
   import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
   // import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
@@ -997,7 +998,8 @@
       WorkContractChooseCom,
       UpLoadComponentDialog,
       ReportServiceUnitForm,
-      ProjectRecoredChooseCom
+      ProjectRecoredChooseCom,
+      UserSelectAll
     },
     methods: {
       // seeFileInfo (index) {

src/views/modules/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -164,7 +164,7 @@
             <el-form-item label="报告实际制作人" prop="realCreate"
                           :rules="[
                    ]">
-              <UserSelect size="medium" :readonly="true" :disabled="true" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelect>
+              <UserSelectAll size="medium" :readonly="true" :disabled="true" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -481,6 +481,7 @@
   // import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
   import ReportServiceUnitForm from './ReportServiceUnitForm'
   import ProcessService from '@/api/flowable/ProcessService'
+  import UserSelectAll from '@/components/userSelect'
   // import UpLoadComponentDialog from '@/views/common/UpLoadComponentDialog'
   // import ProjectInfoForm from './ProjectInfoForm'
   import ProjectRecoredChooseCom from '../projectRecords/ProjectRecordsChooseCom'
@@ -640,7 +641,8 @@
       ReportServiceUnitForm,
       ProcessService,
       // ProjectInfoForm,
-      ProjectRecoredChooseCom
+      ProjectRecoredChooseCom,
+      UserSelectAll
       // UpLoadComponentDialog
     },
     methods: {

src/views/modules/cw/reportManagement/ReportManagementTaskForm.vue

@@ -131,7 +131,7 @@
             <el-form-item label="报告实际制作人" prop="realCreate"
                           :rules="[
                    ]">
-              <UserSelect size="medium" :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelect>
+              <UserSelectAll size="medium" :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -260,6 +260,7 @@
   import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
   // import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
   import ReportServiceUnitForm from './ReportServiceUnitForm'
+  import UserSelectAll from '@/components/userSelect'
   // import UpLoadComponentDialog from '@/views/common/UpLoadComponentDialog'
   // import ProjectInfoForm from './ProjectInfoForm'
   import ProjectRecoredChooseCom from '../projectRecords/ProjectRecordsChooseCom'
@@ -359,7 +360,8 @@
       UserSelect,
       ReportServiceUnitForm,
       // ProjectInfoForm,
-      ProjectRecoredChooseCom
+      ProjectRecoredChooseCom,
+      UserSelectAll
       // UpLoadComponentDialog
     },
     methods: {

src/views/modules/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -148,7 +148,7 @@
               <el-form-item label="报告实际制作人" prop="realCreate"
                             :rules="[
                    ]">
-                <UserSelect size="medium" :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelect>
+                <UserSelectAll size="medium" :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -610,6 +610,7 @@
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import UserSelect from '../../workClientInfo/clientUserSelect'
+  import UserSelectAll from '@/components/userSelect'
   import ReportCancellApplyService from '@/api/cw/reportCancellApply/ReportCancellApplyService'
   import ReportReviewService from '@/api/cw/reportManagement/ReportReviewService'
   import ProjectReportService from '@/api/cw/reportManagement/ProjectReportService'
@@ -750,7 +751,8 @@
       SelectUserTree,
       UpLoadComponent,
       SelectTree,
-      UserSelect
+      UserSelect,
+      UserSelectAll
       // ReportCancellApplyChooseCom
     },
     methods: {

src/views/modules/cw/workClientInfo/clientUserSelect/UserSelectDialog.vue

@@ -317,6 +317,9 @@
       refreshList () {
         this.loading = true
         this.searchForm.certType = '6'
+        if (this.commonJS.isEmpty(this.searchForm.officeDTO.id) && this.commonJS.isEmpty(this.searchForm.companyDTO.id)) {
+          this.searchForm.selectAll = 'true'
+        }
         this.$http({
           url: '/sys/user/list',
           method: 'get',

src/views/modules/materialManagement/collect/CollectForm.vue

@@ -99,18 +99,18 @@
               <el-input v-model="scope.row.goodsName" @focus="openPurchasePageForm(scope.$rowIndex, scope.row)"></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column field="surplusNumber" title="剩余数量" :edit-render="{}">
-            <template v-slot:edit="scope">
-<!--              <el-input @change="changeValue" v-model="scope.row.tradeNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>-->
-<!--              <el-input @change="changeValue" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>-->
-              <el-input :disabled="true" v-model="scope.row.surplusNumber" maxlength="10"></el-input>
-            </template>
-          </vxe-table-column>
+<!--          <vxe-table-column field="surplusNumber" title="剩余数量" :edit-render="{}">-->
+<!--            <template v-slot:edit="scope">-->
+<!--&lt;!&ndash;              <el-input @change="changeValue" v-model="scope.row.tradeNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>&ndash;&gt;-->
+<!--&lt;!&ndash;              <el-input @change="changeValue" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>&ndash;&gt;-->
+<!--              <el-input :disabled="true" v-model="scope.row.surplusNumber" maxlength="10"></el-input>-->
+<!--            </template>-->
+<!--          </vxe-table-column>-->
           <vxe-table-column field="collectNumber" title="领用数量" :edit-render="{}">
             <template v-slot:edit="scope">
               <!--              <el-input @change="changeValue" v-model="scope.row.tradeNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>-->
               <!--              <el-input @change="changeValue" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>-->
-              <el-input @change="changeValue" v-model="scope.row.collectNumber" @blur="scope.row.collectNumber = twoDecimalPlaces2(scope.row.collectNumber)" maxlength="10"></el-input>
+              <el-input v-model="scope.row.collectNumber" @blur="scope.row.collectNumber = twoDecimalPlaces2(scope.row.collectNumber)" maxlength="10"></el-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">

src/views/modules/materialManagement/collect/UpdateCollectInfoForm.vue

@@ -107,14 +107,14 @@
                 <el-input :disabled='true' v-model="scope.row.goodsName" @focus="openPurchasePageForm(scope.$rowIndex, scope.row)"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column field="surplusNumber" title="剩余数量" :edit-render="{}">
-              <template v-slot:edit="scope">
-                <el-input :disabled="true" v-model="scope.row.surplusNumber" maxlength="10"></el-input>
-              </template>
-            </vxe-table-column>
+<!--            <vxe-table-column field="surplusNumber" title="剩余数量" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input :disabled="true" v-model="scope.row.surplusNumber" maxlength="10"></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
             <vxe-table-column field="collectNumber" title="领用数量" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input :disabled='true' @change="changeValue" v-model="scope.row.collectNumber" @blur="scope.row.collectNumber = twoDecimalPlaces2(scope.row.collectNumber)" maxlength="10"></el-input>
+                <el-input :disabled='true' v-model="scope.row.collectNumber" @blur="scope.row.collectNumber = twoDecimalPlaces2(scope.row.collectNumber)" maxlength="10"></el-input>
               </template>
             </vxe-table-column>
             <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">

src/views/modules/materialManagement/contract/ContractChooseForm.vue

@@ -0,0 +1,189 @@
+<template>
+  <div>
+    <el-dialog
+      title="选择合同信息"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      width="1100px"
+      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="contractName">
+            <el-input size="small" v-model="searchForm.contractName" placeholder="请输入合同名称" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="合同生效日期" prop="effectiveDates">
+            <el-date-picker
+              placement="bottom-start"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              v-model="searchForm.effectiveDates"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </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="projectTable"
+          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="160" align="center" title="合同编号" field="contractNo"></vxe-column>
+          <vxe-column min-width="160" align="center" title="合同名称" field="contractName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="客户名称" field="name"></vxe-column>
+          <vxe-column min-width="160" align="center" title="统一社会信用代码" field="uscCode"></vxe-column>
+          <vxe-column min-width="160" align="center" title="详细地址" field="address"></vxe-column>
+          <vxe-column min-width="160" align="center" title="合同生效日期" field="effectiveDate"></vxe-column>
+          <vxe-column min-width="160" align="center" title="合同终止日期" field="endTime"></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="getProject()" 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 ProjectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
+  // import WareHouseService from '@/api/materialManagement/WareHouseService'
+  import ContractService from '@/api/materialManagement/ContractService'
+  import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        dataList: [],
+        searchForm: {
+          contractName: '',
+          status: '',
+          effectiveDates: []
+        }
+      }
+    },
+    // projectRecordsService: null,
+    // wareHouseService: null,
+    contractService: null,
+    created () {
+      // this.projectRecordsService = new ProjectRecordsService()
+      // this.wareHouseService = new WareHouseService()
+      this.contractService = new ContractService()
+    },
+    components: {
+      SelectUserTree,
+      InputNumber
+    },
+    methods: {
+      init () {
+        this.visible = true
+        this.list()
+      },
+      // 表单提交
+      getProject () {
+        let row = this.$refs.projectTable.getRadioRecord()
+        if (this.commonJS.isEmpty(row)) {
+          this.$message.error('请选择一条数据')
+          return
+        }
+        this.close()
+        this.$emit('getProject', row)
+      },
+      list () {
+        this.loading = true
+        // this.searchForm.createId = this.$store.state.user.id
+        this.searchForm.status = '5'
+        this.contractService.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.tableKey = Math.random()
+          this.loading = false
+        })
+        // this.projectRecordsService.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>
+<style scoped>
+  /deep/ .el-dialog__body {
+    padding-top: 0px;
+    padding-bottom: 15px;
+  }
+</style>

src/views/modules/materialManagement/contract/ContractForm.vue

@@ -100,6 +100,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="合同编号" prop="contractNo"
+                        :rules="[
+                 ]">
+            <el-input :disabled="true" v-model="inputForm.contractNo" placeholder="自动生成" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="签订日期" prop="signingDate"
                         :rules="[
                 {required: true, message:'请输入签订日期', trigger:'blur'}
@@ -131,6 +138,7 @@
                         :rules="[
                ]">
             <el-date-picker
+              @change="checkFiledNo"
               placement="bottom-start"
               value-format="yyyy-MM-dd"
               v-model="inputForm.endTime"
@@ -365,6 +373,7 @@
           remarks1: '',
           remarks2: '',
           contractName: '',
+          contractNo: '',
           signingDate: '',
           effectiveDate: '',
           endTime: '',
@@ -640,6 +649,17 @@
           this.$refs.contactTable.remove(row)
           this.inputForm.cwProjectClientContactDTOList.splice(rowIndex, 1)
         }
+      },
+      checkFiledNo () {
+        console.log('进来了时间比较')
+        // eslint-disable-next-line no-unused-vars
+        let date1 = this.inputForm.effectiveDate
+        // eslint-disable-next-line no-unused-vars
+        let date2 = this.inputForm.endTime
+        if (Date.parse(this.inputForm.endTime) < Date.parse(this.inputForm.effectiveDate)) {
+          this.$message.warning(`合同终止日期要大于合同生效日期`)
+          this.inputForm.endTime = ''
+        }
       }
     }
   }

src/views/modules/materialManagement/contract/ContractList.vue

@@ -61,10 +61,17 @@
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
+          <vxe-column min-width="160" align="center" title="合同编号" field="contractNo"></vxe-column>
+          <vxe-column min-width="160" align="center" title="合同名称" field="contractName">
+            <template slot-scope="scope">
+              <el-link  type="primary" :underline="false" v-if="hasPermission('material:list')" @click="view(scope.row.id)">{{scope.row.contractName}}</el-link>
+              <el-link  type="primary" :underline="false" v-else-if="hasPermission('material:list')"  @click="view(scope.row.id,)">{{scope.row.contractName}}</el-link>
+              <span v-else>{{scope.row.contractName}}</span>
+            </template>
+          </vxe-column>
           <vxe-column min-width="160" align="center" title="客户名称" field="name"></vxe-column>
           <vxe-column min-width="160" align="center" title="统一社会信用代码" field="uscCode"></vxe-column>
           <vxe-column min-width="160" align="center" title="详细地址" field="address"></vxe-column>
-          <vxe-column min-width="160" align="center" title="合同名称" field="contractName"></vxe-column>
           <vxe-column min-width="160" align="center" title="合同生效日期" field="effectiveDate"></vxe-column>
           <vxe-column min-width="160" align="center" title="合同终止日期" field="endTime"></vxe-column>
           <vxe-column  min-width="150px"align="center" fixed="right" title="状态" field="status" >
@@ -96,7 +103,7 @@
           :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
           @page-change="currentChangeHandle">
         </vxe-pager>
-        <UpdateInfoForm ref="updateInfoForm" @refreshList="refreshList"></UpdateInfoForm>
+        <UpdateContractInfoForm ref="updateContractInfoForm" @refreshDataList="refreshList"></UpdateContractInfoForm>
       </div>
     </div>
   </div>
@@ -104,7 +111,7 @@
 
 <script>
   import UserSelect from '@/components/userSelect'
-  import UpdateInfoForm from '../info/UpdateInfoForm'
+  import UpdateContractInfoForm from './UpdateContractInfoForm'
   import InputNumber from '@/views/modules/cw/workContract/InputNumber.vue'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import WorkClientService from '@/api/cw/workClientInfo/WorkClientService'
@@ -162,7 +169,7 @@
       InputNumber,
       SelectUserTree,
       SelectTree,
-      UpdateInfoForm,
+      UpdateContractInfoForm,
       UserSelect
     },
     computed: {
@@ -190,11 +197,11 @@
         id = id || this.$refs.clientTable.getCheckboxRecords().map(item => {
           return item.id
         })[0]
-        this.$refs.updateInfoForm.init('edit', id)
+        this.$refs.updateContractInfoForm.init('edit', id)
       },
       // 查看
       view (id) {
-        this.$refs.updateInfoForm.init('view', id)
+        this.$refs.updateContractInfoForm.init('view', id)
       },
       // 查询当前用户是否是管理员用户
       checkIsAdmin () {

src/views/modules/materialManagement/contract/UpdateContractInfoForm.vue

@@ -0,0 +1,566 @@
+<template>
+  <div>
+    <el-dialog
+      :title="title"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      width="1500px"
+      @close="close"
+      @keyup.enter.native="doSubmit"
+      :visible.sync="visible"
+      append-to-body
+    >
+    <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
+             label-width="200px" @submit.native.prevent>
+
+      <el-divider content-position="left"><i class="el-icon-document"></i> 客户信息</el-divider>
+      <el-row :gutter="0">
+        <el-col :span="10">
+          <el-form-item label="客户名称" prop="name" :rules="[
+                   ]">
+            <span slot="label"><span style="color: red;border-top: 20px">*</span> 客户名称</span>
+            <el-input maxlength="64" v-model="inputForm.name" placeholder="请输入客户名称" clearable></el-input>
+            <div class="usc_code_append_message">{{nameMessage}}</div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="2">
+          <el-popover
+            v-model="visiblePop"
+            placement="left"
+            width="400"
+            height="800"
+            trigger="click"
+            :popper-options="{ boundariesElement: 'viewport', removeOnDestroy: true }"
+            ref="pops">
+            <vxe-table
+              border="inner"
+              auto-resize
+              resizable
+              :row-config="{isHover: true}"
+              :data="gridData"
+              :checkbox-config="{}"
+              :row-style="rowStyle"
+              :key="tableKey"
+              @cell-click="rowClick"
+              :show-header="false"
+            >
+              <vxe-column title="" field="entname" ></vxe-column>
+            </vxe-table>
+            <el-button type="info" slot="reference" @click="getPopTable" style="width: 100%" plain>查询</el-button>
+          </el-popover>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="是否有统一社会信用代码" prop="isUscCode"
+                        :rules="[
+                          {required: true, message:'请选择是否有统一社会信用代码', trigger:'blur'}
+                   ]">
+            <el-radio-group v-model="inputForm.isUscCode">
+              <el-radio v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" >{{item.label}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="15">
+        <el-col v-if="inputForm.isUscCode === '1'" :span="12">
+          <el-form-item label="统一社会信用代码" prop="uscCode"
+                        :rules="[
+                                    {required: true, message:'统一社会信用代码不能为空', trigger:'blur'}
+                     ]">
+            <el-input v-model="inputForm.uscCode" placeholder="请填写统一社会信用代码" clearable></el-input>
+            <div class="usc_code_append_message">{{uscCodeMessage}}</div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="注册地址" prop="companyAddress"
+                        :rules="[
+                     ]">
+            <el-input v-model="inputForm.companyAddress" placeholder="注册地址" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="详细地址" prop="address"
+                        :rules="[
+                                  {required: true, message:'详细地址不能为空', trigger:'blur'}
+                     ]">
+            <el-input v-model="inputForm.address" placeholder="详细地址" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="公司电话" prop="mobile"
+                        :rules="[
+                     ]">
+            <el-input v-model="inputForm.mobile" placeholder="公司电话" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remarks1"
+                        :rules="[
+                   ]">
+            <el-input type="textarea" maxlength="500" v-model="inputForm.remarks1" placeholder="请填写备注" show-word-limit></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-divider content-position="left"><i class="el-icon-document"></i> 合同信息</el-divider>
+      <el-row  :gutter="0">
+        <el-col :span="12">
+          <el-form-item label="合同名称" prop="contractName"
+                        :rules="[{required: true, message: '合同名称不能为空', trigger: 'blur'}
+                 ]">
+            <el-input v-model="inputForm.contractName" placeholder="请输入合同名称" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="合同编号" prop="contractNo"
+                        :rules="[
+                 ]">
+            <el-input :disabled="true" v-model="inputForm.contractNo" placeholder="自动生成" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="签订日期" prop="signingDate"
+                        :rules="[
+                {required: true, message:'请输入签订日期', trigger:'blur'}
+               ]">
+            <el-date-picker
+              placement="bottom-start"
+              value-format="yyyy-MM-dd"
+              v-model="inputForm.signingDate"
+              style="width: 100%"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="合同生效日期" prop="effectiveDate"
+                        :rules="[
+                {required: true, message:'请输入合同生效日期', trigger:'blur'}
+               ]">
+            <el-date-picker
+              placement="bottom-start"
+              value-format="yyyy-MM-dd"
+              v-model="inputForm.effectiveDate"
+              style="width: 100%"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="合同终止日期" prop="endTime"
+                        :rules="[
+                {required: true, message:'请输入合同终止日期', trigger:'blur'}
+               ]">
+            <el-date-picker
+              @change="checkFiledNo"
+              placement="bottom-start"
+              value-format="yyyy-MM-dd"
+              v-model="inputForm.endTime"
+              style="width: 100%"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remarks2"
+                        :rules="[
+                   ]">
+            <el-input type="textarea" maxlength="500" v-model="inputForm.remarks2" placeholder="请填写备注" show-word-limit></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-tabs v-model="activeName" type="border-card" @tab-click="tabHandleClick">
+        <el-tab-pane label="客户联系人" name="contact">
+          <span slot="label"><span style="color: red;border-top: 20px">*</span> 客户联系人</span>
+          <el-row :gutter="15">
+            <el-button type="primary" style="margin-bottom: 15px" size="mini" :disabled="status === 'audit' || status === 'taskFormDetail' || method==='view'" @click="insertEvent('contact')">
+              新增客户联系人
+            </el-button>
+          </el-row>
+          <el-row  :gutter="15">
+            <el-form :disabled="status === 'audit' || status === 'taskFormDetail' || method==='view'">
+              <vxe-table
+                border
+                show-overflow
+                show-footer
+                :column-config="{resizable: true}"
+                ref="contactTable"
+                :key="tableKeyContact"
+                class="vxe-table-element"
+                :data="inputForm.cwProjectClientContactDTOList"
+                style=""
+                @cell-click=""
+                @edit-closed=""
+                highlight-current-row
+                :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
+              >
+                <vxe-table-column align="center" field="name" title="姓名" :edit-render="{}">
+                  <template v-slot:edit="scope">
+                    <el-input v-model="scope.row.name" placeholder="姓名" clearable></el-input>
+                  </template>
+                </vxe-table-column>
+                <vxe-table-column align="center" field="position" title="职务" :edit-render="{}">
+                  <template v-slot:edit="scope">
+                    <el-input v-model="scope.row.position" placeholder="职务" clearable></el-input>
+                  </template>
+                </vxe-table-column>
+                <vxe-table-column align="center" field="contactFirst" title="联系方式1" :edit-render="{}">
+                  <template v-slot:edit="scope">
+                    <el-input v-model="scope.row.contactFirst" oninput="value=value.replace(/[^\d]/g,'')" placeholder="联系方式1" clearable></el-input>
+                  </template>
+                </vxe-table-column>
+                <vxe-table-column align="center" field="contactSecond" title="联系方式2" :edit-render="{}">
+                  <template v-slot:edit="scope">
+                    <el-input v-model="scope.row.contactSecond" oninput="value=value.replace(/[^\d]/g,'')" placeholder="联系方式2" clearable></el-input>
+                  </template>
+                </vxe-table-column>
+                <vxe-table-column align="center" field="remarks" title="备注" :edit-render="{}">
+                  <template v-slot:edit="scope">
+                    <el-input maxlength="500" v-model="scope.row.remarks" placeholder="备注" clearable></el-input>
+                  </template>
+                </vxe-table-column>
+                <vxe-table-column align="center" title="操作" width="100">
+                  <template v-slot="scope">
+                    <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'contact')">删除</el-button>
+                  </template>
+                </vxe-table-column>
+              </vxe-table>
+            </el-form>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="附件" name="files">
+          <!--        附件-->
+          <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
+        </el-tab-pane>
+
+
+      </el-tabs>
+    </el-form>
+      <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="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+    </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
+  import WorkClientService from '@/api/cw/workClientInfo/WorkClientService'
+  import UserSelect from '@/components/userSelect'
+  import CommonApi from '@/api/cw/common/CommonApi'
+  import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
+  import ContractService from '@/api/materialManagement/ContractService'
+  import UpLoadComponent from '@/views/common/UpLoadComponent'
+  import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  import SelectTree from '@/components/treeSelect/treeSelect.vue'
+  import UserService from '@/api/sys/UserService'
+  export default {
+    data () {
+      return {
+        validRules: {
+          purchaserAgent: [
+            {required: true, message: '采购人不能为空'}
+          ],
+          procurementOffice: [
+            {required: true, message: '采购部门不能为空'}
+          ],
+          procurementType: [
+            {required: true, message: '采购类型不能为空'}
+          ]
+        },
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        indexRow: '',
+        inputForm: {
+          id: '',
+          createDate: '',
+          name: '',
+          uscCode: '',
+          isUscCode: '',
+          address: '',
+          companyAddress: '',
+          mobile: '',
+          remarks1: '',
+          remarks2: '',
+          contractName: '',
+          contractNo: '',
+          signingDate: '',
+          effectiveDate: '',
+          endTime: '',
+          cwProjectClientContactDTOList: [],
+          files: [] // 附件信息
+        },
+        activeName: 'contact',
+        uscCodeMessage: '',
+        nameMessage: '',
+        tableKey: '',
+        tableKeyContact: '2',
+        keyWatch: '',
+        visiblePop: false,
+        gridData: []
+      }
+    },
+    enterpriseSearchService: null,
+    workClientService: null,
+    materialManagementService: null,
+    contractService: null,
+    userService: null,
+    commonApi: null,
+    created () {
+      this.enterpriseSearchService = new EnterpriseSearchService()
+      this.workClientService = new WorkClientService()
+      this.materialManagementService = new MaterialManagementService()
+      this.contractService = new ContractService()
+      this.userService = new UserService()
+      this.commonApi = new CommonApi()
+    },
+    props: {
+      businessId: {
+        type: String,
+        default: ''
+      },
+      formReadOnly: {
+        type: Boolean,
+        default: false
+      },
+      status: {
+        type: String,
+        default: ''
+      }
+    },
+    components: {
+      UserSelect,
+      UpLoadComponent,
+      SelectUserTree,
+      SelectTree
+    },
+    computed: {
+      bus: {
+        get () {
+          return this.businessId
+        },
+        set (val) {
+          this.businessId = val
+        }
+      },
+      name () {
+        return JSON.parse(localStorage.getItem('user')).name
+      },
+      officeName () {
+        return JSON.parse(localStorage.getItem('user')).officeDTO.name
+      },
+      purchaserAgentId () {
+        return JSON.parse(localStorage.getItem('user')).id
+      },
+      procurementTypeId () {
+        return ''
+      }
+    },
+    watch: {
+      'keyWatch': {
+        handler (newVal) {
+          if (this.commonJS.isNotEmpty(this.bus)) {
+            this.init('', this.bus)
+          } else {
+            this.$nextTick(() => {
+              this.$refs.inputForm.resetFields()
+            })
+          }
+        }
+      }
+    },
+    methods: {
+      getKeyWatch (keyWatch) {
+        this.keyWatch = keyWatch
+      },
+      init (method, id) {
+        this.method = method
+        this.inputForm = {
+          id: '',
+          createDate: '',
+          name: '',
+          isUscCode: '',
+          mobile: '',
+          uscCode: '',
+          address: '',
+          companyAddress: '',
+          remarks1: '',
+          remarks2: '',
+          contractName: '',
+          signingDate: '',
+          effectiveDate: '',
+          endTime: '',
+          cwProjectClientContactDTOList: [],
+          files: [] // 附件信息
+        }
+        this.activeName = 'contact'
+        this.uscCodeMessage = ''
+        this.nameMessage = ''
+        if (method === 'add') {
+          this.title = `新建采购类型`
+        } else if (method === 'edit') {
+          this.title = '修改合同信息'
+        } else if (method === 'view') {
+          this.title = '查看合同信息'
+        }
+        this.inputForm.id = id
+        this.visible = true
+        this.loading = false
+        this.$nextTick(() => {
+          if (this.formReadOnly === true && this.businessId !== 'false') {
+            method = 'view'
+          }
+          if (this.commonJS.isEmpty(this.inputForm.handledByOffice)) {
+            this.inputForm.handledByOffice = JSON.parse(localStorage.getItem('user')).officeDTO.id
+          }
+          if (this.status === 'audit' || this.status === 'taskFormDetail') {
+            method = 'view'
+          }
+          this.loading = true
+          this.$refs.inputForm.resetFields()
+          this.contractService.findById(this.inputForm.id).then(({data}) => {
+            if (this.inputForm.id !== 'false') {
+              this.inputForm = this.recover(this.inputForm, data)
+              this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
+              this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+              this.loading = false
+            } else {
+              this.inputForm.cwProjectClientContactDTOList = []
+              this.loading = false
+            }
+          })
+          if (method !== 'edit' && method !== 'view') {
+            this.$refs.uploadComponent.newUpload(method, [], 'reimbursement')
+          }
+        })
+      },
+      // 表单提交
+      doSubmit () {
+        this.$refs['inputForm'].validate((valid) => {
+          if (valid) {
+            this.loading = true
+            if (this.$refs.uploadComponent.checkProgress()) {
+              this.loading = false
+              return
+            }
+            if (this.commonJS.isEmpty(this.inputForm.files)) {
+              this.inputForm.files = []
+            }
+            this.inputForm.files = this.$refs.uploadComponent.getDataList()
+            this.contractService.save(this.inputForm).then(({data}) => {
+              this.$emit('refreshDataList')
+              this.loading = false
+              this.close()
+              // this.$message.success(data)
+            }).catch(() => {
+              this.loading = false
+            })
+          }
+        })
+      },
+      close () {
+        this.$refs.inputForm.resetFields()
+        this.inputForm.detailInfos = []
+        this.$refs.uploadComponent.clearUpload()
+        this.visible = false
+        this.nameMessage = ''
+        this.uscCodeMessage = ''
+      },
+      reapplyForm (callback) {
+        this.contractService.findById(this.inputForm.id).then(({data}) => {
+          if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示
+            this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+          } else {
+            this.startForm(callback)
+          }
+        })
+      },
+      async getPopTable () {
+        let name = this.inputForm.name
+        if (this.commonJS.isNotEmpty(name)) {
+          await this.enterpriseSearchService.enterpriseSearchByName(name).then(({data}) => {
+            this.gridData = data.data.items
+            this.$refs.pops.updatePopper()
+            this.tableKey = Math.random()
+          })
+        }
+        this.$refs.pops.updatePopper()
+      },
+      closePop () {
+        this.visiblePop = false
+      },
+      rowStyle (event) {
+        return 'cursor:pointer;'
+      },
+      async rowClick (event) {
+        let id = this.gridData[event.rowIndex].companyid
+        await this.enterpriseSearchService.enterpriseTicketInfo(id).then((data) => {
+          this.inputForm.name = data.data.ENTNAME
+          this.inputForm.uscCode = data.data.UNCID
+          this.inputForm.address = data.data.OPLOC
+        })
+        this.visiblePop = false
+      },
+      tabHandleClick (event) {
+        // console.log(event)
+      },
+      insertEvent (type) {
+        if (type === 'contact') {
+          let d = {
+            contactFirst: '',
+            contactSecond: '',
+            email: '',
+            fax: '',
+            name: '',
+            officeId: '',
+            position: '',
+            remarks: '',
+            sex: ''
+          }
+          if (this.commonJS.isEmpty(this.inputForm.cwProjectClientContactDTOList)) {
+            this.inputForm.cwProjectClientContactDTOList = []
+          }
+          this.$refs.contactTable.insertAt(d)
+          this.inputForm.cwProjectClientContactDTOList.push(d)
+          this.tableKeyContact = Math.random()
+        }
+      },
+      // 删除
+      removeEvent (row, rowIndex, type) {
+        if (type === 'contact') {
+          this.$refs.contactTable.remove(row)
+          this.inputForm.cwProjectClientContactDTOList.splice(rowIndex, 1)
+        }
+      },
+      checkFiledNo () {
+        console.log('进来了时间比较')
+        // eslint-disable-next-line no-unused-vars
+        let date1 = this.inputForm.effectiveDate
+        // eslint-disable-next-line no-unused-vars
+        let date2 = this.inputForm.endTime
+        if (Date.parse(this.inputForm.endTime) < Date.parse(this.inputForm.effectiveDate)) {
+          this.$message.warning(`合同终止日期要大于合同生效日期`)
+          this.inputForm.endTime = ''
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-input-number .el-input__inner {
+    text-align: left;
+  }
+</style>
+<style>
+  .usc_code_append_message {
+    color: #F56C6C;
+    font-size: 12px;
+    line-height: 1;
+    padding-top: 4px;
+    position: absolute;
+    top: 100%;
+    left: 0;
+  }
+</style>

src/views/modules/materialManagement/info/UpdateInfoForm.vue

@@ -127,7 +127,7 @@
             </vxe-table-column>
             <vxe-table-column field="tradeName" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.tradeName"></el-input>
+                <el-input @change="ifSameValue" v-model="scope.row.tradeName"></el-input>
               </template>
             </vxe-table-column>
             <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
@@ -618,6 +618,21 @@
             this.inputForm.amountInfos.push(data)
           })
         }
+      },
+      ifSameValue () {
+        let i = this.inputForm.detailInfos.length
+        for (let j = 0; j < i; j++) {
+          if (j + 1 < i) {
+            if (this.inputForm.detailInfos[j].procurementTypeId === this.inputForm.detailInfos[j + 1].procurementTypeId) {
+              if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeName) &&
+                this.commonJS.isNotEmpty(this.inputForm.detailInfos[j + 1].tradeName) && this.inputForm.detailInfos[j].tradeName === this.inputForm.detailInfos[j + 1].tradeName) {
+                // parseFloat(item.account).toFixed(2)
+                this.inputForm.detailInfos.splice(j + 1, 1)
+                this.$message.warning(`同采购类型的商品名称只能输入一条信息！`)
+              }
+            }
+          }
+        }
       }
     }
   }

src/views/modules/materialManagement/purchase/PurchaseForm.vue

@@ -119,7 +119,7 @@
           </vxe-table-column>
           <vxe-table-column field="tradeName" title="商品名称" :edit-render="{}" :rules="[]">
             <template v-slot:edit="scope">
-              <el-input v-model="scope.row.tradeName"></el-input>
+              <el-input @change="ifSameValue" v-model="scope.row.tradeName"></el-input>
             </template>
           </vxe-table-column>
           <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[]">
@@ -396,9 +396,9 @@
               if (this.commonJS.isNotEmpty(data.purchaserAgentId)) {
                 this.purchaserAgentId = data.purchaserAgentId
               }
-              if (this.commonJS.isNotEmpty(data.procurementTypeId)) {
-                this.procurementTypeId = data.procurementTypeId
-              }
+              // if (this.commonJS.isNotEmpty(data.procurementTypeId)) {
+              //   this.procurementTypeId = data.procurementTypeId
+              // }
               let i = this.inputForm.detailInfos.length
               for (let j = 0; j < i; j++) {
                 if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
@@ -800,6 +800,21 @@
             }
           }
         }
+      },
+      ifSameValue () {
+        let i = this.inputForm.detailInfos.length
+        for (let j = 0; j < i; j++) {
+          if (j + 1 < i) {
+            if (this.inputForm.detailInfos[j].procurementTypeId === this.inputForm.detailInfos[j + 1].procurementTypeId) {
+              if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeName) &&
+                this.commonJS.isNotEmpty(this.inputForm.detailInfos[j + 1].tradeName) && this.inputForm.detailInfos[j].tradeName === this.inputForm.detailInfos[j + 1].tradeName) {
+                // parseFloat(item.account).toFixed(2)
+                this.inputForm.detailInfos.splice(j + 1, 1)
+                this.$message.warning(`同种采购类型的商品名称只能输入一条信息！`)
+              }
+            }
+          }
+        }
       }
     }
   }

src/views/modules/materialManagement/purchase/PurchaseList.vue

@@ -146,6 +146,8 @@
               <el-button v-if="hasPermission('material:edit')&&scope.row.createBy === $store.state.user.id&&scope.row.status==='2'" type="text"  size="small" @click="reback(scope.row)">撤回</el-button>
               <el-button v-if="hasPermission('material:del')&&scope.row.createBy === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
               <el-button v-else-if="hasPermission('material:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-if="hasPermission('material:list')&&scope.row.createBy === $store.state.user.id&&scope.row.status==='5'" type="text" size="small" @click="seeWareHouse(scope.row.id)">入库记录</el-button>
+              <el-button v-if="hasPermission('material:add')&&scope.row.createBy === $store.state.user.id&&scope.row.status==='5'" type="text" size="small" @click="wareHouse(scope.row.id)">入库</el-button>
             </template>
           </vxe-column>
         </vxe-table>
@@ -160,12 +162,16 @@
           @page-change="currentChangeHandle">
         </vxe-pager>
         <UpdateInfoForm ref="updateInfoForm" @refreshList="refreshList"></UpdateInfoForm>
+        <SeeWareHouseList  ref="seeWareHouseList"></SeeWareHouseList>
+        <WareHouseAddForm ref="wareHouseAddForm"></WareHouseAddForm>
       </div>
     </div>
   </div>
 </template>
 
 <script>
+  import WareHouseAddForm from '../wareHouse/WareHouseAddForm'
+  import SeeWareHouseList from './SeeWareHouseList'
   import UserSelect from '@/components/userSelect'
   import UpdateInfoForm from '../info/UpdateInfoForm'
   import InputNumber from '@/views/modules/cw/workContract/InputNumber.vue'
@@ -228,6 +234,8 @@
       SelectUserTree,
       SelectTree,
       UpdateInfoForm,
+      SeeWareHouseList,
+      WareHouseAddForm,
       UserSelect
     },
     computed: {
@@ -246,6 +254,14 @@
       this.refreshList()
     },
     methods: {
+      // 入库
+      wareHouse (id) {
+        // this.$refs.reportManagementForm.init('add', '')
+        this.$refs.wareHouseAddForm.init('purchaseAdd', id)
+      },
+      seeWareHouse (id) {
+        this.$refs.seeWareHouseList.init(id)
+      },
       // 新增
       add () {
         // this.$refs.reportManagementForm.init('add', '')

src/views/modules/materialManagement/purchase/SeeWareHouseList.vue

@@ -0,0 +1,153 @@
+<template>
+  <div>
+    <el-dialog
+      title="入库记录"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      width="1100px"
+      height="500px"
+      @close="close"
+      append-to-body
+      @keyup.enter.native=""
+      :visible.sync="visible">
+      <div style="height: calc(100% - 80px);">
+
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="400px"
+          :loading="loading"
+          size="small"
+          ref="projectTable"
+          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 min-width="160" align="center" title="入库编号" field="wareHouseNumber"></vxe-column>
+          <vxe-column min-width="160" align="center" title="入库名称" field="wareHouseName">
+            <template slot-scope="scope">
+              <el-link  type="primary" :underline="false" v-if="hasPermission('material:list')" @click="view(scope.row.id)">{{scope.row.wareHouseName}}</el-link>
+              <el-link  type="primary" :underline="false" v-else-if="hasPermission('material:list')"  @click="view(scope.row.id,)">{{scope.row.wareHouseName}}</el-link>
+              <span v-else>{{scope.row.wareHouseName}}</span>
+            </template>
+          </vxe-column>
+          <vxe-column min-width="160" align="center" title="入库时间" field="wareHouseDate"></vxe-column>
+          <vxe-column min-width="160" align="center" title="经办人" field="handleByName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="经办人部门" field="handledByOfficeName"></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>
+    </span>
+    </el-dialog>
+    <WareHouseAddForm ref="wareHouseAddForm"></WareHouseAddForm>
+  </div>
+</template>
+
+<script>
+  import WareHouseAddForm from '../wareHouse/WareHouseAddForm'
+  import InputNumber from '@/views/modules/sys/workContract/InputNumber.vue'
+  // import ProjectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
+  import WareHouseService from '@/api/materialManagement/WareHouseService'
+  import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        tableKey: '',
+        dataList: [],
+        searchForm: {
+          purchaseSketch: '',
+          purchaseId: '',
+          contractDates: []
+        }
+      }
+    },
+    // projectRecordsService: null,
+    wareHouseService: null,
+    created () {
+      // this.projectRecordsService = new ProjectRecordsService()
+      this.wareHouseService = new WareHouseService()
+    },
+    components: {
+      SelectUserTree,
+      WareHouseAddForm,
+      InputNumber
+    },
+    methods: {
+      // 查看
+      view (id) {
+        // this.$refs.updateInfoForm.init('view', id)
+        this.$refs.wareHouseAddForm.init('view', id)
+      },
+      init (id) {
+        this.visible = true
+        this.searchForm.purchaseId = id
+        this.list()
+      },
+      list () {
+        this.loading = true
+        // this.searchForm.createId = this.$store.state.user.id
+        this.wareHouseService.wareHouseList({
+          '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.tableKey = Math.random()
+          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.visible = false
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-dialog__body {
+    padding-top: 0px;
+    padding-bottom: 15px;
+  }
+</style>

src/views/modules/materialManagement/wareHouse/WareHouseAddForm.vue

@@ -60,6 +60,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="合同编号" prop="contractNo"
+                          :rules="[]">
+              <el-input size="medium" :readonly="true" @focus="openContractChooseForm()" v-model="inputForm.contractNo" placeholder="请选择采购编号">
+                <el-button slot="append" icon="el-icon-search" @click="openContractChooseForm()"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="采购编号" prop="purchaseNo"
                           :rules="[]">
               <el-input size="medium" :readonly="true" @focus="openContractForm()" v-model="inputForm.purchaseNo" placeholder="请选择采购编号">
@@ -201,7 +209,7 @@
             </vxe-table-column>
             <vxe-table-column field="tradeName" width="250" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
               <template v-slot:edit="scope">
-                <el-input maxlength="64" v-model="scope.row.tradeName"></el-input>
+                <el-input @change="ifSameValue" maxlength="64" v-model="scope.row.tradeName"></el-input>
               </template>
             </vxe-table-column>
 
@@ -256,9 +264,11 @@
       <MaterialTypePullForm ref="materialTypePullForm" @getProgramForType="getProgramForType"></MaterialTypePullForm>
       <UserPullForm ref="userPullForm" @getProgramForUser="getProgramForUser"></UserPullForm>
       <PurchaseChooseForm  ref="purchaseChooseForm" @getProject="getContract"></PurchaseChooseForm>
+<!--      合同选择-->
+      <ContractChooseForm  ref="contractChooseForm" @getProject="getContract3"></ContractChooseForm>
       <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="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+      <el-button size="small" type="primary" v-if="method !== 'view'" @click="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
     </span>
     </el-dialog>
   </div>
@@ -274,6 +284,7 @@
   import UpLoadComponent from '@/views/common/UpLoadComponent'
   import UserPullForm from '@/views/modules/finance/invoice/UserPullForm'
   import PurchaseChooseForm from './PurchaseChooseForm'
+  import ContractChooseForm from '../contract/ContractChooseForm'
   import XEUtils from 'xe-utils'
   import UpdateInfoForm from '../info/UpdateInfoForm'
   export default {
@@ -296,6 +307,7 @@
             {required: true, message: '商品数量不能为空'}
           ]
         },
+        purchaseId: '',
         title: '',
         method: '',
         visible: false,
@@ -306,6 +318,7 @@
           tradeTotalPrice: '',  // 商品总价
           fileInfoLost: [],
           purchaseNo: '',
+          contractNo: '',
           handledBy: '',
           handledById: '',
           handledByOffice: '',
@@ -335,6 +348,7 @@
       UpLoadComponent,
       UserPullForm,
       PurchaseChooseForm,
+      ContractChooseForm,
       UpdateInfoForm
     },
     computed: {
@@ -360,6 +374,7 @@
           tradeTotalPrice: '',  // 商品总价
           fileInfoLost: [],
           purchaseNo: '',
+          contractNo: '',
           handledBy: JSON.parse(localStorage.getItem('user')).name,
           handledById: JSON.parse(localStorage.getItem('user')).id,
           handledByOffice: JSON.parse(localStorage.getItem('user')).officeDTO.id,
@@ -381,6 +396,11 @@
         } else if (method === 'view') {
           this.inputForm.id = id
           this.title = '查看入库信息'
+        } else if (method === 'purchaseAdd') {
+          this.purchaseId = id
+          console.log('this.purchaseId', this.purchaseId)
+          this.title = `新建入库信息`
+          this.getContract2(id)
         }
         this.visible = true
         this.loading = false
@@ -392,9 +412,9 @@
               if (this.commonJS.isNotEmpty(data.wareHouseManId)) {
                 this.wareHouseManId = data.wareHouseManId
               }
-              if (this.commonJS.isNotEmpty(data.wareHouseTypeId)) {
-                this.wareHouseTypeId = data.wareHouseTypeId
-              }
+              // if (this.commonJS.isNotEmpty(data.wareHouseTypeId)) {
+              //   this.wareHouseTypeId = data.wareHouseTypeId
+              // }
               this.inputForm = this.recover(this.inputForm, data)
               if (this.commonJS.isEmpty(this.inputForm.handledByOffice)) {
                 this.inputForm.handledByOffice = JSON.parse(localStorage.getItem('user')).officeDTO.id
@@ -439,9 +459,44 @@
         })
         this.$forceUpdate()
       },
+      getContract2 (id) {
+        this.materialManagementService.findById(id).then(({data}) => {
+          this.inputForm.detailInfos = data.detailInfos
+          this.inputForm.purchaseNo = data.purchaseNo
+          let i = this.inputForm.detailInfos.length
+          for (let j = 0; j < i; j++) {
+            if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
+              if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
+                this.inputForm.detailInfos[j].priceSum = this.inputForm.detailInfos[j].tradePrice * this.inputForm.detailInfos[j].tradeNumber
+              }
+            }
+          }
+        })
+        this.$forceUpdate()
+      },
+      getContract3 (row) {
+        console.log('row', row)
+        this.inputForm.contractNo = row.contractNo
+        // this.materialManagementService.findById(id).then(({data}) => {
+        //   this.inputForm.detailInfos = data.detailInfos
+        //   this.inputForm.purchaseNo = data.purchaseNo
+        //   let i = this.inputForm.detailInfos.length
+        //   for (let j = 0; j < i; j++) {
+        //     if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
+        //       if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
+        //         this.inputForm.detailInfos[j].priceSum = this.inputForm.detailInfos[j].tradePrice * this.inputForm.detailInfos[j].tradeNumber
+        //       }
+        //     }
+        //   }
+        // })
+        this.$forceUpdate()
+      },
       openContractForm () {
         this.$refs.purchaseChooseForm.init()
       },
+      openContractChooseForm () {
+        this.$refs.contractChooseForm.init()
+      },
       // 值改变事件
       changeValue () {
         let i = this.inputForm.detailInfos.length
@@ -677,7 +732,6 @@
         })
       },
       close () {
-        this.method = ''
         this.inputForm.detailInfos = []
         this.inputForm.wareHouse = []
         this.inputForm.amountInfos = []
@@ -720,6 +774,21 @@
           this.$refs.updateInfoForm.init('view', data)
         }).catch(() => {
         })
+      },
+      ifSameValue () {
+        let i = this.inputForm.wareHouse.length
+        for (let j = 0; j < i; j++) {
+          if (j + 1 < i) {
+            if (this.inputForm.wareHouse[j].wareHouseTypeId === this.inputForm.wareHouse[j + 1].wareHouseTypeId) {
+              if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradeName) &&
+                this.commonJS.isNotEmpty(this.inputForm.wareHouse[j + 1].tradeName) && this.inputForm.wareHouse[j].tradeName === this.inputForm.wareHouse[j + 1].tradeName) {
+                // parseFloat(item.account).toFixed(2)
+                this.inputForm.wareHouse.splice(j + 1, 1)
+                this.$message.warning(`同种入库类型的商品名称只能输入一条信息！`)
+              }
+            }
+          }
+        }
       }
     }
   }

src/views/modules/materialManagement/wareHouse/WareHouseUpdateForm.vue

@@ -51,6 +51,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="合同编号" prop="contractNo"
+                        :rules="[]">
+            <el-input size="medium" :readonly="true" @focus="openContractChooseForm()" v-model="inputForm.contractNo" placeholder="请选择采购编号">
+              <el-button slot="append" icon="el-icon-search" @click="openContractChooseForm()"></el-button>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="采购编号" prop="purchaseNo"
                         :rules="[]">
             <el-input size="medium" :readonly="true" @focus="openContractForm()" v-model="inputForm.purchaseNo" placeholder="请选择采购编号">
@@ -187,7 +195,7 @@
           </vxe-table-column>
           <vxe-table-column field="tradeName" width="250" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
             <template v-slot:edit="scope">
-              <el-input maxlength="64" v-model="scope.row.tradeName"></el-input>
+              <el-input @change="ifSameValue" maxlength="64" v-model="scope.row.tradeName"></el-input>
             </template>
           </vxe-table-column>
 
@@ -239,6 +247,7 @@
     <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
     <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
     <MaterialTypePullForm ref="materialTypePullForm" @getProgramForType="getProgramForType"></MaterialTypePullForm>
+    <ContractChooseForm  ref="contractChooseForm" @getProject="getContract3"></ContractChooseForm>
     <UserPullForm ref="userPullForm" @getProgramForUser="getProgramForUser"></UserPullForm>
   </div>
 </template>
@@ -260,6 +269,7 @@
   import CwProgramPageForm from '@/views/modules/cw/reimbursementApproval/info/CwProgramPageForm'
   import MaterialTypePullForm from '../info/MaterialTypePullForm'
   import UserPullForm from '@/views/modules/finance/invoice/UserPullForm'
+  import ContractChooseForm from '../contract/ContractChooseForm'
   export default {
     data () {
       return {
@@ -342,6 +352,7 @@
       CwProgramPageForm,
       MaterialTypePullForm,
       UserPullForm,
+      ContractChooseForm,
       UpdateInfoForm
     },
     computed: {
@@ -836,6 +847,41 @@
           this.$refs.amountTable.remove(row)
           this.inputForm.amountInfos.splice(rowIndex, 1)
         }
+      },
+      ifSameValue () {
+        let i = this.inputForm.wareHouse.length
+        for (let j = 0; j < i; j++) {
+          if (j + 1 < i) {
+            if (this.inputForm.wareHouse[j].wareHouseTypeId === this.inputForm.wareHouse[j + 1].wareHouseTypeId) {
+              if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradeName) &&
+                this.commonJS.isNotEmpty(this.inputForm.wareHouse[j + 1].tradeName) && this.inputForm.wareHouse[j].tradeName === this.inputForm.wareHouse[j + 1].tradeName) {
+                // parseFloat(item.account).toFixed(2)
+                this.inputForm.wareHouse.splice(j + 1, 1)
+                this.$message.warning(`同种入库类型的商品名称只能输入一条信息！`)
+              }
+            }
+          }
+        }
+      },
+      openContractChooseForm () {
+        this.$refs.contractChooseForm.init()
+      },
+      getContract3 (row) {
+        console.log('row', row)
+        this.inputForm.contractNo = row.contractNo
+        // this.materialManagementService.findById(id).then(({data}) => {
+        //   this.inputForm.detailInfos = data.detailInfos
+        //   this.inputForm.purchaseNo = data.purchaseNo
+        //   let i = this.inputForm.detailInfos.length
+        //   for (let j = 0; j < i; j++) {
+        //     if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
+        //       if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
+        //         this.inputForm.detailInfos[j].priceSum = this.inputForm.detailInfos[j].tradePrice * this.inputForm.detailInfos[j].tradeNumber
+        //       }
+        //     }
+        //   }
+        // })
+        this.$forceUpdate()
       }
     }
   }

src/views/modules/materialManagement/wareHouseSummary/WareHouseHistory.vue

@@ -0,0 +1,215 @@
+<template>
+  <div>
+    <el-dialog
+      title="记录"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      width="1100px"
+      height="500px"
+      @close="close"
+      append-to-body
+      @keyup.enter.native=""
+      :visible.sync="visible">
+      <el-tabs v-model="activeNameTop" type="border-card" @tab-click="tabHandleClickTop">
+        <el-tab-pane label="入库记录" name="wareHouse">
+          <div style="height: calc(100% - 80px);">
+
+            <vxe-table
+              border="inner"
+              auto-resize
+              resizable
+              height="400px"
+              :loading="loading"
+              size="small"
+              ref="projectTable"
+              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 min-width="160" align="center" title="入库编号" field="wareHouseNumber"></vxe-column>
+              <vxe-column min-width="160" align="center" title="入库名称" field="wareHouseName">
+                <template slot-scope="scope">
+                  <el-link  type="primary" :underline="false" v-if="hasPermission('material:list')" @click="view(scope.row.wareHouseId)">{{scope.row.wareHouseName}}</el-link>
+                  <el-link  type="primary" :underline="false" v-else-if="hasPermission('material:list')"  @click="view(scope.row.wareHouseId,)">{{scope.row.wareHouseName}}</el-link>
+                  <span v-else>{{scope.row.wareHouseName}}</span>
+                </template>
+              </vxe-column>
+              <vxe-column min-width="160" align="center" title="入库时间" field="wareHouseDate"></vxe-column>
+              <vxe-column min-width="160" align="center" title="经办人" field="wareHouseHandledBy"></vxe-column>
+              <vxe-column min-width="160" align="center" title="经办人部门" field="wareHouseHandledByOff"></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>
+        </el-tab-pane>
+        <el-tab-pane label="领用记录" name="collect">
+          <div style="height: calc(100% - 80px);">
+
+            <vxe-table
+              border="inner"
+              auto-resize
+              resizable
+              height="400px"
+              :loading="loading"
+              size="small"
+              ref="projectTable"
+              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 min-width="160" align="center" title="领用编号" field="collectNo"></vxe-column>
+              <vxe-column min-width="160" align="center" title="领用物品名称" field="goodsName">
+                <template slot-scope="scope">
+                  <el-link  type="primary" :underline="false" v-if="hasPermission('material:list')" @click="view2(scope.row.collectId)">{{scope.row.goodsName}}</el-link>
+                  <el-link  type="primary" :underline="false" v-else-if="hasPermission('material:list')"  @click="view2(scope.row.collectId,)">{{scope.row.goodsName}}</el-link>
+                  <span v-else>{{scope.row.goodsName}}</span>
+                </template>
+              </vxe-column>
+              <vxe-column min-width="160" align="center" title="经办人" field="collectHandleBy"></vxe-column>
+              <vxe-column min-width="160" align="center" title="经办人部门" field="collectHandleByOff"></vxe-column>
+              <vxe-column min-width="160" align="center" title="领用时间" field="collectDate"></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>
+        </el-tab-pane>
+      </el-tabs>
+      <span slot="footer" class="dialog-footer">
+      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+    </span>
+    </el-dialog>
+    <WareHouseAddForm ref="wareHouseAddForm"></WareHouseAddForm>
+    <UpdateCollectInfoForm ref="updateCollectInfoForm"></UpdateCollectInfoForm>
+  </div>
+</template>
+
+<script>
+  import WareHouseAddForm from '../wareHouse/WareHouseAddForm'
+  import InputNumber from '@/views/modules/sys/workContract/InputNumber.vue'
+  // import ProjectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
+  import WareHouseService from '@/api/materialManagement/WareHouseService'
+  import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  import UpdateCollectInfoForm from '../collect/UpdateCollectInfoForm'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        tableKey: '',
+        dataList: [],
+        collectList: [],
+        searchForm: {
+          purchaseSketch: '',
+          tradeName: '',
+          contractDates: []
+        },
+        activeNameTop: 'wareHouse'
+      }
+    },
+    // projectRecordsService: null,
+    wareHouseService: null,
+    created () {
+      // this.projectRecordsService = new ProjectRecordsService()
+      this.wareHouseService = new WareHouseService()
+    },
+    components: {
+      SelectUserTree,
+      WareHouseAddForm,
+      InputNumber,
+      UpdateCollectInfoForm
+    },
+    methods: {
+      // 查看
+      view (id) {
+        this.$refs.wareHouseAddForm.init('view', id)
+      },
+      // 查看2
+      view2 (id) {
+        this.$refs.updateCollectInfoForm.init('view', id)
+      },
+      init (tradeName) {
+        this.activeNameTop = 'wareHouse'
+        this.visible = true
+        this.searchForm.tradeName = tradeName
+        this.list()
+      },
+      list () {
+        this.loading = true
+        // this.searchForm.createId = this.$store.state.user.id
+        this.wareHouseService.wareHouseHistoryList({
+          ...this.searchForm
+        }).then(({data}) => {
+          this.dataList = data.records
+          // this.collectList = data.collectList
+          this.tablePage.total = data.total
+          this.tableKey = Math.random()
+          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.visible = false
+      },
+      tabHandleClickTop (event) {
+        // console.log(event)
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-dialog__body {
+    padding-top: 0px;
+    padding-bottom: 15px;
+  }
+</style>

src/views/modules/materialManagement/wareHouseSummary/WareHouseSummaryList.vue

@@ -93,8 +93,16 @@
 <!--          <vxe-column min-width="160" align="center" title="入库人" field="wareHouseManName"></vxe-column>-->
 <!--          <vxe-column min-width="160" align="center" title="入库部门" field="wareHouseManOfficeName"></vxe-column>-->
           <vxe-column min-width="160" align="center" title="入库类型" field="wareHouseTypeName"></vxe-column>
-          <vxe-column min-width="160" align="center" title="商品名称" field="tradeName"></vxe-column>
-          <vxe-column min-width="160" align="center" title="商品数量" field="tradeNumber"></vxe-column>
+          <vxe-column min-width="160" align="center" title="商品名称" field="tradeName">
+            <template slot-scope="scope">
+              <el-link  type="primary" :underline="false" v-if="hasPermission('material:list')" @click="view(scope.row.tradeName)">{{scope.row.tradeName}}</el-link>
+              <el-link  type="primary" :underline="false" v-else-if="hasPermission('material:list')"  @click="view(scope.row.tradeName,)">{{scope.row.tradeName}}</el-link>
+              <span v-else>{{scope.row.tradeName}}</span>
+            </template>
+          </vxe-column>
+          <vxe-column min-width="160" align="center" title="总量" field="allNumber"></vxe-column>
+          <vxe-column min-width="160" align="center" title="领用量" field="borrowNumber"></vxe-column>
+          <vxe-column min-width="160" align="center" title="剩余量" field="tradeNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="单位" field="company"></vxe-column>
 <!--          <vxe-column min-width="160" align="center" title="入库时间" field="wareHouseDate"></vxe-column>-->
 
@@ -110,6 +118,7 @@
           @page-change="currentChangeHandle">
         </vxe-pager>
         <WareHouseAddForm ref="wareHouseAddForm" @refreshList="refreshList"></WareHouseAddForm>
+        <WareHouseHistory ref="wareHouseHistory"></WareHouseHistory>
       </div>
     </div>
   </div>
@@ -118,6 +127,7 @@
 <script>
   import UserSelect from '@/components/userSelect'
   import WareHouseAddForm from '../wareHouse/WareHouseAddForm'
+  import WareHouseHistory from './WareHouseHistory'
   import InputNumber from '@/views/modules/cw/workContract/InputNumber.vue'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import WorkClientService from '@/api/cw/workClientInfo/WorkClientService'
@@ -174,6 +184,7 @@
       UserSelect,
       InputNumber,
       SelectUserTree,
+      WareHouseHistory,
       SelectTree,
       WareHouseAddForm
     },
@@ -193,6 +204,10 @@
       this.refreshList()
     },
     methods: {
+      // 查看
+      view (tradeName) {
+        this.$refs.wareHouseHistory.init(tradeName)
+      },
       // 查询当前用户是否是管理员用户
       checkIsAdmin () {
         this.userService.is().then(({data}) => {

src/views/modules/program/registered/ProjectList.vue

@@ -144,6 +144,8 @@
               <el-button v-if="hasPermission('program:registered:edit')&&(scope.row.status === '1' || scope.row.status === '3')&&scope.row.createBy === createName" type="text" size="small" @click="registeredPush(scope.row)">修改</el-button>
               <!--管理员角色登记完成后可修改-->
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && isAdmin" type="text" size="small" @click="edit(scope.row.id)">修改</el-button>
+              <!--项目负责人修改-->
+              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && scope.row.createBy === createName && (scope.row.archiveStatus === null ||scope.row.archiveStatus === undefined ||scope.row.archiveStatus === '' ||scope.row.archiveStatus === '0')" type="text" size="small" @click="edit(scope.row.id)">修改</el-button>
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '2'&&scope.row.createBy === createName" type="text" size="small" @click="registeredReback(scope.row)">撤回</el-button>
               <el-button v-if="hasPermission('program:registered:del')&&(scope.row.status === '1' || scope.row.status === '3')&&scope.row.createBy === createName" type="text" size="small" @click="del(scope.row.id)">删除</el-button>
               <!--管理员角色登记完成后可删除-->

src/views/modules/roster/RosterForm.vue

@@ -13,30 +13,30 @@
 
         <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
         <el-row  :gutter="15">
-          <el-col :span="12">
-            <el-form-item label="头像" prop="headshot"
-                          :rules="[
-                 ]">
-              <el-popover
-                placement="left"
-                trigger="hover">
-                <el-button style="width: 100%" @click="onPreview(inputForm.headshotLsUrl)" :disabled="false" icon="el-icon-zoom-in"></el-button>
-                <el-upload
-                  slot="reference"
-                  class="avatar-uploader"
-                  :action="`${$http.BASE_URL}/roster/base/webUpload/upload`"
-                  :show-file-list="false"
-                  :on-success="(response, file, fileList) => {
-                    return handleAvatarSuccess(response, file, fileList, null, 'head')
-                  }"
-                  :before-upload="checkIsPic"
-                >
-                  <img style="width: 150px; height: 150px; line-height: 150px" v-if="inputForm.headshotLsUrl" :src="inputForm.headshotLsUrl"/>
-                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                </el-upload>
-              </el-popover>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="头像" prop="headshot"-->
+<!--                          :rules="[-->
+<!--                 ]">-->
+<!--              <el-popover-->
+<!--                placement="left"-->
+<!--                trigger="hover">-->
+<!--                <el-button style="width: 100%" @click="onPreview(inputForm.headshotLsUrl)" :disabled="false" icon="el-icon-zoom-in"></el-button>-->
+<!--                <el-upload-->
+<!--                  slot="reference"-->
+<!--                  class="avatar-uploader"-->
+<!--                  :action="`${$http.BASE_URL}/roster/base/webUpload/upload`"-->
+<!--                  :show-file-list="false"-->
+<!--                  :on-success="(response, file, fileList) => {-->
+<!--                    return handleAvatarSuccess(response, file, fileList, null, 'head')-->
+<!--                  }"-->
+<!--                  :before-upload="checkIsPic"-->
+<!--                >-->
+<!--                  <img style="width: 150px; height: 150px; line-height: 150px" v-if="inputForm.headshotLsUrl" :src="inputForm.headshotLsUrl"/>-->
+<!--                  <i v-else class="el-icon-plus avatar-uploader-icon"></i>-->
+<!--                </el-upload>-->
+<!--              </el-popover>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row  :gutter="15">
           <el-col :span="12">
@@ -195,7 +195,7 @@
                  ]">
               <el-select v-model="inputForm.contractType" placeholder="请选择合同类型" style="width:100%;">
                 <el-option
-                  v-for="item in $dictUtils.getDictList('contract_type')"
+                  v-for="item in $dictUtils.getDictList('roster_contract_type')"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value">
@@ -218,9 +218,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="入职日期" prop="onboardingDate"
-                          :rules="[{required: true, message: '入职日期不能为空', trigger: 'blur'}
-                 ]">
+            <el-form-item label="入职日期" prop="onboardingDate">
               <el-date-picker
                 placement="bottom-start"
                 style="width: 100%"
@@ -257,9 +255,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="出生日期" prop="birthDate"
-                          :rules="[{required: true, message: '出生日期不能为空', trigger: 'blur'}
-                 ]">
+            <el-form-item label="出生日期" prop="birthDate">
               <el-date-picker
                 placement="bottom-start"
                 style="width: 100%"
@@ -554,14 +550,16 @@
               <el-form-item label="工资卡分支行" :prop="'rosterBankCardsDTOList[' + index_bank + '].payrollCardBranches'"
                             :rules="[
                  ]">
-                <el-select v-model="inputForm.rosterBankCardsDTOList[index_bank].payrollCardBranches" placeholder="请选择工资卡分支行"  style="width: 100%;">
-                  <el-option
-                    v-for="item in $dictUtils.getDictList('bank_name')"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
+<!--                <el-select v-model="inputForm.rosterBankCardsDTOList[index_bank].payrollCardBranches" placeholder="请选择工资卡分支行"  style="width: 100%;">-->
+<!--                  <el-option-->
+<!--                    v-for="item in $dictUtils.getDictList('bank_name')"-->
+<!--                    :key="item.value"-->
+<!--                    :label="item.label"-->
+<!--                    :value="item.value">-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+                <el-input v-model="inputForm.rosterBankCardsDTOList[index_bank].payrollCardBranches" placeholder="请填写工资卡分支行"></el-input>
+
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -1067,14 +1065,16 @@
             <el-form-item label="汇报对象" prop="rosterLeadershipDTO.supervisorId"
                           :rules="[
                  ]">
-              <el-select v-model="inputForm.rosterLeadershipDTO.supervisorId" style="width:100%" placeholder="请选择汇报对象">
-                <el-option
-                  v-for="item in supervisorList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
-                </el-option>
-              </el-select>
+<!--              <el-select v-model="inputForm.rosterLeadershipDTO.supervisorId" style="width:100%" placeholder="请选择汇报对象">-->
+<!--                <el-option-->
+<!--                  v-for="item in supervisorList"-->
+<!--                  :key="item.id"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.id">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+              <UserSelect :limit='1' :value="inputForm.rosterLeadershipDTO.supervisorId" @getValue='(value, label) => {inputForm.rosterLeadershipDTO.supervisorId = value}'></UserSelect>
+
             </el-form-item>
           </el-col>
         </el-row>
@@ -1099,6 +1099,7 @@
   import OSSService from '@/api/sys/OSSService'
   import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
   import UpLoadComponent from '@/views/common/UpLoadComponent'
+  import UserSelect from '@/components/userSelect'
   export default {
     data () {
       let checkIdCard = (rule, value, callback) => {
@@ -1241,12 +1242,13 @@
     components: {
       SelectTree,
       ElImageViewer,
-      UpLoadComponent
+      UpLoadComponent,
+      UserSelect
     },
     methods: {
       init (method, id) {
         this.queryAllPosition()
-        this.queryAllSupervisor()
+        // this.queryAllSupervisor()
         this.method = method
         this.inputForm = {
           name: '',

src/views/modules/roster/RosterList.vue

@@ -14,10 +14,11 @@
       </el-form-item>
     </el-form>
     <div class="bg-white top">
-      <vxe-toolbar :refresh="{query: refreshList}" custom>
+      <vxe-toolbar :refresh="{query: refreshList}" import custom>
         <template #buttons>
           <el-button v-if="hasPermission('roster:base:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">新建</el-button>
           <el-button v-if="hasPermission('roster:base:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.rosterTable && $refs.rosterTable.getCheckboxRecords().length === 0" plain>删除</el-button>
+          <el-button v-if="hasPermission('roster:base:import')" size="small"  @click="template()" plain>模板下载</el-button>
           <el-button v-if="showButton" type="primary" size="small" icon="el-icon-arrow-down" @click="showTabs()" plain>展示分类</el-button>
           <el-button v-if="disableButton" type="primary" size="small" icon="el-icon-arrow-up" @click="disableTabs()" plain>收起分类</el-button>
         </template>
@@ -43,7 +44,11 @@
           @sort-change="sortChangeHandle"
           :sort-config="{remote:true}"
           :data="dataList"
-          :import-config="{}"
+          :import-config="{
+                    importMethod: importMethod,
+                    types: ['xls', 'xlsx'],
+                    remote: true
+                    }"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox"  width="40px"></vxe-column>
@@ -217,6 +222,32 @@
         this.workerTypeList = []
         this.showButton = true
         this.disableButton = false
+      },
+      // 模板下载
+      template () {
+        this.rosterService.template().then((res) => {
+          // 将二进制流文件写入excel表，以下为重要步骤
+          this.$utils.downloadExcel(res.data, '花名册导入模板')
+        }).catch(function (err) {
+          if (err.response) {
+            console.log(err.response)
+          }
+        })
+      },
+      // 自定义服务端导入
+      importMethod ({ file }) {
+        // 处理表单
+        const formBody = new FormData()
+        formBody.append('file', file)
+        this.loading = true
+        this.rosterService.importExcel(formBody).then(result => {
+          this.loading = false
+          this.refreshList()
+          this.$message.success(result.data)
+        }).catch(() => {
+          this.refreshList()
+          this.loading = false
+        })
       }
     }
   }