修改

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -148,20 +148,20 @@
               <div class="renling">
                 <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="list-titel-a"
                   v-html="scope.row.companyName"></router-link>
-                <div class="renling-btn" @click="claimbtn(scope.row)">
-                  <p v-if="scope.row.claimStatus==0" class="renling-img-true">
+                <!--<div class="renling-btn" @click="claimbtn(scope.row)">-->
+                  <!--<p v-if="scope.row.claimStatus==0" class="renling-img-true">-->
 
-                  </p>
-                  <p v-else class="renling-img-false">
+                  <!--</p>-->
+                  <!--<p v-else class="renling-img-false">-->
 
-                  </p>
-                  <!--<span v-if="scope.row.claimStatus==0" @click="cancelClaim(scope.row.companyName,scope.$index)" class="renling-hui">-->
-                    <!--已认领-->
-                  <!--</span>-->
-                  <!--<span v-else class="renling-hei">-->
-                    <!--认领-->
-                  <!--</span>-->
-                </div>
+                  <!--</p>-->
+                  <!--&lt;!&ndash;<span v-if="scope.row.claimStatus==0" @click="cancelClaim(scope.row.companyName,scope.$index)" class="renling-hui">&ndash;&gt;-->
+                    <!--&lt;!&ndash;已认领&ndash;&gt;-->
+                  <!--&lt;!&ndash;</span>&ndash;&gt;-->
+                  <!--&lt;!&ndash;<span v-else class="renling-hei">&ndash;&gt;-->
+                    <!--&lt;!&ndash;认领&ndash;&gt;-->
+                  <!--&lt;!&ndash;</span>&ndash;&gt;-->
+                <!--</div>-->
               </div>
 
             </template>

dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue

@@ -214,6 +214,17 @@
               </el-option>
             </el-select>
           </div>
+          <div class="select-popper">
+            <div class=" " :class="(companyXzText.length>0&&companyXzText[0]!='不限')?'select-active':''">
+              企业性质{{(companyXzText.length>0&&companyXzText[0]!='不限')>0?(companyXzText.length+'项'):''}}
+              <i class="el-icon-caret-bottom"></i>
+            </div>
+            <el-select v-model="companyXzText" popper-class='select-multiple-pop' class="select-multiple" style="min-width: 110px;" @change="companyXzbtn" multiple
+              placeholder="请选择">
+              <el-option v-for=" (itme,i)  in companyXzList" :key="i" :label="itme.value" :value="itme.label">
+              </el-option>
+            </el-select>
+          </div>
           <div class="select-popper">
             <div class=" " :class="(companyTypeText.length>0&&companyTypeText[0]!='不限')?'select-active':''">
               企业类型{{(companyTypeText.length>0&&companyTypeText[0]!='不限')>0?(companyTypeText.length+'项'):''}}
@@ -854,6 +865,29 @@ export default {
       },
       ],
       aTaxYeartext: ['不限'],
+      companyXzText: ['不限'],
+      companyXzList: [
+        {
+        label: '',
+        value: '不限'
+      },
+      {
+        label: '5.1.1.',
+        value: '央企'
+      },
+      {
+        label: '5.1.2.',
+        value: '央企子公司'
+      },
+      {
+        label: '5.2.1.,5.2.2.',
+        value: '国有企业'
+      },
+      {
+        label: '5.8.',
+        value: '民营企业'
+      },
+      ],
       companyTypeList: [
         {
         label: '不限',
@@ -2111,6 +2145,52 @@ export default {
       this.aptitudelist.push(data);
 
 
+    },
+    companyXzbtn(){
+      for (let i = 0; i < this.aptitudelist.length; i++) {
+        if (this.aptitudelist[i].keyid == 'tagCode') {
+          this.aptitudelist.splice(i, 1);
+          i--;
+        }
+      }
+      if (this.companyXzText.length > 0 && this.companyXzText[0] == '不限') {
+        for (let i = 0; i < this.companyXzText.length; i++) {
+          if (this.companyXzText[i] == '不限') {
+            this.companyXzText.splice(i, 1);
+          }
+        }
+      } else if (this.companyXzText.length == 0) {
+        this.companyXzText = ['不限'];
+      }
+
+      var n = -1;
+      for (let i = 0; i < this.companyXzText.length; i++) {
+        if (this.companyXzText[i] == '不限') {
+          n = i;
+        }
+      }
+
+      if (n != -1) {
+        this.companyXzText = ['不限'];
+        return;
+      }
+
+      var arr = [];
+      for (let i = 0; i < this.companyXzText.length; i++) {
+        for (let j = 0; j < this.companyXzList.length; j++) {
+          if (this.companyXzText[i] == this.companyXzList[j].label) {
+            arr.push(this.companyXzList[j].value);
+          }
+        }
+      }
+      var data = {
+        value: arr,
+        keyid: 'tagCode',
+        key: this.companyXzText,
+        title: '企业性质:'
+      };
+
+      this.aptitudelist.push(data);
     },
     companyTypebtn() {
       for (let i = 0; i < this.aptitudelist.length; i++) {
@@ -2608,6 +2688,9 @@ export default {
         case 'taxYear':
           this.aTaxYeartext = ['不限'];
           break;
+        case 'tagCode':
+          this.companyXzText = ['不限'];
+          break;
         case 'companyType':
           this.companyTypeText = ['不限'];
           break;
@@ -2826,9 +2909,10 @@ export default {
 
           } else if (this.aptitudelist[i].keyid == "taxYear") {
             data.aptitudeQueryDto['taxYear'] = this.aptitudelist[i].key.join(',');
+          } else if (this.aptitudelist[i].keyid == "tagCode") {
+            data.aptitudeQueryDto['tagCode'] = this.aptitudelist[i].key.join(',');
           } else if (this.aptitudelist[i].keyid == "companyType") {
             data.aptitudeQueryDto['companyType'] = this.aptitudelist[i].key.join(',');
-
           } else if (this.aptitudelist[i].keyid == "businessStatus") {
             data.aptitudeQueryDto['businessStatus'] = this.aptitudelist[i].key.join(',');
           } else if (this.aptitudelist[i].keyid == "establish") {