去掉工序多余选项

.run/docker_Dockerfile_xf.run.xml

@@ -2,13 +2,13 @@
   <configuration default="false" name="docker/Dockerfile_xf" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="admin-temp-xf:latest" />
-        <option name="containerName" value="admin-temp-xf" />
+        <option name="imageTag" value="mes-admin-xf:latest" />
+        <option name="containerName" value="mes-admin-xf" />
         <option name="portBindings">
           <list>
             <DockerPortBindingImpl>
               <option name="containerPort" value="80" />
-              <option name="hostPort" value="10020" />
+              <option name="hostPort" value="10000" />
             </DockerPortBindingImpl>
           </list>
         </option>

docker/Dockerfile_xf

@@ -5,6 +5,11 @@ VOLUME /tmp
 ENV LANG en_US.UTF-8
 RUN echo "server {  \
                       listen       80; \
+                      gzip          on; \
+                      gzip_static on; \
+                      gzip_types text/plain text/css application/json application/javascript;\
+                      gzip_min_length 1024;\
+                      gzip_vary on;\
                       client_max_body_size 100m;\
                       location   /mes-server/ { \
                       proxy_pass              http://139.155.176.112:8078/; \

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

@@ -328,7 +328,7 @@ option.value = Object.assign(option.value, {
     //    dicData: switchOp,
     //    value: 0,
     //  },
-    {
+    /*{
       label: "是否首检",
       prop: "firstCheck",
       span: 8,
@@ -354,7 +354,7 @@ option.value = Object.assign(option.value, {
       type: "switch",
       dicData: switchOp,
       value: 0,
-    },
+    },*/
     //  {
     //    label: "是否工艺数量",
     //    prop: "common",
@@ -373,7 +373,7 @@ option.value = Object.assign(option.value, {
     //    dicData: switchOp,
     //    value: 0,
     //  },
-    {
+    /*{
       label: "是否合批",
       prop: "merge",
       span: 8,
@@ -389,7 +389,7 @@ option.value = Object.assign(option.value, {
           },
         };
       },
-    },
+    },*/
     {
       label: "是否委外",
       prop: "outsourcing",

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

@@ -119,14 +119,14 @@ export const formOption = {
       // slot:true, // 自定义列
     },
     {
-      label: "是否外协",
-      prop: "externalCooperation",
+      label: "是否委外",
+      prop: "outsourcing",
       span: 24,
       type: "switch",
       dicData: switchOp,
       value: 0,
     },
-    {
+    /*{
       label: "是否首检",
       prop: "firstCheck",
       span: 24,
@@ -165,7 +165,7 @@ export const formOption = {
       type: "switch",
       dicData: switchOp,
       value: 0,
-    },
+    },*/
     {
       label: "是否可跳过",
       prop: "skipped",

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

@@ -192,6 +192,9 @@ const saveFlow = async () => {
       list2.value[i].nextOperationId = list2.value[i + 1]?.operationVO?.id;
     }
   }
+  if(currentProcess.value){
+    list2.value[selectIndex.value] = currentProcess.value
+  }
   let p = {
     processRouteId: route.params.id,
     routeOpList: list2.value,

src/views/plan/workOrder/index.vue

@@ -771,7 +771,6 @@ option.value = Object.assign(option.value, {
       label: "自动拆单",
       hide: true,
       type: "switch",
-      display: false,
       dicData: [
         {
           label: "否",

src/views/pro/baseoperation/index.vue

@@ -141,11 +141,11 @@
                     prop: "timeingNum",
                     search: false,
                 },
-                {
+               /* {
                     label: "是否外协",
                     prop: "externalCooperation",
                     search: false,
-                },
+                },*/
                 {
                     label: "加工要求",
                     prop: "processAsk",
@@ -156,7 +156,7 @@
                     prop: "preparationTime",
                     search: false,
                 },
-                {
+                /*{
                     label: "是否自检",
                     prop: "selfCheck",
                     search: false,
@@ -170,7 +170,7 @@
                     label: "是否首检",
                     prop: "firstCheck",
                     search: false,
-                },
+                },*/
                 {
                     label: "是否委外",
                     prop: "outsourcing",
@@ -206,11 +206,11 @@
                     prop: "batch",
                     search: false,
                 },
-                {
+                /*{
                     label: "是否合批",
                     prop: "merge",
                     search: false,
-                },
+                },*/
                 {
                     label: "是否工艺数量",
                     prop: "common",