diff --git a/public/img/driveerror.png b/public/img/driveerror.png
new file mode 100644
index 00000000..6691d6a7
Binary files /dev/null and b/public/img/driveerror.png differ
diff --git a/public/img/loaderror.png b/public/img/loaderror.png
new file mode 100644
index 00000000..15e8a8c4
Binary files /dev/null and b/public/img/loaderror.png differ
diff --git a/src/components/MyPrint/MyPrint.vue b/src/components/MyPrint/MyPrint.vue
index f3017af4..f9d4face 100644
--- a/src/components/MyPrint/MyPrint.vue
+++ b/src/components/MyPrint/MyPrint.vue
@@ -50,6 +50,10 @@ const props = defineProps({
     type: Function,
     default: null,
   },
+  type: {
+    type: String,
+    default: 'deliveryPrint'
+  }
 });
 
 const $emit = defineEmits(['update:modelValue']);
@@ -150,7 +154,7 @@ const printTemplate = () => {
 
   const printNode = document.querySelectorAll('.printCode > div > div');
   console.log('printNode :>> ', printNode);
-  print(printNode);
+  print(printNode, props.type);
 };
 </script>
 
diff --git a/src/components/webCameraIMG/webCamera.vue b/src/components/webCameraIMG/webCamera.vue
index 2f16ba6f..85280172 100644
--- a/src/components/webCameraIMG/webCamera.vue
+++ b/src/components/webCameraIMG/webCamera.vue
@@ -1,22 +1,20 @@
 <template>
   <div class="page">
-    <el-tabs type="border-card">
+    <el-tabs type="border-card" class="el_tabs">
       <el-tab-pane label="拍摄">
-        <div>
-          <!-- <el-button type="primary" @click="Opentrimming" :disabled="!IMG_startUp">{{
-            IMG_Trimming_edge ? '关闭裁边' : '开启裁边'
-          }}</el-button> -->
-          <!-- <el-button type="primary" @click="view1_scan" :disabled="!IMG_startUp"
-            >点击拍摄</el-button
-          > -->
-        </div>
         <div class="IMG_VIEW_container">
           <!-- 主摄像头 -->
           <div class="IMG_VIEW1">
-            <img id="IMG_VIEW1" v-if="IMG_camera" ref="IMG_VIEW" src="../../../public/img/load.gif" alt="主摄像头" />
-            <!-- <el-icon v-if="!IMG_startUp" @click="Deviceinitialization" class="SwitchButton"
+            <img
+              id="IMG_VIEW1"
+              v-if="IMG_camera"
+              ref="IMG_VIEW"
+              src="../../../public/img/load.gif"
+              alt="主摄像头"
+            />
+            <el-icon v-if="!IMG_startUp" @click="Devicerestart" class="SwitchButton"
               ><SwitchButton
-            /></el-icon> -->
+            /></el-icon>
             <div class="el_icon" v-if="IMG_startUp">
               <el-tooltip effect="dark" :content="IMG_Trimming_edge ? '关闭裁边' : '开启裁边'">
                 <el-icon
@@ -35,7 +33,23 @@
           </div>
 
           <!-- 缩略图 -->
-          <div id="suoluetu" ref="IMG_Thumbnail"></div>
+          <div id="suoluetu" ref="IMG_Thumbnail">
+            <el-empty style="margin: auto;" description="暂无缩略图" v-if="!IMG_suoluetuList.length" />
+            <template v-for="(item, index) in IMG_suoluetuList" :key="index">
+              <el-image
+                ref="el => setImagePreviewRef(el, index)"
+                style="width: 90px; height: 90px"
+                :src="item"
+                :zoom-rate="1.2"
+                :max-scale="4"
+                :min-scale="0.2"
+                :preview-src-list="IMG_suoluetuList"
+                :initial-index="initialIndex"
+                fit="cover"
+                @click="showPreview(index)"
+              />
+            </template>
+          </div>
         </div>
       </el-tab-pane>
 
@@ -52,17 +66,79 @@ import axios from 'axios';
 import { ElMessage } from 'element-plus';
 const IMG_camera = ref(false); // 摄像头状态
 const IMG_URL = 'http://127.0.0.1:38088/video=stream&camidx=0'; // 主摄像头地址
