浏览代码

fix:修改代码

lupeng 5 月之前
父节点
当前提交
151f328a39

+ 1 - 7
src/views/base/craftManagement/routeCommon/index.vue

@@ -207,13 +207,7 @@ option.value = Object.assign(option.value, {
       addDisplay: true,
       addDisplay: true,
       editDisabled: true,
       editDisabled: true,
       overHidden: true,
       overHidden: true,
-      rules: [
-        {
-          required: true,
-          message: "工艺路线名称不能为空",
-          trigger: "blur",
-        },
-      ],
+      display: false,
     },
     },
     {
     {
       label: "工艺路线名称",
       label: "工艺路线名称",

+ 2 - 7
src/views/base/defectCheck/index.vue

@@ -108,13 +108,8 @@ option.value = Object.assign(option.value, {
       editDisabled: true,
       editDisabled: true,
       span: 12,
       span: 12,
       search: true,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: "点检项编码不能为空",
-          trigger: "blur",
-        },
-      ],
+      display: false,
+
     },
     },
     {
     {
       label: "内容",
       label: "内容",

+ 1 - 7
src/views/base/defectMana/index.vue

@@ -141,14 +141,8 @@ option.value = Object.assign(option.value, {
       prop: "bugCode",
       prop: "bugCode",
       span: 12,
       span: 12,
       search: true,
       search: true,
+      display: false,
       editDisabled: true,
       editDisabled: true,
-      rules: [
-        {
-          required: true,
-          message: "缺陷编码不能为空",
-          trigger: "blur",
-        },
-      ],
     },
     },
     {
     {
       label: "缺陷名称",
       label: "缺陷名称",

+ 1 - 7
src/views/device/instance/index.vue

@@ -309,13 +309,7 @@ option.value = Object.assign(option.value, {
       editDisabled: true,
       editDisabled: true,
       width: 160,
       width: 160,
       overHidden: true,
       overHidden: true,
-      rules: [
-        {
-          required: true,
-          message: "资产编号不能为空",
-          trigger: "trigger",
-        },
-      ],
+      display: false,
     },
     },
     {
     {
       label: "设备名称",
       label: "设备名称",

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

@@ -1,6 +1,4 @@
 <template>
 <template>
-  <div class="mainContentBox flex">
-    <div>
   <div class="mainContentBox common-layout">
   <div class="mainContentBox common-layout">
     <el-container>
     <el-container>
       <el-aside width="200px" style="min-height: 800px; max-height: calc(100vh - 200px);overflow-y:hidden">
       <el-aside width="200px" style="min-height: 800px; max-height: calc(100vh - 200px);overflow-y:hidden">
@@ -36,164 +34,166 @@
           </template>
           </template>
         </avue-crud>
         </avue-crud>
       </el-aside>
       </el-aside>
-    </div>
-    <div style="width: calc(100% - 600px)">
-      <el-header style="height: 20%">
-        <el-descriptions title="产品信息一览" border>
-          <el-descriptions-item label="产品名称">{{
-            productReviewInfo.materialName
-          }}</el-descriptions-item>
-          <el-descriptions-item label="管号">{{
-            productReviewInfo.seqNo
-          }}</el-descriptions-item>
-          <el-descriptions-item label="物料编号">{{
-            productReviewInfo.materialCode
-          }}</el-descriptions-item>
-          <el-descriptions-item label="产品规格">{{
-            productReviewInfo.materialModel
-          }}</el-descriptions-item>
-          <el-descriptions-item label="铭牌号">-</el-descriptions-item>
-          <el-descriptions-item label="是否返工">
-            <el-tag size="small">{{ productReviewInfo.rework }}</el-tag>
-          </el-descriptions-item>
-          <el-descriptions-item label="工单出站">{{
-            productReviewInfo.outNum
-          }}</el-descriptions-item>
-          <el-descriptions-item label="交付日期">{{
-            productReviewInfo.planStartEnd
-          }}</el-descriptions-item>
-          <el-descriptions-item label="工单报故"
-            ><el-tag size="small">{{
-              productReviewInfo.bug
-            }}</el-tag></el-descriptions-item
+      <el-container>
+        <el-header style="height: 20%">
+          <el-descriptions title="产品信息一览" border>
+            <el-descriptions-item label="产品名称">{{
+              productReviewInfo.materialName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="流转卡号">{{
+              productReviewInfo.seqNo
+            }}</el-descriptions-item>
+            <el-descriptions-item label="物料编号">{{
+              productReviewInfo.materialCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="产品规格">{{
+              productReviewInfo.materialModel
+            }}</el-descriptions-item>
+            <el-descriptions-item label="铭牌号">-</el-descriptions-item>
+            <el-descriptions-item label="是否返工">
+              <el-tag size="small">{{ productReviewInfo.rework }}</el-tag>
+            </el-descriptions-item>
+            <el-descriptions-item label="工单出站">{{
+              productReviewInfo.outNum
+            }}</el-descriptions-item>
+            <el-descriptions-item label="交付日期">{{
+              productReviewInfo.planStartEnd
+            }}</el-descriptions-item>
+            <el-descriptions-item label="工单报故"
+              ><el-tag size="small">{{
+                productReviewInfo.bug
+              }}</el-tag></el-descriptions-item
+            >
+          </el-descriptions>
+        </el-header>
+        <el-main>
+          <el-tabs
+            type="border-card"
+            @tab-click="tabsEvent"
+            v-model="defaultTabName"
           >
           >
-        </el-descriptions>
-      </el-header>
-      <el-main>
-        <el-tabs
-          type="border-card"
-          @tab-click="tabsEvent"
-          v-model="defaultTabName"
-        >
-          <el-tab-pane name="traceabilityComRef" label="维修履历">
-            <template #label>
-              <span
-                >维修履历
-                <el-badge
-                  :value="tabCount.traceability"
-                  class="item"
-                  type="primary"
-                />
-              </span>
-            </template>
-            <TraceabilityCom ref="traceabilityComRef" />
-          </el-tab-pane>
-          <el-tab-pane name="materialsComRef" label="已采物料">
-            <template #label>
-              <span
-                >已采物料
-                <el-badge
-                  :value="tabCount.materials"
-                  class="item"
-                  type="primary"
-                />
-              </span>
-            </template>
-            <MaterialsCom ref="materialsComRef" />
-          </el-tab-pane>
-          <el-tab-pane name="recordComRef" label="记录项">
-            <template #label>
-              <span
-                >记录项
-                <el-badge
-                  :value="tabCount.record"
-                  class="item"
-                  type="primary"
-                />
-              </span>
-            </template>
-            <RecordCom ref="recordComRef"
-          /></el-tab-pane>
-          <el-tab-pane name="checkComRef" label="点检判定">
-            <template #label>
-              <span
-                >点检判定
-                <el-badge
-                  :value="tabCount.checks"
-                  class="item"
-                  type="primary"
-                />
-              </span>
-            </template>
-            <CheckCom ref="checkComRef" />
-          </el-tab-pane>
-          <el-tab-pane name="equitComRef" label="设备使用">
-            <template #label>
-              <span
-                >设备使用
-                <el-badge :value="tabCount.equit" class="item" type="primary" />
-              </span>
-            </template>
-            <EquitCom ref="equitComRef"
-          /></el-tab-pane>
-          <el-tab-pane name="faultComRef" label="报故记录">
-            <template #label>
-              <span
-                >报故记录
-                <el-badge :value="tabCount.fault" class="item" type="primary" />
-              </span>
-            </template>
-            <FaultCom ref="faultComRef" />
-          </el-tab-pane>
-          <!--            <el-tab-pane name="bugComRef" label="缺陷项">缺陷项</el-tab-pane>-->
-          <el-tab-pane name="mediaComRef" label="图片采集"
-            ><template #label>
-              <span
-                >图片采集
-                <el-badge
-                  :value="tabCount.medias"
-                  class="item"
-                  type="primary"
-                />
-              </span>
-            </template>
-            <media-com ref="mediaComRef"
-          /></el-tab-pane>
-
-          <el-tab-pane name="excelComRef" label="表格数据"
-            ><template #label>
-              <span
-                >表格数据
-                <el-badge :value="tabCount.excel" class="item" type="primary" />
-              </span>
-            </template>
-            <ExcelCom ref="excelComRef"
-          /></el-tab-pane>
-          <el-tab-pane name="cssjComRef" label="设备数据"
-            ><template #label>
-              <span
-                >设备数据
-                <el-badge
-                  :value="tabCount.testData"
-                  class="item"
-                  type="primary"
-                />
-              </span>
-            </template>
-            <TestData ref="cssjComRef"
-          /></el-tab-pane>
-          <el-tab-pane name="fileComRef" label="工序文件">
-            <template #label>
-              <span
-                >工序文件
-                <el-badge :value="tabCount.file" class="item" type="primary" />
-              </span>
-            </template>
-            <FileCom ref="fileComRef"
-          /></el-tab-pane>
-        </el-tabs>
-      </el-main>
-    </div>
+            <el-tab-pane name="traceabilityComRef" label="维修履历">
+              <template #label>
+                <span
+                  >维修履历
+                  <el-badge
+                    :value="tabCount.traceability"
+                    class="item"
+                    type="primary"
+                  />
+                </span>
+              </template>
+              <TraceabilityCom ref="traceabilityComRef" />
+            </el-tab-pane>
+            <el-tab-pane name="materialsComRef" label="已采物料">
+              <template #label>
+                <span
+                  >已采物料
+                  <el-badge
+                    :value="tabCount.materials"
+                    class="item"
+                    type="primary"
+                  />
+                </span>
+              </template>
+              <MaterialsCom ref="materialsComRef" />
+            </el-tab-pane>
+            <el-tab-pane name="recordComRef" label="记录项">
+              <template #label>
+                <span
+                  >记录项
+                  <el-badge
+                    :value="tabCount.record"
+                    class="item"
+                    type="primary"
+                  />
+                </span>
+              </template>
+              <RecordCom ref="recordComRef"
+            /></el-tab-pane>
+            <el-tab-pane name="checkComRef" label="点检判定">
+              <template #label>
+                <span
+                  >点检判定
+                  <el-badge
+                    :value="tabCount.checks"
+                    class="item"
+                    type="primary"
+                  />
+                </span>
+              </template>
+              <CheckCom ref="checkComRef" />
+            </el-tab-pane>
+            <el-tab-pane name="equitComRef" label="设备使用">
+              <template #label>
+                <span
+                  >设备使用
+                  <el-badge
+                    :value="tabCount.equit"
+                    class="item"
+                    type="primary"
+                  />
+                </span>
+              </template>
+              <EquitCom ref="equitComRef"
+            /></el-tab-pane>
+            <el-tab-pane name="faultComRef" label="报故记录">
+              <template #label>
+                <span
+                  >报故记录
+                  <el-badge
+                    :value="tabCount.fault"
+                    class="item"
+                    type="primary"
+                  />
+                </span>
+              </template>
+              <FaultCom ref="faultComRef" />
+            </el-tab-pane>
+            <!--            <el-tab-pane name="bugComRef" label="缺陷项">缺陷项</el-tab-pane>-->
+            <el-tab-pane name="mediaComRef" label="图片采集"
+              ><template #label>
+                <span
+                  >图片采集
+                  <el-badge
+                    :value="tabCount.medias"
+                    class="item"
+                    type="primary"
+                  />
+                </span>
+              </template>
+              <media-com ref="mediaComRef"
+            /></el-tab-pane>
+            <el-tab-pane name="excelComRef" label="表格数据"
+              ><template #label>
+                <span
+                  >表格数据
+                  <el-badge
+                    :value="tabCount.excel"
+                    class="item"
+                    type="primary"
+                  />
+                </span>
+              </template>
+              <ExcelCom ref="excelComRef"
+            /></el-tab-pane>
+            <el-tab-pane name="cssjComRef" label="测试数据"
+              ><template #label>
+                <span
+                  >测试数据
+                  <el-badge
+                    :value="tabCount.testData"
+                    class="item"
+                    type="primary"
+                  />
+                </span>
+              </template>
+              <TestData ref="cssjComRef"
+            /></el-tab-pane>
+          </el-tabs>
+        </el-main>
+      </el-container>
+    </el-container>
   </div>
   </div>
 </template>
 </template>
 <script setup>
 <script setup>

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

@@ -121,13 +121,7 @@ option.value = Object.assign(option.value, {
       label: "岗位编码",
       label: "岗位编码",
       prop: "postCode",
       prop: "postCode",
       search: true,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: "岗位编码不能为空",
-          trigger: "trigger",
-        },
-      ],
+      display: false,
     },
     },
     {
     {
       label: "岗位名称",
       label: "岗位名称",

+ 2 - 3
src/views/system/role/index.vue

@@ -46,7 +46,6 @@ const formData = ref({
 
 
 const rules = reactive({
 const rules = reactive({
   roleName: [{ required: true, message: "请输入角色名称", trigger: "blur" }],
   roleName: [{ required: true, message: "请输入角色名称", trigger: "blur" }],
-  roleCode: [{ required: true, message: "请输入角色编码", trigger: "blur" }],
   scope: [{ required: true, message: "请选择数据权限", trigger: "blur" }],
   scope: [{ required: true, message: "请选择数据权限", trigger: "blur" }],
   state: [{ required: true, message: "请选择状态", trigger: "blur" }],
   state: [{ required: true, message: "请选择状态", trigger: "blur" }],
 });
 });
@@ -341,9 +340,9 @@ onMounted?.(() => {
           <el-input v-model="formData.roleName" placeholder="请输入角色名称" />
           <el-input v-model="formData.roleName" placeholder="请输入角色名称" />
         </el-form-item>
         </el-form-item>
 
 
-        <el-form-item label="角色编码" prop="roleCode">
+<!--        <el-form-item label="角色编码" prop="roleCode">
           <el-input v-model="formData.roleCode" placeholder="请输入角色编码" />
           <el-input v-model="formData.roleCode" placeholder="请输入角色编码" />
-        </el-form-item>
+        </el-form-item>-->
 
 
         <el-form-item label="数据权限" prop="scope">
         <el-form-item label="数据权限" prop="scope">
           <el-select v-model="formData.scope">
           <el-select v-model="formData.scope">