From 0aed942a81f153cb5bafc319bcabdeb4a1fa8ef9 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 17 Jun 2024 11:18:08 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=90=8C=E6=AD=A5=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E5=B7=A5=E8=B5=84=E7=B3=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/base/baseStaffInfo/index.vue   |   6 +-
 src/views/mes/prod/prodOrderDetail/index.vue | 104 +++++++++----------
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/views/mes/base/baseStaffInfo/index.vue b/src/views/mes/base/baseStaffInfo/index.vue
index 969077d..47dc683 100644
--- a/src/views/mes/base/baseStaffInfo/index.vue
+++ b/src/views/mes/base/baseStaffInfo/index.vue
@@ -174,9 +174,9 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-<!--        <el-form-item label="卡号" prop="cardId">-->
-<!--          <el-input v-model="form.cardId" placeholder="请输入卡号"/>-->
-<!--        </el-form-item>-->
+        <el-form-item label="卡号" prop="cardId">
+          <el-input v-model="form.cardId" placeholder="请输入卡号"/>
+        </el-form-item>
         <el-form-item label="岗位" prop="postCode">
           <el-select v-model="form.postCode" placeholder="请选择岗位" clearable>
             <el-option
diff --git a/src/views/mes/prod/prodOrderDetail/index.vue b/src/views/mes/prod/prodOrderDetail/index.vue
index f16e1c7..d31ac30 100644
--- a/src/views/mes/prod/prodOrderDetail/index.vue
+++ b/src/views/mes/prod/prodOrderDetail/index.vue
@@ -9,6 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="客户信息" prop="CustomerInfo">
+        <el-input
+          v-model="queryParams.CustomerInfo"
+          placeholder="请输入客户信息"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="下单日期">
         <el-date-picker
           v-model="daterangeOrderDate"
@@ -36,22 +44,14 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="客户信息" prop="CustomerInfo">
-        <el-input
-          v-model="queryParams.CustomerInfo"
-          placeholder="请输入客户信息"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="输送带长度规格" prop="BeltLengthSpecifications">
-        <el-input
-          v-model="queryParams.BeltLengthSpecifications"
-          placeholder="请输入输送带长度规格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="输送带长度规格" prop="BeltLengthSpecifications">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.BeltLengthSpecifications"-->
+<!--          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>
@@ -59,17 +59,17 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['mes/prod:prodOrderDetail:add']"
-        >新增
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['mes/prod:prodOrderDetail:add']"-->
+<!--        >新增-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -111,7 +111,7 @@
     <el-table v-loading="loading" :data="prodOrderDetailList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label=" 主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
-      <el-table-column label="任务编号" align="center" prop="SeqNo" v-if="columns[1].visible"/>
+      <el-table-column label="任务编号" align="center" prop="SeqNo" v-if="columns[1].visible" width="130"/>
       <el-table-column label="下单日期" align="center" prop="OrderDate" width="180" v-if="columns[2].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.OrderDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -119,12 +119,12 @@
       </el-table-column>
       <el-table-column label="交货日期" align="center" prop="DeliveryDate" v-if="columns[3].visible"/>
       <el-table-column label="产品类型" align="center" prop="ProductType" v-if="columns[4].visible"/>
-      <el-table-column label="产品状态" align="center" prop="ProductStatus" v-if="columns[5].visible"/>
+      <el-table-column label="产品状态" align="center" prop="ProductStatus" v-if="columns[5].visible" width="100"/>
       <el-table-column label="订单所属" align="center" prop="OrderOwner" v-if="columns[6].visible"/>
       <el-table-column label="客户信息" align="center" prop="CustomerInfo" v-if="columns[7].visible"/>
-      <el-table-column label="输送带长度规格" align="center" prop="BeltLengthSpecifications" v-if="columns[8].visible"/>
-      <el-table-column label="面积与重量" align="center" prop="AreaAndWeight" v-if="columns[9].visible"/>
-      <el-table-column label="使用原材料" align="center" prop="UsingRawMaterials" v-if="columns[10].visible"/>
+      <el-table-column label="输送带长度规格" align="center" prop="BeltLengthSpecifications" v-if="columns[8].visible" width="230"/>
+      <el-table-column label="面积与重量" align="center" prop="AreaAndWeight" v-if="columns[9].visible" width="200"/>
+      <el-table-column label="使用原材料" align="center" prop="UsingRawMaterials" v-if="columns[10].visible" width="230"/>
       <el-table-column label="输送带宽度" align="center" prop="BeltWidth" v-if="columns[11].visible"/>
       <el-table-column label="输送带布层" align="center" prop="BeltClothLayer" v-if="columns[12].visible"/>
       <el-table-column label="客户要求输送带长度" align="center" prop="BeltRequiredLength" v-if="columns[13].visible" width="100"/>
@@ -195,26 +195,26 @@
           <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes/prod:prodOrderDetail:edit']"
-          >修改
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['mes/prod:prodOrderDetail:remove']"
-          >删除
-          </el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['mes/prod:prodOrderDetail:edit']"-->
+<!--          >修改-->
+<!--          </el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['mes/prod:prodOrderDetail:remove']"-->
+<!--          >删除-->
+<!--          </el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination