md

2025-05-15 10:50:06 +08:00 · 2025-05-15 10:50:06 +08:00 · ea4a16f4bf
commit ea4a16f4bf
parent 9d1c81a7fa
6 changed files with 34 additions and 250 deletions
--- a/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue
+++ b/src/views/emis/emisSettleBill/PayBackStat/PayBackRecordList.vue
@ -54,14 +54,10 @@
            </el-table-column>
            <el-table-column :label="$t('收款金额')" align="center" prop="payMoney" width="80" />
            <el-table-column :label="$t('运单号')" align="center" prop="billCode" width="120" />
-            <el-table-column :label="$t('付款方式')" align="center" prop="settlePayRecordDetail.payType" width="100" >
-              <template slot-scope="scope">
-                    <span v-if="scope.row.settlePayRecordDetail.payType == '1'">微信支付</span>
-                    <span v-if="scope.row.settlePayRecordDetail.payType == '2'">支付宝支付</span>
-                    <span v-if="scope.row.settlePayRecordDetail.payType == '3'">企业微信收款</span>
-                    <span v-if="scope.row.settlePayRecordDetail.payType == '4'">对公付款</span>
-                    <span v-if="scope.row.settlePayRecordDetail.payType == '5'">其他</span>
-                  </template>
+            <el-table-column :label="$t('付款方式')" align="center" prop="settlePayRecordDetail.payType" width="150" >
+                <template slot-scope="scope">
+                  <dict-tag  :options="dict.type.emis_settlebill_pay_type" :value="scope.row.settlePayRecordDetail.payType"/>
+                </template>
            </el-table-column>
            <el-table-column label="登记人" align="center" prop="settlePayRecordDetail.createByName"  width="80" :show-overflow-tooltip="true"/>
            <el-table-column label="登记时间" align="center" prop="settlePayRecordDetail.createTime"  width="170"/>
@ -152,7 +148,7 @@ export default {

  },
  components: { },
-  dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
+  dicts: ['emis_settlebill_pay_type','emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
        'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
        'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
  ],
