傅豪杰 преди 3 месеца
родител
ревизия
7b174981ae

+ 11 - 2
src/pages/components/Waitsent.vue

@@ -212,6 +212,7 @@
         >
           <template #input>
             <van-uploader
+              progress
               v-model="uploader"
               :after-read="afterRead"
               :before-read="beforeRead"
@@ -351,7 +352,8 @@ export default {
       onReceivingVlaue: {}, //点击签收存放的数据
       onSureRetentionVlaue: {}, //点击签收滞留的数据
       Agent: "", //是否待签(后续判断)
-      getFileUrl: "" //返回的图片地址
+      getFileUrl: "" ,//返回的图片地址
+      upfileLoading:''
     };
   },
   methods: {
@@ -440,6 +442,7 @@ export default {
       const formData = new FormData();
       formData.append("file", file.file); // 这里的 'file' 是后端接收文件的字段名
       const res = await appUploadTheSignature(formData);
+      this.upfileLoading.clear()
       if (res.code == 0) {
         this.getFileUrl = res.data;
       } else {
@@ -449,6 +452,11 @@ export default {
     beforeRead(file) {
       // 在这里可以添加对文件的校验逻辑
       // 如果返回 true, 则继续读取文件
+      this.upfileLoading = this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true,
+        message: "上传中"
+      });
       return true;
     },
     // 签收完成
@@ -503,7 +511,8 @@ export default {
 
 .container {
   height: 100%;
-
+  overflow-x: hidden;
+  overflow-y: auto;
   &-searchNumber {
     display: flex;
     justify-content: space-between;

+ 2 - 1
src/pages/new/batched.vue

@@ -63,7 +63,8 @@ export default {
     height: 100vh;
     background-color: #fff;
     padding: 0 20px;
-
+    overflow-x: hidden;
+    overflow-y: auto;
     .number {
         font-size: 20px;
         text-align: center;

+ 2 - 1
src/pages/new/combine.vue

@@ -116,7 +116,8 @@ export default {
     padding: 2px 10px 0 10px;
     background-color: #fff;
     height: 100%;
-
+    overflow-x: hidden;
+    overflow-y: auto;
     .sureSign {
         height: 40px;
         width: 150px;

+ 2 - 1
src/pages/new/removal.vue

@@ -159,7 +159,8 @@ export default {
 .container {
     background-color: #fff;
     height: 100vh;
-
+    overflow-x: hidden;
+    overflow-y: auto;
     .iconStyle {
         position: fixed;
         height: 20px;

+ 2 - 1
src/pages/new/scannerResult.vue

@@ -48,7 +48,8 @@ export default {
 <style lang="less" scoped>
 .container {
     height: 100vh;
-
+    overflow-x: hidden;
+    overflow-y: auto;
     .shujuList {
         height: 100vh;
     }

+ 2 - 1
src/pages/new/sign.vue

@@ -94,7 +94,8 @@ export default {
 .container {
     background-color: #fff;
     height: 100vh;
-
+    overflow-x: hidden;
+    overflow-y: auto;
     .iconStyle {
         font-size: 0.44rem;
         color: #0c2469;

+ 12 - 4
src/pages/new/storage.vue

@@ -193,8 +193,8 @@
           :key="index"
           inset
         >
-          <van-cell style="font-size: 16px;"
-            >{{ item.phone }}--{{ item.NAME }}</van-cell
+          <van-cell style="font-size: 16px;padding-left: 5px;"
+            >{{ item.phone }}--{{item.departmentName}}--{{ item.NAME }}</van-cell
           >
           <!-- < :value="item.phone" />
                     <van-cell :value="item.NAME" /> -->
@@ -283,6 +283,12 @@ export default {
   async mounted() {
     this.getUser();
     this.floorId = this.$store.state.user.expressScope;
+    // 保存上一次类型
+    let storageObjectRadio = localStorage.storageObjectRadio
+    if(storageObjectRadio){
+      this.object.radio = storageObjectRadio
+    }
+
     const expressData = await appFindInsideInfoByExpressNo({
       insideNum: "S6000000363245086"
     });
@@ -447,11 +453,12 @@ export default {
           this.printerGo();
         }
         this.isPrint = false;
+        localStorage.setItem('storageObjectRadio', this.object.radio)
         this.expressInfo = {};
         this.object = {
           expressNum: 1,
           remark: "",
-          radio: "文件",
+          radio: this.object.radio || "文件",
           payMoney: "",
           expressNo: "",
           value4: "",
@@ -576,7 +583,8 @@ export default {
 
 .container {
   height: 100vh;
-
+  overflow-x: hidden;
+  overflow-y: auto;
   background-color: #f2f2f2;
 
   .formStyle {

+ 17 - 1
src/pages/new/sureCombine.vue

@@ -29,7 +29,10 @@
                 <div v-if="currentSelect == '图片'">
                     <van-field name="uploader" label="上传照片"  :rules="[{ required: true, message: '请上传图片' }]">
                             <template #input>
-                                <van-uploader   multiple    :deletable="true"  
+                                <van-uploader   
+                                multiple    
+                                :deletable="true"  
+                                progress
                                 v-model="uploader" :after-read="afterRead" :before-read="beforeRead" :max-count="1" />
                             </template>
                     </van-field>
@@ -96,6 +99,7 @@ export default {
             photoIMG:'',//储存展示图片
             canvasPhotoIMG:'',//展示图片
             hasUploadedImage: false, // 标记是否已上传图片  
+            upfileLoading:''
         };
     },
     
@@ -197,6 +201,12 @@ export default {
                 formData.append('file', file); 
                 const res = await appUploadTheSignature(formData)
                 this.getFileUrl = res.data
+                this.upfileLoading.clear()
+                if (res.code == 0) {
+                    this.getFileUrl = res.data;
+                } else {
+                    this.$toast("上传图片失败");
+                }
                 console.log(this.getFileUrl,'=addresse')
             }); 
             this.currentSelect = "签字板"
@@ -225,6 +235,11 @@ export default {
         beforeRead(file) {
             // 在这里可以添加对文件的校验逻辑
             // 如果返回 true, 则继续读取文件
+            this.upfileLoading = this.$toast.loading({
+                duration: 0, // 持续展示 toast
+                forbidClick: true,
+                message: "上传中"
+            });
             return true;
         },
         // 文件读取完成后的钩子
@@ -236,6 +251,7 @@ export default {
             const formData = new FormData();
             formData.append('file', file.file); // 这里的 'file' 是后端接收文件的字段名
             const res = await appUploadTheSignature(formData)
+            this.upfileLoading.clear()
             this.getFileUrl = res.data
         },
         async onSubmit(values) {