往来账款查询条件修改，企业信息优化

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

@@ -9,9 +9,60 @@
             <column-setting :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId" style="margin-left:5px"></column-setting>
          </div>
          <hr  style="margin-top: 16px;">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
+      <el-form-item prop="value">
+         <el-select v-model="queryParams.value" placeholder="请选择" clearable v-if="companyType !='00'" @change="change">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+        <el-select v-model="queryParams.value" placeholder="请选择" clearable v-if="companyType =='00'" @change="change">
+          <el-option
+            v-for="item in optionsPlus"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="queryValue" v-if="queryParams.value !='02'">
+        <el-input
+          v-model="queryParams.queryValue"
+          placeholder="请输入关键字模糊查询"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+          maxlength="30"
+        />
+      </el-form-item>
+      <el-form-item prop="queryValue" v-if="queryParams.value =='02'">
+         <el-select v-model="queryParams.queryValue" placeholder="请选择账款类型" clearable>
+          <el-option
+            v-for="item in newOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="预计还款日" prop="expireDate">
+        <el-date-picker 
+          clearable 
+          unlink-panels 
+          v-model="queryParams.expireDate" 
+          value-format="yyyy-MM-dd" 
+          format="yyyy-MM-dd" 
+          type="daterange" 
+          range-separator="-" 
+          start-placeholder="开始日期" 
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
   
-      <el-form-item label="账款编号" prop="zbiNumber">
+      <!-- <el-form-item label="账款编号" prop="zbiNumber">
         <el-input
           v-model="queryParams.zbiNumber"
           placeholder="请输入账款编号"
@@ -83,7 +134,7 @@
                   :value="dict.dictValue"
                 ></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
   
 
     </el-form>
@@ -172,6 +223,7 @@
 <script>
 import { listBill, deleteBill } from "@/api/service/bill/bill";
 import { getOwnCompany } from "@/api/common/company";
+import { getUserProfile } from "@/api/system/user";
 import {columnQuery,columnfilter} from "@/api/common/columnSetting";
 import ColumnSetting from '../../../components/Table/columnSetting.vue';
 import Cookies from 'js-cookie'
@@ -182,12 +234,51 @@ export default {
   },
   data() {
     return {
+      options: [{
+          value: '00',
+          label: '按账款名称查询'
+        }, {
+          value: '01',
+          label: '按账款编号查询'
+        }, {
+          value: '02',
+          label: '按账款类型查询'
+        }, {
+          value: '03',
+          label: '按应收企业名称查询'
+        }, {
+          value: '04',
+          label: '按应付企业名称查询'
+      }],
+      optionsPlus: [{
+          value: '00',
+          label: '按账款名称查询'
+        }, {
+          value: '01',
+          label: '按账款编号查询'
+        }, {
+          value: '03',
+          label: '按应收企业名称查询'
+        }, {
+          value: '04',
+          label: '按应付企业名称查询'
+      }],
+      newOptions: [{
+          value: '00',
+          label: '应收账款'
+        }, {
+          value: '01',
+          label: '应付账款'
+      }],
+      value:null,
       // 遮罩层
       loading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
       total: 0,
+      //企业类型
+      companyType:null,
       // 资料目录表格数据
       billList: [],
       //账款类型
@@ -198,12 +289,16 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        zbiNumber: null,
-        zbiName: null,
-        zbiType: null,
-        payeeName: null,
-        payerName: null,
-        zbiStatus:null
+        // zbiNumber: null,
+        // zbiName: null,
+        // zbiType: null,
+        // payeeName: null,
+        // payerName: null,
+        // zbiStatus:null,
+        value:null,
+        // queryType:null,
+        queryValue:null,
+        expireDate:null,
       },
       company:{},
       //筛选按钮的数据列表，与table表头的数据一致 --显示隐藏列用
@@ -256,6 +351,14 @@ export default {
     };
   },
   created() {
+      getUserProfile().then((response) =>{
+        this.companyType = response.data.companyType
+        if("00" == response.data.companyType){
+          this.queryParams.value = "01"
+        }else if("01" == response.data.companyType){
+          this.queryParams.value = "03"
+        }
+      });
       getOwnCompany().then((response) => {
         this.company = response.data;
       });
@@ -320,6 +423,9 @@ export default {
     statusFormat(row, column) {
       return this.selectDictLabel(this.statusOptions, row.zbiStatus);
     },
+    change(){
+      this.queryParams.queryValue = null
+    },
     // 表单重置
     reset() {
       this.form = {

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

@@ -142,7 +142,9 @@
             </el-row>
             <el-row>
                 <el-col :span="12" style="margin-top:2%;margin-left:2%;line-height: 34px; text-align:left;">
-                   CFCA授权编号:<span v-if="scyCfcaAuthNumber">{{scyCfcaAuthNumber}}</span><button v-else @click="openWindows">开炮</button>
+                   CFCA授权编号:<span v-if="scyCfcaAuthNumber">{{scyCfcaAuthNumber}}</span>
+                   <label v-else text="abcdef" id="lab1" style="color:blue" @click="openWindows">激活</label>
+                   <span v-else @click="openWindows">激活</span>
                 </el-col>
                 <!-- <el-upload v-if="commitmentShow" ref="upload" class="upload-demo" action="" 
                 :on-preview="handleFilePreview" multiple :file-list="commitmentFileList" :auto-upload="false">
@@ -540,6 +542,7 @@ export default {
         send(){
             //发送
             sendMessage().then((response) => {
+                debugger
                 if(response.data){
                     //手机号
                     var newIphone = response.data.newIphone;
@@ -609,6 +612,11 @@ export default {
             this.messageIsShow = false;
             this.resetMessage();
         },
+        resetUpdate() {
+        this.messShow = true;
+        clearInterval(this.auth_timer);
+        this.timer = 60;
+        },
         resetMessage() {
             this.messageForm = {
                 validCode:""