|
@@ -195,7 +195,6 @@
|
|
|
import byTable from "/src/components/byTable/index";
|
|
|
import { ElMessage, ElMessageBox } from "element-plus";
|
|
|
import { copyText } from "vue3-clipboard";
|
|
|
-import { flowStatus } from "/src/utils/flowStatus";
|
|
|
import DeliveryNote from "/src/components/order/deliveryNote/index";
|
|
|
import SelectBOM from "/src/views/group/BOM/management/index";
|
|
|
|
|
@@ -288,24 +287,11 @@ const config = computed(() => {
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
- label: "流程状态",
|
|
|
- prop: "flowStatus",
|
|
|
- width: 120,
|
|
|
- },
|
|
|
- render(val) {
|
|
|
- return proxy.dictKeyValue(val, flowStatus());
|
|
|
- },
|
|
|
- },
|
|
|
- {
|
|
|
- attrs: {
|
|
|
label: "订单状态",
|
|
|
prop: "status",
|
|
|
width: 120,
|
|
|
},
|
|
|
- render(val, row) {
|
|
|
- if (val == 0 && row.flowStatus !== 2) {
|
|
|
- return "";
|
|
|
- }
|
|
|
+ render(val) {
|
|
|
return proxy.dictKeyValue(val, proxy.useUserStore().allDict["order_status"]);
|
|
|
},
|
|
|
},
|
|
@@ -636,13 +622,10 @@ const clickReset = () => {
|
|
|
};
|
|
|
const clickCode = (row) => {
|
|
|
proxy.$router.replace({
|
|
|
- path: "/platform_manage/process/processApproval",
|
|
|
+ path: "/order-detail",
|
|
|
query: {
|
|
|
- flowKey: "order",
|
|
|
- flowName: "订单详情",
|
|
|
- processType: "20",
|
|
|
- id: row.id,
|
|
|
- flowId: row.flowId,
|
|
|
+ detailId: row.id,
|
|
|
+ text: "订单详情",
|
|
|
random: proxy.random(),
|
|
|
},
|
|
|
});
|