tanyanfei 5 年之前
父节点
当前提交
d040d457d1
共有 4 个文件被更改,包括 52 次插入46 次删除
  1. 19 16
      src/views/apply/Change.vue
  2. 11 11
      src/views/apply/New.vue
  3. 19 16
      src/views/apply/Update.vue
  4. 3 3
      src/views/project/Index.vue

+ 19 - 16
src/views/apply/Change.vue

@@ -114,7 +114,7 @@
                 </el-form-item>
                 <el-form-item label="培训时间">
                     <el-date-picker clearable
-                    v-model="form.train_time"
+                    v-model="form.train_time1"
                     type="daterange" value-format="yyyy-MM-dd"
                     range-separator="至"
                     start-placeholder="开始日期"
@@ -172,7 +172,7 @@
 
         </div>
         <el-table
-                class="table"
+                class="table" :fit='true'
                 :data="list" v-loading="loading"
                  @selection-change="handleSelectionChange"
                 border 
@@ -218,18 +218,18 @@
         <Page  ref="pageButton"  :total='total' @pageChange='gopage'/>
         
         <el-dialog
-            :title="text" 
+            :title="text"  
             :visible.sync="dialogVisible"
             width="30%">
             <el-date-picker
-            v-model="time" v-if='date_type == 1'
+            v-model="time1" v-show='date_type == 1'
             type="daterange" value-format="yyyy-MM-dd"
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期">
             </el-date-picker>
             <el-date-picker
-            v-model="time" v-else
+            v-model="time2" v-show='date_type == 2'
             type="date" value-format="yyyy-MM-dd">
             </el-date-picker>
             <span slot="footer" class="dialog-footer">
@@ -257,24 +257,25 @@ export default {
           {name:'状态', value:'order_status_1',checked:true,width:'120px'},
           {name:'管理员备注', value:'remark',checked:true,width:'150px'},
           {name:'报名类型', value:'subject_item0',checked:true,width:'120px'},
-          {name:'作业类别', value:'subject_item1',checked:true},
-          {name:'准操项目', value:'subject_item2',checked:true},
+          {name:'作业类别', value:'subject_item1',checked:true,width:'150px'},
+          {name:'准操项目', value:'subject_item2',checked:true,width:'200px'},
           {name:'培训类型', value:'train_type',checked:true},
+          {name:'培训时间', value:'train_time',checked:true,width:'200px'},
           {name:'考试时间', value:'exam_time',checked:true,width:'150px'},
-          {name:'ID', value:'id',checked:true},
           {name:'支付状态', value:'pay_status_1',checked:true},
           {name:'支付金额', value:'price',checked:true},
-          {name:'更新时间', value:'ctime',checked:true,width:'170px'},
-          {name:'发票类型', value:'bill_type_1',checked:true,width:'120px'},
-          {name:'领证方式', value:'receive_card',checked:true},
-          {name:'实名认证', value:'verify_1',checked:true},
           {name:'报名时间', value:'signup_time',checked:true,width:'150px'},
-          {name:'培训时间', value:'train_time',checked:true,width:'150px'},
           {name:'公司名称', value:'company',checked:true,width:'200px'},
+          {name:'更新时间', value:'ctime',checked:false,width:'170px'},
+          {name:'发票类型', value:'bill_type_1',checked:false,width:'120px'},
+          {name:'领证方式', value:'receive_card',checked:false},
+          {name:'实名认证', value:'verify_1',checked:true},
+          {name:'ID', value:'id',checked:false},
       ],
       text:'批量设置培训时间',
       date_type:1,
-      time:'',
+      time1:null,
+      time2:'',
       form:{train_type:'换证',subject_item:'',order_status:'',page:1},
       activeName:"1",
       total:1,
