operation_pc-v2.git

operation_pc-v2

Merge remote-tracking branch 'origin/master'

mayf

2024-09-11 037e46d104c31f36acb67ce4b70ac14f0eb01a01

Merge remote-tracking branch 'origin/master'

已修改4个文件

	pages/partner/list.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/shop/list.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/supplier/list.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	utils/mark-up-config.js	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pages/partner/list.vue

@@ -105,6 +105,7 @@
                label: '启用/禁用',
                id: 'isEnabled',
                type: 'bus-select-dict',
                default: '1',
                el: {
                  code: 'USER_ENABLED_OR_DISABLED',
                  clearable: true,

 pages/shop/list.vue

@@ -66,6 +66,7 @@
                label: '启用/禁用',
                id: 'isEnabled',
                type: 'bus-select-dict',
                default: '1',
                el: {
                  code: 'USER_ENABLED_OR_DISABLED',
                  clearable: true,

 pages/supplier/list.vue

@@ -102,6 +102,7 @@
                label: '启用/禁用',
                id: 'isEnabled',
                type: 'bus-select-dict',
                default: '1',
                el: {
                  code: 'USER_ENABLED_OR_DISABLED',
                  clearable: true,

 utils/mark-up-config.js

@@ -235,6 +235,11 @@
              style: 'width:100%',
            },
          },
          {
            label: '供应商',
            id: 'supplierName',
            type: 'input',
          },
        ],
      },
    ],

			@@ -105,6 +105,7 @@
			label: '启用/禁用',
			id: 'isEnabled',
			type: 'bus-select-dict',
			default: '1',
			el: {
			code: 'USER_ENABLED_OR_DISABLED',
			clearable: true,

			@@ -66,6 +66,7 @@
			label: '启用/禁用',
			id: 'isEnabled',
			type: 'bus-select-dict',
			default: '1',
			el: {
			code: 'USER_ENABLED_OR_DISABLED',
			clearable: true,

			@@ -102,6 +102,7 @@
			label: '启用/禁用',
			id: 'isEnabled',
			type: 'bus-select-dict',
			default: '1',
			el: {
			code: 'USER_ENABLED_OR_DISABLED',
			clearable: true,

			@@ -235,6 +235,11 @@
			style: 'width:100%',
			},
			},
			{
			label: '供应商',
			id: 'supplierName',
			type: 'input',
			},
			],
			},
			],