Merge remote-tracking branch 'origin/liujun-2023-12-05-相关方需求变更' into 相关方关联分公司功能

src/views/xgf/audit/components/list.vue

@@ -98,17 +98,17 @@
       <el-table-column :formatter="(row) => formatDictionaryLabel(row, '1')" prop="SELECT_FORM" label="选取形式" />
       <el-table-column prop="STATE" label="审核状态">
         <template slot-scope="{row}">
-          <span v-if="row.STATE =='0'">未填报</span>
+          <span v-if="row.STATE === '0'">未填报</span>
-          <span v-if="row.STATE =='1'">待审核</span>
+          <span v-if="row.STATE === '1'">待审核</span>
-          <span v-if="row.STATE =='2'">已审核</span>
+          <span v-if="row.STATE === '2'">已审核</span>
-          <span v-if="row.STATE =='3'">已打回</span>
+          <span v-if="row.STATE === '3'">已打回</span>
-          <span v-if="row.STATE =='4'">已填报</span>
+          <span v-if="row.STATE === '4'">已填报</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="200px">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-view" size="mini" @click="goView(row.CORPINFO_ID)">查看</el-button>
-          <el-button v-if="row.STATE == '1'" type="primary" icon="el-icon-s-check" size="mini" @click="handleAudit(row.CORPINFO_ID)">审核</el-button>
+          <el-button v-if="row.STATE === '1'" type="primary" icon="el-icon-s-check" size="mini" @click="handleAudit(row.CORPINFO_ID)">审核</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -216,14 +216,6 @@ export default {
       dialogType: 'add',
       employmentList: [],
       selectList: [],
-      /* employmentList: [
-        { ID: '0', NAME: '劳务承包' },
-        { ID: '1', NAME: '劳务派遣' }
-      ],
-      selectList: [
-        { ID: '0', NAME: '招标' },
-        { ID: '1', NAME: '竞争性谈判' }
-      ], */
       stateList: [
         { ID: '0', NAME: '未填报' },
         { ID: '1', NAME: '待审核' },
@@ -432,22 +424,6 @@ export default {
       ).then((data) => {
         this.corpTypeList = data.list
       })
-      /* requestFN(
-        '/xgf/dictionaries/getLevels',
-        {
-          DICTIONARIES_ID: '688d2cf1c6cd4dab999a0106e09aec83'
-        }
-      ).then((data) => {
-        this.ecnomicTypeList = data.list
-      }) */
-      /* requestFN(
-        '/xgf/dictionaries/getLevels',
-        {
-          DICTIONARIES_ID: '37b045e160c04ddba851073b4e510cc9'
-        }
-      ).then((data) => {
-        this.enterpriseSizeList = data.list
-      }) */
     },
     resetForm() {
       this.form = {

src/views/xgf/insert/components/corpInfoAdd.vue

@@ -1,37 +1,82 @@
 <template>
   <div class="reform-bg">
     <div class="reform-warp">
-      <div class="reform-content" style="padding: 60px">
+      <div class="reform-content" style="padding: 10px">
-        <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="200px">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="主管部门" prop="MAIN_DEPARTMENT">
-                <SelectTree
-                  ref="treeSelect"
-                  :clearable="false"
-                  :options="treeData"
-                  :props="defaultProps"
-                  :node-key="'id'"
-                  v-model="form.MAIN_DEPARTMENT"
-                  placeholder="请选择主管部门"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="开户人" prop="CREATOR">
-                <el-input id="CREATOR" ref="CREATOR" v-model="CREATOR_NAME" maxlength="50" placeholder="开户人" title="开户人" disabled/>
-              </el-form-item>
-            </el-col>
-          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="相关方单位名称" prop="RELEVANT_UNIT_NAME">
                 <el-input id="RELEVANT_UNIT_NAME" ref="RELEVANT_UNIT_NAME" v-model="form.RELEVANT_UNIT_NAME" maxlength="255" placeholder="这里输入相关方单位名称..." title="相关方单位名称"/>
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="12">
-              <el-form-item label="统一社会信用代码" prop="SOCIAL_CODE">
+              <el-form-item label="股份监管部门" prop="MANAGER_DEPARTMENT_ID">
-                <el-input id="SOCIAL_CODE" ref="SOCIAL_CODE" v-model="form.SOCIAL_CODE" maxlength="255" placeholder="这里输入统一社会信用代码..." title="统一社会信用代码"/>
+                <Treeselect
+                  :options="treeData"
+                  :normalizer="normalizergfjg"
+                  :flat="true"
+                  :default-expand-level="0"
+                  :props="defaultProps"
+                  v-model="form.MANAGER_DEPARTMENT_ID"
+                  multiple
+                  placeholder="请选择部门"
+                  no-options-text="暂无数据"
+                  no-children-text="暂无数据"
+                  style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="基层单位监管部门" prop="COMPETENT_DEPT_ID">
+                <Treeselect
+                  :options="treeDataSupervise"
+                  :normalizer="normalizergfjg"
+                  :flat="true"
+                  :default-expand-level="0"
+                  :props="defaultProps"
+                  v-model="form.COMPETENT_DEPT_ID"
+                  multiple
+                  placeholder="请选择基层单位监管部门"
+                  no-options-text="暂无数据"
+                  no-children-text="暂无数据"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="股份主管部门" prop="MAIN_DEPARTMENT">
+                <Treeselect
+                  :options="treeData"
+                  :normalizer="normalizer"
+                  v-model="form.MAIN_DEPARTMENT"
+                  placeholder="请选择部门"
+                  no-options-text="暂无数据"
+                  no-children-text="暂无数据"
+                  style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="基层单位主管部门" prop="SUPERVISE_DEPARTMENT_ID">
+                <Treeselect
+                  :options="treeDataSupervise"
+                  :normalizer="normalizer"
+                  v-model="form.SUPERVISE_DEPARTMENT_ID"
+                  placeholder="请选择基层单位主管部门"
+                  no-options-text="暂无数据"
+                  no-children-text="暂无数据"
+                  @select="selectValue"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="开户人" prop="CREATOR">
+                <el-input id="CREATOR" ref="CREATOR" v-model="CREATOR_NAME" maxlength="50" placeholder="开户人" title="开户人" disabled/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -51,12 +96,17 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="集团单位" prop="INDUSTRY">
+              <el-form-item label="集团单位" prop="CORP_TYPE">
                 <el-select v-model="form.CORP_TYPE" style="width: 100%">
                   <el-option v-for="item in corpTypeList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA"/>
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="统一社会信用代码" prop="SOCIAL_CODE">
+                <el-input id="SOCIAL_CODE" ref="SOCIAL_CODE" v-model="form.SOCIAL_CODE" maxlength="255" placeholder="这里输入统一社会信用代码..." title="统一社会信用代码"/>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
@@ -104,22 +154,24 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="用工形式" prop="EMPLOYMENT_FORM">
-                <el-select v-model="form.EMPLOYMENT_FORM" style="width: 100%;">
+                <Treeselect
-                  <el-option v-for="item in employmentTypeList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA" />
+                  :options="employmentTypeList"
-                </el-select>
+                  :normalizer="normalizer"
+                  v-model="form.EMPLOYMENT_FORM"
+                  placeholder="请选择用工形式"
+                  no-options-text="暂无数据"
+                  no-children-text="暂无数据"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="选取形式" prop="SELECT_FORM">
+              <el-form-item label="选取形式" prop="SELECT_FORMS">
-                <el-select v-model="form.SELECT_FORM" style="width: 100%;">
+                <el-select v-model="form.SELECT_FORMS" multiple style="width: 100%;">
                   <el-option v-for="item in selectFormList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA" />
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-form-item label="流动人员比例(%)" prop="FLOATING_PERCENT">
-            <el-input id="FLOATING_PERCENT" ref="FLOATING_PERCENT" v-model="form.FLOATING_PERCENT" maxlength="255" placeholder="这里输入流动人员比例..." title="流动人员比例"/>
-          </el-form-item>
         </el-form>
         <div style="text-align: center">
           <el-button :loading="submitButtonLoading" type="primary" @click="submitForm">提交</el-button>
@@ -142,11 +194,8 @@
                 <div style="flex:1;">
                   <el-autocomplete v-model="addressKeyword" :fetch-suggestions="querySearch" :trigger-on-focus="false" placeholder="请输入详细地址" style="width:100%" @select="handleSelect" />
                 </div>
-                <!--            <el-input v-model="addressKeyword" style="width: 200px" placeholder="请输入内容" />-->
-                <!--            <el-button slot="append" icon="el-icon-search" @click="mapNameChange"/>-->
               </div>
             </bm-control>
-            <!--        <bm-local-search :keyword="addressKeyword" :auto-viewport="true"/>-->
           </baidu-map>
           <div slot="footer" class="dialog-footer">
             <span>经度：</span>
@@ -167,14 +216,13 @@ import waves from '@/directive/waves' // waves directive
 import { requestFN } from '@/utils/request'
 import DeptSelectTree from '@/components/DeptSelectTree'
 import SelectTree from '@/components/SelectTree'
-// import fa from 'element-ui/src/locale/lang/fa'
+import Treeselect from '@riophae/vue-treeselect'
-// import { upload } from '@/utils/upload'
 
 export default {
-  components: { Pagination, DeptSelectTree, SelectTree },
+  components: { Pagination, DeptSelectTree, SelectTree, Treeselect },
   directives: { waves },
   data() {
-    var hasName = (rule, value, callback) => {
+    const hasName = (rule, value, callback) => {
       requestFN(
         '/relevantunits/hasName',
         {
@@ -191,23 +239,6 @@ export default {
         callback()
       })
     }
-    // var hasSocialCode = (rule, value, callback) => {
-    //   requestFN(
-    //     '/relevantunits/hasSocialCode',
-    //     {
-    //       SOCIAL_CODE: value,
-    //       CORPINFO_ID: ''
-    //
-    //     }
-    //   ).then((data) => {
-    //     if (data.pd) {
-    //       callback(new Error('统一社会信用代码重复'))
-    //     }
-    //     callback()
-    //   }).catch((e) => {
-    //     callback()
-    //   })
-    // }
     return {
       submitButtonLoading: false,
       dialogFormMap: false,
@@ -221,6 +252,21 @@ export default {
       LONGITUDE: '',
       LATITUDE: '',
       treeData: [],
+      normalizergfjg(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes,
+          isDisabled: node.pId === '0'
+        }
+      },
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
       areaList: [],
       industryProps: {
         lazy: true,
@@ -261,10 +307,15 @@ export default {
         checkStrictly: true
       },
       CREATOR_NAME: JSON.parse(sessionStorage.getItem('user')).NAME,
+      treeDataSupervise: [],
       form: {
         CREATOR: JSON.parse(sessionStorage.getItem('user')).USER_ID,
         OPERATOR: JSON.parse(sessionStorage.getItem('user')).USER_ID,
-        MAIN_DEPARTMENT: '',
+        MAIN_DEPARTMENT: null,
+        MANAGER_DEPARTMENT_ID: null, // 股份监管部门
+        COMPETENT_DEPT_ID: null, // 基层单位监管部门
+        SUPERVISE_DEPARTMENT_ID: null,
+        SUPERVISE_CORPINFO_ID: '',
         RELEVANT_UNIT_NAME: '',
         SOCIAL_CODE: '',
         LOCAL: '',
@@ -275,8 +326,9 @@ export default {
         LEGAL_PERSON: '',
         CONTACT_PERSON: '',
         CONTACT_TEL: '',
-        EMPLOYMENT_FORM: '',
+        EMPLOYMENT_FORM: null,
         SELECT_FORM: '',
+        SELECT_FORMS: [],
         FLOATING_PERCENT: '',
         COMPANY_AREA: '',
         POSSESSION: [],
@@ -296,57 +348,31 @@ export default {
       corpTypeList: [], // 集团单位
       rules: {
         MAIN_DEPARTMENT: [{ required: true, message: '请选择主管部门', trigger: 'blur' }],
+        INDUSTRY: [{ required: false, message: '请选择所属行业', trigger: 'blur' }],
+        CORP_TYPE: [{ required: true, message: '请选择集团单位', trigger: 'blur' }],
         RELEVANT_UNIT_NAME: [
           { required: true, message: '相关方单位名称不能为空', trigger: 'blur' },
           { validator: hasName, trigger: 'blur' }
+        ],
+        CONTACT_TEL: [
+          { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
+          {
+            pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+            message: '请输入正确的手机号码'
+          }
         ]
-        // SOCIAL_CODE: [
-        //   { required: false, message: '统一社会信用代码不能为空', trigger: 'blur' },
-        //   {
-        //     pattern: /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/,
-        //     message: '请输入正确的统一社会信用代码'
-        //   },
-        //   { validator: hasSocialCode, trigger: 'blur' }
-        // ],
-        // // LOCAL: [{ required: true, message: '请选择属地', trigger: 'blur' }],
-        // // INDUSTRY: [{ required: true, message: '请选择所属行业', trigger: 'blur' }],
-        // BUSINESS_ADDRESS: [{ required: false, message: '企事业单位经营地址不能为空', trigger: 'blur' }],
-        // LONGITUDE: [{ required: false, message: '请选择经度', trigger: 'blur' }],
-        // LATITUDE: [{ required: false, message: '请选择纬度', trigger: 'blur' }],
-        // LEGAL_PERSON: [{ required: false, message: '法人不能为空', trigger: 'blur' }],
-        // CONTACT_PERSON: [{ required: false, message: '联系人不能为空', trigger: 'blur' }],
-        // CONTACT_TEL: [
-        //   { required: false, message: '联系电话不能为空', trigger: 'blur' },
-        //   { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
-        //   {
-        //     pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
-        //     message: '请输入正确的手机号码'
-        //   }
-        // ],
-        // EMPLOYMENT_FORM: [{ required: false, message: '用工形式不能为空', trigger: 'blur' }],
-        // SELECT_FORM: [{ required: false, message: '选取形式不能为空', trigger: 'blur' }],
-        // POSSESSION: [{ required: false, message: '属地不能为空', trigger: 'blur' }],
-        // FLOATING_PERCENT: [
-        //   { required: false, message: '流动人员比例不能为空', trigger: 'blur' },
-        //   { min: 1, max: 3, message: '请输入1-100的数字', trigger: 'blur' },
-        //   {
-        //     pattern: /^(([1-9][0-9]?)([.,][0-9]{0,2})?|100([.,]0{1,2})?)$/,
-        //     message: '请输入1-100的数字'
-        //   }
-        // ]
       }
     }
   },
   created() {
-    // this.listLoading = false
-    // this.getList()
     this.getDict()
     this.getTreeList()
   },
-  mounted() {
+  mounted() {},
-    // this.getNextTickData()
-  },
   methods: {
+    selectValue(value, node, extra) {
+      this.form.SUPERVISE_CORPINFO_ID = value.CORPINFO_ID
+    },
     async getAreaDict(DICTIONARIES_ID) {
       const { list } = await requestFN(
         '/xgf/dictionaries/getAreaLevels',
@@ -357,16 +383,13 @@ export default {
       return list
     },
     cascaderChange(e) {
-      // console.log('e', e)
       const newVal = e[e.length - 1]
-      // console.log('选中', newVal[newVal.length - 1])
       if (newVal === '1' || newVal === '2' || newVal === '3' || newVal === '4') {
         this.$message({
           message: '请选择正确的属地...',
           type: 'error'
         })
         this.form.POSSESSION.pop()
-        // console.log('移除', this.corpStateForm.REGULATORY_DEPARTMENT_ARR)
       }
     },
     // 加载级联的方法
@@ -390,10 +413,11 @@ export default {
     },
     getTreeList() {
       requestFN(
-        '/department/listTree/',
+        '/department/listTreeManageAndCorp1/',
         {}
       ).then((data) => {
-        this.treeData = JSON.parse(data.zTreeNodes)
+        const treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+        this.treeData = this.removeEmptyChildren(treeData)
       }).catch((e) => {
       })
     },
@@ -415,18 +439,19 @@ export default {
             // this.form.STREET = this.form.POSSESSION[4] || ''
             this.form.COMPANY_AREA = this.$refs.POSSESSION.getCheckedNodes()[0].pathLabels ? this.$refs.POSSESSION.getCheckedNodes()[0].pathLabels.join(',') : ''
           }
-          /* if (this.form.INDUSTRYALL && this.form.INDUSTRYALL.length > 0) {
+          this.form.SELECT_FORM = this.form.SELECT_FORMS.join(',')
-            this.form.CORP_TYPE = this.form.INDUSTRYALL[0] || ''
+          this.form.SELECT_FORM = this.form.SELECT_FORMS.join(',')
-            this.form.CORP_TYPE2 = this.form.INDUSTRYALL[1] || ''
+          if (this.form.COMPETENT_DEPT_ID) {
-            this.form.CORP_TYPE3 = this.form.INDUSTRYALL[2] || ''
+            this.form.COMPETENT_DEPT_ID = this.form.COMPETENT_DEPT_ID.join(',')
-            this.form.CORP_TYPE4 = this.form.INDUSTRYALL[3] || ''
+          }
-            this.form.CORP_TYPE_NAME = this.$refs.industryCascader.getCheckedNodes()[0].pathLabels ? this.$refs.industryCascader.getCheckedNodes()[0].pathLabels.join('/') : ''
+          if (this.form.MANAGER_DEPARTMENT_ID) {
-          } */
+            this.form.MANAGER_DEPARTMENT_ID = this.form.MANAGER_DEPARTMENT_ID.join(',')
+          }
           requestFN(
             '/relevantunits/saveCorpInfo',
             this.form
           ).then((data) => {
-            if (data.result == 'exist') {
+            if (data.result === 'exist') {
               this.$message({
                 message: '用户名已存在，请重新填写...',
                 type: 'error'
@@ -440,7 +465,6 @@ export default {
               this.$parent.activeName = 'CorpInfoList'
             }
             this.listLoading = false
-            // this.getList()
           }).catch((e) => {
             this.listLoading = false
           })
@@ -455,12 +479,21 @@ export default {
     // 获取数据字典数据
     getDict: function() {
       requestFN(
-        '/xgf/dictionaries/getLevels',
+        '/department/listTree/', {}
+      ).then((data) => {
+        const treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+        this.treeDataSupervise = this.removeEmptyChildren(treeData)
+      }).catch((e) => {
+      })
+
+      requestFN(
+        '/xgf/dictionaries/listSelectTree',
         {
           DICTIONARIES_ID: '720992d898bf4fd7b44bf0ba1f1bbb88'
         }
       ).then((data) => {
-        this.employmentTypeList = data.list
+        const employmentTypeList = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+        this.employmentTypeList = this.removeEmptyChildren(employmentTypeList)
       })
       requestFN(
         '/xgf/dictionaries/getLevels',
@@ -591,8 +624,6 @@ export default {
       setTimeout(() => {
         map.centerAndZoom(point, zoom)
       }, 0)
-      // var marker = new BMap.Marker(point) // 创建标注
-      // map.addOverlay(marker) // 将标注添加到地图中
     }
   }
 }

src/views/xgf/insert/components/corpInfoList.vue

@@ -103,9 +103,9 @@
       </el-table-column>
     </el-table>
     <div class="page-btn-group">
-      <!--      <div>-->
+      <div>
-      <!--        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新建相关方单位</el-button>-->
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新建相关方单位</el-button>
-      <!--      </div>-->
+      </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
   </div>