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

src/views/quality/reject/index.vue

@@ -18,6 +18,9 @@
       v-if="!examineStatus"
     >
       <template #menu="{ row }">
+        <el-button  link  @click="showSeq(row.seqNoList)">
+          查看管号
+        </el-button>
         <el-button
           v-if="row.state != '2' && row.state != '3'"
           link
@@ -34,6 +37,20 @@
       <Process :key="proccessKey" @get-list="getList" />
     </div>
     <ShowVue v-model="showState" :tableData="tableData" />
+    <el-dialog
+        v-model="dialog2.visible"
+        :title="dialog2.title"
+        width="950px"
+        @close="dialog2.visible = false"
+    >
+      <el-card
+          style="cursor: pointer; font-size: 20px"
+          shadow="always"
+          :key="item"
+          v-for="item in showSeqList"
+      >{{ item }}</el-card
+      >
+    </el-dialog>
   </div>
 </template>
 <script setup>
@@ -50,6 +67,7 @@ const toShow = (row) => {
   tableData.value = setJson(row);
   showState.value = true;
 };
+const showSeqList =ref([]);
 const tableData = ref();
 const proccessKey = ref(false);
 const examineStatus = ref(false);
@@ -72,6 +90,14 @@ onMounted(() => {
 const getList = () => {
   dataList();
 };
+const dialog2 = reactive({
+  title: "管号列表",
+  visible: false,
+});
+const showSeq = (seqs) => {
+  showSeqList.value = seqs;
+  dialog2.visible = true;
+};
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
   searchEnter: true,
@@ -99,10 +125,7 @@ option.value = Object.assign(option.value, {
       label: "阶段",
       prop: "stage",
     },
-    {
-      label: "创建时间",
-      prop: "created",
-    },
+
     {
       label: "状态",
       prop: "state",
@@ -127,10 +150,34 @@ option.value = Object.assign(option.value, {
         },
       ],
     },
-    {
+      {
+          label: "问题描述",
+          prop: "remark1",
+          overHidden: true,
+          formatter: (val) => {
+              if(val.remark1){
+                  return JSON.parse(val.remark1).content;
+              }
+
+          }
+      },
+      {
       label: "备注",
       prop: "remark",
-    }
+    },
+
+    {
+      label: "创建人",
+      prop: "creator",
+      editDisplay: false,
+    },
+      {
+          label: "创建时间",
+          prop: "created",
+          overHidden: true,
+          width:160
+      },
+
   ],
 });
 const setJson = (row1) => {

src/views/quality/rework/index.vue

@@ -19,65 +19,69 @@
       <template #menu="{ row, index, type }">
         <el-button
           @click="showTable(row)"
-          icon="el-icon-view"
-          text
+          link
           type="primary"
+          size="small"
           >查看</el-button
         >
         <el-button
-          icon="el-icon-edit"
-          text
+            type="primary"
+            size="small"
+            link
+            @click="showSeq(row.seqList)"
+        >查看管号</el-button
+        >
+        <el-button
+            link
           @click="doEdit(row, index)"
           type="primary"
           v-if="row.state === 0 || row.state === 1"
-          :size="size"
+            size="small"
           >编辑</el-button
         >
         <el-button
           @click="operation(row)"
-          icon="el-icon-link"
-          text
+          link
+          size="small"
           type="primary"
           >返工工序</el-button
         >
         <el-button
-          icon="el-icon-edit"
-          text
+            link
           @click="handle(row, index, 2)"
           type="primary"
           v-if="row.state === 0"
+            size="small"
           >驳回</el-button
         >
         <el-button
-          icon="el-icon-edit"
-          text
+            link
           @click="handle(row, index, 1)"
           type="primary"
           v-if="row.state === 0"
+            size="small"
           >确认返工</el-button
         >
-        <el-button
-          icon="el-icon-edit"
-          text
+<!--        <el-button
+            link
           v-if="row.state === 1"
           @click="handle(row, index, 3)"
           type="primary"
-          :size="size"
+            size="small"
           >返工完成</el-button
-        >
+        >-->
         <el-button
-          icon="el-icon-edit"
-          text
+            link
           v-if="row.state === 1"
           @click="handle(row, index, 3)"
           type="primary"
-          :size="size"
+            size="small"
         >返工完成</el-button
         >
         <el-button
           @click="document(row)"
-          icon="el-icon-document"
-          text
+          link
+          size="small"
           v-if="row.state > 0 && row.state!==2 "
           type="primary"
         >领料单</el-button
@@ -120,6 +124,20 @@
         :status="record.state"
       />
     </el-dialog>
+    <el-dialog
+        v-model="dialog2.visible"
+        :title="dialog2.title"
+        width="950px"
+        @close="dialog2.visible = false"
+    >
+      <el-card
+          style="cursor: pointer; font-size: 20px"
+          shadow="always"
+          :key="item"
+          v-for="item in showSeqList"
+      >{{ item }}</el-card
+      >
+    </el-dialog>
     <ReworkShow v-model="showState" :tableData="tableData" />
   </div>
 </template>
@@ -137,7 +155,7 @@ import ReworkDocument from "@/views/quality/rework/components/rework-document.vu
 
 // 数据字典相关
 const { dicts } = useDictionaryStore();
-
+const showSeqList = ref([]);
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
@@ -157,6 +175,14 @@ const dialog1 = ref({
   title: "领料单",
   visible: false,
 });
+const dialog2 = reactive({
+  title: "管号列表",
+  visible: false,
+});
+const showSeq = (seqs) => {
+  showSeqList.value = seqs;
+  dialog2.visible = true;
+};
 const doEdit = (row, index) => {
   crudRef.value && crudRef.value.rowEdit(row, index);
 };
@@ -227,8 +253,8 @@ option.value = Object.assign(option.value, {
       label: "生产批号",
       prop: "workOrderCode",
       editDisabled: true,
-      width: 160,
       overHidden: true,
+      width: 120,
       search: true,
     },
     {
@@ -244,11 +270,6 @@ option.value = Object.assign(option.value, {
     },
     {
       label: "管号",
-      prop: "seqNos",
-      editDisabled: true,
-    },
-    {
-      label: "管号",
       prop: "seqNo",
       search: true,
       editDisabled: true,
@@ -303,17 +324,15 @@ option.value = Object.assign(option.value, {
     },
 
     {
-      label: "返工提出者",
+      label: "创建人",
       prop: "creator",
       editDisplay: false,
     },
     {
-      label: "日期",
+      label: "创建日期",
       prop: "created",
       type: "date",
       width: 160,
-      format: "YYYY-MM-DD",
-      valueFormat: "YYYY-MM-DD",
       editDisplay: false,
       overHidden: true,
     },