公司测试环境代码

src/api/mes/pro/protask.js

@@ -113,4 +113,13 @@ export function deleteTask(taskId) {
     url: "/mes/pro/protask/deleteTask/" + taskId,
     method: "delete",
   });
-}
+}
\ No newline at end of file
+
+// 取消排程
+export function cancelTask(data) {
+  return request({
+    url: "/mes/pro/protask/cancelSchedule",
+    method: "post",
+    data: data,
+  });
+}

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

@@ -181,6 +181,14 @@
           @click="handleDeleteTask"
         >工序删除</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="handleCancelTask"
+        >取消排程</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -622,7 +630,7 @@ import {
   getworkstationList,
   gettaskWorkunitList,
   getdefaultWorkCenterList} from '@/api/mes/pro/scheduleList'
-import {putProtaskSplit, splitWorkstation, deleteTask} from '@/api/mes/pro/protask'
+import {putProtaskSplit, splitWorkstation, deleteTask, cancelTask} from '@/api/mes/pro/protask'
 import BrandSelect from "@/components/TmTool/index.vue";
 import shiftSelectMixin from '@/utils/shiftSelectMixin'
 import OrderList from './orderList.vue'
@@ -795,6 +803,22 @@ export default {
           });
         })
     },
+    handleCancelTask(){
+      this.$modal
+        .confirm('是否取消排程')
+        .then( ()=> {
+          let formData = this.selectedRows.map(item => {
+            return {
+              // workorderId: item.workorderId,
+              arrangeCode: item.arrangeCode
+            }
+          });
+          cancelTask(formData).then(response => {
+            this.$modal.msgSuccess("取消成功");
+            this.getList();
+          });
+        })
+    },
     async handleChangeWorkshopId() {
       // this.workstationList = []
       this.queryWorkunitParams.workstationId = null

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

@@ -68,8 +68,11 @@
             placeholder="请选择排产完成时间">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="设备评分" prop="evaluateResult">
+          <span v-html="form.evaluateResult"></span>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <span v-html="form.remark"></span>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/mes/pro/workorder/indexApply.vue

@@ -90,11 +90,11 @@
           v-hasPermi="['mes:pro:workorder:add']">新增
         </el-button>
       </el-col> -->
-      <!-- <el-col :span="1.5">
+      <!-- --><el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
           v-hasPermi="['mes:pro:workorder:edit']">修改
         </el-button>
-      </el-col> -->
+      </el-col>
 
       <!-- <el-col :span="1.5">
         <el-button