Merge remote-tracking branch 'origin/master'

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java

@@ -544,12 +544,6 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
             id = form.getId();
         }
         //主表字段验证
-//                if(StringUtil.isEmpty(form.getPoundCode())){
-//                    return "磅单编号不能为空";
-//                }
-        if(StringUtil.isEmpty(form.getVehicleId())){
-            return "车牌号不能为空";
-        }
         if(StringUtil.isEmpty(form.getSupplierId())){
             return "发货单位不能为空";
         }

jnpf-java-boot/jnpf-web/src/views/scm/voucherbatch/formBatch.vue

@@ -134,7 +134,7 @@
                     <template slot-scope="scope">
                       <JnpfInput v-model="scope.row.unit"
                         @change="changeData('voucherproduct-unit',scope.$index)" placeholder="请输入"
-                        clearable :style='{"width":"100%"}'>
+                        clearable :style='{"width":"100%"}' disabled>
                       </JnpfInput>
                     </template>
                   </el-table-column>
@@ -535,6 +535,8 @@ export default {
         this.dataForm.voucherProductBatchList = voucherInfo.voucherProductList
         this.dataForm.isSaleDeliveryVoucherSource = voucherInfo.id
         this.dataForm.supplierId = voucherInfo.customerId
+        this.dataForm.customerId = ''
+        this.dataForm.preparationTime = new Date()
       })
     },
     prev() {
@@ -572,10 +574,8 @@ export default {
       });
     },
     goBack() {
-      debugger
       this.visible = false
-      this.$router.go(-1)
+      this.$emit('refresh', true)
-      //   this.$emit('refreshDataList', true)
     },
     changeData(model, index) {
       this.isEdit = false