Przeglądaj źródła

费用收入、费用支出、开票进账等资金归属调整为填写金额,调整相关代码

haizhouwang 2 lat temu
rodzic
commit
30e8366ea3

+ 27 - 19
src/views/FinancialManagement/ExpenseManagement/ExpenseApplyFor.vue

@@ -304,13 +304,11 @@
           </el-row>
           <el-row style="margin-bottom: 20px">
             <el-col :span="12" style="text-align: center"
-              ><h3>支出方资金归属(%)</h3>
-              <span>(请输入资金归属百分比)</span></el-col
-            >
+              ><h3 style="margin-left: 120px">支出方资金归属</h3>
+            </el-col>
             <el-col :span="12" style="text-align: center"
-              ><h3>收入方资金归属(%)</h3>
-              <span>(请输入资金归属百分比)</span></el-col
-            >
+              ><h3 style="margin-left: 120px">收入方资金归属</h3>
+            </el-col>
           </el-row>
           <el-row class="profit_box">
             <el-col :span="12">
@@ -323,8 +321,8 @@
                 <el-input-number
                   v-model="item.profit"
                   :min="0"
-                  placeholder="请输入利润(%)"
-                  :max="100"
+                  placeholder="请输入利润"
+                  :max="999999999999999"
                   label=""
                 ></el-input-number>
               </el-form-item>
@@ -339,8 +337,8 @@
                 <el-input-number
                   v-model="item.profit"
                   :min="0"
-                  placeholder="请输入利润(%)"
-                  :max="100"
+                  placeholder="请输入利润"
+                  :max="999999999999999"
                   label=""
                 ></el-input-number>
               </el-form-item>
@@ -790,8 +788,8 @@ export default {
     },
     //搜索列表功能
     queryStaffInfo() {
-      this.pageRequest.pageNo = 1
-      this.pageRequest.pageSize = 20
+      this.pageRequest.pageNo = 1;
+      this.pageRequest.pageSize = 20;
       this.findPage();
     },
     //查询列表
