财务管理 去掉必填项 修改付费申请弹窗

src/components/part-library/main.vue

@@ -158,7 +158,7 @@ export default {
     },
     //点击搜索按钮触发
     searchChange(params, done) {
-      this.search = this.deepClone(params);
+      this.search = c;
       this.getList(this.page, params);
       done();
     },

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -478,20 +478,20 @@ export default {
                 }
             ],
             rules: {
-                branchName: [{
-                    required: true,
-                    message: '',
-                    trigger: 'blur'
-                },],
+                // branchName: [{
+                //     required: true,
+                //     message: '',
+                //     trigger: 'blur'
+                // },],
                 // corpCnName: [
                 //     { required: true, message: '请输入付费对象', trigger: 'blur' },
                 // ],
                 // bankId: [
                 //     { required: true, message: '请输入开户银行', trigger: 'blur' },
                 // ],
-                remarks: [
-                    { required: true, message: '请输入付费事由', trigger: 'blur' },
-                ],
+                // remarks: [
+                //     { required: true, message: '请输入付费事由', trigger: 'blur' },
+                // ],
                 billDate: [
                     { required: true, message: '请选择结算日期', trigger: 'blur' },
                 ],

src/views/iosBasicData/OceanFreightImport/bills/index.vue

@@ -1037,73 +1037,73 @@ export default {
                         ],
                         overHidden: true
                     },
