现场 wms 字段显示修改

ruoyi-ui/src/views/stock/management/index.vue

@@ -25,14 +25,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="层" prop="theFloor">
-        <el-input
-          v-model="queryParams.theFloor"
-          placeholder="请输入层"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="排" prop="thePlatoon">
         <el-input
           v-model="queryParams.thePlatoon"
@@ -49,23 +41,25 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料编码" prop="productId">
+      <el-form-item label="层" prop="theFloor">
         <el-input
-          v-model="queryParams.productId"
-          placeholder="请输入物料编码"
+          v-model="queryParams.theFloor"
+          placeholder="请输入层"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="规格型号" prop="spec">
+      <el-form-item label="托盘号" prop="trayCode">
         <el-input
-          v-model="queryParams.spec"
-          placeholder="请输入规格型号"
+          v-model="queryParams.trayCode"
+          placeholder="请输入托盘号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="常用编码" prop="parentId">
+
+
+<!--      <el-form-item label="常用编码" prop="parentId">
         <el-input
           v-model="queryParams.parentId"
           placeholder="请输入常用编码"
@@ -88,16 +82,18 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="物料名称" prop="productName">
+      </el-form-item>-->
+<!--      <el-form-item label="物料编码" prop="productId">
         <el-input
-          v-model="queryParams.productName"
-          placeholder="请输入物料名称"
+          v-model="queryParams.productId"
+          placeholder="请输入物料编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="入库单号" prop="stockinId">
+      </el-form-item>-->
+
+
+<!--      <el-form-item label="入库单号" prop="stockinId">
         <el-input
           v-model="queryParams.stockinId"
           placeholder="请输入入库单号"
@@ -112,16 +108,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-
-      <el-form-item label="托盘号" prop="trayCode">
-        <el-input
-          v-model="queryParams.trayCode"
-          placeholder="请输入托盘号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="合同号" prop="orderId">
         <el-input
           v-model="queryParams.orderId"
@@ -130,71 +117,13 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="用途" prop="spare4">
-        <el-select v-model="queryParams.spare4" placeholder="请选择用途" clearable>
-          <el-option
-            v-for="dict in dict.type.purpose_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="起始时间" prop="inDateStart">
-        <el-date-picker clearable
-                        v-model="queryParams.inDateStart"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择起始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="截止日期" prop="inDateEnd">
-        <el-date-picker clearable
-                        v-model="queryParams.inDateEnd"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="请选择截止时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="周转类型" prop="voltage">
-        <el-select v-model="queryParams.voltage" placeholder="请选择周转类型" clearable>
-          <el-option
-            v-for="dict in dict.type.turnover_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="来源" prop="spare1">
-        <el-select v-model="queryParams.spare1" placeholder="请选择来源" clearable>
-          <el-option
-            v-for="dict in dict.type.origin_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="套账" prop="spare3">
-        <el-select v-model="queryParams.spare3" placeholder="请选择套账" clearable>
-          <el-option
-            v-for="dict in dict.type.account_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="形态类型" prop="productType">
-        <el-select v-model="queryParams.productType" placeholder="请选择形态类型" clearable>
-          <el-option
-            v-for="dict in dict.type.product_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+      <el-form-item label="产品号" prop="power">
+        <el-input
+          v-model="queryParams.power"
+          placeholder="请输入产品号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="台次" prop="spare5">
         <el-input
@@ -204,24 +133,23 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="件次" prop="power">
+      <el-form-item label="物料名称" prop="productName">
         <el-input
-          v-model="queryParams.power"
-          placeholder="请输入件次"
+          v-model="queryParams.productName"
+          placeholder="请输入物料名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="库外" prop="outside">
+      <el-form-item label="规格型号" prop="spec">
         <el-input
-          v-model="queryParams.outside"
-          placeholder="请输入库外"
+          v-model="queryParams.spec"
+          placeholder="请输入规格型号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
-
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button><!-- 搜索 -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button><!-- 重置 -->
@@ -266,46 +194,51 @@
 
     <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" align="center" />
+      <el-table-column label="仓库名称" align="center" prop="warehouseName"/>
       <el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
