浏览代码

fix:报故消息提示

lupeng 1 年之前
父节点
当前提交
1f74f7e781

+ 1 - 0
src/views/base/information/index.vue

@@ -216,6 +216,7 @@ option.value = Object.assign(option.value, {
       prop: "fileName",
       prop: "fileName",
       span: 24,
       span: 24,
       width:120,
       width:120,
+      overHidden:true,
       display:false,
       display:false,
     },
     },
     {
     {

+ 1 - 0
src/views/base/materials/components/drawing-page.vue

@@ -224,6 +224,7 @@ option.value = Object.assign(option.value, {
       prop: "fileName",
       prop: "fileName",
       span: 24,
       span: 24,
       width:120,
       width:120,
+      overHidden:true,
       display:false,
       display:false,
     },
     },
     {
     {

+ 13 - 3
src/views/quality/faultHandle/index.vue

@@ -44,7 +44,7 @@
                    v-if="row.currentState==4"
                    v-if="row.currentState==4"
         >解冻</el-button>
         >解冻</el-button>
         <el-button @click="faultExamine(row)"
         <el-button @click="faultExamine(row)"
-                   icon="el-icon-CircleCheck"
+                   icon="el-icon-reading"
                    text
                    text
                    type="primary"
                    type="primary"
                    v-if="row.currentState==1"
                    v-if="row.currentState==1"
@@ -177,6 +177,7 @@
 
 
   const crudRef = ref(null); //crudRef.value 获取avue-crud对象
   const crudRef = ref(null); //crudRef.value 获取avue-crud对象
   const router = useRouter();
   const router = useRouter();
+  const route = useRoute();
   const viewFault = (row) => {
   const viewFault = (row) => {
 
 
     fault.value.id=row.id;
     fault.value.id=row.id;
@@ -186,7 +187,7 @@
   onMounted(() => {
   onMounted(() => {
     // console.log("crudRef", crudRef)
     // console.log("crudRef", crudRef)
 
 
-
+    search.value.id = route.query.id;
     search.value.state = radio1.value;
     search.value.state = radio1.value;
     dataList();
     dataList();
 
 
@@ -234,10 +235,19 @@
         width:100,
         width:100,
         prop: "unqualifiedNum",
         prop: "unqualifiedNum",
       },
       },
+      {
+        label: "产品编码", prop: "materialCode", overHidden: true,
+        width:120,
 
 
+      },
       {
       {
-        label: "序列号", prop: "seqNo", overHidden: true,
+        label: "产品名称", prop: "materialName", overHidden: true,
+        width:100,
+      },
 
 
+      {
+        label: "流转卡号", prop: "seqNo", overHidden: true,
+        width:120,
       },
       },
       {
       {
         label: "状态", prop: "state", overHidden: true,
         label: "状态", prop: "state", overHidden: true,

+ 12 - 10
src/views/quality/unqualified/columns.ts

@@ -3,10 +3,9 @@ const { dicts } = useDictionaryStore();
 export const columns = [
 export const columns = [
 
 
   {
   {
-    label: "审理单号",
-    prop: "trackingNumber",
+    label: "报故时间", prop: "created",
     overHidden: true,
     overHidden: true,
-    width:120,
+    width:100,
     search: true,
     search: true,
   },
   },
   {
   {
@@ -31,20 +30,23 @@ export const columns = [
   },
   },
 
 
   {
   {
-    label: "序列号", prop: "seqNo", overHidden: true,
+    label: "流转卡号", prop: "seqNo", overHidden: true,
 
 
   },
   },
   {
   {
-    label: "状态", prop: "state", overHidden: true,
+    label: "产品编码", prop: "materialCode", overHidden: true,
     width:120,
     width:120,
-    dicData:dicts.escalation_fault_state,
-    props: { label: "dictLabel", value: "dictValue" },
+
+  },
+  {
+    label: "产品名称", prop: "materialName", overHidden: true,
+    width:100,
   },
   },
   {
   {
-    label: "跟踪状态", prop: "currentState", overHidden: true,
+    label: "故障描述", prop: "remark",
+    overHidden: true,
     width:100,
     width:100,
-    dicData:dicts.fault_current_state,
-    props: { label: "dictLabel", value: "dictValue" },
+    search: true,
   },
   },
   {
   {
     label: "报故人", prop: "creator",
     label: "报故人", prop: "creator",