From 8abc9481eafeb715b39a4f4f8d6f628a642e6b53 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 19 三月 2025 17:38:18 +0800
Subject: [PATCH] 优化AGV和输送线、产线对接逻辑
---
项目代码/WMS/WIDESEA_WMSClient/src/views/system/Sys_Role.vue | 268 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 206 insertions(+), 62 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/system/Sys_Role.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/system/Sys_Role.vue"
index bb09c8e..538b0a7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/system/Sys_Role.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/system/Sys_Role.vue"
@@ -5,69 +5,213 @@
*涓氬姟璇峰湪@/extension/system/Sys_Role.js姝ゅ缂栧啓
-->
<template>
- <view-grid ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend">
- </view-grid>
+ <view-grid
+ ref="grid"
+ :columns="columns"
+ :detail="detail"
+ :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions"
+ :searchFormFields="searchFormFields"
+ :searchFormOptions="searchFormOptions"
+ :table="table"
+ :extend="extend"
+ >
+ </view-grid>
</template>
<script>
- import extend from "@/extension/system/Sys_Role.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: 'roleId',
- footer: "Foots",
- cnName: '瑙掕壊绠＄悊',
- name: 'Sys_Role',
- url: "/Sys_Role/",
- sortName: "Role_Id"
- });
- const editFormFields = ref({"parentId":[],"roleName":"","deptName":"","enable":""});
- const editFormOptions = ref([[{"dataKey":"tree_roles","data":[],"title":"鐖剁骇ID","required":true,"field":"parentId","type":"cascader"},
- {"title":"瑙掕壊鍚嶇О","required":true,"field":"roleName"}],
- [{"title":"閮ㄩ棬鍚嶇О","field":"deptName"},
- {"dataKey":"enable","data":[],"title":"鏄惁鍚敤","field":"enable","type":"switch"}],
- // [{"title":"鍒涘缓浜�","field":"Creater","disabled":true},
- // {"title":"鍒涘缓鏃堕棿","field":"createDate","type":"datetime"}],
- // [{"title":"淇敼浜�","field":"modifier","disabled":true},
- // {"title":"淇敼鏃堕棿","field":"modifyDate","type":"datetime"}]
- ]);
- const searchFormFields = ref({"roleName":"","deptName":"","enable":"","createDate":"","modifyDate":""});
- const searchFormOptions = ref([[{"title":"瑙掕壊鍚嶇О","field":"roleName","type":"text"},{"title":"閮ㄩ棬鍚嶇О","field":"deptName","type":"text"},{"dataKey":"enable","data":[],"title":"鏄惁鍚敤","field":"enable","type":"select"}],[{"title":"鍒涘缓鏃堕棿","field":"createDate","type":"datetime"},{"title":"淇敼鏃堕棿","field":"modifyDate","type":"datetime"}]]);
- const columns = ref([{field:'roleId',title:'瑙掕壊缂栧彿',type:'int',width:70,readonly:true,require:true,align:'left',sortable:true},
- {field:'roleName',title:'瑙掕壊鍚嶇О',type:'string',link:true,width:90,require:true,align:'left'},
- {field:'parentId',title:'鐖剁骇鍚嶇О',type:'int',bind:{ key:'tree_roles',data:[]},width:70,require:true,align:'left'},
- {field:'dept_Id',title:'閮ㄩ棬ID',type:'int',width:90,hidden:true,align:'left'},
- {field:'deptName',title:'閮ㄩ棬鍚嶇О',type:'string',width:90,align:'left'},
- {field:'enable',title:'鏄惁鍚敤',type:'byte',bind:{ key:'enable',data:[]},width:90,align:'left'},
- {field:'orderNo',title:'鎺掑簭',type:'int',width:90,hidden:true,align:'left'},
- {field:'creater',title:'鍒涘缓浜�',type:'string',width:130,readonly:true,align:'left'},
- {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:90,readonly:true,align:'left',sortable:true},
- {field:'modifier',title:'淇敼浜�',type:'string',width:130,readonly:true,align:'left'},
- {field:'modifyDate',title:'淇敼鏃堕棿',type:'datetime',width:90,readonly:true,align:'left',sortable:true}]);
- const detail = ref({
- cnName: "#detailCnName",
- columns: [],
- sortName: "",
- key: ""
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
+import extend from "@/extension/system/Sys_Role.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "roleId",
+ footer: "Foots",
+ cnName: "瑙掕壊绠＄悊",
+ name: "Sys_Role",
+ url: "/Sys_Role/",
+ sortName: "roleId",
});
+ const editFormFields = ref({
+ parentId: [],
+ roleName: "",
+ deptId: "",
+ enable: "",
+ // creater: "",
+ // createDate: "",
+ // modifier: "",
+ // modifyDate: "",
+ });
+ const editFormOptions = ref([
+ [
+ {
+ dataKey: "tree_roles",
+ data: [],
+ title: "鐖剁骇ID",
+ required: true,
+ field: "parentId",
+ type: "cascader",
+ },
+ { title: "瑙掕壊鍚嶇О", required: true, field: "roleName" },
+ ],
+ [
+ { title: "閮ㄩ棬ID", field: "deptId" },
+ {
+ dataKey: "enable",
+ data: [],
+ title: "鏄惁鍚敤",
+ field: "enable",
+ type: "switch",
+ },
+ ],
+ // [
+ // { title: "鍒涘缓浜�", field: "creater", disabled: true },
+ // {
+ // title: "鍒涘缓鏃堕棿",
+ // field: "createDate",
+ // disabled: true,
+ // type: "datetime",
+ // },
+ // ],
+ // [
+ // { title: "淇敼浜�", field: "modifier", disabled: true },
+ // { title: "淇敼鏃堕棿", field: "modifyDate", disabled: true },
+ // ],
+ ]);
+ const searchFormFields = ref({
+ roleName: "",
+ deptId: "",
+ enable: "",
+ createDate: "",
+ modifyDate: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "瑙掕壊鍚嶇О", field: "roleName", type: "text" },
+ { title: "閮ㄩ棬ID", field: "deptId", type: "text" },
+ {
+ dataKey: "enable",
+ data: [],
+ title: "鏄惁鍚敤",
+ field: "enable",
+ type: "select",
+ },
+ ],
+ [
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ { title: "淇敼鏃堕棿", field: "modifyDate", type: "datetime" },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "roleId",
+ title: "瑙掕壊ID",
+ type: "int",
+ width: 70,
+ readonly: true,
+ require: true,
+ align: "left",
+ sortable: true,
+ },
+ {
+ field: "parentId",
+ title: "鐖剁骇ID",
+ type: "int",
+ bind: { key: "tree_roles", data: [] },
+ width: 70,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "roleName",
+ title: "瑙掕壊鍚嶇О",
+ type: "string",
+ link: true,
+ width: 90,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "deptId",
+ title: "閮ㄩ棬ID",
+ type: "int",
+ width: 90,
+ // hidden: true,
+ align: "left",
+ },
+ // {
+ // field: "deptName",
+ // title: "閮ㄩ棬鍚嶇О",
+ // type: "string",
+ // width: 90,
+ // align: "left",
+ // },
+ {
+ field: "enable",
+ title: "鏄惁鍚敤",
+ type: "byte",
+ bind: { key: "enable", data: [] },
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "orderNo",
+ title: "鎺掑簭",
+ type: "int",
+ width: 90,
+ hidden: true,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 130,
+ readonly: true,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 90,
+ readonly: true,
+ align: "left",
+ sortable: true,
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 130,
+ readonly: true,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 90,
+ readonly: true,
+ align: "left",
+ sortable: true,
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ columns: [],
+ sortName: "",
+ key: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
</script>
--
Gitblit v1.9.3