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

src/views/inout/DialogNewReviewOrder.vue

@@ -215,6 +215,7 @@ export default {
           this.$refs.inputRef.focus();
           this.$refs.inputRef.select();
           this.udiCode = response.data;
+          this.originCode = '';
           this.addCode();
         } else {
           if (response.code == 502) {

src/views/inventory/InvPlaceSelect.vue

@@ -3,7 +3,7 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="18">
+          <el-col :span="16">
             <el-form-item class="query-form-item" label="编码:">
               <el-input v-model="filterQuery.code" placeholder="请扫描或输入编码" ref="inputRef" clearable style="width: 97%" @keyup.enter.native="keyup_submit($event)"></el-input>
             </el-form-item>
@@ -18,7 +18,7 @@
           <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
         </el-button-group>
       </div>
-
+      <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border>
         <el-table-column label="序号" type="index"></el-table-column>

src/views/purchase/purApply/pureApplyMySearch.vue

@@ -11,7 +11,7 @@
 
           <el-col :span="8">
             <el-form-item label="申购部门">
-              <el-select v-model="filterQuery.deptCode" @change="getInvList" placeholder="请选择申购部门" style="width: 90%">
+              <el-select v-model="filterQuery.targetDeptCode" clearable @change="getInvList" placeholder="请选择申购部门" style="width: 90%">
                 <el-option
                   v-for="item in deptList"
                   :key="item.code"
@@ -25,7 +25,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="申购仓库">
-              <el-select v-model="filterQuery.invCode" style="width: 90%" clearable placeholder="请选择所属仓库">
+              <el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable placeholder="请选择所属仓库">
                 <el-option
                   v-for="item in invList"
                   :key="item.name"
@@ -171,7 +171,7 @@
 import pureApplyDetail from "./pureApplyDetailDialog";
 import {delApply, auditOrder, listApplyDetail, auditListApply, listApply} from "@/api/purchase/purApply";
 import {getInvListByUser} from "@/api/system/invWarehouse";
-import {getDeptListByUser} from "@/api/auth/authDept";
+import {filterDepts, getDeptListByUser} from "@/api/auth/authDept";
 import {filterSubAll} from "@/api/system/invSubWarehouse";
 
 export default {
@@ -297,7 +297,7 @@ export default {
       this.$router.push({
         path: "",
       });
-      let deptCode = this.filterQuery.deptCode
+      let targetDeptCode = this.filterQuery.targetDeptCode
       this.filterQuery = {
         billNo: "",
         thirdSysFk: "",
@@ -310,9 +310,9 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
-        deptCode: this.invCodebe,
+        targetDeptCode: this.invCodebe,
       };
-      if (deptCode != this.invCodebe) {
+      if (targetDeptCode != this.invCodebe) {
         this.getInvList()
       }
       this.actDateRange = [];
@@ -463,7 +463,10 @@ export default {
       })
     },
     getDeptList() {
-      getDeptListByUser().then((res) => {
+      let query = {
+        spUse: true,
+      };
+      filterDepts(query).then((res) => {
         this.deptList = res.data || [];
         if (this.deptList.length > 0) {
           this.filterQuery.targetDeptCode = this.deptList[0].code

src/views/purchase/purApply/pureApplySearch.vue

@@ -495,7 +495,7 @@ export default {
   }
   ,
   created() {
-    this.getDeptList();
+    this.getList();
   }
   ,
 }