From 1bcb58eee811320b682e7ffc5558a657bc4f969f Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 19 Apr 2023 14:59:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=B1=BB=E5=9E=8B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/invWarehouse.vue | 97 +++++++++++++++-----------
 1 file changed, 56 insertions(+), 41 deletions(-)

diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index 81b2b3b..eeb977d 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -11,18 +11,18 @@
         </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="subData.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 label="仓库类型" prop="advanceType">
+          <el-select v-model="subData.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>
@@ -43,30 +43,39 @@
         <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
         <el-table-column
           prop="code"
+          width="140"
           label="仓库编码"
         >
         </el-table-column>
         <el-table-column
+          width="160"
           prop="name"
           label="仓库名称"
         >
         </el-table-column>
         <el-table-column
           prop="parentName"
+          width="180"
           label="所属部门"
         >
         </el-table-column>
-        <el-table-column
-          prop="parentInvName"
-          label="上级仓库"
+        <el-table-column width="160"
+                         prop="parentInvName"
+                         label="上级仓库"
         >
         </el-table-column>
         <el-table-column
+          width="140"
           prop="advanceType"
           label="仓库类型"
         >
+
+          <template slot-scope="scope">
+            <span>{{ advanceTypeTypeMap[scope.row.advanceType] }}</span>
+          </template>
+
         </el-table-column>
-        <el-table-column label="允许供应商使用" prop="spUse">
+        <el-table-column label="允许供应商使用" prop="spUse" width="140">
           <template slot-scope="scope">
             <el-tag :type="scope.row.spUse | spUerFilterType">{{
                 scope.row.spUse | spUerFilterName
@@ -74,7 +83,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width">
+        <el-table-column label="操作" width="220">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -187,11 +196,12 @@
           </el-row>
           <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-option  label="入账库"  value="1"/>
-                  <el-option  label="寄售库"  value="2"/>
-                  <el-option  label="预验收库" value="3"/>
+              <el-form-item label="仓库类型" prop="advanceType">
+                <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="3"/>
                 </el-select>
               </el-form-item>
 
@@ -414,17 +424,22 @@ export default {
         // page: 1,
         // limit: 10,
       },
-      isAdvanceTypeShow:false,
-      isShow:false,
+      isAdvanceTypeShow: false,
+      isShow: false,
       loading: true,
       list: [],
       isExpandAll: true,
       total: 0,
+      advanceTypeTypeMap: {
+        1: "入账库",
+        2: "寄售库",
+        3: "预验收库",
+      },
       formMap: {
         add: "仓库信息-新增",
         edit: "仓库信息-编辑"
       },
-      invWouse:{},
+      invWouse: {},
       formName: null,
       configParms: {},
       currentCode: null,
@@ -467,7 +482,7 @@ export default {
       },
       sysList: [],
       sysSubList: [],
-      advanceTypese:[],
+      advanceTypese: [],
     };
   },
   methods: {
@@ -512,38 +527,38 @@ export default {
         });
     },
     handleSubForm(data, formName) {   //新增，编辑
-      if(data != null ){
-        this.invWouse=data;
+      if (data != null) {
+        this.invWouse = data;
       }
       this.formName = formName;
       if (formName === "edit") {
         this.subData = JSON.parse(JSON.stringify(data));
-        this.subData.advanceType=this.subData.advanceType.toString();
-        if(this.subData.parentCode!=null && this.subData.parentCode!=""){
-          this.isAdvanceTypeShow=true;
-          this.isShow=false;
-        }else{
-          this.isAdvanceTypeShow=false;
-          this.isShow=true
-          this.subData.parentCode=null;
+        this.subData.advanceType = this.subData.advanceType.toString();
+        if (this.subData.parentCode != null && this.subData.parentCode != "") {
+          this.isAdvanceTypeShow = true;
+          this.isShow = false;
+        } else {
+          this.isAdvanceTypeShow = false;
+          this.isShow = true
+          this.subData.parentCode = null;
         }
       } else if (formName === "add") {
-        this.isShow=true
-        if(data==null){
-          this.isAdvanceTypeShow=false;
-          this.subData = {advanceType: '1', spUse: false,parentCode:null};
-        }else{
-          this.isAdvanceTypeShow=true;
-          this.subData = {advanceType: data.advanceType.toString(), spUse: false,parentCode:data.code};
+        this.isShow = true
+        if (data == null) {
+          this.isAdvanceTypeShow = false;
+          this.subData = {advanceType: '1', spUse: false, parentCode: null};
+        } else {
+          this.isAdvanceTypeShow = true;
+          this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code};
         }
       }
       //转换
-      let advanceTypese =this.subData.advanceType
+      let advanceTypese = this.subData.advanceType
 
 
       this.subFormVisible = true;
       this.getSubThrsysDetailData();
-      if(this.subData.parentCode!=null && this.subData.parentCode!=""){
+      if (this.subData.parentCode != null && this.subData.parentCode != "") {
         filterSubAll(this.query)
           .then((response) => {
             let invList = response.data || [];