bug 及需求更改

src/api/station/index.ts

@@ -44,3 +44,4 @@ export function queryStationByLineId(lineId: any) {
     method: "get",
   });
 }
+

src/layout/components/NavBar/components/NavbarRight.vue

@@ -156,6 +156,9 @@ const clickItem =(row) =>{
   if(row.msgId === '5'){
     window.open("/storage/warningInfo",'_blank')
   }
+  if(row.msgId === '6'){
+    window.open("/requisition",'_blank')
+  }
 }
 const openMessageDialog = () => {
   handleQuery();
@@ -272,10 +275,19 @@ const handleQuery1 = (params, done) => {
   queryMessageList(querySearch, page1, pageData1, done);
 };
 
+const timer = ref(null)
 onMounted(() => {
   checkUnReadMessageNum();
+  timer.value = setInterval(() => {
+    checkUnReadMessageNum();
+  }, 20000);
+});
+onBeforeUnmount(()=>{
+  clearInterval(timer.value)
+})
+onUnmounted(()=>{
+  clearInterval(timer.value)
 });
-
 const userCenterRef = ref();
 const userCenter = () => {
   userCenterRef.value && userCenterRef.value?.show();

src/views/base/craftManagement/route/bindConfig.ts

@@ -167,6 +167,14 @@ export const formOption = {
       value: 0,
     },*/
     {
+      label: "是否专检",
+      prop: "specialInspection",
+      span: 24,
+      type: "switch",
+      dicData: switchOp,
+      value: 0,
+    },
+    {
       label: "是否可跳过",
       prop: "skipped",
       span: 24,

src/views/base/modeling/station/index.vue

@@ -16,19 +16,19 @@
       @current-change="dataList"
       @selection-change="selectionChange"
     >
-      <!--      <template #enable="scope">
+      <template #enable="scope">
         <el-switch
-          active-value="1"
-          inactive-value="0"
-          inline-prompt
-          active-text="启用"
-          inactive-text="禁用"
-          v-model="scope.row.enable"
-          @click="changeItem(scope.row)"
-          class="ml-2"
-          style="&#45;&#45;el-switch-on-color: #13ce66; &#45;&#45;el-switch-off-color: #ff4949"
+            active-value="1"
+            inactive-value="0"
+            inline-prompt
+            active-text="启用"
+            inactive-text="禁用"
+            v-model="scope.row.enable"
+            @click="changeItem(scope.row)"
+            class="ml-2"
+            style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
         />
-      </template>-->
+      </template>
       <template #menu-left="{ size }">
         <el-button
           :disabled="toDeleteIds.length < 1"
@@ -183,6 +183,12 @@ const changeItem = (row) => {
       message: data.msg,
       type: "success",
     });
+  }).catch(()=>{
+    if(row.enable == 1){
+      row.enable = 0
+    }else{
+      row.enable = 1
+    }
   });
 };
 // 设置表格列或者其他自定义的option
@@ -313,14 +319,15 @@ option.value = Object.assign(option.value, {
         },
       ],
     },
-    /* {
+    {
       label: "启用状态",
       slot: true,
       headerAlign: "center",
       prop: "enable",
+      addDisplay: false,
+      editDisplay: false,
       width: 100,
-      display: false,
-    },*/
+    },
     {
       label: "工位描述",
       width: 90,

src/views/plan/requisition/index.vue

@@ -158,14 +158,14 @@
               border
             >
               <el-table-column label="序号" type="index" width="60" />
-              <el-table-column label="工作令号" prop="workCode">
+<!--              <el-table-column label="工作令号" prop="workCode">
                 <template v-slot="{ row }">
                   <el-text v-if="dialogType === 1 || form.state > 0">{{
                     row.workCode
                   }}</el-text>
                   <el-input v-else v-model="row.workCode" />
                 </template>
-              </el-table-column>
+              </el-table-column>-->
               <el-table-column label="零、部(组)件图号" prop="materialCode" />
               <el-table-column label="名称" prop="materialName" />
               <el-table-column label="数量" align="num">

src/views/pro/traceability/components/materialsCom.vue

@@ -101,9 +101,16 @@ option.value = Object.assign(option.value, {
       search: false,
     },
     {
-      label: "采集编码",
-      prop: "itemSeq",
+      label: "采集批次",
+      prop: "batchNo",
       search: false,
+      formatter: (val) => {
+        if(val.batchNo){
+          return val.batchNo;
+        }else{
+          return val.itemSeq;
+        }
+      },
     },
     {
       label: "已采集数量",

src/views/storage/stock/index.vue

@@ -99,7 +99,7 @@ option.value = Object.assign(option.value, {
   selection: true,
   column: [
     {
-      label: "仓库编码",
+      label: "仓库",
       prop: "houseType",
       type: "select",
       search: true,
@@ -122,7 +122,7 @@ option.value = Object.assign(option.value, {
       ],
     },
     {
-      label: "料箱编号",
+      label: "料箱",
       prop: "vehicleCode",
       editDisabled: true,
       rules: [
@@ -134,7 +134,7 @@ option.value = Object.assign(option.value, {
       ],
     },
     {
-      label: "仓库坐标",
+      label: "坐标",
       prop: "coordinate",
       editDisabled: true,
       rules: [
@@ -148,6 +148,7 @@ option.value = Object.assign(option.value, {
     {
       label: "层数",
       prop: "position",
+      width: 60,
       rules: [
         {
           required: true,
@@ -169,15 +170,21 @@ option.value = Object.assign(option.value, {
       search: true,
     },*/
     {
-      label: "计划单号",
+      label: "计划号",
       prop: "planNo",
       search: true,
     },
-    {
+    /*{
       label: "流转卡号",
       width: 130,
       overHidden: true,
       prop: "seqNo",
+    },*/
+    {
+      label: "物料编码",
+      prop: "materialNo",
+      width: 130,
+      search: true,
     },
     {
       label: "物料名称",