From 277c0120b80bfee1965215eb90d72e89ae42e7a4 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 9 Jan 2025 14:29:01 +0800
Subject: [PATCH] md

---
 .../oms/emisWaybill/OrderDetailReadOnly.vue   | 19 +++++-------------
 src/views/oms/emisWaybill/OrderRecord.vue     | 20 ++++++++++---------
 .../oms/emisWaybill/SendOrderbillList.vue     | 19 ------------------
 3 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/src/views/oms/emisWaybill/OrderDetailReadOnly.vue b/src/views/oms/emisWaybill/OrderDetailReadOnly.vue
index cfe59db..7e06217 100644
--- a/src/views/oms/emisWaybill/OrderDetailReadOnly.vue
+++ b/src/views/oms/emisWaybill/OrderDetailReadOnly.vue
@@ -242,24 +242,15 @@
     </el-col>
     <el-col :span="12">
       <el-descriptions :title="$t('收费信息')" size="small" :column="4" style="margin-top:10px">
-            <!-- <el-descriptions-item label="计费方式" :span="4">
-              <dict-tag :options="dict.type.emis_calc_fee_type" :value="form.calcFeeType"/>
-            </el-descriptions-item> -->
-            <!-- <el-descriptions-item label="是否特殊报价" :span="1">
-              <span v-if="form.blSpecialQuote == 1"> 是 </span>
-              <span v-else> 否 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="是否敏感物" :span="4">
-              <span v-if="form.blSensitive == 1"> 是 </span>
-              <span v-else> 否 </span>
-            </el-descriptions-item> -->
             <el-descriptions-item label="支付方式" :span="4">
               <dict-tag :options="dict.type.emis_payment_type" :value="form.paymentType"/>
             </el-descriptions-item>
             <!-- <el-descriptions-item label="费用币种">{{ form.currency }}</el-descriptions-item> -->
-            <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  label="月结客户" :span="4">{{ form.customerName }}</el-descriptions-item>
-            <!-- <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
-            <el-descriptions-item label="销售联系人" :span="3">{{ form.salesmen }}</el-descriptions-item> -->
+            <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  label="月结客户" :span="4">
+              {{ form.customerName }}
+            </el-descriptions-item>
+            <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
+            <el-descriptions-item label="销售联系人" :span="3">{{ form.salesmen }}</el-descriptions-item>
             <el-descriptions-item label="费用明细" :span="4">
               <el-table
                             class="cargoList"
diff --git a/src/views/oms/emisWaybill/OrderRecord.vue b/src/views/oms/emisWaybill/OrderRecord.vue
index a71809c..25471ba 100644
--- a/src/views/oms/emisWaybill/OrderRecord.vue
+++ b/src/views/oms/emisWaybill/OrderRecord.vue
@@ -1194,7 +1194,9 @@ methods: {
           if(this.action=='copyOrder'){
             this.billCode=null;
             this.form.billCode=null;
-            this.sendDate=null;
+            this.form.orderSn=null;
+            this.form.orderDate =parseTime(new Date());
+            this.form.sendDate=null;
              // 加载产品列表
              this.preCalcFee();
           }
@@ -1556,15 +1558,15 @@ methods: {
 
   realSaveOrderInfo(){
 
-      this.form.attachmentList=[];
-      let item={
-        fileName: "货物申报材料",
-        fileUrl: this.form.filePath,
-        fileDesc: ""
-      };
-      this.form.attachmentList.push(item);
+      // this.form.attachmentList=[];
+      // let item={
+      //   fileName: "货物申报材料",
+      //   fileUrl: this.form.filePath,
+      //   fileDesc: ""
+      // };
+      // this.form.attachmentList.push(item);
 
-      this.form.orderDate =parseTime(new Date());
+      // this.form.orderDate =parseTime(new Date());
       // 不影响原表单提交,clone 一份数据
       let postForm=deepClone(this.form)
       // 调整包装类型为多选
diff --git a/src/views/oms/emisWaybill/SendOrderbillList.vue b/src/views/oms/emisWaybill/SendOrderbillList.vue
index 2c8a0f3..c02f3a0 100644
--- a/src/views/oms/emisWaybill/SendOrderbillList.vue
+++ b/src/views/oms/emisWaybill/SendOrderbillList.vue
@@ -560,23 +560,6 @@
         />
     </div>
 
-    <el-dialog title="查看揽收底单图片" :visible.sync="openShowGotPic" width="30%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
-      <div>
-          <ImagePreview height="300px" :key="billPicSendRmk" :src="billPicSendRmk" ></ImagePreview>
-              <!-- <el-image
-                :src="`${realSrc}`"
-                fit="cover"
-                :style="`width:${realWidth};height:${realHeight};`"
-                :preview-src-list="realSrcList"
-              >
-                <div slot="error" class="image-slot">
-                  <i class="el-icon-picture-outline"></i>
-                </div>
-            </el-image> -->
-      </div>
-
-    </el-dialog>
-
   </XdPageContainer>
 </template>
 
@@ -691,13 +674,11 @@ export default {
 
       queryStatInfoMap:null,
 
-
       // 弹出展示层
       id:null,
       titleView:"",
       openView: false,
 
-      openShowGotPic:false,
       billPicSendRmk:null,
       showViewer: false,