@ -629,24 +625,7 @@ export default {

        if (j === 'settlePayRecordDetail.payType') {
          let payType=v['settlePayRecordDetail']['payType'];
-          if(payType == 1){
-            return '微信支付';
-          }
-          else if(payType == 2){
-            return '支付宝支付';
-          }
-          else if(payType == 3){
-            return '企业微信收款';
-          }
-          else if(payType == 4){
-            return '对公付款';
-          }
-          else if(payType == 5){
-            return '其他';
-          }
-          else{
-            return '';
-          }
+
        }
        if (j === 'settleSubBill.openBillStatus') {
          let openBillStatus=v['settleSubBill']['openBillStatus'];
--- a/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue
+++ b/src/views/emis/emisSettleBill/PayBackStat/PayBackStatQuery.vue
@ -67,6 +67,7 @@
          :queryParams="queryParams"
          :total="total"

+          @queryTable="getList"
          @selection-change="handleSelectionChange"
          @sort-change="handleSortChange"
          @row-dblclick="onDblClick"
@ -356,6 +357,7 @@ export default {

    },
    handleQuery(){
+      console.log("===>handleQuery====>");
      this.getList();
    },
    /** 查询明细列表 */
--- a/src/views/emis/emisSettleBill/PayBackStat/PayDayRecordList.vue
+++ b/src/views/emis/emisSettleBill/PayBackStat/PayDayRecordList.vue
@ -54,14 +54,10 @@
              <span v-if="scope.row.recType == '2'">退款</span>
      </template>
      </el-table-column>
-      <el-table-column :label="$t('支付类型')" align="center" prop="payType" width="100" >
-        <template slot-scope="scope">
-              <span v-if="scope.row.payType == '1'">微信支付</span>
-              <span v-if="scope.row.payType == '2'">支付宝支付</span>
-              <span v-if="scope.row.payType == '3'">企业微信收款</span>
-              <span v-if="scope.row.payType == '4'">对公付款</span>
-              <span v-if="scope.row.payType == '5'">其他</span>
-            </template>
+      <el-table-column :label="$t('支付类型')" align="center" prop="payType" width="150" >
+          <template slot-scope="scope">
+            <dict-tag  :options="dict.type.emis_settlebill_pay_type" :value="scope.row.payType"/>
+          </template>
      </el-table-column>
      <el-table-column :label="$t('支付金额')" align="center" prop="payMoney" width="100" />
      <el-table-column :label="$t('缴款客户')" align="center" prop="payMan" width="150" :show-overflow-tooltip="true" />
@ -119,8 +115,7 @@ export default {

  },
  components: { elDateAdvPicker,emisSettlePayRecordForm,SalemanPicker },
-  dicts: [
-  ],
+  dicts: ['emis_settlebill_pay_type'],
  data() {
    return {
      // 遮罩层
@ -466,106 +461,14 @@ export default {
          return ++index
        }

-        if (j === 'waybillDetail.parcelQty') {
-          return v['waybillDetail']['parcelQty'];
+
+        if (j === 'payType') {
+          let payType=v['payType'];
+          return this.selectDictLabel(this.dict.type.emis_settlebill_pay_type,payType);
        }

-        if (j === 'waybillDetail.billWeight') {
-          return v['waybillDetail']['billWeight'];
-        }
-
-        if (j === 'waybillDetail.totalVolume') {
-          return v['waybillDetail']['totalVolume'];
-        }
-
-        if (j === 'waybillDetail.volumeWeight') {
-          return v['waybillDetail']['volumeWeight'];
-        }
-
-        if (j === 'waybillDetail.settlementWeight') {
-          return v['waybillDetail']['settlementWeight'];
-        }
-
-        if (j === 'waybillDetail.freight') {
-          return v['waybillDetail']['freight'];
-        }
-
-
-        if (j === 'waybillDetail.productTypeName') {
-          return v['waybillDetail']['productTypeName']+'('+v['waybillDetail']['timeType']+')';
-        }
-
-
-        if (j === 'waybillDetail.transLineTypeName') {
-          return v['waybillDetail']['transLineTypeName'];
-        }
-
-        if (j === 'waybillDetail.sendCompany') {
-          return v['waybillDetail']['sendCompany'];
-        }
-
-        if (j === 'waybillDetail.paymentType') {
-          let paymentType=v['waybillDetail']['paymentType'];
-          return this.selectDictLabel(this.dict.type.emis_payment_type,paymentType);
-        }
-
-
-
-        if (j === 'settleBillDetail.payee') {
-          return v['settleBillDetail']['payee'];
-        }
-
-        if (j === 'settleBillDetail.salesmen') {
-          return v['settleBillDetail']['salesmen'];
-        }
-
-        if (j === 'settleBillDetail.recMoney') {
-          return v['settleBillDetail']['recMoney'];
-        }
-
-        if (j === 'settleBillDetail.recMoney') {
-          return v['settleBillDetail']['recMoney'];
-        }
-
-        if (j === 'settleBillDetail.refundMoney') {
-          return v['settleBillDetail']['refundMoney'];
-        }
-
-        if (j === 'settleBillDetail.satisfyMoney') {
-          return v['settleBillDetail']['satisfyMoney'];
-        }
-
-
-        if (j === 'settleBillDetail.allowanceMoney') {
-          return v['settleBillDetail']['allowanceMoney'];
-        }
-
-        if (j === 'settleBillDetail.deductionMoney') {
-          return v['settleBillDetail']['deductionMoney'];
-        }
-
-        if (j === 'settleBillDetail.otherMoney') {
-          return v['settleBillDetail']['otherMoney'];
-        }
-
-        if (j === 'settlePayRecordDetail.remark') {
-          return v['settlePayRecordDetail']['remark'];
-        }
-
-        if (j === 'settlePayRecordDetail.tradeDate') {
-          return v['settlePayRecordDetail']['tradeDate'];
-        }
-
-        if (j === 'settleBillDetail.paymentDueDate') {
-          return v['settleBillDetail']['paymentDueDate'];
-        }
-
-        if (j === 'settlePayRecordDetail.payId') {
-          return v['settlePayRecordDetail']['payId'];
-        }
-
-        if (j === 'settlePayRecordDetail.recType') {
-          let recType=v['settlePayRecordDetail']['recType'];
+        if (j === 'recType') {
+          let recType=v['recType'];
          if(recType == 1){
            return '收款';
          }
@ -573,59 +476,8 @@ export default {
            return '退款';
          }
        }
-        if (j === 'settlePayRecordDetail.createByName') {
-          return v['settlePayRecordDetail']['createByName'];
-        }
-        if (j === 'settlePayRecordDetail.createTime') {
-          return v['settlePayRecordDetail']['createTime'];
-        }

-        if (j === 'settleBillDetail.settleBillName') {
-          return v['settleBillDetail']['settleBillName'];
-        }
-        if (j === 'settleBillDetail.billMonth') {
-          return v['settleBillDetail']['billMonth'];
-        }
-        if (j === 'settleBillDetail.creditPeriod') {
-          return v['settleBillDetail']['creditPeriod'];
-        }
-        if (j === 'settleBillDetail.custName') {
-          return v['settleBillDetail']['custName'];
-        }
-        if (j === 'settleBillDetail.custName') {
-          let paymentType=v['waybillDetail']['paymentType'];
-          if(paymentType==2 || paymentType==4 || paymentType==5 ){
-            return v['settleBillDetail']['custName'];
-          }else{
-            return "";
-          }
-        }
-
-
-
-        if (j === 'settlePayRecordDetail.payType') {
-          let payType=v['settlePayRecordDetail']['payType'];
-          if(payType == 1){
-            return '微信支付';
-          }
-          else if(payType == 2){
-            return '支付宝支付';
-          }
-          else if(payType == 3){
-            return '企业微信收款';
-          }
-          else if(payType == 4){
-            return '对公付款';
-          }
-          else if(payType == 5){
-            return '其他';
-          }
-          else{
-            return '';
-          }
-        }
         if (j === 'settleType') {
-
           if(v['settleType'] == 1){
            return '现金收款';
          }
@ -637,34 +489,7 @@ export default {

        }

-        if (j === 'settleSubBill.openBillStatus') {
-          let openBillStatus=v['settleSubBill']['openBillStatus'];
-          if(openBillStatus== 0){
-            return '未开票';
-          }
-          else if(openBillStatus == 1){
-            return '已开票';
-          }
-          else if(openBillStatus == 2){
-            return '部分开票';
-          }
-          else if(openBillStatus == 3){
-            return '不开票';
-          }
-          else if(openBillStatus == 4){
-            return '已完成';
-          }
-          else{
-            return '';
-          }
-        }
-        if (j === 'settleSubBill.invoicedMoney') {
-          return v['settleSubBill']['invoicedMoney'];
-        }
-        if (j === 'settleSubBill.paymentStatus') {
-          let paymentStatus=v['settleSubBill']['paymentStatus'];
-          return this.selectDictLabel(this.dict.type.emis_payment_status,paymentStatus);
-        }
+

        return v[j]
      }))
--- a/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue
+++ b/src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordList.vue
@ -167,8 +167,8 @@
    </XdTable>

    <el-dialog :title="titleForm" :visible.sync="openForm" width="80%" :destroy-on-close="true" :close-on-click-modal="false"  v-dialogDrag append-to-body>
-      <emisSettleInvoiceChRecordForm v-if="isManaul==false" :id="currentId" :applyId="applyId"  @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleInvoiceChRecordForm>
-      <ManualInvoiceChRecordForm  v-if="isManaul==true" :id="currentId" :applyId="applyId"  @on-changed="handleFormChanged" @on-cancel="cancelForm"></ManualInvoiceChRecordForm>
+      <emisSettleInvoiceChRecordForm :key="resetRefreshId+'1'" v-if="isManaul==false" :id="currentId" :applyId="applyId"  @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleInvoiceChRecordForm>
+      <ManualInvoiceChRecordForm :key="resetRefreshId+'2'"  v-if="isManaul==true" :id="currentId" :applyId="applyId"  @on-changed="handleFormChanged" @on-cancel="cancelForm"></ManualInvoiceChRecordForm>
    </el-dialog>


@ -203,6 +203,7 @@ export default {
  ],
  data() {
    return {
+      resetRefreshId:null,
      // 遮罩层
      loading: true,
      // 选中数组
@ -410,12 +411,15 @@ export default {
    },
    /** 新增按钮操作 */
    handleAdd(row) {
+      this.resetRefreshId="openchbill-"+Math.random().toString(36).substring(3,10);
+
      this.isManaul=false;
      this.currentId=null;
      this.openForm= true;
      this.titleForm = "新增航信开票";
    },
    handleManualAdd(){
+      this.resetRefreshId="openchbill-"+Math.random().toString(36).substring(3,10);
      this.isManaul=true;
      this.currentId=null;
      this.openForm= true;
@ -426,6 +430,7 @@ export default {
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
+      this.resetRefreshId="openchbill-"+Math.random().toString(36).substring(3,10);
       this.currentId=  row.id || this.ids;
       this.openForm = true;
       this.titleForm = "修改";
--- a/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue
+++ b/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue
@ -127,7 +127,7 @@
          <el-col :span="10">
            <el-form-item label="开票金额" prop="openMoney">
              <el-input-number v-model="form.openMoney" placeholder="" :min="1.0" :controls="false" :precision="2"></el-input-number>
-             <span style="font-size: 12px;color:red">（申请开票金额:￥{{ invoiceApplyData.applyMoney }})</span>
+             <span style="font-size: 12px;color:red" v-if="invoiceApplyData!=null">（申请开票金额:￥{{ invoiceApplyData.applyMoney }})</span>
            </el-form-item>
          </el-col>
          <el-col :span="14">
--- a/src/views/emis/emisSettlePayRecord/index.vue
+++ b/src/views/emis/emisSettlePayRecord/index.vue
@ -48,6 +48,7 @@
              </el-select>

          </el-form-item>
+
          <el-form-item label="收退类型" prop="recType">
              <el-select v-model="queryParams.recType" placeholder="" clearable filterable style="width:100%">
                    <el-option label="收款" :value="1"></el-option>
@ -110,29 +111,6 @@
                  @click="handleShowCanlender"
                >收款日历</el-button>
              </el-col>
-              <!--
-              <el-col :span="1.5">
-                <el-button
-                  type="success"
-                  plain
-                  icon="el-icon-edit"
-                  size="mini"
-                  :disabled="single"
-                  @click="handleUpdate"
-                  v-hasPermi="['emis:emisSettlePayRecord:edit']"
-                >修改</el-button>
-              </el-col>-->
-              <!-- <el-col :span="1.5">
-                <el-button
-                  type="danger"
-                  plain
-                  icon="el-icon-delete"
-                  size="mini"
-                  :disabled="multiple"
-                  @click="handleDelete"
-                  v-hasPermi="['emis:emisSettlePayRecord:remove']"
-                >作废</el-button>
-              </el-col> -->
              <el-col :span="1.5">
                <el-button
                  type="warning"
@ -167,14 +145,10 @@
      </el-table-column>
      <el-table-column :label="$t('缴款客户')" align="center" prop="payMan" width="150" :show-overflow-tooltip="true" />
      <!-- <el-table-column :label="$t('月结编号')" align="center" prop="payManCode" width="100" :show-overflow-tooltip="true"/> -->
-      <el-table-column :label="$t('支付类型')" align="center" prop="payType" width="100" >
-        <template slot-scope="scope">
-              <span v-if="scope.row.payType == '1'">微信支付</span>
-              <span v-if="scope.row.payType == '2'">支付宝支付</span>
-              <span v-if="scope.row.payType == '3'">企业微信收款</span>
-              <span v-if="scope.row.payType == '4'">对公付款</span>
-              <span v-if="scope.row.payType == '5'">其他</span>
-            </template>
+       <el-table-column :label="$t('支付类型')" align="center" prop="payType" width="150" >
+          <template slot-scope="scope">
+            <dict-tag  :options="dict.type.emis_settlebill_pay_type" :value="scope.row.payType"/>
+          </template>
      </el-table-column>

      <el-table-column :label="$t('收付类型')" align="center" prop="recType" width="80" >
@ -232,8 +206,7 @@ import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
 export default {
  name: "EmisSettlePayRecord",
  components: { elDateAdvPicker,emisSettlePayRecordForm,SalemanPicker },
-  dicts: [
-  ],
+  dicts: ['emis_settlebill_pay_type'],
  data() {
    return {
      // 遮罩层