修改费用收入、支出、开票的新增编辑单位传参

src/http/moudules/expense.js

@@ -137,7 +137,7 @@ export const getAccountExcelById = (id) => {
 //新增费用申请数据
 export const insert = (data) => {
     return axios({
-        url: '/accountExcel/invert',
+        url: '/accountExcel/insert',
         method: "post",
         data
     })

src/views/FinancialManagement/ExpenseManagement/ExpenseApplyFor.vue

@@ -44,12 +44,6 @@
             value-format="yyyy-MM-dd"
           >
           </el-date-picker>
-          <!-- <el-date-picker
-            v-model="queryFrom.applyTime"
-            type="date"
-            placeholder="选择日期"
-          >
-          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="queryStaffInfo"
@@ -936,8 +930,9 @@ export default {
                   it.bankCardNum +
                   "   " +
                   it.bank;
-                it.nameValue =
-                  item.accountName + "   " + it.bankCardNum + "   " + it.bank;
+                it.nameValue =it.name
+                // it.nameValue =
+                //   item.accountName + "   " + it.bankCardNum + "   " + it.bank;
               });
               arr.push(...item.invAccountCardList);
               //获取全部内部用户

src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -910,8 +910,9 @@ export default {
                   it.bankCardNum +
                   "   " +
                   it.bank;
-                it.nameValue =
-                  item.accountName + "   " + it.bankCardNum + "   " + it.bank;
+                it.nameValue = it.name
+                // it.nameValue =
+                //   item.accountName + "   " + it.bankCardNum + "   " + it.bank;
               });
               arr.push(...item.invAccountCardList);
             }

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -57,12 +57,6 @@
             value-format="yyyy-MM-dd"
           >
           </el-date-picker>
-          <!-- <el-date-picker
-            v-model="pageRequest.invoiceTime"
-            value-format="yyyy-MM-dd"
-            type="date"
-            placeholder="选择开票日期"
-          ></el-date-picker> -->
         </el-form-item>
         <el-form-item
           ><el-button type="primary" size="small" @click="queryStaffInfo"
@@ -365,43 +359,9 @@
                       checkStrictly: false,
                     }"
                   ></el-cascader>
-                  <!-- <el-select
-                    v-model="formData.fundUse"
-                    placeholder=""
-                  >
-                    <el-option
-                      v-for="item in fundFlowData"
-                      :key="item.value"
-                      :label="item.category"
-                      :value="item.category"
-                    >
-                    </el-option>
-                  </el-select> -->
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row>
-              <el-col :span="12">
-                <el-form-item label="资金用途分项" prop="fundFen">
-                  <el-cascader
-                    v-model="formData.fundFen"
-                    :show-all-levels="false"
-                    :clearable="true"
-                    :checkStrictly="true"
-                    :emitPath="false"
-                    placeholder=""
-                    :options="fundFlowData"
-                    filterable
-                    :props="{
-                      children: 'child',
-                      label: 'category',
-                      value: 'category',
-                      checkStrictly: false,
-                    }"
-                  ></el-cascader>
-                </el-form-item>
-              </el-col>
-            </el-row> -->
             <el-row>
               <el-col :span="12" style="text-align: center"
                 ><h3>收入方资金归属(%)</h3>
@@ -820,8 +780,9 @@ export default {
                   it.bankCardNum +
                   "   " +
                   it.bank;
-                it.nameValue =
-                  it.accountName + "   " + it.bankCardNum + "   " + it.bank;
+                it.nameValue = it.name
+                // it.nameValue =
+                //   it.accountName + "   " + it.bankCardNum + "   " + it.bank;
                 arr.push(it);
               });
             }
@@ -960,6 +921,10 @@ export default {
     handleDetail(index, type) {
       this.typeStatus = type;
       let row = index.row;
+      if (row.invoiceMoney < 0) {
+        this.$message.error("对冲票据，无法进账");
+        return;
+      }
       this.formDataId = row.invoiceId;
       this.title = type == 1 ? "开票编辑" : "开票进账";
       this.getDetailData(row.invoiceId);
@@ -999,9 +964,9 @@ export default {
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
       let params = JSON.parse(JSON.stringify(this.pageRequest));
-      if (params.invoiceTime!=null&&params.invoiceTime.length>0) {
+      if (params.invoiceTime != null && params.invoiceTime.length > 0) {
         params.invoiceTimeStart = params.invoiceTime[0];
-        params.invoiceTimeEnd= params.invoiceTime[1];
+        params.invoiceTimeEnd = params.invoiceTime[1];
       }
       delete params.invoiceTime;
       this.$api.expense