update:修改刀模板上下机接口

src/api/mes/tm/toolmachinesrecord.js

@@ -3,7 +3,7 @@ import request from "@/utils/request";
 // 查询刀模板上下机记录列表
 export function listRecord(query) {
   return request({
-    url: "/tm/tmToolMachinesRecord/list",
+    url: "/tm/tmToolMachines/list",
     method: "get",
     params: query,
   });

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

@@ -181,7 +181,7 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改刀模板申请单对话框 -->
+    <!-- 添加或修改刀模版申请单对话框 -->
     <el-dialog v-if="open" :destroy-on-close="true" :title="title" :visible.sync="open" width="960px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
@@ -191,8 +191,8 @@
             </el-form-item>
           </el-col>
           <el-col v-if="optType === 'add'" :span="12">
-            <el-form-item label="任务单" prop="taskId">
-              <el-input v-model="form.taskId"  placeholder="请选择任务单"
+            <el-form-item label="任务排产单" prop="taskId">
+              <el-input v-model="form.taskId"  placeholder="请选择任务排产单"
                             disabled>
                 <el-button
                  v-if="optType === 'add'"
@@ -257,7 +257,7 @@
           <el-input v-model="form.arrangeCode" placeholder="请输入编排单号" />
         </el-form-item> -->
       </el-form>
-      <el-divider content-position="center">刀模板申请详细</el-divider>
+      <el-divider content-position="center">刀模版申请详细</el-divider>
       <el-card shadow="always" class="box-card">
         <itemline ref="line" :quantity="form.requestNum" :toolRequestId="form.toolRequestId" :taskId="form.taskId" :optType="optType" @sum="handleSumNum"></itemline>
       </el-card>
@@ -328,7 +328,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 刀模板申请单表格数据
+      // 刀模版申请单表格数据
       tmToolRequestList: [],
       // 弹出层标题
       title: "",
@@ -386,7 +386,7 @@ export default {
         pdf_path: 'http://192.168.23.19:8081/static/123.pdf',
       });
     },
-    /** 查询刀模板申请单列表 */
+    /** 查询刀模版申请单列表 */
     getList() {
       this.loading = true;
       listTmToolRequest(this.queryParams).then(response => {
@@ -465,7 +465,7 @@ export default {
     handleAdd() {
       this.reset()
       this.gCode()
-      this.title = '添加刀模板申请单'
+      this.title = '添加刀模版申请单'
       this.open = true;
       this.optType = "add"
     },
@@ -498,7 +498,7 @@ export default {
       getTmToolRequest(toolRequestId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改刀模板申请单";
+        this.title = "修改刀模版申请单";
       });
     },
     /** 提交按钮 */
@@ -532,7 +532,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const toolRequestIds = row.toolRequestId || this.ids;
-      this.$modal.confirm('是否确认删除刀模板申请单编号为"' + toolRequestIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除刀模版申请单编号为"' + toolRequestIds + '"的数据项？').then(function() {
         return delTmToolRequest(toolRequestIds);
       }).then(() => {
         this.getList();

src/views/mes/tm/toolrequest/selectTask.vue

@@ -74,33 +74,23 @@
           > -->
           <!-- 可以手动的修改label的值，从而控制选择哪一项 -->
           <el-radio class="radio" v-model="selectedItemId" :label="scope.row.taskId"
-            >&nbsp;</el-radio
+            >{{ "" }}</el-radio
           >
         </template>
       </el-table-column>
       <el-table-column
-        label="任务单编码"
-        width="120"
-        align="center"
-        key="taskCode"
-        prop="taskCode"
-      >
-      </el-table-column>
-      <el-table-column
-        label="工序名称"
-        min-width="120"
+        label="排产任务id"
+        width="100"
         align="center"
-        key="processName"
-        prop="processName"
-        :show-overflow-tooltip="true"
+        key="taskWorkunitId"
+        prop="taskWorkunitId"
       />
       <el-table-column
-        label="产品名称"
+        label="排产数量"
+        min-width="100"
         align="center"
-        key="itemName"
-        min-width="150"
-        prop="itemName"
-        :show-overflow-tooltip="true"
+        key="quantity"
+        prop="quantity"
       />
       <el-table-column
         label="单位"
@@ -118,7 +108,6 @@
         prop="quantity"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="工作单元编码" align="center" prop="workunitId" />
       <el-table-column
         label="开始生产时间"
         align="center"
@@ -132,7 +121,30 @@
           }}</span>
         </template>
       </el-table-column>
-
+      <el-table-column
+        label="结束生产时间"
+        align="center"
+        prop="endTime"
+        width="180"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.endTime, "{y}-{m}-{d}:{h}-{m}-{s}")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" width="100" label="状态" align="center" prop="statusName" />
+      <el-table-column :show-overflow-tooltip="true" min-width="180" label="工序任务编码" align="center" prop="taskCode" />
+      <el-table-column :show-overflow-tooltip="true" min-width="300" label="工序任务名称" align="center" prop="taskName" />
+      <el-table-column :show-overflow-tooltip="true" width="100" label="工作单元名称" align="center" prop="workunitName" />
+      <el-table-column :show-overflow-tooltip="true" width="100" label="工作单元编码" align="center" prop="workunitCode" />
+      <el-table-column :show-overflow-tooltip="true" width="100" label="工站编码" align="center" prop="workstationCode" />
+      <el-table-column :show-overflow-tooltip="true" width="100" label="工站名称" align="center" prop="workstationName" />
+      <el-table-column :show-overflow-tooltip="true" width="100" label="工艺名称" align="center" prop="routeName" />
+      <el-table-column :show-overflow-tooltip="true" width="100" label="工艺编码" align="center" prop="routeCode" />
+      <el-table-column :show-overflow-tooltip="true" min-width="150" label="工序编码" align="center" prop="processCode" />
+      <el-table-column :show-overflow-tooltip="true" width="100" label="工序名称" align="center" prop="processName" />
     </el-table>
 
     <pagination