Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/views/wms/accountcalendar/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Accountcalendar.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -65,6 +70,16 @@ defineOptions({ name: 'Accountcalendar' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Accountcalendar.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: AccountcalendarApi.getAccountcalendarPage // 分页接口
 })
@@ -78,6 +93,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:accountcalendar:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:accountcalendar:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/areabasic/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Area.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -67,6 +72,16 @@ defineOptions({ name: 'Area' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Area.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询列表参数设置 
 const searchTableParams = ref([{
   formField: 'warehouseCode',
@@ -88,6 +103,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:areabasic:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:areabasic:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/businesstype/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Businesstype.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -67,6 +72,16 @@ defineOptions({ name: 'Businesstype' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Businesstype.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询列表参数设置 
 const searchTableParams = ref([{
   formField: 'outAreaCodes',
@@ -90,9 +105,10 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:businesstype:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:businesstype:import'}), // 导入
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:businesstype:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:businesstype:export'}), // 导出
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:businesstype:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/carrier/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Carrier.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -65,6 +70,16 @@ defineOptions({ name: 'Carrier' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Carrier.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: CarrierApi.getCarrierPage // 分页接口
 })
@@ -78,6 +93,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:carrier:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:carrier:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/condition/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Condition.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,6 +73,16 @@ defineOptions({ name: 'Condition' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Condition.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: ConditionApi.getConditionPage // 分页接口
 })
@@ -81,6 +96,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:condition:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:condition:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/configuration/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Configuration.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,6 +73,16 @@ defineOptions({ name: 'Configuration' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Configuration.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: ConfigurationApi.getConfigurationPage // 分页接口
 })
@@ -81,6 +96,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:configuration:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:configuration:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/configurationsetting/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Configurationsetting.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,6 +73,16 @@ defineOptions({ name: 'Configurationsetting' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Configurationsetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: ConfigurationsettingApi.getConfigurationsettingPage // 分页接口
 })
@@ -81,6 +96,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:configurationsetting:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:configurationsetting:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/currencyexchange/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Currencyexchange.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -65,6 +70,16 @@ defineOptions({ name: 'Currencyexchange' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Currencyexchange.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: CurrencyexchangeApi.getCurrencyexchangePage // 分页接口
 })
@@ -78,6 +93,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:currencyexchange:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:currencyexchange:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/customer/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Customer.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -65,6 +70,16 @@ defineOptions({ name: 'Customer' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Customer.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: CustomerApi.getCustomerPage // 分页接口
 })
@@ -78,6 +93,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:customer:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:customer:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/customerdock/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Customerdock.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -69,6 +74,16 @@ defineOptions({ name: 'Customerdock' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Customerdock.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询列表参数设置 
 const searchTableParams = ref([{
   formField: 'customerCode',
@@ -100,6 +115,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:customerdock:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:customerdock:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/customeritem/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Customeritem.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,6 +73,16 @@ defineOptions({ name: 'Customeritem' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Customeritem.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询列表参数设置 
 const searchTableParams = ref([{
   formField: 'customerCode',
@@ -94,6 +109,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:customeritem:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:customeritem:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/dock/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Dock.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,6 +73,16 @@ defineOptions({ name: 'Dock' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Dock.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询列表参数设置 
 const searchTableParams = ref([{
   formField: 'warehouseCode',
@@ -94,6 +109,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:dock:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:dock:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/documentsetting/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Documentsetting.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,6 +73,16 @@ defineOptions({ name: 'Documentsetting' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Documentsetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: DocumentsettingApi.getDocumentsettingPage // 分页接口
 })
@@ -78,9 +93,10 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:documentsetting:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:documentsetting:import'}), // 导入
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:documentsetting:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:documentsetting:export'}), // 导出
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:documentsetting:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/jobsetting/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Jobsetting.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -35,11 +40,8 @@
   <BasicForm 
     ref="basicFormRef" 
     @success="getList" 
-    :rules="JobsettingRules" 
+    :rules="JobsettingRules"
-    :formAllSchemas="Jobsetting.allSchemas" 
+    :formAllSchemas="Jobsetting.allSchemas"
-    searchTableTitle="物料基础信息"
-    :searchTableAllSchemas="Itembasic.allSchemas"
-    :searchTablePage="ItembasicApi.getItembasicPage"
     :apiUpdate="JobsettingApi.updateJobsetting"
     :apiCreate="JobsettingApi.createJobsetting"
     :isBusiness="false"
@@ -55,9 +57,8 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as JobsettingApi from '@/api/wms/jobsetting'
-import * as ItembasicApi from '@/api/wms/itembasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Jobsetting, JobsettingRules, Itembasic } from '@/utils/disposition/tableColumns'
+import { Jobsetting, JobsettingRules } from '@/utils/disposition/tableColumns'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -68,8 +69,18 @@ defineOptions({ name: 'Jobsetting' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Jobsetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
-  getListApi: JobsettingApi.getJobsettingPage // 分页接口
+  getListApi: JobsettingApi.getJobsettingPage // 分页接口 
 })
 
 // 获得表格的各种操作
@@ -78,9 +89,10 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:jobsetting:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:jobsetting:import'}), // 导入
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:jobsetting:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:jobsetting:export'}), // 导出
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:jobsetting:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -172,7 +184,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '任务单置导入模版.xls'
+  templateTitle: '任务单设置导入模版.xls'
 })
 // 导入成功之后
 const importSuccess = () => {

src/views/wms/location/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Location.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -69,6 +74,16 @@ defineOptions({ name: 'Location' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Location.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询列表参数设置 
 const searchTableParams = ref([{
   formField: 'warehouseCode',
@@ -100,6 +115,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:location:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:location:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -150,10 +166,6 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
-  console.log(145, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]

src/views/wms/locationgroup/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Locationgroup.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,6 +73,16 @@ defineOptions({ name: 'Locationgroup' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Locationgroup.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询列表参数设置 
 const searchTableParams = ref([{
   formField: 'warehouseCode',
@@ -94,6 +109,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:locationgroup:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:locationgroup:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/owner/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Owner.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -65,6 +70,16 @@ defineOptions({ name: 'Owner' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Owner.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: OwnerApi.getOwnerPage // 分页接口
 })
@@ -78,6 +93,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:owner:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:owner:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/paramsetting/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Paramsetting.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,6 +73,16 @@ defineOptions({ name: 'Paramsetting' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Paramsetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: ParamsettingApi.getParamsettingPage // 分页接口
 })
@@ -81,6 +96,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:paramsetting:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:paramsetting:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/process/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Process.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,6 +73,16 @@ defineOptions({ name: 'Process' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Process.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询列表参数设置 
 const searchTableParams = ref([{
   formField: 'workshopCode',
@@ -94,6 +109,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:process:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:process:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/productionline/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Productionline.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,6 +73,16 @@ defineOptions({ name: 'Productionline' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Productionline.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询列表参数设置 
 const searchTableParams = ref([{
   formField: 'workshopCode',
@@ -99,6 +114,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:productionline:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:productionline:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/project/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Project.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -67,6 +72,16 @@ defineOptions({ name: 'Project' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Project.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询列表参数设置 
 const searchTableParams = ref([{
   formField: 'customerCode',
@@ -88,6 +103,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:project:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:project:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/purchaseprice/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Purchaseprice.allSchemas.tableColumns"
+    :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,6 +73,16 @@ defineOptions({ name: 'Purchaseprice' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Purchaseprice.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询列表参数设置 
 const searchTableParams = ref([{
   formField: 'supplierCode',
@@ -94,6 +109,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:purchaseprice:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:purchaseprice:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/recordsetting/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Recordsetting.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,6 +73,16 @@ defineOptions({ name: 'Recordsetting' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Recordsetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: RecordsettingApi.getRecordsettingPage // 分页接口
 })
@@ -78,9 +93,10 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:recordsetting:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:recordsetting:import'}), // 导入
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:recordsetting:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:recordsetting:export'}), // 导出
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:recordsetting:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/requestsetting/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Requestsetting.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,6 +73,16 @@ defineOptions({ name: 'Requestsetting' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Requestsetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: RequestsettingApi.getRequestsettingPage // 分页接口
 })
@@ -78,9 +93,10 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:requestsetting:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:requestsetting:import'}), // 导入
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:requestsetting:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:requestsetting:export'}), // 导出
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:requestsetting:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/rule/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Rule.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,6 +73,16 @@ defineOptions({ name: 'Rule' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Rule.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: RuleApi.getRulePage // 分页接口
 })
@@ -81,6 +96,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:rule:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:rule:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/saleprice/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Saleprice.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -20,9 +25,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #customercode="{row}">
+      <template #customerCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '客户代码', row.customercode)">
+        <el-button type="primary" link @click="openDetail(row, '客户代码', row.customerCode)">
-          <span>{{ row.customercode }}</span>
+          <span>{{ row.customerCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -68,14 +73,24 @@ defineOptions({ name: 'Saleprice' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Saleprice.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询列表参数设置 
 const searchTableParams = ref([{
-  formField: 'customercode',
+  formField: 'customerCode',
   searchTableTitle: '客户信息',
   searchTableAllSchemas: Customer.allSchemas,
   searchTablePage: CustomerApi.getCustomerPage
 },{
-  formField: 'itemcode',
+  formField: 'itemCode',
   searchTableTitle: '物料信息',
   searchTableAllSchemas: Itembasic.allSchemas,
   searchTablePage: ItembasicApi.getItembasicPage
@@ -94,6 +109,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:saleprice:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:saleprice:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/shift/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Shift.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -65,6 +70,16 @@ defineOptions({ name: 'Shift' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Shift.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: ShiftApi.getShiftPage // 分页接口
 })
@@ -78,6 +93,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:shift:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:shift:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/supplier/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Supplier.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -65,6 +70,16 @@ defineOptions({ name: 'Supplier' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Supplier.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: SupplierApi.getSupplierPage // 分页接口
 })
@@ -78,6 +93,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:supplier:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:supplier:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/supplieritem/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName"
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Supplieritem.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -70,6 +75,16 @@ defineOptions({ name: 'Supplieritem' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Supplieritem.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询列表参数设置 
 const searchTableParams = ref([{
   formField: 'supplierCode',
@@ -106,6 +121,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:supplieritem:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:supplieritem:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/systemcalendar/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Systemcalendar.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -65,6 +70,16 @@ defineOptions({ name: 'Systemcalendar' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Systemcalendar.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: SystemcalendarApi.getSystemcalendarPage // 分页接口
 })
@@ -78,6 +93,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:systemcalendar:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:systemcalendar:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/team/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Team.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -65,6 +70,16 @@ defineOptions({ name: 'Team' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Team.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: TeamApi.getTeamPage // 分页接口
 })
@@ -78,6 +93,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:team:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:team:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/transactiontype/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Transactiontype.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -68,8 +73,18 @@ defineOptions({ name: 'Transactiontype' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Transactiontype.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
-  getListApi: TransactiontypeApi.getTransactiontype // 分页接口
+  getListApi: TransactiontypeApi.getTransactiontypePage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -78,9 +93,10 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:transactiontype:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:transactiontype:import'}), // 导入
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:transactiontype:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:transactiontype:export'}), // 导出
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:transactiontype:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -184,4 +200,4 @@ onMounted(async() => {
   getList()
   importTemplateData.templateUrl = await TransactiontypeApi.importTemplate()
 })
-</script>
+</script>

src/views/wms/warehouse/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Warehouse.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -64,6 +69,16 @@ defineOptions({ name: 'Warehouse' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Warehouse.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: WarehouseApi.getWarehousePage // 分页接口
 })
@@ -77,6 +92,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:warehouse:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:warehouse:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/workshop/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Workshop.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -64,6 +69,16 @@ defineOptions({ name: 'Workshop' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Workshop.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: WorkshopApi.getWorkshopPage // 分页接口
 })
@@ -77,6 +92,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:workshop:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:workshop:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',

src/views/wms/workstation/index.vue

@@ -5,12 +5,17 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" />
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   />
 
   <!-- 列表 -->
   <ContentWrap>
     <Table
-      :columns="Workstation.allSchemas.tableColumns"
+      :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
       :pagination="{
@@ -69,6 +74,16 @@ defineOptions({ name: 'Workstation' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Workstation.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 查询列表参数设置 
 const searchTableParams = ref([{
   formField: 'workshopCode',
@@ -105,6 +120,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:workstation:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:workstation:export'}), // 导出
   defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',