Merge remote-tracking branch 'origin/master'

src/api/cw/projectBusinessType/CwProjectBusinessTypeService.js

@@ -0,0 +1,39 @@
+import request from '@/utils/httpRequest'
+
+export default class CwProjectBusinessTypeService {
+  list (params) {
+    return request({
+      url: '/projectRecords/cw_project_business_type/list',
+      method: 'get',
+      params: params
+    })
+  }
+  queryById (id) {
+    return request({
+      url: '/projectRecords/cw_project_business_type/queryById',
+      method: 'get',
+      params: {id: id}
+    })
+  }
+  getList () {
+    return request({
+      url: '/projectRecords/cw_project_business_type/getList',
+      method: 'get',
+      params: {}
+    })
+  }
+  save (inputForm) {
+    return request({
+      url: `/projectRecords/cw_project_business_type/save`,
+      method: 'post',
+      data: inputForm
+    })
+  }
+  delete (ids) {
+    return request({
+      url: '/projectRecords/cw_project_business_type/delete',
+      method: 'delete',
+      params: {ids: ids}
+    })
+  }
+}

src/views/modules/cw/projectBusinessType/CwProjectBusinessTypeForm.vue

@@ -0,0 +1,126 @@
+<template>
+  <div>
+    <el-dialog
+      :title="title"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      width="500px"
+      @close="close"
+      @keyup.enter.native="doSubmit"
+      :visible.sync="visible">
+      <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
+               label-width="120px" @submit.native.prevent>
+        <el-row  :gutter="15">
+          <el-col :span="21">
+            <el-form-item label="业务类型" prop="name"
+                          :rules="[
+                          {required: true, message:'业务类型不能为空', trigger:'blur'}
+                 ]">
+              <el-input v-model="inputForm.name" placeholder="请填写业务类型"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item label="排序" prop="sort"
+                          :rules="[
+                          {required: true, message:'排序不能为空', trigger:'blur'}
+                 ]">
+              <el-input v-model="inputForm.sort" placeholder="请填写排序"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item label="备注" prop="remarks"
+                          :rules="[
+                 ]">
+              <el-input type="textarea" maxlength="200" v-model="inputForm.remarks" placeholder="请填写备注"  show-word-limit   ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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 CwProjectBusinessTypeService from '@/api/cw/projectBusinessType/CwProjectBusinessTypeService'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        inputForm: {
+          type: '',
+          sort: '',
+          remarks: '',
+          parentId: ''
+        }
+      }
+    },
+    cwProjectBusinessTypeService: null,
+    created () {
+      this.cwProjectBusinessTypeService = new CwProjectBusinessTypeService()
+    },
+    methods: {
+      init (method, id) {
+        this.method = method
+        this.inputForm = {
+          name: '',
+          sort: '',
+          remarks: '',
+          parentId: ''
+        }
+        if (method === 'add') {
+          this.title = `新建业务类型`
+          this.inputForm.parentId = '0'
+        } else if (method === 'edit') {
+          this.inputForm.id = id
+          this.title = '修改业务类型'
+        } else if (method === 'view') {
+          this.inputForm.id = id
+          this.title = '查看业务类型'
+        } else if (method === 'addChild') {
+          this.title = '新建子业务类型'
+          this.inputForm.parentId = id
+        }
+        this.visible = true
+        this.loading = false
+        this.$nextTick(() => {
+          this.$refs.inputForm.resetFields()
+          if (method === 'edit' || method === 'view') { // 修改或者查看
+            this.loading = true
+            this.cwProjectBusinessTypeService.queryById(this.inputForm.id).then(({data}) => {
+              this.inputForm = this.recover(this.inputForm, data)
+              this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+              this.loading = false
+            })
+          }
+        })
+      },
+      // 表单提交
+      doSubmit () {
+        this.$refs['inputForm'].validate((valid) => {
+          if (valid) {
+            this.loading = true
+            this.cwProjectBusinessTypeService.save(this.inputForm).then(({data}) => {
+              this.close()
+              this.$message.success(data)
+              this.$emit('refreshDataList')
+              this.loading = false
+            }).catch(() => {
+              this.loading = false
+            })
+          }
+        })
+      },
+      close () {
+        this.$refs.inputForm.resetFields()
+        this.visible = false
+      }
+    }
+  }
+</script>

