# 修改字段

src/views/mes/pro/feedback/index.vue

@@ -299,8 +299,8 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="报工人" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请选择报工人" >
+            <el-form-item label="报工人" prop="userName">
+              <el-input v-model="form.userName" placeholder="请选择报工人" >
                 <el-button slot="append" @click="handleUserSelect" icon="el-icon-search"></el-button>
               </el-input>
             </el-form-item>

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

@@ -96,20 +96,21 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['tm:tmToolMachines:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="tmToolMachinesList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <!-- <el-table-column label="主键ID" align="center" prop="toolMachinesId" /> -->
-      <el-table-column label="编码" align="center" prop="toolMachinesCode" />
-      <el-table-column label="编排单号" align="center" prop="arrangeCode" />
-      <el-table-column label="工单工序" align="center" prop="processName" />
-      <el-table-column label="工作单元" align="center" prop="workunitName" />
-      <el-table-column label="生产工单" align="center" prop="workorderName" />
-      <el-table-column label="刀模版领用单号" align="center" prop="toolRequestUseCode" />
+      <el-table-column label="编码" align="center" prop="toolMachinesCode"/>
+      <el-table-column label="编排单号" align="center" prop="arrangeCode"/>
+      <el-table-column label="工单工序" align="center" prop="processName"/>
+      <el-table-column label="工作单元" align="center" prop="workunitName"/>
+      <el-table-column label="生产工单" align="center" prop="workorderName"/>
+      <el-table-column label="刀模版领用单号" align="center" prop="toolRequestUseCode"/>
       <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -129,7 +130,7 @@
         </template>
       </el-table-column> -->
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -142,22 +143,22 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="编码" prop="toolMachinesCode">
-          <el-input v-model="form.toolMachinesCode" placeholder="请输入编码" />
+          <el-input v-model="form.toolMachinesCode" placeholder="请输入编码"/>
         </el-form-item>
         <el-form-item label="编排单号" prop="arrangeCode">
-          <el-input v-model="form.arrangeCode" placeholder="请输入编排单号" />
+          <el-input v-model="form.arrangeCode" placeholder="请输入编排单号"/>
         </el-form-item>
-        <el-form-item label="工单工序id" prop="routeId">
-          <el-input v-model="form.routeId" placeholder="请输入工单工序id" />
+        <el-form-item label="工单工序号" prop="processCode">
+          <el-input v-model="form.processCode" placeholder="请输入工单工序号"/>
         </el-form-item>
-        <el-form-item label="工作单元id" prop="processId">
-          <el-input v-model="form.processId" placeholder="请输入工作单元id" />
+        <el-form-item label="工作单元编码" prop="workunitCode">
+          <el-input v-model="form.workunitCode" placeholder="请输入工作单元编码"/>
         </el-form-item>
-        <el-form-item label="生产工单id" prop="workorderId">
-          <el-input v-model="form.workorderId" placeholder="请输入生产工单id" />
+        <el-form-item label="生产工单号" prop="workorderCode">
+          <el-input v-model="form.workorderCode" placeholder="请输入生产工单号"/>
         </el-form-item>
-        <el-form-item label="刀模版领用单id" prop="toolRequestUseId">
-          <el-input v-model="form.toolRequestUseId" placeholder="请输入刀模版领用单id" />
+        <el-form-item label="刀模版领用单编码" prop="toolRequestUseCode">
+          <el-input v-model="form.toolRequestUseCode" placeholder="请输入刀模版领用单编码"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -169,7 +170,13 @@
 </template>
 
 <script>
-import { listTmToolMachines, getTmToolMachines, delTmToolMachines, addTmToolMachines, updateTmToolMachines } from "@/api/mes/tm/tmToolMachines";
+import {
+  listTmToolMachines,
+  getTmToolMachines,
+  delTmToolMachines,
+  addTmToolMachines,
+  updateTmToolMachines
+} from "@/api/mes/tm/tmToolMachines";
 
 export default {
   name: "TmToolMachines",
@@ -197,12 +204,17 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        toolMachinesCode: null,        arrangeCode: null,        workunitId: null,        processId: null,        workorderId: null,        toolRequestUseId: null,      },
+        toolMachinesCode: null,
+        arrangeCode: null,
+        workunitCode: null,
+        processCode: null,
+        workorderCode: null,
+        toolRequestUseCode: null,
+      },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {}
     };
   },
   created() {
@@ -226,7 +238,26 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        toolMachinesId: null,        toolMachinesCode: null,        arrangeCode: null,        workunitId: null,        processId: null,        workorderId: null,        toolRequestUseId: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
+        toolMachinesId: null,
+        toolMachinesCode: null,
+        arrangeCode: null,
+        workunitId: null,
+        workunitCode: null,
+
+        processId: null,
+        processCode: null,
+
+        workorderId: null,
+        workorderCode: null,
+
+        toolRequestUseId: null,
+        toolRequestUseCode: null,
+
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -242,7 +273,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.toolMachinesId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -284,12 +315,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const toolMachinesIds = row.toolMachinesId || this.ids;
-      this.$modal.confirm('是否确认删除刀模版上下机编号为"' + toolMachinesIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除刀模版上下机编号为"' + toolMachinesIds + '"的数据项？').then(function () {
         return delTmToolMachines(toolMachinesIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {

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

@@ -23,10 +23,10 @@
               <el-option label="否" value="1" />
             </el-select>
           </el-form-item>
-          <el-form-item label="工作单元id" prop="workunitId">
+          <el-form-item label="工作单元编码" prop="workunitCode">
             <el-input
-              v-model="queryParams.workunitId"
-              placeholder="请输入工作单元id"
+              v-model="queryParams.workunitCode"
+              placeholder="请输入工作单元编码"
               style="width:220px;"
               clearable
               @keyup.enter.native="handleQuery"
@@ -130,7 +130,7 @@
       <el-table-column label="领用单编码" min-width="150" align="center" prop="toolRequestUseCode" />
       <el-table-column label="工序任务编码" width="120" align="center" prop="taskCode" />
       <el-table-column label="工作单元名称" min-width="100" align="center" prop="workunitName" />
-      <el-table-column label="工作单元id" min-width="100" align="center" prop="workunitId" />
+      <el-table-column label="工作单元编码" min-width="100" align="center" prop="workunitCode" />
 
       <!-- <el-table-column label="操作" align="center" width="100" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">