+const IMG_error = '../../../public/img/loaderror.png'; //设备未连接
+const IMG_drive = '../../../public/img/driveerror.png'; //设备驱动未启动
 const IMG_VIEW = ref(null); // 主摄像头实例
 const IMG_Thumbnail = ref(null); // 缩略图实例
-const IMG_TITLE=ref('设备正在初始化中...')
+const IMG_TITLE = ref('设备正在初始化中...');
+const IMG_suoluetuList = ref([]); // 示例图片列表
+const initialIndex = ref(0); // 初始显示的索引
+const imagePreviewRefs = ref([]);
 let IMG_Trimming_edge = ref(false); //图片裁边
 let IMG_startUp = ref(false); //摄像头是否启动
 let IMG_API = ref('/api/blade-resource/oss/endpoint/put-file');
 let zoom = ref(5); //图片缩放等级
+let IMGstate=ref(1);//是否清楚历史记录
 const $emit = defineEmits(['upload-success']);
+const props = defineProps({
+    IMGstate: {
+        type: Number,//参数类型
+        required: false,//是否必传
+        default: 1 //默认值;0,清除历史记录.1不清除
+    }
+});
+watch(() => props.IMGstate, (newValue, oldValue) => {
+  if(newValue !=IMGstate.value){
+    IMGstate.value  = props.IMGstate
+   IMG_suoluetuList.value=[];//重置拍摄图片
+  }
+});
+// 打印日志
+const mylog = val => {
+  let element = document.getElementById('log');
+  let old_val = element.innerHTML;
+  let date = new Date().toString().slice(16, 24);
+  element.innerHTML = date + '&nbsp;&nbsp;' + val + '<br>' + old_val;
+};
+// 设置每个 el-image 的引用
+const setImagePreviewRef = (el, index) => {
+  if (el) {
+    imagePreviewRefs.value[index] = el.$refs.imageRef;
+  }
+};
+const showPreview = async index => {
+  initialIndex.value = index; // 设置点击的图片为初始显示图片
+  await nextTick();
+  // 触发图片预览
+  if (imagePreviewRefs.value[index]) {
+    imagePreviewRefs.value[index].click();
+  }
+};
+//判断设备是否连接
+const IsConnect = async () => {
+  let timeoutMs = 6000; // 6秒
+  let startTime = Date.now();
+  while (Date.now() - startTime < timeoutMs) {
+    try {
+      const response = await axios.post('/imgapi/device=isconnect', {}, { timeout: timeoutMs });
+      console.log(response.data, 'res');
 
-// 获取设备状态
-const Getdevicestatus = () => {};
+      if (response.data.code === '0') {
+        console.log('设备数量:', response.data);
+        return response.data; // 返回数据
+      } else {
+        throw new Error('设备未连接');
+      }
+    } catch (error) {
+      console.error(error);
+      // 如果是网络请求失败，可以选择重试，这里简化为继续等待
+    }
+    // 等待一段时间后继续检查
+    await new Promise(resolve => setTimeout(resolve, 1000)); // 等待1秒
+  }
+  // 如果超过6秒仍未返回数据，返回false
+  return false;
+};
 //(开启/关闭)图像裁边
 const Opentrimming = () => {
   IMG_Trimming_edge.value = !IMG_Trimming_edge.value;
@@ -74,46 +150,52 @@ const Opentrimming = () => {
     mylog('图像裁边已关闭');
   }
 };
-// 框选图片
-const FrameSelectImage = () => {
-  let data = {
-    filepath: '', // 是否保存本地，可选a，为空不保存本地，否则按路径保存
-    left: 0,
-    top: 0,
-    right: 100,
-    bottom: 100,
-  };
-  axios.post('/imgapi/select=imagearea', JSON.stringify(data)).then(res => {
-    console.log(res, '框选图片');
-  });
-};
+
 // 开启摄像头