src/views/modules/cw/projectBusinessType/CwProjectBusinessTypeList.vue

@@ -0,0 +1,159 @@
+<template>
+  <div class="page">
+    <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+      <!-- 搜索框-->
+      <el-form-item prop="name">
+        <el-input size="small" v-model="searchForm.name" placeholder="请输入业务类型" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
+        <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="bg-white top" style="">
+      <vxe-toolbar :refresh="{query: refreshList}" custom>
+        <template #buttons>
+          <el-button v-if="hasPermission('cw_project_business_type:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">新建</el-button>
+          <el-button v-if="hasPermission('cw_project_business_type:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.businessTypeTable && $refs.businessTypeTable.getCheckboxRecords().length === 0" plain>删除</el-button>
+        </template>
+      </vxe-toolbar>
+      <div style="height: calc(100% - 50px)">
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="auto"
+          :loading="loading"
+          size="small"
+          ref="businessTypeTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :menu-config="{}"
+          @sort-change="sortChangeHandle"
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :tree-config="{transform: true, rowField: 'id', parentField: 'parentId'}"
+          :checkbox-config="{}">
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
+          <vxe-column type="checkbox" width="40" ></vxe-column>
+          <vxe-column min-width="350" title="业务类型" field="name" align="left" tree-node></vxe-column>
+          <vxe-column min-width="50" align="center" title="序号" field="sort"></vxe-column>
+          <vxe-column min-width="50" align="center" title="级别" field="level"></vxe-column>
+          <vxe-column min-width="50" align="center" title="备注" field="remarks"></vxe-column>
+          <vxe-column title="操作" width="230px" fixed="right" align="center">
+            <template  slot-scope="scope">
+              <el-button v-if="hasPermission('cw_project_business_type:edit')" type="text"  size="small" @click="addChild(scope.row.id)">新建子类型</el-button>
+              <el-button v-if="hasPermission('cw_project_business_type:edit')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('cw_project_business_type:del')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+            </template>
+          </vxe-column>
+        </vxe-table>
+      </div>
+    </div>
+    <CwProjectBusinessTypeForm  ref="businessTypeForm" @refreshDataList="refreshList"></CwProjectBusinessTypeForm>
+  </div>
+</template>
+
+<script>
+  import CwProjectBusinessTypeService from '@/api/cw/projectBusinessType/CwProjectBusinessTypeService'
+  import CwProjectBusinessTypeForm from './CwProjectBusinessTypeForm'
+  export default {
+    data () {
+      return {
+        searchForm: {
+          name: '',
+          sort: ''
+        },
+        dataList: [],
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        loading: false
+      }
+    },
+    cwProjectBusinessTypeService: null,
+    created () {
+      this.cwProjectBusinessTypeService = new CwProjectBusinessTypeService()
+    },
+    components: {
+      CwProjectBusinessTypeForm
+    },
+    mounted () {
+      this.refreshList()
+    },
+    methods: {
+      // 新增
+      add () {
+        this.$refs.businessTypeForm.init('add', '')
+      },
+      addChild (id) {
+        this.$refs.businessTypeForm.init('addChild', id)
+      },
+      // 修改
+      edit (id) {
+        id = id || this.$refs.businessTypeTable.getCheckboxRecords().map(item => {
+          return item.id
+        })[0]
+        this.$refs.businessTypeForm.init('edit', id)
+      },
+      // 查看
+      view (id) {
+        this.$refs.businessTypeForm.init('view', id)
+      },
+      // 获取数据列表
+      refreshList () {
+        this.loading = true
+        this.cwProjectBusinessTypeService.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.refreshList()
+      },
+      // 排序
+      sortChangeHandle (column) {
+        this.tablePage.orders = []
+        if (column.order != null) {
+          this.tablePage.orders.push({column: this.$utils.toLine(column.property), asc: column.order === 'asc'})
+        }
+        this.refreshList()
+      },
+      // 删除
+      del (id) {
+        let ids = id || this.$refs.businessTypeTable.getCheckboxRecords().map(item => {
+          return item.id
+        }).join(',')
+        this.$confirm(`确定删除所选项吗?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.loading = true
+          this.cwProjectBusinessTypeService.delete(ids).then(({data}) => {
+            this.$message.success(data)
+            this.refreshList()
+            this.loading = false
+          })
+        })
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.refreshList()
+      }
+    }
+  }
+</script>

src/views/modules/cw/projectBusinessType/CwProjectBusinessTypeListForm.vue

@@ -0,0 +1,170 @@
+<template>
+  <div>
+    <el-dialog
+      :title="title"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      width="850px"
+      height="500px"
+      append-to-body
+      @close="close"
+      @keyup.enter.native="getBusinessType"
+      :visible.sync="visible">
+      <div style="height: calc(100% - 50px);">
+        <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm"  @submit.native.prevent>
+          <el-form-item label="业务类型" prop="name">
+            <el-input size="small" v-model="searchForm.name" placeholder="请输入业务类型" clearable></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" @click="list()" size="small" icon="el-icon-search">查询</el-button>
+            <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="450px"
+          :loading="loading"
+          size="small"
+          ref="businessTypeTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :row-config="{isCurrent: true}"
+          :radio-config="{trigger: 'row'}"
+          :menu-config="{}"
+          @sort-change=""
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :tree-config="{transform: true, rowField: 'id', parentField: 'parentId'}"
+          :checkbox-config="{}">
+          <vxe-column type="radio" width="40" ></vxe-column>
+          <vxe-column min-width="350" title="业务类型" field="name" align="left" tree-node></vxe-column>
+<!--          <vxe-column min-width="50" align="center" title="序号" field="sort"></vxe-column>-->
+<!--          <vxe-column min-width="50" align="center" title="级别" field="level"></vxe-column>-->
+<!--          <vxe-column min-width="50" align="center" title="备注" field="remarks"></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="getBusinessType()" 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 CwProjectBusinessTypeService from '@/api/cw/projectBusinessType/CwProjectBusinessTypeService'
+  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: {
+          name: ''
+        }
+      }
+    },
+    cwProjectBusinessTypeService: null,
+    created () {
+      this.cwProjectBusinessTypeService = new CwProjectBusinessTypeService()
+    },
+    components: {
+      SelectUserTree,
+      InputNumber
+    },
+    methods: {
+      init (deputy) {
+        this.title = '管理级次分类选择'
+        this.visible = true
+        this.list()
+      },
+      // 表单提交
+      getBusinessType () {
+        let row = this.$refs.businessTypeTable.getRadioRecord()
+        if (this.commonJS.isEmpty(row)) {
+          this.$message.error('请至少选择一条数据')
+        } else {
+          let _this = this
+          const waitForEach = function () {
+            return new Promise(function (resolve, reject) {
+              _this.dataList.forEach((item) => {
+                if (item.parentId === row.id) {
+                  _this.$message.error('只可以选择最小节点的数据')
+                  throw new Error('只可以选择最小节点的数据')
+                }
+              })
+              resolve()
+            })
+          }
+          waitForEach().then(() => {
+            this.close()
+            this.$emit('getBusinessType', row)
+          }).catch((reject) => {
+            console.log('waitForEach.catch', reject)
+          })
+        }
+      },
+      list () {
+        this.dataList = []
+        this.loading = true
+        this.cwProjectBusinessTypeService.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: 0;
+  }
+  /deep/ .el-form-item--mini.el-form-item, .el-form-item--small.el-form-item {
+    margin-bottom: 0px;
+  }
+</style>

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

@@ -105,6 +105,27 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
+                  <el-form-item label="业务类型" prop="businessTypeName"
+                                :rules="[
+                   ]">
+                    <el-input :readonly="true" @focus="openBusinessTypeForm" v-model="inputForm.businessTypeName" placeholder="请填写业务类型" clearable></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="风险等级" prop="riskLevel"
+                                :rules="[
+                   ]">
+                    <el-select v-model="inputForm.riskLevel" placeholder="请选择风险等级" style="width:100%;">
+                      <el-option
+                        v-for="item in $dictUtils.getDictList('cw_project_risk_level')"
+                        :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="projectMoney"
                                 :rules="[
                    ]">
@@ -263,6 +284,8 @@
     </span>
       <WorkContractChooseCom ref="workContractChooseCom" @getContract="getContract"></WorkContractChooseCom>
     <WorkClientChooseForm ref="workClientChooseForm" @getWorkClientChoose="getWorkClientChoose"></WorkClientChooseForm>
+      <CwProjectBusinessTypeListForm ref="cwProjectBusinessTypeListForm" @getBusinessType="getBusinessType"></CwProjectBusinessTypeListForm>
+
     </el-dialog>
   </div>
 </template>
@@ -276,6 +299,8 @@
   import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
   import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
   import WorkContractChooseCom from './WorkContractChooseCom'
+  import CwProjectBusinessTypeListForm from '@/views/modules/cw/projectBusinessType/CwProjectBusinessTypeListForm'
+
   export default {
     props: {
       businessId: {
@@ -323,7 +348,10 @@
           contractNum: '',
           payerSubject: '',
           paymentMethod: '',
-          contractId: ''
+          contractId: '',
+          businessType: '',
+          riskLevel: '',
+          businessTypeName: ''
         },
         keyWatch: '',
         activeName: 'client',
@@ -368,7 +396,8 @@
       SelectTree,
       UserSelect,
       WorkClientChooseForm,
-      WorkContractChooseCom
+      WorkContractChooseCom,
+      CwProjectBusinessTypeListForm
     },
     methods: {
       getKeyWatch (keyWatch) {
@@ -412,7 +441,10 @@
           contractNum: '',
           payerSubject: '',
           paymentMethod: '',
-          contractId: ''
+          contractId: '',
+          businessType: '',
+          riskLevel: '',
+          businessTypeName: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -585,7 +617,10 @@
           contractNum: '',
           payerSubject: '',
           paymentMethod: '',
-          contractId: ''
+          contractId: '',
+          businessType: '',
+          riskLevel: '',
+          businessTypeName: ''
         }
         this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()
@@ -659,6 +694,13 @@
       },
       openContract () {
         this.$refs.workContractChooseCom.init()
+      },
+      getBusinessType (row) {
+        this.inputForm.businessType = row.id
+        this.inputForm.businessTypeName = row.name
+      },
+      openBusinessTypeForm () {
+        this.$refs.cwProjectBusinessTypeListForm.init()
       }
     }
   }

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

@@ -96,6 +96,27 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
+                  <el-form-item label="业务类型" prop="businessTypeName"
+                                :rules="[
+                   ]">
+                    <el-input :readonly="true" @focus="openBusinessTypeForm" v-model="inputForm.businessTypeName" placeholder="请填写业务类型" clearable></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="风险等级" prop="riskLevel"
+                                :rules="[
+                   ]">
+                    <el-select v-model="inputForm.riskLevel" placeholder="请选择风险等级" style="width:100%;">
+                      <el-option
+                        v-for="item in $dictUtils.getDictList('cw_project_risk_level')"
+                        :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="projectMoney"
                                 :rules="[
                    ]">
@@ -250,6 +271,7 @@
     </el-row>
     <WorkContractChooseCom ref="workContractChooseCom" @getContract="getContract"></WorkContractChooseCom>
     <WorkClientChooseForm ref="workClientChooseForm" @getWorkClientChoose="getWorkClientChoose"></WorkClientChooseForm>
+    <CwProjectBusinessTypeListForm ref="cwProjectBusinessTypeListForm" @getBusinessType="getBusinessType"></CwProjectBusinessTypeListForm>
   </div>
 </template>
 
@@ -262,6 +284,7 @@
   import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
   import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
   import WorkContractChooseCom from './WorkContractChooseCom'
+  import CwProjectBusinessTypeListForm from '@/views/modules/cw/projectBusinessType/CwProjectBusinessTypeListForm'
   export default {
     props: {
       businessId: {
@@ -309,7 +332,10 @@
           contractNum: '',
           payerSubject: '',
           paymentMethod: '',
-          contractId: ''
+          contractId: '',
+          businessType: '',
+          riskLevel: '',
+          businessTypeName: ''
         },
         keyWatch: '',
         activeName: 'client',
@@ -353,7 +379,8 @@
       SelectTree,
       UserSelect,
       WorkClientChooseForm,
-      WorkContractChooseCom
+      WorkContractChooseCom,
+      CwProjectBusinessTypeListForm
     },
     methods: {
       getKeyWatch (keyWatch) {
@@ -390,7 +417,10 @@
           contractNum: '',
           payerSubject: '',
           paymentMethod: '',
-          contractId: ''
+          contractId: '',
+          businessType: '',
+          riskLevel: '',
+          businessTypeName: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -561,7 +591,10 @@
           contractNum: '',
           payerSubject: '',
           paymentMethod: '',
-          contractId: ''
+          contractId: '',
+          businessType: '',
+          riskLevel: '',
+          businessTypeName: ''
         }
         this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()
@@ -633,6 +666,13 @@
       },
       openContract () {
         this.$refs.workContractChooseCom.init()
+      },
+      getBusinessType (row) {
+        this.inputForm.businessType = row.id
+        this.inputForm.businessTypeName = row.name
+      },
+      openBusinessTypeForm () {
+        this.$refs.cwProjectBusinessTypeListForm.init()
       }
     }
   }

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

@@ -133,10 +133,10 @@
                 </el-col>
 
                 <el-col :span="12">
-                  <el-form-item label="管理级次分类" prop="manageLevelType"
+                  <el-form-item label="管理级次分类" prop="manageLevelTypeName"
                                 :rules="[
                    ]">
-                    <el-input v-model="inputForm.manageLevelType" @focus="openManageLevelType" placeholder="请填写管理级次分类" clearable></el-input>
+                    <el-input v-model="inputForm.manageLevelTypeName" @focus="openManageLevelType" placeholder="请填写管理级次分类" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -198,10 +198,10 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="按组织类型分类" prop="organizationType"
+                  <el-form-item label="按组织类型分类" prop="organizationTypeName"
                                 :rules="[
                    ]">
-                    <el-input v-model="inputForm.organizationType" @focus="openOrganizationType()" placeholder="请填写按组织类型分类" clearable></el-input>
+                    <el-input v-model="inputForm.organizationTypeName" @focus="openOrganizationType()" placeholder="请填写按组织类型分类" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -804,7 +804,9 @@
           workAttachmentDtoList: [],
           address: '',
           mobile: '',
-          isUscCode: ''
+          isUscCode: '',
+          manageLevelTypeName: '',
+          organizationTypeName: ''
         },
         keyWatch: '',
         activeName: 'base',
@@ -984,7 +986,9 @@
           workAttachmentDtoList: [],
           address: '',
           mobile: '',
-          isUscCode: ''
+          isUscCode: '',
+          manageLevelTypeName: '',
+          organizationTypeName: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -1220,7 +1224,9 @@
           workAttachmentDtoList: [],
           address: '',
           mobile: '',
-          isUscCode: ''
+          isUscCode: '',
+          manageLevelTypeName: '',
+          organizationTypeName: ''
         }
         this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()
@@ -1275,7 +1281,8 @@
       },
       // 获取选择管理级次分类后的回参
       getManageLevelType (row) {
-        this.inputForm.manageLevelType = row.name
+        this.inputForm.manageLevelType = row.id
+        this.inputForm.manageLevelTypeName = row.name
       },
       // 选择管理级次分类
       openManageLevelType () {
@@ -1283,7 +1290,8 @@
       },
       // 获取选择组织类型分类后的回参
       getOrganizationType (row) {
-        this.inputForm.organizationType = row.name
+        this.inputForm.organizationType = row.id
+        this.inputForm.organizationTypeName = row.name
       },
       // 选择组织类型分类
       openOrganizationType () {

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

@@ -124,10 +124,10 @@
                   </el-col>
 
                   <el-col :span="12">
-                    <el-form-item label="管理级次分类" prop="manageLevelType"
+                    <el-form-item label="管理级次分类" prop="manageLevelTypeName"
                                   :rules="[
                    ]">
-                      <el-input v-model="inputForm.manageLevelType" @focus="openManageLevelType" placeholder="请填写管理级次分类" clearable></el-input>
+                      <el-input v-model="inputForm.manageLevelTypeName" @focus="openManageLevelType" placeholder="请填写管理级次分类" clearable></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
@@ -189,10 +189,10 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="按组织类型分类" prop="organizationType"
+                    <el-form-item label="按组织类型分类" prop="organizationTypeName"
                                   :rules="[
                    ]">
-                      <el-input v-model="inputForm.organizationType" @focus="openOrganizationType()" placeholder="请填写按组织类型分类" clearable></el-input>
+                      <el-input v-model="inputForm.organizationTypeName" @focus="openOrganizationType()" placeholder="请填写按组织类型分类" clearable></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
@@ -791,7 +791,9 @@
           workAttachmentDtoList: [],
           address: '',
           mobile: '',
-          isUscCode: ''
+          isUscCode: '',
+          manageLevelTypeName: '',
+          organizationTypeName: ''
         },
         keyWatch: '',
         activeName: 'base',
@@ -962,7 +964,9 @@
           workAttachmentDtoList: [],
           address: '',
           mobile: '',
-          isUscCode: ''
+          isUscCode: '',
+          manageLevelTypeName: '',
+          organizationTypeName: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -1192,7 +1196,9 @@
           workAttachmentDtoList: [],
           address: '',
           mobile: '',
-          isUscCode: ''
+          isUscCode: '',
+          manageLevelTypeName: '',
+          organizationTypeName: ''
         }
         this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()
@@ -1246,7 +1252,8 @@
       },
       // 获取选择管理级次分类后的回参
       getManageLevelType (row) {
-        this.inputForm.manageLevelType = row.name
+        this.inputForm.manageLevelType = row.id
+        this.inputForm.manageLevelTypeName = row.name
       },
       // 选择管理级次分类
       openManageLevelType () {
@@ -1254,7 +1261,8 @@
       },
       // 获取选择组织类型分类后的回参
       getOrganizationType (row) {
-        this.inputForm.organizationType = row.name
+        this.inputForm.organizationType = row.id
+        this.inputForm.organizationTypeName = row.name
       },
       // 选择组织类型分类
       openOrganizationType () {

src/views/modules/cw/workClientInfo/manageLevelType/ManageLevelTypeListForm.vue

@@ -4,7 +4,7 @@
       :title="title"
       :close-on-click-modal="false"
       v-dialogDrag
-      width="1100px"
+      width="650px"
       height="500px"
       append-to-body
       @close="close"
@@ -13,14 +13,14 @@
       <div style="height: calc(100% - 50px);">
         <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm"  @submit.native.prevent>
           <!-- 搜索框-->
-<!--          <el-form-item label="客户姓名" prop="name">-->
-<!--            <el-input size="small" v-model="searchForm.name" placeholder="请输入客户姓名" clearable></el-input>-->
-<!--          </el-form-item>-->
+          <el-form-item label="管理级次分类名称" prop="name">
+            <el-input size="small" v-model="searchForm.name" placeholder="请输入管理级次分类名称" clearable></el-input>
+          </el-form-item>
 
-<!--          <el-form-item>-->
-<!--            <el-button type="primary" @click="list()" size="small" icon="el-icon-search">查询</el-button>-->
-<!--            <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>-->
-<!--          </el-form-item>-->
+          <el-form-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

src/views/modules/cw/workClientInfo/organizationType/OrganizationTypeListForm.vue

@@ -4,7 +4,7 @@
       :title="title"
       :close-on-click-modal="false"
       v-dialogDrag
-      width="1100px"
+      width="650px"
       height="500px"
       @close="close"
       append-to-body
@@ -13,14 +13,14 @@
       <div style="height: calc(100% - 50px);">
         <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @submit.native.prevent>
           <!-- 搜索框-->
-<!--          <el-form-item label="客户姓名" prop="name">-->
-<!--            <el-input size="small" v-model="searchForm.name" placeholder="请输入客户姓名" clearable></el-input>-->
-<!--          </el-form-item>-->
+          <el-form-item label="组织类型分类名称" prop="name">
+            <el-input size="small" v-model="searchForm.name" placeholder="请输入组织类型分类名称" clearable></el-input>
+          </el-form-item>
 
-<!--          <el-form-item>-->
-<!--            <el-button type="primary" @click="list()" size="small" icon="el-icon-search">查询</el-button>-->
-<!--            <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>-->
-<!--          </el-form-item>-->
+          <el-form-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