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

config/dev.env.js

@@ -5,9 +5,9 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
-  BASE_URL: '"http://192.168.0.115:8080/"' //凯森
+  // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
   // BASE_URL: '"http:///192.168.0.36:8080/"',//靖燕龙

src/http/moudules/expense.js

@@ -6,7 +6,15 @@ import axios from '../axios'
  * 
  */
 
-//获取账户信息列表
+//导出账户信息
+export const updateAccountExcel = (data) => {
+    return axios({
+        url: '/invAccount/accountExcel',
+        method: "post",
+        data
+    })
+}
+//导出费用支出明细
 export const updateUserExcel = (data) => {
     return axios({
         url: '/invAccount/excel',
@@ -261,7 +269,15 @@ export const addInvAccountIncoice = (data) => {
         data
     })
 }
-//修改开票
+//开票修改
+export const updateIncoice = (data) => {
+    return axios({
+        url: '/invAccountIncoice/updateIncoice',
+        method: "post",
+        data
+    })
+}
+//开票进账
 export const putInvAccountIncoice = (data) => {
     return axios({
         url: '/invAccountIncoice/update',

src/views/FinancialManagement/ExpenseManagement/ExpenseApplyFor.vue

@@ -58,6 +58,13 @@
       @click="showExpense"
       >资金使用申请单</el-button
     >
+    <el-button
+      @click="expendDataup"
+      type="primary"
+      size="medium"
+      :disabled="!this.expentList.length"
+      >批量导出</el-button
+    >
     <!-- 表格 -->
     <kt-common-table
       :operationWidth="operationWidth"
@@ -69,11 +76,13 @@
       editButtonName="编辑"
       button1Name="删除"
       :showBatchDelete="false"
+      :showBatchPrint="true"
       :showOperation="true"
       @findPage="findPage"
       :isshowpagination="true"
       @handleEdit="expendEdit"
       @handleButton1="expendDelete"
+      @selectionChange="selectionChange"
     ></kt-common-table>
     <!-- 申请资金弹框 -->
     <el-dialog
@@ -170,7 +179,7 @@
               <el-form-item label="资金用途" prop="fundUse">
                 <el-cascader
                   v-model="tableForm.fundUse"
-                  :show-all-levels="false"
+                  :show-all-levels="true"
                   :clearable="true"
                   :checkStrictly="true"
                   :emitPath="false"
@@ -270,27 +279,27 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row style="margin-bottom: 20px">
+            <el-col :span="12" style="text-align: center"
+              ><h3>收入方资金归属(%)</h3>
+              <span>(请输入资金归属百分比)</span></el-col
+            >
+            <el-col :span="12" style="text-align: center"
+              ><h3>支出方资金归属(%)</h3>
+              <span>(请输入资金归属百分比)</span></el-col
+            >
+          </el-row>
+          <el-row class="profit_box">
             <el-col :span="12">
-              <el-form-item label="收入方资金归属" prop="entProfit">
-                <el-select
-                  v-model="profitObj.entProfitName"
-                  filterable
-                  @change="profitChange($event, 1)"
-                  placeholder=""
-                >
-                  <el-option
-                    v-for="(item, index) in affiliationData"
-                    :key="item.profitId + 'ent' + index"
-                    :label="item.profitName"
-                    :value="item.profitEng"
-                  >
-                  </el-option>
-                </el-select>
+              <el-form-item
+                v-for="item in affiliationData"
+                :key="item.profitId + 'sr'"
+                :label="item.profitName"
+                prop="entProfit"
+              >
                 <el-input-number
-                  v-model="profitObj.entProfitValue"
+                  v-model="item.profit"
                   :min="0"
-                  @blur="profitBlur($event, 1)"
                   placeholder="请输入利润(%)"
                   :max="100"
                   label=""
@@ -298,25 +307,15 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="支出方资金归属" prop="outFlag">
-                <el-select
-                  v-model="profitObj.outProfitName"
-                  filterable
-                  @change="profitChange($event, 2)"
-                  placeholder=""
-                >
-                  <el-option
-                    v-for="(item, index) in affiliationData"
-                    :key="item.profitId + 'out' + index"
-                    :label="item.profitName"
-                    :value="item.profitEng"
-                  >
-                  </el-option>
-                </el-select>
+              <el-form-item
+                v-for="item in affiliationData2"
+                :key="item.profitId + 'zc'"
+                :label="item.profitName"
+                prop="entProfit"
+              >
                 <el-input-number
-                  v-model="profitObj.outProfitValue"
+                  v-model="item.profit"
                   :min="0"
-                  @blur="profitBlur($event, 2)"
                   placeholder="请输入利润(%)"
                   :max="100"
                   label=""
@@ -328,13 +327,6 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="resetForm" size="small">取 消</el-button>
-        <el-button
-          v-if="expendDataId"
-          @click="expendDataup"
-          type="primary"
-          size="small"
-          >导 出</el-button
-        >
         <el-button type="primary" @click="submitForm" size="small">{{
           buttonValue
         }}</el-button>
@@ -382,6 +374,7 @@ export default {
       }
     };
     return {
+      expentList: [], //批量导出数据
       expenseaaa: true,
       expendTitle: "新增资金使用申请单", //弹框标题
       operationWidth: 200, //操作单元格宽度
@@ -534,6 +527,7 @@ export default {
       },
       payment_methodsData: [], //支付方式字典数据
       affiliationData: [], //归属字典数据
+      affiliationData2: [], //归属字典数据
       collectionData: [], //收款单位信息数据
       innerCollectionData: [], //内部账户单位信息数据
       account_qualityData: [], //账户性质字典
@@ -629,6 +623,12 @@ export default {
         this.tableForm.payMethod = [
           this.payment_methodsData.find((item) => item.value == 2).label,
         ];
+        this.affiliationData.forEach((item) => {
+          item.profit = 0;
+        });
+        this.affiliationData2.forEach((item) => {
+          item.profit = 0;
+        });
         this.expendDataId = "";
       }
     },
@@ -643,84 +643,49 @@ export default {
   },
   mounted() {},
   methods: {
-    //收入资金归属change事件
-    profitChange(e, num) {
-      if (num == 1) {
-        //收入
-        this.profitObj.entProfitName = e;
-        this.tableForm.entProfit = {
-          [this.profitObj.entProfitName]: this.profitObj.entProfitValue,
-        };
-      } else {
-        //支出
-        this.profitObj.outProfitName = e;
-        this.tableForm.outProfit = {
-          [this.profitObj.outProfitName]: this.profitObj.outProfitValue,
-        };
-      }
-    },
-    //收入资金归属利润事件
-    profitBlur(e, num) {
-      this.tableForm.entProfit = {
-        [this.profitObj.entProfitName]: this.profitObj.entProfitValue,
-      };
-      this.tableForm.outProfit = {
-        [this.profitObj.outProfitName]: this.profitObj.outProfitValue,
-      };
+    //表格多选事件
+    selectionChange(e) {
+      this.expentList = e.selections.map((item) => item.excelAccountOperateId);
     },
     //获取归属数据
     getAffiliationData() {
       this.$api.expense.getList().then((res) => {
         if (res.code == 200) {
-          this.affiliationData = res.data;
-          res.data.forEach((item) => {
-            this.columns.push({
-              prop: item.profitEng,
-              label: item.profitName,
-              minWidth: 60,
-              sortable: false,
-            });
+          res.data.map((item) => {
+            item.profit = 0;
+            return item;
           });
+          this.affiliationData = JSON.parse(JSON.stringify(res.data));
+          this.affiliationData2 = JSON.parse(JSON.stringify(res.data));
         } else {
           this.$message.error(res.msg);
         }
       });
     },
     //导出
-    expendDataup(idList) {
-      if (this.expendDataId) {
-        //编辑查看直接导出
-        let url = process.env.BASE_URL + "/upload/" + this.tableForm.uplodePath; // 3.创建一个临时的url指向blob对象
-        // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
-        let a = document.createElement("a");
-        a.href = url;
-        a.download = "资金使用申请单.xlsx";
-        a.click();
-        // 5.释放这个临时的对象url
-        window.URL.revokeObjectURL(url);
-        this.resetForm();
-        this.findPage();
-      } else {
-        //新增并导出
-        this.$api.expense.excel(idList).then((response) => {
-          if (response.code == 200) {
-            response.data.forEach((data) => {
-              this.resetForm();
-              this.findPage();
-              let url = process.env.BASE_URL + "/upload/" + data.uplodePath; // 3.创建一个临时的url指向blob对象
-              // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
-              let a = document.createElement("a");
-              a.href = url;
-              a.download = "资金使用申请单.xlsx";
-              a.click();
-              // 5.释放这个临时的对象url
-              window.URL.revokeObjectURL(url);
-            });
-          } else {
-            this.$message.error(response.msg);
+    expendDataup(e, idList) {
+      idList = idList || this.expentList;
+      this.$api.expense.excel(idList).then((response) => {
+        if (response.code == 200) {
+          if (response.data == null) {
+            this.$message.error("暂无导出数据，请重试！");
+            return;
           }
-        });
-      }
+          let url = process.env.BASE_URL + "/upload/" + response.data; // 3.创建一个临时的url指向blob对象
+          // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
+          let a = document.createElement("a");
+          a.href = url;
+          a.click();
+          // 5.释放这个临时的对象url
+          window.URL.revokeObjectURL(url);
+          document.body.removeChild(a); //移除a标签
+          this.resetForm();
+          this.findPage();
+        } else {
+          this.$message.error(response.msg);
+        }
+      });
+      // }
     },
     //点击编辑按钮
     expendEdit(index) {
@@ -742,14 +707,22 @@ export default {
               this.tableForm.fundUse,
               this.tableForm.fundFen,
             ];
+            //转换资金归属
             for (let key in res.data.outProfit) {
-              this.profitObj.outProfitName = key;
-              this.profitObj.outProfitValue = res.data.outProfit[key];
+              this.affiliationData2.forEach((item) => {
+                if (item.profitEng == key) {
+                  item.profit = res.data.outProfit[key];
+                }
+              });
             }
             for (let key in res.data.entProfit) {
-              this.profitObj.entProfitName = key;
-              this.profitObj.entProfitValue = res.data.entProfit[key];
+              this.affiliationData.forEach((item) => {
+                if (item.profitEng == key) {
+                  item.profit = res.data.entProfit[key];
+                }
+              });
             }
+            //转换资金归属
           } else {
             this.$message.error(res.msg);
           }
@@ -819,12 +792,6 @@ export default {
         .getAccountExcel(obj)
         .then((res) => {
           res.data.records.forEach((element) => {
-            for (let key in element.outProfit) {
-              element[key] = element.outProfit[key];
-            }
-            for (let key in element.entProfit) {
-              element[key] = element.entProfit[key];
-            }
             element.transferFlagName =
               element.transferFlag == 0 ? "已转账" : "未转账";
           });
@@ -994,7 +961,7 @@ export default {
     //费用申请弹框
     showExpense() {
       this.expendTitle = "新增资金使用申请单";
-      this.buttonValue = "导 出";
+      this.buttonValue = "提 交";
       this.expenseDialog = true;
     },
     //取消隐藏弹框
@@ -1004,10 +971,6 @@ export default {
     //导出事件
     submitForm() {
       let params = JSON.parse(JSON.stringify(this.tableForm));
-      if( !this.profitObj.entProfitName||!this.profitObj.outProfitName){
-        this.$message.error('请选择资金归属！');
-        return
-      }
       this.$refs.tableForm.validate((valid) => {
         if (valid) {
           params.payMethod = this.toPayment(params.payMethod); //支付方式转换
@@ -1027,6 +990,16 @@ export default {
           params.fundFen =
             this.tableForm.fundUse[this.tableForm.fundUse.length - 1]; //资金用途分项
           params.fundFlow = params.company + "→" + params.collectionMessage; //资金流程
+          //转化资金归属
+          params.entProfit = {};
+          params.outProfit = {};
+          this.affiliationData.forEach((item) => {
+            params.entProfit[item.profitEng] = item.profit;
+          });
+          this.affiliationData2.forEach((item) => {
+            params.outProfit[item.profitEng] = item.profit;
+          });
+          //转化资金归属
           if (this.expendDataId) {
             //修改
             params.expendDataId = this.expendDataId;
@@ -1042,7 +1015,8 @@ export default {
             //新增+导出
             this.$api.expense.insert(params).then((res) => {
               if (res.code == 200) {
-                this.expendDataup([res.data]);
+                this.resetForm();
+                this.findPage();
               } else {
                 this.$message.error(res.msg);
               }
@@ -1177,4 +1151,8 @@ export default {
 .table_btnbox {
   position: relative;
 }
+.dialog-body {
+  overflow-y: auto;
+  height: 500px;
+}
 </style>

src/views/FinancialManagement/ExpenseManagement/ExpenseComponent.vue

@@ -427,29 +427,29 @@ export default {
         accountName: [
           { required: true, message: "户名不能为空", trigger: "blur" },
         ],
-        businessQuality: [
-          { required: true, message: "请选择营业性质", trigger: "change" },
-        ],
-        owned: [
-          { required: true, message: "所属地不能为空", trigger: "change" },
-        ],
-        juridicalPerson: [
-          { required: true, message: "法人不能为空", trigger: "change" },
-        ],
-        establishTime: [
-          {
-            required: true,
-            message: "请选择成立日期",
-            trigger: "change",
-          },
-        ],
-        biller: [
-          {
-            required: true,
-            message: "开票员不能为空",
-            trigger: "blur",
-          },
-        ],
+        // businessQuality: [
+        //   { required: true, message: "请选择营业性质", trigger: "change" },
+        // ],
+        // owned: [
+        //   { required: true, message: "所属地不能为空", trigger: "change" },
+        // ],
+        // juridicalPerson: [
+        //   { required: true, message: "法人不能为空", trigger: "change" },
+        // ],
+        // establishTime: [
+        //   {
+        //     required: true,
+        //     message: "请选择成立日期",
+        //     trigger: "change",
+        //   },
+        // ],
+        // biller: [
+        //   {
+        //     required: true,
+        //     message: "开票员不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
       },
       interiorRules: {
         //卡表单规则

src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -66,7 +66,15 @@
       plain
       size="medium"
       @click="expentData"
-      >导出</el-button
+      >费用支出明细导出</el-button
+    >
+    <el-button
+      class="operation"
+      type="primary"
+      plain
+      size="medium"
+      @click="userInfoExpentData"
+      >账户信息导出</el-button
     >
     <!-- 表格 -->
     <el-table
@@ -342,7 +350,7 @@
             <el-form-item label="资金用途" prop="fundUse">
               <el-cascader
                 v-model="inComeFormData.fundUse"
-                :show-all-levels="false"
+                :show-all-levels="true"
                 :clearable="true"
                 :checkStrictly="true"
                 :emitPath="false"
@@ -361,10 +369,12 @@
         </el-row>
         <el-row>
           <el-col :span="12" style="text-align: center"
-            ><h3>收入方资金归属</h3></el-col
+            ><h3>收入方资金归属(%)</h3>
+            <span>(请输入资金归属百分比)</span></el-col
           >
           <el-col :span="12" style="text-align: center"
-            ><h3>支出方资金归属</h3></el-col
+            ><h3>支出方资金归属(%)</h3>
+            <span>(请输入资金归属百分比)</span></el-col
           >
         </el-row>
         <el-row class="profit_box">
@@ -783,10 +793,35 @@ export default {
         }
       });
     },
-    //导出开票记录
+    //账户信息导出
+    userInfoExpentData() {
+      this.$api.expense.updateAccountExcel(this.queryFrom).then((res) => {
+        if (res.code == 200) {
+          if (res.data == null) {
+            this.$message.error("暂无导出数据，请重试！");
+            return;
+          }
+          let url = process.env.BASE_URL + "/upload/" + res.data; // 3.创建一个临时的url指向blob对象
+          // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
+          let a = document.createElement("a");
+          a.href = url;
+          a.download = "导出订单.xlsx";
+          a.click();
+          // 5.释放这个临时的对象url
+          window.URL.revokeObjectURL(url);
+        } else {
+          this.$message.error(res.msg);
+        }
+      });
+    },
+    //费用支出明细导出
     expentData() {
       this.$api.expense.updateUserExcel(this.queryFrom).then((res) => {
         if (res.code == 200) {
+          if (res.data == null) {
+            this.$message.error("暂无导出数据，请重试！");
+            return;
+          }
           let url = process.env.BASE_URL + "/upload/" + res.data; // 3.创建一个临时的url指向blob对象
           // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
           let a = document.createElement("a");
@@ -886,15 +921,16 @@ export default {
     },
     //选择收款单位change事件
     companyChange(val) {
-      const item = this.collectionData.find((item) => item.accountId === val);
+      const item = this.collectionData.find((item) => item.nameValue === val);
       this.companyItem = item;
     },
     //点击确认收入事件
     submitIncomeForm() {
       let obj = JSON.parse(JSON.stringify(this.inComeFormData));
-      obj.enterCardId = this.enterCardId;
-      obj.fundFlow = obj.company + "→" + obj.collectionMessage;
-      obj.payMethod = obj.payMethod.join(",");
+      obj.enterCardId = this.enterCardId; //收入银行卡号
+      obj.outCardId = this.companyItem.bankCardNum; //支出银行卡号
+      obj.fundFlow = obj.company + "→" + obj.collectionMessage; //资金流向
+      obj.payMethod = obj.payMethod.join(",");//支付方式
       obj.revenueOutlay = "0";
       obj.fundUse = obj.fundUse[obj.fundUse.length - 2]; //资金用途
       obj.fundFen = obj.fundUse[obj.fundUse.length - 1]; //资金用途分项
@@ -1214,7 +1250,7 @@ export default {
       this.type = 1; //账户类型
       this.formDataId = row.accountId;
       this.$api.expense
-        .getAccount({ accountId: this.formDataId,pageNo:1,pageSize:10 })
+        .getAccount({ accountId: this.formDataId, pageNo: 1, pageSize: 10 })
         .then((res) => {
           if (res.code == 200) {
             this.accountFormData = JSON.parse(
@@ -1406,8 +1442,8 @@ export default {
 }
 
 .expendDialog >>> .el-dialog__body {
-  overflow-y: hidden !important;
-  max-height: 500px;
+  overflow-y: auto;
+  height: 500px;
 }
 .collec >>> .el-form-item__content {
   display: flex;

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -115,12 +115,15 @@
       :columns="columns"
       :showBatchDelete="false"
       :showOperation="true"
-      editButtonName="编辑"
+      editButtonName="进账"
       button3Name="撤销"
+      button2Name="编辑"
       button3Icon="fa fa-trash"
       button3Background="#f56c6c"
+      button2Background="#E6A23C"
       @handleButton3="handleTableDelete"
-      @handleEdit="handleDetail"
+      @handleButton2="handleDetail($event, 1)"
+      @handleEdit="handleDetail($event, 2)"
       @findPage="findPage"
       :isshowpagination="true"
     ></kt-common-table>
@@ -142,7 +145,7 @@
           size="small"
           :class="formDataId ? 'data_form' : 'frame data_form'"
         >
-          <div v-if="!formDataId">
+          <div v-if="!formDataId || (typeStatus == 1 && formDataId)">
             <el-row>
               <el-col :span="12">
                 <el-form-item label="开票方" prop="invoiceBy">
@@ -293,7 +296,7 @@
               </el-col>
             </el-row>
           </div>
-          <div v-else>
+          <div v-if="typeStatus == 2 && formDataId">
             <el-row>
               <el-col :span="12">
                 <el-form-item label="进账金额" prop="payoutMoney">
@@ -339,7 +342,7 @@
                 <el-form-item label="资金用途" prop="fundUse">
                   <el-cascader
                     v-model="formData.fundUse"
-                    :show-all-levels="false"
+                    :show-all-levels="true"
                     :clearable="true"
                     :checkStrictly="true"
                     :emitPath="false"
@@ -392,10 +395,12 @@
             </el-row> -->
             <el-row>
               <el-col :span="12" style="text-align: center"
-                ><h3>收入方资金归属</h3></el-col
+                ><h3>收入方资金归属(%)</h3>
+                <span>(请输入资金归属百分比)</span></el-col
               >
               <el-col :span="12" style="text-align: center"
-                ><h3>支出方资金归属</h3></el-col
+                ><h3>支出方资金归属(%)</h3>
+                <span>(请输入资金归属百分比)</span></el-col
               >
             </el-row>
             <el-row class="profit_box">
@@ -481,7 +486,7 @@ export default {
       title: "开票新增",
       loading: true,
       detailDialog: false,
-      operationWidth: 200, //操作列宽度
+      operationWidth: 220, //操作列宽度
       queryFrom: {
         //查询条件
       },
@@ -642,6 +647,7 @@ export default {
       allCollectionData: [], //所有账户信息列表
       formDataId: "", //编辑数据id
       profitObj: {},
+      typeStatus: "", //1是编辑 2是进账
     };
   },
   watch: {
@@ -663,11 +669,11 @@ export default {
           rate: 0, //税率
           payMethod: [], //支付方式
         };
-        this.affiliationData.forEach(item=>{
-          item.profit = 0
+        this.affiliationData.forEach((item) => {
+          item.profit = 0;
         });
-        this.affiliationData2.forEach(item=>{
-          item.profit = 0
+        this.affiliationData2.forEach((item) => {
+          item.profit = 0;
         });
         this.formDataId = "";
         this.$nextTick(() => {
@@ -690,9 +696,9 @@ export default {
     getAffiliationData() {
       this.$api.expense.getList().then((res) => {
         if (res.code == 200) {
-          res.data.forEach(item=>{
-            item.profit = 0
-          })
+          res.data.forEach((item) => {
+            item.profit = 0;
+          });
           this.affiliationData = JSON.parse(JSON.stringify(res.data));
           this.affiliationData2 = JSON.parse(JSON.stringify(res.data));
         } else {
@@ -709,6 +715,10 @@ export default {
       delete params.pageSize;
       this.$api.expense.invAccountExcel(params).then((res) => {
         if (res.code == 200) {
+          if (res.data == null) {
+            this.$message.error("暂无导出数据，请重试！");
+            return;
+          }
           let url = process.env.BASE_URL + "/upload/" + res.data; // 3.创建一个临时的url指向blob对象
           // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
           let a = document.createElement("a");
@@ -725,21 +735,21 @@ export default {
     //获取资金用途树数据
     getTreeList() {
       this.$api.expense.getAccountExpensesTreeList().then((res) => {
-        if(res.code == 200){
+        if (res.code == 200) {
           this.fundFlowData = res.data;
-          this.fundFlowSet()
-        }else{
+          this.fundFlowSet();
+        } else {
           this.$message.error(res.msg);
         }
       });
     },
     //资金用途数据转换     如果最后一项child数组长度为0把值变为null
-    fundFlowSet(data){
-      data = data || this.fundFlowData
-      for(var i = 0; i <data.length;i++) {
-        if(data[i].child.length){
-          this.fundFlowSet(data[i].child)
-        }else{
+    fundFlowSet(data) {
+      data = data || this.fundFlowData;
+      for (var i = 0; i < data.length; i++) {
+        if (data[i].child.length) {
+          this.fundFlowSet(data[i].child);
+        } else {
           data[i].child = null;
         }
       }
@@ -827,11 +837,12 @@ export default {
       let params = JSON.parse(JSON.stringify(this.formData));
       this.$refs.formData.validate((valid) => {
         if (valid) {
-          if (this.formDataId) {
+          //进账
+          if (this.formDataId && this.typeStatus == 2) {
             //转化资金归属
             params.entProfit = {};
             params.outProfit = {};
-            this.affiliationData.forEach((item) => { 
+            this.affiliationData.forEach((item) => {
               params.entProfit[item.profitEng] = item.profit;
             });
             this.affiliationData2.forEach((item) => {
@@ -846,8 +857,8 @@ export default {
               fundUse: this.formData.fundUse[this.formData.fundUse.length - 2], //资金用途
               fundFen: this.formData.fundUse[this.formData.fundUse.length - 1], //资金用途分项
               payoutTime: params.payoutTime, //进账日期
-              entProfit:params.entProfit, //收入方资金归属
-              outProfit:params.outProfit, //支出方资金归属
+              entProfit: params.entProfit, //收入方资金归属
+              outProfit: params.outProfit, //支出方资金归属
             };
             this.$api.expense.putInvAccountIncoice(obj).then((res) => {
               if (res.code == 200) {
@@ -857,6 +868,25 @@ export default {
                 this.$message.error(res.msg);
               }
             });
+            //编辑
+          } else if (this.formDataId && this.typeStatus == 1) {
+            params.invoiceBy = this.formData.invoiceBy.nameValue; //开票方
+            params.bigApplyAmount = toChies(params.invoiceMoney); //大写金额
+            params.invoiceSubjects =
+              params.invoiceSubjects1 + "*" + params.invoiceSubjects2; //开票科目
+            params.otherUnit = params.otherUnit.nameValue; //对方单位名称
+            params.company = params.otherUnit; //单位
+            delete params.payMethod;
+            delete params.payoutTime;
+            this.$api.expense.updateIncoice(params).then((res) => {
+              if (res.code == 200) {
+                this.detailDialog = false;
+                this.findPage();
+              } else {
+                this.$message.error(res.msg);
+              }
+            });
+            //新增
           } else {
             params.invoiceBy = this.formData.invoiceBy.nameValue; //开票方
             params.bigApplyAmount = toChies(params.invoiceMoney); //大写金额
@@ -907,10 +937,11 @@ export default {
       this.detailParams.pageSize = 10;
     },
     //编辑按钮
-    handleDetail(index) {
+    handleDetail(index, type) {
+      this.typeStatus = type;
       let row = index.row;
       this.formDataId = row.invoiceId;
-      this.title = "开票编辑";
+      this.title = type == 1 ? "开票编辑" : "开票进账";
       this.getDetailData(row.invoiceId);
       this.detailDialog = true;
     },
@@ -919,12 +950,22 @@ export default {
       this.$api.expense.detailInvAccountIncoice(id).then((res) => {
         if (res.code == 200) {
           let obj = this.collectionData.find(
-            (item) => item.bankCardNum == res.data.bankCardNum
+            (item) => item.bankCardNum == res.data.revBankCardNum
+          );
+          let obj2 = this.collectionData.find(
+            (item) => item.bankCardNum == res.data.outBankCardNum
           );
           if (obj) {
             res.data.invoiceBy = obj;
           }
-          this.formData = res.data;
+          if (obj2) {
+            res.data.otherUnit = obj;
+          }
+          if (this.typeStatus == 1) {
+            res.data.invoiceSubjects1 = res.data.invoiceSubjects.split('*')[0]
+            res.data.invoiceSubjects2 = res.data.invoiceSubjects.split('*')[1]
+          }
+          this.formData = JSON.parse(JSON.stringify(res.data));
         } else {
           this.$message.error(res.msg);
         }

src/views/FinancialManagement/ExpenseManagement/TransferRecord.vue

@@ -140,6 +140,10 @@ export default {
       delete params.pageSize;
       this.$api.expense.accountOperateExcel(params).then((res) => {
         if (res.code == 200) {
+          if (res.data == null) {
+            this.$message.error("暂无导出数据，请重试！");
+            return;
+          }
           let url = process.env.BASE_URL + "/upload/" + res.data; // 3.创建一个临时的url指向blob对象
           // 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
           let a = document.createElement("a");

src/views/PeopleManage/Player/PlayerManage.vue

@@ -416,7 +416,7 @@ export default {
       this.$api.user
         .findUserList({
           ...this.pageData,
-          dto: { ...data, deptId: this.deptId, agentFlag: "1" },
+          dto: { ...data, deptId: this.deptId, agentFlag: "1",roleId:'19'},
         })
         .then((res) => {
           if (res.code == 200 && res.data.records.length > 0) {

src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -627,7 +627,7 @@ export default {
       this.$api.user
         .findUserList({
           ...this.pageData,
-          dto: { ...data, deptId: this.deptId, agentFlag: "1" },
+          dto: { ...data, deptId: this.deptId, agentFlag: "1",roleId:'21' },
         })
         .then((res) => {
           if (res.code == 200 && res.data.records.length > 0) {

src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -616,33 +616,18 @@ export default {
       dialogVisible: false, // 新增编辑界面是否显示
       departmentList: [], // 选中公司的所有部门的集合
       deptInfo: {}, //选中机构的基本信息
-      user_statusoptions: JSON.parse(
-        localStorage.getItem("user_statusoptions")
-      ),
-      roles: JSON.parse(localStorage.getItem("find_all")),
-      option: [], //机构列表
+       option: [], //机构列表
       dialogPassword: false, //密码是否明文
       postOption:[]
     };
   },
   created() {
-    this.$api.role.postViewAll().then((res) => {
-      res.data.forEach(ele=>{
-        ele.postId=ele.postId+''
-      })
-      this.postOption = res.data
-    })
     // this.$api.role.findAll().then((res) => {
     //   this.roles = res.data
     // })
     //获取所有下拉框数据(字典)
     // this.getDictItems("sex");
     // this.getDictItems("user_status");
-    this.findLeftTreeData(); // 获取机构树的数据
-  },
-  mounted() {
-    //用像素初始化左边的split的宽度
-    this.changeTreeWidth(240); // 初始化树的宽度
   },
   watch: {
     containsSubDeptChecked() {
@@ -674,34 +659,6 @@ export default {
       // return row.sex+'1'
       // console.log(val,1)
     },
-    changeTreeWidth(widthVal) {
-      // 初始化树的宽度
-      this.leftSplitWidth = Math.ceil(
-        (widthVal / this.$refs.elMain.$el.clientWidth) * 100
-      );
-      this.rightSplitWidth = 100 - this.leftSplitWidth;
-    },
-    findLeftTreeData: function () {
-      this.$api.dept.findDeptTree().then((res) => {
-        this.treeDataRecursion(res.data, 2);
-        this.ztreeNodes = res.data;
-      });
-    },
-    //树过滤五级机构递归
-    treeDataRecursion(data, num,one) {
-      data = data || this.ztreeNodes;
-      one = one || 0;
-      one++;
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].comlevel == 5 && data[i].managementSource != num) {
-          // console.log(data[i].managementSource!=num)
-          data.splice(i, 1);
-          i = i - 1;
-        } else {
-          this.treeDataRecursion(data[i].children, num, one);
-        }
-      }
-    },
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件
       this.currentTreeNode = evt;