Просмотр исходного кода

fix(发货单): 无客户生产性订单可以创建发货单-客户信息不必填

liujt 7 месяцев назад
Родитель
Сommit
64d31d581e

+ 0 - 1
src/views/saleManage/saleOrder/index.vue

@@ -202,7 +202,6 @@
                     ((row.saleTypeName.includes('受托') &&
                     ((row.saleTypeName.includes('受托') &&
                       row.isEntrustedReceive == 1) ||
                       row.isEntrustedReceive == 1) ||
                       !row.saleTypeName.includes('受托')) &&
                       !row.saleTypeName.includes('受托')) &&
-                    row.needProduce != 2 &&
                     $hasPermission('eom:saleordersendrecord:save') &&
                     $hasPermission('eom:saleordersendrecord:save') &&
                     ((isTotalCount == '1' &&
                     ((isTotalCount == '1' &&
                       ![800, 1000].includes(row.progress)) ||
                       ![800, 1000].includes(row.progress)) ||

+ 29 - 22
src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue

@@ -372,24 +372,6 @@ import {
         formDef,
         formDef,
         form: copyObj(formDef),
         form: copyObj(formDef),
         returnOrderDialogFlag: false,
         returnOrderDialogFlag: false,
-        rules: {
-          partaName: [
-            { required: true, message: '请选择客户名称', trigger: 'change' }
-          ],
-          linkName: [
-            { required: true, message: '请输入', trigger: ['blur', 'change'] }
-          ],
-          linkPhone: [
-            { required: true, message: '请输入', trigger: 'change' }
-          ],
-          orderNo: [{ required: true, message: '请选择', trigger: 'change' }],
-          receiveAddress: [
-            { required: true, message: '请输入', trigger: 'change' }
-          ],
-          deviceName: [
-            { required: true, message: '前选择车辆', trigger: 'change' }
-          ]
-        },
 
 
         // 提交状态
         // 提交状态
         loading: false,
         loading: false,
@@ -412,7 +394,27 @@ import {
     computed: {
     computed: {
       allcountAmount() {
       allcountAmount() {
         return this.$store.state.order.allcountAmount;
         return this.$store.state.order.allcountAmount;
-      }
+      },
+      rules() {
+          return {
+            partaName: [
+              { required: true, message: '请选择客户名称', trigger: 'change' }
+            ],
+            linkName: [
+              { required: this.form.needProduce != 2 ? true : false, message: '请输入', trigger: ['blur', 'change'] }
+            ],
+            linkPhone: [ 
+              { required: this.form.needProduce != 2 ? true : false, message: '请输入', trigger: 'change' }
+            ],
+            orderNo: [{ required: true, message: '请选择', trigger: 'change' }],
+            receiveAddress: [
+              { required: this.form.needProduce != 2 ? true : false, message: '请输入', trigger: 'change' }
+            ],
+            deviceName: [
+              { required: true, message: '前选择车辆', trigger: 'change' }
+            ]
+          }
+        }
     },
     },
 
 
     methods: {
     methods: {
@@ -430,7 +432,8 @@ import {
         this.form = Object.assign({}, this.form, {
         this.form = Object.assign({}, this.form, {
           productionRequirements: obj.map((item) => item.productionRequirements).toString(),
           productionRequirements: obj.map((item) => item.productionRequirements).toString(),
           orderIds: obj.map((item) => item.id).toString(),
           orderIds: obj.map((item) => item.id).toString(),
-          orderNo: obj.map((item) => item.orderNo).toString()
+          orderNo: obj.map((item) => item.orderNo).toString(),
+          needProduce: obj.map((item) => item.needProduce)
         });
         });
         this.getSaleOrderDetails(obj.map((item) => item.id));
         this.getSaleOrderDetails(obj.map((item) => item.id));
       },
       },
@@ -646,7 +649,8 @@ import {
             entrustedCode: '',
             entrustedCode: '',
             entrustedId: '',
             entrustedId: '',
             sendNoteNo: '',
             sendNoteNo: '',
-            pricingWay: ''
+            pricingWay: '',
+
           });
           });
           this.$refs.inventoryTableref &&
           this.$refs.inventoryTableref &&
             this.$refs.inventoryTableref.putTableValue([], true);
             this.$refs.inventoryTableref.putTableValue([], true);
@@ -836,7 +840,10 @@ import {
             entrustedCode: '',
             entrustedCode: '',
             entrustedId: '',
             entrustedId: '',
             sendNoteNo: '',
             sendNoteNo: '',
-            pricingWay: ''
+            pricingWay: '',
+            sourceNo: '',
+            sourceId: '',
+
           });
           });
           this.$refs.inventoryTableref &&
           this.$refs.inventoryTableref &&
             this.$refs.inventoryTableref.putTableValue([], true);
             this.$refs.inventoryTableref.putTableValue([], true);