qinhb 8 месяцев назад
Родитель
Сommit
49d7773cab

+ 1 - 1
src/layout/components/NavBar/components/NavbarRight.vue

@@ -148,7 +148,7 @@ const dialog = reactive({
 });
 const clickItem =(row) =>{
   if(row.msgId === '4'){
-    window.open("/#/outsource",'_blank')
+    window.open("/quality/outsource",'_blank')
   }
 }
 const openMessageDialog = () => {

+ 1 - 1
src/views/device/disable/index.vue

@@ -338,7 +338,7 @@ const onSelectedFinish = (selectedValue) => {
   form.value.deviceName2 = selectedValue.deviceName;
   form.value.deviceNo = selectedValue.deviceNo;
   form.value.specifications = selectedValue.specifications;
-  form.value.manufacturer = selectedValue.manufacturer;
+  form.value.manufacturer = selectedValue.brand;
   form.value.originalValue = selectedValue.originalValue;
 };
 const maintenanceInfo = ref({});

+ 6 - 6
src/views/pro/traceability/index.vue

@@ -19,8 +19,8 @@
           @selection-change="selectionChange"
         >
           <template #seqNo="{ row }">
-            <el-tag :type="chooseTagType(row.seqNo, 'css')">{{
-              chooseTagType(row.seqNo, "text")
+            <el-tag :type="chooseTagType(row.level, 'css')">{{
+              chooseTagType(row.level, "text")
             }}</el-tag>
             {{ row.seqNo }}
           </template>
@@ -228,15 +228,15 @@ const tabsEvent = (pane, ev) => {
 const chooseTagType = (row, type) => {
   let daynamicType = "";
   if (type == "text") {
-    daynamicType = row.startsWith("DD")
+    daynamicType = row === 'order'
       ? "订单"
-      : row.startsWith("GD")
+      : row === 'workOrder'
         ? "工单"
         : "流转卡号";
   } else {
-    daynamicType = row.startsWith("DD")
+    daynamicType = row === 'order'
       ? "success"
-      : row.startsWith("GD")
+      : row === 'workOrder'
         ? "warning"
         : "primary";
   }