Explorar o código

采购订单维护-优化退换货订单保存后,在提交时有校验现存量,由于提示过长,超出屏幕无法滚动

002390 hai 1 ano
pai
achega
3e6fe19bb7
Modificáronse 2 ficheiros con 42 adicións e 30 borrados
  1. 40 28
      src/views/purchase/purchase-order/index.vue
  2. 2 2
      vue.config.js

+ 40 - 28
src/views/purchase/purchase-order/index.vue

@@ -417,33 +417,40 @@ export default {
           if (code == 200) {
             _this.handleRefreshList();
           } else if (code == 10000) {
-            _this.$alert(msg, "提示", {
-              showCancelButton: true,
-              confirmButtonText: "继续提交",
-              cancelButtonText: "取消",
-              beforeClose: async (action, instance, done) => {
-                if (action === "confirm") {
-                  instance.confirmButtonLoading = true;
-                  instance.confirmButtonText = "执行中...";
-                  try {
-                    let { code, msg } = await orderApi.submit({
-                      puOrderIds,
-                      checkAmount: false,
-                    });
-                    if (code == 200) {
-                      done();
-                      _this.handleRefreshList();
+            _this.$alert(
+              "<div style='overflow: auto;overflow-x: hidden;max-height: 65vh;padding: 10px 20px 0;'>" +
+                msg +
+                "</div>",
+              "提示",
+              {
+                showCancelButton: true,
+                dangerouslyUseHTMLString: true,
+                confirmButtonText: "继续提交",
+                cancelButtonText: "取消",
+                beforeClose: async (action, instance, done) => {
+                  if (action === "confirm") {
+                    instance.confirmButtonLoading = true;
+                    instance.confirmButtonText = "执行中...";
+                    try {
+                      let { code, msg } = await orderApi.submit({
+                        puOrderIds,
+                        checkAmount: false,
+                      });
+                      if (code == 200) {
+                        done();
+                        _this.handleRefreshList();
+                      }
+                    } catch (error) {
+                      instance.confirmButtonText = "确认";
+                    } finally {
+                      instance.confirmButtonLoading = false;
                     }
-                  } catch (error) {
-                    instance.confirmButtonText = "确认";
-                  } finally {
-                    instance.confirmButtonLoading = false;
+                  } else {
+                    done();
                   }
-                } else {
-                  done();
-                }
-              },
-            });
+                },
+              }
+            );
           }
         } catch (error) {
         } finally {
@@ -893,6 +900,11 @@ export default {
   </el-card>
 </template>
 
-<style lang="scss">
-
-</style>
+<!-- <style scoped>
+>>> .el-message-box__content {
+  max-height: 350px;
+  overflow-y: scroll;
+  overflow-x: auto;
+  box-sizing: border-box;
+}
+</style> -->

+ 2 - 2
vue.config.js

@@ -37,10 +37,10 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://172.16.100.107:8080/drp-admin`, //测试
-        // target: `http://test-sy.derom.com/drp-admin`, //测试
+        target: `http://test-sy.derom.com/drp-admin`, //测试
         // target: `http://release-sy.derom.com/drp-admin`, //预发
         // target: `http://sy.derom.com/drp-admin`, //生产
-        target: `http://172.16.63.202:8000/drp-admin`, // D本地
+        // target: `http://172.16.63.202:8000/drp-admin`, // D本地
         // target: `http://172.16.62.241:8000/drp-admin`, //笑寒本地
         // target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地
         // target: `http://172.16.13.47:8000/drp-admin`, //这是一个美女的本地