浏览代码

修改bug

chenrui 1 年之前
父节点
当前提交
19d3c91e6d

二进制
public/templ/产品批量导入模板.xlsx


+ 0 - 4
src/views/productManagement/productInfo/edit.vue

@@ -325,10 +325,6 @@ export default {
         this.$message.warning('产品分类未选到第三级,请修改后再提交!')
         return
       }
-      if (!this.form.packQtyUnit) {
-        this.$message.warning('包装数中的包装单位不能为空!')
-        return
-      }
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const form = JSON.parse(JSON.stringify(_this.form))

+ 8 - 9
src/views/salesReturnManagement/salesReturn/list.vue

@@ -448,16 +448,15 @@ export default {
           if (!res.data) {
             this.openDepartUserModal = true
           } else {
-            const h = this.$createElement
             const arr = res.data.split('\n')
-            const newArr = []
-            arr.forEach(item => {
-              newArr.push(h('p', item))
-            })
-            this.$warning({
-              title: '提示',
-              closable: true,
-              content: h('div', {}, newArr)
+            this.$notification.open({
+              message: '提示',
+              description:
+              <div>
+                {arr.map(item =>
+                  (<p>{item}</p>)
+                )}
+              </div>
             })
           }
         }

+ 8 - 9
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -496,16 +496,15 @@ export default {
                   this.$refs.chooseDepart.getDetail(this.ordeDetail)
                 }
               } else {
-                const h = this.$createElement
                 const arr = res.data.split('\n')
-                const newArr = []
-                arr.forEach(item => {
-                  newArr.push(h('p', item))
-                })
-                this.$warning({
-                  title: '提示',
-                  closable: true,
-                  content: h('div', {}, newArr)
+                this.$notification.open({
+                  message: '提示',
+                  description:
+                  <div>
+                    {arr.map(item =>
+                      (<p>{item}</p>)
+                    )}
+                  </div>
                 })
               }
             }