Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/DCustomerController.java

@@ -49,7 +49,7 @@ public class DCustomerController extends BaseController {
      */
     @GetMapping("/info/{customerKey}")
     public R<DCustomer> info(@PathVariable String customerKey) {
-        return R.ok(baseService.info(customerKey));
+        return R.ok(baseService.getById(customerKey));
     }
 
   

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/DSubcontract.java

+package com.dsk.cscec.domain;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * 分包分供合同(DSubcontract)表实体类
+ *
+ * @author lcl
+ * @since 2023-12-11 15:31:44
+ */
+@Data
+public class DSubcontract implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分包合同主键
+     */
+    private Long subcontractKey;
+    /**
+     * 分包合同ID
+     */
+    private String subcontractId;
+    /**
+     * 分包合同编码
+     */
+    private String subcontractCode;
+    /**
+     * 分包合同名称
+     */
+    private String subcontractName;
+    /**
+     * 财务一体化分包合同编码
+     */
+    private String fipSubcontractCode;
+    /**
+     * 财务一体化分包合同名称
+     */
+    private String fipSubcontractName;
+    /**
+     * 业务类型
+     */
+    private String contractScope;
+    /**
+     * 合同类型
+     */
+    private String contractType;
+    /**
+     * 项目ID
+     */
+    private String projectId;
+    /**
+     * 项目编码
+     */
+    private String projectCode;
+    /**
+     * 项目名称
+     */
+    private String projectName;
+    /**
+     * 分包合同金额
+     */
+    private Double subcontractValue;
+    /**
+     * 分包合同不含税金额
+     */
+    private Double subcontractValueExcl;
+    /**
+     * 分包合同税额
+     */
+    private Double subcontractTaxValue;
+    /**
+     * 签订单位ID
+     */
+    private String signOrgId;
+    /**
+     * 签订单位名称
+     */
+    private String signOrgName;
+    /**
+     * 合同签订日期
+     */
+    private String signDate;
+    /**
+     * 合同盖章日期
+     */
+    private String stampDate;
+    /**
+     * 合同返回日期
+     */
+    private String returnDate;
+    /**
+     * 交底日期
+     */
+    private String noticeDate;
+    /**
+     * 实际完成时间
+     */
+    private String completeDate;
+    /**
+     * 合同开始日期
+     */
+    private String subcontractStartDate;
+    /**
+     * 合同结束日期
+     */
+    private String subcontractEndDate;
+    /**
+     * 是否甲指
+     */
+    private String isownerappoint;
+    /**
+     * 施工专业ID
+     */
+    private String specialtyId;
+    /**
+     * 施工专业
+     */
+    private String specialtyType;
+    /**
+     * 履约状态
+     */
+    private String contractState;
+    /**
+     * 供应商ID
+     */
+    private String customerId;
+    /**
+     * 供应商名称
+     */
+    private String customerName;
+    /**
+     * 客商类型
+     */
+    private String customerType;
+    /**
+     * 分包范围
+     */
+    private String jobScope;
+    /**
+     * 付款方式
+     */
+    private String payType;
+    /**
+     * 付款比例是否固定
+     */
+    private Double isfixedpayratio;
+    /**
+     * 过程中付款比例
+     */
+    private Double processPayRatio;
+    /**
+     * 完工后付款比例
+     */
+    private Double completePayRatio;
+    /**
+     * 结算后付款比例
+     */
+    private Double settlePayRatio;
+    /**
+     * 保修金比例
+     */
+    private Double warrantyGoldRatio;
+    /**
+     * 分包合同应付金额
+     */
+    private Double subcontractPayableValue;
+    /**
+     * 分包合同已付金额
+     */
+    private Double subcontractPaidValue;
+    /**
+     * 预付款
+     */
+    private Double prepayValue;
+    /**
+     * 已付款
+     */
+    private Double paidValue;
+    /**
+     * 垫付款
+     */
+    private Double advanceValue;
+    /**
+     * 结算方式
+     */
+    private String settleType;
+    /**
+     * 结算价
+     */
+    private Double settleValue;
+    /**
+     * 人工费
+     */
+    private Double laborFee;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 合同分类
+     */
+    private String contractClass;
+    /**
+     * 成本科目ID
+     */
+    private String costSubjectId;
+    /**
+     * 成本科目名称
+     */
+    private String costSubjectName;
+    /**
+     * 成本科目全路径名称
+     */
+    private String costSubjectFullname;
+    /**
+     * 执行备案
+     */
+    private String contractTextType;
+    /**
+     * 税率
+     */
+    private Double taxRate;
+    /**
+     * 盖章份数
+     */
+    private Double noOfStamp;
+    /**
+     * 盖章明晰
+     */
+    private String signRemark;
+    /**
+     * 返回明晰
+     */
+    private String issign;
+    /**
+     * 承包类型
+     */
+    private String contractForm;
+    /**
+     * 是否为一局内部公司
+     */
+    private String iscscec1bcompany;
+    /**
+     * 是否主体结构分包合同
+     */
+    private String isfirststruct;
+    /**
+     * 建筑面积
+     */
+    private Double areaSum;
+    /**
+     * 锁定金额
+     */
+    private Double lockValue;
+    /**
+     * 战采资源级别
+     */
+    private String gpResLevel;
+    /**
+     * 战采资源类别
+     */
+    private String gpResScope;
+    /**
+     * 战采资源品类
+     */
+    private String gpResCategory;
+    /**
+     * 战略采购供应商年度
+     */
+    private Double gpSupplierYear;
+    /**
+     * 是否集中采购（是/否）
+     */
+    private String isGp;
+    /**
+     * 战采管理要求
+     */
+    private String gpApplication;
+    /**
+     * 合同是否执行战采价格
+     */
+    private String isUseGpprice;
+    /**
+     * 战采供应商ID
+     */
+    private String fgpcustomerid;
+    /**
+     * 分包合同版本
+     */
+    private Double subcontractVersion;
+    /**
+     * 流程状态
+     */
+    private String fbizstatename;
+    /**
+     * 流程状态
+     */
+    private String fbizstate;
+    /**
+     * 材料类型
+     */
+    private String materialType;
+    /**
+     * 数据加载时间
+     */
+    private String loadTime;
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DSubcontractMapper.java

+package com.dsk.cscec.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.DSubcontract;
+
+/**
+ * 分包分供合同(DSubcontract)表数据库访问层
+ *
+ * @author lcl
+ * @since 2023-12-11 15:31:44
+ */
+public interface DSubcontractMapper extends BaseMapper<DSubcontract> {
+
+    Integer selectEnterpriseCountByCustomerId(String customerId);
+
+    Integer selectProjectCountByCustomerId(String customerId);
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDCustomerService.java

@@ -16,7 +16,5 @@ public interface IDCustomerService extends IService<DCustomer> {
 
     TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query);
 
-    DCustomer info(String customerKey);
-
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/DCustomerServiceImpl.java

@@ -8,10 +8,12 @@ import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.cscec.domain.bo.DCustomerSearchBo;
 import com.dsk.cscec.mapper.DCustomerMapper;
 import com.dsk.cscec.domain.DCustomer;
+import com.dsk.cscec.mapper.DSubcontractMapper;
 import com.dsk.cscec.service.IDCustomerService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,24 +26,24 @@ import java.util.List;
 @Service
 public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer> implements IDCustomerService {
 
+    @Resource
+    private DSubcontractMapper subcontractMapper;
+
     @Override
     public TableDataInfo<DCustomer> allSearchList(DCustomerSearchBo bo, PageQuery query) {
         dealWithCustomerClass(bo);
         Page<DCustomer> page = baseMapper.allSearchList(query.build(), bo);
         if (CollectionUtils.isNotEmpty(page.getRecords())) {
             for (DCustomer customer : page.getRecords()) {
-
+                //企业合作数量
+                customer.setEnterpriseCooperationCount(subcontractMapper.selectEnterpriseCountByCustomerId(customer.getCustomerId()));
+                //项目合作数量
+                customer.setProjectCooperationCount(subcontractMapper.selectProjectCountByCustomerId(customer.getCustomerId()));
             }
         }
         return TableDataInfo.build(page);
     }
 
-    @Override
-    public DCustomer info(String customerKey) {
-        return baseMapper.selectById(customerKey);
-    }
-
-
     private void dealWithCustomerClass(DCustomerSearchBo bo) {
         if (!ObjectUtils.isEmpty(bo.getCustomerClass())) {
             List<String> list = new ArrayList<>();
@@ -58,11 +60,19 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
                         list.add("租赁");
                         break;
                     case "劳务分包":
-                        if(isTeam == null)  isTeam = 0;
+                        if(isTeam == null){
+                            isTeam = 0;
+                        }else if(isTeam == 1) {
+                            isTeam = null;
+                        }
                         list.add("劳务分包");
                         break;
                     case "劳务队伍":
-                        if(isTeam == null)  isTeam = 1;
+                        if(isTeam == null) {
+                            isTeam = 1;
+                        }else if(isTeam == 0) {
+                            isTeam = null;
+                        }
                         list.add("劳务分包");
                         break;
                     default:

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DSubcontractMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.cscec.mapper.DSubcontractMapper">
+
+    <select id="selectEnterpriseCountByCustomerId" resultType="java.lang.Integer">
+        select count(num) from (
+            select count(sign_org_id) num from d_subcontract where customer_id = #{customerId} group by sign_org_id
+        ) a
+
+    </select>
+
+    <select id="selectProjectCountByCustomerId" resultType="java.lang.Integer">
+         select count(num) from (
+            select count(project_id) num from d_subcontract where customer_id = #{customerId} group by project_id
+        ) a
+    </select>
+
+</mapper>
\ No newline at end of file

dsk-operate-ui/src/views/supplier/supplierlist/access.vue

@@ -293,6 +293,11 @@
                     {{scope.row.legalPerson||"--"}}
                   </template>
                 </el-table-column>
+                <el-table-column label="备注说明" :resizable="false">
+                  <template slot-scope="scope">
+                    {{scope.row.legalPerson||"--"}}
+                  </template>
+                </el-table-column>
                 <el-table-column label="考察项目" :resizable="false">
                   <template slot-scope="scope">
                     {{scope.row.legalPerson||"--"}}

dsk-operate-ui/src/views/supplier/supplierlist/disposal.vue

 <template>
-  <!--供应商考评-->
+  <!--供应商处置-->
   <div class="supplier">
     <div class="search-supplier">
       <div class="title_wrap i">
         <div class="enterprise_title">
-          供应商考评
+          供应商处置
         </div>
       </div>
     </div>

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontracting.vue

@@ -13,9 +13,8 @@
               <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
             </el-form-item>
             <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="注册城市">
@@ -27,15 +26,13 @@
           </el-row>
           <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="资质等级">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="专业类别">
@@ -47,21 +44,18 @@
           </el-row>
           <el-row>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
           </el-row>
@@ -272,6 +266,7 @@
   import skeleton from '@/views/project/projectList/component/skeleton';
   import api from '@/api/enterpriseData/enterpriseData.js';
   import dataRegion from '@/assets/json/provinceTree'
+  import { getDicts } from "@/api/system/dict/data";
   export default {
     name: 'laborSubcontracting',
     components:{skeleton},
@@ -280,6 +275,12 @@
         encodeStr,
         formdata:{},
         addressList:[],
+        arealist:[],
+        creditlevel:[],
+        customstate:[],
+        credential:[],
+        paytaxtype:[],
+        taxrate:[],
         provienceprops:{
           checkStrictly:true,
           multiple:true,
@@ -496,9 +497,36 @@
       }
     },
     created() {
-      this.dataRegion()
+      this.init()
     },
     methods:{
+      init(){
+        //地区
+        getDicts('arealist').then(res=>{
+          this.arealist = res.data
+        })
+        //评价等级
+        getDicts('credit_level').then(res=>{
+          this.creditlevel = res.data
+        })
+        //供应商状态
+        getDicts('custom_state').then(res=>{
+          this.customstate = res.data
+        })
+        //纳税人身份
+        getDicts('paytaxtype').then(res=>{
+          this.paytaxtype = res.data
+        })
+        //纳税人税率
+        getDicts('taxrate').then(res=>{
+          this.taxrate = res.data
+        })
+        //资质等级
+        getDicts('credential').then(res=>{
+          this.credential = res.data
+        })
+        this.dataRegion()
+      },
       handleCurrentChange(){
 
       },

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontractingTeam.vue

@@ -13,15 +13,11 @@
               <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
             </el-form-item>
             <el-form-item label="劳务队长">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
+              <el-input v-model="formdata.user" placeholder="请输入劳务队长"></el-input>
             </el-form-item>
             <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
           </el-row>
@@ -33,15 +29,13 @@
                 :props="provienceprops"></el-cascader>
             </el-form-item>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="资质等级">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
           </el-row>
@@ -53,23 +47,20 @@
               </el-select>
             </el-form-item>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
           </el-row>
           <el-row>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="准入时间">
@@ -188,7 +179,14 @@
           </el-table-column>
           <el-table-column label="主项资质" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              <!--没有值直接展示空-->
+              --
+            </template>
+          </el-table-column>
+          <el-table-column label="劳务资质" min-width="85" :resizable="false">
+            <template slot-scope="scope">
+              <!--没有值直接展示空-->
+              --
             </template>
           </el-table-column>
           <el-table-column label="施工队长" min-width="85" :resizable="false">
@@ -305,6 +303,7 @@
   import skeleton from '@/views/project/projectList/component/skeleton';
   import api from '@/api/enterpriseData/enterpriseData.js';
   import dataRegion from '@/assets/json/provinceTree'
+  import { getDicts } from "@/api/system/dict/data";
   export default {
     name: 'laborSubcontractingTeam',
     components:{skeleton},
@@ -312,6 +311,12 @@
       return{
         encodeStr,
         addressList:[],
+        arealist:[],
+        creditlevel:[],
+        customstate:[],
+        credential:[],
+        paytaxtype:[],
+        taxrate:[],
         provienceprops:{
           checkStrictly:true,
           multiple:true,
@@ -529,9 +534,36 @@
       }
     },
     created() {
-      this.dataRegion()
+      this.init()
     },
     methods:{
+      init(){
+        //地区
+        getDicts('arealist').then(res=>{
+          this.arealist = res.data
+        })
+        //评价等级
+        getDicts('credit_level').then(res=>{
+          this.creditlevel = res.data
+        })
+        //供应商状态
+        getDicts('custom_state').then(res=>{
+          this.customstate = res.data
+        })
+        //纳税人身份
+        getDicts('paytaxtype').then(res=>{
+          this.paytaxtype = res.data
+        })
+        //纳税人税率
+        getDicts('taxrate').then(res=>{
+          this.taxrate = res.data
+        })
+        //资质等级
+        getDicts('credential').then(res=>{
+          this.credential = res.data
+        })
+        this.dataRegion()
+      },
       //地区
       async dataRegion() {
         let addrs = JSON.parse(JSON.stringify(dataRegion))

dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue

@@ -10,32 +10,29 @@
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
             <el-form-item label="分供方名称">
-              <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
+              <el-input v-model="formdata.user" placeholder="请输入分供方名称" clearable></el-input>
             </el-form-item>
             <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="注册城市">
               <el-cascader
                 v-model="formdata.user"
-                :options="addressList" :collapse-tags="true"
+                :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
           </el-row>
           <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="准入时间">
@@ -52,15 +49,13 @@
           <el-divider></el-divider>
           <el-row>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
           </el-row>
@@ -304,6 +299,7 @@
   import skeleton from '@/views/project/projectList/component/skeleton';
   import api from '@/api/enterpriseData/enterpriseData.js';
   import dataRegion from '@/assets/json/provinceTree'
+  import { getDicts } from "@/api/system/dict/data";
   export default {
     name: 'ledger',
     components:{skeleton},
@@ -311,6 +307,11 @@
       return{
         encodeStr,
         addressList:[],
+        arealist:[],
+        creditlevel:[],
+        customstate:[],
+        paytaxtype:[],
+        taxrate:[],
         provienceprops:{
           checkStrictly:true,
           multiple:true,
@@ -549,9 +550,32 @@
       }
     },
     created() {
-      this.dataRegion()
+      this.init()
     },
     methods:{
+      init(){
+        //地区
+        getDicts('arealist').then(res=>{
+          this.arealist = res.data
+        })
+        //评价等级
+        getDicts('credit_level').then(res=>{
+          this.creditlevel = res.data
+        })
+        //供应商状态
+        getDicts('custom_state').then(res=>{
+          this.customstate = res.data
+        })
+        //纳税人身份
+        getDicts('paytaxtype').then(res=>{
+          this.paytaxtype = res.data
+        })
+        //纳税人税率
+        getDicts('taxrate').then(res=>{
+          this.taxrate = res.data
+        })
+        this.dataRegion()
+      },
       //地区
       async dataRegion() {
         let addrs = JSON.parse(JSON.stringify(dataRegion))

dsk-operate-ui/src/views/supplier/supplierlist/professionalSubcontracting.vue

@@ -13,9 +13,8 @@
               <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
             </el-form-item>
             <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="注册城市">
@@ -27,15 +26,13 @@
           </el-row>
           <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="资质等级">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="专业类别">
@@ -47,21 +44,18 @@
           </el-row>
           <el-row>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
           </el-row>
@@ -272,6 +266,7 @@
   import skeleton from '@/views/project/projectList/component/skeleton';
   import api from '@/api/enterpriseData/enterpriseData.js';
   import dataRegion from '@/assets/json/provinceTree'
+  import { getDicts } from "@/api/system/dict/data";
   export default {
     name: 'professionalSubcontracting',
     components:{skeleton},
@@ -279,6 +274,12 @@
       return{
         encodeStr,
         addressList:[],
+        arealist:[],
+        creditlevel:[],
+        customstate:[],
+        credential:[],
+        paytaxtype:[],
+        taxrate:[],
         provienceprops:{
           checkStrictly:true,
           multiple:true,
@@ -496,9 +497,36 @@
       }
     },
     created() {
-      this.dataRegion()
+      this.init()
     },
     methods:{
+      init(){
+        //地区
+        getDicts('arealist').then(res=>{
+          this.arealist = res.data
+        })
+        //评价等级
+        getDicts('credit_level').then(res=>{
+          this.creditlevel = res.data
+        })
+        //供应商状态
+        getDicts('custom_state').then(res=>{
+          this.customstate = res.data
+        })
+        //纳税人身份
+        getDicts('paytaxtype').then(res=>{
+          this.paytaxtype = res.data
+        })
+        //纳税人税率
+        getDicts('taxrate').then(res=>{
+          this.taxrate = res.data
+        })
+        //资质等级
+        getDicts('credential').then(res=>{
+          this.credential = res.data
+        })
+        this.dataRegion()
+      },
       //地区
       async dataRegion() {
         let addrs = JSON.parse(JSON.stringify(dataRegion))

dsk-operate-ui/src/views/supplier/supplierlist/rentalServices.vue

@@ -14,9 +14,8 @@
               <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
             </el-form-item>
             <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="注册城市">
@@ -28,15 +27,13 @@
           </el-row>
           <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="资质等级">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="物资类别">
@@ -48,21 +45,18 @@
           </el-row>
           <el-row>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
           </el-row>
@@ -268,6 +262,7 @@
   import skeleton from '@/views/project/projectList/component/skeleton';
   import api from '@/api/enterpriseData/enterpriseData.js';
   import dataRegion from '@/assets/json/provinceTree'
+  import { getDicts } from "@/api/system/dict/data";
   export default {
     name: 'rentalServices',
     components:{skeleton},
@@ -275,6 +270,12 @@
       return{
         encodeStr,
         addressList:[],
+        arealist:[],
+        creditlevel:[],
+        customstate:[],
+        credential:[],
+        paytaxtype:[],
+        taxrate:[],
         provienceprops:{
           checkStrictly:true,
           multiple:true,
@@ -492,9 +493,36 @@
       }
     },
     created() {
-      this.dataRegion()
+      this.init()
     },
     methods:{
+      init(){
+        //地区
+        getDicts('arealist').then(res=>{
+          this.arealist = res.data
+        })
+        //评价等级
+        getDicts('credit_level').then(res=>{
+          this.creditlevel = res.data
+        })
+        //供应商状态
+        getDicts('custom_state').then(res=>{
+          this.customstate = res.data
+        })
+        //纳税人身份
+        getDicts('paytaxtype').then(res=>{
+          this.paytaxtype = res.data
+        })
+        //纳税人税率
+        getDicts('taxrate').then(res=>{
+          this.taxrate = res.data
+        })
+        //资质等级
+        getDicts('credential').then(res=>{
+          this.credential = res.data
+        })
+        this.dataRegion()
+      },
       //地区
       async dataRegion() {
         let addrs = JSON.parse(JSON.stringify(dataRegion))

dsk-operate-ui/src/views/supplier/supplierlist/supplySubcontracting.vue

@@ -13,9 +13,8 @@
               <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
             </el-form-item>
             <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="注册城市">
@@ -27,15 +26,13 @@
           </el-row>
           <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="资质等级">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="物资类别">
@@ -47,21 +44,18 @@
           </el-row>
           <el-row>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
           </el-row>
@@ -267,6 +261,7 @@
   import skeleton from '@/views/project/projectList/component/skeleton';
   import api from '@/api/enterpriseData/enterpriseData.js';
   import dataRegion from '@/assets/json/provinceTree'
+  import { getDicts } from "@/api/system/dict/data";
   export default {
     name: 'supplySubcontracting',
     components:{skeleton},
@@ -274,6 +269,12 @@
       return{
         encodeStr,
         addressList:[],
+        arealist:[],
+        creditlevel:[],
+        customstate:[],
+        credential:[],
+        paytaxtype:[],
+        taxrate:[],
         provienceprops:{
           checkStrictly:true,
           multiple:true,
@@ -491,9 +492,36 @@
       }
     },
     created() {
-      this.dataRegion()
+      this.init()
     },
     methods:{
+      init(){
+        //地区
+        getDicts('arealist').then(res=>{
+          this.arealist = res.data
+        })
+        //评价等级
+        getDicts('credit_level').then(res=>{
+          this.creditlevel = res.data
+        })
+        //供应商状态
+        getDicts('custom_state').then(res=>{
+          this.customstate = res.data
+        })
+        //纳税人身份
+        getDicts('paytaxtype').then(res=>{
+          this.paytaxtype = res.data
+        })
+        //纳税人税率
+        getDicts('taxrate').then(res=>{
+          this.taxrate = res.data
+        })
+        //资质等级
+        getDicts('credential').then(res=>{
+          this.credential = res.data
+        })
+        this.dataRegion()
+      },
       //地区
       async dataRegion() {
         let addrs = JSON.parse(JSON.stringify(dataRegion))