Ver Fonte

Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

@dongkboy há 2 anos atrás
pai
commit
3c83f89e55

+ 1 - 1
src/config/global.js

@@ -21,7 +21,7 @@ export const baseUrl = 'http://192.168.0.115:8080'
 // export const h5BaseUrl = 'http://39.98.239.48/h5'  //h5测试
 
 // export const baseUrl = 'http://sxzgkj.baoxianzhanggui.com/web-api' //正式服务器
-export const h5BaseUrl = 'http://sxzgkj.baoxianzhanggui.com/h5'  //h5正式
+export const h5BaseUrl = 'https://sxzgkj.baoxianzhanggui.com/h5'  //h5正式
 // export const h5BaseUrl = 'http://39.98.239.48/h5'  //h5正式
 
 //保险公司名称

+ 55 - 1
src/http/moudules/expense.js

@@ -54,7 +54,7 @@ export const getAccountByAccountName = () => {
 
 /**
  * 
- * 费用申请
+ * 账户卡信息
  * 
  */
 //插入账户卡信息
@@ -65,6 +65,29 @@ export const insertAccountCard = (data) => {
         data
     })
 }
+//修改账户卡信息
+export const updateAccountCard = (data) => {
+    return axios({
+        url: '/invAccount/updateAccountCard',
+        method: "post",
+        data
+    })
+}
+//查询账户卡列表
+export const getAccountCardList = (data) => {
+    return axios({
+        url: '/invAccount/getAccountCardList',
+        method: "post",
+        data
+    })
+}
+//删除账户卡信息
+export const deleteAccountCard = (id) => {
+    return axios({
+        url: '/invAccount/card/'+id,
+        method: "delete",
+    })
+}
 
 
 /**
@@ -197,4 +220,35 @@ export const getAccountOperateDetail = (id) => {
         url: '/accountOperate/getAccountOperateDetail?accountOperateId='+id,
         method: "get"
     })
+}
+
+
+
+/**
+ * 
+ * 开票管理
+ * 
+ */
+//获取开票列表
+export const getInvAccountIncoice = () => {
+    return axios({
+        url: '/invAccountIncoice',
+        method: "get"
+    })
+}
+//新增开票
+export const addInvAccountIncoice = (data) => {
+    return axios({
+        url: '/invAccountIncoice',
+        method: "post",
+        data
+    })
+}
+//修改开票
+export const putInvAccountIncoice = (data) => {
+    return axios({
+        url: '/invAccountIncoice',
+        method: "put",
+        data
+    })
 }

+ 48 - 36
src/views/FinancialManagement/ExpenseManagement/ExpenseApplyFor.vue

@@ -118,10 +118,10 @@
                   placeholder="单位"
                 >
                   <el-option
-                    v-for="item in collectionData"
-                    :key="item.accountId"
+                    v-for="(item,index) in collectionData"
+                    :key="item.accountId+''+index"
                     :label="item.name"
-                    :value="item.accountId"
+                    :value="item.bankCardNum"
                   >
                   </el-option>
                 </el-select>
@@ -182,10 +182,10 @@
                   placeholder=""
                 >
                   <el-option
-                    v-for="item in collectionData"
-                    :key="item.accountId"
+                    v-for="(item,index) in collectionData"
+                    :key="item.accountId+'aa'+index"
                     :label="item.name"
-                    :value="item.accountId"
+                    :value="item.bankCardNum"
                   >
                   </el-option>
                 </el-select>
@@ -202,10 +202,10 @@
                     placeholder=""
                   >
                     <el-option
-                      v-for="item in collectionData"
-                      :key="item.accountId"
+                      v-for="(item,index) in collectionData"
+                      :key="item.accountId+'ac'+index"
                       :label="item.name"
-                      :value="item.accountId"
+                      :value="item.bankCardNum"
                     >
                     </el-option>
                   </el-select>
@@ -217,10 +217,10 @@
                     placeholder=""
                   >
                     <el-option
-                      v-for="item in collectionData"
-                      :key="item.accountId"
+                      v-for="(item,index) in collectionData"
+                      :key="item.accountId+'avb'+index"
                       :label="item.name"
-                      :value="item.accountId"
+                      :value="item.bankCardNum"
                     >
                     </el-option>
                   </el-select>
@@ -243,7 +243,7 @@
                     children: 'child',
                     label: 'category',
                     value: 'category',
-                    checkStrictly:true
+                    checkStrictly: true,
                   }"
                 ></el-cascader>
               </td>
