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

src/layout/components/header.vue

@@ -83,9 +83,8 @@ import dayjs from "dayjs";
 import type { DropdownInstance } from "element-plus";
 import { logoutApi } from "@/api/auth";
 import { useUserStore } from "@/store";
-
+import { ElMessage, ElMessageBox } from "element-plus";
 const userStore = useUserStore();
-
 const router = useRouter();
 const route = useRoute();
 const routeMeta = computed(() => {
@@ -132,7 +131,20 @@ const showClick = () => {
 };
 
 const commonBack = (itemValue) => {
-  router.back();
+  //包含弹框逻辑
+  if (route.fullPath.split("/")[1] == "pro-steps") {
+    ElMessageBox.confirm("确认是否要回退？", "警告", {
+      confirmButtonText: "确认",
+      cancelButtonText: "取消",
+      type: "warning",
+    })
+      .then(() => {
+        router.back();
+      })
+      .catch(() => {});
+  } else {
+    router.back();
+  }
 };
 
 const handleCommand = (command: string | number | object) => {

src/views/message/index.vue

@@ -92,6 +92,7 @@ const submit = async (id) => {
   const { code } = await confirmMessage([id]);
   if (code == "200") {
     ElMessage.success("操作成功");
+    getPageInfo2();
     getPageInfo1();
   }
 };
@@ -120,8 +121,8 @@ const getPageInfo2 = async () => {
 const getPageInfo1 = async () => {
   const { data, code } = await dataList({
     pageNo: page2.value,
-    pageSize: pageSize2.value,
-    readState: 1,
+    pageSize: 999,
+    readState: 0,
   });
   if (code == "200") {
     newMsg.value = data.records;
@@ -134,6 +135,7 @@ const setNextStatus2 = computed(() => {
 const setPage2 = (num) => {
   page2.value = page2.value + num;
   getPageInfo2();
+  getPageInfo1();
 };
 onMounted(() => {
   getPageInfo2();

src/views/prepare-complete-suit/components/order.vue

@@ -17,7 +17,7 @@
       </div>
       <div class="productMsg">
         <span :class="hoverStatus ? 'msgName msgNameHover' : 'msgName'"
-          >计划编号</span
+          >订单编号</span
         >
         <span class="msgValue">{{ item.orderCode }}</span>
       </div>

src/views/pro-operation/inspect/components/checkForm.vue

@@ -13,15 +13,14 @@
       </el-select>
     </el-form-item>
     <el-form-item label="流转卡号" prop="seqNoList">
-      <div>{{ SeqArray?.[0] }}</div>
-      <!--      <el-select v-model="modelValue.seqNoList" multiple>-->
-      <!--        <el-option-->
-      <!--          v-for="(item, index) in SeqArray"-->
-      <!--          :key="index"-->
-      <!--          :label="item"-->
-      <!--          :value="item"-->
-      <!--        />-->
-      <!--      </el-select>-->
+      <el-select v-model="modelValue.seqNoList" multiple :disabled="true">
+        <el-option
+          v-for="(item, index) in SeqArray"
+          :key="index"
+          :label="item"
+          :value="item"
+        />
+      </el-select>
     </el-form-item>
     <el-form-item label="备注" prop="remark">
       <el-input v-model="modelValue.remark" type="textarea" />
@@ -38,8 +37,8 @@ import { useProcessStore } from "@/store/modules/processView";
 const rules = reactive({
   checkContent: [{ required: true, trigger: "blur" }],
   checkName: [{ required: true, trigger: "blur" }],
-  result: [{ required: true, trigger: "change" }],
-  seqNoList: [{ required: true, trigger: "change" }],
+  result: [{ required: true, trigger: "blur" }],
+  seqNoList: [{ required: true, trigger: "blur" }],
 });
 const processStore = useProcessStore();
 const uploadRef = ref(null);
@@ -58,6 +57,10 @@ const emits = defineEmits(["update:modelValue", "submit"]);
 const getSeq = async () => {
   // const { data } = await getSeqData(processStore.scanInfo.id);
   SeqArray.value = [processStore.useSeqNo];
+  emits("update:modelValue", {
+    ...props.modelValue.value,
+    seqNoList: SeqArray.value,
+  });
 };
 onMounted(() => {
   getSeq();

src/views/process/components/order.vue

@@ -17,7 +17,7 @@
       </div>
       <div class="productMsg">
         <span :class="hoverStatus ? 'msgName msgNameHover' : 'msgName'"
-          >计划编号</span
+          >订单编号</span
         >
         <span class="msgValue">{{ item.orderCode }}</span>
       </div>

src/views/traceability/index.vue

@@ -66,7 +66,7 @@
                     <CreditCard />
                   </el-icon>
                 </div>
-                计划编号
+                订单编号
               </div>
               <div class="value destext">
                 {{ infoData.orderCode ? infoData.orderCode : "-" }}