我的链属类型查询

front-vue/src/views/service/creditLine/creditLine.vue

@@ -29,25 +29,25 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="类型" prop="zfpcrQuery" size="large">
-                <el-select v-model="queryParams.zfpcrQuery" clearable>
-                    <el-option
-                    v-for="dict in queryTypesOptions"
-                    :key="dict.dictValue"
-                    :label="dict.dictLabel"
-                    :value="dict.dictValue"
-                    v-if="dict.dictValue == '02' && companyType  == '00'"
-                    />
-                    <el-option
-                    v-for="dict in queryTypesOptions"
-                    :key="dict.dictValue"
-                    :label="dict.dictLabel"
-                    :value="dict.dictValue"
-                    v-if="dict.dictValue != '02'"
-                    />
-                </el-select>
+                    <el-select v-model="queryParams.zfpcrQuery" clearable>
+                        <el-option
+                        v-for="dict in queryTypesOptions"
+                        :key="dict.dictValue"
+                        :label="dict.dictLabel"
+                        :value="dict.dictValue"
+                        v-if="dict.dictValue == '02' && companyType  == '00'"
+                        />
+                        <el-option
+                        v-for="dict in queryTypesOptions"
+                        :key="dict.dictValue"
+                        :label="dict.dictLabel"
+                        :value="dict.dictValue"
+                        v-if="dict.dictValue != '02'"
+                        />
+                    </el-select>
                 </el-form-item>
                 <el-form-item prop="zfpcrValue" v-if="this.queryParams.zfpcrQuery"  size="large">
-                <el-input v-model="queryParams.zfpcrValue" placeholder="请输入关键字模糊查询" clearable maxlength="25"/>
+                    <el-input v-model="queryParams.zfpcrValue" placeholder="请输入关键字模糊查询" clearable maxlength="25"/>
                 </el-form-item>
                 <el-form-item label="授信状态" prop="zfpcrStatus" size="large">
                     <el-select v-model="queryParams.zfpcrStatus" placeholder="请选择状态" clearable>

front-vue/src/views/service/rel/companyRel.vue

@@ -22,7 +22,7 @@
         v-show="showSearch"
         label-width="auto"
       >
-        <el-form-item label="企业名称" prop="companyName" size="large">
+        <!-- <el-form-item label="企业名称" prop="companyName" size="large">
           <el-input
             maxlength="30"
             v-model="queryParams.companyName"
@@ -39,7 +39,20 @@
             clearable
             @keyup.enter.native="handleQuery"
           />
-        </el-form-item>
+        </el-form-item> -->
+        <el-form-item label="类型" prop="scrQuery" size="large">
+          <el-select v-model="queryParams.scrQuery" clearable>
+            <el-option
+            v-for="dict in queryOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+            />
+          </el-select>
+      </el-form-item>
+      <el-form-item prop="scrValue" v-if="this.queryParams.scrQuery"  size="large">
+        <el-input v-model="queryParams.scrValue" placeholder="请输入关键字模糊查询" clearable maxlength="25"/>
+      </el-form-item>
         <el-form-item label="链属状态" prop="scrStatus" size="large">
           <el-select v-model="queryParams.scrStatus" placeholder="链属状态" clearable>
             <el-option
@@ -612,6 +625,8 @@ export default {
       scrStatusOptions: [],
       scrTypeOptions: [],
       scpStatusOptions: [],
+      //筛选条件数据字典
+      queryOptions: [],
       listCom: [],
       comlist: [],
       // 弹出层标题
@@ -646,7 +661,9 @@ export default {
         scySocialCode: null,
         scrStatus: null,
         scrType: null,
-        scpStatus: null
+        scpStatus: null,
+        scrQuery: null,
+        scrValue: null,
       },
       //未认证列表查询参数
       spareParams: {
@@ -789,7 +806,12 @@ export default {
     this.getDicts("sys_scp_status").then(response => {
       this.scpStatusOptions = response.data;
     });
-    this.getUser();
+    this.getDicts("sys_scr_query").then(response => {
+      this.queryOptions = response.data;
+    });
+    this.getUser().then(() => {
+      this.queryParams.scrQuery = "00";
+    });
     this.getSpare();
     this.getCompanyList();
   },
@@ -1389,7 +1411,7 @@ export default {
 
     //获取操作员Id
     getUser() {
-      getUser().then(response => {
+      return getUser().then(response => {
         this.userId = response.data.userId;
         this.scyTypeNow = response.data.scyType;
         this.companyId = response.data.companyId;
@@ -1398,7 +1420,11 @@ export default {
         } else {
           this.handleRel = false;
         }
+        return Promise.resolve(response);
         this.getList();
+      }).catch(response => {
+        this.loading = false;
+        return Promise.reject("error");
       });
     }
   }