Merge branch 'master' of http://192.168.101.4:3000/jiaxiaoqiang/JG-CLIENT-TEMP

src/api/process/index.ts

@@ -9,11 +9,14 @@ import { OrdersQuery } from "./types";
  * @param data
  */
 export function getOrders(data: any) {
-  return request({
-    url: "/api/v1/plan/workOrder/taskPage",
-    method: "post",
-    data: data,
-  });
+  return request(
+    {
+      url: "/api/v1/plan/workOrder/taskPage",
+      method: "post",
+      data: data,
+    },
+    { loadingKey: "getProcessOrders" }
+  );
 }
 
 /**

src/styles/variables.scss

@@ -6,6 +6,7 @@
   --menu-active-text: var(--el-menu-active-color);
   --menu-hover: #263445;
   --sidebar-logo-background: #2d3748;
+  --el-mask-color: #f1f3f5;
 }
 
 /** 暗黑主题 */
@@ -28,33 +29,32 @@ $sidebar-width-collapsed: 54px; // 侧边栏收缩宽度
 $navbar-height: 80px; // 导航栏高度
 $tags-view-height: 34px; // TagsView 高度
 
-
-$select-hover: #0A59F7;//选中主题色
-$font-default-black: #303030;//字体默认黑
-$font-default-60: #00000060;//黑字体透明60%
+$select-hover: #0a59f7; //选中主题色
+$font-default-black: #303030; //字体默认黑
+$font-default-60: #00000060; //黑字体透明60%
 $font-default-80: #00000080;
 $font-default-90: #00000080;
 //字体大小
-$f10:10px;
-$f12:12px;
-$f14:14px;
-$f16:16px;
-$f20:20px;
-$f24:24px;
-$f38:38px;
-$f60:60px;
+$f10: 10px;
+$f12: 12px;
+$f14: 14px;
+$f16: 16px;
+$f20: 20px;
+$f24: 24px;
+$f38: 38px;
+$f60: 60px;
 
 //字重
-$Medium:500;
+$Medium: 500;
 
 //间隔距离
-$p5:5px;
-$p10:10px;
-$p15:15px;
-$p20:20px;
+$p5: 5px;
+$p10: 10px;
+$p15: 15px;
+$p20: 20px;
 
 @mixin flex() {
   display: flex;
   justify-content: center;
-  align-items: center
-}
+  align-items: center;
+}

src/views/process/orders.vue

@@ -7,6 +7,7 @@
       <el-tab-pane label="未完成" name="false" />
       <el-tab-pane label="已完成" name="ok" />
     </el-tabs>
+    <!-- <el-scrollbar class="barHeight" ref="wrapRef" @scroll="handleScroll" v-loading="map.get('getProcessOrders')"> -->
     <el-scrollbar class="barHeight" ref="wrapRef" @scroll="handleScroll">
       <Order v-for="(item, index) in ordersDataArray" :key="index" @click="setSlectIndex(index)"
         :hoverStatus="index == selectIndex ? true : false" :item="item" />
@@ -24,11 +25,14 @@ import { useProcessStore } from "@/store";
 import { useDictionaryStore } from "@/store";
 import { getOrders } from "@/api/process";
 import { emitter, EventsNames } from "@/utils/common";
+import { useCommonStoreHook } from "@/store";
 const dictS = useDictionaryStore();
 const store = useProcessStore();
 const selectSeqIndex = inject("selectSeqIndex");
 const scanStatus = inject("scanStatus");
 const ordersSum = ref(0);
+const commonS = useCommonStoreHook();
+const map = commonS.loadingMap;
 const emit = defineEmits(["getindex"]);
 const ordersDataArray = inject("ordersDataArray");
 //获取未完成订单的参数

src/views/traceability/components/check.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="collapseStyle">
     <el-scrollbar style="border: 1px solid #ebeef5" :height="tableHeight">
-      <el-collapse accordion>
+      <el-collapse accordion v-model="activeNames">
         <el-collapse-item v-for="(item, index) in materialsData" :key="index" :title="item.opName" :name="index">
           <el-table :data="item.children" border>
             <el-table-column prop="checkName" label="点检项名称" />
@@ -34,6 +34,7 @@ import { useProcessStore } from "@/store";
 import { checkRecordInfo } from "@/api/process/traceability";
 import { useDictionaryStore } from "@/store";
 const dictS = useDictionaryStore();
+const activeNames = ref([0]);
 const store = useProcessStore();
 const page = ref(1);
 const limit = ref(10);

src/views/traceability/components/equit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="collapseStyle">
     <el-scrollbar style="border: 1px solid #ebeef5" :height="tableHeight">
