取消组合和吹膜厚度

src/api/mes/pro/workorder.js

@@ -87,6 +87,14 @@ export function delWorkorder(workorderId) {
   })
 }
 
+// 生产工单取消组合
+export function delComWorkorder(workorderId) {
+  return request({
+    url: '/pro/combination/workorder/' + workorderId,
+    method: 'delete'
+  })
+}
+
 // 查询物料依赖列表
 export function listItems(query) {
   return request({

src/views/mes/pro/productionSolution/components/ProogingSpecificationSheet.vue

@@ -505,21 +505,10 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :lg="6" :md="8" :sm="12" :xs="12"
-          ><el-form-item label="吹膜厚度" prop="blownFilmThickness"
-            ><el-input
-              v-model="form.blownFilmThickness"
-              placeholder
-              type="number"
-              :precision="2"
-            >
-            </el-input>
-          </el-form-item>
-        </el-col>
         <el-col :lg="6" :md="8" :sm="12" :xs="12">
-          <el-form-item label="印刷宽度" prop="printingWidth">
+          <el-form-item label="印张宽度" prop="printPaperwidth">
             <el-input
-              v-model="form.printingWidth"
+              v-model="form.printPaperwidth"
               placeholder
               type="number"
               :precision="2"
@@ -701,7 +690,7 @@ export default {
         backImg: "",
         blownFilmWidth: "",
         blownFilmThickness: "",
-        printingWidth: "",
+        printPaperwidth: "",
         inlay: "",
         customerConfirmedBy: "",
         customerConfirmedDate: "",
@@ -780,7 +769,7 @@ export default {
         backImg: "",
         blownFilmWidth: "",
         blownFilmThickness: "",
-        printingWidth: "",
+        printPaperwidth: "",
         inlay: "",
         customerConfirmedBy: "",
         customerConfirmedDate: "",

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

@@ -578,6 +578,7 @@ import {
   dofinish,
   printInfo,
   doCheckToolNum,
+  delComWorkorder,
   closeWorkorder
 } from "@/api/mes/pro/workorder";
 import { addProtaskList } from "@/api/mes/pro/protask";
@@ -591,7 +592,7 @@ import { genCode } from "@/api/system/autocode/rule";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getToken } from "@/utils/auth";
-import { addCombination, batchAddCombination, delCombination } from "@/api/mes/pro/combination";
+import { addCombination, batchAddCombination } from "@/api/mes/pro/combination";
 import CombinationInfos from "@/views/mes/pro/combination/infos.vue";
 import { batchAddArrange, delArrange } from "@/api/mes/pro/arrange";
 import ArrangeInfo from "@/views/mes/pro/arrange/info.vue";
@@ -885,7 +886,7 @@ export default {
       if(type === 'del') {
         if(this.ids.length === 0) return this.$message.warning('请勾选要取消组合的工单')
         this.$modal.confirm('确认取消组合？').then(() => {
-          return delCombination(this.ids)//执行报工
+          return delComWorkorder(this.ids)//执行报工
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("取消成功");