#

Junjie

2024-09-20 b9498279476a649fe8a6861b7b6032bbd9ff7b7a

#

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

@@ -41,18 +41,18 @@
    console.log('Failed:', errorInfo);
};

const orderQueryList = ref(null); 
const orderQueryList = ref(null);
orderQuery();
function orderQuery() { 
    postForm('/api/order/query', {}).then(resp => { 
function orderQuery() {
    postForm('/api/order/query', {}).then(resp => {
        let result = resp.data;
        orderQueryList.value = result.data;
    })
}
const userQueryList = ref(null); 
const userQueryList = ref(null);
userQuery();
function userQuery() { 
    postForm('/api/user/query', {}).then(resp => { 
function userQuery() {
    postForm('/api/user/query', {}).then(resp => {
        let result = resp.data;
        userQueryList.value = result.data;
    })
@@ -79,137 +79,73 @@
        <a-modal v-model:open="open"
            :title="isSave ? formatMessage('page.add', '添加') : formatMessage('page.edit', '编辑')" @ok="handleOk"
            style="width: 600px;">
            <a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }"
                style="display: flex;justify-content: space-between;flex-wrap: wrap;" autocomplete="off"
                @finish="onFinish" @finishFailed="onFinishFailed">
                    <a-form-item 
                      :label="formatMessage('db.man_cache_site.site_no', '站点编号') " 
                      name="siteNo" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.siteNo" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_cache_site.site_status', '站点状态') " 
                      name="siteStatus" 
                      style="width: 250px;" 
                            >
                    <a-select 
                        v-model:value="formData.siteStatus" 
                        :options="[
                                { label: '空站', value: 0 },
                                { label: '满站', value: 1 },
                                { label: '预约', value: 2 },
                            ]"
                        >
            <a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 8 }"
                :wrapper-col="{ span: 16 }" style="display: flex;justify-content: space-between;flex-wrap: wrap;"
                autocomplete="off" @finish="onFinish" @finishFailed="onFinishFailed">
                <a-form-item :label="formatMessage('db.man_cache_site.channel', '通道')" name="channel"
                    style="width: 250px;">
                    <a-input v-model:value="formData.channel" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_cache_site.site_no', '站点编号')" name="siteNo"
                    style="width: 250px;">
                    <a-input v-model:value="formData.siteNo" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_cache_site.site_status', '站点状态')" name="siteStatus"
                    style="width: 250px;">
                    <a-select v-model:value="formData.siteStatus" :options="[
                        { label: '空站', value: 0 },
                        { label: '满站', value: 1 },
                        { label: '预约', value: 2 },
                    ]">
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_cache_site.order_id', '订单ID') " 
                      name="orderId" 
                      style="width: 250px;" 
                            >
                    <a-select 
                        v-model:value="formData.orderId" 
                        :placeholder="formatMessage('common.select', '请选择')" 
                        style="width: 100%" 
                        show-search 
                        :options="orderQueryList" 
                        optionFilterProp="label" 
                        optionLabelProp="label" 
                     > 
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_cache_site.order_id', '订单ID')" name="orderId"
                    style="width: 250px;">
                    <!-- <a-select v-model:value="formData.orderId" :placeholder="formatMessage('common.select', '请选择')"
                        style="width: 100%" show-search :options="orderQueryList" optionFilterProp="label"
                        optionLabelProp="label">
                    </a-select> -->
                    <a-input v-model:value="formData.orderId" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_cache_site.order_no', '订单编号')" name="orderNo"
                    style="width: 250px;">
                    <a-input v-model:value="formData.orderNo" />
                </a-form-item>
                <!-- <a-form-item :label="formatMessage('db.man_cache_site.status', '状态')" name="status"
                    style="width: 250px;">
                    <a-select v-model:value="formData.status" :options="[
                        { label: '正常', value: 1 },
                        { label: '禁用', value: 0 },
                    ]">
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_cache_site.order_no', '订单编号') " 
                      name="orderNo" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.orderNo" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_cache_site.status', '状态') " 
                      name="status" 
                      style="width: 250px;" 
                            >
                    <a-select 
                        v-model:value="formData.status" 
                        :options="[
                                { label: '正常', value: 1 },
                                { label: '禁用', value: 0 },
                            ]"
                        >
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_cache_site.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" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_cache_site.create_by', '添加人员')" name="createBy"
                    style="width: 250px;">
                    <a-select v-model:value="formData.createBy" :placeholder="formatMessage('common.select', '请选择')"
                        style="width: 100%" show-search :options="userQueryList" optionFilterProp="label"
                        optionLabelProp="label">
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_cache_site.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" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_cache_site.create_by', '添加人员') " 
                      name="createBy" 
                      style="width: 250px;" 
                            >
                    <a-select 
                        v-model:value="formData.createBy" 
                        :placeholder="formatMessage('common.select', '请选择')" 
                        style="width: 100%" 
                        show-search 
                        :options="userQueryList" 
                        optionFilterProp="label" 
                        optionLabelProp="label" 
                     > 
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_cache_site.update_time', '修改时间')" name="updateTime"
                    style="width: 250px;">
                    <a-date-picker v-model:value="formData.updateTime" show-time format="YYYY-MM-DD HH:mm:ss"
                        value-format="YYYY-MM-DD HH:mm:ss" />
                </a-form-item>
                <a-form-item :label="formatMessage('db.man_cache_site.update_by', '修改人员')" name="updateBy"
                    style="width: 250px;">
                    <a-select v-model:value="formData.updateBy" :placeholder="formatMessage('common.select', '请选择')"
                        style="width: 100%" show-search :options="userQueryList" optionFilterProp="label"
                        optionLabelProp="label">
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_cache_site.update_time', '修改时间') " 
                      name="updateTime" 
                      style="width: 250px;" 
                            >
                    <a-date-picker 
                        v-model:value="formData.updateTime" 
                        show-time 
                        format="YYYY-MM-DD HH:mm:ss" 
                        value-format="YYYY-MM-DD HH:mm:ss" 
                     /> 
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_cache_site.update_by', '修改人员') " 
                      name="updateBy" 
                      style="width: 250px;" 
                            >
                    <a-select 
                        v-model:value="formData.updateBy" 
                        :placeholder="formatMessage('common.select', '请选择')" 
                        style="width: 100%" 
                        show-search 
                        :options="userQueryList" 
                        optionFilterProp="label" 
                        optionLabelProp="label" 
                     > 
                    </a-select>
                        </a-form-item>
                    <a-form-item 
                      :label="formatMessage('db.man_cache_site.memo', '备注') " 
                      name="memo" 
                      style="width: 250px;" 
                            >
                    <a-input 
                        v-model:value="formData.memo" 
                     /> 
                        </a-form-item>
                </a-form-item> -->
                <a-form-item :label="formatMessage('db.man_cache_site.memo', '备注')" name="memo" style="width: 250px;">
                    <a-input v-model:value="formData.memo" />
                </a-form-item>

                <a-form-item>
                    <a-button type="primary" html-type="submit" ref="submitButton"

 zy-asrs-admin/src/views/base/cacheSite/index.vue

@@ -31,76 +31,83 @@
} = useTableSearch();

