update:修改刀模板上下机记录

src/components/toolRequest/single.vue

@@ -68,7 +68,7 @@
           </el-table-column>
           <el-table-column
             label="申请单编码"
-            width="120"
+            min-width="130"
             align="center"
             key="toolRequestCode"
             prop="toolRequestCode"

src/views/mes/tm/toolmachinesrecord/index.vue

@@ -16,8 +16,8 @@
           <el-option label="待上机" value="3" />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否入库" prop="inWareHouseStr">
-        <el-select v-model="queryParams.inWareHouseStr" placeholder="请选择是否入库" clearable>
+      <el-form-item label="是否入库" prop="warehouseStr">
+        <el-select v-model="queryParams.warehouseStr" placeholder="请选择是否入库" clearable>
           <el-option label="是" value="1" />
           <el-option label="否" value="0" />
         </el-select>
@@ -92,29 +92,28 @@
 
     <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="申请单编码" width="120" align="center" prop="toolRequestCode" />
-      <el-table-column label="上下机编码" width="120" align="center" prop="toolMachinesCode" />
-      <el-table-column label="上下机记录编码" width="150" align="center" prop="toolMachinesRecordCode" />
+      <el-table-column label="申请单编码" min-width="130" align="center" prop="toolRequestCode" />
+      <el-table-column label="上下机编码" min-width="150" align="center" prop="toolMachinesCode" />
+      <el-table-column label="上下机记录编码" min-width="150" align="center" prop="toolMachinesRecordCode" />
       <el-table-column label="上下机记录id" width="120" align="center" prop="toolMachinesRecordId" />
       <el-table-column label="工序任务id" width="120" align="center" prop="taskId" />
       <el-table-column label="上机时间" width="120" align="center" prop="upDate" />
       <el-table-column label="创建人" width="100" align="center" prop="createBy" />
       <el-table-column label="更新人" width="100" align="center" prop="updateBy" />
-      <el-table-column label="创建时间" width="120" align="center" prop="createTime" />
-      <el-table-column label="更新时间" width="120" align="center" prop="updateTime" />
+      <el-table-column label="创建时间" min-width="170" align="center" prop="createTime" />
+      <el-table-column label="更新时间" min-width="170" align="center" prop="updateTime" />
       <el-table-column label="物料名称" width="150" align="center" prop="itemName" />
       <el-table-column label="物料编码" width="150" align="center" prop="itemCode" />
       <el-table-column label="工装夹具台账编码" width="180" align="center" prop="toolCode" />
       <el-table-column label="工装夹具台账名称" width="180" align="center" prop="toolName" />
-      <el-table-column label="上机状态" width="120" align="center" prop="type" />
       <el-table-column label="上机状态" align="center" prop="inWareHouse" width="120">
         <template slot-scope="scope">
           <span>{{ getTypes(scope.row.type) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否入库" align="center" prop="inWareHouse" width="180">
+      <el-table-column label="是否入库" align="center" prop="warehouse" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.inWareHouse == '1'? '是': '否' }}</span>
+          <span>{{ scope.row.warehouse == '1'? '是': '否' }}</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -215,7 +214,7 @@ export default {
         pageSize: 10,
         type: null,
         typeStr: null,
-        inWareHouseStr: null,
+        warehouseStr: null,
         toolRequestUseItemId: null,
         upDate: null,
         downDate: null,
@@ -233,11 +232,11 @@ export default {
   methods: {
     getTypes(type) {
       switch (type) {
-        case '1':
+        case 1:
           return '上机'
-        case '2':
+        case 2:
           return '下机'
-        case '3':
+        case 3:
           return '待上机'
         default:
           return '--'
@@ -258,7 +257,9 @@ export default {
     /** 查询刀模板上下机记录列表 */
     getList() {
       this.loading = true;
-      listRecord(this.queryParams).then(response => {
+      const params = Object.assign({}, this.queryParams)
+      delete params.type
+      listRecord(params).then(response => {
         this.recordList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/mes/tm/toolrequestuse/index.vue

@@ -190,6 +190,7 @@
             <el-form-item label="领用单编码" prop="toolRequestUseCode">
               <el-input
                 readonly
+                style="width: 220px;"
                 v-model="form.toolRequestUseCode"
                 placeholder="请输入领用单编码"
               />
@@ -197,7 +198,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="申请单" prop="toolRequestId">
-              <el-input v-model="form.toolRequestCode" readonly>
+              <el-input style="width: 220px;" v-model="form.toolRequestCode" readonly>
                 <el-button
                   slot="append"
                   icon="el-icon-search"
@@ -214,6 +215,7 @@
           <el-col :span="8">
             <el-form-item label="工序" prop="processId">
               <el-input
+                style="width: 220px;"
                 v-model="form.processName"
                 placeholder="请输入工序"
                 disabled
@@ -226,6 +228,7 @@
           <el-col :span="8">
             <el-form-item label="作业单元" prop="workunitId">
               <el-input
+                style="width: 220px;"
                 v-model="form.workunitName"
                 placeholder="作业单元"
                 disabled
@@ -279,6 +282,7 @@
             <el-form-item label="申请数量" prop="requestNum">
               <el-input
                 disabled
+                style="width: 220px;"
                 v-model="form.requestNum"
                 placeholder="请输入申请数量"
               />
@@ -289,6 +293,7 @@
             <el-form-item label="编排单号" prop="arrangeCode">
               <el-input
                 disabled
+                style="width: 220px;"
                 v-model="form.arrangeCode"
                 placeholder="编排单号"
               />
@@ -541,6 +546,7 @@ export default {
         this.form.processName = row.processName;
         this.form.workunitName = row.workunitName;
         this.form.requestDate = row.requestDate;
+        this.form.arrangeCode = row.arrangeCode;
         this.form.startTime = row.startTime;
         this.form.endTime = row.endTime;
         this.form.requestNum = row.requestNum;