Merge remote-tracking branch 'origin/dev' into dev

src/views/inout/DialogcChangeNewOrder.vue

@@ -260,29 +260,27 @@ export default {
         this.$message.warning("请选择单据类型！");
         return;
       }
-      if ((this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit)) && this.$isBlank(this.formData.fromCorp)) {
-        this.$message.error('当前往来信息不能为空');
-        return;
-      }
       if (this.$isBlank(this.formData.invCode)) {
         this.$message.error("当前分库不能为空");
         return;
       }
-
+      if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromCorp)) {
-      if (this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit && this.$isBlank(this.formData.fromCorp))) {
+        this.$message.error('往来单位不能为空');
+        return;
+      }
+      if ((this.curAction.corpType === 2 && this.$isBlank(this.formData.fromCorp))) {
         this.$message.error("往来单位不能为空");
         return;
       }
-
+      if ((this.curAction.corpType === 4 && this.$isBlank(this.formData.fromCorp))) {
-      if (this.curAction.corpType == 3 && this.$isBlank(this.formData.fromInvCode)) {
         this.$message.error("往来单位不能为空");
         return;
       }
-
+      if (this.curAction.corpType == 3 && this.$isBlank(this.formData.fromInvCode)) {
-      if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromCorp)) {
+        this.$message.error("往来单位不能为空");
-        this.$message.error('往来单位不能为空');
         return;
       }
+
       if (this.detailList.length == 0) {
         this.$message.error("产品列表不能为空");
         return;

src/views/purchase/purOrder/purOrderAudit.vue

@@ -182,8 +182,8 @@ export default {
       formName: null,
       invCodebe: null,
       formMap: {
-        add: "新增采购计划",
+        add: "新增采购订单",
-        update: "采购计划审核",
+        update: "采购订单审核",
       },
       statusMap: {
         1: "草稿",

src/views/purchase/purOrder/purOrderDetailDialog.vue

@@ -261,9 +261,9 @@ export default {
     saveOrder(status) {
       let tip = "";
       if (status == "3") {
-        tip = "是否确定通过该采购计划？";
+        tip = "是否确定通过该采购订单？";
       } else {
-        tip = "是否确定拒绝该采购计划？";
+        tip = "是否确定拒绝该采购订单？";
       }
       this.$confirm(tip, "提示", {
         confirmButtonText: "确定",