bug修复

src/views/inout/DialogcChangeNewOrder.vue

@@ -268,8 +268,19 @@ export default {
         this.$message.error("当前分库不能为空");
         return;
       }
-      if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromInvCode)) {
-        this.$message.error('往来单位仓库不能为空');
+
+      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 == 3 && this.$isBlank(this.formData.fromInvCode)) {
+        this.$message.error("往来单位不能为空");
+        return;
+      }
+
+      if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromCorp)) {
+        this.$message.error('往来单位不能为空');
         return;
       }
       if (this.detailList.length == 0) {

src/views/inventory/InvOutPlace.vue

@@ -113,7 +113,6 @@
         <el-table-column label="仓库" prop="invName" width="180"></el-table-column>
         <el-table-column label="操作时间" prop="createTime" width="150"></el-table-column>
         <el-table-column label="操作前货位" prop="invSpaceName" width="180"></el-table-column>
-        <el-table-column label="操作后货位" prop="invSpaceName" width="180"></el-table-column>
         <el-table-column label="单号" v-if="filterQuery.type === 2" prop="orderId" width="120"></el-table-column>
         <el-table-column label="DI/物资编码" prop="nameCode" width="150"></el-table-column>
         <el-table-column label="物资名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>

src/views/inventory/InvSupPreInProducts.vue

@@ -372,7 +372,6 @@ export default {
     },
     detailDialog(row) {
       this.detailDialogVisible = true;
-      debugger
       this.inputQuery = {
         relId: row.relIdFk,
         cpmctymc: row.cpmctymc,

src/views/inventory/supInoutSearchOrder.vue

@@ -239,7 +239,6 @@ export default {
       }
       let query = {id: 4};
       verifyTemplateFile(query).then((res) => {
-        debugger
           if (res.code === 20000) {
             let printParams = {
               templateId: res.data,

src/views/remind/addInvRemindSetDialog.vue

@@ -199,11 +199,12 @@ export default {
       this.showSearch = !this.showSearch;
     },
     invChange() {
+      this.productQuery.deptCode=this.invList.find(item => item.code == this.productQuery.invCode).parentId
       this.multipleSelection = [];
       this.spaceList = [];
-      this.formData.invSpaceCode = null;
-      this.formData.relId = null;
-      this.formData.ggxh = null;
+      this.productQuery.invSpaceCode = null;
+      this.productQuery.relId = null;
+      this.productQuery.ggxh = null;
       this.getInvProductList();
       this.getSpaceList();
     },
@@ -218,7 +219,7 @@ export default {
         });
     },
     getSpaceList() {
-      let params = {invWarehouseCode: this.formData.invCode, status: 1};
+      let params = {invWarehouseCode: this.productQuery.invCode, status: 1};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
       })
@@ -251,12 +252,11 @@ export default {
         overStock: this.formData.overStock,
         expireDate: this.formData.expireDate,
         recentDate: this.formData.recentDate,
-        deptCode: this.formData.deptCode,
-        invCode: this.formData.invCode,
+        deptCode: this.productQuery.deptCode,
+        invCode: this.productQuery.invCode,
         invSpaceCode: this.productQuery.invSpaceCode,
         relIdList: relIdList
       };
-      debugger
       console.log(params)
       batchAddInvRemindSet(params).then((res) => {
         if (res.code === 20000) {
@@ -271,7 +271,7 @@ export default {
       })
     },
     verifyFormData() {
-      if (isBlank(this.formData.invCode)) {
+      if (isBlank(this.productQuery.invCode)) {
         return "请选择预警仓库";
       }
       if (this.formData.lowStock === false && this.formData.lackStock === false && this.formData.overStock === false && this.formData.expireDate === false && this.formData.recentDate === false) {
@@ -283,8 +283,8 @@ export default {
       this.productVisible = true;
       this.getInvProductList();
       this.productQuery = {
-        invCode: this.formData.invCode,
-        invSpaceCode: this.formData.invSpaceCode,
+        invCode: this.productQuery.invCode,
+        invSpaceCode: this.productQuery.invSpaceCode,
         page: 1,
         limit: 10
       };