Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

src/utils/request.js

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 6000000
 })
 
 // request拦截器

src/views/threeViolations/tFPasses/family.vue

@@ -11,17 +11,18 @@
       <!-- 权限-->
     </el-row>
     <br>
-    <el-form ref="form" label-width='80px'  :model="form" >
+    <el-form ref="form" label-width='80px'   >
        <el-row :gutter="20">
          <el-col :span="24">
            <el-form-item label="教育人">
-             <el-input v-model="vMain.rowItem.jsjyr" :readonly="readonly" rows="5" >
-             </el-input>
+            <!-- <el-input v-model="vMain.rowItem.jsjyr" :readonly="readonly" rows="5" >
+             </el-input> -->
+               <personSelector  :readonly="readonly"  :label="vMain.rowItem.jsjyrName||vMain.rowItem.jsjyr||'暂无'" @selected='jsjyrSelected' ></personSelector>
            </el-form-item>
          </el-col>
          <el-col :span="24">
-           <el-form-item label="教育时间">
-             <el-date-picker v-model="vMain.rowItem.jsjysj" :readonly="readonly" ></el-date-picker>
+           <el-form-item style="width: 100%;" label="教育时间">
+             <el-date-picker  type="datetime" v-model="vMain.rowItem.jsjysj" :readonly="readonly" ></el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="24">
@@ -48,6 +49,9 @@
     },
     props:['vMain'],
     methods: {
+      jsjyrSelected(row){
+        this.vMain.rowItem.jsjyr=row.id
+      },
       save(){
         let params=this.vMain.rowItem
         this.vMain.apiUpdate(params).then(res => {

src/views/threeViolations/tFPasses/leadership.vue

@@ -34,7 +34,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="教育时间">
-             <el-date-picker :readonly="readonly" v-model="vMain.rowItem.ldjysj" style="width: 100%;"></el-date-picker>
+             <el-date-picker type="datetime" :readonly="readonly" v-model="vMain.rowItem.ldjysj" style="width: 100%;"></el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="24">

src/views/threeViolations/tFPasses/reflect.vue

@@ -2,7 +2,7 @@
  <div class="form-detail">
    <el-row class="tool-bar">
  
-     <AttachFileButton :params="{childPath:'FSJC'}" :app='this'></AttachFileButton>
+     <AttachFileButton :params="{childPath:'FSJC'}" :app='vMain'></AttachFileButton>
      <el-button size='mini' @click.native="readonly=false;$success('开启编辑')"  type="primary">编辑</el-button>
      <el-button size='mini' @click.native="save()"  type="primary">保存</el-button>
      <!-- 额外按钮-->
@@ -22,7 +22,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="教育时间">
-            <el-date-picker  v-model="vMain.rowItem.fsjysj"  :readonly="readonly"  ></el-date-picker>
+            <el-date-picker type="datetime"  v-model="vMain.rowItem.fsjysj"  :readonly="readonly"  ></el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="24">

src/views/threeViolations/tFPasses/safetyCourse.vue

@@ -2,7 +2,7 @@
   <div class="form-detail">
     <el-row class="tool-bar">
 
-      <AttachFileButton  :params="{childPath:'AQBK'}" :app='this'></AttachFileButton>
+      <AttachFileButton  :params="{childPath:'AQBK'}" :app='vMain'></AttachFileButton>
       <el-button size='mini' @click.native="readonly=false;$success('开启编辑')"  type="primary">编辑</el-button>
       <el-button size='mini' @click.native="save()"  type="primary">保存</el-button>
       <!-- 额外按钮-->
@@ -22,7 +22,7 @@
          </el-col>
          <el-col :span="24">
            <el-form-item label="教育时间">
-             <el-date-picker  v-model="vMain.rowItem.aqjysj"  :readonly="readonly"  ></el-date-picker>
+             <el-date-picker type="datetime" v-model="vMain.rowItem.aqjysj"  :readonly="readonly"  ></el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="24">