From 8e7467330f6626cf2e4bcfbfe7fa7b0089051da0 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 22 Jun 2024 14:24:35 +0800
Subject: [PATCH] md

---
 src/views/emis/emisPrintTpl/designerPanel.vue | 21 ++++++++--------
 .../signatureRecordQuery.vue                  | 25 +++++++++++--------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/views/emis/emisPrintTpl/designerPanel.vue b/src/views/emis/emisPrintTpl/designerPanel.vue
index d8df0e45..f2aad973 100644
--- a/src/views/emis/emisPrintTpl/designerPanel.vue
+++ b/src/views/emis/emisPrintTpl/designerPanel.vue
@@ -1,19 +1,18 @@
-<!-- <template>
+<template>
   <div >
-    <KrPrintDesigner ref="printDesigner" :temp-value="form.tplData" :widget-options="widgets" @save="handleSave" ></KrPrintDesigner>
-
 
   </div>
-</template> -->
-
-<template>
-  <kr-print-designer ref="printDesigner" :temp-value="value" :widget-options="widgets" @save="handleSave" />
 </template>
+
+<!-- <template>
+
+  <kr-print-designer ref="printDesigner" :temp-value="value" :widget-options="widgets" @save="handleSave" />
+</template> -->
 <script>
 import { listEmisPrintTpl, getEmisPrintTpl, delEmisPrintTpl, addEmisPrintTpl, updateEmisPrintTpl } from "@/api/emis/emisPrintTpl";
-import KrPrintDesigner from "@/components/PrintDesigner/index.vue";
+// import KrPrintDesigner from "@/components/PrintDesigner/index.vue";
 // import "kr-print-designer/lib/kr-print-designer.css";
-
+// KrPrintDesigner
 
 import { OutStockOptions, InStockOptions } from './data/options'
 export default {
@@ -22,7 +21,7 @@ export default {
         type:[Number,Array]
     }
   },
-  components: { KrPrintDesigner },
+  components: {  },
   data() {
     return {
        // 遮罩层
@@ -138,7 +137,7 @@ export default {
     },
     // 手动初始话模板数据
     initTemp(){
-      this.$refs.printDesigner.initTemp(this.value,this.widgets)
+      // this.$refs.printDesigner.initTemp(this.value,this.widgets)
     }
   },
 }
diff --git a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
index dd8be797..7a78fba4 100644
--- a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
+++ b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
@@ -30,13 +30,13 @@
           </el-form-item>
         <!-- </el-col> -->
         <!-- <el-col :span="8"> -->
-          <el-form-item :label="$t('录入网点')" prop="recordSiteCode" label-width="70px">
-            <EmisSiteSimplePicker v-model="queryParams.recordSiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
+          <el-form-item :label="$t('签收网点')" prop="signSiteCode" label-width="70px">
+            <EmisSiteSimplePicker v-model="queryParams.signSiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
           </el-form-item>
         <!-- </el-col> -->
         <!-- <el-col :span="8"> -->
           <el-form-item :label="$t('签收图片')" prop="isUploadPic">
-            <el-select v-model="queryParams.params.isUploadPic" :placeholder="$t('全部')" value="0">
+            <el-select v-model="queryParams.params.isUploadPic" clearable :placeholder="$t('全部')" value="0">
               <el-option :label="$t('未上传')" value="0"></el-option>
               <el-option :label="$t('已上传')" value="1"></el-option>
             </el-select>
@@ -124,21 +124,26 @@
           <span>{{ scope.row.waybillDetail.timeType }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="150">
+      <!-- <el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="150">
         <template slot-scope="scope">
           <span>{{ scope.row.waybillDetail.registerManName }}</span>
         </template>
-      </el-table-column>
-      <el-table-column :label="$t('录入网点')" align="center" prop="recordSiteCode" min-width="100">
+      </el-table-column> -->
+      <!-- <el-table-column :label="$t('录入网点')" align="center" prop="recordSiteCode" min-width="100">
         <template slot-scope="scope">
           <span>{{ scope.row.waybillDetail.registerSiteName }}</span>
         </template>
+      </el-table-column> -->
+      <el-table-column :label="$t('寄件网点')" align="center" prop="recordSiteCode" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.waybillDetail.sendSiteName }}</span>
+        </template>
       </el-table-column>
-      <el-table-column :label="$t('录入时间')" align="center" prop="waybillDetail.registerDate" min-width="170" >
+      <!-- <el-table-column :label="$t('录入时间')" align="center" prop="waybillDetail.registerDate" min-width="170" >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.waybillDetail.registerDate) }}</span>
           </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- <el-table-column :label="$t('录入网点所属省份')" align="center" prop="xxx" min-width="100" /> -->
       <el-table-column :label="$t('签收网点')" align="center" prop="signSite" min-width="100" />
       <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="150">
@@ -353,8 +358,8 @@ export default {
       // this.form.countryCode=item.code;
     },
     onScanSiteSelect(item){
-      this.queryParams.scanSite=item && item.siteName;
-      this.queryParams.scanSiteCode=item && item.siteCode;
+      // this.queryParams.scanSite=item && item.siteName;
+      // this.queryParams.scanSiteCode=item && item.siteCode;
     },
     onPreOrNextSiteSelect(item){
       this.queryParams.preOrNextStation=item && item.siteName;