@@ -295,6 +296,7 @@ export default {
       },
       getData(){
           var parm=this.form;
+          if(parm.train_time1){parm.train_time=parm.train_time1.join(',')};
           this.loading=true;
           if(this.order_status != '-3'){parm.order_status=this.order_status}else{parm.order_status=''}
           this.$api.getSignList(parm).then(res=>{
@@ -407,10 +409,11 @@ export default {
       },
       save(){
           var parm={id:this.select_ids}
+          console.log(this.time)
           if(this.date_type == 1){
-              parm.train_time=this.time.join(',')
+              parm.train_time=this.time1.join(',')
           }else{
-              parm.exam_time=this.time
+              parm.exam_time=this.time2
           }
            this.$api.updateSign(parm).then((res)=>{
                     if(res.data.code == 0){

+ 11 - 11
src/views/apply/New.vue

@@ -172,7 +172,7 @@
 
         </div>
         <el-table
-                class="table"
+                class="table" :fit='true'
                 :data="list" v-loading="loading"
                  @selection-change="handleSelectionChange"
                 border 
@@ -218,7 +218,7 @@
         <Page  ref="pageButton"  :total='total' @pageChange='gopage'/>
         
         <el-dialog
-            :title="text" 
+            :title="text"  
             :visible.sync="dialogVisible"
             width="30%">
             <el-date-picker
@@ -257,20 +257,20 @@ export default {
           {name:'状态', value:'order_status_1',checked:true,width:'120px'},
           {name:'管理员备注', value:'remark',checked:true,width:'150px'},
           {name:'报名类型', value:'subject_item0',checked:true,width:'120px'},
-          {name:'作业类别', value:'subject_item1',checked:true},
-          {name:'准操项目', value:'subject_item2',checked:true},
+          {name:'作业类别', value:'subject_item1',checked:true,width:'150px'},
+          {name:'准操项目', value:'subject_item2',checked:true,width:'200px'},
           {name:'培训类型', value:'train_type',checked:true},
+          {name:'培训时间', value:'train_time',checked:true,width:'200px'},
           {name:'考试时间', value:'exam_time',checked:true,width:'150px'},
-          {name:'ID', value:'id',checked:true},
           {name:'支付状态', value:'pay_status_1',checked:true},
           {name:'支付金额', value:'price',checked:true},
-          {name:'更新时间', value:'ctime',checked:true,width:'170px'},
-          {name:'发票类型', value:'bill_type_1',checked:true,width:'120px'},
-          {name:'领证方式', value:'receive_card',checked:true},
-          {name:'实名认证', value:'verify_1',checked:true},
           {name:'报名时间', value:'signup_time',checked:true,width:'150px'},
-          {name:'培训时间', value:'train_time',checked:true,width:'200px'},
           {name:'公司名称', value:'company',checked:true,width:'200px'},
+          {name:'更新时间', value:'ctime',checked:false,width:'170px'},
+          {name:'发票类型', value:'bill_type_1',checked:false,width:'120px'},
+          {name:'领证方式', value:'receive_card',checked:false},
+          {name:'实名认证', value:'verify_1',checked:true},
+          {name:'ID', value:'id',checked:false},
       ],
       text:'批量设置培训时间',
       date_type:1,
@@ -296,7 +296,7 @@ export default {
       },
       getData(){
           var parm=this.form;
-          parm.train_time=parm.train_time1.join(',');
+          if(parm.train_time1){parm.train_time=parm.train_time1.join(',')};
           this.loading=true;
           if(this.order_status != '-3'){parm.order_status=this.order_status}else{parm.order_status=''}
           this.$api.getSignList(parm).then(res=>{

+ 19 - 16
src/views/apply/Update.vue

@@ -114,7 +114,7 @@
                 </el-form-item>
                 <el-form-item label="培训时间">
                     <el-date-picker clearable
-                    v-model="form.train_time"
+                    v-model="form.train_time1"
                     type="daterange" value-format="yyyy-MM-dd"
                     range-separator="至"
                     start-placeholder="开始日期"
@@ -172,7 +172,7 @@
 
         </div>
         <el-table
-                class="table"
+                class="table" :fit='true'
                 :data="list" v-loading="loading"
                  @selection-change="handleSelectionChange"
                 border 
@@ -218,18 +218,18 @@
         <Page  ref="pageButton"  :total='total' @pageChange='gopage'/>
         
         <el-dialog
-            :title="text" 
+            :title="text"  
             :visible.sync="dialogVisible"
             width="30%">
             <el-date-picker
-            v-model="time" v-if='date_type == 1'
+            v-model="time1" v-show='date_type == 1'
             type="daterange" value-format="yyyy-MM-dd"
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期">
             </el-date-picker>
             <el-date-picker
-            v-model="time" v-else
+            v-model="time2" v-show='date_type == 2'
             type="date" value-format="yyyy-MM-dd">
             </el-date-picker>
             <span slot="footer" class="dialog-footer">
@@ -257,24 +257,25 @@ export default {
           {name:'状态', value:'order_status_1',checked:true,width:'120px'},
           {name:'管理员备注', value:'remark',checked:true,width:'150px'},
           {name:'报名类型', value:'subject_item0',checked:true,width:'120px'},
-          {name:'作业类别', value:'subject_item1',checked:true},
-          {name:'准操项目', value:'subject_item2',checked:true},
+          {name:'作业类别', value:'subject_item1',checked:true,width:'150px'},
+          {name:'准操项目', value:'subject_item2',checked:true,width:'200px'},
           {name:'培训类型', value:'train_type',checked:true},
+          {name:'培训时间', value:'train_time',checked:true,width:'200px'},
           {name:'考试时间', value:'exam_time',checked:true,width:'150px'},
-          {name:'ID', value:'id',checked:true},
           {name:'支付状态', value:'pay_status_1',checked:true},
           {name:'支付金额', value:'price',checked:true},
-          {name:'更新时间', value:'ctime',checked:true,width:'170px'},
-          {name:'发票类型', value:'bill_type_1',checked:true,width:'120px'},
-          {name:'领证方式', value:'receive_card',checked:true},
-          {name:'实名认证', value:'verify_1',checked:true},
           {name:'报名时间', value:'signup_time',checked:true,width:'150px'},
-          {name:'培训时间', value:'train_time',checked:true,width:'150px'},
           {name:'公司名称', value:'company',checked:true,width:'200px'},
+          {name:'更新时间', value:'ctime',checked:false,width:'170px'},
+          {name:'发票类型', value:'bill_type_1',checked:false,width:'120px'},
+          {name:'领证方式', value:'receive_card',checked:false},
+          {name:'实名认证', value:'verify_1',checked:true},
+          {name:'ID', value:'id',checked:false},
       ],
       text:'批量设置培训时间',
       date_type:1,
-      time:'',
+      time1:null,
+      time2:'',
       form:{train_type:'复审',subject_item:'',order_status:'',page:1},
       activeName:"1",
       total:1,
@@ -295,6 +296,7 @@ export default {
       },
       getData(){
           var parm=this.form;
+          if(parm.train_time1){parm.train_time=parm.train_time1.join(',')};
           this.loading=true;
           if(this.order_status != '-3'){parm.order_status=this.order_status}else{parm.order_status=''}
           this.$api.getSignList(parm).then(res=>{
@@ -407,10 +409,11 @@ export default {
       },
       save(){
           var parm={id:this.select_ids}
+          console.log(this.time)
           if(this.date_type == 1){
-              parm.train_time=this.time.join(',')
+              parm.train_time=this.time1.join(',')
           }else{
-              parm.exam_time=this.time
+              parm.exam_time=this.time2
           }
            this.$api.updateSign(parm).then((res)=>{
                     if(res.data.code == 0){

+ 3 - 3
src/views/project/Index.vue

@@ -104,15 +104,15 @@
                         <el-input v-model="form.name"></el-input>
                         <span class="req">*</span>
                     </el-form-item>
-                    <el-form-item label="新办价格" v-if='form.isleaf'>
+                    <el-form-item label="新办价格" >
                           <el-input-number v-model="form.price_new" controls-position="right"  :min="0"></el-input-number>
                           <span class="req">*</span>
                     </el-form-item>
-                    <el-form-item label="复审价格" v-if='form.isleaf'>
+                    <el-form-item label="复审价格" >
                           <el-input-number v-model="form.price_re" controls-position="right" :min="0" ></el-input-number>
                           <span class="req">*</span>
                     </el-form-item>
-                    <el-form-item label="换证价格" v-if='form.isleaf'>
+                    <el-form-item label="换证价格" >
                           <el-input-number v-model="form.price_change" controls-position="right" :min="0" ></el-input-number>
                           <span class="req">*</span>
                     </el-form-item>