From 9be4fb02c45846036758bb9806fed56b5b0241cf Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Sat, 10 Dec 2022 17:01:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/wms/sch/task/index.vue          | 44 ++++++++++---------
 .../wms/statistics/ioStorQuery/DivDialog.vue  | 11 +++--
 .../wms/statistics/ioStorQuery/TaskDialog.vue |  6 +--
 3 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
index a9665f423..309667e37 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -49,7 +49,7 @@
           </el-row>
 
           <el-row>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="任务类型">
                 <treeselect
                   v-model="query.task_type"
@@ -60,7 +60,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="16">
               <el-form-item label="创建时间">
                 <el-date-picker
                   v-model="query.createTime"
@@ -73,27 +73,29 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="10">
-              <el-form-item label="任务状态">
-                <el-select
-                  v-model="query.task_status"
-                  multiple
-                  style="width: 400px"
-                  placeholder="任务状态"
-                  class="filter-item"
-                  clearable
-                  @change="handTaskStatus"
-                >
-                  <el-option
-                    v-for="item in taskStatusList"
-                    :key="item.code"
-                    :label="item.name"
-                    :value="item.code"
-                  />
-                </el-select>
-              </el-form-item>
+            <el-col :span="9">
             </el-col>
           </el-row>
+          <el-row>
+            <el-form-item label="任务状态">
+              <el-select
+                v-model="query.task_status"
+                multiple
+                style="width: 400px"
+                placeholder="任务状态"
+                class="filter-item"
+                clearable
+                @change="handTaskStatus"
+              >
+                <el-option
+                  v-for="item in taskStatusList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-row>
           <rrOperation />
         </el-form>
 
diff --git a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue
index fa16e6f57..7f2542fef 100644
--- a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/DivDialog.vue
@@ -34,7 +34,6 @@
         @current-change="handleDtlCurrentChange"
       >
         <el-table-column prop="bill_status" label="状态" align="center" width="110px" :formatter="bill_statusFormat" />
-        <el-table-column show-overflow-tooltip width="50px" prop="seq_no" label="序号" align="center" />
         <el-table-column show-overflow-tooltip width="140px" prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column show-overflow-tooltip width="150px" prop="pcsn" label="子卷号" align="center" />
@@ -62,13 +61,13 @@
         :highlight-current-row="true"
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
       >
-        <el-table-column show-overflow-tooltip prop="seq_no" label="明细序号" align="center" />
+        <el-table-column show-overflow-tooltip prop="seq_no" width="70" label="序号" align="center" />
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="box_no" label="木箱号" align="center" />
-        <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" />
-        <el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次" align="center" />
-        <el-table-column show-overflow-tooltip prop="real_qty" label="出入库重量" :formatter="crud.formatNum3" align="center" />
+        <el-table-column show-overflow-tooltip prop="box_no" width="250" label="木箱号" align="center" />
+        <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" width="150" align="center" />
+        <el-table-column show-overflow-tooltip prop="sap_pcsn" width="120" label="sap批次" align="center" />
+        <el-table-column show-overflow-tooltip prop="real_qty" width="130" label="出入库重量" :formatter="crud.formatNum3" align="center" />
         <el-table-column show-overflow-tooltip prop="struct_code" label="仓位编码" align="center" />
         <el-table-column show-overflow-tooltip prop="struct_name" label="仓位名称" align="center" />
         <el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
diff --git a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/TaskDialog.vue b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/TaskDialog.vue
index 3a9dd9ce3..1ea609f9a 100644
--- a/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/TaskDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/TaskDialog.vue
@@ -36,12 +36,12 @@
         <el-table-column show-overflow-tooltip prop="bill_code" label="出库单号" align="center" />
         <el-table-column show-overflow-tooltip prop="seq_no" label="明细序号" align="center" />
         <el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
-        <el-table-column show-overflow-tooltip width="140px" prop="material_code" label="物料编码" align="center" />
-        <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column show-overflow-tooltip width="130px" prop="material_code" label="物料编码" align="center" />
+        <el-table-column show-overflow-tooltip prop="material_name" width="130" label="物料名称" align="center" />
         <el-table-column show-overflow-tooltip width="150px" prop="pcsn" label="子卷号" align="center" />
         <el-table-column show-overflow-tooltip width="120px" prop="sap_pcsn" label="sap批次" align="center" />
         <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
+        <el-table-column show-overflow-tooltip prop="qty_unit_name" width="90" label="单位" align="center" />
         <el-table-column show-overflow-tooltip prop="start_point_code" label="起始位置" align="center" :formatter="start_point_codeFormat" />
         <el-table-column show-overflow-tooltip prop="point_code" label="目的位置" align="center" :formatter="point_codeFormat" />
         <el-table-column prop="work_status" label="任务状态" align="center" width="110px" :formatter="work_statusFormat" />