Browse Source

修改了禅道上面的bug

ooo 1 year ago
parent
commit
a50cca73df

+ 2 - 2
src/store/modules/dictionary.ts

@@ -25,11 +25,11 @@ export const useDictionaryStore = defineStore("dictionaryStore", () => {
     "skill_type",
     "skill_type",
     "drawing_type",
     "drawing_type",
     "vehicle_level",
     "vehicle_level",
-    "fault_current_state",
+	"fault_current_state",
     "escalation_fault_state",
     "escalation_fault_state",
     "defect_mana",
     "defect_mana",
     "disposal_measures_type",
     "disposal_measures_type",
-  ];
+	"process_check_result",  ];
   const dicts = ref<{ [key: string]: any[] }>({});
   const dicts = ref<{ [key: string]: any[] }>({});
   function checkDicts() {
   function checkDicts() {
     if (JSON.stringify(dicts.value) === "{}") {
     if (JSON.stringify(dicts.value) === "{}") {

+ 7 - 1
src/views/base/accessories/index.vue

@@ -124,7 +124,7 @@ option.value = Object.assign(option.value, {
       ],
       ],
     },
     },
     {
     {
-      label: "生产物料编码",
+      label: "物料编码",
       prop: "materialCode",
       prop: "materialCode",
       clearable: false,
       clearable: false,
       rules: [
       rules: [
@@ -144,6 +144,12 @@ option.value = Object.assign(option.value, {
         }
         }
       },
       },
     },
     },
+    {
+      label: "物料名称",
+      prop: "materialName",
+      addDisplay: false,
+    },
+    { label: "物料规格", prop: "spec", addDisplay: false },
   ],
   ],
 });
 });
 </script>
 </script>

+ 28 - 15
src/views/pro/traceability/components/checkCom.vue

@@ -1,3 +1,4 @@
+<!-- 点检判定 -->
 <template>
 <template>
   <div class="mainContentBox">
   <div class="mainContentBox">
     <avue-crud
     <avue-crud
