dengrui 11 mesi fa
parent
commit
718c9980db

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "2.9"
+  "version": "3.0"
 }

+ 1 - 1
src/views/base/craftManagement/route/components/configs.ts

@@ -360,7 +360,7 @@ export const comTypes: comType[] = [
     compentType: "duomeiticaiji",
   },
   {
-    compentName: "工序表",
+    compentName: "工序表",
     compentType: "operationExcel",
   },
 ];

+ 1 - 1
src/views/base/craftManagement/route/components/processComponent.vue

@@ -66,7 +66,7 @@
       <div v-if="isChanged || selectIndex === -1 || isNoneedEdit">
         <el-empty :image-size="200" :description="getTipContent()" />
       </div>
-      <div v-else-if="tipTitle !== '编辑工序表'">
+      <div v-else-if="tipTitle !== '编辑工序表'">
         <div class="tipTitle">{{ tipTitle }}</div>
         <el-button
           type="primary"

+ 12 - 0
src/views/device/disable/index.vue

@@ -524,6 +524,18 @@ option.value = Object.assign(option.value, {
     {
       label: "停用时间",
       prop: "disableTime",
+      type: "date",
+      width: 100,
+      overHidden: true,
+      format: "YYYY-MM-DD", //前端展示格式
+      valueFormat: "YYYY-MM-DD", //设置后端接收的日期格式
+      rules: [
+        {
+          required: true,
+          message: "请选择停用日期",
+          trigger: "trigger",
+        },
+      ],
     },
     {
       label: "停用理由",

+ 1 - 1
src/views/system/post/index.vue

@@ -155,7 +155,7 @@ option.value = Object.assign(option.value, {
         }
         return '<b class="el-tag el-tag--danger el-tag--light">禁用</b>';
       },
-      addDisplay: false,
+      addDisplay: true,
       rules: [
         {
           required: true,