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

.gitignore

@@ -17,3 +17,4 @@ package-lock.json
 pnpm-lock.yaml
 stats.html
 /docker/.run
+/dist

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.6"
+  "version": "1.7"
 }

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

@@ -315,7 +315,7 @@ option.value = Object.assign(option.value, {
     //    dicData: switchOp,
     //    value: 0,
     //  },
-    {
+    /*{
       label: "是否首检",
       prop: "firstCheck",
       span: 8,
@@ -323,7 +323,7 @@ option.value = Object.assign(option.value, {
       type: "switch",
       dicData: switchOp,
       value: 0,
-    },
+    },*/
     {
       label: "是否巡检",
       prop: "inspection",

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

@@ -126,14 +126,14 @@ export const formOption = {
       dicData: switchOp,
       value: 0,
     },
-    {
+    /*{
       label: "是否首检",
       prop: "firstCheck",
       span: 24,
       type: "switch",
       dicData: switchOp,
       value: 0,
-    },
+    },*/
     {
       label: "是否巡检",
       prop: "inspection",

src/views/plan/workOrder/components/check-task.vue

@@ -167,9 +167,9 @@ const getTemplate = async () => {
 watch(
     () => props.workOrderInfo,
     () => {
-      form.value.workOrderCode = props.workOrderInfo.workOrderCode
-      info.value = props.workOrderInfo
-      search.value.workOrderCode = props.workOrderInfo.workOrderCode
+      taskForm.value.workOrderId = props.workOrderInfo.id
+      form.value.workOrderId = props.workOrderInfo.id
+      search.value.workOrderId = props.workOrderInfo.id
       dataList();
     }
 );
@@ -226,8 +226,7 @@ option.value = Object.assign(option.value, {
 });
 
 onMounted(() => {
-  info.value = props.workOrderInfo
-  taskForm.value.workOrderId = info.value.id
+  taskForm.value.workOrderId = props.workOrderInfo.id
   form.value.workOrderId = props.workOrderInfo.id
   search.value.workOrderId = props.workOrderInfo.id
   dataList();

src/views/plan/workOrder/index.vue

@@ -781,6 +781,18 @@ option.value = Object.assign(option.value, {
       prop: "scrapNum",
     },
     {
+      label: "首检数量",
+      width: 85,
+      prop: "firstCheckNum",
+      value: 0,
+    },
+    {
+      label: "已检数量",
+      width: 85,
+      display: false,
+      prop: "firstCheckAlreadyNum",
+    },
+    {
       label: "创建时间",
       width: 180,
       display: false,

src/views/pro/baseoperation/index.vue

@@ -170,11 +170,11 @@
                     prop: "inspection",
                     search: false,
                 },
-                {
+                /*{
                     label: "是否首检",
                     prop: "firstCheck",
                     search: false,
-                },
+                },*/
                 {
                     label: "是否委外",
                     prop: "outsourcing",