Merge branch 'qingban' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

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

@@ -115,21 +115,8 @@ const switchOp = [
 ];
 option.value = Object.assign(option.value, {
   selection: true,
+  labelWidth: 120,
   column: [
-    // {
-    //   label: "工序OP号",
-    //   prop: "operationOp",
-    //   search: true,
-    //   span: 12,
-    //   dispaly: false,
-    //   rules: [
-    //     {
-    //       required: true,
-    //       message: "工序OP号不能为空",
-    //       trigger: "blur",
-    //     },
-    //   ],
-    // },
     {
       label: "工序名称",
       prop: "operationName",
@@ -227,19 +214,19 @@ option.value = Object.assign(option.value, {
       ],
     },
     {
-      label: "人工工时",
-      prop: "preparationTime",
+      label: "前置时间(分)",
+      prop: "forceTime",
       type: "number",
       span: 12,
       rules: [
         {
           required: true,
-          message: "人工工时不能为空",
+          message: "前置时间不能为空",
           trigger: "blur",
         },
       ],
     },
-    {
+    /*{
       label: "标准机时",
       prop: "timeingNum",
       type: "number",
@@ -251,9 +238,9 @@ option.value = Object.assign(option.value, {
           trigger: "blur",
         },
       ],
-    },
+    },*/
     {
-      label: "标准工时",
+      label: "标准工时(分)",
       prop: "standardWorktime",
       type: "number",
       span: 12,
@@ -355,6 +342,15 @@ option.value = Object.assign(option.value, {
       dicData: switchOp,
       value: 0,
     },
+    {
+      label: "批量报工",
+      prop: "batchReport",
+      span: 8,
+      hide: true,
+      type: "switch",
+      dicData: switchOp,
+      value: 0,
+    },
     //  {
     //    label: "是否工艺数量",
     //    prop: "common",
@@ -438,7 +434,7 @@ option.value = Object.assign(option.value, {
       value: 0,
       // slot:true, // 自定义列
     },
-    {
+    /*{
       label: "前置时间",
       prop: "forceTime",
       hide: true,
@@ -452,7 +448,7 @@ option.value = Object.assign(option.value, {
         },
       ],
       // slot:true, // 自定义列
-    },
+    },*/
     {
       label: "工序描述",
       prop: "operationDesc",

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

@@ -89,7 +89,7 @@ export const formOption = {
         },
       ],
     },
-    {
+   /* {
       label: "标准机时",
       prop: "timeingNum",
       span: 24,
@@ -102,7 +102,7 @@ export const formOption = {
       //     trigger: "blur",
       //   },
       // ],
-    },
+    },*/
     {
       label: "前置时间",
       prop: "forceTime",
@@ -120,7 +120,7 @@ export const formOption = {
     },
     {
       label: "是否外协",
-      prop: "externalCooperation",
+      prop: "outsourcing",
       span: 24,
       type: "switch",
       dicData: switchOp,
@@ -151,6 +151,14 @@ export const formOption = {
       value: 0,
     },
     {
+      label: "批量报工",
+      prop: "batchReport",
+      span: 24,
+      type: "switch",
+      dicData: switchOp,
+      value: 0,
+    },
+    {
       label: "是否可跳过",
       prop: "skipped",
       span: 24,

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

@@ -180,6 +180,7 @@ provide("currentProcess", currentProcess);
 const nodeClick = (event) => {
   if (!editStatus.value) return;
   currentProcess.value = event.node;
+  console.log("------------" + JSON.stringify(event.node))
 };
 onConnect(addEdges);
 const getPng = () => {

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

@@ -128,6 +128,7 @@ const getTemplate = async () => {
   const { data } = await getForm({
     pageNo: 1,
     pageSize: 9999999,
+    formType: 0
   });
   options.value = [];
   data.records.forEach((element) => {

src/views/pro/baseoperation/index.vue

@@ -135,16 +135,16 @@
                     prop: "operationType",
                     search: true,
                 },
-                {
+              /*  {
                     label: "机时",
                     prop: "timeingNum",
                     search: false,
-                },
-                {
+                },*/
+               /* {
                     label: "是否外协",
                     prop: "externalCooperation",
                     search: false,
-                },
+                },*/
                 {
                     label: "加工要求",
                     prop: "processAsk",
@@ -161,6 +161,11 @@
                     search: false,
                 },
                 {
+                  label: "批量报工",
+                  prop: "batchReport",
+                  search: false,
+                },
+                {
                     label: "是否巡检",
                     prop: "inspection",
                     search: false,
@@ -185,7 +190,7 @@
                     prop: "skipped",
                     search: false,
                 },
-                {
+               /* {
                     label: "坐标X",
                     prop: "x",
                     search: false,
@@ -194,7 +199,7 @@
                     label: "坐标Y",
                     prop: "y",
                     search: false,
-                },
+                },*/
                 {
                     label: "删除标识",
                     prop: "deleted",
@@ -241,4 +246,4 @@
     onMounted(() => {
         dataList();
     });
-</script>
+</script>