Merge branch 'master' of http://116.204.71.86:3000/UDI/udiwms-vue-frame

src/views/system/dept/invWarehouse.vue

@@ -9,6 +9,20 @@
             placeholder="仓库名称"
           ></el-input>
         </el-form-item>
+        <!-- <el-form-item class="query-form-item" label="仓库类型:">
+          <el-input
+
+            clearable
+            placeholder="仓库类型"
+          ></el-input>
+        </el-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"/>
+            <el-option label="寄售库" :value="3"/>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
@@ -28,34 +42,48 @@
       >
         <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
         <el-table-column
-          prop="name"
+          prop="code"
-          label="仓库名称"
+          width="140"
+          label="仓库编码"
         >
         </el-table-column>
         <el-table-column
-          prop="code"
+          width="160"
-          label="仓库编码"
+          prop="name"
+          label="仓库名称"
         >
         </el-table-column>
         <el-table-column
           prop="parentName"
+          width="180"
           label="所属部门"
         >
         </el-table-column>
-        <el-table-column
+        <el-table-column width="160"
                          prop="parentInvName"
                          label="上级仓库"
         >
         </el-table-column>
-        <!--<el-table-column label="允许供应商使用" prop="spUse">-->
+        <el-table-column
-        <!--  <template slot-scope="scope">-->
+          width="140"
-        <!--    <el-tag :type="scope.row.spUse | spUerFilterType">{{-->
+          prop="advanceType"
-        <!--        scope.row.spUse | spUerFilterName-->
+          label="仓库类型"
-        <!--      }}-->
+        >
-        <!--    </el-tag>-->
+
-        <!--  </template>-->
+          <template slot-scope="scope">
-        <!--</el-table-column>-->
+            <span>{{ advanceTypeTypeMap[scope.row.advanceType] }}</span>
-        <el-table-column label="操作" class-name="small-padding fixed-width">
+          </template>
+
+        </el-table-column>
+        <el-table-column label="允许供应商使用" prop="spUse" width="140">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.spUse | spUerFilterType">{{
+                scope.row.spUse | spUerFilterName
+              }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="220">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -169,10 +197,11 @@
           <el-row :gutter="20" class="el-row" type="flex">
             <el-col :span="12" class="el-col">
               <el-form-item label="仓库类型" prop="advanceType">
-                <el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型" style="width: 80%">
+                <el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型"
+                           style="width: 80%">
                   <el-option label="入账库" value="1"/>
-                  <el-option  label="寄售库"  value="2"/>
+                  <el-option label="预验收库" value="2"/>
-                  <el-option  label="预验收库" value="3"/>
+                  <el-option label="寄售库" value="3"/>
                 </el-select>
               </el-form-item>
 
@@ -401,6 +430,11 @@ export default {
       list: [],
       isExpandAll: true,
       total: 0,
+      advanceTypeTypeMap: {
+        1: "入账库",
+        3: "寄售库",
+        2: "预验收库",
+      },
       formMap: {
         add: "仓库信息-新增",
         edit: "仓库信息-编辑"
@@ -424,6 +458,7 @@ export default {
         ]
       },
       subData: {},
+      subDataType:{},
       fromDeptOptions: [],
       invOptions: [],
       thirdSubQuery: {
@@ -448,6 +483,7 @@ export default {
       },
       sysList: [],
       sysSubList: [],
+      advanceTypese: [],
     };
   },
   methods: {
@@ -460,6 +496,7 @@ export default {
         name: "",
         status: "",
       };
+      this.subDataType.advanceType=null;
       this.getList();
 
       //置空用户列表和货位信息列表的参数
@@ -472,6 +509,7 @@ export default {
     },
 
     onSubmit() { //提交查询
+      this.query.advanceType=this.subDataType.advanceType;
       this.getList();
     },
 
@@ -483,6 +521,7 @@ export default {
           this.loading = false;
           let invlist = response.data || [];
           this.list = this.handleTree(invlist, "code", "parentCode");
+          console.log(this.list);
         })
         .catch(() => {
           this.loading = false;
@@ -516,6 +555,10 @@ export default {
           this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code};
         }
       }
+      //转换
+      let advanceTypese = this.subData.advanceType
+
+
       this.subFormVisible = true;
       this.getSubThrsysDetailData();
       if (this.subData.parentCode != null && this.subData.parentCode != "") {