Merge branch 'master' of http://139.196.39.194:9021/yuansh/doors-windows-web

src/views/production/productionTotalOrder/modules/SurplusMaterials.vue

@@ -563,7 +563,7 @@
                        alertModal.closeLoading();
                       if (res.success) {
                           this.$emit('ok','1')
-                          this.$message.success('执行成功'+res.message);
+                          this.$message.success(res.message);
                       } else {
                           this.$emit('ok','2')
                           this.$message.error(res.message);

src/views/production/productionTotalOrder/modules/productWarehousModel.vue

@@ -357,6 +357,7 @@
                     alertModal.closeLoading();
                     if (res.success) {
                         this.visible = false
+                        this.$message.success(res.message);
                         this.$emit('ok')
                     } else {
                         this.$message.error(res.message);

src/views/production/productionTotalOrder/productionTotalOrderList.vue

@@ -161,7 +161,6 @@
     </template>
       
       <script>
-      
         import { JeecgListMixin } from '@/mixins/JeecgListMixin'
         import moment from 'dayjs'
         import { httpAction ,getAction,postAction,putAction,deleteAction,downFile} from '@/api/manage'
@@ -441,7 +440,15 @@
                       alertModal.closeLoading();
                       if(res.success){
                         this.getTableList()
-                        this.$message.success(res.message)
+                        
+                        var arr = res.message.split(";");
+                        var str = arr.join(' <br/> ');
+                        Message({
+                          dangerouslyUseHTMLString: true,
+                          message: str,
+                          type: ''
+                        });
+                        // this.$message.success(res.message)
                       }else{
                         this.$message.error(res.message)
                       }
@@ -563,7 +570,14 @@
                         alertModal.closeLoading();
                         if(res.success){
                           this.getTableList()
-                          this.$message.success(res.message)
+                          var arr = res.message.split(";");
+                          var str = arr.join(' <br/> ');
+                          Message({
+                            dangerouslyUseHTMLString: true,
+                            message: str,
+                            type: ''
+                          });
+                          // this.$message.success(res.message)
                          }else{
                           this.$message.error(res.message)
                          }