md

2024-08-11 10:49:29 +08:00 · 2024-08-11 10:49:29 +08:00 · aa267b2815
commit aa267b2815
parent 98790ce609
6 changed files with 57 additions and 13 deletions
--- a/src/layout/components/TopNotice/index.vue
+++ b/src/layout/components/TopNotice/index.vue
@ -12,6 +12,9 @@
          <i class="el-icon-bell"></i>
        </el-badge>
      </div>
+      <div class="wrap">
+        <audio id="audioMusic" class="audio" src="/static/tone/notifyTone2.mp3" controls autoplay="autoplay" hidden="true" ref="audio"></audio>
+       </div>
    </div>
    <el-tabs v-model="active">
      <!-- <el-tab-pane name="notice" :label="noticeLabel"> -->
@ -72,6 +75,8 @@ export default {
  },
  mounted() {
    this.initXDNoticSdk();
+    window.addEventListener("click", this.musicAutoPlay);
+

    // this.notice();
    // const wsuri = this.url;
@ -100,6 +105,15 @@ export default {
    // };
  },
  methods: {
+     musicAutoPlay() {
+       this.isPlay = true;
+     },
+     latestSecurityIncidents() {
+         //同时 触发提示音
+         if (this.isPlay){
+           document.getElementById('audioMusic').play();
+         }
+     },
    initXDNoticSdk(){
        this.xdNoticSdk = this.$xdNoticeSdk;
        const userId=this.$store.getters.userId;
--- a/src/views/emis/emisSettleBill/ChargeBillMoneyList.vue
+++ b/src/views/emis/emisSettleBill/ChargeBillMoneyList.vue
@ -7,7 +7,7 @@
            <ChargeBillMoneyPanel key="billList"  @onSelect="onSelectBill"> </ChargeBillMoneyPanel>
          </el-tab-pane>
          <el-tab-pane v-for="(item, index) in billTabs" :key="index"  :name="item.settleBillNo" :label="'账单:'+item.settleBillNo"  closable >
-            <BillDetailPanel :key="'Detail_'+index" :settleBillNo="item.settleBillNo"></BillDetailPanel>
+            <BillDetailPanelReadOnly :key="'Detail_'+index" :settleBillNo="item.settleBillNo"></BillDetailPanelReadOnly>
          </el-tab-pane>
        </el-tabs>
      </div>
@ -19,14 +19,14 @@

 <script>
 import ChargeBillMoneyPanel from '@/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue';
-import BillDetailPanel from '@/views/emis/emisSettleBill/panel/BillDetailPanel.vue';
+import BillDetailPanelReadOnly from '@/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue';


 export default {
  name: "ChargeBillMoneyList",
  components: {
    ChargeBillMoneyPanel,
-    BillDetailPanel
+    BillDetailPanelReadOnly
 },
  dicts: [
  ],
--- a/src/views/emis/emisSettleBill/ChargeBillMonthList.vue
+++ b/src/views/emis/emisSettleBill/ChargeBillMonthList.vue
@ -7,7 +7,7 @@
            <ChargeBillMonthPanel @onSelect="onSelectBill"> </ChargeBillMonthPanel>
          </el-tab-pane>
          <el-tab-pane v-for="(item, index) in billTabs" :key="index"  :name="item.settleBillNo" :label="'账单:'+item.settleBillNo"  closable >
-            <BillDetailPanel :settleBillNo="item.settleBillNo"></BillDetailPanel>
+            <BillDetailPanelReadOnly :settleBillNo="item.settleBillNo"></BillDetailPanelReadOnly>
          </el-tab-pane>
        </el-tabs>
    </div>
@ -16,14 +16,14 @@

 <script>
 import ChargeBillMonthPanel from '@/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue';
-import BillDetailPanel from '@/views/emis/emisSettleBill/panel/BillDetailPanel.vue';
+import BillDetailPanelReadOnly from '@/views/emis/emisSettleBill/panel/BillDetailPanel.vue';


 export default {
  name: "ChargeBillMonthList",
  components: {
    ChargeBillMonthPanel,
-    BillDetailPanel
+    BillDetailPanelReadOnly
 },
  dicts: [
  ],
--- a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
@ -286,8 +286,10 @@ export default {
      openForm: false,
      titleForm: "",

+      queryCode:null,
      queryOrderType:null,

+
      subBillTotal: 0,
     // 结算子账单表格数据
     emisSettleSubBillList: [],
@ -374,14 +376,19 @@ export default {
      this.loading = true;

      // 按运单查询时的处理
-      if(this.queryOrderType==1){
-        this.queryParams.params.billCode=this.queryParams.settleBillNo;
+      if(this.queryOrderType=='1'){
+        this.queryParams.params.billCode=this.queryParams.queryCode;
        this.queryParams.settleBillNo=null;
      }
+      else if(this.queryOrderType=='2'){
+        this.queryParams.params.billCode=null;
+        this.queryParams.settleBillNo=this.queryParams.queryCode;
+      }

      // 必须业务已确认后才可以做收款和开票
      this.queryParams.blSiteConfirm="1"

+
      listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
        this.emisSettleBillList = response.rows;
        this.total = response.total;
--- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
@ -182,14 +182,25 @@
      <el-table-column :label="$t('账单名称')" align="center" prop="settleBillName" min-width="100" :show-overflow-tooltip="true"/>
      <el-table-column :label="$t('发票文件')" align="center" prop="filePath" min-width="170" :show-overflow-tooltip="true">
      <template slot-scope="scope">
-          <el-button
+          <!-- <el-button
                  v-if="scope.row.invoiceStatus=='2'"
                  type="primary"
                  plain
                  icon="el-icon-download"
                  size="mini"
                  @click="handleDownPDF(scope.row)"
-                >下载发票</el-button>
+                >下载发票</el-button> -->
+                <el-link
+                 v-if="scope.row.invoiceStatus=='2'"
+                type="primary" style="line-height: 28px;font-size:13px;color:blue"  @click="handleDownPDF(scope.row)" >
+                  下载发票
+                </el-link>
+                <el-link
+                 v-if="scope.row.invoiceStatus=='2'"
+                type="primary" style="line-height: 28px;font-size:13px;color:blue"  @click="handleDownPDF(scope.row)" >
+                  复制发票地址
+                </el-link>
+
        </template>
      </el-table-column>
      <el-table-column :label="$t('开票状态')" align="center" prop="invoiceStatus" width="100" >
--- a/src/views/emis/emisWaybillTransfer/waybillTransfer.vue
+++ b/src/views/emis/emisWaybillTransfer/waybillTransfer.vue
@ -94,12 +94,12 @@
              @click="handleDelete"
            >删除</el-button>
          </el-col>
-          <!-- <el-col :span="1.5">
+          <el-col :span="1.5">
            <el-button plain class="filter-item" size="mini"  type="primary" icon="el-icon-upload2" @click="handleBatchImport">导入</el-button>
          </el-col>
          <el-col :span="1.5">
            <a href="/static/tpl/转件管理导出模板.xlsx"  style="color: blue;font-weight: 600;font-size:13px;text-decoration: underline">下载导入模版</a>
-          </el-col> -->
+          </el-col>
        </el-row>
      </div>

@ -550,13 +550,25 @@ export default {
      // 组装提交的数据
      for (let index = 0; index < results.length; index++) {
        const element = results[index]
+
+        // 判断转件公司是否正确
+        let transferExpressLabel=element['转件公司'];
+         let expressCodeItem=this.dict.type.emis_express_code.find(item=>item.label==transferExpressLabel);
+         if(!expressCodeItem){
+          this.$modal.msgError("转件公司:"+transferExpressLabel+" 名称不存在!");
+          loadingInstance.close();
+          return;
+         }
+
+         let transferExpress=expressCodeItem.value;
+
        let orderData={
                billCode: element['运单号'],
                transferBillCode: element['转件单号'],
                // transferDate2: element['转件时间'],
                transferDate: parseTime(new Date(element['转件时间'])),
                transferCity:  element['目的城市'],
-                transferExpress: element['转件公司'],
+                transferExpress: transferExpress,
                linkMan:element['联系人'],
                linkPhone:element['联系电话'],
                transferWeight: element['重量'],