Merge branch 'V0.0.3' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.3

src/views/core/outIn/approve/dialog.approve.letter.detail.vue

@@ -61,9 +61,9 @@
               </el-form-item>
             </el-col>          
           </el-row>
-          <el-row :gutter="10" class="mb8">
+          <el-row :gutter="10">
             <el-col :span="12">
-                <h3 class="title">
+                <h3>
                   <i class="el-icon-collection-tag"></i>
                   人员信息
                 </h3> 
@@ -86,9 +86,9 @@
                     </template> 
               </el-table-column>             
           </el-table>     
-          <el-row :gutter="10" class="mb8">
+          <el-row :gutter="10">
             <el-col :span="12">
-                <h3 class="title">
+                <h3>
                   <i class="el-icon-collection-tag"></i>
                   审批信息
                 </h3> 

src/views/core/outIn/approve/dialog.approve.letter.vue

@@ -61,14 +61,13 @@
             </el-col>          
           </el-row>
 
-          <el-row :gutter="10" class="mb8">
+          <el-row :gutter="10" >
             <el-col :span="12">
-                <h3 class="title">
+                <h3>
                   <i class="el-icon-collection-tag"></i>
                   人员信息
                 </h3> 
-            </el-col>
-              
+            </el-col>              
           </el-row>   
           <el-table border :data="formData.userInfos" height="300">
                   <el-table-column label="序号"  align="center"  type="index" width="70" />
@@ -87,9 +86,9 @@
                           </template> 
                     </el-table-column>             
           </el-table>      
-          <el-row :gutter="10" class="mb8">
+          <el-row :gutter="10">
             <el-col :span="12">
-                <h3 class="title">
+                <h3>
                   <i class="el-icon-collection-tag"></i>
                   审批信息
                 </h3> 

src/views/core/outIn/letter/dialog.addletter.vue

@@ -83,15 +83,15 @@
             </el-col>
           </el-row>
 
-          <el-row :gutter="10" class="mb8">
+          <el-row :gutter="10">
             <el-col :span="12">
-                <h3 class="title">
+                <h3>
                   <i class="el-icon-collection-tag"></i>
                   人员信息
                 </h3> 
             </el-col>
-            <el-col :offset="8" :span="2" justify="end" type="flex">
-              <h3 class="title">
+            <el-col :offset="8" :span="2">
+              <h3>
                 <el-button
                 type="primary"
                 icon="el-icon-plus"
@@ -254,7 +254,7 @@ export default {
         reasons: null,
         letterNo:null,
         receptionOrgIds: [],
-        range:[],
+        // range:[],
         startTime:new Date(),
         effectiveDays:1,
         description: null,
@@ -280,10 +280,10 @@ export default {
         this.title = "修改介绍信";   
         this.isShow = true;
         getLetter(id).then((response) => {
-          let tempRange=[];
-          tempRange.push(dayjs(response.data.startTime));
-          tempRange.push(new Date(response.data.endTime));
-          response.data.range=tempRange;
+          // let tempRange=[];
+          // tempRange.push(dayjs(response.data.startTime));
+          // tempRange.push(new Date(response.data.endTime));
+          // response.data.range=tempRange;
           this.formData = response.data;
           this.formFileListDefualtValue=this.formData.letterFile;
         });        

src/views/core/outIn/letter/dialog.letter.detail.vue

@@ -64,9 +64,9 @@
             </el-col>
            
           </el-row>
-          <el-row :gutter="10" class="mb8">
+          <el-row :gutter="10">
             <el-col :span="12">
-                <h3 class="title">
+                <h3>
                   <i class="el-icon-collection-tag"></i>
                   人员信息
                 </h3> 

src/views/core/outIn/outInLog/dialog.outIn.detail.vue

@@ -131,7 +131,7 @@ export default {
     return {
       id: params ? params.id : null,
       isShow: false,
-      title: "出入事项审批",
+      title: "来访核验登记详情",
       formData: this.reset(),
       formDataRules: {
         approveStatus: [{ required: true, message: "请勾选审批结果" }],        
@@ -169,21 +169,13 @@ export default {
     //   console.log("checkApprove value",value);
     //   console.log("checkApprove callback",callback);
     // },
-    async show(id, other = {}) {     
-      if (id) {
-        this.title = "出入情况详情";   
+    async show(id, other = {}) {    
+        // this.title = "出入情况详情";   
         this.isShow = true;
         outInRecordDetail(id).then((response) => {
           this.formData = response.data;
           this.formFileListDefualtValue=this.formData.letterFile;
-        });        
-      }
-      else 
-      {
-        this.isShow = true;
-        this.title = "录入介绍信";
-        this.formData = this.reset();       
-      }
+        });      
     },
     handleAddUser() {
       this.open = true;

src/views/core/outIn/outInLog/index.vue

@@ -250,6 +250,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.range=[];
       this.handleQuery();
     },
     getDefaultKey(key) {