-                    {
-                        label: "本币应收",
-                        prop: "amountDr",
-                        width: "160",
-                        overHidden: true
-                    },
-                    {
-                        label: "本币应付",
-                        prop: "amountCr",
-                        width: "160",
-                        overHidden: true
-                    },
-                    {
-                        label: "本币利润",
-                        prop: "amountProfit",
-                        width: "160",
-                        overHidden: true
-                    },
-                    {
-                        // label: "综合 USD 应付(USD) - 非 USD 外币转换为 USD",
-                        label: "综合外币应付",
-                        prop: "amountCrUsd",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "综合外币利润",
-                        prop: "amountProfitUsd",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "合计本币应收",
-                        prop: "amountDrLoc",
-                        width: "160",
-                        overHidden: true
-                    },
-                    {
-                        label: "合计本币应付(",
-                        prop: "amountCrLoc",
-                        width: "160",
-                        overHidden: true
-                    },
-                    {
-                        label: "合计本币利润",
-                        prop: "amountProfitLoc",
-                        width: "160",
-                        overHidden: true
-                    },
-                    {
-                        label: "应收海运费",
-                        prop: "oceanFreightDr",
-                        width: "160",
-                        overHidden: true
-                    },
-                    {
-                        label: "应付海运费",
-                        prop: "oceanFreightCr",
-                        width: "160",
-                        overHidden: true
-                    },
-                    {
-                        label: "海运费利润",
-                        prop: "oceanFreightProfit",
-                        width: "160",
-                        overHidden: true
-                    },
+                    // {
+                    //     label: "本币应收",
+                    //     prop: "amountDr",
+                    //     width: "160",
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "本币应付",
+                    //     prop: "amountCr",
+                    //     width: "160",
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "本币利润",
+                    //     prop: "amountProfit",
+                    //     width: "160",
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     // label: "综合 USD 应付(USD) - 非 USD 外币转换为 USD",
+                    //     label: "综合外币应付",
+                    //     prop: "amountCrUsd",
+                    //     width: "120",
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "综合外币利润",
+                    //     prop: "amountProfitUsd",
+                    //     width: "120",
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "合计本币应收",
+                    //     prop: "amountDrLoc",
+                    //     width: "160",
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "合计本币应付",
+                    //     prop: "amountCrLoc",
+                    //     width: "160",
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "合计本币利润",
+                    //     prop: "amountProfitLoc",
+                    //     width: "160",
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "应收海运费",
+                    //     prop: "oceanFreightDr",
+                    //     width: "160",
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "应付海运费",
+                    //     prop: "oceanFreightCr",
+                    //     width: "160",
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "海运费利润",
+                    //     prop: "oceanFreightProfit",
+                    //     width: "160",
+                    //     overHidden: true
+                    // },
                     {
                         label: "应收对账状态",
                         prop: "checkDrStatusDescr",

src/views/iosBasicData/PaymentApplication/assembly/searchPopup.vue

@@ -7,10 +7,26 @@
                 :header-cell-class-name="headerClassName" @search-change="searchChange" @search-reset="searchReset"
                 @selection-change="selectionChange" :search.sync="query">
                 <template slot="menuLeft">
-                    <el-tabs v-model="activeName" @tab-click="handleClick">
-                        <el-tab-pane label="查看数据" name="query" />
-                        <el-tab-pane label="选择数据" name="pick" />
-                    </el-tabs>
+                    <div style="display:flex;">
+                        <el-tabs v-model="activeName" @tab-click="handleClick">
+                            <el-tab-pane label="查看数据" name="query" />
+                            <el-tab-pane label="已选择数据" name="pick" />
+                        </el-tabs>
+                        <div style="margin: 10px 0 0 10px;">
+                            <el-button v-if="activeName == 'query'" type="success" @click="allPick"
+                                size="mini">批量选择</el-button>
+                            <el-button v-if="activeName == 'pick'" type="danger" @click="allCancel"
+                                size="mini">全部取消</el-button>
+                            <span style="font-size: 18px;font-weight: 600;margin-left: 10px;">
+                                <span style="color: #67C23A;margin-right: 10px;">
+                                    本币:{{ amountSubSum }}元
+                                </span>
+                                <span style="color: #E6A23C;">
+                                    外币:{{ amountSubUsdSum }}元
+                                </span>
+                            </span>
+                        </div>
+                    </div>
                 </template>
                 <tempalte slot="currentStlAmountRMB" slot-scope="{ row }">
                     <el-input-number v-if="editSave" v-model="row.currentStlAmountRMB" @change="armbChange(row)"
@@ -61,6 +77,8 @@ export default {
     },
     data() {
         return {
+            amountSubSum: 0,
+            amountSubUsdSum: 0,
             activeName: 'query',
             editSave: true,
             selectionList: [],
@@ -95,11 +113,11 @@ export default {
                 menu: true,
                 menuWidth: 60,
                 // header: false,
-                // tip: false,
-                // selection: true,
-                // selectable: (row, index) => {
-                //     return !row.disabled
-                // },
+                tip: false,
+                selection: true,
+                selectable: (row, index) => {
+                    return !row.disabled
+                },
                 column: [
                     {
                         label: "MB/L NO",
@@ -264,10 +282,30 @@ export default {
                 this.data = this.pickData
             }
         },
+        allPick() {
+            if (this.selectionList.length == 0) {
+                return this.$message.error("请选择数据");
+            }
+            let list = this.deepClone(this.selectionList)
+            list.forEach((item, index) => {
+                this.$set(item, 'disabled', true)
+                this.pickData.push(item)
+                this.data = this.data.filter(row => row.accBillNo != item.accBillNo);
+                this.queryData=this.data
+            })
+        },
+        allCancel() {
+            this.pickData.forEach((item, index) => {
+                this.$set(item, 'disabled', false)
+                this.queryData.push(item)
+                this.data = this.data.filter(row => row.accBillNo != item.accBillNo);
+                this.pickData=this.data
+            })
+        },
         pick(row, index) {
             this.$set(row, 'disabled', true)
             this.data.splice(index, 1)
-            this.queryData.splice(index, 1)
+            // this.queryData.splice(index, 1)
             this.pickData.push(row)
         },
         cancel(row, index) {
@@ -599,6 +637,18 @@ export default {
             deep: true,
             immediate: true
         },
+        pickData: {
+            handler(val) {
+                this.amountSubSum = 0
+                this.amountSubUsdSum = 0
+                val.forEach(e => {
+                    this.amountSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0)
+                    this.amountSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0)
+                })
+            },
+            deep: true,
+            immediate: true
+        },
     },
 }
 </script>

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -259,7 +259,7 @@
                                             </el-button>
                                             <el-button size="small" type="primary"
                                                 :disabled="editSave || (tableData.length > 0 && appendType == '检索')"
-                                                :loading="saveLoading" @click="retrievalfun2">快捷检索
+                                                :loading="saveLoading" @click="quickSearch">快捷检索
                                             </el-button>
                                             <el-button size="small" :disabled="tableData.length > 0"
                                                 @click="ResetFilter">重置条件
@@ -537,11 +537,6 @@ export default {
             }],
             vesselData: [], // 船名数据
             rules: {
-                branchName: [{
-                    required: true,
-                    message: '',
-                    trigger: 'blur'
-                },],
                 // corpCnName: [{
                 //     required: true,
                 //     message: '请输入付费对象',
@@ -550,16 +545,6 @@ export default {
                 // bankId: [
                 //     { required: true, message: '请输入开户银行', trigger: 'blur' },
                 // ],
-                remarks: [{
-                    required: true,
-                    message: '请输入付费事由',
-                    trigger: 'blur'
-                },],
-                estimatedTime: [{
-                    required: true,
-                    message: '请输入预计收回',
-                    trigger: 'blur'
-                },]
             },
             roleName: [], // 当前的角色权限
             saberUserInfo: {}, // 当前登录人信息
@@ -1012,13 +997,11 @@ export default {
                     }
                     console.log('原来的接口')
                     this.finstlbillslistAccBillV1fun(this.appendType)
-
-                    // this.$refs.searchPopup.openDialog(this.appendType)
                 }
             })
 
         },
