财务销账功能调整

src/views/emis/emisSettleBill/WriteoffApplyApplicationList.vue

@@ -21,6 +21,7 @@ import CancelAccountApplicationFormPanel from '@/views/emis/emisSettleBill/panel
 import CancelAccountDetail from '@/views/emis/emisSettleBill/panel/CancelAccountDetail.vue';
 
 export default {
+name: 'WriteoffApplyApplicationList',
 components: {
     CancelAccountApplicationListPanel,CancelAccountApplicationFormPanel,CancelAccountDetail
 },
@@ -58,6 +59,7 @@ methods:{
             this.formTitle='新增申请';
             this.showForm=true;
             this.activeTab='newApply';
+            this.applyId=null;
         },
         onUpdate(applyId){
             this.applyId=applyId[0];

src/views/emis/emisSettleBill/WriteoffApplyCheckList.vue

@@ -13,6 +13,7 @@
 import CancelAccountCheckListPanel from '@/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue';
 
 export default {
+name: 'WriteoffApplyCheckList',
 components: {
     CancelAccountCheckListPanel
 },

src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue

@@ -14,7 +14,8 @@
                     <el-form-item :label="$t('收款方式')" prop="payType">
                         <template slot-scope="scope">
                             <el-select v-model="form.payType" placeholder="请选择收款方式" clearable="">
-                                <el-option v-for="item in dict.type.emis_settlebill_pay_type" :key="item.value" :label="item.label" :value="item.value" />
+                                <el-option v-for="item in dict.type.emis_settlebill_pay_type" :key="item.value"
+                                    :label="item.label" :value="item.value" />
                             </el-select>
                         </template>
                     </el-form-item>
@@ -31,14 +32,15 @@
                 </el-col>
                 <el-col :span="4">
                     <el-form-item label="发出时间" prop="tradeDate">
-                        <el-date-picker clearable v-model="form.tradeDate" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+                        <el-date-picker clearable v-model="form.tradeDate" type="date"
-                            placeholder="请选择发出时间" style="width:100%">
+                            value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择发出时间" style="width:100%">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="4">
-                   <el-form-item :label="$t('申请说明')" prop="applyMemo">
+                    <el-form-item :label="$t('申请说明')" prop="applyMemo">
-                        <el-input v-model="form.applyMemo"  type="textarea" :rows="2" clearable="" placeholder="申请说明"></el-input>
+                        <el-input v-model="form.applyMemo" type="textarea" :rows="2" clearable=""
+                            placeholder="申请说明"></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -53,10 +55,6 @@
                     <el-button type="primary" plain size="mini" @click="handleCoPackListDelete"
                         :disabled="multiple">移除运单</el-button>
                 </el-col>
-                <el-col :span="1.5" v-if="this.form.id != null">
-                    <el-button style="margin-right: 5px;" type="warning" plain icon="el-icon-download" size="mini"
-                        @click="handleExport">导出</el-button>
-                </el-col>
             </el-row>
         </div>
         <el-table class="cargoList" max-height="400px" v-loading="loading" border size="mini"
@@ -69,25 +67,28 @@
                 :show-overflow-tooltip="true" />
             <el-table-column :label="$t('已收金额')" align="center" prop="emisSettleSubBill.recedMoney" min-width="100">
             </el-table-column>
-            <el-table-column :label="$t('收/退款金额')" align="center" prop="applyMoney" min-width="100">
+            <el-table-column :label="$t('收款金额')" align="center" prop="applyMoney" min-width="100">
-                    <template slot-scope="scope">
+                <template slot-scope="scope">
-                            <el-input-number  v-model="scope.row.applyMoney" placeholder="" :controls="false" :precision="2"  >
+                    <el-input-number v-model="scope.row.applyMoney" placeholder="" :controls="false" :precision="2">
-                                <span slot="suffix">(CNY)</span>
+                        <span slot="suffix">(CNY)</span>
-                            </el-input-number>
+                    </el-input-number>
-                    </template>
+                </template>
             </el-table-column>
             <el-table-column :label="$t('寄件日期')" align="center" prop="emisWaybill.sendDate" min-width="170"
                 :show-overflow-tooltip="true" />
             <el-table-column :label="$t('快件类型')" align="center" prop="expressType" min-width="200" />
             <el-table-column :label="$t('发件人')" align="center" prop="emisWaybill.sendName" min-width="100" />
-            <el-table-column :label="$t('寄件公司')" align="center" prop="emisWaybill.sendCompany" min-width="170"></el-table-column>
+            <el-table-column :label="$t('寄件公司')" align="center" prop="emisWaybill.sendCompany"
+                min-width="170"></el-table-column>
             <el-table-column :label="$t('支付方式')" align="center" prop="emisWaybill.paymentType" min-width="140">
                 <template slot-scope="scope">
-                      <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.emisWaybill.paymentType"/>
+                    <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.emisWaybill.paymentType" />
                 </template>
             </el-table-column>
-            <el-table-column :label="$t('产品类型')" align="center" prop="emisWaybill.productTypeName" min-width="100"></el-table-column>
+            <el-table-column :label="$t('产品类型')" align="center" prop="emisWaybill.productTypeName"
-            <el-table-column :label="$t('件数')" align="center" prop="emisWaybill.parcelQty" min-width="100"> </el-table-column>
+                min-width="100"></el-table-column>
+            <el-table-column :label="$t('件数')" align="center" prop="emisWaybill.parcelQty" min-width="100">
+            </el-table-column>
             <el-table-column :label="$t('结算重量 ')" align="center" prop="emisWaybill.settlementWeight" min-width="100" />
         </el-table>
 
@@ -116,26 +117,12 @@
 </template>
 
 <script>
-
-import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
-import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
-import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
-import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
-import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
-import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
-import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
-import { parseTime } from "@/utils/custom";
-
-import PackListView from '@/views/emis/emisTmsSiteBatch/packListView';
-import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
-import EmisTmsSiteBatchSupplierPicker from '@/views/emis/EmisBaseTools/EmisTmsSiteBatchSupplierPicker';
-import EmisTmsSiteBatchNextSitePicker from '@/views/emis/EmisBaseTools/EmisTmsSiteBatchNextSitePicker.vue';
 import { uploadFile } from '@/api/common';
-import { queryByBillCodes , writeoffApply ,getWriteoffApply ,updateWriteoffApply } from "@/api/emis/emisSettleCancelAccount";
+import { queryByBillCodes, writeoffApply, getWriteoffApply, updateWriteoffApply } from "@/api/emis/emisSettleCancelAccount";
 import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 
 export default {
-    name: "CancelAccountApplicationFormPanel",
+    name: "cancelAccountApplicationFormPanel",
     props: {
         applyId: {
             type: [Number, Array],
@@ -154,8 +141,8 @@ export default {
             default: ''
         }
     },
-    components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView, EmisSupplierPicker, EmisTmsSiteBatchSupplierPicker, EmisTmsSiteBatchNextSitePicker, uploadFile ,EmpNamePicker },
+    components: {  uploadFile, EmpNamePicker },
-    dicts: ['emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status', 'emis_declare_mode', 'emis_customs_clear', 'emis_big_batch_type', 'emis_settlebill_pay_type'],
+    dicts: [ 'emis_payment_type', 'emis_settlebill_pay_type'],
     data() {
         return {
             // 遮罩层
@@ -167,28 +154,12 @@ export default {
             single: true,
             // 非多个禁用
             multiple: true,
-
-            addWayBillDisabled: true,
-            // packDisabled: true,
-            activeName: 'third',
-
             // 显示搜索条件
             showSearch: true,
             // 创建时间搜索
             dateTimeRange: [],
             // 总条数
             total: 0,
-            // TMS组批次表格数据
-            emisTmsPackList: [],
-
-            // 待组批次列表
-            emisTmsWaitPackList: [],
-            waitTotal: 0,
-
-            // 已组批次列表
-            emisTmsDonePackList: [],
-            doneTotal: 0,
-            waitPackList: [],//选择未组包的运单先保存起来，在后续新增组批次的弹框中使用
             // 新增/修改弹窗数据
             form: {},
 
@@ -216,55 +187,20 @@ export default {
             blUnpack: "1",
             // 追加的运单数据
             emisWayBillList: [],
-            wayBillotal: 0,
-
             currentId: null,
             openForm: false,
             titleForm: "",
-
-            titleWayBill: null,
-            openWayBillForm: false,
-
-            // 临时存储
-            tempCoPackInfo: {},
-
-            // 弹出展示层
             id: null,
             titleView: "",
             openView: false,
-
-            tableData: [
-                { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-                { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-                { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }
-            ],
-            tableDataId: [
-                { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-                { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-                { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }
-            ],
             // 查询参数
             queryParams: {
                 pageNum: 1,
                 pageSize: 20,
                 billCode: null,
                 orderSN: null,
-                batchNo: null,
-                // packNo: null,
-                // packName: null,
-                // packDate: null,
                 destCountry: null,
                 destCountryName: null,
-                // blUnpack: null,
-                // sendSiteCode: null,
-                // totalParcelQty: null,
-                // totalWaybillQty: null,
-                // totalVolume: null,
-                // totalWeight: null,
-                // packStatus: null,
-                // opMan: null,
-                // remark: null,
-                // delFlag: null,
                 params: {
                     queryOrderType: '0',
                     queryOrderDateType: '1'
@@ -272,23 +208,8 @@ export default {
             },
             queryCoParams: {
                 params: {}
-            },
+            }
-            // 查询参数
+           
-            queryWaitParams: {
-                pageNum: 1,
-                pageSize: 20,
-                packNo: null,
-                beginCreateTime: null,
-                endCreateTime: null,
-                params: {}
-            },
-            // 查询参数
-            queryDoneParams: {
-                pageNum: 1,
-                pageSize: 20,
-                packNo: null,
-                params: {}
-            },
         };
     },
     created() {
@@ -298,92 +219,33 @@ export default {
 
         initData() {
             if (this.applyId != null) {
-                console.log('initData', this.applyId);
+                console.log("===>initData",this.applyId);
                 this.loading = true;
                 getWriteoffApply(this.applyId).then(response => {
                     this.form = response.data;
                     this.waitBatchDtlList = this.form.detailList;
-                    console.log('initData form', this.form);
                     this.form.picUrl = this.form.imageList.map(item => item.imagePath).join(',');
                     this.loading = false;
                 });
             } else {
                 this.reset();
-
-                this.form.startSiteCode = this.$store.getters.ownerSiteCode;
-                this.form.batchType = '1';
-                this.form.batchNo = null;
-                // getTmsGroupBatchNo().then(resPack => {
-                //     this.form.batchNo = resPack.data;
-                // });
-
-                this.form.batchDate = parseTime(new Date());
             }
         },
-
-    
-
-        initBatchBillRel(batchNo) {
-            this.waitBatchDtlList = [];
-            listEmisTmsSiteBatchDtl({ batchNo: batchNo }).then(response => {
-                let rows = response.rows;
-                let cvtBillList = rows.map(item => {
-                    let batchVolume = item.batchVolume;
-                    let batchParcelQty = item.batchParcelQty;
-                    let batchWeight = item.batchWeight;
-                    return { ...item.waybillDetail, batchVolume, batchParcelQty, batchWeight, batchId: item.id };
-                    // return item.waybillDetail
-                });
-                this.waitBatchDtlList = cvtBillList;
-                this.computeTotal();
-            });
-        },
-
         // 表单重置
         reset() {
             this.form = {
-                id: null,
+                writeoffAmount: null,
-                batchNo: null,
+                payType: null,
-                batchName: null,
+                recipient: null,
-                batchDate: null,
+                tradeDate: null,
-                supplierCode: null,
+                applyMemo: null,
-                supplierName: null,
+                picUrl: null,
-                supplierNameEn: null,
-                transLineType: null,
-                productType: null,
-                batchType: null,
-                transType: null,
-                startSiteCode: null,
-                startSiteSizeCode3: null,
-                sendCountry: null,
-                nextSiteCode: null,
-                nextSiteSizeCode3: null,
-                airBilllNo: null,
-                etd: null,
-                eta: null,
-                carNo: null,
-                shipNo: null,
-                clearanceResStatus: null,
-                declareResStatus: null,
-                destCountry: null,
-                destCountryName: null,
-                transWeight: null,
-                packNum: null,
-                totalParcelQty: null,
-                totalWaybillQty: null,
-                totalVolume: null,
-                totalWeight: null,
-                opMan: null,
-                remark: null,
-                tenantId: null,
-
-                loadingList: [],
-                batchDtlList: [],
             };
+            this.waitBatchDtlList = [];
             this.resetForm("form");
         },
 
-  
+
 
         submitSaveBatchForm() {
             if (this.waitBatchDtlList.length == 0) {
@@ -477,7 +339,7 @@ export default {
                 queryByBillCodes(queryParams).then(res => {
                     const billData = res.data;
                     console.log('queryByBillCodes', billData);
-                    let item = { ...billData[0]};
+                    let item = { ...billData[0] };
                     this.waitBatchDtlList.push(item);
                 })
             }
@@ -551,231 +413,6 @@ export default {
         cancelForm() {
             this.openForm = false;
         },
-        /** 导出按钮操作 */
-        handleDownBatchDtl() {
-            const loadingInstance = this.$loading({
-                text: '正在导出...'
-            })
-
-            this.exportData(this.waitBatchDtlList, loadingInstance);
-
-            // let qExportParam={
-            //   pageNum:1,
-            //   pageSize:20000,
-            //   batchNo: this.form.batchNo
-            // };
-
-            // listEmisTmsSiteBatchDtl(qExportParam).then(response => {
-            //   if (response.code === 200) {
-            //     this.exportData(response.rows,loadingInstance);
-            //   }
-            // });
-        },
-        exportData(selData, loadingInstance) {
-            const curList = selData
-            import('@/vendor/Export2Excel').then(excel => {
-                const exportParam = this.$refs.refTable.getExportParam();
-                const tHeader = exportParam.header;
-                const filterVal = exportParam.filter;
-                console.log("===>filterVal===>", filterVal);
-
-                const data = this.formatJson(filterVal, curList, selData)
-                excel.export_json_to_excel({
-                    header: tHeader,
-                    data,
-                    filename: '批次明细导出',
-                    autoWidth: true
-                })
-                loadingInstance.close()
-            })
-        },
-        formatJson(filterVal, jsonData, resData) {
-            let index = 0
-            return jsonData.map(v => filterVal.map(j => {
-
-                // console.log("===>1111===>",v);
-
-                if (j === 'index') {
-                    return ++index
-                }
-                if (j === 'kjlx') {
-                    return v['sendSiteName'] + '--' + v['dispatchUnderlingSiteName'];
-                }
-                if (j === 'fjr') {
-                    return v['sendName'] + '--' + v['receiveName'];
-                }
-
-                if (j === 'receiveCountryName') {
-                    return v['receiveCountryName'];
-                }
-
-                if (j === 'sendCountryName') {
-                    return v['sendCountryName'];
-                }
-
-
-                if (j === 'estimateDate') {
-                    return v['estimateDate'];
-                }
-
-                if (j === 'sendSiteName') {
-                    return v['sendSiteName'];
-                }
-
-                if (j === 'sendName') {
-                    return v['sendName'];
-                }
-
-                if (j === 'receiveName') {
-                    return v['receiveName'];
-                }
-
-                if (j === 'sendDate') {
-                    return v['sendDate'];
-                }
-
-                if (j === 'sendCompany') {
-                    return v['sendCompany'];
-                }
-
-                if (j === 'receiveCompany') {
-                    return v['receiveCompany'];
-                }
-
-                if (j === 'transLineTypeName') {
-                    return v['transLineTypeName'];
-                }
-
-                if (j === 'productTypeName') {
-                    return v['productTypeName'];
-                }
-
-
-                if (j === 'sendName') {
-                    return v['sendName'];
-                }
-
-                if (j === 'parcelQty') {
-                    return v['parcelQty'];
-                }
-
-                if (j === 'billWeight') {
-                    return v['billWeight'];
-                }
-
-                if (j === 'volumeWeight') {
-                    return v['volumeWeight'];
-                }
-
-                if (j === 'totalVolume') {
-                    return v['totalVolume'];
-                }
-
-                if (j === 'settlementWeight') {
-                    return v['settlementWeight'];
-                }
-
-                if (j === 'freight') {
-                    return v['freight'];
-                }
-
-                if (j === 'realFee') {
-                    return v['realFee'];
-                }
-
-                if (j === 'remark') {
-                    return v['remark'];
-                }
-
-                if (j === 'feeRemark') {
-                    return v['feeRemark'];
-                }
-
-                if (j === 'salesmen') {
-                    return v['salesmen'];
-                }
-
-                if (j === 'payee') {
-                    return v['payee'];
-                }
-
-                if (j === 'payee') {
-                    return v['payee'];
-                }
-
-                if (j === 'problemTypeName') {
-                    return v['problemTypeName'];
-                }
-
-                if (j === 'problemCause') {
-                    return v['problemCause'];
-                }
-
-                if (j === 'sendMobile') {
-                    return "";
-                }
-
-                if (j === 'calcFeeType') {
-                    return this.selectDictLabel(this.dict.type.emis_calc_fee_type, v['calcFeeType']);
-                }
-
-                if (j === 'waybillDetail.paymentStatus') {
-                    return this.selectDictLabel(this.dict.type.emis_payment_status, v['paymentStatus']);
-                }
-
-                if (j === 'pickupMethod') {
-                    return this.selectDictLabel(this.dict.type.emis_qujian_fangshi, v['pickupMethod']);
-                }
-                if (j === 'customsEclaration') {
-                    return this.selectDictLabel(this.dict.type.emis_declare_mode, v['customsEclaration']);
-                }
-                if (j === 'customsClear') {
-                    return this.selectDictLabel(this.dict.type.emis_customs_clear, v['customsClear']);
-                }
-                if (j === 'packType') {
-                    return this.selectDictLabels(this.dict.type.emis_tab_packing_type, v['packType']);
-                }
-
-                if (j === 'dispatchMethod') {
-                    if (v['dispatchMethod'] == 1) {
-                        return '派送';
-                    } else {
-                        return '自提';
-                    }
-                }
-
-
-
-
-
-                if (j === 'blMessage') {
-                    if (v['blMessage'] == 1) {
-                        return '发送';
-                    } else {
-                        return '不发送';
-                    }
-                }
-                if (j === 'blAcceptMessage') {
-                    if (v['blAcceptMessage'] == 1) {
-                        return '发送';
-                    } else {
-                        return '不发送';
-                    }
-                }
-                if (j === 'blSign') {
-                    if (v['blSign'] == 1) {
-                        return '已签收';
-                    } else {
-                        return '未签收';
-                    }
-                }
-                if (j === 'paymentType') {
-                    return this.selectDictLabel(this.dict.type.emis_payment_type, v['paymentType']);
-                }
-                return v[j]
-            }))
-        },
-
         /** 列索引函数  */
         getIndex($index) {
             return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
@@ -784,43 +421,6 @@ export default {
         dateTimeChange(value) {
             this.dateTimeRange = value;
         },
-        /** 导出按钮操作 */
-        handleExport() {
-            const loadingInstance = this.$loading({
-                text: '正在导出...'
-            })
-            var qParam = { ...this.queryParams };
-            qParam.pageNum = 1;
-            qParam.pageSize = 5000;
-
-            listEmisTmsSiteBatchDtl({ batchNo: this.form.batchNo }).then(response => {
-                this.downloadLoading = false
-                if (response.code === 200) {
-                    const curList = response.rows.map(item => {
-                        return {
-                            "billCode": item.billCode,
-                            ...item.waybillDetail,
-                        }
-                    })
-                    console.log(curList)
-                    setTimeout(() => {
-                        import('@/vendor/Export2Excel').then(excel => {
-                            const tHeader = ['运单号', '寄件网点', '寄件国家', '目的国家', '线路', '产品类型', '寄件日期', '预计到达时间', '总件数', '实际重量', '总体积', '体积重量', '结算重量', '收件人', '收件公司', '报关方式', '清关方式', '取件方式', '付款方式', '运费', '寄件人', '寄件公司', '录单备注'];
-                            const filterVal = ['billCode', 'sendSiteName', 'sendCountryName', 'receiveCountryName', 'transLineTypeName', 'productTypeName', 'sendDate', 'estimateDate', 'parcelQty', 'billWeight', 'totalVolume', 'volumeWeight', 'settlementWeight', 'receiveName', 'receiveCompany', 'customsEclaration', 'customsClear', 'pickupMethod', 'paymentType', 'freight', 'sendName', 'sendCompany', 'remark'];
-                            const data = this.formatJson(filterVal, curList, response.rows)
-                            excel.export_json_to_excel({
-                                header: tHeader,
-                                data,
-                                filename: '批次明细导出',
-                                autoWidth: true
-                            })
-                            loadingInstance.close()
-                        })
-
-                    }, 500)
-                }
-            });
-        },
     }
 };
 </script>

src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue

@@ -53,16 +53,9 @@
       @selection-change="handleSelectionChange" @sort-change="handleSortChange" @row-dblclick="handleShowBatchInfo">
 
       <div slot="toolbar">
-        <!-- <el-button style="margin-right: 5px;"
-                type="primary"
-                plain
-                size="mini"
-                v-hasPermi="['emis:emisTmsSiteBatch:query']"
-                @click="getList"
-              >查询</el-button> -->
         <el-button style="margin-right: 5px;" type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['emis:writeoffApply:add']">新增申请</el-button>
-        <el-button style="margin-right: 5px;" type="primary" plain size="mini" @click="handleUpdate" :disabled="single"
+        <el-button style="margin-right: 5px;" type="primary" plain size="mini" @click="handleUpdate" :disabled="single || selectBlCenterConfirmed != '0'"
           v-hasPermi="['emis:writeoffApply:edit']">修改</el-button>
         <el-button style="margin-right: 5px;" type="danger" plain size="mini" @click="handleRevoke" :disabled="multiple"
           v-hasPermi="['emis:writeoffApply:revoke']">撤销</el-button>
@@ -100,130 +93,43 @@
 <script>
 import { getWriteoffApplyList, deleteWriteoffApply, revoke } from "@/api/emis/emisSettleCancelAccount";
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
-import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
-import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
-import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
-import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
-import { listEmisTmsSiteBatchDtl } from "@/api/emis/emisTmsSiteBatchDtl";
-
-import PackListView from '@/views/emis/emisTmsSiteBatch/packListView';
-import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
-
-import SysUserSimplePicker from '@/views/emis/EmisBaseTools/SysUserSimplePicker.vue';
-
-import BatchImportSiteBatch from '@/views/emis/emisTmsSiteBatch/panel/BatchImportSiteBatch.vue';
-import BatchSiteBatchUpdateForm from '@/views/emis/emisTmsSiteBatch/panel/BatchSiteBatchUpdateForm.vue';
 import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
 import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
 import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 import CancelAccountApplicationFormPanel from '@/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue';
 
 export default {
-  name: "CancelAccountApplicationListPanel",
+  name: "cancelAccountApplicationListPanel",
   components: {
-    EmisGetNextSitePicker,
+     elDateAdvPicker, PayeePicker, SalemanPicker, EmpNamePicker, CancelAccountApplicationFormPanel
-    EmisSiteSimplePicker, elDateAdvPicker, TransLinePicker,
-    TransProductPicker, PackListView, SysUserSimplePicker,
-    EmisSupplierPicker, BatchImportSiteBatch, BatchSiteBatchUpdateForm, PayeePicker, SalemanPicker, EmpNamePicker, CancelAccountApplicationFormPanel
   },
-  dicts: [
+  dicts: ['emis_payment_type', 'center_confirme_status'],
-    'emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status', 'emis_declare_mode', 'emis_customs_clear', 'emis_big_batch_type', 'center_confirme_status'
-  ],
 
   data() {
     return {
       // 遮罩层
       loading: false,
-      loading2: false,
-      loadingWait: false,
-      loadingDone: false,
       // 选中数组
       ids: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
       multiple: true,
-
-      coSingle: true,
-      coMultiple: true,
-
-      addWayBillDisabled: true,
-      // packDisabled: true,
-      activeName: 'third',
-
       // 显示搜索条件
       showSearch: true,
       // 创建时间搜索
       dateTimeRange: [],
       // 总条数
       total: 0,
-      // TMS组批次表格数据
+      emisTmsBatchList: [],
-      emisTmsBatchList: [{ 'id': 22100, 'settleBillNo': '123' }],
-
-      // 待组批次列表
-      emisTmsWaitPackList: [],
-      waitTotal: 0,
-
-      // 已组批次列表
-      emisTmsDonePackList: [],
-      doneTotal: 0,
-      waitPackList: [],//选择未组包的运单先保存起来，在后续新增组批次的弹框中使用
-      // 新增/修改弹窗数据
-      coData: {
-
-      },
-
-      openBatchUpdateForm: false,
-      titleBatchForm: "",
-
-      openBatch: false,
-      titleBatch: "",
-      formBatchBillList: "",
-
-      // 新增/修改包详情数据
-      emisCoPackDetail: [],
-      blUnpack: "1",
-      // 追加的运单查询数据
-      wayBillData: {
-        pageNum: 1,
-        pageSize: 20,
-        params: {
-          dataTimeType: '1',
-          queryOrderType: '1'
-        }
-      },
-      // 追加的运单数据
-      emisWayBillList: [],
       selectionList: [],
-      wayBillotal: 0,
-
       currentId: null,
       openForm: false,
-      titleForm: "",
       queryOrderType: '1',
       queryETDType: '1',
-
-      titleWayBill: null,
-      openWayBillForm: false,
-
-      tempCoPackList: [],
-      coSelection: [],
-      //区分当前是新增还是修改
-      coPackType: '',
-
-      // 临时存储已有组批次的运单号
-      tempExistCoPackWayBillList: [],
-      tempCoPackInfo: {},
-
       // 弹出展示层
       id: null,
-      titleView: "",
+      selectBlCenterConfirmed: null,
-      openView: false,
-      // 更新网点时间范围
-      daterangeCreateTime: [],
-      // 更新网点时间范围
-      daterangeUpdateTime: [],
-
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -313,6 +219,7 @@ export default {
       this.selectionList = selection;
       this.single = selection.length !== 1
       this.multiple = !selection.length
+      this.selectBlCenterConfirmed = selection[0].blCenterConfirmed;
     },
     // 排序 查询字段是表格中字段名字 动态取值排序顺序
     handleSortChange(column) {
@@ -328,10 +235,6 @@ export default {
     handleUpdate(row) {
       this.$emit("onUpdate", this.ids);
     },
-    handleBatchAdd() {
-      this.openForm = true;
-      this.titleForm = "批量导入";
-    },
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal.confirm('是否确认删除').then(function () {
@@ -351,20 +254,6 @@ export default {
       }).catch(() => { });
     },
 
-    /** 修改按钮操作 */
-    handleBatchUpdate(row) {
-      // this.currentId= row.id;
-      this.openBatchUpdateForm = true;
-      this.titleBatchForm = "批量修改";
-    },
-    handleBatchFormChanged() {
-      this.openBatchUpdateForm = false;
-      this.getList();
-    },
-    cancelBatchForm() {
-      this.openBatchUpdateForm = false;
-    },
-
     handleCopy() {
       this.$emit("onCopy", this.ids);
     },
@@ -377,379 +266,7 @@ export default {
     },
     cancelForm() {
       this.openForm = false;
-    },
+    }
-
-    /** 导出按钮操作 */
-    handleExport() {
-      const loadingInstance = this.$loading({
-        text: '正在导出...'
-      })
-
-      if (this.selectionList && this.selectionList.length > 0) {
-        this.exportData(this.selectionList, loadingInstance);
-      }
-      else {
-        let qExportParam = this.initQueryParams();
-        qExportParam.pageNum = 1;
-        qExportParam.pageSize = 20000;
-
-        listEmisTmsSiteBatch(qExportParam).then(response => {
-          if (response.code === 200) {
-            this.exportData(response.rows, loadingInstance);
-          }
-        });
-      }
-    },
-    exportData(selData, loadingInstance) {
-      const curList = selData
-      import('@/vendor/Export2Excel').then(excel => {
-        const exportParam = this.$refs.refTable.getExportParam();
-        const tHeader = exportParam.header;
-        const filterVal = exportParam.filter;
-        const data = this.formatJson(filterVal, curList, selData)
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: '批次列表',
-          autoWidth: true
-        })
-        loadingInstance.close()
-      })
-    },
-    formatJson(filterVal, jsonData, resData) {
-      let index = 0
-      return jsonData.map(v => filterVal.map(j => {
-
-        if (j === 'index') {
-          return ++index
-        }
-        if (j === 'kjlx') {
-          return v['sendSiteName'] + '--' + v['dispatchUnderlingSiteName'];
-        }
-        if (j === 'fjr') {
-          return v['sendName'] + '--' + v['receiveName'];
-        }
-        if (j === 'custName') {
-          let paymentType = v['paymentType'];
-          if (paymentType == 2 || paymentType == 4 || paymentType == 5) {
-            return v['custName'];
-          } else {
-            return "";
-          }
-        }
-
-        if (j === 'sendMobile') {
-          return "";
-        }
-        if (j === 'batchType') {
-          return this.selectDictLabel(this.dict.type.emis_big_batch_type, v[j]);
-        }
-        if (j === 'transType') {
-          return this.selectDictLabel(this.dict.type.emis_biz_shipping_method, v[j]);
-        }
-        if (j === 'paymentStatus') {
-          return this.selectDictLabel(this.dict.type.emis_payment_status, v[j]);
-        }
-
-        if (j === 'pickupMethod') {
-          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi, v[j]);
-        }
-        if (j === 'customsEclaration') {
-          return this.selectDictLabel(this.dict.type.emis_declare_mode, v[j]);
-        }
-        if (j === 'customsClear') {
-          return this.selectDictLabel(this.dict.type.emis_customs_clear, v[j]);
-        }
-        if (j === 'packType') {
-          return this.selectDictLabels(this.dict.type.emis_tab_packing_type, v[j]);
-        }
-
-
-
-        if (j === 'dispatchMethod') {
-          if (v[j] == 1) {
-            return '派送';
-          } else {
-            return '自提';
-          }
-        }
-        if (j === 'blMessage') {
-          if (v[j] == 1) {
-            return '发送';
-          } else {
-            return '不发送';
-          }
-        }
-        if (j === 'blAcceptMessage') {
-          if (v[j] == 1) {
-            return '发送';
-          } else {
-            return '不发送';
-          }
-        }
-        if (j === 'blSign') {
-          if (v[j] == 1) {
-            return '已签收';
-          } else {
-            return '未签收';
-          }
-        }
-        if (j === 'paymentType') {
-          return this.selectDictLabel(this.dict.type.emis_payment_type, v[j]);
-        }
-        return v[j]
-      }))
-    },
-
-    handleDownBatchDtl(batchName) {
-      const loadingInstance = this.$loading({
-        text: '正在导出...'
-      })
-
-      if (this.selectionList && this.selectionList.length > 0) {
-        this.selectionList.forEach(item => {
-          let qExportParam = {
-            pageNum: 1,
-            pageSize: 20000,
-            batchNo: item.batchNo
-          };
-          let batchName = item.batchNo;
-          listEmisTmsSiteBatchDtl(qExportParam).then(response => {
-            if (response.code === 200) {
-              this.exportDataDtl(batchName, response.rows, loadingInstance);
-            }
-          });
-
-        });
-      }
-    },
-    exportDataDtl(batchName, selData, loadingInstance) {
-      const curList = selData
-      import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['运单号', '寄件国家', '目的国家', '线路', '产品类型', '预计到达时间', '总件数', '实际重量', '总体积', '体积重量', '结算重量', '收件人', '收件公司', '取件方式', '付款方式', '运费', '寄件人', '寄件公司', '录单备注', '寄件网点', '清关方式', '报关方式'];
-        const filterVal = [
-          "billCode",
-          "sendCountryName",
-          "receiveCountryName",
-          "transLineTypeName",
-          "productTypeName",
-          "estimateDate",
-          "parcelQty",
-          "billWeight",
-          "totalVolume",
-          "volumeWeight",
-          "settlementWeight",
-          "receiveName",
-          "receiveCompany",
-          "pickupMethod",
-          "paymentType",
-          "freight",
-          "sendName",
-          "sendCompany",
-          "remark",
-          "sendSiteName",
-          "customsEclaration",
-          "customsClear"
-        ];
-
-        const data = this.formatJsonDtl(filterVal, curList, selData)
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: batchName + '批次明细表',
-          autoWidth: true
-        })
-        loadingInstance.close()
-      })
-    },
-    formatJsonDtl(filterVal, jsonData, resData) {
-      let index = 0
-      return jsonData.map(v => filterVal.map(j => {
-
-
-        if (j === 'index') {
-          return ++index
-        }
-        if (j === 'kjlx') {
-          return v['waybillDetail']['sendSiteName'] + '--' + v['waybillDetail']['dispatchUnderlingSiteName'];
-        }
-        if (j === 'fjr') {
-          return v['sendName'] + '--' + v['receiveName'];
-        }
-
-        if (j === 'receiveCountryName') {
-          return v['waybillDetail']['receiveCountryName'];
-        }
-
-        if (j === 'sendCountryName') {
-          return v['waybillDetail']['sendCountryName'];
-        }
-
-
-        if (j === 'estimateDate') {
-          return v['waybillDetail']['estimateDate'];
-        }
-
-        if (j === 'sendSiteName') {
-          return v['waybillDetail']['sendSiteName'];
-        }
-
-        if (j === 'sendName') {
-          return v['waybillDetail']['sendName'];
-        }
-
-        if (j === 'receiveName') {
-          return v['waybillDetail']['receiveName'];
-        }
-
-        if (j === 'sendDate') {
-          return v['waybillDetail']['sendDate'];
-        }
-
-        if (j === 'sendCompany') {
-          return v['waybillDetail']['sendCompany'];
-        }
-
-        if (j === 'receiveCompany') {
-          return v['waybillDetail']['receiveCompany'];
-        }
-
-        if (j === 'transLineTypeName') {
-          return v['waybillDetail']['transLineTypeName'];
-        }
-
-        if (j === 'productTypeName') {
-          return v['waybillDetail']['productTypeName'];
-        }
-
-
-        if (j === 'sendName') {
-          return v['waybillDetail']['sendName'];
-        }
-
-        if (j === 'parcelQty') {
-          return v['waybillDetail']['parcelQty'];
-        }
-
-        if (j === 'billWeight') {
-          return v['waybillDetail']['billWeight'];
-        }
-
-        if (j === 'volumeWeight') {
-          return v['waybillDetail']['volumeWeight'];
-        }
-
-        if (j === 'totalVolume') {
-          return v['waybillDetail']['totalVolume'];
-        }
-
-        if (j === 'settlementWeight') {
-          return v['waybillDetail']['settlementWeight'];
-        }
-
-        if (j === 'freight') {
-          return v['waybillDetail']['freight'];
-        }
-
-        if (j === 'realFee') {
-          return v['waybillDetail']['realFee'];
-        }
-
-        if (j === 'remark') {
-          return v['waybillDetail']['remark'];
-        }
-
-        if (j === 'feeRemark') {
-          return v['waybillDetail']['feeRemark'];
-        }
-
-        if (j === 'salesmen') {
-          return v['waybillDetail']['salesmen'];
-        }
-
-        if (j === 'payee') {
-          return v['waybillDetail']['payee'];
-        }
-
-        if (j === 'payee') {
-          return v['waybillDetail']['payee'];
-        }
-
-        if (j === 'problemTypeName') {
-          return v['waybillDetail']['problemTypeName'];
-        }
-
-        if (j === 'problemCause') {
-          return v['waybillDetail']['problemCause'];
-        }
-
-        if (j === 'sendMobile') {
-          return "";
-        }
-
-        if (j === 'calcFeeType') {
-          return this.selectDictLabel(this.dict.type.emis_calc_fee_type, v['waybillDetail']['calcFeeType']);
-        }
-
-        if (j === 'waybillDetail.paymentStatus') {
-          return this.selectDictLabel(this.dict.type.emis_payment_status, v['waybillDetail']['paymentStatus']);
-        }
-
-        if (j === 'pickupMethod') {
-          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi, v['waybillDetail']['pickupMethod']);
-        }
-        if (j === 'customsEclaration') {
-          return this.selectDictLabel(this.dict.type.emis_declare_mode, v['waybillDetail']['customsEclaration']);
-        }
-        if (j === 'customsClear') {
-          return this.selectDictLabel(this.dict.type.emis_customs_clear, v['waybillDetail']['customsClear']);
-        }
-        if (j === 'packType') {
-          return this.selectDictLabels(this.dict.type.emis_tab_packing_type, v['waybillDetail']['packType']);
-        }
-
-        if (j === 'dispatchMethod') {
-          if (v['waybillDetail']['dispatchMethod'] == 1) {
-            return '派送';
-          } else {
-            return '自提';
-          }
-        }
-        if (j === 'blMessage') {
-          if (v['waybillDetail']['blMessage'] == 1) {
-            return '发送';
-          } else {
-            return '不发送';
-          }
-        }
-        if (j === 'blAcceptMessage') {
-          if (v['waybillDetail']['blAcceptMessage'] == 1) {
-            return '发送';
-          } else {
-            return '不发送';
-          }
-        }
-        if (j === 'blSign') {
-          if (v['waybillDetail']['blSign'] == 1) {
-            return '已签收';
-          } else {
-            return '未签收';
-          }
-        }
-        if (j === 'paymentType') {
-          return this.selectDictLabel(this.dict.type.emis_payment_type, v['waybillDetail']['paymentType']);
-        }
-        return v[j]
-      }))
-    },
-    /** 列索引函数  */
-    getIndex($index) {
-      return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
-    },
-    /** 时间搜索响应函数 */
-    dateTimeChange(value) {
-      this.dateTimeRange = value;
-    },
   }
 };
 </script>

src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue

@@ -19,7 +19,7 @@
                 :show-overflow-tooltip="true" />
             <el-table-column :label="$t('已收金额')" align="center" prop="emisSettleSubBill.recedMoney" min-width="100">
             </el-table-column>
-            <el-table-column :label="$t('收/退款金额')" align="center" prop="applyMoney" min-width="100">
+            <el-table-column :label="$t('收款金额')" align="center" prop="applyMoney" min-width="100">
             </el-table-column>
             <el-table-column :label="$t('寄件日期')" align="center" prop="emisWaybill.sendDate" min-width="170"
                 :show-overflow-tooltip="true" />

src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue

@@ -91,41 +91,11 @@
             </el-table-column>
             <el-table-column :label="$t('销账金额')" align="center" prop="writeoffAmount" min-width="150" />
         </XdTable>
-
-        <el-dialog :title="titleForm" :visible.sync="openForm" width="90%" :destroy-on-close="true" v-dialogDrag
-            append-to-body>
-            <BatchImportSiteBatch @on-changed="handleFormChanged" @on-cancel="cancelForm"></BatchImportSiteBatch>
-        </el-dialog>
-
-        <el-dialog :title="titleBatchForm" :visible.sync="openBatchUpdateForm" width="50%" :destroy-on-close="true"
-            :close-on-click-modal="false" v-dialogDrag append-to-body>
-            <BatchSiteBatchUpdateForm :ids="ids" @on-changed="handleBatchFormChanged" @on-cancel="cancelBatchForm">
-            </BatchSiteBatchUpdateForm>
-        </el-dialog>
-
     </XdPageContainer>
 </template>
 
 <script>
-import { listEmisTmsSiteBatch, getTmsGroupBatchNo, getEmisTmsSiteBatch, delEmisTmsSiteBatch, addEmisTmsSiteBatch, updateEmisTmsSiteBatch } from "@/api/emis/emisTmsSiteBatch";
-import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
-import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
-import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
-import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
-import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
-import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
-import { parseTime, dateToStr } from "@/utils/custom";
-import { formatSearchStr } from '@/utils/index'
-import { listEmisTmsSiteBatchDtl } from "@/api/emis/emisTmsSiteBatchDtl";
-
-import PackListView from '@/views/emis/emisTmsSiteBatch/packListView';
-import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
-
-import SysUserSimplePicker from '@/views/emis/EmisBaseTools/SysUserSimplePicker.vue';
-
-import BatchImportSiteBatch from '@/views/emis/emisTmsSiteBatch/panel/BatchImportSiteBatch.vue';
-import BatchSiteBatchUpdateForm from '@/views/emis/emisTmsSiteBatch/panel/BatchSiteBatchUpdateForm.vue';
 import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
 import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
 import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
@@ -133,12 +103,8 @@ import CancelAccountApplicationFormPanel from '@/views/emis/emisSettleBill/panel
 import { getWriteoffApplyList, auditCenterPass, auditCenterReject, auditHeadquartersConfirm, auditHeadquartersReject } from "@/api/emis/emisSettleCancelAccount";
 
 export default {
-    name: "CancelAccountApplicationListPanel",
+    name: "CancelAccountCheckListPanel",
-    components: {
+    components: {  elDateAdvPicker, PayeePicker, SalemanPicker, EmpNamePicker, CancelAccountApplicationFormPanel
-        EmisGetNextSitePicker, CountryPicker,
-        EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker,
-        TransProductPicker, PackListView, SysUserSimplePicker,
-        EmisSupplierPicker, BatchImportSiteBatch, BatchSiteBatchUpdateForm, PayeePicker, SalemanPicker, EmpNamePicker, CancelAccountApplicationFormPanel
     },
     dicts: [ 'center_confirme_status'],
 
@@ -257,14 +223,10 @@ export default {
         };
     },
     created() {
-    },
+        console.log("===> created "); // created
-
-    mounted() {
         this.getList();
     },
     methods: {
-
-
         getList() {
             this.loading = true;
 
@@ -382,15 +344,6 @@ export default {
             this.openForm = true;
             this.titleForm = "批量导入";
         },
-        handleDelete(row) {
-            const ids = row.id || this.ids;
-            this.$modal.confirm('是否确认删除').then(function () {
-                return delEmisTmsSiteBatch(ids);
-            }).then(() => {
-                this.getList();
-                this.$modal.msgSuccess("删除成功");
-            }).catch(() => { });
-        },
 
         /** 修改按钮操作 */
         handleBatchUpdate(row) {