费用查询条件修改

front-vue/src/api/service/company/company.js

@@ -97,4 +97,14 @@ export function companyToCore(scyId) {
     url: '/sc-service/company/companyToCore?scyId='+scyId,
     method: 'GET'
   })
+}
+
+// 根据手机号获取用户姓名
+export function selectNormalUser(userName) {
+  const query = {userName : userName}
+  return request({
+    url: '/sc-service/company/selectNormalUser',
+    method: 'get',
+    params: query
+  })
 }

front-vue/src/views/service/company/coreCompanyManage.vue

@@ -195,7 +195,7 @@
 
 <script>
 import { listCompany, companyQuery, addCompany, updateCompany, 
-updateCompanyStatus, getElementStatus, removeCompany } 
+updateCompanyStatus, getElementStatus, removeCompany, selectNormalUser } 
 from "@/api/service/company/company";
 import { uploadFileNew } from "@/api/common/file";
 import { getToken } from "@/utils/auth";
@@ -328,6 +328,9 @@ export default {
       },
     };
   },
+  watch:{
+    // 'form.userName':'getLoginName'
+  },
   activated(){
     this.getList();
     this.getDicts("ser_scy_status").then(response => {
@@ -341,6 +344,19 @@ export default {
     this.columnQuery();
   },
   methods: {
+    getLoginName(item){
+      const userName = item;
+      selectNormalUser(userName).then((response) => {
+        console.log(response,"根据手机号获取用户姓名")
+        if(response.data.length > 0){
+          this.$set(this.form, "nickName", response.data[0].nickName);
+          this.isName = true;
+        }else{
+          this.$set(this.form, "nickName", '');
+          this.isName = false;
+        }
+      });
+    },
     //获取当前客户是否之前设置过列展示隐藏
     columnQuery(){
         //获取页面路径
@@ -505,11 +521,6 @@ export default {
           this.msgSuccess("冻结成功");
         })
         .catch(() => {
-          this.$message({
-            type: "warning",
-            message: "已取消冻结",
-           
-          });
         }); 
     },
 

front-vue/src/views/service/cost/costManage.vue

@@ -22,6 +22,26 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="开立企业" prop="coreScyName">
+        <el-input
+          maxlength="30"
+          v-model="queryParams.coreScyName"
+          placeholder="请输入开立企业名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="融资企业" prop="supScyName">
+        <el-input
+          maxlength="30"
+          v-model="queryParams.supScyName"
+          placeholder="请输入融资企业名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="融资状态" prop="zfrStatus">
             <el-select v-model="queryParams.zfrStatus"
                 placeholder="融资状态"
@@ -158,7 +178,27 @@
           @keyup.enter.native="handleInvoiceQuery"
         />
       </el-form-item>
-      <el-form-item label="融资状态" prop="zfrStatus">
+      <el-form-item label="开立企业" prop="coreScyName">
+        <el-input
+          maxlength="30"
+          v-model="invoiceParams.coreScyName"
+          placeholder="请输入开立企业名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleInvoiceQuery"
+        />
+      </el-form-item>
+      <el-form-item label="融资企业" prop="supScyName">
+        <el-input
+          maxlength="30"
+          v-model="invoiceParams.supScyName"
+          placeholder="请输入融资企业名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleInvoiceQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="融资状态" prop="zfrStatus">
           <el-select v-model="invoiceParams.zfrStatus"
               placeholder="融资状态"
               clearable
@@ -171,8 +211,8 @@
                   :value="dict.dictValue"
                   ></el-option>
           </el-select>
-      </el-form-item>
-      <el-form-item label="费用状态" prop="zciStatus">
+      </el-form-item> -->
+      <!-- <el-form-item label="费用状态" prop="zciStatus">
           <el-select v-model="invoiceParams.zciStatus"
               placeholder="费用状态"
               clearable
@@ -185,7 +225,7 @@
                   :value="dict.dictValue"
                   ></el-option>
           </el-select>
-      </el-form-item>
+      </el-form-item> -->
         <!-- <el-form-item label="发票状态" prop="zciInvoiceStatus">
             <el-select v-model="invoiceParams.zciInvoiceStatus"
                 placeholder="发票状态"
@@ -241,7 +281,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
         <template slot-scope="scope">
           <el-button
-            v-if="scope.row.zciInvoiceStatus == '1'"
+            v-if="scope.row.zciInvoiceStatus == '1' && scope.row.zciStatus == '02' && scope.row.zfrStatus == '01' "
             size="mini"
             type="text"
             @click="handleInvoiceOpen(scope.row)"
@@ -409,6 +449,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         zfrNumber: null,
+        coreScyName: null,
+        supScyName: null,
         zciStatus: null,
         zfrStatus:null,
         zciInvoiceStatus: null
@@ -417,6 +459,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         zfrNumber: null,
+        supScyName: null,
+        coreScyName: null,
         zciStatus: null,
         zfrStatus:null,
         zciInvoiceStatus: null
@@ -517,7 +561,7 @@ export default {
       },
     };
   },
-  created() {
+  activated() {
     this.getDicts("ser_zci_status").then(response => {
       this.zciStatusOptions = response.data;
     });

front-vue/src/views/service/cost/userCostManage.vue

@@ -21,6 +21,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="开立企业" prop="coreScyName">
+        <el-input
+          maxlength="30"
+          v-model="queryParams.coreScyName"
+          placeholder="请输入开立企业名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="融资状态" prop="zfrStatus">
             <el-select v-model="queryParams.zfrStatus"
                 placeholder="融资状态"
@@ -116,7 +126,7 @@
             v-hasPermi="['service:cost:pay']"
           >去缴费</el-button>
           <el-button
-            v-if="scope.row.zciStatus == '02' && scope.row.zfrStatus == '01'"
+            v-if="scope.row.zciStatus == '02' && (scope.row.zfrStatus == '01' || scope.row.zfrStatus == '03') && scope.row.zciInvoiceStatus == '0'"
             size="mini"
             type="text"
             @click="handleApply(scope.row)"
@@ -244,6 +254,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         zfrNumber: null,
+        coreScyName: null,
         zciStatus: null,
         zfrStatus:null,
         zciInvoiceStatus: null
@@ -353,8 +364,8 @@ export default {
     this.getDicts("	ser_zfr_status").then(response => {
       this.zfrStatusOptions = response.data;
     });
-    this.getList();
     this.getUser();
+    this.getList();
   },
   activated() {
     this.getDicts("ser_zci_status").then(response => {
@@ -366,8 +377,8 @@ export default {
     this.getDicts("	ser_zfr_status").then(response => {
       this.zfrStatusOptions = response.data;
     });
-    this.getList();
     this.getUser();
+    this.getList();
   },
   mounted() {
     this.columnQuery();