流程添加

src/components/CommonTable/index.vue

@@ -136,6 +136,9 @@ const calculateColumnWidth = (column) => {
 };
 
 onMounted(() => {
+  if(props.tableType == 'ROUTE_COMMON'){
+    search.value.enabled = "0";
+  }
   url.value = tableConfig[props.tableType].url;
   option.value = Object.assign(option.value, {
     searchEnter: true,

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

@@ -771,7 +771,7 @@ option.value = Object.assign(option.value, {
       label: "启用状态",
       prop: "enabled",
       addDisplay: false,
-      // editDisplay: false,
+      editDisplay: false,
       slot: true,
       width: 100,
       type: "radio",

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

@@ -368,7 +368,7 @@ option.value = Object.assign(option.value, {
       label: "启用状态",
       prop: "enabled",
       addDisplay: false,
-      // editDisplay: false,
+      editDisplay: false,
       slot: true,
       width: 100,
       type: "radio",

src/views/flow/done/index.vue

@@ -110,6 +110,10 @@ option.value = Object.assign(option.value, {
         value: "dictValue",
       },
     },
+    {
+      label: "办理时间",
+      prop: "updated",
+    },
   ],
 });
 

src/views/flow/todo/index.vue

@@ -112,6 +112,10 @@ option.value = Object.assign(option.value, {
         value: "dictValue",
       },
     },
+    {
+      label: "接收时间",
+      prop: "created",
+    },
   ],
 });
 

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

@@ -14,6 +14,15 @@
       @search-reset="resetChange"
       @selection-change="selectionChange"
     >
+      <template #menu="{ row }">
+        <el-button
+            link
+            v-if="row.flowState === '0' || row.flowState == '2' || row.flowState == '-1'"
+            type="danger"
+            icon="el-icon-delete"
+            @click="deleteRow(row)"
+        >删除</el-button>
+      </template>
     </avue-crud>
   </div>
 </template>
@@ -23,8 +32,6 @@ 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 test = () => {
@@ -77,12 +84,13 @@ onMounted(() => {
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
   searchEnter: true,
-  selection: true,
+  selection: false,
   addBtn: false,
   editBtn: false,
   delBtn: false,
   viewBtn: false,
-  menu: false,
+  menu: true,
+  menuWidth: 150,
   columnBtn: false,
   gridBtn: false,
   column: [
@@ -93,10 +101,12 @@ option.value = Object.assign(option.value, {
     {
       label: "入库数量",
       prop: "inventoryNum",
+      width: 110,
     },
     {
       label: "管号",
       prop: "seqNo",
+      minWidth: 250,
       overHidden: true,
     },
     {
@@ -106,6 +116,7 @@ option.value = Object.assign(option.value, {
     },
     {
       label: "创建人",
+      width: 110,
       prop: "creator",
     },
     {

src/views/plan/finishProduct/index.vue

@@ -24,14 +24,14 @@
           icon="el-icon-view"
           text
           type="primary"
-          >查看</el-button
+          >入库记录</el-button
         >
       </template>
     </avue-crud>
     <el-dialog
       v-model="dialog.visible"
       :title="dialog.title"
-      width="800px"
+      width="90%"
       :destroy-on-close="true"
       @close="dialog.visible = false"
     >
@@ -69,7 +69,7 @@ const test = () => {
   tableType.value = tableType.value == 1 ? 2 : 1;
 };
 const dialog = reactive({
-  title: "查看",
+  title: "入库记录",
   visible: false,
 });