Merge branch 'dev' into pre-production

src/components/MyPrintZero/MyPrintZero.vue

@@ -395,10 +395,10 @@ const handleShowPrint = () => {
     for (let index = value.start; index <= value.end; index++) {
       let template = details.waybillInfo.template;
 
-      template = template.replace('发站仓信息', details.waybillInfo.destinationWarehouseName);
-      template = template.replace('目的仓信息', details.waybillInfo.departureWarehouseName);
-      template = template.replace('发站信息', details.waybillInfo.destination);
-      template = template.replace('到站信息', details.waybillInfo.departure);
+      template = template.replace('发站仓信息', details.waybillInfo.departureWarehouseName);
+      template = template.replace('目的仓信息', details.waybillInfo.destinationWarehouseName);
+      template = template.replace('发站信息', details.waybillInfo.departure);
+      template = template.replace('到站信息', details.waybillInfo.destination);
       template = template.replace('运单号', details.waybillNo);
       template = template.replace('订单号', details.waybillInfo.orderNo);
       template = template.replace('运单地址', details.waybillInfo.waybillNoCode);

src/views/distribution/artery/VehicleStowageDetails.vue

@@ -1142,12 +1142,12 @@ const handleBatchDelete = () => {
 
 /** 导出 */
 const handleExport = () => {
-  console.log('exportColumnListNode.value.$el :>> ', exportColumnListNode.value.$el);
-  console.log('detailsRenderData.value :>> ', detailsRenderData.value);
+  // console.log('exportColumnListNode.value.$el :>> ', exportColumnListNode.value.$el);
+  // console.log('detailsRenderData.value :>> ', detailsRenderData.value);
   exportExcel(
     details.detailsColumnList,
     detailsRenderData.value,
-    `${details.form.carsNo} - ${dateNow()}.xlsx`
+    `${details.form.carsNo} - ${dateNow()}`
   );
 };
 

src/views/distribution/inventory/BookingNote.vue

@@ -78,43 +78,6 @@
               <el-form-item label="到站:" prop="destination">
                 <el-input readonly v-model="query['destination']" placeholder="到站地址"></el-input>
               </el-form-item>
-              <!-- <el-form-item label="发站:" prop="departure">
-                <div class="w100">
-                  <el-cascader
-                    pleceholder="请选择到站地址"
-                    :options="details.regionOptione"
-                    style="width: 100%"
-                    v-model="query.departure"
-                    :props="{
-                      checkStrictly: true,
-                    }"
-                  >
-                    <template #default="{ node, data }">
-                      <span>{{ data.label }}</span>
-                      <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-                    </template>
-                  </el-cascader>
-                </div>
-              </el-form-item>
-
-              <el-form-item label="到站:" prop="destination">
-                <div class="w100">
-                  <el-cascader
-                    pleceholder="请选择到站地址"
-                    :options="details.regionOptione"
-                    style="width: 100%"
-                    v-model="query.destination"
-                    :props="{
-                      checkStrictly: true,
-                    }"
-                  >
-                    <template #default="{ node, data }">
-                      <span>{{ data.label }}</span>
-                      <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-                    </template>
-                  </el-cascader>
-                </div>
-              </el-form-item> -->
 
               <el-form-item label="目的仓:" class="el-times" prop="queryDestinationWarehouseName">
                 <el-input
@@ -1054,7 +1017,12 @@
             <el-button type="primary" icon="el-icon-printer" @click="handlePrint"> 打 印</el-button>
 
             <!-- 打印标签 -->
-            <el-button type="primary" icon="el-icon-printer" @click="handleShowTip">
+            <el-button
+              v-if="Number(query.waybillType) === 2 && !details.query.orderCode"
+              type="primary"
+              icon="el-icon-printer"
+              @click="handleShowTip"
+            >
               打印标签
             </el-button>