项目登记添加合同信息

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

@@ -14,6 +14,63 @@
 
         <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method === 'view'"
                      label-width="135px" @submit.native.prevent>
+          <el-divider content-position="left"><i class="el-icon-document"></i> 选择合同</el-divider>
+          <el-row  :gutter="15">
+            <el-col :span="24">
+              <el-form-item label="合同名称" prop="contractName"
+                            :rules="[
+                          {required: true, message:'合同不能为空', trigger:'blur'},
+                          {required: true, message:'合同不能为空', trigger:'change'}
+                 ]">
+                <el-input size="medium" :readonly="true" @focus="openContract()" v-model="inputForm.contractName" placeholder="请选择合同">
+                  <el-button slot="append" icon="el-icon-search" @click="openContract()"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="合同金额(元)" prop="contractAmount"
+                            :rules="[
+                 ]">
+                <el-input :disabled="true" v-model="inputForm.contractAmount" placeholder="请填写合同金额"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="合同份数" prop="contractNum"
+                            :rules="[
+                 ]">
+                <el-input :disabled="true" v-model="inputForm.contractNum" placeholder="请填写合同份数"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="付款主体" prop="payerSubject"
+                            :rules="[
+                 ]">
+                <el-select :disabled="true" v-model="inputForm.payerSubject" placeholder="请选择付款主体" style="width:100%;">
+                  <el-option
+                    v-for="item in $dictUtils.getDictList('cw_payment_subject')"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="付款方式" prop="paymentMethod"
+                            :rules="[
+                 ]">
+                <el-select :disabled="true" v-model="inputForm.paymentMethod" placeholder="请选择付款方式" style="width:100%;">
+                  <el-option
+                    v-for="item in $dictUtils.getDictList('cw_payment_method')"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <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="projectName"
@@ -206,6 +263,7 @@
       <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
       <el-button size="small" v-if="method === 'edit'" type="primary" icon="el-icon-circle-check" @click="doSubmit('save')">确定</el-button>
     </span>
+      <WorkContractChooseCom ref="workContractChooseCom" @getContract="getContract"></WorkContractChooseCom>
     <WorkClientChooseForm ref="workClientChooseForm" @getWorkClientChoose="getWorkClientChoose"></WorkClientChooseForm>
     </el-dialog>
   </div>
@@ -219,6 +277,7 @@
   import ProjectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
   import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
   import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
+  import WorkContractChooseCom from './WorkContractChooseCom'
   export default {
     props: {
       businessId: {
@@ -260,7 +319,13 @@
           processDefinitionId: '',
           status: '',
           workAttachmentDtoList: [],
-          cwProjectClientInfoDTOList: []
+          cwProjectClientInfoDTOList: [],
+          contractName: '',
+          contractAmount: '',
+          contractNum: '',
+          payerSubject: '',
+          paymentMethod: '',
+          contractId: ''
         },
         keyWatch: '',
         activeName: 'client',
@@ -304,7 +369,8 @@
       UpLoadComponent,
       SelectTree,
       UserSelect,
-      WorkClientChooseForm
+      WorkClientChooseForm,
+      WorkContractChooseCom
     },
     methods: {
       getKeyWatch (keyWatch) {
@@ -343,7 +409,13 @@
           processDefinitionId: '',
           status: '',
           workAttachmentDtoList: [],
-          cwProjectClientInfoDTOList: []
+          cwProjectClientInfoDTOList: [],
+          contractName: '',
+          contractAmount: '',
+          contractNum: '',
+          payerSubject: '',
+          paymentMethod: '',
+          contractId: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -499,7 +571,13 @@
           processDefinitionId: '',
           status: '',
           workAttachmentDtoList: [],
-          cwProjectClientInfoDTOList: []
+          cwProjectClientInfoDTOList: [],
+          contractName: '',
+          contractAmount: '',
+          contractNum: '',
+          payerSubject: '',
+          paymentMethod: '',
+          contractId: ''
         }
         this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()
@@ -561,6 +639,17 @@
             this.tableKeyClient = Math.random()
           })
         })
+      },
+      getContract (row) {
+        this.inputForm.contractName = row.contractName
+        this.inputForm.contractAmount = row.contractAmount
+        this.inputForm.contractNum = row.contractNum
+        this.inputForm.payerSubject = row.payerSubject
+        this.inputForm.paymentMethod = row.paymentMethod
+        this.inputForm.contractId = row.id
+      },
+      openContract () {
+        this.$refs.workContractChooseCom.init()
       }
     }
   }

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

