Explorar o código

销售退货 提交判断价格

chenrui hai 1 ano
pai
achega
5d37c527b8

+ 8 - 0
src/api/salesReturn.js

@@ -300,3 +300,11 @@ export const grabSalesBill = (params) => {
     method: 'post'
   })
 }
+// 判断 各级别价格不完整,不让提交
+export const submitVerify = (params) => {
+  return axios({
+    url: '/salesReturn/submitVerify',
+    data: params,
+    method: 'post'
+  })
+}

+ 7 - 3
src/views/productManagement/productInfo/edit.vue

@@ -273,9 +273,9 @@ export default {
         unit: [
           { required: true, message: '请选择单位', trigger: 'change' }
         ],
-        // packQty: [
-        //   { required: true, message: '请输入包装数', trigger: 'blur' }
-        // ],
+        packQty: [
+          { required: true, message: '请输入包装数', trigger: 'blur' }
+        ],
         arrowFalg: [
           { required: true, message: '请选择是否为箭冠产品', trigger: 'change' }
         ],
@@ -325,6 +325,10 @@ 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))

+ 21 - 2
src/views/salesReturnManagement/salesReturn/list.vue

@@ -240,9 +240,10 @@ import verifyModal from './verifyModal.vue'
 import chooseDepartUserModal from './chooseDepartUserModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import warehouse from '@/views/common/chooseWarehouse.js'
-import { salesReturnList, salesReturnQueryCount, salesReturnDel, salesReturnCancelBill, salesReturnSubmit } from '@/api/salesReturn'
+import { salesReturnList, salesReturnQueryCount, salesReturnDel, salesReturnCancelBill, salesReturnSubmit, submitVerify } from '@/api/salesReturn'
 import moment from 'moment'
 import getDate from '@/libs/getDate.js'
+import { forEach } from 'core-js/fn/array'
 export default {
   name: 'SalesReturnList',
   mixins: [commonMixin],
@@ -441,7 +442,25 @@ export default {
     },
     beforeSubmit (row) {
       this.auditInfo = row
-      this.openDepartUserModal = true
+      // 判断价格
+      submitVerify({ salesReturnBillSn: row.salesReturnBillSn }).then(res => {
+        if (res.status == 200) {
+          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.$error({
+              title: '提示',
+              content: h('div', {}, newArr)
+            })
+          }
+        }
+      })
     },
     // 提交
     handleSubmit (data) {

+ 24 - 5
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -180,7 +180,8 @@ import {
   salesReturnBatchInsert,
   salesReturnPrint,
   salesReturnExport,
-  salesReturnModify
+  salesReturnModify,
+  submitVerify
 } from '@/api/salesReturn'
 import {
   salesReturnDetailList,
@@ -486,10 +487,28 @@ export default {
         if (hasKong) {
           this.$message.warning('请输入退货原因!')
         } else {
-          this.openDepartUserModal = true
-          if (this.ordeDetail.billStatus == 'AUDIT_REJECT') {
-            this.$refs.chooseDepart.getDetail(this.ordeDetail)
-          }
+          // 判断价格
+          submitVerify({ salesReturnBillSn: this.orderSn }).then(res => {
+            if (res.status == 200) {
+              if (!res.data) {
+                this.openDepartUserModal = true
+                if (this.ordeDetail.billStatus == 'AUDIT_REJECT') {
+                  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.$error({
+                  title: '提示',
+                  content: h('div', {}, newArr)
+                })
+              }
+            }
+          })
         }
       } else {
         this.$message.warning('请添加产品!')