优化加bug修复

src/api/inout/order.js

@@ -553,7 +553,7 @@ export function addAliBizProduct(params) {
     url: "/udiwms/inout/order/addAliBizProduct",
     method: "post",
     data: params,
-    timeout: 1800000
+    timeout: 300000
   });
 }
 

src/api/pharmaceuticals/drugDistribution.js

@@ -29,7 +29,8 @@ export function submitOrderWeb(query) {
   return axios({
     url: "/warehouse/inout/submitOrderWeb",
     method: "post",
-    data: query
+    data: query,
+    timeout: 300000
   });
 }
 
@@ -38,6 +39,7 @@ export function submitCodes(query) {
     url: "/warehouse/inout/submitCodes",
     method: "post",
     data: query
+
   });
 }
 

src/views/pharmaceuticals/distribution/DialogCreateOrder.vue

@@ -7,7 +7,7 @@
           style="display: flex; margin: 0px 0 15px 75%; height: 35px">
           <el-button size="mini" type="primary" @click="triggerFileUpload2"
           >
-            上传阳采单据
+            上传阳采单据（1）
           </el-button>
           <!-- 隐藏的文件输入元素 -->
           <input type="file" ref="fileInput2" accept=".xlsx,.xls" style="display: none;" @change="handleFileUpload2"/>
@@ -215,7 +215,7 @@
                 size="mini"
                 @click.native="selectOrder()"
                 v-if="curAction.checkWebNew != 2  || viewType !=1"
-              >下载码上放心追溯码
+              >下载码上放心追溯码（2）
                 <!--   v-if="(curAction.checkWebNew !== 2 || viewType !== 1) && orderFormData.billNo"-->
               </el-button
               >
@@ -969,15 +969,28 @@ export default {
       let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
       tQuery.orderId = this.orderFormData.billNo;
       tQuery.productType = 2
+      // 显示加载状态
+      const loading = this.$loading({
+        lock: true,
+        text: '目前追溯码过多请耐心等待...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
       if (this.viewType == 2) { //扫码单据立即提交
         submitCodes(tQuery)
           .then((response) => {
             if (response.code === 20000) {
               this.$message.success("提交成功,等待处理，请刷新后查看！");
               this.closeDialog();
+
             } else {
               this.$message.error(response.message);
             }
+            loading.close();
+
+          }).catch(() => {
+          // 关闭加载状态
+          loading.close();
           });
       } else if (this.viewType == 1) {    //业务单据提交提交
         if (val == 1 || this.curAction.checkWebNew == 2)
@@ -991,6 +1004,11 @@ export default {
           } else {
             this.$message.error(response.message);
           }
+          loading.close();
+
+        }).catch(() => {
+          // 关闭加载状态
+          loading.close();
         });
       } else if (this.viewType == 4) {
         submitAllocateBiz(tQuery).then((response) => {
@@ -1000,6 +1018,11 @@ export default {
           } else {
             this.$message.error(response.message);
           }
+          loading.close();
+
+        }).catch(() => {
+          // 关闭加载状态
+          loading.close();
         });
       } else {   //校验后提交
         submitOrderWeb(tQuery)
@@ -1010,8 +1033,14 @@ export default {
             } else {
               this.$message.error(response.message);
             }
-          });
+            loading.close();
+
+          }).catch(() => {
+          // 关闭加载状态
+          loading.close();
+        });
       }
+
     }
     ,
     saveOrder() {

src/views/purchase/product/supProductEditDialog.vue

@@ -116,7 +116,6 @@
             <el-form-item label="注册/备案人名称:" prop="recordPeopleName">
               <el-input
                 size="small"
-                disabled
                 placeholder="请输入内容"
                 v-model="inputQuery.recordPeopleName"
                 @input="change()"
@@ -130,7 +129,6 @@
             <el-form-item label="产品类别:" prop="hchzsb">
               <el-select
                 size="small"
-                disabled
                 v-model="inputQuery.hchzsb"
                 placeholder="产品类别"
                 style="width: 100%;"
@@ -146,7 +144,6 @@
                 size="small"
                 v-model="inputQuery.productType"
                 placeholder="器械类别"
-                disabled
                 style="width: 100%;"
               >
                 <el-option label="器械" value="器械"></el-option>