财务管理 默认4行 申请转圈 和禅道2024的bug

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -24,7 +24,7 @@
                     v-if="form.isCleared == 1" :loading="saveLoading" @click="finstlbillsRevokeSettlementfun">撤销结算
                 </el-button>
                 <el-button size="small" type="success" plain style="margin-right: 8px" :disabled="!form.id || editPower"
-                    v-else :loading="saveLoading" @click="editCustomer('结算')">确认结算
+                    v-else :loading="saveLoading" @click="submit('结算')">确认结算
                 </el-button>
                 <el-button size="small" type="primary" style="margin-right: 8px"
                     :disabled="form.isCleared == 1 || editPower" v-if="editSave" :loading="saveLoading"
@@ -207,7 +207,7 @@
                                         :disabled="settlementdistar || editSave || (tableData.length > 0 && appendType == '检索')"
                                         :loading="saveLoading" @click="retrievalfun">检 索
                                     </el-button>
-                                    <el-button  size="small" :disabled="tableData.length>0" @click="ResetFilter">重置条件
+                                    <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
                                     </el-button>
                                 </div>
                             </el-col>
@@ -507,6 +507,17 @@ export default {
                 }
             })
         },
+        submit(type) {
+            this.$confirm("确定进行结算操作?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                this.editCustomer(type)
+            }).catch(() => {
+                this.saveLoading = false // 关闭按钮动画
+            })
+        },
         // 费用明细开票匹配
         invoiceMatchingfun() {
             if (this.invoiceAmountCNY != 0 || this.invoiceAmountUSD != 0) {
@@ -772,44 +783,36 @@ export default {
                 // 判断是结算还是保存
                 if (type == '结算') {
 
-                    this.$confirm("确定进行结算操作?", {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning"
-                    }).then(() => {
-                        finstlbillsSubmit(this.form).then(res => {
-                            this.form = res.data.data
-                            this.tableData = this.form.finStlBillsItemsList.map(item => {
-                                item.stlTtlAmountNet = Number(item.stlTtlAmount) - (Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
-                                item.currentStlAmountNet = Number(item.unsettledAmount) - (Number(item.unsettledAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
-                                if (item.curCode == 'CNY') {
-                                    this.$set(item, 'currentInvoiceAmountRMB', item.currentInvoiceAmount)
-                                    this.$set(item, 'amountRMB', item.amount)
-                                    this.$set(item, 'amountNetRMB', item.amountNet)
-                                    this.$set(item, 'stlTtlAmountRMB', item.stlTtlAmount)
-                                    this.$set(item, 'stlTtlAmountNetRMB', item.stlTtlAmountNet)
+                    finstlbillsSubmit(this.form).then(res => {
+                        this.form = res.data.data
+                        this.tableData = this.form.finStlBillsItemsList.map(item => {
+                            item.stlTtlAmountNet = Number(item.stlTtlAmount) - (Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
+                            item.currentStlAmountNet = Number(item.unsettledAmount) - (Number(item.unsettledAmount) * (Number(item.taxRate) + Number(item.surchargeRate)))
+                            if (item.curCode == 'CNY') {
+                                this.$set(item, 'currentInvoiceAmountRMB', item.currentInvoiceAmount)
+                                this.$set(item, 'amountRMB', item.amount)
+                                this.$set(item, 'amountNetRMB', item.amountNet)
+                                this.$set(item, 'stlTtlAmountRMB', item.stlTtlAmount)
+                                this.$set(item, 'stlTtlAmountNetRMB', item.stlTtlAmountNet)
 
-                                    this.$set(item, 'currentStlAmountNetRMB', item.currentStlAmountNet)
-                                    this.$set(item, 'currentStlAmountRMB', item.currentStlAmount)
-                                } else {
-                                    this.$set(item, 'currentInvoiceAmountUSD', item.currentInvoiceAmount)
-                                    this.$set(item, 'amountUSD', item.amount)
-                                    this.$set(item, 'amountNetUSD', item.amountNet)
-                                    this.$set(item, 'stlTtlAmountNetUSD', item.stlTtlAmountNet)
-                                    this.$set(item, 'stlTtlAmountUSD', item.stlTtlAmount)
-                                    this.$set(item, 'currentStlAmountNetUSD', item.currentStlAmountNet)
-                                    this.$set(item, 'currentStlAmountUSD', item.currentStlAmount)
-                                }
+                                this.$set(item, 'currentStlAmountNetRMB', item.currentStlAmountNet)
+                                this.$set(item, 'currentStlAmountRMB', item.currentStlAmount)
+                            } else {
+                                this.$set(item, 'currentInvoiceAmountUSD', item.currentInvoiceAmount)
+                                this.$set(item, 'amountUSD', item.amount)
+                                this.$set(item, 'amountNetUSD', item.amountNet)
+                                this.$set(item, 'stlTtlAmountNetUSD', item.stlTtlAmountNet)
+                                this.$set(item, 'stlTtlAmountUSD', item.stlTtlAmount)
+                                this.$set(item, 'currentStlAmountNetUSD', item.currentStlAmountNet)
+                                this.$set(item, 'currentStlAmountUSD', item.currentStlAmount)
+                            }
 
-                                if (item.srcIdInvoices) {
-                                    this.settlementdistar = true
-                                }
-                                return item
-                            })
-                            this.finstlbillsConfirmSettlementfun()
+                            if (item.srcIdInvoices) {
+                                this.settlementdistar = true
+                            }
+                            return item
                         })
-                    }).catch(() => {
-                        this.saveLoading = false // 关闭按钮动画
+                        this.finstlbillsConfirmSettlementfun()
                     })
 
                 } else if (type == 'toAddEdit') {

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue

@@ -163,21 +163,19 @@
                                         @corpFocus="remoteMethod($event, 'hconsignee')">
                                     </search-query>
                                 </el-col>
-                                <el-col :span="4">
-                                    <span style="padding-left: 10px"></span>
+                                <el-col :span="8">
                                     <el-input type="age" style="width: 100%;"
                                         v-model="assemblyForm.detail.hconsigneeCntyName" size="small" autocomplete="off"
                                         :disabled="detailData.seeDisabled" clearable placeholder="收货人"></el-input>
                                 </el-col>
-                                <el-col :span="4">
-                                    <span style="margin-left: 20px"></span>
-                                    <span style="font-size: 12px;color: #1e9fff;cursor: pointer;"
-                                        @click="notifybyfun">同通</span>
-                                </el-col>
                             </div>
                         </el-form-item>
                         <div>
-                            <el-form-item label="" prop="hconsigneeDetails">
+                            <el-form-item label="同通" prop="hconsigneeDetails">
+                                <span slot="label">
+                                    <span style="font-size: 12px;color: #1e9fff;cursor: pointer;"
+                                          @click="notifybyfun">同通</span>
+                                </span>
                                 <el-input type="textarea" style="width: 100%;"
                                     v-model="assemblyForm.detail.hconsigneeDetails" size="small" autocomplete="off"
                                     :disabled="detailData.seeDisabled" rows="5" clearable placeholder="请输入收货人提单描述"
@@ -202,25 +200,19 @@
                                     </search-query>
                                 </el-col>
                                 <el-col :span="8">
-                                    <div
-                                        style="display: flex;align-items: center;justify-content: space-between;padding-left: 10px">
-                                        <div style="flex: 4">
-                                            <el-input type="age" style="width: 100%;"
+                                    <el-input type="age" style="width: 100%;"
                                                 v-model="assemblyForm.detail.hnotifyCntyName" size="small"
                                                 autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                                 placeholder="通知人"></el-input>
-                                        </div>
-                                        <div style="flex: 1;margin-left: 10px">
-                                            <el-button type="primary" icon="el-icon-plus" size="mini"
-                                                @click="hnotifyClick"></el-button>
-                                            <!-- <div class="addbuttonClass" @click="hnotifyClick">+</div> -->
-                                        </div>
-                                    </div>
                                 </el-col>
                             </div>
                         </el-form-item>
                         <div>
                             <el-form-item label="" prop="hnotifyDetails">
+                                <span slot="label">
+                                    <el-button type="primary" icon="el-icon-plus" size="mini"
+                                    @click="hnotifyClick"></el-button>
+                                </span>
                                 <el-input type="textarea" style="width: 100%;"
                                     v-model="assemblyForm.detail.hnotifyDetails" size="small" autocomplete="off"
                                     :disabled="detailData.seeDisabled" rows="5" clearable placeholder="请输入通知人提单描述"

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -408,6 +408,10 @@ export default {
                     this.$message.warning('请选择尺码箱型')
                     return;
                 }
+                if (!item.quantity) {
+                    this.$message.warning('请输入箱量')
+                    return;
+                }
                 item.pid = this.assemblyForm.id
             }
             this.$confirm("批量保存后，需要重新配箱，确认继续?", {

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

@@ -817,8 +817,8 @@ export default {
                     }).catch(() => {
                         this.$emit('toAddEdit')
                     });
-                }else{
-                    this.$emit('toAddEdit') 
+                } else {
+                    this.$emit('toAddEdit')
                 }
             }
         },
@@ -930,7 +930,7 @@ export default {
         },
         // 获取客户联系人 客户OP
         getBcorpsattnListfun(cname) {
-            getBcorpsattnList(1, 10, { cname }).then(res => {
+            getBcorpsattnList(1, 10, { pid: this.form.corpId, cname }).then(res => {
                 this.columnforfun('corpAttnName').dicData = res.data.data.records
                 // if (res.data.data.records.length == 0) {
                 //     this.form.corpAttnName = ''
@@ -1008,7 +1008,7 @@ export default {
                     this.form.corpCode = this.$refs.bcorps[0].selectionList[0].code
                     this.form.corpSource = this.$refs.bcorps[0].selectionList[0].corpSource
                     // 获取 客户op数据
-                    // this.getBcorpsattnListfun()
+                    this.getBcorpsattnListfun()
                     // 业务来源参数带出
                     this.$set(this.form, 'srcType', this.$refs.bcorps[0].selectionList[0].sourceType)
                     this.$set(this.form, 'srcId', this.$refs.bcorps[0].selectionList[0].srcId)
@@ -1118,7 +1118,7 @@ export default {
                     this.form.corpEnName = ''
                     this.form.corpId = ''
                     this.form.corpCode = ''
-                    this.form.shortName=''
+                    this.form.shortName = ''
                     this.form.corpSource = ""
                     // 清空 客户OP
                     this.form.corpAttnName = ''
@@ -1141,7 +1141,7 @@ export default {
                         this.form.shortName = item.shortName
                         this.form.corpSource = item.corpSource
                         // 获取 客户op数据
-                        // this.getBcorpsattnListfun()
+                        this.getBcorpsattnListfun()
                         // 业务来源参数带出
                         this.$set(this.form, 'srcType', item.sourceType)
                         this.$set(this.form, 'srcId', item.srcId)
@@ -1458,6 +1458,16 @@ export default {
                     if (!this.form.teamName) {
                         msgs.push('所属团队')
                     }
+                    for (let item of this.form.preContainersList) {
+                        if (!item.cntrTypeCode) {
+                            this.$message.warning('请选择尺码箱型')
+                            return;
+                        }
+                        if (!item.quantity) {
+                            this.$message.warning('请输入箱量')
+                            return;
+                        }
+                    }
                     for (let item of this.form.feeCenterListD) {
                         if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
                             msgs.push(`应收第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`)

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -15,7 +15,7 @@
                 </el-button>
                 <el-button size="small" type="success" plain style="margin-right: 8px"
                     :disabled="!form.id || editPower || $route.query.id" v-if="form.status == '0' || form.status == '4'"
-                    :loading="saveLoading" @click="editCustomer('申请')">提交申请
+                    :loading="saveLoading" @click="submit('申请')">提交申请
                 </el-button>
                 <el-button size="small" type="warning" plain style="margin-right: 8px" :disabled="!form.id || editPower"
                     v-if="form.status == '1'" :loading="saveLoading" @click="revokeSettlementApprovefun">撤销申请
@@ -217,15 +217,15 @@
                         <el-row>
                             <el-col span="24">
                                 <div style="text-align: right">
-                           
+
                                     <el-checkbox v-model="appendType" :disabled="editSave" false-label="检索"
                                         true-label="追加">追加</el-checkbox>
-                                     
+
                                     <el-button size="small" type="primary"
                                         :disabled="editSave || (tableData.length > 0 && appendType == '检索')"
                                         :loading="saveLoading" @click="retrievalfun">检 索
                                     </el-button>
-                                    <el-button  size="small" :disabled="tableData.length>0" @click="ResetFilter">重置条件
+                                    <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
                                     </el-button>
                                 </div>
                             </el-col>
@@ -684,6 +684,15 @@ export default {
                 this.$set(this.form, name, value)
             }
         },
+        submit(type) {
+            this.$confirm("确定进行申请操作?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                this.editCustomer(type)
+            })
+        },
         newbillFun() {
             if (!(this.form.status == '0' || this.form.status == '4')) {
                 this.$emit('toAddEdit')
@@ -775,17 +784,11 @@ export default {
                 }
                 // 判断是直接保存还是提交申请
                 if (type == '申请') {
-                    this.$confirm("确定进行申请操作?", {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning"
-                    }).then(() => {
-                        finstlbillsSubmit(this.form).then(res => {
-                            this.form = res.data.data
-                            this.settlementApprovefun()
-                        }).catch(() => {
-                            this.saveLoading = false
-                        })
+                    finstlbillsSubmit(this.form).then(res => {
+                        this.form = res.data.data
+                        this.settlementApprovefun()
+                    }).catch(() => {
+                        this.saveLoading = false
                     })
                 } else if (type == 'toAddEdit') {
                     finstlbillsSubmit(this.form).then(res => {
@@ -850,7 +853,7 @@ export default {
         },
         // 重置条件
         ResetFilter() {
-            this.form ={
+            this.form = {
                 dc: 'C',
                 mblno: null,
                 corpCnName: null,

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox.vue

@@ -1,29 +1,16 @@
 <template>
     <div>
         <div>
-            <containers ref="containers" :assemblyForm="assemblyForm" :pid="assemblyForm.id"
-                        :detailData="detailData"
-                        :pleasereviewType="pleasereviewType"
-                        @selectionChange="selectionChange"
-                        @rowSavefun="containersSubmitfun"
-                        @billsDetailfun="billsDetailfun"
-                        @billsAddfun="billsAddfun"
-                        @equalDistribution="containersEqualDistributionfun"
-                        :showLock="showLock"
-                        ></containers>
+            <containers ref="containers" :assemblyForm="assemblyForm" :pid="assemblyForm.id" :detailData="detailData"
+                :pleasereviewType="pleasereviewType" @selectionChange="selectionChange"
+                @rowSavefun="containersSubmitfun" @billsDetailfun="billsDetailfun" @billsAddfun="billsAddfun"
+                @equalDistribution="containersEqualDistributionfun" :showLock="showLock"></containers>
         </div>
 
         <div>
-            <PackingBusiness ref="PackingBusiness"
-                             :assemblyForm="assemblyForm"
-                             :detailData="detailData"
-                             :selectionList="selectionList"
-                             :pleasereviewType="pleasereviewType"
-                             @billsDetailfun="billsDetailfun"
-                             @allocationfun="allocationfun"
-                             @withdrawfun="withdrawfun"
-                             :showLock="showLock"
-                             ></PackingBusiness>
+            <PackingBusiness ref="PackingBusiness" :assemblyForm="assemblyForm" :detailData="detailData"
+                :selectionList="selectionList" :pleasereviewType="pleasereviewType" @billsDetailfun="billsDetailfun"
+                @allocationfun="allocationfun" @withdrawfun="withdrawfun" :showLock="showLock"></PackingBusiness>
         </div>
     </div>
 </template>
@@ -34,126 +21,128 @@ import PackingBusiness from "@/views/iosBasicData/SeafreightExportF/bills/assemb
 import {
     containersSubmit
 } from "@/api/iosBasicData/containers";
-import {containersEqualDistribution} from "@/api/iosBasicData/containers";
+import { containersEqualDistribution } from "@/api/iosBasicData/containers";
+import { create } from "js-md5";
 
 export default {
-        components:{
-            containers,
-            PackingBusiness
+    components: {
+        containers,
+        PackingBusiness
+    },
+    props: {
+        assemblyForm: {},
+        detailData: {},
+        // 请核禁用
+        pleasereviewType: {
+            type: Boolean,
+            default: false
         },
-        props:{
-            assemblyForm:{},
-            detailData:{},
-            // 请核禁用
-            pleasereviewType:{
-                type:Boolean,
-                default:false
-            },
-            showLock:{
-                type:Boolean,
-                default:false
-            }
+        showLock: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data() {
+        return {
+            // 当前选择的数据
+            selectionList: [],
+        }
+    },
+    methods: {
+        inPitch() {
+            this.$refs.containers.inPitch();
+        },
+        // 平均分配接口
+        containersEqualDistributionfun() {
+            containersEqualDistribution({
+                pid: this.assemblyForm.id,
+                waitingBox: this.assemblyForm.waitingBoxList[0]
+            }).then(res => {
+                this.$message({
+                    type: "success",
+                    message: "操作成功!"
+                })
+                this.billsDetailfun()
+            })
         },
-        data(){
-            return {
-                // 当前选择的数据
-                selectionList:[],
+        // 保存接口
+        billsAddfun() {
+            this.$emit('billsAddfun')
+        },
+        // 详情接口
+        billsDetailfun() {
+            this.$emit('billsDetailfun')
+        },
+        // 选择项
+        selectionChange(list) {
+            this.selectionList = list
+            if (list.length > 0) {
+                this.$refs.PackingBusiness.containersBillsList = this.selectionList[0].containersBillsList
+                this.$refs.PackingBusiness.containersCommodityList = this.selectionList[0].containersCommodityList
             }
         },
-        methods:{
-            // 平均分配接口
-            containersEqualDistributionfun(){
-                containersEqualDistribution({
-                    pid:this.assemblyForm.id,
-                    waitingBox:this.assemblyForm.waitingBoxList[0]
-                }).then(res=>{
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    })
-                    this.billsDetailfun()
+        // 分配
+        allocationfun(row) {
+            if (this.selectionList.length > 0) {
+                this.$set(row, 'quantity', Number(row.quantity) - Number(row.editQuantity))
+                this.$set(row, 'grossWeight', Number(row.grossWeight) - Number(row.editGrossWeight))
+                this.$set(row, 'measurement', Number(row.measurement) - Number(row.editMeasurement))
+                let obj = JSON.parse(JSON.stringify(row))
+                obj.quantity = obj.editQuantity
+                obj.grossWeight = obj.editGrossWeight
+                obj.measurement = obj.editMeasurement
+                obj.ppId = obj.id
+                obj.pid = this.selectionList[0].id
+                delete obj.editQuantity
+                delete obj.editGrossWeight
+                delete obj.editMeasurement
+                delete obj.id
+                this.selectionList[0].containersBillsList.push(obj)
+                // 保存接口
+                this.containersSubmitfun(this.selectionList[0])
+            } else {
+                this.$message({
+                    type: "warning",
+                    message: "请先勾选要添加的箱!"
                 })
-            },
-            // 保存接口
-            billsAddfun(){
-                this.$emit('billsAddfun')
-            },
-            // 详情接口
-            billsDetailfun(){
-                this.$emit('billsDetailfun')
-            },
-            // 选择项
-            selectionChange(list){
-                this.selectionList = list
-                if (list.length > 0) {
-                    this.$refs.PackingBusiness.containersBillsList = this.selectionList[0].containersBillsList
-                    this.$refs.PackingBusiness.containersCommodityList = this.selectionList[0].containersCommodityList
-                }
-            },
-            // 分配
-            allocationfun(row){
-                if (this.selectionList.length > 0) {
-                    this.$set(row,'quantity',Number(row.quantity) - Number(row.editQuantity))
-                    this.$set(row,'grossWeight',Number(row.grossWeight) - Number(row.editGrossWeight))
-                    this.$set(row,'measurement',Number(row.measurement) - Number(row.editMeasurement))
-                    let obj = JSON.parse(JSON.stringify(row))
-                    obj.quantity = obj.editQuantity
-                    obj.grossWeight = obj.editGrossWeight
-                    obj.measurement = obj.editMeasurement
-                    obj.ppId = obj.id
-                    obj.pid = this.selectionList[0].id
-                    delete obj.editQuantity
-                    delete obj.editGrossWeight
-                    delete obj.editMeasurement
-                    delete obj.id
-                    this.selectionList[0].containersBillsList.push(obj)
-                    // 保存接口
-                    this.containersSubmitfun(this.selectionList[0])
-                }else {
-                    this.$message({
-                        type: "warning",
-                        message: "请先勾选要添加的箱!"
-                    })
-                }
-            },
-            // 单个撤回
-            withdrawfun(data){
-                this.$confirm("确定将选择数据撤回?", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                }).then(()=>{
-                    // 判断是否是数组
-                    this.selectionList[0].subtractContainersBillsList = this.selectionList[0].subtractContainersBillsList instanceof Array?this.selectionList[0].subtractContainersBillsList:[]
-                    this.selectionList[0].subtractContainersBillsList.push(data.row)
-                    this.selectionList[0].containersBillsList.splice(data.index,1)
-                    for (let item of this.assemblyForm.waitingBoxList) {
-                        if (data.row.ppId == item.id) {
-                            this.$set(item,'quantity',Number(item.quantity) + Number(data.row.quantity))
-                            this.$set(item,'grossWeight',Number(item.grossWeight) + Number(data.row.grossWeight))
-                            this.$set(item,'measurement',Number(item.measurement) + Number(data.row.measurement))
-                        }
+            }
+        },
+        // 单个撤回
+        withdrawfun(data) {
+            this.$confirm("确定将选择数据撤回?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                // 判断是否是数组
+                this.selectionList[0].subtractContainersBillsList = this.selectionList[0].subtractContainersBillsList instanceof Array ? this.selectionList[0].subtractContainersBillsList : []
+                this.selectionList[0].subtractContainersBillsList.push(data.row)
+                this.selectionList[0].containersBillsList.splice(data.index, 1)
+                for (let item of this.assemblyForm.waitingBoxList) {
+                    if (data.row.ppId == item.id) {
+                        this.$set(item, 'quantity', Number(item.quantity) + Number(data.row.quantity))
+                        this.$set(item, 'grossWeight', Number(item.grossWeight) + Number(data.row.grossWeight))
+                        this.$set(item, 'measurement', Number(item.measurement) + Number(data.row.measurement))
                     }
-                    // 保存接口
-                    this.containersSubmitfun(this.selectionList[0])
-                })
-            },
-            // 保存接口
-            containersSubmitfun(row){
-                containersSubmit(row).then(res=>{
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    })
-                    this.billsDetailfun() // 获取详情数据
+                }
+                // 保存接口
+                this.containersSubmitfun(this.selectionList[0])
+            })
+        },
+        // 保存接口
+        containersSubmitfun(row) {
+            containersSubmit(row).then(res => {
+                this.$message({
+                    type: "success",
+                    message: "操作成功!"
                 })
-            },
+                this.billsDetailfun() // 获取详情数据
+            })
+        },
 
 
-        }
     }
+}
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -121,8 +121,29 @@
                     <template slot-scope="{type,disabled}" slot="packingUnitForm">
                         <dic-select style="width: 100%;" v-model="Detailform.packingUnit" placeholder="包装单位" key="id"
                             label="cnName" url="/blade-los/bpackages/list" :filterable="true" :remote="true"
-                            res="records" dataName="cnName" @selectChange="dicChange('packingUnit', $event)"></dic-select>
+                            res="records" dataName="cnName"
+                            @selectChange="dicChange('packingUnit', $event)"></dic-select>
                     </template>
+                    <tempalte slot-scope="{type,disabled}" slot="dgPackingUnitForm">
+                        <dic-select v-model="Detailform.dgPackingUnit" placeholder="危险品包装单位" key="dictKey"
+                            label="dictValue" url="/blade-system/dict-biz/dictionary?code=hazardous_Units"
+                            :filterable="true"></dic-select>
+                    </tempalte>
+                    <tempalte slot-scope="{type,disabled}" slot="dgPackingLevelForm">
+                        <dic-select v-model="Detailform.dgPackingLevel" placeholder="危险品包装等级" key="dictKey"
+                            label="dictValue" url="/blade-system/dict-biz/dictionary?code=hazard_Level"
+                            :filterable="true"></dic-select>
+                    </tempalte>
+                    <tempalte slot-scope="{type,disabled}" slot="dgEmerTemperatureUnitForm">
+                        <dic-select v-model="Detailform.dgEmerTemperatureUnit" placeholder="Emergency温度单位" key="dictKey"
+                            label="dictValue" url="/blade-system/dict-biz/dictionary?code=Emergency_Unit"
+                            :filterable="true"></dic-select>
+                    </tempalte>
+                    <tempalte slot-scope="{type,disabled}" slot="dgCtrlTemperatureUnitForm">
+                        <dic-select v-model="Detailform.dgCtrlTemperatureUnit" placeholder="Control温度单位" key="dictKey"
+                            label="dictValue" url="/blade-system/dict-biz/dictionary?code=dgCtrlTemperatureUnit_Unit"
+                            :filterable="true"></dic-select>
+                    </tempalte>
                 </avue-crud>
             </el-tab-pane>
         </el-tabs>
@@ -446,18 +467,13 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
-                        type: "select",
-                        dicData: [],
-                        props: {
-                            label: "cnName",
-                            value: "cnName"
-                        },
+                        // type: "select",
+                        // props: {
+                        //     label: "dictValue",
+                        //     value: "dictKey"
+                        // },
                         cell: true,
-                        remote: true,
-                        dicUrl: '/api/blade-los/bunits/list?cnName={{key}}',
-                        dicFormatter: (res => {
-                            return res.data.records
-                        }),
+                        // dicUrl: '/api/blade-system/dict-biz/dictionary?code=hazardous_Units',
                     },
                     {
                         label: "危险品包装等级",
@@ -473,6 +489,8 @@ export default {
                         prop: "dgFlashPoint",
                         labelWidth: 100,
                         width: "120",
+                        type: 'number',
+                        controls: false,
                         overHidden: true,
                         display: false,
                         cell: true,
@@ -553,12 +571,16 @@ export default {
                         prop: "dgDcWeight",
                         labelWidth: 100,
                         width: "120",
+                        type: 'number',
+                        controls: false,
                         overHidden: true,
                         cell: true,
                     },
                     {
                         label: "Emergency温度",
                         prop: "dgEmerTemperature",
+                        type: 'number',
+                        controls: false,
                         labelWidth: 100,
                         width: "120",
                         overHidden: true,
@@ -575,6 +597,8 @@ export default {
                     {
                         label: "Control温度",
                         prop: "dgCtrlTemperature",
+                        type: 'number',
+                        controls: false,
                         labelWidth: 100,
                         width: "120",
                         overHidden: true,
@@ -591,6 +615,8 @@ export default {
                     {
                         label: "左超 厘米",
                         prop: "overLeft",
+                        type: 'number',
+                        controls: false,
                         labelWidth: 100,
                         width: "120",
                         overHidden: true,
@@ -599,6 +625,8 @@ export default {
                     {
                         label: "右超 厘米",
                         prop: "overRight",
+                        type: 'number',
+                        controls: false,
                         labelWidth: 100,
                         width: "120",
                         overHidden: true,
@@ -607,6 +635,8 @@ export default {
                     {
                         label: "前超 厘米",
                         prop: "overFront",
+                        type: 'number',
+                        controls: false,
                         labelWidth: 100,
                         width: "120",
                         overHidden: true,
@@ -615,6 +645,8 @@ export default {
                     {
                         label: "后超 厘米",
                         prop: "overBack",
+                        type: 'number',
+                        controls: false,
                         labelWidth: 100,
                         width: "120",
                         overHidden: true,
@@ -623,6 +655,8 @@ export default {
                     {
                         label: "超高 厘米",
                         prop: "overTop",
+                        type: 'number',
+                        controls: false,
                         labelWidth: 100,
                         width: "120",
                         overHidden: true,
@@ -642,7 +676,7 @@ export default {
         this.optionDetail = await this.getColumnData(this.getColumnName(309.4), this.optionBackDetail);
         this.bcommodityListfun()
         this.packingUnitListfun()
-        this.dgPackingUnitListfun()
+        // this.dgPackingUnitListfun()
         this.ifInvoiceWorkDictsfun()
     },
     watch: {
@@ -690,6 +724,11 @@ export default {
         },
         // 货物明细单个保存接口
         rowSaveDetail(row, done, loading) {
+            for (let key in row) {
+                if (row[key] == "") {
+                    row[key] = null
+                }
+            }
             row.billNo = this.assemblyForm.billNo
             row.ppId = this.assemblyForm.id
             row.pid = this.selectionList[0].id
@@ -707,12 +746,13 @@ export default {
                     this.$set(row, 'packingUnit', item.cnName)
                 }
             }
-            for (let item of this.dgPackingUnitData) {
-                if (item.cnName == row.cnName) {
-                    this.$set(row, 'dgPackingUnitId', item.id)
-                    this.$set(row, 'dgPackingUnit', item.cnName)
-                }
-            }
+            // for (let item of this.dgPackingUnitData) {
+            //     if (item.cnName == row.cnName) {
+            //         this.$set(row, 'dgPackingUnitId', item.id)
+            //         this.$set(row, 'dgPackingUnit', item.cnName)
+            //     }
+            // }
+            console.log(row, 33333)
             containerscommoditySubmit(row).then(res => {
                 this.$message.success("操作成功!");
                 this.$emit('billsDetailfun')
@@ -759,12 +799,12 @@ export default {
                     this.$set(row, 'packingUnit', item.cnName)
                 }
             }
-            for (let item of this.dgPackingUnitData) {
-                if (item.cnName == row.cnName) {
-                    this.$set(row, 'dgPackingUnitId', item.id)
-                    this.$set(row, 'dgPackingUnit', item.cnName)
-                }
-            }
+            // for (let item of this.dgPackingUnitData) {
+            //     if (item.cnName == row.cnName) {
+            //         this.$set(row, 'dgPackingUnitId', item.id)
+            //         this.$set(row, 'dgPackingUnit', item.cnName)
+            //     }
+            // }
             containerscommoditySubmit(row).then(res => {
                 this.$message.success("操作成功!");
                 this.$emit('billsDetailfun')
@@ -773,8 +813,8 @@ export default {
                 loading();
             })
         },
-        allEdit(){
-            this.containersCommodityList.forEach(row=>{
+        allEdit() {
+            this.containersCommodityList.forEach(row => {
                 this.$set(row, '$cellEdit', true)
             })
         },
@@ -812,11 +852,29 @@ export default {
                 this.$message.warning("请选择至少一条数据");
                 return;
             }
+            let multiList = []
+            let arr = []
+            multiList = this.selectionDetailList
+            arr = this.containersCommodityList
             let ids = [];
             this.selectionDetailList.forEach(ele => {
                 ids.push(ele.id);
             });
-            this.containerscommodityRemovefun(ids.join(","))
+            const itemsWithId = multiList.filter(item => item.hasOwnProperty('id'));
+            multiList.forEach((item) => {
+                for (let index in arr) {
+                    if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                        arr.splice(Number(index), 1)
+                    }
+                }
+            })
+            if (itemsWithId.length != 0) {
+                containerscommodityRemove(ids.join(",")).then(res => {
+                    this.$message.success("操作成功!");
+                    this.$emit('billsDetailfun')
+                })
+            }
+
         },
         // 箱货物明细删除接口
         containerscommodityRemovefun(id, index) {
@@ -827,6 +885,7 @@ export default {
             }).then(() => {
                 containerscommodityRemove(id).then(res => {
                     this.$message.success("操作成功!");
+                    this.containersCommodityList.splice(index, 1)
                     this.$emit('billsDetailfun')
                 })
             })
@@ -846,12 +905,12 @@ export default {
             })
         },
         // 获取危险品包装单位
-        dgPackingUnitListfun() {
-            getBunitsList(1, 10).then(res => {
-                this.dgPackingUnitData = res.data.data.records
-                this.findObject(this.optionDetail.column, "dgPackingUnit").dicData = res.data.data.records
-            })
-        },
+        // dgPackingUnitListfun() {
+        //     getBunitsList(1, 10).then(res => {
+        //         this.dgPackingUnitData = res.data.data.records
+        //         this.findObject(this.optionDetail.column, "dgPackingUnit").dicData = res.data.data.records
+        //     })
+        // },
         // 全部是否字典
         ifInvoiceWorkDictsfun() {
             getWorkDicts('ifInvoice').then(res => {
@@ -916,7 +975,6 @@ export default {
             }
             this.ifInvoiceWorkDictsfun()
             this.packingUnitListfun()
-            this.dgPackingUnitListfun()
         },
         //自定义列重置
         async resetColumnTwo(ref, option, optionBack, code) {
@@ -928,7 +986,6 @@ export default {
             }
             this.ifInvoiceWorkDictsfun()
             this.packingUnitListfun()
-            this.dgPackingUnitListfun()
         },
 
     }

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -320,8 +320,7 @@ export default {
             return ids.join(",");
         }
     },
-    created() {
-    },
+    created() {},
     methods: {
         // 提取箱信息
         extractBoxInformation() {
@@ -721,6 +720,9 @@ export default {
             this.selectionList = arr
             this.$emit('selectionChange', this.selectionList)
         },
+        inPitch(){
+            this.$refs.crud.toggleRowSelection(this.assemblyForm.containersList[0],true);
+        },
         selectionClear() {
             this.selectionList = [];
             this.$refs.crud.toggleSelection();

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -1242,7 +1242,7 @@ export default {
                         // 签单地点 默认 装货港
                         if (name == 'pol') {
                             this.$set(this.assemblyForm, 'issueAt', this.assemblyForm.polEnName)
-                            this.$set(this.assemblyForm, 'issueAtId', this.assemblyForm.polEnName)
+                            this.$set(this.assemblyForm, 'issueAtId', this.assemblyForm.polId)
                         }
                         // // 选择卸货港带出目的地
                         // if(name == 'pod') {

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -415,6 +415,10 @@ export default {
                     this.$message.warning('请选择尺码箱型')
                     return;
                 }
+                if (!item.quantity) {
+                    this.$message.warning('请输入箱量')
+                    return;
+                }
                 item.pid = this.assemblyForm.id
             }
             this.$confirm("批量保存后，需要重新配箱，确认继续?", {

src/views/iosBasicData/SeafreightExportF/bills/assembly/mbinformation.vue

@@ -184,8 +184,8 @@
                         </search-query>
                     </el-form-item>
                     <div style="margin-top: 10px">
-                        <el-form-item label="" prop="mconsigneeCntyName">
-                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mconsigneeCntyName"
+                        <el-form-item label="" prop="mconsigneeDetails">
+                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mconsigneeDetails"
                                 size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
                                 placeholder="MB/L 收货人"></el-input>
                         </el-form-item>
@@ -204,8 +204,8 @@
                         </search-query>
                     </el-form-item>
                     <div style="margin-top: 10px">
-                        <el-form-item label="" prop="mnotifyCntyName">
-                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mnotifyCntyName"
+                        <el-form-item label="" prop="mnotifyDetails">
+                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.detail.mnotifyDetails"
                                 size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
                                 placeholder="MB/L 通知人"></el-input>
                         </el-form-item>

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

@@ -1078,7 +1078,7 @@ export default {
         },
         // 获取客户联系人 客户OP
         getBcorpsattnListfun(cname) {
-            getBcorpsattnList(1, 10, { cname }).then(res => {
+            getBcorpsattnList(1, 10, { pid: this.form.corpId, cname }).then(res => {
                 this.columnforfun('corpAttnName').dicData = res.data.data.records
                 // if (res.data.data.records.length == 0) {
                 //     this.form.corpAttnName = ''
@@ -1169,7 +1169,7 @@ export default {
                     this.form.corpCode = this.$refs.bcorps[0].selectionList[0].code
                     this.form.corpSource = this.$refs.bcorps[0].selectionList[0].corpSource
                     // 获取 客户op数据
-                    // this.getBcorpsattnListfun()
+                    this.getBcorpsattnListfun()
                     // 业务来源参数带出
                     this.$set(this.form, 'srcType', this.$refs.bcorps[0].selectionList[0].sourceType)
                     this.$set(this.form, 'srcId', this.$refs.bcorps[0].selectionList[0].srcId)
@@ -1200,7 +1200,7 @@ export default {
                     this.form.corpCode = this.$refs.bcorps[0].$refs.detail.formData.code
                     this.form.corpSource = this.$refs.bcorps[0].$refs.detail.formData.corpSource
                     // 获取 客户op数据
-                    // this.getBcorpsattnListfun()
+                    this.getBcorpsattnListfun()
                     // 业务来源参数带出
                     this.$set(this.form, 'srcType', this.$refs.bcorps[0].$refs.detail.formData.sourceType)
                     this.$set(this.form, 'srcId', this.$refs.bcorps[0].$refs.detail.formData.srcId)
@@ -1333,7 +1333,7 @@ export default {
                         this.form.shortName = item.shortName
                         this.form.corpSource = item.corpSource
                         // 获取 客户op数据
-                        // this.getBcorpsattnListfun()
+                        this.getBcorpsattnListfun()
                         // 业务来源参数带出
                         this.$set(this.form, 'srcType', item.sourceType)
                         this.$set(this.form, 'srcId', item.srcId)
@@ -1670,6 +1670,16 @@ export default {
                     if (!this.form.teamName) {
                         msgs.push('所属团队')
                     }
+                    for (let item of this.form.preContainersList) {
+                        if (!item.cntrTypeCode) {
+                            this.$message.warning('请选择尺码箱型')
+                            return;
+                        }
+                        if (!item.quantity) {
+                            this.$message.warning('请输入箱量')
+                            return;
+                        }
+                    }
                     for (let item of this.form.feeCenterListD) {
                         if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
                             msgs.push(`应收第${item.$index + 1}行${!item.corpId ? ' 往来单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`)
@@ -2129,12 +2139,14 @@ export default {
 .isShow {
     display: none;
 }
-.dropdown-max{
+
+.dropdown-max {
     top: 150px !important;
     max-width: 600px;
     display: flex;
     flex-flow: row wrap;
-    li{
+
+    li {
         margin-right: 5px;
         white-space: nowrap;
     }

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -13,7 +13,7 @@
                     v-if="form.status == 3" :loading="saveLoading" @click="fininvoicesRevokeFinInvoicesfun">撤销开票
                 </el-button>
                 <el-button size="small" type="success" plain style="margin-right: 8px" :disabled="!form.id || editPower"
-                    v-else :loading="saveLoading" @click="editCustomer('开票')">确认开票
+                    v-else :loading="saveLoading" @click="submit('开票')">确认开票
                 </el-button>
                 <el-button size="small" type="primary" :disabled="statusType || editPower" style="margin-right: 8px"
                     v-if="editSave" :loading="saveLoading" @click="editHandle">编 辑
@@ -91,6 +91,8 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
+                                </el-row>
+                                <el-row v-show="showForm">
                                     <el-col :span="12">
                                         <el-form-item label="人民币银行" prop="invCorpAccountBankCny">
                                             <el-input style="width: 100%;" v-model="form.invCorpAccountBankCny"
@@ -309,6 +311,8 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
+                                </el-row>
+                                <el-row v-show="showForm">
                                     <el-col :span="16">
                                         <el-form-item label="分单编号" prop="hblno">
                                             <el-input style="width: 100%;" v-model="form.hblno" size="small"
@@ -366,19 +370,6 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="24">
-                                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1"
-                                            :false-label="0" :disabled="editSave" v-model="form.isExchangeToCny">转换成人民币
-                                        </el-checkbox>
-                                        <el-checkbox v-model="appendType" :disabled="editSave" false-label="检索"
-                                            true-label="追加">追加</el-checkbox>
-                                        <el-button type="primary" size="small"
-                                            :disabled="editSave || (tableData.length > 0 && appendType == '检索')" plain
-                                            @click="finstlbillslistAccBillV1fun(appendType)">提取费用
-                                        </el-button>
-                                        <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
-                                        </el-button>
-                                    </el-col>
-                                    <el-col :span="24">
                                         <el-form-item label="全电发票:" prop="elecRemarks">
                                             <el-input style="width: 100%;" v-model="form.elecRemarks" size="small"
                                                 autocomplete="off" type="textarea" clearable placeholder="请输入全电发票备注">
@@ -389,6 +380,23 @@
                             </div>
                         </el-col>
                     </el-row>
+                    <div style="display: flex;justify-content: flex-end;align-items: center;">
+                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
+                            :disabled="editSave" v-model="form.isExchangeToCny">转换成人民币
+                        </el-checkbox>
+                        <el-checkbox v-model="appendType" :disabled="editSave" false-label="检索"
+                            true-label="追加">追加</el-checkbox>
+                        <el-button type="primary" size="small"
+                            :disabled="editSave || (tableData.length > 0 && appendType == '检索')" plain
+                            @click="finstlbillslistAccBillV1fun(appendType)">提取费用
+                        </el-button>
+                        <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
+                        </el-button>
+                        <el-button icon="el-icon-arrow-down" type="text" size="small" v-if="!showForm"
+                            @click="showForm = true">开展</el-button>
+                        <el-button icon="el-icon-arrow-up" type="text" size="small" v-if="showForm"
+                            @click="showForm = false">收缩</el-button>
+                    </div>
                 </trade-card>
                 <el-card style="margin-top: 10px">
                     <el-tabs v-model="detailTabs" type="card">
@@ -497,6 +505,7 @@ export default {
     components: { SearchQuery, fininvoicesitems, fininvoiceitemdetail, dicSelect },
     data() {
         return {
+            showForm: false,
             invoiceAmountCNY: 0, // 费用明细开票金额输入框CNY
             invoiceAmountUSD: 0, // 费用明细开票金额输入框USD
             statusType: false, // 是否确认开票
@@ -594,8 +603,8 @@ export default {
         }
     },
     methods: {
-        ResetFilter(){
-            this.form={
+        ResetFilter() {
+            this.form = {
                 invCurCode: 'CNY',
                 isRp: 1,
                 invType: '全电发票',
@@ -950,6 +959,15 @@ export default {
                 });
             }
         },
+        submit(type) {
+            this.$confirm("确定进行确认开票操作?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                this.editCustomer(type)
+            })
+        },
         // 保存按钮事件
         editCustomer(type) {
             this.$refs.form.validate((valid) => {
@@ -999,21 +1017,15 @@ export default {
                 this.form.finInvoiceItemDetailList = this.InvoicingList
 
                 if (type == '开票') {
-                    this.$confirm("确定进行确认开票操作?", {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning"
-                    }).then(() => {
-                        this.saveLoading = true
-                        this.pageLoading = true
-                        fininvoicesSubmit(this.form).then(res => {
-                            this.form = res.data.data
-                            this.fininvoicesConfirmFinInvoicesfun()
-                        }).catch(() => {
-                            this.pageLoading = false
-                            this.saveLoading = false
-                        });
-                    })
+                    this.saveLoading = true
+                    this.pageLoading = true
+                    fininvoicesSubmit(this.form).then(res => {
+                        this.form = res.data.data
+                        this.fininvoicesConfirmFinInvoicesfun()
+                    }).catch(() => {
+                        this.pageLoading = false
+                        this.saveLoading = false
+                    });
                 } else if (type == 'toAddEdit') {
                     fininvoicesSubmit(this.form).then(res => {
                         this.$message.success('操作成功');

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -19,7 +19,7 @@
                     v-if="form.status == 3" :loading="saveLoading" @click="revokeFinInvoicesApprovefun">撤销
                 </el-button>
                 <el-button size="small" type="success" plain style="margin-right: 8px" :disabled="!form.id || editPower"
-                    v-else :loading="saveLoading" @click="editCustomer('提交')">提交
+                    v-else :loading="saveLoading" @click="submit('提交')">提交
                 </el-button>
                 <el-button size="small" type="primary" :disabled="statusType || editPower" style="margin-right: 8px"
                     v-if="editSave" :loading="saveLoading" @click="editHandle">编 辑
@@ -106,6 +106,8 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
+                                </el-row>
+                                <el-row v-show="showForm">
                                     <el-col :span="12">
                                         <el-form-item label="人民币银行" prop="invCorpAccountBankCny">
                                             <el-input style="width: 100%;" v-model="form.invCorpAccountBankCny"
@@ -313,6 +315,8 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
+                                </el-row>
+                                <el-row v-show="showForm">
                                     <el-col :span="16">
                                         <el-form-item label="分单编号" prop="hblno">
                                             <el-input style="width: 100%;" v-model="form.hblno" size="small"
@@ -362,20 +366,6 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="12">
-                                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1"
-                                            :false-label="0" :disabled="editSave" v-model="form.isExchangeToCny">转换成人民币
-                                        </el-checkbox>
-                                        <el-checkbox v-model="appendType" :disabled="statusType" false-label="检索"
-                                            true-label="追加">追加</el-checkbox>
-                                        <el-button type="primary" size="small"
-                                            :disabled="statusType || (tableData.length > 0 && appendType == '检索')" plain
-                                            @click="finstlbillslistAccBillV1fun(appendType)">提取费用
-                                        </el-button>
-                                        <el-button size="small" :disabled="tableData.length > 0"
-                                            @click="ResetFilter">重置条件
-                                        </el-button>
-                                    </el-col>
                                     <el-col :span="24">
                                         <el-form-item label="全电发票:" prop="elecRemarks">
                                             <el-input style="width: 100%;" v-model="form.elecRemarks" size="small"
@@ -383,12 +373,27 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
-
-
                                 </el-row>
                             </div>
                         </el-col>
                     </el-row>
+                    <div style="display: flex;justify-content: flex-end;align-items: center;">
+                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
+                            :disabled="editSave" v-model="form.isExchangeToCny">转换成人民币
+                        </el-checkbox>
+                        <el-checkbox v-model="appendType" :disabled="statusType" false-label="检索"
+                            true-label="追加">追加</el-checkbox>
+                        <el-button type="primary" size="small"
+                            :disabled="statusType || (tableData.length > 0 && appendType == '检索')" plain
+                            @click="finstlbillslistAccBillV1fun(appendType)">提取费用
+                        </el-button>
+                        <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
+                        </el-button>
+                        <el-button icon="el-icon-arrow-down" type="text" size="small" v-if="!showForm"
+                            @click="showForm = true">开展</el-button>
+                        <el-button icon="el-icon-arrow-up" type="text" size="small" v-if="showForm"
+                            @click="showForm = false">收缩</el-button>
+                    </div>
                 </trade-card>
                 <el-card style="margin-top: 10px">
                     <el-tabs v-model="detailTabs" type="card">
@@ -480,7 +485,7 @@
                 <el-button size="small" @click="selectPrintingDialog = false;">取 消</el-button>
             </span>
         </el-dialog>
-        <el-dialog title="选择数据"  :visible.sync="retrievePopupsType" append-to-body width="70%"
+        <el-dialog title="选择数据" :visible.sync="retrievePopupsType" append-to-body width="70%"
             :close-on-click-modal="false">
             <div>
                 <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
@@ -532,6 +537,7 @@ export default {
     components: { checkSchedule, reportContainer, reportformsList, reports, SearchQuery, fininvoicesitems, fininvoiceitemdetail, dicSelect },
     data() {
         return {
+            showForm: false,
             retrievePopupsType: false, // 弹窗开启关闭
             retrievePopupsData: [], // 选择弹窗数据
             retrievePopupsOption: {
@@ -547,7 +553,7 @@ export default {
                 refreshBtn: false,
                 columnBtn: false,
                 menuWidth: '60',
-                header:false,
+                header: false,
                 column: [
                     {
                         label: "客户中文名",
@@ -1057,6 +1063,18 @@ export default {
         editHandle() {
             this.editSave = false
         },
+        submit(type) {
+            this.$confirm("确定进行发票申请操作?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                this.editCustomer(type)
+            }).finally(() => {
+                this.saveLoading = false
+            });
+
+        },
         newbillFun() {
             if (this.statusType) {
                 this.$emit('toAddEdit')
@@ -1131,20 +1149,12 @@ export default {
                 this.form.finInvoiceItemDetailList = this.InvoicingList
                 this.saveLoading = true
                 if (type == '提交') {
-                    this.$confirm("确定进行发票申请操作?", {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning"
-                    }).then(() => {
-                        fininvoicesSubmit(this.form).then(res => {
-                            res.data.data.businessTypes = res.data.data.businessTypes ? res.data.data.businessTypes.split(',') : []
-                            res.data.data.feeCnName = res.data.data.feeCnName ? res.data.data.feeCnName.split(',') : []
-                            this.form = res.data.data
-                            this.finInvoicesApprovefun()
-                        })
-                    }).finally(() => {
-                        this.saveLoading = false
-                    });
+                    fininvoicesSubmit(this.form).then(res => {
+                        res.data.data.businessTypes = res.data.data.businessTypes ? res.data.data.businessTypes.split(',') : []
+                        res.data.data.feeCnName = res.data.data.feeCnName ? res.data.data.feeCnName.split(',') : []
+                        this.form = res.data.data
+                        this.finInvoicesApprovefun()
+                    })
                 } else if (type == 'toAddEdit') {
                     fininvoicesSubmit(this.form).then(res => {
                         this.$message.success('操作成功');
@@ -1207,7 +1217,7 @@ export default {
         },
         // 检索
         finstlbillslistAccBillV1fun(type) {
-            if (this.form.businessNo || this.form.mblno||this.form.checkNo) {
+            if (this.form.businessNo || this.form.mblno || this.form.checkNo) {
                 if (!this.form.corpId) {
                     this.finstlbillslistAccBillByCorpfun()
                     return
@@ -1290,7 +1300,7 @@ export default {
                         item.lineNo = Number(index) + 1 // 行号
                         item.accBillId = item.id
                         item.accBillNo = item.billNo // JOB NO
-                        item.billNo=item.businessBillNo
+                        item.billNo = item.businessBillNo
                         item.billNo = item.businessBillNo // 账单编号
                         item.accDate = item.createTime
                         item.currentCurCode = item.curCode

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -13,7 +13,7 @@
                     v-if="form.status == 3" :loading="saveLoading" @click="fininvoicesRevokeFinInvoicesfun">撤销开票
                 </el-button>
                 <el-button size="small" type="success" plain style="margin-right: 8px" :disabled="!form.id || editPower"
-                    v-else :loading="saveLoading" @click="editCustomer('开票')">确认开票
+                    v-else :loading="saveLoading" @click="submit('开票')">确认开票
                 </el-button>
                 <el-button size="small" type="primary" :disabled="statusType || editPower" style="margin-right: 8px"
                     v-if="editSave" :loading="saveLoading" @click="editHandle">编 辑
@@ -91,6 +91,8 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
+                                </el-row>
+                                <el-row v-show="showForm">
                                     <el-col :span="12">
                                         <el-form-item label="人民币银行" prop="invCorpAccountBankCny">
                                             <el-input style="width: 100%;" v-model="form.invCorpAccountBankCny"
@@ -309,6 +311,8 @@
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
+                                </el-row>
+                                <el-row v-show="showForm">
                                     <el-col :span="16">
                                         <el-form-item label="分单编号" prop="hblno">
                                             <el-input style="width: 100%;" v-model="form.hblno" size="small"
@@ -366,20 +370,6 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="24">
-                                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1"
-                                            :false-label="0" :disabled="editSave" v-model="form.isExchangeToCny">转换成人民币
-                                        </el-checkbox>
-                                        <el-checkbox v-model="appendType" :disabled="editSave" false-label="检索"
-                                            true-label="追加">追加</el-checkbox>
-                                        <el-button type="primary" size="small"
-                                            :disabled="editSave || (tableData.length > 0 && appendType == '检索')" plain
-                                            @click="finstlbillslistAccBillV1fun(appendType)">提取费用
-                                        </el-button>
-                                        <el-button size="small" :disabled="tableData.length > 0"
-                                            @click="ResetFilter">重置条件
-                                        </el-button>
-                                    </el-col>
-                                    <el-col :span="24">
                                         <el-form-item label="全电发票:" prop="elecRemarks">
                                             <el-input style="width: 100%;" v-model="form.elecRemarks" size="small"
                                                 autocomplete="off" type="textarea" clearable placeholder="请输入全电发票备注">
@@ -390,6 +380,23 @@
                             </div>
                         </el-col>
                     </el-row>
+                    <div style="display: flex;justify-content: flex-end;align-items: center;">
+                        <el-checkbox style="margin-left: 10%" size="medium" :true-label="1" :false-label="0"
+                            :disabled="editSave" v-model="form.isExchangeToCny">转换成人民币
+                        </el-checkbox>
+                        <el-checkbox v-model="appendType" :disabled="editSave" false-label="检索"
+                            true-label="追加">追加</el-checkbox>
+                        <el-button type="primary" size="small"
+                            :disabled="editSave || (tableData.length > 0 && appendType == '检索')" plain
+                            @click="finstlbillslistAccBillV1fun(appendType)">提取费用
+                        </el-button>
+                        <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
+                        </el-button>
+                        <el-button icon="el-icon-arrow-down" type="text" size="small" v-if="!showForm"
+                            @click="showForm = true">开展</el-button>
+                        <el-button icon="el-icon-arrow-up" type="text" size="small" v-if="showForm"
+                            @click="showForm = false">收缩</el-button>
+                    </div>
                 </trade-card>
                 <el-card style="margin-top: 10px">
                     <el-tabs v-model="detailTabs" type="card">
@@ -464,7 +471,7 @@
                 </el-card>
             </el-form>
         </div>
-        <el-dialog title="选择数据"  :visible.sync="retrievePopupsType" append-to-body width="70%"
+        <el-dialog title="选择数据" :visible.sync="retrievePopupsType" append-to-body width="70%"
             :close-on-click-modal="false">
             <div>
                 <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
@@ -508,6 +515,7 @@ export default {
     components: { SearchQuery, fininvoicesitems, fininvoiceitemdetail, dicSelect },
     data() {
         return {
+            showForm: false,
             retrievePopupsType: false, // 弹窗开启关闭
             retrievePopupsData: [], // 选择弹窗数据
             retrievePopupsOption: {
@@ -523,7 +531,7 @@ export default {
                 refreshBtn: false,
                 columnBtn: false,
                 menuWidth: '60',
-                header:false,
+                header: false,
                 column: [
                     {
                         label: "客户中文名",
@@ -990,6 +998,17 @@ export default {
                 });
             }
         },
+        submit(type) {
+            this.$confirm("确定进行确认开票操作?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                this.editCustomer(type)
+            }).catch(() => {
+                this.saveLoading = false
+            });
+        },
         // 保存按钮事件
         editCustomer(type) {
             this.$refs.form.validate((valid) => {
@@ -1039,20 +1058,12 @@ export default {
                 this.form.finInvoiceItemDetailList = this.InvoicingList
                 this.saveLoading = true
                 if (type == '开票') {
-                    this.$confirm("确定进行确认开票操作?", {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning"
-                    }).then(() => {
-                        fininvoicesSubmit(this.form).then(res => {
-                            res.data.data.businessTypes = res.data.data.businessTypes ? res.data.data.businessTypes.split(',') : []
-                            res.data.data.feeCnName = res.data.data.feeCnName ? res.data.data.feeCnName.split(',') : []
-                            this.form = res.data.data
-                            this.fininvoicesConfirmFinInvoicesfun()
-                        }).finally(() => {
-                            this.saveLoading = false
-                        });
-                    }).catch(() => {
+                    fininvoicesSubmit(this.form).then(res => {
+                        res.data.data.businessTypes = res.data.data.businessTypes ? res.data.data.businessTypes.split(',') : []
+                        res.data.data.feeCnName = res.data.data.feeCnName ? res.data.data.feeCnName.split(',') : []
+                        this.form = res.data.data
+                        this.fininvoicesConfirmFinInvoicesfun()
+                    }).finally(() => {
                         this.saveLoading = false
                     });
                 } else if (type == 'toAddEdit') {
@@ -1117,7 +1128,7 @@ export default {
         },
         // 检索
         finstlbillslistAccBillV1fun(type) {
-            if (this.form.businessNo || this.form.mblno||this.form.checkNo) {
+            if (this.form.businessNo || this.form.mblno || this.form.checkNo) {
                 if (!this.form.corpId) {
                     this.finstlbillslistAccBillByCorpfun()
                     return
@@ -1202,7 +1213,7 @@ export default {
                         item.lineNo = Number(index) + 1 // 行号
                         item.accBillId = item.id
                         item.accBillNo = item.billNo
-                        item.billNo=item.businessBillNo
+                        item.billNo = item.businessBillNo
                         item.accDate = item.createTime
                         item.currentCurCode = item.curCode
                         item.currentExrate = item.exrate

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -22,7 +22,7 @@
                     v-if="form.billStatus == 1" :loading="saveLoading" @click="finstlbillsRevokeReconciliationfun">撤销对账
                 </el-button>
                 <el-button size="small" type="success" plain style="margin-right: 8px" :disabled="!form.id || editPower"
-                    v-else :loading="saveLoading" @click="editCustomer('对账')">确认对账
+                    v-else :loading="saveLoading" @click="submit('对账')">确认对账
                 </el-button>
                 <el-button size="small" type="primary" style="margin-right: 8px" v-if="editSave"
                     :disabled="submitType || editPower" :loading="saveLoading" @click="editHandle">编 辑
@@ -331,11 +331,11 @@
                         <el-row>
                             <el-col span="24">
                                 <div style="text-align: right">
-                                    
-                                    <el-button size="small" type="primary"
-                                        :disabled="editSave" :loading="saveLoading" @click="retrievalfun">检 索
+
+                                    <el-button size="small" type="primary" :disabled="editSave" :loading="saveLoading"
+                                        @click="retrievalfun">检 索
                                     </el-button>
-                                    <el-button  size="small" :disabled="tableData.length>0" @click="ResetFilter">重置条件
+                                    <el-button size="small" :disabled="tableData.length > 0" @click="ResetFilter">重置条件
                                     </el-button>
                                 </div>
                             </el-col>
@@ -786,22 +786,13 @@ export default {
                     this.saveLoading = false
                 })
             } else if (type == '对账') {
-                this.$confirm("确定进行对账操作?", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                }).then(() => {
-                    finstlbillsSubmit(this.form).then(res => {
-                        this.form = res.data.data
-                        this.finstlbillsConfirmReconciliationfun()
-                    }).catch(() => {
-                        this.pageLoading = false
-                        this.saveLoading = false
-                    })
+                finstlbillsSubmit(this.form).then(res => {
+                    this.form = res.data.data
+                    this.finstlbillsConfirmReconciliationfun()
                 }).catch(() => {
-                        this.pageLoading = false
-                        this.saveLoading = false
-                    })
+                    this.pageLoading = false
+                    this.saveLoading = false
+                })
             } else {
                 finstlbillsSubmit(this.form).then(res => {
                     this.$message.success('操作成功');
@@ -827,6 +818,18 @@ export default {
                 });
             }
         },
+        submit(type) {
+            this.$confirm("确定进行对账操作?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                this.editCustomer(type)
+            }).catch(() => {
+                this.pageLoading = false
+                this.saveLoading = false
+            })
+        },
         // 详情接口
         finstlbillsDetailfun(id) {
             this.pageLoading = true

src/views/serviceConfiguration/modifyData/detailsPage.vue

@@ -429,12 +429,12 @@ export default {
             this.$refs["form"].validate((valid, done) => {
                 done();
                 if (valid) {
-                    for (let row of this.data) {
-                        if (!row.fieldValueNewName) {
-                            this.$refs.crud.rowCell(row, row.$index)
-                            return this.$message.error("请完善字段明细");
-                        }
-                    }
+                    // for (let row of this.data) {
+                    //     if (!row.fieldValueNewName) {
+                    //         this.$refs.crud.rowCell(row, row.$index)
+                    //         return this.$message.error("请完善字段明细");
+                    //     }
+                    // }
                     this.$confirm('是否提交数据?', '提示', {
                         confirmButtonText: '确定',
                         cancelButtonText: '取消',
@@ -454,13 +454,12 @@ export default {
                             background: 'rgba(255,255,255,0.7)'
                         });
                         checkUpdate(obj).then(res => {
-                            this.$message.success("保存成功");
+                            this.$message.success("提交成功");
                             this.getDetails(res.data.data.id)
                         }).finally(() => {
                             loading.close();
                         })
                     })
-
                 } else {
                     return false;
                 }

src/views/tirePartsMall/pointsMall/customerPoints/index.vue

@@ -39,10 +39,7 @@ export default {
         return {
             isShow: true,
             form: {},
-            query: {
-                checkbox: [],
-                businessType: 'MYDL',
-            },
+            query: { },
             loading: false,
             page: {
                 pageSize: 10,