-        retrievalfun2(){
+        quickSearch(){
             this.$refs.form.validate((valid) => {
                 if (!valid) return
                 // 判断是否有对账单位
@@ -1183,7 +1166,6 @@ export default {
                                 return elem.accBillNo === obj.accBillNo
                             }) === index;
                         });
-                        this.$refs.searchPopup.openDialog(this.tableData)
                     } else {
                         // 获取有id 的数据
                         const itemsWithId = this.tableData.filter(item => item.hasOwnProperty('id'));

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -1263,36 +1263,36 @@ export default {
                         width: "160",
                         overHidden: true
                     },
-                    {
-                        label: "合计应付",
-                        prop: "amountCrLoc",
-                        width: "160",
-                        overHidden: true
-                    },
-                    {
-                        label: "合计利润",
-                        prop: "amountProfitLoc",
-                        width: "160",
-                        overHidden: true
-                    },
-                    {
-                        label: "应收海运费",
-                        prop: "oceanFreightDr",
-                        width: "160",
-                        overHidden: true
-                    },
-                    {
-                        label: "应付海运费",
-                        prop: "oceanFreightCr",
-                        width: "160",
-                        overHidden: true
-                    },
-                    {
-                        label: "海运费利润",
-                        prop: "oceanFreightProfit",
-                        width: "160",
-                        overHidden: true
-                    },
+                    // {
+                    //     label: "合计应付",
+                    //     prop: "amountCrLoc",
+                    //     width: "160",
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "合计利润",
+                    //     prop: "amountProfitLoc",
+                    //     width: "160",
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "应收海运费",
+                    //     prop: "oceanFreightDr",
+                    //     width: "160",
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "应付海运费",
+                    //     prop: "oceanFreightCr",
+                    //     width: "160",
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "海运费利润",
+                    //     prop: "oceanFreightProfit",
+                    //     width: "160",
+                    //     overHidden: true
+                    // },
                     {
                         label: "付费申请状态",
                         prop: "checkCrStatusDescr",

src/views/iosBasicData/businessCenter/customerLetter/detailsPage.vue

@@ -144,7 +144,7 @@
                     </el-col>
                     <el-col span="12">
                       <el-form-item label="订舱日期" prop="bookingDate">
-                        <el-date-picker v-model="form.bookingDate" type="date" placeholder="请选择 订舱日期" :disabled="true"
+                        <el-date-picker v-model="form.bookingDate" type="date" placeholder="请选择 订舱日期" :disabled="editDisabled"
                           size="small" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%;">
                         </el-date-picker>
                       </el-form-item>

src/views/iosBasicData/businessCenter/customerLetter/index.vue

@@ -38,6 +38,9 @@
                         style="color: #fff;border-radius: 30px;padding: 2px 15px;background-color: #67C23A;">{{
                             row.status }}</span>
                 </template> -->
+                <template slot="billNo" slot-scope="{ row }">
+                    <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.billNo }}</span>
+                </template>
             </avue-crud>
         </basic-container>
         <detailsPage v-if="!isShow" :detailData="detailData" @goBack="goBack"></detailsPage>

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -642,11 +642,11 @@ export default {
             invCurCodeData: [], // 发票币种
             invTypeData: [], // 发票类型
             rules: {
-                branchName: [{
-                    required: true,
-                    message: '',
-                    trigger: 'blur'
-                },],
+                // branchName: [{
+                //     required: true,
+                //     message: '',
+                //     trigger: 'blur'
+                // },],
                 // corpCnName: [
                 //     { required: true, message: '请输入付费对象', trigger: 'blur' },
                 // ],

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -710,11 +710,11 @@ export default {
             invCurCodeData: [], // 发票币种
             invTypeData: [], // 发票类型
             rules: {
-                branchName: [{
-                    required: true,
-                    message: '',
-                    trigger: 'blur'
-                },],
+                // branchName: [{
+                //     required: true,
+                //     message: '',
+                //     trigger: 'blur'
+                // },],
                 // corpCnName: [
                 //     { required: true, message: '请输入付费对象', trigger: 'blur' },
                 // ],

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -698,11 +698,11 @@ export default {
             invCurCodeData: [], // 发票币种
             invTypeData: [], // 发票类型
             rules: {
-                branchName: [{
-                    required: true,
-                    message: '',
-                    trigger: 'blur'
-                },],
+                // branchName: [{
+                //     required: true,
+                //     message: '',
+                //     trigger: 'blur'
+                // },],
                 // corpCnName: [
                 //     { required: true, message: '请输入付费对象', trigger: 'blur' },
                 // ],

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -549,11 +549,11 @@ export default {
             amountSubSum: 0,
             amountSubUsdSum: 0,
             rules: {
-                branchName: [{
-                    required: true,
-                    message: '',
-                    trigger: 'blur'
-                },],
+                // branchName: [{
+                //     required: true,
+                //     message: '',
+                //     trigger: 'blur'
+                // },],
                 // corpCnName: [{
                 //     required: true,
                 //     message: '',