需求更改

src/components/CommonTable/configs/tableConfig.ts

@@ -627,7 +627,7 @@ export const tableConfig = {
     ],
   },
   MARTERIAL_BOM: {
-    url: "/api/v1/base/materialBom",
+    url: "/api/v1/op/operationItem/queryBom",
     column: [
       {
         label: "物料版本",

src/components/CommonTable/index.vue

@@ -13,6 +13,7 @@
       v-model:page="page"
       v-model:search="search"
       :data="data"
+      :row-style="tableRowClassName"
       :option="option"
       @row-click="rowClick"
       @row-save="createRow"
@@ -71,6 +72,13 @@ const startSelect = async (param) => {
   isShowTable.value = true;
 };
 
+const tableRowClassName = ({ row, rowIndex }) => {
+  if (row.rowStyleChange) {
+    return { backgroundColor: '#58F195FF'};
+  }
+  return '';
+};
+
 /**
  * propName 要跟字典配置的key一致
  * dictData 字典数据, 注意props的value和label

src/views/base/craftManagement/route/components/bottomTable.vue

@@ -124,6 +124,7 @@ const startCreat = () => {
       //查询参数
       let configParam = {};
       configParam.materialCode = prodtCode;
+      configParam.routeId = routeId;
       if (bomVersion.value) {
         configParam.bomVersion = bomVersion.value;
       }

src/views/base/information/index.vue

@@ -115,13 +115,6 @@ const {
 } = Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
 const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
-// checkBtnPerm(ButtonPermKeys.PLAN.BTNS.order_add) :permission="permission"
-// const permission = reactive({
-//   delBtn: checkPerm(buttonPermission.PLAN.BTNS.order_del),
-//   addBtn: checkPerm(buttonPermission.PLAN.BTNS.order_add),
-//   editBtn: checkPerm(buttonPermission.PLAN.BTNS.order_edit),
-//   menu: true,
-// });
 
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 const router = useRouter?.();
@@ -156,7 +149,7 @@ const uploadFinished = () => {
 option.value = Object.assign(option.value, {
   selection: false,
   viewBtn: false,
-  editBtn: false,
+  editBtn: true,
   delBtn: false,
   menu: true,
   column: [
@@ -303,14 +296,6 @@ option.value = Object.assign(option.value, {
       hide: true,
       display: false,
     },
-    /*{ label: "文件",
-      prop: "drawing",
-      type: 'img',
-      span: 24,
-      display:false,
-      slot: true,
-      formatter: (row, column, cellValue, index) => {
-        return import.meta.env.VITE_APP_UPLOAD_URL + `${row.drawingPath}`;} },*/
     {
       label: "版本",
       prop: "drawingVersion",
@@ -338,6 +323,7 @@ option.value = Object.assign(option.value, {
       headerAlign: "center",
       prop: "enable",
       width: 100,
+      editDisplay: false,
       addDisplay: false,
     },
   ],

src/views/plan/finishProduct/components/detail-stock.vue

@@ -28,13 +28,10 @@
 <script setup lang="ts">
   import { ref, getCurrentInstance } from "vue";
   import { useCrud } from "@/hooks/userCrud";
-  import ButtonPermKeys from "@/common/configs/buttonPermission";
   import { useCommonStoreHook, useDictionaryStore } from "@/store";
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-  import {addStock} from "@/api/inStock"
-  import dictDataUtil from "@/common/configs/dictDataUtil";
   // 数据字典相关
-
+  const { dicts } = useDictionaryStore();
   const test = () => {
     isShowTable.value = true;
     tableType.value = tableType.value == 1 ? 2 : 1;
@@ -64,26 +61,10 @@
     Methords; //增删改查
   const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
   const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
-  // checkBtnPerm(ButtonPermKeys.PLAN.BTNS.order_add) :permission="permission"
-  // const permission = reactive({
-  //   delBtn: checkPerm(buttonPermission.PLAN.BTNS.order_del),
-  //   addBtn: checkPerm(buttonPermission.PLAN.BTNS.order_add),
-  //   editBtn: checkPerm(buttonPermission.PLAN.BTNS.order_edit),
-  //   menu: true,
-  // });
-
-
-
-
-
   onMounted(() => {
     search.value.workOrderCode=props.workOrderCode;
     dataNoPageList();
-
-
   });
-
-
   // 设置表格列或者其他自定义的option
   option.value = Object.assign(option.value, {
     selection: true,
@@ -98,6 +79,9 @@
       {
         label: "接收人",
         prop: "recipient",
+        type: "select",
+        dicData: dicts.user_name_list,
+        props: {"label": "dictLabel","value":"dictValue"},
       },
       {
         label: "入库数量",
@@ -116,6 +100,9 @@
       {
         label: "创建人",
         prop: "creator",
+        type: "select",
+        dicData: dicts.user_name_list,
+        props: {"label": "dictLabel","value":"dictValue"},
       },
       {
         label: "创建时间",

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

@@ -113,6 +113,11 @@ option.value = Object.assign(option.value, {
       },
     },
     {
+      label: "包装编号",
+      prop: "bgCode",
+      search: false,
+    },
+    {
       label: "已采集数量",
       prop: "num",
       search: false,