申购仓库修改

src/api/system/invSubWarehouse.js

@@ -94,6 +94,16 @@ export function findLyInv(query) {
 }
 
 
+export function findSgInv(query) {
+  return axios({
+    url: "/spms/inv/warehouse/findSgInv",
+    method: "get",
+    params: query
+  });
+}
+
+
+
 export function filterSubByInv(query) {
   return axios({
     url: "/spms/inv/warehouse/findByUser",

src/views/purchase/purApply/purApplyEditDiaolog.vue

@@ -213,7 +213,7 @@ import {
   addApplyId,
   updateDetail
 } from "@/api/purchase/purApply";
-import {filterGroupBySpuse, filterSubByInv} from "@/api/system/invSubWarehouse";
+import {filterGroupBySpuse, filterSubByInv, findSgInv} from "@/api/system/invSubWarehouse";
 import {addPlanId} from "@/api/purchase/purPlan";
 import SelectRecelveListDialog from "@/views/inout/receive/selectReveiceListDialog";
 import {parseTime} from "@/utils/coTools";
@@ -454,7 +454,7 @@ export default {
         });
     },
     rowChange(val) {
-      if (this.currentRow != null){
+      if (this.currentRow != null) {
         updateDetail(this.currentRow);
       }
       this.currentRow = val;
@@ -556,11 +556,8 @@ export default {
 
     findSubInvs() {
       this.subInvList = [];
-      let query = {
+      let query = {};
-        filter: 3,
+      findSgInv(query)
-        spUse: true,
-      };
-      filterGroupBySpuse(query)
         .then((response) => {
           this.subInvList = response.data || [];
           if (this.subInvList != null && this.subInvList.length == 1) {

src/views/system/dept/invWarehouse.vue

@@ -2,14 +2,14 @@
   <div>
     <el-card>
       <el-form :inline="true" :model="query" class="query-form" size="mini">
-        <el-form-item class="query-form-item" label="仓库名称:">
+        <el-form-item label="仓库名称:">
           <el-input
             v-model="query.name"
             clearable
             placeholder="仓库名称"
           ></el-input>
         </el-form-item>
-        <el-form-item label="仓库类型" prop="advanceType" class="query-form-item">
+        <el-form-item label="仓库类型" prop="advanceType">
           <el-select v-model="subDataType.advanceType" placeholder="请选择仓库类型" style="width: 80%">
             <el-option label="入账库" :value="1"/>
             <el-option label="预验收库" :value="2"/>
@@ -169,7 +169,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" class="el-col">
-              <el-form-item label="仓库编码" prop="code" class="query-form-item">
+              <el-form-item label="仓库编码" prop="code">
                 <el-input
                   disabled
                   v-model="subData.code" style="width: 80%"
@@ -178,7 +178,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" class="el-col">
-              <el-form-item label="仓库名称" prop="name" class="query-form-item">
+              <el-form-item label="仓库名称" prop="name">
                 <el-input
                   v-model="subData.name" style="width: 80%"
                   placeholder="请输入仓库名称"
@@ -186,6 +186,22 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="是否申购仓库" prop="sgInvType">
+                <el-radio-group v-model="subData.sgInvType">
+                  <el-radio :label="true">是</el-radio>
+                  <el-radio :label="false">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="是否领用仓库" prop="lyInvType">
+                <el-radio-group v-model="subData.lyInvType">
+                  <el-radio :label="true">是</el-radio>
+                  <el-radio :label="false">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
             <el-col :span="12" class="el-col">
               <el-form-item label="仓库类型" prop="advanceType">
                 <el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型"
@@ -195,32 +211,27 @@
                   <el-option label="寄售库" value="3"/>
                 </el-select>
               </el-form-item>
-
-              <!--<el-form-item label="寄售仓库" prop="advanceType" class="query-form-item">-->
-              <!--  <el-radio-group :disabled="isAdvanceTypeShow" v-model="subData.advanceType">-->
-              <!--    <el-radio :label="false">非寄售</el-radio>-->
-              <!--    <el-radio :label="true">寄售</el-radio>-->
-              <!--  </el-radio-group>-->
-              <!--</el-form-item>-->
             </el-col>
+
+
             <el-col :span="12" class="el-col">
-              <el-form-item label="是否能被供应商使用" prop="spUse" class="query-form-item">
+              <el-form-item label="是否能被供应商使用" prop="spUse">
                 <el-radio-group v-model="subData.spUse">
                   <el-radio :label="true">是</el-radio>
                   <el-radio :label="false">否</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="12" class="el-col">
+            <!--<el-form-item label="寄售仓库" prop="advanceType" >-->
-              <el-form-item label="是否领用仓库" prop="lyInvType" class="query-form-item">
+            <!--  <el-radio-group :disabled="isAdvanceTypeShow" v-model="subData.advanceType">-->
-                <el-radio-group v-model="subData.lyInvType">
+            <!--    <el-radio :label="false">非寄售</el-radio>-->
-                  <el-radio :label="true">是</el-radio>
+            <!--    <el-radio :label="true">寄售</el-radio>-->
-                  <el-radio :label="false">否</el-radio>
+            <!--  </el-radio-group>-->
-                </el-radio-group>
+            <!--</el-form-item>-->
-              </el-form-item>
+
-            </el-col>
+
             <el-col class="el-col" :span="24">
-              <el-form-item label="备注" prop="remark" class="query-form-item">
+              <el-form-item label="备注" prop="remark">
                 <el-input
                   v-model="subData.remark"
                   type="textarea"
@@ -280,7 +291,7 @@
       <!-- 仓库关联第三方分库对话框-->
       <el-dialog title="仓库信息-关联第三方仓库" :visible.sync="thrSubWareHouseVisible">
         <el-form :inline="true" :model="thirdSubQuery" class="query-form" size="mini">
-          <el-form-item class="query-form-item">
+          <el-form-item>
             <el-input
               v-model="thirdSubQuery.name"
               clearable