+
+<!--      <el-table-column label="套账" align="center" prop="spare3">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
+        </template>
+      </el-table-column>-->
+<!--      <el-table-column label="仓库编码" align="center" prop="warehouseId"/>-->
+      <el-table-column label="库位" align="center" prop="cargoSpaceId" width="160"/>
+      <el-table-column label="托盘" align="center" prop="trayCode"/>
+      <el-table-column label="合同号" align="center" prop="orderId"/>
+      <el-table-column label="产品号" align="center" prop="power"/>
+      <el-table-column label="代号" align="center" prop="distribution"/>
+      <el-table-column label="台次" align="center" prop="spare5"/>
+      <el-table-column label="物料编码" align="center" prop="productId"/>
+      <el-table-column label="物料名称" align="center" prop="productName" width="160" />
+      <el-table-column label="规格" align="center" prop="spec" width="160"/>
       <el-table-column label="库存状态" align="center" prop="stockStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="套账" align="center" prop="spare3">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="库位编码" align="center" prop="cargoSpaceId" width="160"/>
-      <el-table-column label="托盘" align="center" prop="trayCode"/>
-      <el-table-column label="产品编码" align="center" prop="productId"/>
-      <el-table-column label="产品名称" align="center" prop="productName" width="160" />
-      <el-table-column label="规格" align="center" prop="spec" width="160"/>
       <el-table-column label="数量" align="center" prop="quantity"/>
-      <el-table-column label="单价" align="center" prop="price"/>
-      <el-table-column label="金额" align="center" prop="spare6"/>
-      <el-table-column label="产品状态" align="center" prop="productType">
+<!--      <el-table-column label="单价" align="center" prop="price"/>-->
+<!--      <el-table-column label="金额" align="center" prop="spare6"/>-->
+<!--      <el-table-column label="产品状态" align="center" prop="productType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
         </template>
-      </el-table-column>
-      <el-table-column label="单位" align="center" prop="unit"/>
-      <el-table-column label="图号" align="center" prop="cargoNo"/>
-      <el-table-column label="合同号" align="center" prop="orderId"/>
-      <el-table-column label="台次" align="center" prop="spare5"/>
-      <el-table-column label="件次" align="center" prop="power"/>
-      <el-table-column label="质量" align="center" prop="spare8">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="常用编码" align="center" prop="parentId"/>
+      </el-table-column>-->
+<!--      <el-table-column label="单位" align="center" prop="unit"/>-->
+<!--      <el-table-column label="图号" align="center" prop="cargoNo"/>-->
+
+<!--      <el-table-column label="质量" align="center" prop="spare8">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="常用编码" align="center" prop="parentId"/>-->
+<!--      -->
+<!--      <el-table-column label="供应商编码" align="center" prop="supplierId" width="160"/>-->
+<!--      <el-table-column label="供应商名称" align="center" prop="supplierName" width="160"/>-->
+      <el-table-column label="重量" align="center" prop="netWeight" width="160"/>
       <el-table-column label="入库单号" align="center" prop="stockinId" width="160"/>
-      <el-table-column label="供应商编码" align="center" prop="supplierId" width="160"/>
-      <el-table-column label="供应商名称" align="center" prop="supplierName" width="160"/>
-      <el-table-column label="仓库编码" align="center" prop="warehouseId"/>
-      <el-table-column label="仓库名称" align="center" prop="warehouseName"/>
       <el-table-column label="首次入库时间" align="center" prop="inDate" width="160"/>
       <el-table-column label="最后出库时间" align="center" prop="stackingId" width="160"/>
       <el-table-column label="盘点标识" align="center" prop="spare7">
@@ -315,7 +248,7 @@
       </el-table-column>
       <el-table-column label="盘点时间" align="center" prop="backDate" width="160"/>
       <el-table-column label="备注" align="center" prop="remark"/>
-      <el-table-column label="来源" align="center" prop="spare4">
+<!--      <el-table-column label="来源" align="center" prop="spare4">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.origin_type" :value="scope.row.spare4"/>
         </template>
@@ -324,7 +257,7 @@
         <template slot-scope="scope">
           <dict-tag :options="dict.type.purpose_type" :value="scope.row.spare1"/>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
         <template slot-scope="scope">
           <el-button