From 422c2f537b943aca2891cad7b16572dbb91525f9 Mon Sep 17 00:00:00 2001
From: ldj_willow <ldj_willow@163.com>
Date: Sun, 9 Oct 2022 11:14:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/wms/pdm/ivt/cutpointivt/index.vue   |  16 +-
 .../wms/pdm/ivt/deliverypointivt/index.vue    |   2 -
 .../wms/pdm/order/rawfoilworkorder/index.vue  | 201 +++++++++---------
 3 files changed, 106 insertions(+), 113 deletions(-)

diff --git a/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue b/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue
index 461e3717b..4c8c569bb 100644
--- a/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue
+++ b/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue
@@ -56,20 +56,18 @@
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="point_code" label="点位编码" />
-        <el-table-column prop="full_point_code" label="满轴位编码" />
-        <el-table-column prop="full_point_status" label="满轴位状态" />
+        <el-table-column prop="full_point_code" label="满轴位" />
+        <el-table-column prop="is_used" label="是否启用" />
+        <el-table-column prop="full_point_status" label="满轴位状态" min-width="100" show-overflow-tooltip/>
         <el-table-column prop="container_name" label="母卷号" />
-        <el-table-column prop="full_vehicle_code" label="母卷轴编码" />
-        <el-table-column prop="empty_point_code" label="空轴位编码" />
-        <el-table-column prop="empty_point_status" label="空轴位状态" />
+        <el-table-column prop="full_vehicle_code" label="母卷轴编号" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="empty_point_code" label="空轴位" />
+        <el-table-column prop="empty_point_status" label="空轴位状态" min-width="100" show-overflow-tooltip/>
         <el-table-column prop="empty_vehicle_code" label="空轴编码" />
         <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="point_location" label="位置" />
-        <el-table-column prop="sort_seq" label="顺序号" />
-        <el-table-column prop="is_used" label="是否启用" />
         <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="create_name" label="创建人姓名" />
-        <el-table-column prop="update_time" label="修改时间" />
+        <el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip/>
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
diff --git a/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue b/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
index 48eb46032..2bd9547bb 100644
--- a/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
+++ b/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
@@ -37,10 +37,8 @@
         <el-table-column prop="point_code" label="点位编码" />
         <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="point_location" label="位置" />
-        <el-table-column prop="sort_seq" label="顺序号" />
         <el-table-column prop="is_used" label="是否启用" />
         <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="create_name" label="创建人姓名" />
         <el-table-column prop="update_time" label="修改时间" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
diff --git a/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue b/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
index 4b157ee64..e28c38b20 100644
--- a/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
+++ b/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
@@ -8,93 +8,77 @@
           :inline="true"
           class="demo-form-inline"
           label-position="right"
-          label-width="11 0px"
+          label-width="80px"
           label-suffix=":"
         >
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="生产区域">
-                <el-select
-                  v-model="query.product_area"
-                  clearable
-                  size="mini"
-                  placeholder="请选择"
-                  class="filter-item"
-                  style="width: 250px"
-                  @change="hand"
-                >
-                  <el-option
-                    v-for="item in dict.product_area"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
 
-            <el-col :span="8">
-              <el-form-item label="机台编码">
-                <el-input
-                  v-model="query.resource_name"
-                  clearable
-                  size="mini"
-                  placeholder="机台编码"
-                  style="width: 250px"
-                  @keyup.enter.native="crud.toQuery"
-                />
-              </el-form-item>
-            </el-col>
+          <el-form-item label="生产区域">
+            <el-select
+              v-model="query.product_area"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
 