-      <el-collapse accordion>
+      <el-collapse accordion v-model="activeNames">
         <el-collapse-item v-for="(item, index) in materialsData" :key="index" :title="item.opName" :name="index">
           <el-table :data="item.children" border>
             <el-table-column prop="equitType" label="设备类型" />
@@ -27,6 +27,7 @@ const limit = ref(10);
 const total = ref(10);
 const materialsData = ref([]);
 const tableHeight = ref(null);
+const activeNames = ref([0]);
 const getPagination = async () => {
   const { data } = await equitRecordInfo({
     pageNo: page.value,
@@ -47,6 +48,4 @@ onMounted(() => {
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

src/views/traceability/components/materials.vue

@@ -1,12 +1,13 @@
 <template>
   <div class="collapseStyle">
     <el-scrollbar style="border: 1px solid #ebeef5" :height="tableHeight">
-      <el-collapse accordion>
+      <el-collapse accordion v-model="activeNames" >
         <el-collapse-item v-for="(item, index) in materialsData" :key="index" :title="item.opName" :name="index">
-          <el-table :data="item.children"  border>
+          <el-table :data="item.children" border>
             <el-table-column prop="itemName" label="物料名称" />
             <el-table-column prop="itemModel" label="物料规格" />
             <el-table-column prop="itemCode" label="物料编号" />
+            <el-table-column prop="itemSeq" label="采集编码" />
             <el-table-column prop="needNum" label="需求数量" />
             <el-table-column prop="realNum" label="已采集数量" />
           </el-table>
@@ -21,6 +22,7 @@
 import { useProcessStore } from "@/store";
 import { getMaterialsInfo } from "@/api/process/traceability";
 const store = useProcessStore();
+const activeNames = ref([0]);
 const page = ref(1);
 const limit = ref(10);
 const total = ref(10);
@@ -46,6 +48,4 @@ onMounted(() => {
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

src/views/traceability/components/record.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="collapseStyle">
     <el-scrollbar style="border: 1px solid #ebeef5" :height="tableHeight">
-      <el-collapse accordion>
+      <el-collapse accordion v-model="activeNames">
         <el-collapse-item v-for="(item, index) in materialsData" :key="index" :title="item.opName" :name="index">
           <el-table :data="item.children"  border>
             <el-table-column prop="label" label="记录项名称" />
@@ -20,6 +20,7 @@ import { useProcessStore } from "@/store";
 import { getRecordInfo } from "@/api/process/traceability";
 const store = useProcessStore();
 const page = ref(1);
+const activeNames = ref([0]);
 const limit = ref(10);
 const total = ref(10);
 const materialsData = ref([]);

src/views/traceability/index.vue

@@ -3,12 +3,12 @@
     <!-- 基础信息展示 -->
     <div class="contentBody">
       <div class="headerInfo">
-        <el-descriptions :column="3" border class="descriptions">
+        <el-descriptions :column="3" border class="descriptions" label-class-name="labelStyle">
           <el-descriptions-item>
             <template #label>
               <div class="cell-item">
                 <el-icon>
-                  <user />
+                  <Postcard />
                 </el-icon>
                 产品名称
               </div>
@@ -30,7 +30,7 @@
             <template #label>
               <div class="cell-item">
                 <el-icon>
-                  <location />
+                  <Collection />
                 </el-icon>
                 物料编号
               </div>
@@ -41,7 +41,7 @@
             <template #label>
               <div class="cell-item">
                 <el-icon>
-                  <tickets />
+                  <ScaleToOriginal />
                 </el-icon>
                 产品规格
               </div>
@@ -52,7 +52,7 @@
             <template #label>
               <div class="cell-item">
                 <el-icon>
-                  <tickets />
+                  <CreditCard />
                 </el-icon>
                 铭牌号
               </div>
@@ -63,29 +63,31 @@
             <template #label>
               <div class="cell-item">
                 <el-icon>
-                  <tickets />
+                  <QuestionFilled />
                 </el-icon>
                 是否返工
               </div>
             </template>
-            {{ infoData.materialName ? infoData.materialName : "-" }}
+            {{
+              infoData.isReturn === null ? "-" : infoData.isReturn ? "是" : "否"
+            }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template #label>
               <div class="cell-item">
                 <el-icon>
-                  <tickets />
+                  <Van />
                 </el-icon>
                 工单出站
               </div>
             </template>
-            {{ infoData.outNum ? infoData.outNum : "-" }}
+            {{ infoData.nameplateNo ? infoData.nameplateNo : "-" }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template #label>
               <div class="cell-item">
                 <el-icon>
-                  <tickets />
+                  <Calendar />
                 </el-icon>
                 交付日期
               </div>
@@ -256,4 +258,10 @@ onMounted(() => {
 :deep(.is-bordered-content) {
   font-size: $f24 !important;
 }
+
+:deep(.el-descriptions__cell) {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>