Merge branch 'qingban' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

src/views/base/craftManagement/route/bindConfig.ts

@@ -76,6 +76,18 @@ export const formOption = {
       ],
     },
     {
+      label: "工序分组",
+      prop: "groupStr",
+      span: 24,
+      rules: [
+        {
+          required: true,
+          message: "请输入工序分组",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
       label: "标准工时",
       prop: "standardWorktime",
       span: 24,
@@ -89,7 +101,7 @@ export const formOption = {
         },
       ],
     },
-   /* {
+    /* {
       label: "标准机时",
       prop: "timeingNum",
       span: 24,

src/views/base/craftManagement/route/components/configs.ts

@@ -367,8 +367,8 @@ export const comTypes: comType[] = [
     compentName: "测试数据",
     compentType: "ceshishuju",
   },
-  {
-    compentName: "数据采集",
-    compentType: "screwdriver",
-  },
+  // {
+  //   compentName: "数据采集",
+  //   compentType: "screwdriver",
+  // },
 ];

src/views/base/craftManagement/route/index.vue

@@ -48,12 +48,12 @@
           >编辑</el-button
         >
         <el-button
-            link
-            type="danger"
-            icon="el-icon-edit"
-            v-if="row.usable === 0"
-            @click="deleteRow(row, index)"
-        >删除</el-button
+          link
+          type="danger"
+          icon="el-icon-edit"
+          v-if="row.usable === 0"
+          @click="deleteRow(row, index)"
+          >删除</el-button
         >
         <el-button
           link
@@ -120,7 +120,6 @@ import { copyRoute } from "@/api/craft/route/index";
 // 数据字典相关
 const { dicts } = useDictionaryStore();
 
-
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -231,7 +230,7 @@ const bindProcess = (row) => {
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
   selection: true,
-  labelWidth: 110,
+  labelWidth: 130,
   menuWidth: 250,
   delBtn: false,
   searchLabelWidth: 110,
@@ -287,6 +286,7 @@ option.value = Object.assign(option.value, {
         value: "dictValue",
       },
     },
+
     {
       label: "通用工艺id",
       prop: "commonRouteId",
@@ -315,6 +315,21 @@ option.value = Object.assign(option.value, {
       overHidden: true,
     },
     {
+      label: "执行文件和标准",
+      prop: "executeFileStd",
+      width: 180,
+      addDisplay: true,
+      editDisabled: true,
+      overHidden: true,
+      rules: [
+        {
+          required: true,
+          message: "执行文件和标准不能为空",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
       label: "产品名称",
       prop: "prodtName",
       overHidden: true,

src/views/base/craftManagement/routeCommon/index.vue

@@ -196,7 +196,7 @@ const bindProcess = (row) => {
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
   selection: true,
-  labelWidth: 110,
+  labelWidth: 130,
   searchLabelWidth: 110,
   column: [
     {
@@ -249,6 +249,21 @@ option.value = Object.assign(option.value, {
         value: "dictValue",
       },
     },
+    {
+      label: "执行文件和标准",
+      prop: "executeFileStd",
+      width: 180,
+      addDisplay: true,
+      editDisabled: true,
+      overHidden: true,
+      rules: [
+        {
+          required: true,
+          message: "执行文件和标准不能为空",
+          trigger: "blur",
+        },
+      ],
+    },
     // 在产品那边绑定了工艺路线才是已绑定
     {
       label: "启用状态",

src/views/plan/workOrder/components/work-order-seq.vue

@@ -228,7 +228,7 @@ option.value = Object.assign(option.value, {
   menu: false,
   column: [
     {
-      label: "流转卡号",
+      label: "产品管号",
       prop: "seqNo",
       width: 220,
       search: true,
@@ -236,7 +236,7 @@ option.value = Object.assign(option.value, {
       rules: [
         {
           required: true,
-          message: "流转卡号不能为空",
+          message: "产品管号不能为空",
           trigger: "trigger",
         },
       ],

src/views/plan/workOrder/index.vue

@@ -100,7 +100,7 @@
           @click="showSeqPage(row)"
           type="primary"
           :size="size"
-          >流转卡号</el-button
+          >产品管号</el-button
         >
         <el-button
           icon="el-icon-delete"
@@ -381,7 +381,7 @@ const dialog3 = reactive({
   visible: false,
 });
 const dialog4 = reactive({
-  title: "流转卡号",
+  title: "产品管号",
   visible: false,
 });
 const dialog5 = reactive({