@@ -5,6 +5,63 @@
 
         <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
                      label-width="135px" @submit.native.prevent>
+          <el-divider content-position="left"><i class="el-icon-document"></i> 选择合同</el-divider>
+          <el-row  :gutter="15">
+            <el-col :span="24">
+              <el-form-item label="合同名称" prop="contractName"
+                            :rules="[
+                          {required: true, message:'合同不能为空', trigger:'blur'},
+                          {required: true, message:'合同不能为空', trigger:'change'}
+                 ]">
+                <el-input size="medium" :readonly="true" @focus="openContract()" v-model="inputForm.contractName" placeholder="请选择合同">
+                  <el-button slot="append" icon="el-icon-search" @click="openContract()"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="合同金额(元)" prop="contractAmount"
+                            :rules="[
+                 ]">
+                <el-input :disabled="true" v-model="inputForm.contractAmount" placeholder="请填写合同金额"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="合同份数" prop="contractNum"
+                            :rules="[
+                 ]">
+                <el-input :disabled="true" v-model="inputForm.contractNum" placeholder="请填写合同份数"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="付款主体" prop="payerSubject"
+                            :rules="[
+                 ]">
+                <el-select :disabled="true" v-model="inputForm.payerSubject" placeholder="请选择付款主体" style="width:100%;">
+                  <el-option
+                    v-for="item in $dictUtils.getDictList('cw_payment_subject')"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="付款方式" prop="paymentMethod"
+                            :rules="[
+                 ]">
+                <el-select :disabled="true" v-model="inputForm.paymentMethod" placeholder="请选择付款方式" style="width:100%;">
+                  <el-option
+                    v-for="item in $dictUtils.getDictList('cw_payment_method')"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <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="projectName"
@@ -193,6 +250,7 @@
         </el-tabs>
       </el-col>
     </el-row>
+    <WorkContractChooseCom ref="workContractChooseCom" @getContract="getContract"></WorkContractChooseCom>
     <WorkClientChooseForm ref="workClientChooseForm" @getWorkClientChoose="getWorkClientChoose"></WorkClientChooseForm>
   </div>
 </template>
@@ -205,6 +263,7 @@
   import ProjectRecordsService from '@/api/cw/projectRecords/ProjectRecordsService'
   import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
   import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
+  import WorkContractChooseCom from './WorkContractChooseCom'
   export default {
     props: {
       businessId: {
@@ -246,7 +305,13 @@
           processDefinitionId: '',
           status: '',
           workAttachmentDtoList: [],
-          cwProjectClientInfoDTOList: []
+          cwProjectClientInfoDTOList: [],
+          contractName: '',
+          contractAmount: '',
+          contractNum: '',
+          payerSubject: '',
+          paymentMethod: '',
+          contractId: ''
         },
         keyWatch: '',
         activeName: 'client',
@@ -289,7 +354,8 @@
       UpLoadComponent,
       SelectTree,
       UserSelect,
-      WorkClientChooseForm
+      WorkClientChooseForm,
+      WorkContractChooseCom
     },
     methods: {
       getKeyWatch (keyWatch) {
@@ -320,7 +386,13 @@
           processDefinitionId: '',
           status: '',
           workAttachmentDtoList: [],
-          cwProjectClientInfoDTOList: []
+          cwProjectClientInfoDTOList: [],
+          contractName: '',
+          contractAmount: '',
+          contractNum: '',
+          payerSubject: '',
+          paymentMethod: '',
+          contractId: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -475,7 +547,13 @@
           processDefinitionId: '',
           status: '',
           workAttachmentDtoList: [],
-          cwProjectClientInfoDTOList: []
+          cwProjectClientInfoDTOList: [],
+          contractName: '',
+          contractAmount: '',
+          contractNum: '',
+          payerSubject: '',
+          paymentMethod: '',
+          contractId: ''
         }
         this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()
@@ -536,6 +614,17 @@
             this.tableKeyClient = Math.random()
           })
         })
+      },
+      getContract (row) {
+        this.inputForm.contractName = row.contractName
+        this.inputForm.contractAmount = row.contractAmount
+        this.inputForm.contractNum = row.contractNum
+        this.inputForm.payerSubject = row.payerSubject
+        this.inputForm.paymentMethod = row.paymentMethod
+        this.inputForm.contractId = row.id
+      },
+      openContract () {
+        this.$refs.workContractChooseCom.init()
       }
     }
   }

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