-const Deviceinitialization = () => {
+const Deviceinitialization = async () => {
   IMG_camera.value = true; // 摄像头打开
-//   这里需要判断设备是否在线
-  let TIME_IMG_VIEW = setTimeout(() => {
-    if (IMG_VIEW.value) {
-      IMG_startUp.value = true; //摄像头已启动
-      IMG_VIEW.value.src = IMG_URL; // 主摄像头地址
-      IMG_TITLE.value=''
-      ElMessage({ message: '摄像头已启动', type: 'success' });
-      mylog('摄像头已启动');
-    }
-    clearTimeout(TIME_IMG_VIEW);
-  }, 2000);
+  let IMG_state = await IsConnect();
+  console.log(IMG_state, 'IMG_state');
+  //检查设备驱动是否连接成功
+  if (IMG_state == false) {
+    ElMessage({ message: '设备驱动未连接', type: 'warning' });
+    mylog('设备驱动未连接');
+    IMG_VIEW.value.src = IMG_drive; // 主摄像头地址
+    return;
+  }
+  // 检查设备是否连接成功
+  if (IMG_state.code == '0' && IMG_state.data == '1') {
+    ElMessage({ message: '设备已连接，设备数量:1', type: 'success' });
+    mylog('设备已连接，设备数量:1');
+    let TIME_IMG_VIEW = setTimeout(() => {
+      if (IMG_VIEW.value) {
+        IMG_startUp.value = true; //摄像头已启动
+        IMG_VIEW.value.src = IMG_URL; // 主摄像头地址
+        IMG_TITLE.value = '';
+        ElMessage({ message: '摄像头已启动', type: 'success' });
+        mylog('摄像头已启动');
+      }
+      clearTimeout(TIME_IMG_VIEW);
+    }, 2000);
+  } else {
+    IMG_VIEW.value.src = IMG_error; // 主摄像头地址
+    ElMessage({ message: '设备未连接', type: 'warning' });
+    mylog('设备未连接');
+  }
 };
 // 页面初始化加载
-const onLoad=()=>{
-    Deviceinitialization();//初始化设备
-}
-onLoad()
-// 打印日志
-const mylog = val => {
-  let element = document.getElementById('log');
-  let old_val = element.innerHTML;
-  let date = new Date().toString().slice(16, 24);
-  element.innerHTML = date + '&nbsp;&nbsp;' + val + '<br>' + old_val;
+const onLoad = async () => {
+ await Deviceinitialization(); //初始化设备
 };
+onLoad();
+// 设备重启
+const Devicerestart=()=>{
+  IMG_camera.value = true; // 摄像头打开
+  mylog('重启设备');
+  IMG_VIEW.value.src = '../../../public/img/load.gif'; // 主摄像头地址
+  Deviceinitialization(); //初始化设备
+}
+
 
 // 图片缩放API
 const zoomAPI = attribute => {
@@ -227,19 +309,12 @@ const IMG_add = img_base64 => {
   const base64Data = img_base64.replace(/^data:image\/\w+;base64,/, '');
   const blob = base64ToBlob(base64Data, 'image/jpeg');
   const url = URL.createObjectURL(blob);
-  let img = document.createElement('img');
-  img.src = url;
-  img.style.width = '80px';
-  img.style.height = '80px';
   // 添加到缩略图
   if (IMG_Thumbnail.value) {
-    IMG_Thumbnail.value.appendChild(img);
+    IMG_suoluetuList.value.push(url);
     mylog('添加缩略图成功');
   }
-  console.log(img, 'img');
   Upload_Images(blob); //上传图片接口
-
-  console.log(url, 'blob');
 };
 
 // 旋转摄像头
@@ -276,6 +351,10 @@ let view1_scan = async () => {
 </script>
 
 <style scoped lang="scss">
+.el_tabs {
+  height: 380px;
+  overflow: hidden;
+}
 .page {
   width: 100%;
   img {
@@ -329,8 +408,8 @@ let view1_scan = async () => {
   }
   .SwitchButton {
     position: absolute;
-    top: 50%;
-    left: 50%;
+    top: 10%;
+    right: 0%;
     transform: translate(-50%, -50%);
     font-size: 25px;
     color: #fff;
@@ -342,11 +421,18 @@ let view1_scan = async () => {
 /* 缩略图 */
 #suoluetu {
   width: 38%;
-  height: aut;
-  border: 1px solid blue;
+  height: 300px;
+  overflow: scroll;
+  border: 1px solid #172e60;
+  padding: 0 !important;
+  display: flex;
+  flex-wrap: wrap;
 }
-#suoluetu img {
-  margin-right: 10px;
+#suoluetu {
+  .el-image {
+    margin: 0 4px;
+    margin-bottom: 2px;
+  }
 }
 /* 操作按钮 */
 #myactive {
diff --git a/src/utils/print.js b/src/utils/print.js
index 93b7c591..d20038ab 100644
--- a/src/utils/print.js
+++ b/src/utils/print.js
@@ -1,10 +1,41 @@
 import { getLodop } from '@/utils/LodopFuncs';
 import hwyPrintNew from '@/utils/print/index';
+
+/** 处理标签打印 */
+const handleTitlePrint = (LODOP, templateData)=>{
+  LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
+  LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
+  LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开
+  // LODOP.SET_PRINT_STYLE('FontColor', '#000000');
+  // // 设置打印整宽且不变形
+  LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
+  // // 设置打印后自动关闭
+  LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
+    // // data就是一段html文本
+    LODOP.ADD_PRINT_HTM('40', '0%', '100%', '100%', templateData);
+}
+
+/** 打印配送单 */
+const handleDeliveryPrint = (LODOP, templateData)=>{
+  LODOP.PRINT_INITA("");
+  // LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
+  LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开
+  // LODOP.SET_PRINT_STYLE('FontColor', '#000000');
+  // // 设置打印整宽且不变形
+  LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '98%');
+  // // 设置打印后自动关闭
+  LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
+
+  // // data就是一段html文本
+  LODOP.ADD_PRINT_HTM('0', '0%', '100%%', "100%", templateData);
+}
+
 /**
  * 根据传入的元素列表进行打印
  * @param nodeList 元素节点列表
+ * @param type 打印类型: titlePrint -- 标签打印; deliveryPrint -- 配送单打印
  */
-const print = nodeList => {
+const print = (nodeList, type = 'deliveryPrint') => {
   // 直接调用时使用默认节点列表
   if (!nodeList) nodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
 
@@ -16,19 +47,9 @@ const print = nodeList => {
 
   // 循环列表内元素并打印
   nodeList.forEach(orderNode => {
-    LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
-    LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
-    LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开
-    // LODOP.SET_PRINT_STYLE('FontColor', '#000000');
-    // // 设置打印整宽且不变形
-    LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
-    // // 设置打印后自动关闭
-    LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
-    console.log(orderNode, 'orderNode');
-
     let templateData = orderNode.innerHTML;
-    // // data就是一段html文本
-    LODOP.ADD_PRINT_HTM('45', '0%', '100%', '100%', templateData);
+    if (type === 'titlePrint') handleTitlePrint(LODOP, templateData)
+    else handleDeliveryPrint(LODOP, templateData)
     // LODOP.NewPage()
     LODOP.PRINT(); //直接打印
   });
@@ -48,4 +69,25 @@ const newPrint = nodeName => {
   hwyPrintNew('.el-dialog__body>div>div>div');
 };
 
+
+const hwyPrint2 = nodeList => {
+  // 直接调用时使用默认节点列表
+  if (!nodeList) nodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
+
+  // 初始化打印实例
+  let LODOP = getLodop();
+
+  // 当列表内没有元素时, 退出函数
+  if (nodeList.length === 0) return;
+
+  // 循环列表内元素并打印
+  nodeList.forEach(orderNode => {
+   
+    // LODOP.NewPage()100
+    // LODOP.PRINT(); //直接打印
+    LODOP.PRINT_DESIGN();
+  });
+  // LODOP.PREVIEW(); //预览(预览打印无脚标)
+};
+
 export default print;
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index de43afd6..e4abd3fb 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -400,7 +400,7 @@ export default {
     printTemplate() {
       const printNode = document.querySelectorAll('.print_QRCode>div>div');
       console.log('printNode :>> ', printNode);
-      print(printNode);
+      print(printNode, 'titlePrint');
     },
     async handleqr() {
       try {
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index b40bd644..51104815 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -1365,7 +1365,7 @@ export default {
 
       console.log('nodeList :>> ', nodeList);
 
-      print(nodeList);
+      print(nodeList, 'titlePrint');
     },
     rowDel(row) {
       this.$confirm('确定将选择数据删除?', {
diff --git a/src/views/basicdata/warehouse/tray/basicdataTray.vue b/src/views/basicdata/warehouse/tray/basicdataTray.vue
index fd3c5248..9ccebb73 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTray.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTray.vue
@@ -346,7 +346,7 @@ export default {
       const printNode = document.querySelectorAll('.print_QRCode>div>div');
 
       console.log('printNode :>> ', printNode);
-      print(printNode);
+      print(printNode, 'titlePrint');
     },
     async handleqr() {
       try {
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 3be41404..d4b7a816 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -4853,7 +4853,7 @@ if($useStore.getters && $useStore.getters.permission){
       const orderNode = document.querySelectorAll('.BarCode>div>div');
       console.log('orderNode :>> ', orderNode);
 
-      print(orderNode);
+      print(orderNode, 'titlePrint');
     },
     printTemplate() {
       const orderNode = document.querySelectorAll('.waybill>div>div');
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 1d3a289c..deca29bd 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -810,7 +810,7 @@ export default {
     },
     printTemplate() {
       const orderNodeList = document.querySelectorAll('.print_QRCode>div>div');
-      print(orderNodeList);
+      print(orderNodeList, 'titlePrint');
     },
     //提交物品数据
     handleSubmitMethod() {
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 94e3b618..68fa608c 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -198,6 +198,7 @@
         <el-row :gutter="20" class="toscontent">
           <el-col v-if="!view" :span="8">
             <el-form-item label="提货证件" label-width="120px">
+
               <el-upload
                 v-model:file-list="fileListSell"
                 class="upload-demo"
@@ -205,6 +206,7 @@
                 :headers="headers"
                 multiple
                 :on-preview="handlePreview"
+                :disabled='smIMG'
                 :on-success="
                   (response, file, fileList) => {
                     uploadSuccess(fileListSell);
@@ -213,13 +215,17 @@
                 :on-remove="handleRemove"
                 list-type="picture"
               >
-                <el-button type="primary">上传</el-button>
-                <template #tip>
+              <el-button type="primary" @click="smIMG=false">上传</el-button>
+              <el-button type="primary" @click="clicklocal(1)">上传扫描图片</el-button>
+              <template #tip>
                   <div class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
                 </template>
-              </el-upload>
+            </el-upload>
+
+          
+          
+            
               
-              <!-- <el-button type="primary" @click="clicklocal">上传扫描图片</el-button> -->
             </el-form-item>
           </el-col>
           <el-col v-if="!view" :span="8">
@@ -230,6 +236,7 @@
                 :action="action"
                 :headers="headers"
                 multiple
+                  :disabled='smIMG'
                 :on-preview="handlePreview"
                 :on-success="
                   (response, file, fileList) => {
@@ -239,7 +246,8 @@
                 :on-remove="handleRemove"
                 list-type="picture"
               >
-                <el-button type="primary">上传</el-button>
+              <el-button type="primary" @click="smIMG=false">上传</el-button>
+                <el-button type="primary" @click="clicklocal(2)">上传扫描图片</el-button>
                 <template #tip>
                   <div class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
                 </template>
@@ -253,6 +261,7 @@
                 class="upload-demo"
                 :action="action"
                 :headers="headers"
+                  :disabled='smIMG'
                 multiple
                 :on-preview="handlePreview"
                 :on-success="
@@ -263,7 +272,8 @@
                 :on-remove="handleRemove"
                 list-type="picture"
               >
-                <el-button type="primary">上传</el-button>
+              <el-button type="primary" @click="smIMG=false">上传</el-button>
+                <el-button type="primary" @click="clicklocal(3)">上传扫描图片</el-button>
                 <template #tip>
                   <div class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
                 </template>
@@ -627,24 +637,9 @@
       </el-dialog>
  
 
-  <!-- <el-dialog
-    v-model="webCamera"
-    title="Tips"
-    
-  >
-    <webCamera> </webCamera>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="webCamera = false">Cancel</el-button>
-        <el-button type="primary" @click="dialogVisible = false">
-          Confirm
-        </el-button>
-      </div>
-    </template>
-  </el-dialog> -->
-
-
-
+  <el-dialog v-model="webCamera" title="扫描上传">
+    <webCamera @upload-success="IMGUploadSuccess" :IMGstate="IMGstate"> </webCamera>
+  </el-dialog>
     <div class="LoadIMG">
       <el-dialog v-model="dialogImg">
         <img w-full :src="Imgurl" alt="Preview Image" />
@@ -686,8 +681,11 @@ export default {
   name: '/distribution/inventory/distrilbutionBillLading',
   data() {
     return {
-      webCamera:true,//弹窗
+      webCamera:false,//弹窗
+      IMGstate:0,
       PackageCheckList:[],//包件勾选的数据
+      imgValue:1,//上传扫描标识
+      smIMG:false,//是否禁止选择本地文件
       tabletit: '', //记录当前点击的标题栏
       multifunctional: '', //编辑订单搜索
       PackageState:[],//包件字典
@@ -2113,10 +2111,37 @@ export default {
       console.log(this.order.selectList,'当前勾选');
 
     },
+
     // 上传本地图片
-    clicklocal(){
+    clicklocal(value){
+      this.IMGstate=value
+      this.imgValue=value
+      this.smIMG=true;//扫描上传禁止选择本地文件
       this.webCamera=true
     },
+        // 扫描图片上传
+      IMGUploadSuccess(value){
+        console.log(this.fileListSell,'this.fileListSell');
+      console.log(value,'接收上传成功图片地址');
+      if(this.imgValue ==1){
+        this.fileListSell.push({
+        name:value.data.data.originalName,
+        url:value.data.data.link,
+      })
+      }else if(this.imgValue ==2){
+        this.fileListClerk.push({
+        name:value.data.data.originalName,
+        url:value.data.data.link,
+      })
+      }else if(this.imgValue ==3){
+        this.fileListLibrary.push({
+        name:value.data.data.originalName,
+        url:value.data.data.link,
+      })
+      }
+
+ 
+    },  
     scrollToElementWithinTableRow(partialIdString) {
       // 清空之前的样式
       const tableRows = document.querySelectorAll('tr');
@@ -2307,6 +2332,7 @@ export default {
         this.dataList.splice(id1, 1);
       }
     },
+
     //订单选择确定
     callFordeliveryOrder() {
       if(!this.selectionList.length){
@@ -3011,28 +3037,31 @@ export default {
             let o = [];
             if (this.fileListClerk.length > 0) {
               this.fileListClerk.forEach(i => {
+              console.log(i,'图片地址');
                 let num = {};
                 num.state = '2';
                 num.name = i.name;
-                num.url = i.response.data.link;
+                num.url = i.url ? i.url : i.response.data.link;
                 o.push(num);
               });
             }
             if (this.fileListLibrary.length > 0) {
               this.fileListLibrary.forEach(i => {
+                console.log(i,'图片地址');
                 let num = {};
                 num.state = '3';
                 num.name = i.name;
-                num.url = i.response.data.link;
+                num.url = i.url ? i.url : i.response.data.link;
                 o.push(num);
               });
             }
             if (this.fileListSell.length > 0) {
               this.fileListSell.forEach(i => {
+                console.log(i,'图片地址');
                 let num = {};
                 num.state = '1';
                 num.name = i.name;
-                num.url = i.response.data.link;
+                num.url = i.url ? i.url : i.response.data.link;
                 o.push(num);
               });
             }
@@ -3152,6 +3181,7 @@ export default {
             Object.entries(fileListMapping).forEach(([fileList, state]) => {
               if (this[fileList].length > 0) {
                 this[fileList].forEach(i => {
+                  console.log(i,'编辑图片');
                   let num = {
                     state,
                   };
@@ -3160,6 +3190,7 @@ export default {
                     num.url = i.response.data.link;
                     mark = true;
                   } else {
+                    mark = true;
                     num.name = i.name;
                     num.url = i.url;
                   }
@@ -3252,6 +3283,7 @@ if (this.dataOwn?.length) {
             } else if (this.dataList?.length) {
               up.consigneeUnit = this.dataList[0].consigneeUnit;
             }
+  
 this.Selfpickuploading = true; //开启加载效果
 
             update(up)
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
index 6d2aa931..13e633ef 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
@@ -213,7 +213,7 @@
       <el-button @click="dialogVisible = false">取 消</el-button>
     </span>
   </el-dialog> -->
-  <MyPrint :html="html" v-model="dialogVisible"></MyPrint>
+  <MyPrint :html="html" v-model="dialogVisible" type="titlePrint"></MyPrint>
 </template>
 
 <script>
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index 3b9d65c6..ec949313 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -407,6 +407,26 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'isInstallName',
+          label: '是否安装',
+          type: 3,
+          values: '',
+          width: '100',
+          checkarr: [
+          {
+              label: '否',
+              value: '1',
+            },
+            {
+              label: '是',
+              value: '2',
+            },
+          ],
+          fixed: false,
+          sortable: true,
+        },
+    
         {
           prop: 'warehouseName',
           label: '仓库',
@@ -1097,6 +1117,7 @@ export default {
     },
     inputscA(index, row) {
       console.log(index, row);
+      console.log(row,'row');
       this.queryA[row.prop] = index;
       if (!index) delete this.queryA[row.prop];
       this.onLoad(this.page);
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 20542bb2..597e6945 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -121,6 +121,13 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="10">
+            <el-form-item label="安&emsp;&emsp;装:" prop="serveType" label-width="100px">
+              <el-radio-group v-model="form.IsInstall" v-for="item in this.whetherData">
+                <el-radio :label="item.dictKey" :value="item.dictKey">{{ item.dictValue }}&emsp; </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
 
@@ -1914,7 +1921,9 @@ export default {
         total: 0,
       },
       // 表单数据
-      form: {},
+      form: {
+      IsInstall:'1',//安装
+      },
       // 选择行
       selectionList: [],
       selectionInventoryList: [],
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index 9c127bbb..bfb7f4d1 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -287,6 +287,8 @@
           </el-form>
           <div class="imgName">
             <span>上门照</span>
+            <br/>
+            <el-button type="primary" @click="UploadTheScanningMap(1)">上传扫描图</el-button>
             <el-upload
               v-model:file-list="DoorstepPhoto"
               :action="doubledCount"
@@ -306,6 +308,8 @@
 
           <div class="imgName">
             <span>堆码照</span>
+            <br/>
+            <el-button type="primary" @click="UploadTheScanningMap(2)">上传扫描图</el-button>
             <el-upload
               v-model:file-list="StackingPhoto"
               :action="doubledCount"
@@ -325,6 +329,8 @@
 
           <div class="imgName">
             <span>易碎照</span>
+            <br/>
+            <el-button type="primary" @click="UploadTheScanningMap(3)">上传扫描图</el-button>
             <el-upload
               v-model:file-list="FragilePhotos"
               :action="doubledCount"
@@ -344,6 +350,8 @@
 
           <div class="imgName">
             <span>家配照</span>
+            <br/>
+            <el-button type="primary" @click="UploadTheScanningMap(4)">上传扫描图</el-button>
             <el-upload
               v-model:file-list="HomePhotos"
               :action="doubledCount"
@@ -363,6 +371,8 @@
 
           <div class="imgName">
             <span>签收照</span>
+            <br/>
+            <el-button type="primary" @click="UploadTheScanningMap(5)">上传扫描图</el-button>
             <el-upload
               v-model:file-list="SignForPhotos"
               :action="doubledCount"
@@ -481,6 +491,10 @@
     <el-button @click="numberDetailDialogVisible = false">取 消</el-button>
     <el-button type="primary" @click="numberDetailDialogVisible = false">确 定</el-button>
   </el-dialog>
+
+  <el-dialog v-model="webCamera" title="扫描上传">
+    <webCamera @upload-success="IMGUploadSuccess"  :IMGstate="IMGstate"> </webCamera>
+  </el-dialog>
 </template>
 
 <script>
@@ -511,6 +525,9 @@ export default {
   data() {
     return {
       abnormalReview: '', //异常审核
+      imgValue:1,//扫描图标识
+      IMGstate:0,
+      webCamera:false,//扫描上传
       Abnormalloading: false, //审核加载效果
       dialogImageUrl: '', //图片放大地址
       dialogVisible: false, //图片状态
@@ -1788,10 +1805,52 @@ export default {
       }
     },
     //取消
+          // 上传图片处理开始
+   generatePhotoArray(photoType, photoItems, reservationId) {
+        const photoArray = [];
+        photoItems.forEach(item => {
+          photoArray.push({
+            name: item.name,
+            reservationId: reservationId,
+            type: photoType,
+            urlRoute: item.response && item.response.data ? item.response.data.link : item.url,
+          });
+        });
+        return photoArray;
+      },
     cancellation() {
       this.signBox = false;
     },
-
+    // 上传扫描图按钮
+    UploadTheScanningMap(value){
+      this.IMGstate=value
+      this.imgValue=value
+      this.webCamera=true;//开启扫描弹窗
+    },
+    // 扫描图处理
+    IMGUploadSuccess(res){
+      let dataURL={
+          name:res.data.data.originalName,
+          url:res.data.data.link,
+        }
+      console.log(res,'扫描图返回值');
+      if(this.imgValue==1){
+        console.log( this.DoorstepPhoto,' this.DoorstepPhoto');
+        this.DoorstepPhoto.push(dataURL)
+      }
+      if(this.imgValue==2){
+        this.StackingPhoto.push(dataURL)
+      }
+      if(this.imgValue==3){
+        this.FragilePhotos.push(dataURL)
+      }
+      if(this.imgValue==4){
+        this.HomePhotos.push(dataURL)
+      }
+      if(this.imgValue==5){
+        this.SignForPhotos.push(dataURL)
+      }
+    },
     //签收
     submitForm() {
       // this.isDis = true;
@@ -1842,24 +1901,12 @@ export default {
       });
       // 本身图片处理结束
 
-      // 上传图片处理开始
-      function generatePhotoArray(photoType, photoItems, reservationId) {
-        const photoArray = [];
-        photoItems.forEach(item => {
-          photoArray.push({
-            name: item.name,
-            reservationId: reservationId,
-            type: photoType,
-            urlRoute: item.response && item.response.data ? item.response.data.link : item.url,
-          });
-        });
-        return photoArray;
-      }
-      row.map.photo_1 = generatePhotoArray('photo_1', this.DoorstepPhoto, this.reservationId);
-      row.map.photo_2 = generatePhotoArray('photo_2', this.StackingPhoto, this.reservationId);
-      row.map.photo_3 = generatePhotoArray('photo_3', this.FragilePhotos, this.reservationId);
-      row.map.photo_4 = generatePhotoArray('photo_4', this.HomePhotos, this.reservationId);
-      row.map.photo_5 = generatePhotoArray('photo_5', this.SignForPhotos, this.reservationId);
+
+      row.map.photo_1 = this.generatePhotoArray('photo_1', this.DoorstepPhoto, this.reservationId);
+      row.map.photo_2 = this.generatePhotoArray('photo_2', this.StackingPhoto, this.reservationId);
+      row.map.photo_3 = this.generatePhotoArray('photo_3', this.FragilePhotos, this.reservationId);
+      row.map.photo_4 = this.generatePhotoArray('photo_4', this.HomePhotos, this.reservationId);
+      row.map.photo_5 = this.generatePhotoArray('photo_5', this.SignForPhotos, this.reservationId);
       // 上传图片处理结束
       // 图片去重
       this.deduplicateByIdAndUpdate(row.map.photo_1);
diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
index 3293d5e5..1ecf4f61 100644
--- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
@@ -1643,7 +1643,7 @@ setNodeHeight(_node, '', true);
     printTemplate() {
       // const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
       // 调用打印方法打印表单
-      print();
+      print('', 'titlePrint');
     },
     //查看包条码
     handleQRCode(row) {
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index d9853a92..08f0320c 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -1079,7 +1079,7 @@ export default {
     /** 打印 */
     printTemplate() {
       const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
-      print(orderNodeList);
+      print(orderNodeList, 'titlePrint');
     },
   },
 };