feat: 优化销售订单

src/views/saleManage/saleOrder/components/addDialogNew.vue

@@ -265,6 +265,16 @@
             />
           </el-form-item>
 
+          <el-form-item label="收款条件" prop="paymentCondition">
+            <el-input
+              clearable
+              readonly
+              v-model="form.paymentCondition"
+              @click.native="handlePaymentConditionBtn"
+              placeholder="请输入"
+            />
+          </el-form-item>
+
           <el-form-item
             label="总数"
             prop="totalPlanNum"
@@ -284,6 +294,12 @@
         </el-col>
 
         <el-col :span="8">
+          <el-form-item label="生成收款计划表" prop="generatePlan">
+            <el-radio-group v-model="form.generatePlan">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item label="交易方式" prop="transactionMode">
             <el-select
               v-model="form.transactionMode"
@@ -751,6 +767,8 @@
       @changeParent="changeReturn"
     >
     </return-order-dialog>
+
+    <receiveTermsModal ref="receiveTermsModalRef"></receiveTermsModal>
   </ele-modal>
 </template>
 
@@ -806,6 +824,7 @@
   import PaymentCollectionPlan from '@/BIZComponents/paymentCollectionPlan/Index.vue';
   import { shippingModeOp, transactionMethodsOp } from '@/enum/dict.js';
   import { formatPrice } from '@/BIZComponents/setProduct.js';
+  import receiveTermsModal from './receiveTermsModal.vue'
   export default {
     mixins: [dictMixins],
     components: {
@@ -825,7 +844,8 @@
       saleOrderListDialog,
       opportunityDialog,
       personSelect,
-      PaymentCollectionPlan
+      PaymentCollectionPlan,
+      receiveTermsModal
     },
     props: {
       contactData: {
@@ -1119,6 +1139,12 @@
       });
     },
     methods: {
+      generatePlanChange() {
+
+      },
+      handlePaymentConditionBtn() {
+
+      },
       setIssueNumber(len) {
         this.form.issueNumber = len;
       },
@@ -2070,10 +2096,10 @@
               return;
             }
 
-            if (is) {
-              this.$message.error('同产品，工序、批次号、颜色、机型、产地、等级不能完全一致！');
-              return;
-            }
+            // if (is) {
+            //   this.$message.error('同产品，工序、批次号、颜色、机型、产地、等级不能完全一致！');
+            //   return;
+            // }
             // if(+ratioSum != 100){
             //   this.$message.error('比例合计必须为100%');
             //   return;