@@ -800,10 +798,12 @@ export default {
         this.pageRequest.pageNo = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
-      let obj = JSON.parse(JSON.stringify({ ...this.queryFrom, ...this.pageRequest }))
-      if (obj.applyTime!=null&&obj.applyTime.length>0) {
+      let obj = JSON.parse(
+        JSON.stringify({ ...this.queryFrom, ...this.pageRequest })
+      );
+      if (obj.applyTime != null && obj.applyTime.length > 0) {
         obj.applyTimeStart = obj.applyTime[0];
-        obj.applyTimeEnd= obj.applyTime[1];
+        obj.applyTimeEnd = obj.applyTime[1];
       }
       delete obj.applyTime;
       this.$api.expense
@@ -946,7 +946,7 @@ export default {
                   it.bankCardNum +
                   "   " +
                   it.bank;
-                it.nameValue =it.name
+                it.nameValue = it.name;
                 // it.nameValue =
                 //   item.accountName + "   " + it.bankCardNum + "   " + it.bank;
               });
@@ -987,7 +987,7 @@ export default {
     resetForm() {
       this.expenseDialog = false;
     },
-    //导出事件
+    //提交事件
     submitForm() {
       let params = JSON.parse(JSON.stringify(this.tableForm));
       this.$refs.tableForm.validate((valid) => {
@@ -1013,11 +1013,19 @@ export default {
           params.entProfit = {};
           params.outProfit = {};
           this.affiliationData.forEach((item) => {
-            params.entProfit[item.profitEng] = item.profit;
+            params.entProfit[item.profitEng] =
+              item.profit == null ? 0 : item.profit;
           });
           this.affiliationData2.forEach((item) => {
-            params.outProfit[item.profitEng] = item.profit*-1;
+            params.outProfit[item.profitEng] =
+              item.profit == 0 || item.profit == null ? 0 : item.profit * -1;
           });
+          // this.affiliationData.forEach((item) => {
+          //   params.entProfit[item.profitEng] = item.profit;
+          // });
+          // this.affiliationData2.forEach((item) => {
+          //   params.outProfit[item.profitEng] = item.profit==0?item.profit:item.profit*-1;
+          // });
           //转化资金归属
           if (this.expendDataId) {
             //修改

+ 10 - 10
src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -355,12 +355,12 @@
         </el-row>
         <el-row>
           <el-col :span="12" style="text-align: center"
-            ><h3>支出方资金归属(%)</h3>
-            <span>(请输入资金归属百分比)</span></el-col
+            ><h3 style="margin-left: 120px;">支出方资金归属</h3>
+           </el-col
           >
           <el-col :span="12" style="text-align: center"
-            ><h3>收入方资金归属(%)</h3>
-            <span>(请输入资金归属百分比)</span></el-col
+            ><h3 style="margin-left: 120px;">收入方资金归属</h3>
+           </el-col
           >
         </el-row>
         <el-row class="profit_box">
@@ -374,8 +374,8 @@
               <el-input-number
                 v-model="item.profit"
                 :min="0"
-                placeholder="请输入利润(%)"
-                :max="100"
+                placeholder="请输入利润"
+                :max="99999999999999"
                 label=""
               ></el-input-number>
             </el-form-item>
@@ -390,8 +390,8 @@
               <el-input-number
                 v-model="item.profit"
                 :min="0"
-                placeholder="请输入利润(%)"
-                :max="100"
+                placeholder="请输入利润"
+                :max="99999999999999"
                 label=""
               ></el-input-number>
             </el-form-item>
@@ -947,10 +947,10 @@ export default {
       obj.entProfit = {};
       obj.outProfit = {};
       this.affiliationData.forEach((item) => {
-        obj.entProfit[item.profitEng] = item.profit;
+        obj.entProfit[item.profitEng] = item.profit==null?0:item.profit;
       });
       this.affiliationData2.forEach((item) => {
-        obj.outProfit[item.profitEng] = item.profit*-1;
+        obj.outProfit[item.profitEng] = item.profit==0||item.profit==null?0:item.profit*-1;
       });
       //转化资金归属
       this.$refs.inComeFormData.validate((valid) => {

+ 19 - 13
src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -364,13 +364,11 @@
             </el-row>
             <el-row>
               <el-col :span="12" style="text-align: center"
-                ><h3>收入方资金归属(%)</h3>
-                <span>(请输入资金归属百分比)</span></el-col
-              >
+                ><h3 style="margin-left: 120px">收入方资金归属</h3>
+              </el-col>
               <el-col :span="12" style="text-align: center"
-                ><h3>支出方资金归属(%)</h3>
-                <span>(请输入资金归属百分比)</span></el-col
-              >
+                ><h3 style="margin-left: 120px">支出方资金归属</h3>
+              </el-col>
             </el-row>
             <el-row class="profit_box">
               <el-col :span="12">
@@ -383,8 +381,8 @@
                   <el-input-number
                     v-model="item.profit"
                     :min="0"
-                    placeholder="请输入利润(%)"
-                    :max="100"
+                    placeholder="请输入利润"
+                    :max="9999999999999"
                     label=""
                   ></el-input-number>
                 </el-form-item>
@@ -399,8 +397,8 @@
                   <el-input-number
                     v-model="item.profit"
                     :min="0"
-                    placeholder="请输入利润(%)"
-                    :max="100"
+                    placeholder="请输入利润"
+                    :max="9999999999999"
                     label=""
                   ></el-input-number>
                 </el-form-item>
@@ -780,7 +778,7 @@ export default {
                   it.bankCardNum +
                   "   " +
                   it.bank;
-                it.nameValue = it.name
+                it.nameValue = it.name;
                 // it.nameValue =
                 //   it.accountName + "   " + it.bankCardNum + "   " + it.bank;
                 arr.push(it);
@@ -821,11 +819,19 @@ export default {
             params.entProfit = {};
             params.outProfit = {};
             this.affiliationData.forEach((item) => {
-              params.entProfit[item.profitEng] = item.profit;
+              params.entProfit[item.profitEng] =
+                item.profit == null ? 0 : item.profit;
             });
             this.affiliationData2.forEach((item) => {
-              params.outProfit[item.profitEng] = item.profit * -1;
+              params.outProfit[item.profitEng] =
+                item.profit == 0 || item.profit == null ? 0 : item.profit * -1;
             });
+            // this.affiliationData.forEach((item) => {
+            //   params.entProfit[item.profitEng] = item.profit;
+            // });
+            // this.affiliationData2.forEach((item) => {
+            //   params.outProfit[item.profitEng] = item.profit * -1;
+            // });
             //转化资金归属
             let obj = {
               invoiceId: this.formDataId, //id