Merge remote-tracking branch 'origin/wms-dev' into wms-dev

ZY

2024-08-20 1c02f5b648cd3c58a7db7dcec761071d5daabb26

 zy-asrs-admin/src/views/base/locTypeBind/edit.vue

@@ -132,7 +132,7 @@
                    ]">
                    </a-select>
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_loc_type_bind.create_time', '添加时间')" name="createTime"
                <!-- <a-form-item :label="formatMessage('db.man_loc_type_bind.create_time', '添加时间')" name="createTime"
                    style="width: 250px;">
                    <a-date-picker v-model:value="formData.createTime" show-time format="YYYY-MM-DD HH:mm:ss"
                        value-format="YYYY-MM-DD HH:mm:ss" />
@@ -155,7 +155,7 @@
                        style="width: 100%" show-search :options="userQueryList" optionFilterProp="label"
                        optionLabelProp="label">
                    </a-select>
                </a-form-item>
                </a-form-item> -->
                <a-form-item :label="formatMessage('db.man_loc_type_bind.memo', '备注')" name="memo"
                    style="width: 250px;">
                    <a-input v-model:value="formData.memo" />