From c94975cc05045a76b74add0f19b31d6983cc9133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Fri, 3 Mar 2023 13:44:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/scm/basicInformation/saleorder/Form.vue   |  2 +-
 .../basicInformation/saleorder/collectionForm.vue   | 13 ++++++++++++-
 .../views/scm/basicInformation/saleorder/index.vue  |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
index 5ba4f02e..39d088e7 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
@@ -1211,7 +1211,7 @@
                     contractCodecolumnOptions:[ {"label":"合同编码","value":"contract_code"}, {"label":"合同名称","value":"contract_name"}, {"label":"合同类型","value":"contract_type"}, {"label":"客户ID","value":"code"}, {"label":"客户名称","value":"name"},],
                     costomerCodecolumnOptions:[ {"label":"客户编码","value":"supplier_cd"}, {"label":"客户名称","value":"supplier_nm"}, {"label":"联系人","value":"contact_name"}, {"label":"联系电话","value":"contact_phone"}, {"label":"地址","value":"address"},],
                         currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                        statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待回款","id":"3"},{"fullName":"回款中","id":"4"},{"fullName":"归档","id":"5"}],
+                        statusOptions:[{"fullName":"待发货","id":"0"},{"fullName":"待开票","id":"1"},{"fullName":"待回款","id":"2"},{"fullName":"归档","id":"3"}],
 
               salesorder_item0vehicleIdcolumnOptions:[ {"label":"车牌号","value":"ticketno"}, {"label":"物料名称","value":"materialName"},{"label":"磅单类型","value":"pound_type"},
                 {"label":"净重","value":"net_weight"}, {"label":"单位","value":"unit"}, {"label":"是否垫资","value":"advance"},
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
index 2c3dc9d4..ce350e3a 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
@@ -231,6 +231,7 @@
     import request from '@/utils/request'
     import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
     import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import { message } from '@/utils/message'
     export default {
         components: {},
         props: [],
@@ -288,7 +289,7 @@
 					for(let i=0;i<this.dataForm.collection_item0List.length;i++){
 						const e = this.dataForm.collection_item0List[i];
 					}
-				return isOk;
+          return isOk;
 			},
             clearData(data){
                 for (let key in data) {
@@ -325,6 +326,16 @@
             },
             request() {
                 var _data =this.dataList()
+              for(let i=0;i<this.dataForm.collection_item0List.length;i++) {
+                if (this.dataForm.collection_item0List[i].amount > this.dataForm.collection_item0List[i].price) {
+                  this.$message({
+                    message: '收款金额不能大于金额',
+                    type: 'error',
+                    duration: 1000
+                  })
+                  return this.$message
+                }
+              }
                 if (!this.dataForm.id) {
                     request({
                         url: '/api/collection/Collection',
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/index.vue b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
index 66b81c77..ca50caba 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
@@ -174,7 +174,7 @@ width="150" >
                 ],
                                 currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
                             currencyProps:{"label":"fullName","value":"id"},
-                                statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待回款","id":"3"},{"fullName":"回款中","id":"4"},{"fullName":"归档","id":"5"}],
+                                statusOptions:[{"fullName":"待发货","id":"0"},{"fullName":"待开票","id":"1"},{"fullName":"待回款","id":"2"},{"fullName":"归档","id":"3"}],
                             statusProps:{"label":"fullName","value":"id"},
             }
         },