@@ -67,8 +68,15 @@ option.value = Object.assign(option.value, {
   addBtn: false,
   addBtn: false,
   menu: false,
   menu: false,
   header: false,
   header: false,
+  rowKey: "opId",
   column: [
   column: [
     {
     {
+      label: "工序Id",
+      prop: "opId",
+      display: false,
+      hide: true,
+    },
+    {
       label: "工序名称",
       label: "工序名称",
       prop: "opName",
       prop: "opName",
     },
     },
@@ -90,6 +98,11 @@ option.value = Object.assign(option.value, {
     {
     {
       label: "结果",
       label: "结果",
       prop: "result",
       prop: "result",
+      dicData: dicts.process_check_result,
+      props: {
+        label: "dictLabel",
+        value: "dictValue",
+      },
       search: false,
       search: false,
     },
     },
     // {
     // {
@@ -112,21 +125,21 @@ option.value = Object.assign(option.value, {
       prop: "lower",
       prop: "lower",
       search: false,
       search: false,
     },
     },
-    {
-      label: "实测值",
-      prop: "realValue",
-      search: false,
-    },
-    {
-      label: "单位",
-      prop: "unit",
-      search: false,
-      dicData: dicts.danwei_type,
-      props: {
-        label: "dictLabel",
-        value: "dictValue",
-      },
-    },
+    // {
+    //   label: "实测值",
+    //   prop: "realValue",
+    //   search: false,
+    // },
+    // {
+    //   label: "单位",
+    //   prop: "unit",
+    //   search: false,
+    //   dicData: dicts.danwei_type,
+    //   props: {
+    //     label: "dictLabel",
+    //     value: "dictValue",
+    //   },
+    // },
     {
     {
       label: "录入时间",
       label: "录入时间",
       prop: "created",
       prop: "created",

+ 10 - 2
src/views/pro/traceability/components/equitCom.vue

@@ -1,3 +1,4 @@
+<!-- 设备使用 -->
 <template>
 <template>
   <div class="mainContentBox">
   <div class="mainContentBox">
     <avue-crud
     <avue-crud
@@ -67,8 +68,15 @@ option.value = Object.assign(option.value, {
   addBtn: false,
   addBtn: false,
   menu: false,
   menu: false,
   header: false,
   header: false,
+  rowKey: "opId",
   column: [
   column: [
     {
     {
+      label: "工序Id",
+      prop: "opId",
+      display: false,
+      hide: true,
+    },
+    {
       label: "工序名称",
       label: "工序名称",
       prop: "opName",
       prop: "opName",
     },
     },
@@ -89,12 +97,12 @@ option.value = Object.assign(option.value, {
     },
     },
     {
     {
       label: "设备名称",
       label: "设备名称",
-      prop: "result",
+      prop: "equitName",
       search: false,
       search: false,
     },
     },
     {
     {
       label: "设备编码",
       label: "设备编码",
-      prop: "standard",
+      prop: "equitCode",
       search: false,
       search: false,
     },
     },
     {
     {

+ 1 - 0
src/views/pro/traceability/components/faultCom.vue

@@ -1,3 +1,4 @@
+<!-- 报故记录 -->
 <template>
 <template>
   <div class="mainContentBox">
   <div class="mainContentBox">
     <avue-crud
     <avue-crud

+ 9 - 0
src/views/pro/traceability/components/materialsCom.vue

@@ -1,3 +1,4 @@
+<!-- 已采物料 -->
 <template>
 <template>
   <div class="mainContentBox">
   <div class="mainContentBox">
     <avue-crud
     <avue-crud
@@ -67,11 +68,19 @@ option.value = Object.assign(option.value, {
   addBtn: false,
   addBtn: false,
   menu: false,
   menu: false,
   header: false,
   header: false,
+  rowKey: 'opId',
   column: [
   column: [
+	{
+	  label: "工序Id",
+	  prop: "opId",
+		display: false,
+		hide: true,
+	},
     {
     {
       label: "工序名称",
       label: "工序名称",
       prop: "opName",
       prop: "opName",
     },
     },
+
     {
     {
       label: "物料名称",
       label: "物料名称",
       prop: "itemName",
       prop: "itemName",

+ 11 - 29
src/views/pro/traceability/components/recordCom.vue

@@ -1,3 +1,4 @@
+<!-- 记录项 -->
 <template>
 <template>
   <div class="mainContentBox">
   <div class="mainContentBox">
     <avue-crud
     <avue-crud
@@ -67,44 +68,25 @@ option.value = Object.assign(option.value, {
   addBtn: false,
   addBtn: false,
   menu: false,
   menu: false,
   header: false,
   header: false,
+  rowKey: "opId",
   column: [
   column: [
     {
     {
+      label: "工序Id",
+      prop: "opId",
+      display: false,
+      hide: true,
+    },
+    {
       label: "工序名称",
       label: "工序名称",
       prop: "opName",
       prop: "opName",
     },
     },
     {
     {
       label: "记录项名称",
       label: "记录项名称",
-      prop: "thName",
-    },
-    {
-      label: "单位",
-      prop: "unit",
-      search: false,
-      dicData: dicts.danwei_type,
-      props: {
-        label: "dictLabel",
-        value: "dictValue",
-      },
-    },
-    {
-      label: "标准值",
-      prop: "standard",
-      search: false,
+      prop: "label",
     },
     },
     {
     {
-      label: "上限值",
-      prop: "upper",
-      search: false,
-    },
-    {
-      label: "下限值",
-      prop: "lower",
-      search: false,
-    },
-    {
-      label: "实测值",
-      prop: "realValue",
-      search: false,
+      label: "记录项值",
+      prop: "inputValue",
     },
     },
     {
     {
       label: "录入时间",
       label: "录入时间",

+ 1 - 0
src/views/pro/traceability/components/traceabilityCom.vue

@@ -1,3 +1,4 @@
+<!-- 生产履历 -->
 <template>
 <template>
   <div class="mainContentBox">
   <div class="mainContentBox">
     <avue-crud
     <avue-crud