md

2024-08-09 21:37:55 +08:00 · 2024-08-09 21:37:55 +08:00 · 43e9df183d
commit 43e9df183d
parent 27a53f252c
5 changed files with 53 additions and 32 deletions
--- a/src/views/emis/customerService/traceRecordList.vue
+++ b/src/views/emis/customerService/traceRecordList.vue
@ -203,7 +203,7 @@ export default {
         }
         // 转单扫描
         else if(scanType=="80"){
-          content='转单,快件在网点 <span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>,转件人<span class="siteOrManHighlight" >['+scanRecord.scanMan+']</span>';
+          content='转单,快件在网点 <span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>,转件人<span class="siteOrManHighlight" >['+scanRecord.scanMan+']</span>'+scanRecord.remark;
         }
         // 转件第三方物流信息,拼接三方公司物流轨迹
         else if(scanType=="81"){
--- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
@ -113,7 +113,7 @@
                        v-hasPermi="['emis:emisSettleBill:export']"
                      >导出</el-button>
                    </el-col> -->
-              <el-col :span="1.5" >
+              <el-col :span="1.5" v-if="confirmStatus==0">
               <el-button
                 type="primary"
                 plain
@ -122,6 +122,15 @@
                 @click="handleConfirmBySite"
               >确认账单</el-button>
             </el-col>
+             <!-- <el-col :span="1.5" v-if="confirmStatus==1">
+               <el-button
+                 type="danger"
+                 plain
+                 size="mini"
+                 :disabled="multiple"
+                 @click="handleCancelConfirmBySite"
+               >取消确认</el-button>
+             </el-col> -->
             <!-- <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
               <el-button
                 type="primary"
@ -133,16 +142,7 @@
               >确认不出账</el-button>
             </el-col> -->

-             <!-- <el-col :span="1.5" v-if="activeTab!='waitConfirm'">
-               <el-button
-                 type="danger"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleCancelConfirmBySite"
-                 v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillBySite']"
-               >取消确认</el-button>
-             </el-col> -->
+
                    <el-col :span="1.5">
                      <el-button
                        type="warning"
@ -400,6 +400,15 @@ export default {
       this.$modal.msgSuccess("操作成功");
     }).catch(() => {});
   },
+   handleConfirmBySite(row) {
+     const ids = row.id || this.ids;
+     this.$modal.confirm('请仔细确认,确认后不可撤销').then(function() {
+       return confirmSettleBillBySite(ids);
+     }).then(() => {
+       this.getList();
+       this.$modal.msgSuccess("操作成功");
+     }).catch(() => {});
+   },

    handleSendDbClick(row){
      this.$emit("onSelect",row);
--- a/src/views/emis/emisTmsScanRecord/signAndRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
@ -194,6 +194,11 @@
      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="150" />
      <el-table-column :label="$t('派件员')" align="center" prop="dispatchMan" min-width="100" />
      <el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="100" />
+      <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
+        </template>
+      </el-table-column>
      <el-table-column :label="$t('签收网点')" align="center" prop="signSiteCode" min-width="100" />
      <el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="170" >
        <template slot-scope="scope">
@ -216,11 +221,7 @@
      <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="100" />
      <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />

-      <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
-        </template>
-      </el-table-column>
+
      <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
      <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
          <template slot-scope="scope">
--- a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
+++ b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
@ -1,7 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="8"  label-width="100px" v-show="showSearch" @search="getList" @reset="resetQuery">
+  <XdPageContainer class="app-container">
+      <SearchForm   slot="pageHeader"  :model="queryParams" ref="queryForm"   size="small" :maxShow="8"  label-width="100px" v-show="showSearch" @search="getList" @reset="resetQuery">
          <el-form-item label="" prop="billCode">
            <div slot="label">
              <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
@ -54,13 +53,23 @@
          </el-form-item>
        <!-- </el-col> -->

-      </SearchForm>
-    </el-row >

-    <xd-table v-loading="loading"
+      </SearchForm>
+
+
+    <xd-table
+
+         slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          v-loading="loading"
           border
-           size="small"
+           size="mini"
           :data="tmsScanList"
+
+            storageName="signatureRecordQuery_main_240702"
+
           :showSearch.sync="showSearch"
           :queryParams="queryParams"
           :total="total"
@ -99,6 +108,7 @@
          <span>{{ scope.row.waybillDetail.dispatchManName }}</span>
        </template>
      </el-table-column>
+
      <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="170" >
          <template slot-scope="scope">
            <span>{{ parseTime(scope.row.waybillDetail.sendDate) }}</span>
@ -114,6 +124,11 @@
          <span>{{ scope.row.waybillDetail.transLineTypeName }}</span>
        </template>
      </el-table-column>
+      <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
+          </template>
+        </el-table-column>
      <el-table-column :label="$t('产品类型')" align="center" prop="" min-width="100">
        <template slot-scope="scope">
          <span>{{ scope.row.waybillDetail.productTypeName }}</span>
@ -177,7 +192,7 @@
        </template>
      </el-table-column>
    </xd-table>
-  </div>
+  </XdPageContainer>
 </template>

 <script>
@ -194,7 +209,7 @@ import { getDateTimeToString } from '@/utils/payutils'
 export default {
  name: "SignatureRecordQuery",
  components: { EmisUserSimplePicker,elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, CountryPicker },
-  dicts: ['emis_scan_type', 'emis_waybill_status'],
+  dicts: ['emis_scan_type', 'emis_waybill_status','emis_payment_type'],
  data() {

    return {
@ -242,7 +257,7 @@ export default {
      // 查询参数
      queryParams: {
        pageNum: 1,
-        pageSize: 10,
+        pageSize: 100,
        orderSN:null,
        billCode: null,
        scanType: null,
@ -294,11 +309,6 @@ export default {
    // end.setHours(23,59,59,0)
    // this.dateTimeRange=[start,end];

-    this.$nextTick(function() {
-      let queryFormEl = this.$refs.queryForm.$el;
-      let tableH = queryFormEl.offsetHeight+190;
-      this.tableHeight = window.innerHeight - tableH;
-    });
  },
  mounted() {
    const end = new Date()
--- a/src/views/emis/emisWaybill/statpanel/ScanDtlAllListPanel.vue
+++ b/src/views/emis/emisWaybill/statpanel/ScanDtlAllListPanel.vue
@ -65,6 +65,7 @@
            <el-table-column :label="$t('发件扫描次数')" align="center" prop="sendCount" min-width="120" />
            <el-table-column :label="$t('到件扫描次数')" align="center" prop="arrivalCount" min-width="120" />
            <el-table-column :label="$t('派件扫描次数')" align="center" prop="sentCount" min-width="120" />
+            <el-table-column :label="$t('转件扫描次数')" align="center" prop="transferCount" min-width="120" />
            <el-table-column :label="$t('问题件扫描次数')" align="center" prop="issueCount" min-width="120" />
            <el-table-column :label="$t('留仓扫描次数')" align="center" prop="holdCount" min-width="120" />
            <el-table-column :label="$t('签收状态')" align="center" prop="waybillDetail.blSign" width="80" >