财务新增业务编号

src/views/finance/charge/index.vue

@@ -894,7 +894,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="费用名称" prop="fFeeid">
               <el-select
                 v-model="queryParameter.fFeeid"
@@ -957,7 +957,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6" style="width: 240px"></el-col>
+            <el-col :span="6">
+              <el-form-item label="业务编号">
+                <el-input  v-model="queryParameter.fBillno" placeholder="业务编号" clearable />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
@@ -1155,7 +1159,15 @@
                 v-model="scope.row.fAmt" v-if="item.label == 'fAmt'"
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 @change="imgChangeI(scope.row)"/>
-              <el-input v-model="scope.row.fRemarks" v-if="item.label == 'fRemarks'"/>
+              <span v-if="item.label == 'fBillno'">{{
+                  scope.row.fBillno
+                }}</span>
+              <el-input
+                v-model="scope.row.invoiceNo"
+                v-if="item.label == 'invoiceNo'"
+                placeholder="请输入发票号"
+              />
+              <el-input v-model="scope.row.fRemarks" v-if="item.label == 'fRemarks'" placeholder="请输入备注"/>
             </template>
           </el-table-column>
 
@@ -1591,13 +1603,20 @@ export default {
         },
         {
           surface: "14",
+          label: "fSrcBillno",
+          name: "业务编号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "15",
           label: "fRemarks",
           name: "备注",
           checked: 0,
           width: 100,
         },
         {
-          surface: "15",
+          surface: "16",
           label: "fBillstatus",
           name: "状态",
           checked: 0,
@@ -1677,6 +1696,20 @@ export default {
         },
         {
           surface: "11",
+          label: "fBillno",
+          name: "业务编号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "12",
+          label: "invoiceNo",
+          name: "发票号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "13",
           label: "fRemarks",
           name: "备注",
           checked: 0,
@@ -1756,6 +1789,20 @@ export default {
         },
         {
           surface: "11",
+          label: "fBillno",
+          name: "业务编号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "12",
+          label: "invoiceNo",
+          name: "发票号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "13",
           label: "fRemarks",
           name: "备注",
           checked: 0,
@@ -2785,12 +2832,17 @@ export default {
         if (valid) {
           if (this.increase_s.length) {
             let fMblnoList = []; // 定义存储列表的提单号
+            let fBillnoList = [];
             this.increase_s.map(e => {
               const repeat = fMblnoList.some(item => item == e.fMblno)
+              const repeat1 = fBillnoList.some(item => item == e.fBillno)
               if (!repeat) fMblnoList.push(e.fMblno)
+              if (!repeat1) fBillnoList.push(e.fBillno)
             })
             this.queryParams.tMblno = fMblnoList.join(',');
+            this.$set(this.queryParams, 'fSrcBillno', fBillnoList.join(','));
             if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno = this.queryParams.tMblno.slice(0, 199)
+            if (this.queryParams.fSrcBillno.length > 200) this.queryParams.fSrcBillno = this.queryParams.fSrcBillno.slice(0, 199)
             // this.queryParams.fBillstatus = '4'
             let formDate = new window.FormData();
             formDate.append("tFee", JSON.stringify(this.queryParams));
@@ -3473,12 +3525,17 @@ export default {
       this.$refs["ruless"].validate((valid) => {
         if (valid) {
           let fMblnoList = []; // 定义存储列表的提单号
+          let fBillnoList = [];
           this.increase_s.map(e => {
             const repeat = fMblnoList.some(item => item == e.fMblno)
+            const repeat1 = fBillnoList.some(item => item == e.fBillno)
             if (!repeat) fMblnoList.push(e.fMblno)
+            if (!repeat1) fBillnoList.push(e.fBillno)
           })
           this.queryParams.tMblno = fMblnoList.join(',');
+          this.$set(this.queryParams, 'fSrcBillno', fBillnoList.join(','));
           if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno = this.queryParams.tMblno.slice(0, 199)
+          if (this.queryParams.fSrcBillno.length > 200) this.queryParams.fSrcBillno = this.queryParams.fSrcBillno.slice(0, 199)
           if (!this.queryParams.fId) {
             // this.chargeList.fBillstatus = '1'
             this.queryParams.fBillstatus = "1";

src/views/finance/contrast/index.vue

@@ -3487,7 +3487,7 @@ export default {
             let fBillnoList = [];
             this.DzfeeList.map(e => {
               const repeat = fMblnoList.some(item => item == e.fMblno)
-              const repeat1 = fMblnoList.some(item => item == e.fBillno)
+              const repeat1 = fBillnoList.some(item => item == e.fBillno)
               if (!repeat) fMblnoList.push(e.fMblno)
               if (!repeat1) fBillnoList.push(e.fBillno)
             })
@@ -4800,7 +4800,7 @@ export default {
           let fBillnoList = [];
           this.DzfeeList.map(e => {
             const repeat = fMblnoList.some(item => item == e.fMblno)
-            const repeat1 = fMblnoList.some(item => item == e.fBillno)
+            const repeat1 = fBillnoList.some(item => item == e.fBillno)
             if (!repeat) fMblnoList.push(e.fMblno)
             if (!repeat1) fBillnoList.push(e.fBillno)
           })

src/views/finance/payment/index.vue

@@ -929,7 +929,7 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="费用名称" prop="fFeeid">
                   <template>
                     <el-select
@@ -993,7 +993,11 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="6" style="width: 240px"></el-col>
+              <el-col :span="6">
+                <el-form-item label="业务编号">
+                  <el-input  v-model="queryParameter.fBillno" placeholder="业务编号" clearable />
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
@@ -1219,9 +1223,18 @@
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   @change="imgChangeI(scope.row)"
                 />
+                <span v-if="item.label == 'fBillno'">{{
+                    scope.row.fBillno
+                  }}</span>
+                <el-input
+                  v-model="scope.row.invoiceNo"
+                  v-if="item.label == 'invoiceNo'"
+                  placeholder="请输入发票号"
+                />
                 <el-input
                   v-model="scope.row.fRemarks"
                   v-if="item.label == 'fRemarks'"
+                  placeholder="请输入备注"
                 />
               </template>
             </el-table-column>
@@ -2328,13 +2341,20 @@ export default {
         },
         {
           surface: "13",
+          label: "fSrcBillno",
+          name: "业务编号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "14",
           label: "fRemarks",
           name: "备注",
           checked: 0,
           width: 100,
         },
         {
-          surface: "14",
+          surface: "15",
           label: "fBillstatus",
           name: "状态",
           checked: 0,
@@ -2418,6 +2438,20 @@ export default {
         },
         {
           surface: "11",
+          label: "fBillno",
+          name: "业务编号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "12",
+          label: "invoiceNo",
+          name: "发票号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "13",
           label: "fRemarks",
           name: "备注",
           checked: 0,
@@ -2497,6 +2531,20 @@ export default {
         },
         {
           surface: "11",
+          label: "fBillno",
+          name: "业务编号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "12",
+          label: "invoiceNo",
+          name: "发票号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "13",
           label: "fRemarks",
           name: "备注",
           checked: 0,
@@ -3561,12 +3609,17 @@ export default {
         if (valid) {
           if (this.increase_s.length) {
             let fMblnoList = []; // 定义存储列表的提单号
+            let fBillnoList = [];
             this.increase_s.map(e => {
               const repeat = fMblnoList.some(item => item == e.fMblno)
+              const repeat1 = fBillnoList.some(item => item == e.fBillno)
               if (!repeat) fMblnoList.push(e.fMblno)
+              if (!repeat1) fBillnoList.push(e.fBillno)
             })
             this.queryParams.tMblno = fMblnoList.join(',');
+            this.$set(this.queryParams, 'fSrcBillno', fBillnoList.join(','));
             if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno = this.queryParams.tMblno.slice(0, 199)
+            if (this.queryParams.fSrcBillno.length > 200) this.queryParams.fSrcBillno = this.queryParams.fSrcBillno.slice(0, 199)
             // this.queryParams.fBillstatus = '4'
             let formDate = new window.FormData();
             formDate.append("tFee", JSON.stringify(this.queryParams));
@@ -4245,12 +4298,17 @@ export default {
       this.$refs["ruless"].validate((valid) => {
         if (valid) {
           let fMblnoList = []; // 定义存储列表的提单号
+          let fBillnoList = [];
           this.increase_s.map(e => {
             const repeat = fMblnoList.some(item => item == e.fMblno)
+            const repeat1 = fBillnoList.some(item => item == e.fBillno)
             if (!repeat) fMblnoList.push(e.fMblno)
+            if (!repeat1) fBillnoList.push(e.fBillno)
           })
           this.queryParams.tMblno = fMblnoList.join(',');
+          this.$set(this.queryParams, 'fSrcBillno', fBillnoList.join(','));
           if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno = this.queryParams.tMblno.slice(0, 199)
+          if (this.queryParams.fSrcBillno.length > 200) this.queryParams.fSrcBillno = this.queryParams.fSrcBillno.slice(0, 199)
           if (this.queryParams.fId == null) {
             // this.chargeList.fBillstatus = '1'
             this.queryParams.fBillstatus = "1";