Merge remote-tracking branch 'origin/master'

src/views/inout/receive/DialogNewReceive.vue

@@ -440,33 +440,34 @@ export default {
       }
     },
     deleteCodeArray(index, row) {
+      let _this = this
       this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
-        if (this.orderEditor) {
+        if (_this.formData.billNo) {
-          this.detailLoading = true;
+          _this.detailLoading = true;
-          if (this.$isNotBlank(row.id)) {
+          if (_this.$isNotBlank(row.id)) {
             delReceiveDetail({id: row.id})
               .then(response => {
-                this.detailLoading = false;
+                _this.detailLoading = false;
                 if (response.code === 20000) {
-                  this.getOrderDetailList();
+                  _this.getOrderDetailList();
                 } else {
-                  this.$message.error(response.message);
+                  _this.$message.error(response.message);
                 }
               })
               .catch(() => {
-                this.detailLoading = false;
+                _this.detailLoading = false;
               })
           } else {
-            this.$message.success('删除成功');
+            _this.$message.success('删除成功');
-            this.codeArray.splice(index, 1);
+            _this.codeArray.splice(index, 1);
           }
         } else {
-          this.$message.success('删除成功');
+          _this.$message.success('删除成功');
-          this.codeArray.splice(index, 1);
+          _this.codeArray.splice(index, 1);
         }
       }).catch(() => {
 

src/views/purchase/purApply/purApply.vue

@@ -174,6 +174,7 @@ export default {
                 editStatus: 1,
                 emergency:'',
                 targetDeptCode:'',
+                targetInvCode:null
             },
             isChang:false,
             formName: null,
@@ -247,6 +248,7 @@ export default {
             this.$router.push({
                 path: "",
             });
+            let deptCode = this.filterQuery.targetDeptCode
             this.filterQuery = {
                 billNo: "",
                 thirdSysFk: "",
@@ -260,7 +262,11 @@ export default {
                 type: 1,
                 editStatus: 1,
                 targetDeptCode: this.invCodebe,
+                targetInvCode:null
             };
+            if(deptCode!=this.invCodebe){
+              this.getInvList()
+            }
             this.actDateRange = [];
             this.getList();
         },
@@ -405,6 +411,8 @@ export default {
           var query={
             parentId:this.filterQuery.targetDeptCode
           }
+          this.filterQuery.targetInvCode = null
+          this.$forceUpdate()
           filterSubAll(query).then((res) => {
             this.invList = res.data || [];
           })

src/views/purchase/purApply/purApplyEditDiaolog.vue

@@ -286,7 +286,7 @@ export default {
               return this.$message.error("单据日期不能为空！");
             }
             if (this.formData.targetInvCode == "" || this.formData.targetInvCode == null) {
-              return this.$message.error("采购科室不能为空！");
+              return this.$message.error("申购仓库不能为空！");
             }
             if (this.formData.emergency == "" || this.formData.emergency == null) {
               return this.$message.error("紧急程度不能为空！");