luobang 1 jaar geleden
bovenliggende
commit
8a81672105

+ 2 - 2
build/utils.js

@@ -16,9 +16,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
-let devModules = ['all']
-// let devModules = ['index', 'statisticalReport', 'sale']
 // let devModules = ['all']
+// let devModules = ['index', 'statisticalReport', 'appoint']
+let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']
 

+ 5 - 2
src/views/appoint/components/saleContract/addSaleOrder.vue

@@ -2219,11 +2219,14 @@ export default {
             if (res.data.code == '200') {
               this.$router.go(-1)
               this.notDebounce = false
+              this.$message.success('新增订单成功!')
+            } else {
+              this.$message.error(res.data.data)
+              this.notDebounce = false
             }
-            this.$message.success('新增订单成功!')
           })
           .catch(() => {
-            this.$message.error()
+            this.$message.error('新增失败')
           })
       } else {
         this.$message.error('还有物资件数未填写!')

File diff suppressed because it is too large
+ 369 - 332
src/views/appoint/components/saleContract/addSaleOrderArrange.vue


+ 3 - 1
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -2127,7 +2127,9 @@ export default {
         { text: '4', value: '4' },
         { text: '5', value: '5' },
         { text: '6', value: '6' },
-        { text: '7', value: '7' }
+        { text: '7', value: '7' },
+        { text: '8', value: '8' },
+        { text: '9', value: '9' }
       ],
       filteraddressPlace: [],
       filtermaterialSpe: [],

Some files were not shown because too many files changed in this diff