Merge remote-tracking branch 'origin/dev2.5_scan' into dev2.5_scan

src/views/inoutDrug/DialogCreateDrugOrder.vue

@@ -394,7 +394,7 @@
                 <!--   v-if="(curAction.checkWebNew !== 2 || viewType !== 1) && orderFormData.billNo"-->
               </el-button
               >
-              <el-button size="mini" type="primary" @click="triggerFileUpload" icon="el-icon-upload2"
+              <el-button size="mini" type="primary" @click="triggerFileUpload" icon="el-icon-upload2" :loading="this.loading"
                          v-if="curAction.checkWebNew != 2  || viewType !=1"
               >
                 导入阳采追溯码
@@ -848,14 +848,26 @@ export default {
       this.$refs.fileInput.click();
     },
     triggerFileUpload2() {
+
       this.$refs.fileInput2.click();
     },
     handleFileUpload(event) {
+
+      // 显示加载状态
+      const loading = this.$loading({
+        lock: true,
+        text: '数据提交中，请稍候',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
+
       const file = event.target.files[0];
       const billNo = this.orderFormData.billNo;
       const uploadUrl = process.env.VUE_APP_BASE_API + '/udiwms/inout/order/yc/fileUpload';
 
       if (this.$isBlank(this.orderFormData.billNo)) {
+        // 关闭加载状态
+        loading.close();
         this.$message.error("单据编号不可以为空!");
         return;
       }
@@ -876,12 +888,16 @@ export default {
         })
           .then(response => {
             if (!response.ok) {
+              // 关闭加载状态
+              loading.close();
               throw new Error(`HTTP error! Status: ${response.status}`);
             }
             return response.json();
           })
           .then(data => {
             if (data.code === 20000) {
+              // 关闭加载状态
+              loading.close();
               // 更新单据号
               if (data.data && data.data.billNo) {
                 this.orderFormData.billNo = data.data.billNo;
@@ -895,6 +911,8 @@ export default {
             }
           })
           .catch(error => {
+            // 关闭加载状态
+            loading.close();
             console.error('File upload failed:', error);
             this.$message.error('文件上传失败：' + error.message);
           });
@@ -902,8 +920,19 @@ export default {
 
       // 清空文件输入框的值
       event.target.value = '';
+      // 关闭加载状态
+      loading.close();
     },
     handleFileUpload2(event) {
+
+      // 显示加载状态
+      const loading = this.$loading({
+        lock: true,
+        text: '数据提交中，请稍候',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
+
       const file = event.target.files[0];
       const uploadUrl = process.env.VUE_APP_BASE_API + '/udiwms/inout/order/yc/orderFileUpload';
 
@@ -925,12 +954,16 @@ export default {
         })
           .then(response => {
             if (!response.ok) {
+              // 关闭加载状态
+              loading.close();
               throw new Error(`HTTP error! Status: ${response.status}`);
             }
             return response.json();
           })
           .then(data => {
             if (data.code === 20000) {
+              // 关闭加载状态
+              loading.close();
               // 更新单据号
               if (data.data && data.data.billNo) {
                 this.orderFormData.billNo = data.data.billNo;
@@ -954,15 +987,21 @@ export default {
             }
           })
           .catch(error => {
+            // 关闭加载状态
+            loading.close();
             console.error('File upload failed:', error);
             this.$message.error('文件上传失败：' + error.message);
           });
       } else {
+        // 关闭加载状态
+        loading.close();
         this.$message.warning('请选择要上传的文件');
       }
 
       // 清空文件输入框的值
       event.target.value = '';
+      // 关闭加载状态
+      loading.close();
     },
     //获取用户仓库列表
     findInvListByUser() {
@@ -2034,6 +2073,7 @@ export default {
 
 
 <style scoped>
+
 </style>
 
 

src/views/login.vue

@@ -162,7 +162,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/login.jpg");
+  background-image: url("../assets/login.png");
   background-size: cover;
 }
 

src/views/register.vue

@@ -154,7 +154,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/login.jpg");
+  background-image: url("../assets/login.png");
   background-size: cover;
 }
 .title {