Merge branch 'qingban' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

src/api/material/index.ts

@@ -14,9 +14,9 @@ export function getMaterialDetails(materialCode: String): AxiosPromise<any> {
   });
 }
 
-export function getMaterialDetailsByseqNo(seqNo: String): AxiosPromise<any> {
+export function getMaterialDetailsByseqNo(workOrderCode: String,seqNo: String): AxiosPromise<any> {
   return request({
-    url: "/api/v1/process/web/traceability/get/" + seqNo,
+    url: "/api/v1/process/web/traceability/get/" + workOrderCode + "/" + seqNo,
     method: "get",
   });
 }

src/directive/permission/index.ts

@@ -37,10 +37,7 @@ export function checkPerm(str: string) {
   if (roles.includes("ROOT")) {
     return true;
   }
-  const hasPerm = perms?.some((perm) => {
-    return str.includes(perm);
-  });
-  return hasPerm;
+  return perms.includes(str);
 }
 
 /**

src/views/base/craftManagement/route/index.vue

@@ -9,7 +9,6 @@
       v-model:page="page"
       @row-save="createRow"
       @row-update="updateRow"
-      @row-del="deleteRow"
       @search-change="searchChange"
       @search-reset="resetChange"
       @size-change="dataList"
@@ -44,11 +43,19 @@
           link
           type="primary"
           icon="el-icon-edit"
-          :disabled="false"
+          v-if="row.usable === 0"
           @click="doEdit(row, index)"
           >编辑</el-button
         >
         <el-button
+            link
+            type="danger"
+            icon="el-icon-edit"
+            v-if="row.usable === 0"
+            @click="deleteRow(row, index)"
+        >删除</el-button
+        >
+        <el-button
           link
           icon="el-icon-copy-document"
           :disabled="false"
@@ -106,7 +113,6 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import { useDictionaryStore } from "@/store";
 import { copyRoute } from "@/api/craft/route/index";
@@ -114,9 +120,6 @@ import { copyRoute } from "@/api/craft/route/index";
 // 数据字典相关
 const { dicts } = useDictionaryStore();
 
-const testDebunce = () => {
-  console.log("执行了事件");
-};
 
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
@@ -229,6 +232,8 @@ const bindProcess = (row) => {
 option.value = Object.assign(option.value, {
   selection: true,
   labelWidth: 110,
+  menuWidth: 250,
+  delBtn: false,
   searchLabelWidth: 110,
   editBtn: false,
   column: [

src/views/plan/order/index.vue

@@ -17,10 +17,10 @@
       @row-del="rowDel"
       :data="pageData"
     >
-      <template #menu-left="{ size }">
+<!--      <template #menu-left="{ size }">
         <el-button type="primary" @click="scan">扫码导入</el-button>
         <el-button type="primary" @click="test">测试数据</el-button>
-      </template>
+      </template>-->
       <template #menu-right="{}">
         <el-dropdown split-button v-hasPerm="['plan:order:import']"
           >导入
@@ -78,13 +78,13 @@
           @click="rowDel(row, 0)"
           ><i-ep-edit />删除
         </el-button>
-        <el-button
+<!--        <el-button
           type="primary"
           size="small"
           v-if="row.orderState == '5'"
           @click="handleScanCode(row.id)"
           >二维码生成
-        </el-button>
+        </el-button>-->
       </template>
     </avue-crud>
     <el-dialog

src/views/pro/traceability/index.vue

@@ -44,7 +44,7 @@
             }}</el-descriptions-item>
             <el-descriptions-item label="铭牌号">-</el-descriptions-item>
             <el-descriptions-item label="是否返工">
-              <el-tag size="small">否</el-tag>
+              <el-tag size="small">{{productReviewInfo.rework}}</el-tag>
             </el-descriptions-item>
             <el-descriptions-item label="工单出站">{{
               productReviewInfo.outNum
@@ -52,6 +52,7 @@
             <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>
@@ -247,6 +248,8 @@ let productReviewInfo = reactive({
   planStartEnd: "",
   workOrderCode: "",
   outNum: "",
+  rework: '-',
+  bug: '-'
 });
 
 let tabCount = reactive({
@@ -261,12 +264,20 @@ let tabCount = reactive({
 });
 
 const handleCellClick = (row, column, event) => {
+  if(row.level === 'order'){
+    productReviewInfo.bug = '-'
+  }
+  if(row.orderType){
+    productReviewInfo.rework = row.orderType === '2' ? '是' : '否'
+  }
   //获取出单的数量
   if (data.value) {
     for (let topTree of data.value) {
       if (topTree) {
         for (let secondTree of topTree.children) {
           if (row.workOrderCode == secondTree.workOrderCode) {
+            productReviewInfo.rework = topTree.orderType === '2' ? '是' : '否'
+            productReviewInfo.bug = secondTree.bugNum === 0 ? '否' : '是'
             productReviewInfo.outNum = secondTree.children.length;
           }
         }
@@ -282,7 +293,7 @@ const handleCellClick = (row, column, event) => {
       tabNameComRef.get(defaultTabName.value)?.value.refreshTra(temRow.value);
     }
     //每次点击都要获取tab页面的数量
-    traceabilityTabCount({ seqNo: row.seqNo }).then(({ data }) => {
+    traceabilityTabCount({ seqNo: row.seqNo,workOrderCode: row.workOrderCode }).then(({ data }) => {
       tabCount = Object.assign(tabCount, data);
     });
     if (row.workOrderCode == productReviewInfo.workOrderCode) {
@@ -290,7 +301,7 @@ const handleCellClick = (row, column, event) => {
       return;
     }
     //产品信息
-    getMaterialDetailsByseqNo(row.seqNo).then(({ data }) => {
+    getMaterialDetailsByseqNo(row.workOrderCode,row.seqNo).then(({ data }) => {
       productReviewInfo = Object.assign(productReviewInfo, data);
       productReviewInfo.workOrderCode = row.workOrderCode;
       // productReviewInfo.outNum =