Merge branch 'ziyouqishi' into api.essencefunds.com

zzzz

2024-04-22 4e4b6e218ad4a875c46661e15634e466d4135171

 src/views/newshares/newshareslist.vue

@@ -185,24 +185,24 @@
        </a-row>
        <a-row :gutter="48">
          <a-col :md="12" :lg="12" :sm="12">
            <a-form-item label="认缴时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
            <a-form-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-date-picker
                show-time
                style="width: 100%"
                @change="getsubscriptionTime"
                v-decorator="['subscriptionTime', { rules: [{ required: true, message: '请填写认缴时间' }] }]"
                v-decorator="['subscriptionTime', { rules: [{ required: true, message: '请填写开始时间' }] }]"
                format="YYYY-MM-DD HH:mm:ss"
              >
              </a-date-picker>
            </a-form-item>
          </a-col>
          <a-col :md="12" :lg="12" :sm="12">
            <a-form-item label="申购时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
            <a-form-item label="结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-date-picker
                show-time
                style="width: 100%"
                @change="getsubscribeTime"
                v-decorator="['subscribeTime', { rules: [{ required: true, message: '请填写申购时间' }] }]"
                v-decorator="['subscribeTime', { rules: [{ required: true, message: '请填写结束时间' }] }]"
                format="YYYY-MM-DD HH:mm:ss"
              >
              </a-date-picker>
@@ -276,15 +276,15 @@
          align: 'center',
          scopedSlots: { customRender: 'type' },
        },
        {
          title: '股票类型',
          dataIndex: 'stockType',
          align: 'center',
          scopedSlots: { customRender: 'stockType' },
        },
        // {
        //   title: '股票类型',
        //   dataIndex: 'stockType',
        //   align: 'center',
        //   scopedSlots: { customRender: 'stockType' },
        // },

        {
          title: '申购时间',
          title: '结束时间',
          dataIndex: 'subscribeTime',
          align: 'center',
          customRender: (text, row, index) => {
@@ -292,7 +292,7 @@
          },
        },
        {
          title: '认缴时间',
          title: '开始时间',
          dataIndex: 'subscriptionTime',
          align: 'center',
          customRender: (text, row, index) => {