const columns = [
        {
            title: formatMessage('db.man_cache_site.site_no', '站点编号'),
            dataIndex: 'siteNo',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('siteNo'),
        },
        {
            title: formatMessage('db.man_cache_site.site_status', '站点状态'),
            dataIndex: 'siteStatus$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('siteStatus$'),
        },
        {
            title: formatMessage('db.man_cache_site.order_id', '订单ID'),
            dataIndex: 'orderId$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('orderId$'),
        },
        {
            title: formatMessage('db.man_cache_site.order_no', '订单编号'),
            dataIndex: 'orderNo',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('orderNo'),
        },
        {
            title: formatMessage('db.man_cache_site.status', '状态'),
            dataIndex: 'status$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('status$'),
        },
        {
            title: formatMessage('db.man_cache_site.create_time', '添加时间'),
            dataIndex: 'createTime$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('createTime$'),
        },
        {
            title: formatMessage('db.man_cache_site.create_by', '添加人员'),
            dataIndex: 'createBy$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('createBy$'),
        },
        {
            title: formatMessage('db.man_cache_site.update_time', '修改时间'),
            dataIndex: 'updateTime$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('updateTime$'),
        },
        {
            title: formatMessage('db.man_cache_site.update_by', '修改人员'),
            dataIndex: 'updateBy$',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('updateBy$'),
        },
        {
            title: formatMessage('db.man_cache_site.memo', '备注'),
            dataIndex: 'memo',
            width: 140,
            ellipsis: true,
            ...getColumnSearchProps('memo'),
        },
  {
    title: formatMessage('db.man_cache_site.channel', '通道'),
    dataIndex: 'channel',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('channel'),
  },
  {
    title: formatMessage('db.man_cache_site.site_no', '站点编号'),
    dataIndex: 'siteNo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('siteNo'),
  },
  {
    title: formatMessage('db.man_cache_site.site_status', '站点状态'),
    dataIndex: 'siteStatus$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('siteStatus$'),
  },
  {
    title: formatMessage('db.man_cache_site.order_id', '订单ID'),
    dataIndex: 'orderId$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderId$'),
  },
  {
    title: formatMessage('db.man_cache_site.order_no', '订单编号'),
    dataIndex: 'orderNo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('orderNo'),
  },
  // {
  //   title: formatMessage('db.man_cache_site.status', '状态'),
  //   dataIndex: 'status$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('status$'),
  // },
  // {
  //   title: formatMessage('db.man_cache_site.create_time', '添加时间'),
  //   dataIndex: 'createTime$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('createTime$'),
  // },
  // {
  //   title: formatMessage('db.man_cache_site.create_by', '添加人员'),
  //   dataIndex: 'createBy$',
  //   width: 140,
  //   ellipsis: true,
  //   ...getColumnSearchProps('createBy$'),
  // },
  {
    title: formatMessage('db.man_cache_site.update_time', '修改时间'),
    dataIndex: 'updateTime$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('updateTime$'),
  },
  {
    title: formatMessage('db.man_cache_site.update_by', '修改人员'),
    dataIndex: 'updateBy$',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('updateBy$'),
  },
  {
    title: formatMessage('db.man_cache_site.memo', '备注'),
    dataIndex: 'memo',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('memo'),
  },

  {
    title: formatMessage('common.operation', '操作'),
@@ -224,7 +231,8 @@
    <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
      :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
      :pagination="{ total: tableData.total, onChange: onPageChange }"
      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn" :loading="state.loading">
      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn"
      :loading="state.loading">
      <template #bodyCell="{ column, text, record }">
        <template v-if="column.dataIndex === 'oper'">
          <div style="display: flex;justify-content: space-evenly;">