-            <el-col :span="8">
-              <el-form-item label="母卷号">
-                <el-input
-                  v-model="query.container_name"
-                  clearable
-                  size="mini"
-                  placeholder="母卷号"
-                  style="width: 250px"
-                  @keyup.enter.native="crud.toQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
+          <el-form-item label="机台编码">
+            <el-input
+              v-model="query.resource_name"
+              clearable
+              size="mini"
+              placeholder="机台编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
 
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="日期">
-                <el-date-picker
-                  v-model="query.createTime"
-                  type="daterange"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  :default-time="['00:00:00', '23:59:59']"
-                  @change="crud.toQuery"
-                />
-              </el-form-item>
-            </el-col>
+          <el-form-item label="母卷号">
+            <el-input
+              v-model="query.container_name"
+              clearable
+              size="mini"
+              placeholder="母卷号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
 
-            <el-col :span="8">
-              <el-form-item label="状态">
-                <el-select
-                  v-model="query.status"
-                  clearable
-                  size="mini"
-                  placeholder="单据状态"
-                  class="filter-item"
-                  style="width: 250px"
-                  @change="hand"
-                >
-                  <el-option
-                    v-for="item in dict.product_status"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-              <rrOperation />
-            </el-col>
-          </el-row>
+          <el-form-item label="工单状态">
+            <el-select
+              v-model="query.status"
+              clearable
+              size="mini"
+              placeholder="工单状态"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.product_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="工单日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+
+          <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -112,31 +96,37 @@
         </el-button>
       </crudOperation>
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="500px"
+      >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
           <el-form-item label="母卷号" prop="container_name">
-            <el-input v-model="form.container_name" style="width: 370px;"/>
+            <el-input v-model="form.container_name" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="机台编码" prop="resource_name">
-            <el-input v-model="form.resource_name" style="width: 370px;"/>
+            <el-input v-model="form.resource_name" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="生产工单" prop="mfg_order_name">
-            <el-input v-model="form.mfg_order_name" style="width: 370px;"/>
+            <el-input v-model="form.mfg_order_name" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="产品编码" prop="product_name">
-            <el-input v-model="form.product_name" style="width: 370px;"/>
+            <el-input v-model="form.product_name" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="产品名称" prop="description">
-            <el-input v-model="form.description" style="width: 370px;"/>
+            <el-input v-model="form.description" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="重量">
-            <el-input v-model="form.productin_qty" style="width: 370px;"/>
+            <el-input v-model="form.productin_qty" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="车号">
-            <el-input v-model="form.agvno" style="width: 370px;"/>
+            <el-input v-model="form.agvno" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="备注">
-            <el-input v-model="form.remark" style="width: 370px;"/>
+            <el-input v-model="form.remark" style="width: 370px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -145,20 +135,27 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55"/>
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="workorder_id" label="工单标识" />
-        <el-table-column prop="status" label="状态" :formatter="formatStatusName" />
-        <el-table-column prop="mfg_order_name" label="工单号"/>
-        <el-table-column prop="container_name" label="母卷号"/>
-        <el-table-column prop="resource_name" label="机台编码"/>
-        <el-table-column prop="product_name" label="产品编码"/>
-        <el-table-column prop="theory_height" label="理论长度"/>
+        <el-table-column prop="mfg_order_name" label="工单号" />
+        <el-table-column prop="status" label="工单状态" :formatter="formatStatusName" />
+        <el-table-column prop="container_name" label="母卷号" />
+        <el-table-column prop="resource_name" label="机台编码" />
+        <el-table-column prop="product_name" label="产品编码" />
+        <el-table-column prop="theory_height" label="理论长度" />
         <el-table-column prop="realstart_time" label="开始时间" width="150px" />
         <el-table-column prop="realend_time" label="结束时间" width="150px" />
-        <el-table-column prop="productin_qty" label="重量"/>
-        <el-table-column prop="agvno" label="车号"/>
-        <el-table-column prop="product_area" label="生产区域"/>
+        <el-table-column prop="productin_qty" label="重量" />
+        <el-table-column prop="agvno" label="车号" />
+        <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="update_time" label="更新时间" width="150px" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
@@ -170,7 +167,7 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <pagination />
     </div>
   </div>
 </template>