@@ -0,0 +1,175 @@
+<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" @keyup.enter.native="refreshList()" @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="contractNo">
+            <el-input size="small" v-model="searchForm.contractNo" placeholder="请输入客户名称" clearable></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" @click="list()" size="small" icon="el-icon-search">查询</el-button>
+            <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="400px"
+          :loading="loading"
+          size="small"
+          ref="workContractTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :menu-config="{}"
+          :print-config="{}"
+          @sort-change=""
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :row-config="{isCurrent: true}"
+          :radio-config="{trigger: 'row'}"
+        >
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
+          <vxe-column type="radio" width="40px"></vxe-column>
+          <vxe-column width="200px" title="合同编号" field="contractNo"></vxe-column>
+          <vxe-column width="200px" title="合同名称" field="contractName">
+            <template slot-scope="scope">
+              <el-link  type="primary" :underline="false" v-if="hasPermission('cw:workContract:edit')" @click="view(scope.row.id)">{{scope.row.contractName}}</el-link>
+              <el-link  type="primary" :underline="false" v-else-if="hasPermission('cw:workContract:view')" @click="view(scope.row.id)">{{scope.row.contractName}}</el-link>
+              <span v-else>{{scope.row.contractName}}</span>
+            </template>
+          </vxe-column>
+          <vxe-column width="200px" title="签约日期" field="signingDate"></vxe-column>
+          <vxe-column width="200px" title="合同金额(元)" field="contractAmount"></vxe-column>
+          <vxe-column width="200px" title="所属部门" field="department"></vxe-column>
+          <vxe-column width="200px" title="创建人" field="createBy"></vxe-column>
+          <vxe-column width="200px" title="创建日期" field="createDate"></vxe-column>
+
+        </vxe-table>
+        <vxe-pager
+          background
+          size="small"
+          :current-page="tablePage.currentPage"
+          :page-size="tablePage.pageSize"
+          :total="tablePage.total"
+          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+          @page-change="currentChangeHandle">
+        </vxe-pager>
+      </div>
+      <span slot="footer" class="dialog-footer">
+      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+      <el-button size="small" type="primary" v-if="method != 'view'" @click="getContract()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+    </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import InputNumber from '@/views/modules/sys/workContract/InputNumber.vue'
+  import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  import ContractInfoService from '@/api/cw/workContract/ContractInfoService'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        dataList: [],
+        searchForm: {
+          contractNo: '',
+          contractName: '',
+          contractAmount: '',
+          contractDates: [],
+          type: '',
+          filedType: '',
+          contractAmounts: [],
+          createBy: this.$store.state.user.id,
+          createId: '',
+          department: '',
+          status: '',
+          procInsId: '',
+          processDefinitionId: ''
+        }
+      }
+    },
+    contractInfoService: null,
+    created () {
+      this.contractInfoService = new ContractInfoService()
+    },
+    components: {
+      SelectUserTree,
+      InputNumber
+    },
+    methods: {
+      init (id) {
+        // if (!this.commonJS.isEmpty(id)) {
+        //   this.$refs.workContractTable.setCurrentRow(id)
+        // }
+        this.visible = true
+        this.list()
+      },
+      // 表单提交
+      getContract () {
+        let row = this.$refs.workContractTable.getRadioRecord()
+        if (this.commonJS.isEmpty(row)) {
+          this.$message.error('请选择一条数据')
+          return
+        }
+        this.close()
+        this.$emit('getContract', row)
+      },
+      list () {
+        this.loading = true
+        this.searchForm.createId = this.$store.state.user.id
+        this.searchForm.status = '5'
+        this.contractInfoService.list({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then(({data}) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.loading = false
+        })
+      },
+      // 当前页
+      currentChangeHandle ({currentPage, pageSize}) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.list()
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.list()
+      },
+      close () {
+        this.visible = false
+      }
+    }
+  }
+</script>

src/views/modules/cw/workClientInfo/WorkClientChooseForm.vue

@@ -121,6 +121,7 @@
       list () {
         this.dataList = []
         this.loading = true
+        this.searchForm.status = '5'
         this.workClientService.list({
           'current': 1,
           'size': -1,

src/views/modules/cw/workClientInfo/WorkClientListForm.vue

@@ -148,6 +148,7 @@
       list () {
         this.dataList = []
         this.loading = true
+        this.searchForm.status = '5'
         this.workClientService.list({
           'current': this.tablePage.currentPage,
           'size': this.tablePage.pageSize,