@@ -362,7 +362,7 @@
 <script>
 import ExpenseComponent from "./ExpenseComponent.vue"; //新增账户信息弹框
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
-import {toChies} from '../../../utils/moneyTransition';
+import { toChies } from "../../../utils/moneyTransition";
 export default {
   name: "ExpenseApplyFor",
   components: { KtCommonTable, ExpenseComponent },
@@ -659,11 +659,13 @@ export default {
       this.$api.expense
         .getAccountExcelById(row.excelAccountOperateId)
         .then((res) => {
+          console.log(res)
           if (res.code == 200) {
             this.tableForm = JSON.parse(JSON.stringify(res.data));
             this.tableForm.payMethod = this.tableForm.payMethod.split(",");
-            this.tableForm.collectionMessage = res.data.enterAccountId;
-            this.tableForm.company = res.data.outAccountId;
+            this.tableForm.collectionMessage = res.data.enterCardNum;
+            this.tableForm.company = res.data.outCardNum;
+            this.tableForm.remark = this.use_fundsData.find(item=>item.label==res.data.remark).value
             let obj = this.fundFlowData.find((item) =>
               item.child.find(
                 (chidlItem) => chidlItem.category == this.tableForm.fundUse
@@ -711,7 +713,7 @@ export default {
       this.$api.expense.getAccountExpensesTreeList().then((res) => {
         // res.data.forEach((item) => {
         //   item.child.forEach((childItem) => {
-            
+
         //   });
         // });
         this.fundFlowData = res.data;
@@ -856,31 +858,37 @@ export default {
     },
     //选择收款单位信息事件
     collectionChange(e) {
+      console.log(e)
       if (e.length > 0) {
         let obj = this.collectionData
-          .find((item) => item.accountId == e[0])
-          .children.find((item) => item.accountId == e[1]);
+          .find((item) => item.bankCardNum == e[0])
+          .children.find((item) => item.bankCardNum == e[1]);
       }
     },
     //获取所有账户信息
     getAllUser() {
       this.$api.expense.getAccountByAccountName().then((res) => {
         if (res.code == 200) {
+          let arr = [];
           res.data.forEach((item, index) => {
-            item.name =
-              (item.outerFlag == 0 ? "内部用户" : "外部用户") +
-              "   " +
-              (item.accountQuality == 0 ? "公户" : "私户") +
-              "   " +
-              item.accountName +
-              "   " +
-              item.bankCardNum +
-              "   " +
-              item.bank;
-            item.nameValue =
-              item.accountName + "   " + item.bankCardNum + "   " + item.bank;
+            item.invAccountCardList.forEach((it) => {
+              it.name =
+                (item.outerFlag == 0 ? "内部用户" : "外部用户") +
+                "   " +
+                (it.accountQuality == 0 ? "公户" : "私户") +
+                "   " +
+                item.accountName +
+                "   " +
+                it.bankCardNum +
+                "   " +
+                it.bank;
+              it.nameValue =
+                item.accountName + "   " + it.bankCardNum + "   " + it.bank;
+            });
+            arr.push(...item.invAccountCardList)
           });
-          this.collectionData = res.data;
+          this.collectionData = arr;
+          console.log(this.collectionData)
         }
       });
     },
@@ -936,17 +944,21 @@ export default {
         return;
       }
       params.payMethod = this.toPayment(params.payMethod); //支付方式转换
+      console.log(this.collectionData)
       let companyItem = this.collectionData.find(
-        (item) => item.accountId === params.company
+        (item) => {
+          console.log(params.company, item.bankCardNum)
+         return  item.bankCardNum === params.company
+        }
       );
       let collectionMessageItem = this.collectionData.find(
-        (item) => item.accountId === params.collectionMessage
+        (item) => item.bankCardNum === params.collectionMessage
       );
       params.company = companyItem.nameValue; //单位
-      params.outAccountId = companyItem.accountId; //支出账户id
+      params.outCardNum = companyItem.bankCardNum; //支出账户id
       params.outFlag = collectionMessageItem.outerFlag; //支出账户性质
       params.collectionMessage = collectionMessageItem.nameValue; //收入账户信息
-      params.enterAccountId = collectionMessageItem.accountId; //收入账户id
+      params.enterCardNum = collectionMessageItem.bankCardNum; //收入账户id
       params.fundUse = params.fundUse[params.fundUse.length - 1]; //资金用途
       params.fundFlow = params.company + "→" + params.collectionMessage; //资金流程
       if (this.expendDataId) {

+ 73 - 39
src/views/FinancialManagement/ExpenseManagement/ExpenseComponent.vue

@@ -11,13 +11,13 @@
     >
       <el-form
         :model="formData"
-        :rules="formData.outerFlag == 0 ? interiorRules : externalRules"
+        :rules="type == 1 ? externalRules : interiorRules"
         ref="formData"
         label-width="130px"
         size="small"
         class="frame"
       >
-        <el-row v-if="type==1">
+        <el-row v-if="type == 1">
           <el-col :span="12">
             <el-form-item label="账户类别" prop="outerFlag">
               <el-select
@@ -39,10 +39,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="type==1">
+        <el-row v-if="type == 1 && formData.outerFlag == 0">
           <el-col :span="12">
             <el-form-item label="营业性质" prop="businessQuality">
-              <el-select v-model="formData.businessQuality" placeholder="请选择营业性质">
+              <el-select
+                v-model="formData.businessQuality"
+                placeholder="请选择营业性质"
+              >
                 <el-option label="一般纳税" value="0"></el-option>
                 <el-option label="小规模" value="1"></el-option>
                 <el-option label="个体户" value="2"></el-option>
@@ -50,7 +53,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="成立日期" prop="clrq">
+            <el-form-item label="成立日期" prop="establishTime">
               <el-date-picker
                 v-model="formData.establishTime"
                 type="date"
@@ -61,26 +64,29 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="type==1">
+        <el-row v-if="type == 1 && formData.outerFlag == 0">
           <el-col :span="12">
-            <el-form-item label="所属地" prop="ssd">
+            <el-form-item label="所属地" prop="owned">
               <el-input v-model="formData.owned" autocomplete="off"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="法人" prop="fr">
-              <el-input v-model="formData.juridicalPerson" autocomplete="off"></el-input>
+            <el-form-item label="法人" prop="juridicalPerson">
+              <el-input
+                v-model="formData.juridicalPerson"
+                autocomplete="off"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="type==1">
+        <el-row v-if="type == 1&&formData.outerFlag == 0">
           <el-col :span="12">
-            <el-form-item label="开票员" prop="ssd">
+            <el-form-item label="开票员" prop="biller">
               <el-input v-model="formData.biller" autocomplete="off"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="开票额度" prop="fr">
+            <el-form-item label="开票额度" prop="invoicingAmount">
               <el-input-number
                 v-model="formData.invoicingAmount"
                 :min="0"
@@ -90,7 +96,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formDataId&&type==1">
+        <el-row v-if="formData.outerFlag == 0&&formDataId && type == 1">
           <el-col :span="12">
             <el-form-item label="剩余开票额度" prop="ssd">
               <el-input-number
@@ -102,7 +108,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="type==2">
+        <el-row v-if="type == 2">
           <el-col :span="12">
             <el-form-item label="账户性质" prop="accountQuality">
               <el-select
@@ -127,7 +133,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row  v-if="type==2">
+        <el-row v-if="type == 2">
           <el-col :span="12">
             <el-form-item label="开户行" prop="bank">
               <el-input v-model="formData.bank" autocomplete="off"></el-input>
@@ -142,7 +148,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formData.outerFlag == 0&&type==2">
+        <el-row v-if="formData.outerFlag == 0 && type == 2">
           <el-col :span="12">
             <el-form-item label="开户行号" prop="bankNum">
               <el-input
@@ -167,7 +173,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formData.outerFlag == 0&&type==2">
+        <el-row v-if="formData.outerFlag == 0 && type == 2">
           <el-col :span="12">
             <el-form-item label="结算卡" prop="clearingProfit">
               <el-input-number
@@ -189,7 +195,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formData.outerFlag == 0&&type==2">
+        <el-row v-if="formData.outerFlag == 0 && type == 2">
           <el-col :span="12">
             <el-form-item label="外部过账金额" prop="exteriorProfit">
               <el-input-number
@@ -211,7 +217,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formData.outerFlag == 0&&type==2">
+        <el-row v-if="formData.outerFlag == 0 && type == 2">
           <el-col :span="12">
             <el-form-item label="保险公司回款" prop="insuranceProfit">
               <el-input-number
@@ -233,7 +239,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formData.outerFlag == 0&&type==2">
+        <el-row v-if="formData.outerFlag == 0 && type == 2">
           <el-col :span="12">
             <el-form-item label="园区利润" prop="parkProfit">
               <el-input-number
@@ -255,7 +261,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formData.outerFlag == 0&&type==2">
+        <el-row v-if="formData.outerFlag == 0 && type == 2">
           <el-col :span="12">
             <el-form-item label="对私单笔限额" prop="priSingleLines">
               <el-input-number
@@ -277,7 +283,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formData.outerFlag == 0&&type==2">
+        <el-row v-if="formData.outerFlag == 0 && type == 2">
           <el-col :span="12">
             <el-form-item label="对公单日限额" prop="pubDayLines">
               <el-input-number
@@ -299,7 +305,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formData.outerFlag == 0&&type==2">
+        <el-row v-if="formData.outerFlag == 0 && type == 2">
           <el-col :span="12">
             <el-form-item label="对公年额度" prop="pubYearLines">
               <el-input-number
@@ -321,7 +327,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formData.outerFlag == 0 && formDataId&&type==2">
+        <el-row v-if="formData.outerFlag == 0 && formDataId && type == 2">
           <el-col :span="12">
             <el-form-item label="单日转账笔数剩余" prop="dayStrokeNumExcess">
               <el-input-number
@@ -343,7 +349,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formData.outerFlag == 0 && formDataId&&type==2">
+        <el-row v-if="formData.outerFlag == 0 && formDataId && type == 2">
           <el-col :span="12">
             <el-form-item label="对私年剩余额度" prop="priYearExcess">
               <el-input-number
@@ -365,7 +371,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formData.outerFlag == 0 && formDataId&&type==2">
+        <el-row v-if="formData.outerFlag == 0 && formDataId && type == 2">
           <el-col :span="12">
             <el-form-item label="对公年剩余额度" prop="pubYearExcess">
               <el-input-number
@@ -387,6 +393,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row v-if="formData.outerFlag == 0 && type == 2">
+          <el-col :span="12">
+            <el-form-item label="余额" prop="balance">
+              <el-input-number
+                v-model="formData.balance"
+                :min="0"
+                :max="99999999999999999"
+                label=""
+              ></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="resetForm()" size="small">取 消</el-button>
@@ -422,11 +440,11 @@ export default {
       default: {
         outerFlag: "0", //账户类别
         accountName: "", //户名
-        businessQuality:'0',//营业性质
-        establishTime:"",//成立日期
+        businessQuality: "0", //营业性质
+        establishTime: "", //成立日期
         invoicingAmount: 0, //开票额度
         // invoicingAmountExcess:0,//剩余开票额度
-        juridicalPerson:'',//法人
+        juridicalPerson: "", //法人
         owned: "", //所属地
         accountQuality: "", //账户性质
         bankCardNum: "", //银行卡号
@@ -461,22 +479,41 @@ export default {
     return {
       dictionariesData: [], //账户性质数据字典
       externalRules: {
-        //外部表单规则
+        //账户表单规则
         outerFlag: [
           { required: true, message: "请选择账户类别", trigger: "change" },
         ],
         accountName: [
           { required: true, message: "户名不能为空", trigger: "blur" },
         ],
-        accountQuality: [
-          { required: true, message: "请选择账户性质", trigger: "change" },
+        businessQuality: [
+          { required: true, message: "请选择营业性质", trigger: "change" },
+        ],
+        owned: [
+          { required: true, message: "所属地不能为空", trigger: "change" },
+        ],
+        juridicalPerson: [
+          { required: true, message: "法人不能为空", trigger: "change" },
+        ],
+        establishTime: [
+          {
+            type: "date",
+            required: true,
+            message: "请选择成立日期",
+            trigger: "change",
+          },
+        ],
+        biller: [
+          {
+            type: "date",
+            required: true,
+            message: "开票员不能为空",
+            trigger: "change",
+          },
         ],
       },
       interiorRules: {
-        //内部表单规则
-        outerFlag: [
-          { required: true, message: "请选择账户类别", trigger: "change" },
-        ],
+        //卡表单规则
         accountName: [
           { required: true, message: "户名不能为空", trigger: "blur" },
         ],
@@ -493,9 +530,6 @@ export default {
         bankNum: [
           { required: true, message: "开户行号不能为空", trigger: "blur" },
         ],
-        // clearingProfit: [
-        //   { required: true, message: "结算卡不能为空", trigger: "blur" },
-        // ],
         certExpirationDate: [
           {
             required: true,

+ 221 - 107
src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -113,26 +113,26 @@
               align="center"
               width="300"
             >
-              <template slot-scope="scope">
-                <el-button size="mini" @click="handleTableEdit(scope.row)"
+              <template slot-scope="scopes">
+                <el-button size="mini" @click="childEdit(scopes.row)"
                   >编辑</el-button
                 >
                 <el-button
                   size="mini"
                   type="danger"
-                  @click="handleTableDelete(scope.row)"
+                  @click="cardDelete(scopes.row)"
                   >删除</el-button
                 >
                 <el-button
                   size="mini"
                   type="danger"
-                  @click="handleTableExpend(scope.row)"
+                  @click="handleTableExpend(scopes.row)"
                   >支出</el-button
                 >
                 <el-button
                   size="mini"
                   type="danger"
-                  @click="handleTableIncome(scope.row)"
+                  @click="handleTableIncome(scope.row,scopes.row)"
                   >收入</el-button
                 >
               </template>
@@ -224,7 +224,7 @@
     <expense-component
       ref="expenseComponent"
       :type="type"
-      :formData="type==1?accountFormData:accountCardFormData"
+      :formData="type == 1 ? accountFormData : accountCardFormData"
       :formDataId="formDataId"
       :title="title"
       :dialogFormVisible="dialogFormVisible"
@@ -413,7 +413,7 @@ export default {
         ],
         remark: [{ required: true, message: "请选择备注", trigger: "change" }],
       },
-      enterAccountId: "", //点击收入按钮当条数据收入id
+      enterCardId: "", //点击收入按钮当条数据收入id
       /**
        * 账户模块
        */
@@ -670,6 +670,7 @@ export default {
         // invoicingAmountExcess:0,//剩余开票额度
         juridicalPerson: "", //法人
         owned: "", //所属地
+        biller: "", //开票员
       },
       //账户卡信息form
       accountCardFormData: {
@@ -678,27 +679,28 @@ export default {
         bank: "", //开户行
         bankName: "", //开户行名称
         bankNum: "", //开户行号
+        balance: "", //余额
         certExpirationDate: "", //证书有效期
-        clearingProfit: "", //结算卡
-        dayStrokeNum: "", //单日转账笔数限制
-        dayStrokeNumExcess: "", //单日转账笔数剩余
-        exteriorProfit: "", //外部过账金额
-        fiscalProfit: "", //	财务公司利润
-        insuranceProfit: "", //保险公司回款
-        otherProfit: "", //其他利润
-        parkProfit: "", //园区利润
-        priDayLines: "", //对私单日限额
-        priDayLinesExcess: "", //对私单日限额剩余
-        priSingleLines: "", //对私单笔限额
-        priYearExcess: "", //对私年剩余额度
-        priYearLines: "", //对私年额度
-        pubDayLines: "", //对公单日限额
-        pubDayLinesExcess: "", //对公单日限额剩余
-        pubSingleLines: "", //对公单笔限额
-        pubYearExcess: "", //对公年剩余额度
-        pubYearLines: "", //对公年额度
-        spend: "", //支出金额
-        tianqinProfit: "", //天勤利润
+        clearingProfit: 0, //结算卡
+        dayStrokeNum: 0, //单日转账笔数限制
+        dayStrokeNumExcess: 0, //单日转账笔数剩余
+        exteriorProfit: 0, //外部过账金额
+        fiscalProfit: 0, //	财务公司利润
+        insuranceProfit: 0, //保险公司回款
+        otherProfit: 0, //其他利润
+        parkProfit: 0, //园区利润
+        priDayLines: 0, //对私单日限额
+        priDayLinesExcess: 0, //对私单日限额剩余
+        priSingleLines: 0, //对私单笔限额
+        priYearExcess: 0, //对私年剩余额度
+        priYearLines: 0, //对私年额度
+        pubDayLines: 0, //对公单日限额
+        pubDayLinesExcess: 0, //对公单日限额剩余
+        pubSingleLines: 0, //对公单笔限额
+        pubYearExcess: 0, //对公年剩余额度
+        pubYearLines: 0, //对公年额度
+        spend: 0, //支出金额
+        tianqinProfit: 0, //天勤利润
       },
       /**
        * 支出模块
@@ -742,7 +744,7 @@ export default {
         pageSize: 10,
       },
       expendDialogVisible: false, //支出弹出框状态
-      expendOutAccountId: "", //点击支出按钮当条数据支出id
+      outCardNum: "", //点击支出按钮当条数据支出id
       companyItem: {}, //选择单位整条数据
       typeName: "card", //账户信息 跟 卡信息
     };
@@ -750,13 +752,13 @@ export default {
   watch: {
     expendDialogVisible(n) {
       if (n == false) {
-        this.expendOutAccountId = "";
+        this.outCardNum = "";
       }
     },
     //收入去除form表单信息
     incomeDialogVisible(n) {
       if (n == false) {
-        this.enterAccountId = "";
+        this.enterCardId = "";
         this.$refs.inComeFormData.clearValidate();
         this.inComeFormData = {
           //收入form数据
@@ -790,21 +792,29 @@ export default {
     //获取所有外部账户信息
     getAllUser() {
       this.$api.expense.getAccountByAccountName().then((res) => {
+        console.log(res);
         if (res.code == 200) {
+          let arr = [];
           let outArr = res.data.filter((item) => item.outerFlag == 1);
+          console.log(outArr);
           outArr.forEach((item, index) => {
-            item.name =
-              (item.accountQuality == 0 ? "公户" : "私户") +
-              "   " +
-              item.accountName +
-              "   " +
-              item.bankCardNum +
-              "   " +
-              item.bank;
-            item.nameValue =
-              item.accountName + "   " + item.bankCardNum + "   " + item.bank;
+            item.invAccountCardList.forEach((it) => {
+              it.name =
+                (item.outerFlag == 0 ? "内部用户" : "外部用户") +
+                "   " +
+                (it.accountQuality == 0 ? "公户" : "私户") +
+                "   " +
+                item.accountName +
+                "   " +
+                it.bankCardNum +
+                "   " +
+                it.bank;
+              it.nameValue =
+                item.accountName + "   " + it.bankCardNum + "   " + it.bank;
+            });
+            arr.push(...item.invAccountCardList)
           });
-          this.collectionData = outArr;
+          this.collectionData = arr;
         }
       });
     },
@@ -815,6 +825,7 @@ export default {
     },
     //选择账户类别
     outChange(e) {
+      return
       if (e == 1) {
         this.formData = {
           outerFlag: e, //账户类别
@@ -833,29 +844,29 @@ export default {
           bankName: "", //开户行名称
           bankNum: "", //开户行号
           certExpirationDate: "", //证书有效期
-          clearingProfit: "", //结算卡
-          dayStrokeNum: "", //单日转账笔数限制
-          exteriorProfit: "", //外部过账金额
-          fiscalProfit: "", //财税公司利润
-          insuranceProfit: "", //保险公司回款
-          otherProfit: "", //其他利润
-          parkProfit: "", //园区利润
-          priDayLines: "", //对私单日限额
-          priSingleLines: "", //对私单笔限额
-          priYearExcess: "", //对私年剩余额度
-          priYearLines: "", //对私年额度
-          pubDayLines: "", //对公单日限额
-          pubSingleLines: "", //对公单笔限额
-          pubYearExcess: "", //对公年剩余额度
-          pubYearLines: "", //对公年额度
-          tianqinProfit: "", //天勤利润
+          clearingProfit: 0, //结算卡
+          dayStrokeNum: 0, //单日转账笔数限制
+          exteriorProfit: 0, //外部过账金额
+          fiscalProfit: 0, //财税公司利润
+          insuranceProfit: 0, //保险公司回款
+          otherProfit: 0, //其他利润
+          parkProfit: 0, //园区利润
+          priDayLines: 0, //对私单日限额
+          priSingleLines: 0, //对私单笔限额
+          priYearExcess: 0, //对私年剩余额度
+          priYearLines: 0, //对私年额度
+          pubDayLines: 0, //对公单日限额
+          pubSingleLines: 0, //对公单笔限额
+          pubYearExcess: 0, //对公年剩余额度
+          pubYearLines: 0, //对公年额度
+          tianqinProfit: 0, //天勤利润
         };
       }
     },
     //点击确认收入事件
     submitIncomeForm() {
       let obj = JSON.parse(JSON.stringify(this.inComeFormData));
-      obj.enterAccountId = this.enterAccountId;
+      obj.enterCardId = this.enterCardId;
       obj.fundFlow = obj.company + "→" + obj.collectionMessage;
       this.$refs.inComeFormData.validate((valid) => {
         if (valid) {
@@ -873,25 +884,27 @@ export default {
       });
     },
     //点击页面收入按钮
-    handleTableIncome(e) {
-      if (e.row.outerFlag == 1) {
+    handleTableIncome(row,rows) {
+      console.log(row,rows)
+      if (row.outerFlag == 1) {
         this.$message.error("请选择内部账户");
         return;
       }
       this.getAllUser();
-      this.enterAccountId = e.row.accountId;
+      this.enterCardId = rows.bankCardNum;
       this.inComeFormData.collectionMessage =
-        e.row.accountName + "   " + e.row.bankCardNum + "   " + e.row.bank;
+        row.accountName + "   " + rows.bankCardNum + "   " + rows.bank;
       this.incomeDialogVisible = true;
     },
     //点击页面支出按钮
-    handleTableExpend(e) {
-      if (e.row.outerFlag == 1) {
+    handleTableExpend(row) {
+      console.log(row)
+      if (row.outerFlag == 1) {
         this.$message.error("请选择内部账户");
         return;
       }
       this.expendDialogVisible = true;
-      this.expendOutAccountId = e.row.accountId;
+      this.outCardNum = row.bankCardNum;
       this.getExpendData();
     },
     //获取支出信息列表
@@ -904,7 +917,7 @@ export default {
         pageNo: this.expendPageResult.pageNo,
         pageSize: this.expendPageResult.pageSize,
         transferFlag: 1,
-        outAccountId: this.expendOutAccountId,
+        outCardNum: this.outCardNum,
       };
       this.$api.expense
         .getAccountExcel(obj)
@@ -950,11 +963,11 @@ export default {
     //选择证书有效日期区间
     setDateInterval(e) {
       if (e != null && e != "") {
-        this.formData.startCertExpirationDate = e[0];
-        this.formData.endCertExpirationDate = e[1];
+        this.accountCardFormData.startCertExpirationDate = e[0];
+        this.accountCardFormData.endCertExpirationDate = e[1];
       } else {
-        this.formData.startCertExpirationDate = "";
-        this.formData.endCertExpirationDate = "";
+        this.accountCardFormData.startCertExpirationDate = "";
+        this.accountCardFormData.endCertExpirationDate = "";
       }
     },
     //获取支出页面列表数据
@@ -982,7 +995,12 @@ export default {
               }
               element.outerFlagName =
                 element.outerFlag == 0 ? "内部账户" : "外部账户";
-              element.accountQualityName = this.dictFn(element, 1); //转化账户性质跟账户性别
+              if (element.invAccountCardList != null) {
+                element.invAccountCardList.forEach((inv) => {
+                  inv.outerFlag = element.outerFlag;
+                  inv.accountQualityName = this.dictFn(inv, 1); //转化账户性质
+                });
+              }
             });
             this.accountData = res.data.records;
             this.pageRequest.pageNo = res.data.current;
@@ -1022,9 +1040,26 @@ export default {
     //新增事件
     addAmount() {
       this.title = "新增账户信息";
-      this.type == 1;
+      this.type = 1;
       this.dialogFormVisible = true;
     },
+    //卡删除数据事件
+    cardDelete(row) {
+      this.$confirm("确认删除该条数据吗?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
+          this.$api.expense.deleteAccountCard(row.bankCardNum).then((res) => {
+            if (res.code == 200) {
+              this.$message.success("删除成功");
+              this.findPage();
+            } else {
+              this.$message.error(res.msg);
+            }
+          });
+        })
+        .catch(() => {});
+    },
     //账户删除数据事件
     handleTableDelete(row) {
       this.$confirm("确认删除该记录吗?", "提示", {
@@ -1054,39 +1089,82 @@ export default {
     resetForm() {
       this.dialogFormVisible = false;
       this.formDataId = "";
-      this.formData = {
-        outerFlag: "0", //账户类别
-        accountName: "", //户名
-        accountQuality: "", //账户性质
-        bankCardNum: "", //银行卡号
-        bank: "", //开户行
-        bankName: "", //开户行名称
-        bankNum: "", //开户行号
-        certExpirationDate: "", //证书有效期
-        clearingProfit: "", //结算卡
-        dayStrokeNum: "", //单日转账笔数限制
-        exteriorProfit: "", //外部过账金额
-        fiscalProfit: "", //财税公司利润
-        insuranceProfit: "", //保险公司回款
-        otherProfit: "", //其他利润
-        parkProfit: "", //园区利润
-        priDayLines: "", //对私单日限额
-        priSingleLines: "", //对私单笔限额
-        priYearExcess: "", //对私年剩余额度
-        priYearLines: "", //对私年额度
-        pubDayLines: "", //对公单日限额
-        pubSingleLines: "", //对公单笔限额
-        pubYearExcess: "", //对公年剩余额度
-        pubYearLines: "", //对公年额度
-        tianqinProfit: "", //天勤利润
-      };
+      console.log(this.type)
+      if (this.type == 1) {
+        this.accountFormData = {
+          outerFlag: "0", //账户类别
+          accountName: "", //户名
+          businessQuality: "0", //营业性质
+          establishTime: "", //成立日期
+          invoicingAmount: 0, //开票额度
+          // invoicingAmountExcess:0,//剩余开票额度
+          juridicalPerson: "", //法人
+          owned: "", //所属地
+        };
+      } else {
+        this.accountCardFormData = {
+          accountQuality: "", //账户性质
+          bankCardNum: "", //银行卡号
+          bank: "", //开户行
+          bankName: "", //开户行名称
+          bankNum: "", //开户行号
+          balance: 0, //余额
+          certExpirationDate: "", //证书有效期
+          clearingProfit: 0, //结算卡
+          dayStrokeNum: 0, //单日转账笔数限制
+          dayStrokeNumExcess: 0, //单日转账笔数剩余
+          exteriorProfit: 0, //外部过账金额
+          fiscalProfit: 0, //	财务公司利润
+          insuranceProfit: 0, //保险公司回款
+          otherProfit: 0, //其他利润
+          parkProfit: 0, //园区利润
+          priDayLines: 0, //对私单日限额
+          priDayLinesExcess: 0, //对私单日限额剩余
+          priSingleLines: 0, //对私单笔限额
+          priYearExcess: 0, //对私年剩余额度
+          priYearLines: 0, //对私年额度
+          pubDayLines: 0, //对公单日限额
+          pubDayLinesExcess: 0, //对公单日限额剩余
+          pubSingleLines: 0, //对公单笔限额
+          pubYearExcess: 0, //对公年剩余额度
+          pubYearLines: 0, //对公年额度
+          spend: 0, //支出金额
+          tianqinProfit: 0, //天勤利润
+        };
+      }
+    },
+    //卡信息修改事件
+    childEdit(row) {
+      this.type = 2; //卡信息
+      this.title = "编辑账户卡信息";
+      this.formDataId = row.accountId;
+      this.$api.expense
+        .getAccountCardList({
+          accountId: row.accountId,
+          bankCardNum: row.bankCardNum,
+          bank: row.bank,
+        })
+        .then((res) => {
+          if (res.code == 200) {
+            res.data[0].certExpirationDate = [
+              res.data[0].startCertExpirationDate,
+              res.data[0].endCertExpirationDate,
+            ];
+            this.accountCardFormData = res.data[0];
+            this.accountCardFormData.outerFlag = row.outerFlag;
+            this.dialogFormVisible = true;
+          } else {
+            this.$message.error(res.msg);
+          }
+        });
     },
     //账户卡信息增加
     handleTableAdd(row) {
       this.type = 2; //卡信息
       this.title = "新增账户卡信息";
       this.dialogFormVisible = true;
-      this.accountCardFormData.outerFlag = row.outerFlag
+      this.accountCardFormData.accountId = row.accountId;
+      this.accountCardFormData.outerFlag = row.outerFlag;
     },
     //账户信息修改
     handleTableEdit(row) {
@@ -1105,8 +1183,9 @@ export default {
     },
     //提交
     submitForm() {
-      let params = JSON.parse(JSON.stringify(this.accountFormData));
-      if (this.type == 1) { //新增修改账户信息
+      if (this.type == 1) {
+        //新增修改账户信息
+        let params = JSON.parse(JSON.stringify(this.accountFormData));
         if (this.formDataId) {
           //修改
           params.accountId = this.formDataId;
@@ -1117,14 +1196,14 @@ export default {
                 message: "修改成功",
                 type: "success",
               });
+              this.findPage();
+              this.resetForm();
             } else {
               this.$message({
                 message: `修改失败, ${res.msg}`,
                 type: "error",
               });
             }
-            this.findPage();
-            this.resetForm();
           });
         } else {
           //新增
@@ -1134,19 +1213,54 @@ export default {
                 message: "添加成功",
                 type: "success",
               });
+              this.findPage();
+              this.resetForm();
             } else {
               this.$message({
                 message: `添加失败, ${res.msg}`,
                 type: "error",
               });
             }
-            this.findPage();
-            this.resetForm();
           });
         }
-      }else{  //新增修改卡信息
-        console.log(params)
+      } else {
+        //新增修改卡信息
+        let params = JSON.parse(JSON.stringify(this.accountCardFormData));
         delete params.certExpirationDate;
+        console.log(params);
+        //修改
+        if (this.formDataId) {
+          this.$api.expense.updateAccountCard(params).then((res) => {
+            if (res.code == 200) {
+              this.$message({
+                message: "修改成功",
+                type: "success",
+              });
+              this.findPage();
+              this.resetForm();
+            } else {
+              this.$message({
+                message: `修改失败, ${res.msg}`,
+                type: "error",
+              });
+            }
+          });
+          //新增
+        } else {
+          this.$api.expense.insertAccountCard(params).then((res) => {
+            console.log(res);
+            if (res.code == 200) {
+              this.$message({
+                message: "添加成功",
+                type: "success",
+              });
+              this.findPage();
+              this.resetForm();
+            } else {
+              this.$message.error(res.msg);
+            }
+          });
+        }
       }
     },
   },

+ 76 - 72
src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -94,20 +94,24 @@
         >
           <el-row>
             <el-col :span="12">
-              <el-form-item label="账户类别" prop="outerFlag">
-                <el-select
+              <el-form-item label="卡号" prop="bankCardNum">
+                <el-input
+                  v-model="formData.bankCardNum"
+                  autocomplete="off"
+                ></el-input>
+                <!-- <el-select
                   v-model="formData.outerFlag"
-                  placeholder="请选择账户类别"
+                  placeholder="卡号"
                 >
                   <el-option label="内部账户" value="0"></el-option>
                   <el-option label="外部账户" value="1"></el-option>
-                </el-select>
+                </el-select> -->
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="户名" prop="accountName">
+              <el-form-item label="开票员" prop="biller">
                 <el-input
-                  v-model="formData.accountName"
+                  v-model="formData.biller"
                   autocomplete="off"
                 ></el-input>
               </el-form-item>
@@ -115,55 +119,82 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="账户性质" prop="accountQuality">
-                <el-select
-                  v-model="formData.accountQuality"
+              <el-form-item label="对方单位" prop="invoiceBy">
+                <el-input
+                  v-model="formData.invoiceBy"
+                  autocomplete="off"
+                ></el-input>
+                <!-- <el-select
+                  v-model="formData.invoiceBy"
                   placeholder="请选择账户性质"
                 >
-                  <!-- <el-option
+                  <el-option
                     v-for="item in dictionariesData"
                     :key="item.value + 'bb'"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option> -->
-                </el-select>
+                  ></el-option>
+                </el-select> -->
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="银行卡号" prop="bankCardNum">
+              <el-form-item label="发票序号" prop="invoiceId">
                 <el-input
-                  v-model="formData.bankCardNum"
+                  v-model="formData.invoiceId"
                   autocomplete="off"
                 ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row v-show="formData.outerFlag == 0">
+            <el-col :span="12">
+              <el-form-item label="开票金额" prop="invoiceMoney">
+                <el-input-number
+                  v-model="formData.invoiceMoney"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="发票数" prop="invoiceNum">
+                <el-input-number
+                  v-model="formData.invoiceNum"
+                  :min="0"
+                  :max="99999999999999999"
+                  label=""
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="营业性质" prop="yyxz">
-                <el-select v-model="formData.yyxz" placeholder="请选择营业性质">
+              <el-form-item label="开票科目" prop="invoiceSubjects">
+                <el-input v-model="formData.invoiceSubjects" autocomplete="off"></el-input>
+                <!-- <el-select v-model="formData.invoiceSubjects" placeholder="请选择开票科目">
                   <el-option label="一般纳税" value="0"></el-option>
                   <el-option label="小规模" value="1"></el-option>
                   <el-option label="个体户" value="2"></el-option>
-                </el-select>
+                </el-select> -->
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="所属地" prop="ssd">
-                <el-input v-model="formData.ssd" autocomplete="off"></el-input>
+              <el-form-item label="发票类型" prop="invoiceType">
+                <el-input v-model="formData.invoiceType" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="法人" prop="fr">
-                <el-input v-model="formData.fr" autocomplete="off"></el-input>
+              <el-form-item label="不含税金额" prop="noHasTax">
+                <el-input v-model="formData.noHasTax" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="成立日期" prop="clrq">
+              <el-form-item label="开票日期" prop="invoiceTime">
                 <el-date-picker
-                  v-model="formData.clrq"
+                  v-model="formData.invoiceTime"
                   type="date"
                   placeholder="选择日期"
                 >
@@ -173,14 +204,14 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="开户行" prop="bank">
-                <el-input v-model="formData.bank" autocomplete="off"></el-input>
+              <el-form-item label="未进账金额" prop="notPayoutMoney">
+                <el-input v-model="formData.notPayoutMoney" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
-            <el-col v-show="formData.outerFlag == 0" :span="12">
-              <el-form-item label="开户行名称" prop="bankName">
+            <el-col :span="12">
+              <el-form-item label="对方单位" prop="otherUnit">
                 <el-input
-                  v-model="formData.bankName"
+                  v-model="formData.otherUnit"
                   autocomplete="off"
                 ></el-input>
               </el-form-item>
@@ -188,34 +219,30 @@
           </el-row>
           <el-row v-show="formData.outerFlag == 0">
             <el-col :span="12">
-              <el-form-item label="开户行号" prop="bankNum">
+              <el-form-item label="进账金额" prop="payoutMoney">
                 <el-input
-                  v-model="formData.bankNum"
+                  v-model="formData.payoutMoney"
                   autocomplete="off"
                 ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="证书有效期" prop="certExpirationDate">
+              <el-form-item label="进账日期" prop="payoutTime">
                 <el-date-picker
-                  v-model="formData.certExpirationDate"
-                  size="small"
-                  type="daterange"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  value-format="yyyy-MM-dd"
-                  @change="setDateInterval($event)"
+                  v-model="formData.payoutTime"
+                  type="date"
+                  placeholder="选择日期"
                 >
                 </el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
+         
           <el-row v-show="formData.outerFlag == 0">
             <el-col :span="12">
-              <el-form-item label="结算卡" prop="clearingProfit">
+              <el-form-item label="税率" prop="rate">
                 <el-input-number
-                  v-model="formData.clearingProfit"
+                  v-model="formData.rate"
                   :min="0"
                   :max="99999999999999999"
                   label=""
@@ -223,29 +250,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="单日转账笔数限制" prop="dayStrokeNum">
-                <el-input-number
-                  v-model="formData.dayStrokeNum"
-                  :min="0"
-                  :max="99999999999999999"
-                  label=""
-                ></el-input-number>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row v-show="formData.outerFlag == 0">
-            <el-col :span="12">
-              <el-form-item label="外部过账金额" prop="exteriorProfit">
-                <el-input-number
-                  v-model="formData.exteriorProfit"
-                  :min="0"
-                  :max="99999999999999999"
-                  label=""
-                ></el-input-number>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="财税公司利润" prop="fiscalProfit">
+              <el-form-item label="备注" prop="remark">
                 <el-input-number
                   v-model="formData.fiscalProfit"
                   :min="0"
@@ -257,16 +262,16 @@
           </el-row>
           <el-row v-show="formData.outerFlag == 0">
             <el-col :span="12">
-              <el-form-item label="保险公司回款" prop="insuranceProfit">
+              <el-form-item label="	税额" prop="tax">
                 <el-input-number
-                  v-model="formData.insuranceProfit"
+                  v-model="formData.tax"
                   :min="0"
                   :max="99999999999999999"
                   label=""
                 ></el-input-number>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
               <el-form-item label="其他利润" prop="otherProfit">
                 <el-input-number
                   v-model="formData.otherProfit"
@@ -275,9 +280,9 @@
                   label=""
                 ></el-input-number>
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
-          <el-row v-show="formData.outerFlag == 0">
+          <!-- <el-row v-show="formData.outerFlag == 0">
             <el-col :span="12">
               <el-form-item label="园区利润" prop="parkProfit">
                 <el-input-number
@@ -430,7 +435,7 @@
                 ></el-input-number>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -765,8 +770,7 @@ export default {
         this.pageRequest.pageNo = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
-      this.$api.user
-        .quTeamNum(this.pageRequest)
+      this.$api.expense.getInvAccountIncoice(this.pageRequest)
         .then((res) => {
           if (res.code == 200) {
             this.pageResult = {

+ 3 - 0
src/views/Letter/Letter.vue

@@ -3876,6 +3876,9 @@ export default {
         seatCount: [
           { required: true, message: "请输入座位数", trigger: "blur" }
         ],
+        completeKerbMass: [
+          { required: true, message: "请输入整备质量", trigger: "blur" }
+        ],
         name: [{ required: true, message: "请填写姓名", trigger: "blur" }],
 
         // identifyNumber: [

+ 26 - 2
src/views/Report/StatisticalReport/OrderVolumeAndCostStatistics.vue

@@ -47,8 +47,13 @@
                               range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
-              <el-button type="primary" style="margin-right: 40px;" @click="queryData">查询</el-button>
+        </el-row>
+        <el-row>
+          <el-col :span="2" class="u-f u-f-je" style="height: 40px;">
+            <el-button type="primary" icon="el-icon-arrow-left" size="mini" @click="returnUpper">返回上层</el-button>
+          </el-col>
+          <el-col :span="22" class="u-f u-f-je" style="height: 40px;">
+            <el-button type="primary" style="margin-right: 40px;" @click="queryData">查询</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -128,8 +133,14 @@
           pageNum: 1,
           pageSize: 10,
           isDrilling:"0",//是否下钻查询
+          isReturnBack:"0"//是否返回上层
         },
         dataList: [],//查询结果数据
+        //返回上层查询对象
+        returnForm:{
+          deptId: "",
+          teamCode:"",
+        }
       };
     },
     created(){
@@ -152,6 +163,13 @@
       };
     },
     methods: {
+      //返回上层
+      returnUpper(){
+        this.queryForm.isReturnBack="1";
+        this.queryForm.deptId= this.returnForm.deptId;
+        this.queryForm.teamCode= this.returnForm.teamCode;
+        this.findPage();
+      },
       // 按照查询条件查询
       drillingData(obj,type) {
         this.queryForm.pageNum = 1;
@@ -160,6 +178,7 @@
         this.queryForm.userId="";
         this.queryForm.teamCode="";
         this.queryForm.deptId="";
+        this.queryForm.isReturnBack="0";
         if(type=='jg'){
           this.queryForm.deptId=obj.institutionId;
         }else if(type='td'){
@@ -236,6 +255,7 @@
         this.queryForm.pageNum = 1;
         this.queryForm.pageSize = 10;
         this.queryForm.isDrilling="0";
+        this.queryForm.isReturnBack="0";
         this.findPage();
       },
       //数据
@@ -245,6 +265,10 @@
           if (res.code == "200") {
             this.loading = false;
             this.dataList = res.data.content;
+            for(let item of this.dataList){
+              this.returnForm.deptId=item.institutionId;
+              this.returnForm.teamCode=item.deptId;
+            }
             this.currentPage = res.data.pageNum;
             this.totalSum = res.data.totalSize;
           } else {

+ 18 - 4
src/views/Sys/Inscommanytemplate.vue

@@ -159,6 +159,10 @@ export default {
                     apiName: "非车险查询",
                     apiType: 7,
                     url: "",
+                }, {
+                    apiName: "人工核保状态刷新",
+                    apiType: 8,
+                    url: "",
                 }
             ],
             pageRequest: {
@@ -222,7 +226,8 @@ export default {
                 .pagebelong(params)
                 .then((res) => {
                     if (res.code == "200") {
-                        this.pageResult = res.data.content;
+                        this.pageResult = res.data.content
+                        this.totalSize = res.data.totalSize
                     }
                 });
         },
@@ -269,7 +274,6 @@ export default {
                                 }
                             });
                     } else {
-                        console.log(this.attributionform)
                         this.$api.insCompany
                             .addbelong(this.attributionform)
                             .then((res) => {
@@ -300,6 +304,16 @@ export default {
             this.id=row.id;
            this.$api.insCompany.querybelong(row.id).then(res=>{
             this.attributionform=res.data;
+            if(res.data.api!=null){
+                let api = JSON.parse(JSON.stringify(this.pythonApi));
+                api.forEach(item=>{
+                    let obj = res.data.api.find(it=>(item.apiName==it.apiName&&item.apiType==it.apiType))
+                    if(obj){
+                        item.url = obj.url
+                    }
+                })
+                this.attributionform['api']= api;
+            }
             this.dialogVisible=true;
            })
         },
@@ -309,14 +323,14 @@ export default {
             this.pageNum = 1;
             this.pageRequest.pageNum = 1;
             this.pageRequest.pageSize = val;
-            this.findPage();
+            this.findpage();
         },
         // 当前页
         // 当前页 当前页
         applyhandleCurrentChange(val) {
             this.pageNum = val;
             this.pageRequest.pageNum = val;
-            this.findPage();
+            this.findpage();
         },
     },
 };