财务修改

src/views/finance/Invoicing/index.vue

@@ -3555,11 +3555,18 @@ export default {
         })
         .catch((_) => {});
     },
-    // 确认付费
+    // 确认开票
     confirmCharge() {
       this.$refs["ruless"].validate((valid) => {
         if (valid) {
           if (this.increase_s.length) {
+            let fMblnoList = []; // 定义存储列表的提单号
+            this.increase_s.map(e => {
+              const repeat = fMblnoList.some(item => item == e.fMblno)
+              if (!repeat) fMblnoList.push(e.fMblno)
+            })
+            this.queryParams.tMblno = fMblnoList.join(',');
+            if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno.slice(0, 199)
             // this.queryParams.fBillstatus = '4'
             let formDate = new window.FormData();
             formDate.append("tFee", JSON.stringify(this.queryParams));
@@ -4235,6 +4242,13 @@ export default {
     submitForm(res) {
       this.$refs["ruless"].validate((valid) => {
         if (valid) {
+          let fMblnoList = []; // 定义存储列表的提单号
+          this.increase_s.map(e => {
+            const repeat = fMblnoList.some(item => item == e.fMblno)
+            if (!repeat) fMblnoList.push(e.fMblno)
+          })
+          this.queryParams.tMblno = fMblnoList.join(',');
+          if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno.slice(0, 199)
           if (this.queryParams.fId == null) {
             // this.chargeList.fBillstatus = '1'
             this.queryParams.fBillstatus = "1";

src/views/finance/charge/index.vue

@@ -311,20 +311,8 @@
           :fixed="item.fixed"
         >
           <template slot-scope="scope">
-            <span v-if="item.label == 'createBy'">{{scope.row.createBy}}</span>
-            <span v-if="item.label == 'fBillno'">{{scope.row.fBillno}}</span>
-            <span v-if="item.label == 'fCtrlcorpid'">{{scope.row.fCtrlcorpid}}</span>
             <span v-if="item.label == 'createTime'">{{scope.row.createTime?scope.row.createTime.slice(0,10):''}}</span>
-            <span v-if="item.label == 'fAccbilldate'">{{scope.row.fAccbilldate}}</span>
-            <span v-if="item.label == 'fMblno'">{{scope.row.fMblno}}</span>
-            <span v-if="item.label == 'chargingMethod'">{{scope.row.chargingMethod}}</span>
-            <span v-if="item.label == 'invoiceNo'">{{scope.row.invoiceNo}}</span>
-            <span v-if="item.label == 'bank'">{{scope.row.bank}}</span>
-            <span v-if="item.label == 'waterBillNo'">{{scope.row.waterBillNo}}</span>
-            <span v-if="item.label == 'fAmtdr'">{{scope.row.fAmtdr}}</span>
-            <span v-if="item.label == 'fAmtcr'">{{scope.row.fAmtcr}}</span>
-            <span v-if="item.label == 'fRemarks'">{{scope.row.fRemarks}}</span>
-            <span v-if="item.label == 'fBillstatus'">{{scope.row.fBillstatus}}</span>
+            <span v-else>{{ scope.row[item.label] }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -521,6 +509,17 @@
             style="width: 200px"
             :disabled="notChange"/>
         </el-form-item>
+        <el-form-item label="账务金额">
+          <el-input
+            v-model="queryParams.fTotalamount"
+            clearable
+            size="small"
+            style="width: 200px"
+            :disabled="notChange"
+            placeholder="请输入账务金额"
+            v-input-limit="2"
+          />
+        </el-form-item>
 
         <el-form-item label="备注" prop="fRemarks">
           <el-input
@@ -1536,7 +1535,7 @@ export default {
         },
         {
           surface: "6",
-          label: "fMblno",
+          label: "tMblno",
           name: "提单号",
           checked: 0,
           width: 100,
@@ -1585,13 +1584,20 @@ export default {
         },
         {
           surface: "13",
+          label: "fTotalamount",
+          name: "账务金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "14",
           label: "fRemarks",
           name: "备注",
           checked: 0,
           width: 100,
         },
         {
-          surface: "14",
+          surface: "15",
           label: "fBillstatus",
           name: "状态",
           checked: 0,
@@ -2213,7 +2219,7 @@ export default {
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = "合计";
-        } else if (column.label == '应收合计' || column.label == '实收合计' || column.label == '金额' || column.label == '本次金额') {
+        } else if (column.label == '应收合计' || column.label == '实收合计' || column.label == '金额' || column.label == '本次金额' || column.label == '账务金额') {
           const values = data.map((item) => Number(item[column.property]));
           if (!values.every((value) => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -2778,6 +2784,13 @@ export default {
       this.$refs["ruless"].validate((valid) => {
         if (valid) {
           if (this.increase_s.length) {
+            let fMblnoList = []; // 定义存储列表的提单号
+            this.increase_s.map(e => {
+              const repeat = fMblnoList.some(item => item == e.fMblno)
+              if (!repeat) fMblnoList.push(e.fMblno)
+            })
+            this.queryParams.tMblno = fMblnoList.join(',');
+            if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno.slice(0, 199)
             // this.queryParams.fBillstatus = '4'
             let formDate = new window.FormData();
             formDate.append("tFee", JSON.stringify(this.queryParams));
@@ -3459,6 +3472,13 @@ export default {
     submitForm(res) {
       this.$refs["ruless"].validate((valid) => {
         if (valid) {
+          let fMblnoList = []; // 定义存储列表的提单号
+          this.increase_s.map(e => {
+            const repeat = fMblnoList.some(item => item == e.fMblno)
+            if (!repeat) fMblnoList.push(e.fMblno)
+          })
+          this.queryParams.tMblno = fMblnoList.join(',');
+          if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno.slice(0, 199)
           if (!this.queryParams.fId) {
             // this.chargeList.fBillstatus = '1'
             this.queryParams.fBillstatus = "1";

src/views/finance/contrast/index.vue

@@ -86,17 +86,6 @@
           <el-row>
             <div v-show="show">
               <el-col :span="6">
-                <el-form-item label="备注" prop="fRemarks">
-                  <el-input
-                    v-model="tablefilter.fRemarks"
-                    placeholder="请输入备注"
-                    clearable
-                    style="width: 100%"
-                    @keyup.enter.native="handleQuery"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
                 <el-form-item label="对账日期" prop="timeInterval">
                   <el-date-picker
                     v-model="tablefilter.timeInterval"
@@ -111,6 +100,28 @@
                   ></el-date-picker>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item label="业务编号" prop="fBillno">
+                  <el-input
+                    v-model="tablefilter.fBillno"
+                    placeholder="请输入备注"
+                    clearable
+                    style="width: 100%"
+                    @keyup.enter.native="handleQuery"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="备注" prop="fRemarks">
+                  <el-input
+                    v-model="tablefilter.fRemarks"
+                    placeholder="请输入备注"
+                    clearable
+                    style="width: 100%"
+                    @keyup.enter.native="handleQuery"
+                  />
+                </el-form-item>
+              </el-col>
             </div>
           </el-row>
         </el-form>
@@ -809,7 +820,7 @@
           :summary-method="listTotal"
           v-if="typevalue != 2"
         >
-          <el-table-column label="行号" align="center" type="index" />
+          <el-table-column label="行号" align="center" type="index" fixed />
           <el-table-column
             v-for="(item, index) in getRowList2"
             :key="index"
@@ -894,6 +905,7 @@
             label="操作"
             align="center"
             class-name="small-padding fixed-width"
+            fixed="right"
           >
             <template slot-scope="scope">
               <el-button
@@ -1839,7 +1851,7 @@ import {
   contrastExport,
   exportWarehousebillsitems
 } from "@/api/finance/contrast";
-// import { listCorps } from "@/api/basicdata/corps";
+import { listCorps as getCorp } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
 import AddOrUpdate from "@/views/viewApproval";
 import { queryUserVal } from "@/api/warehouseBusiness/agreement";
@@ -2584,6 +2596,7 @@ export default {
       hide: false,
       cancelButton: true,
       businessTypeOption: [],
+
       // 传值对象
       TWareHouseFees: {
         fCorpid: "",
@@ -3421,6 +3434,13 @@ export default {
       this.$refs["ruless"].validate((valid) => {
         if (valid) {
           if (this.DzfeeList.length) {
+            let fMblnoList = []; // 定义存储列表的提单号
+            this.DzfeeList.map(e => {
+              const repeat = fMblnoList.some(item => item == e.fMblno)
+              if (!repeat) fMblnoList.push(e.fMblno)
+            })
+            this.queryParams.tMblno = fMblnoList.join(',');
+            if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno.slice(0, 199)
             // this.queryParams.fBillstatus = '4'
             let formDate = new window.FormData();
             formDate.append("tFee", JSON.stringify(this.queryParams));
@@ -4720,6 +4740,13 @@ export default {
     submitForm(type, res) {
       this.$refs["ruless"].validate((valid) => {
         if (valid) {
+          let fMblnoList = []; // 定义存储列表的提单号
+          this.DzfeeList.map(e => {
+            const repeat = fMblnoList.some(item => item == e.fMblno)
+            if (!repeat) fMblnoList.push(e.fMblno)
+          })
+          this.queryParams.tMblno = fMblnoList.join(',');
+          if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno.slice(0, 199)
           if (!this.queryParams.fId || this.queryParams.fId == null) {
             // this.queryParams.fBillstatus = "1";
             let formData = new window.FormData();

src/views/finance/payment/index.vue

@@ -3560,6 +3560,13 @@ export default {
       this.$refs["ruless"].validate((valid) => {
         if (valid) {
           if (this.increase_s.length) {
+            let fMblnoList = []; // 定义存储列表的提单号
+            this.increase_s.map(e => {
+              const repeat = fMblnoList.some(item => item == e.fMblno)
+              if (!repeat) fMblnoList.push(e.fMblno)
+            })
+            this.queryParams.tMblno = fMblnoList.join(',');
+            if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno.slice(0, 199)
             // this.queryParams.fBillstatus = '4'
             let formDate = new window.FormData();
             formDate.append("tFee", JSON.stringify(this.queryParams));
@@ -4237,6 +4244,13 @@ export default {
     submitForm(res) {
       this.$refs["ruless"].validate((valid) => {
         if (valid) {
+          let fMblnoList = []; // 定义存储列表的提单号
+          this.increase_s.map(e => {
+            const repeat = fMblnoList.some(item => item == e.fMblno)
+            if (!repeat) fMblnoList.push(e.fMblno)
+          })
+          this.queryParams.tMblno = fMblnoList.join(',');
+          if (this.queryParams.tMblno.length > 200) this.queryParams.tMblno.slice(0, 199)
           if (this.queryParams.fId == null) {
             // this.chargeList.fBillstatus = '1'
             this.queryParams.fBillstatus = "1";

src/views/finance/query/index.vue

@@ -166,6 +166,73 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :xs="12" :sm="6">
+              <el-form-item label="结算状态">
+                <el-select
+                  v-model="queryParams.fStalmountStatus"
+                  filterable
+                  clearable
+                  placeholder="请选择结算状态"
+                  style="width: 100%"
+                  @clear="queryParams.fStalmountStatus = null"
+                >
+                  <el-option label="已结算" :value="1"/>
+                  <el-option label="未结算" :value="2"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="12" :sm="6">
+              <el-form-item label="对账状态">
+                <el-select
+                  v-model="queryParams.feesStatus"
+                  filterable
+                  clearable
+                  placeholder="请选择对账状态"
+                  style="width: 100%"
+                  @clear="queryParams.feesStatus = null"
+                >
+                  <el-option label="已对账" :value="1"/>
+                  <el-option label="未对账" :value="2"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="12" :sm="6">
+              <el-form-item label="发票状态">
+                <el-select
+                  v-model="queryParams.fInvnosStatus"
+                  filterable
+                  clearable
+                  placeholder="请选择发票状态"
+                  style="width: 100%"
+                  @clear="queryParams.fInvnosStatus = null"
+                >
+                  <el-option label="已开票" :value="1"/>
+                  <el-option label="未开票" :value="2"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="发货方">
+                <el-select
+                  v-model="queryParams.fShipper"
+                  clearable
+                  filterable
+                  placeholder="请输入关键词"
+                  style="width: 100%"
+                  allow-create
+                  default-first-option
+                >
+                  <el-option
+                    v-for="(item, index) in fMblnoOptions"
+                    :key="index.fId"
+                    :label="item.fCname"
+                    :value="item.fCname"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </div>
       </el-collapse-transition>
     </el-form>
@@ -302,8 +369,8 @@
           <span v-if="item.label == 'fDc'">
             {{ scope.row.fDc == 'D'? '收': '付' }}
           </span>
-          <span v-else-if="item.label == 'fFeeUnitid'">
-            {{ scope.row.fFeeUnitid | fFeeUnitFormat(fFeetUnitOptions) }}
+          <span v-else-if="item.label == 'fFeeunitid'">
+            {{ scope.row.fFeeunitid | fFeeUnitFormat(fFeetUnitOptions) }}
           </span>
           <span v-else-if="item.label == 'fBilltype'">
             {{ scope.row.fBilltype | billTypeFormat(billTypeList) }}
@@ -463,7 +530,7 @@ export default {
         },
         {
           surface: "15",
-          label: "fFeeUnitid",
+          label: "fFeeunitid",
           name: "计价单位",
           checked: 0,
           width: 100,
@@ -505,6 +572,13 @@ export default {
         },
         {
           surface: "20",
+          label: "fShipper",
+          name: "发货方(货主)",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "20",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -519,6 +593,7 @@ export default {
       billTypeList: [],
       fNameOptions:[],
       fStltypeOptions: [],
+      fCorpOptions: [],
     }
   },
   created() {