zhuxinbo vor 4 Jahren
Ursprung
Commit
b01161a337

+ 15 - 8
src/views/modules/BatchCreate/TouTiaoBatch.vue

@@ -73,7 +73,7 @@
                  <a-range-picker v-model="dateValue" :disabled-date="disabledDate"  style="width: 250px;" format="YYYY-MM-DD" @change="dateChange" />
             </span>
             <span class="OptinItem">
-                <a-input-search placeholder="请输入ID或名称关键词" v-model="optionId" style="width: 200px"  />
+                <a-input-search placeholder="请输入名称关键词" v-model="optionId" style="width: 200px"  />
             </span>
             <span class="optionBtn">
                 <a-button type='primary' @click="search" class="searchBtn">查询</a-button>
@@ -411,15 +411,15 @@ const planColumns = [
     dataIndex: 'name',
     key: 'name',
     align: 'center',
-    width:300,
+    width:200,
     scopedSlots: { customRender: 'name' }
   },
-  {
-    title: '计划ID',
-    dataIndex: 'id',
-    key: 'id',
-    align: 'center',
-  },
+    // {
+    //     title: '计划ID',
+    //     dataIndex: 'id',
+    //     key: 'id',
+    //     align: 'center',
+    // },
   {
     title: '账户',
     dataIndex: 'accountId_dictText',
@@ -464,6 +464,13 @@ const planColumns = [
     align: 'center',
     scopedSlots: { customRender: 'campaignId_dictText' }
   },
+  {
+    title: '创建时间',
+    dataIndex: 'adCreateTime',
+    key: 'adCreateTime',
+    align: 'center',
+    scopedSlots: { customRender: 'adCreateTime' }
+  },
 ];
 const ideaColumns = [
   {

+ 2 - 1
src/views/system/QuartzJobList.vue

@@ -207,12 +207,13 @@
       handleTableChange(pagination, filters, sorter) {
         //分页、排序、筛选变化时触发
         //TODO 筛选
+        console.log(pagination, filters, sorter)
         if (Object.keys(sorter).length > 0) {
           this.isorter.column = sorter.field;
           this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
         }
         //这种筛选方式只支持单选
-        this.filters.status = filters.status[0];
+        // this.filters.status = filters.status[0];
         this.ipagination = pagination;
         this.loadData();
       },

+ 2 - 1
src/views/system/modules/UserModal.vue

@@ -41,7 +41,7 @@
         </a-form-item>
 
         <a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入工号" v-decorator.trim="[ 'workNo', validatorRules.workNo]" />
+          <a-input placeholder="请输入工号" v-decorator.trim="[ 'workNo']" />
         </a-form-item>
 
         <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -211,6 +211,7 @@
           phone:{rules: [{validator: this.validatePhone}]},
           email:{
             rules: [{
+              required: true,
               validator: this.validateEmail
             }],
           },

+ 1 - 0
vue.config.js

@@ -57,6 +57,7 @@ module.exports = {
     proxy: {
       '/jeecg-boot': {
         // target: 'http://192.168.1.90:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+        // target: 'http://192.168.0.59:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.1.72:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.94:8088', //请求本地 需要jeecg-boot后台项目  孙震