调整 出人管理界面名词

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

@@ -10,40 +10,42 @@
           ref="form"
           :model="formData"
           label-width="120px"
-          label-suffix=":">
+          label-suffix=":">             
           <el-row>
-            <el-col :span="12">
-              <el-form-item label="出入类型">
+            <el-col :span="24">
+              <el-form-item label="介绍信类型">
               <dict-tag :options="dict.type.out_in_type" :value="formData.type"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="出入事由">
-              {{formData.reasons}}
+              <el-form-item label="介绍信编号">
+              {{formData.letterNo}}
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item  label="申请时间">
-              {{formData.createTime}}
+              <el-form-item label="接待机构" prop="receptionOrgIds">
+                {{formData.receptionOrgNames}}
+                <!-- <org-tree-select v-model="formData.receptionOrgIds" ref="orgTreeSelect">
+                </org-tree-select> -->
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="介绍信编号">
-              {{formData.letterNo}}
+            <el-col :span="24">
+              <el-form-item label="来访事由">
+              {{formData.reasons}}
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item  label="出入有效期">
-                {{ formData.startTimeStr}}~{{formData.endTimeStr}}
+              <el-form-item  label="开具日期">
+              {{formData.startTimeStr}}
               </el-form-item>
             </el-col>
+           
             <el-col :span="12">
-              <el-form-item label="接待机构" prop="receptionOrgIds">
-                {{formData.receptionOrgNames}}
-                <!-- <org-tree-select v-model="formData.receptionOrgIds" ref="orgTreeSelect">
-                </org-tree-select> -->
+              <el-form-item  label="有效天数">
+                {{ formData.effectiveDays}}
               </el-form-item>
             </el-col>
+           
             <el-col :span="12">
               <!-- <el-form-item label="介绍信" prop="letterNo">               
               </el-form-item> -->
@@ -59,25 +61,39 @@
               </el-form-item>
             </el-col>          
           </el-row>
-
           <el-row :gutter="10" class="mb8">
-            <el-col :span="24">
-              <el-form-item label="人员信息" prop="letterNo">
-                <el-table :data="formData.userInfos" height="300">
-                  <el-table-column label="人员姓名" width="150" align="center" prop="userName" />
-                  <el-table-column label="单位"  width="200" align="center" prop="companyName" />
-                  <el-table-column label="证件号码"  width="200" align="center" prop="idCard">
-                  </el-table-column>
-                  <el-table-column label="证件照"  align="center" prop="imgFile">
-                    <template slot-scope="scope">
-                      <ImageListPreview v-model="scope.row.imgFile"></ImageListPreview>
-                      <!-- <img width="50" height="50" :src="scope.row.imgFile" /> -->
+            <el-col :span="12">
+                <h3 class="title">
+                  <i class="el-icon-collection-tag"></i>
+                  人员信息
+                </h3> 
+            </el-col>              
+          </el-row>
+          <el-table border :data="formData.userInfos" height="300">
+            <el-table-column label="序号"  align="center"  type="index" width="70" />
+            <el-table-column label="来访单位" width="100" align="center" prop="companyName" />
+            <el-table-column label="来访人员" width="100" align="center" prop="userName" />
+            <el-table-column label="证件类型" width="100" align="center" prop="idType">
+              <template slot-scope="scope">
+              <dict-tag :options="dict.type.letter_id_type" :value="scope.row.idType"/>
+            </template>
+            </el-table-column>
+            <el-table-column label="证件号码" width="200" align="center" prop="idCard">
+            </el-table-column>
+            <el-table-column label="证件照" align="center" prop="imgFile">
+              <template slot-scope="scope">                      
+                      <ImageListPreview v-model="scope.row.imgFile"></ImageListPreview>                  
                     </template> 
-                  </el-table-column>            
-          </el-table>
-              </el-form-item>
-            </el-col>          
-          </el-row>          
+              </el-table-column>             
+          </el-table>     
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="12">
+                <h3 class="title">
+                  <i class="el-icon-collection-tag"></i>
+                  审批信息
+                </h3> 
+            </el-col>              
+          </el-row>      
           <el-row>
             <el-col :span="12">
               <el-form-item label="审批">   
@@ -117,12 +133,12 @@ export default {
     return {
       id: params ? params.id : null,
       isShow: false,
-      title: "出入事项审批详情",
+      title: "来访事项审批详情",
       formData: this.reset(),      
       formFileListDefualtValue: [],
     };
   },
-  dicts: ['out_in_type','out_in_approve_status'],
+  dicts: ['out_in_type','out_in_approve_status','letter_id_type'],
   props: {},
   watch: {},
   created() {},

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

@@ -15,41 +15,39 @@
           label-suffix=":"
         >
           <el-row>
-            <el-col :span="12">
-              <el-form-item label="出入类型">
+            <el-col :span="24">
+              <el-form-item label="介绍信类型">
               <dict-tag :options="dict.type.out_in_type" :value="formData.type"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="出入事由">
-              {{formData.reasons}}
+              <el-form-item label="介绍信编号">
+              {{formData.letterNo}}
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item  label="申请时间">
-              {{formData.createTime}}
+              <el-form-item label="接待机构" prop="receptionOrgIds">
+                {{formData.receptionOrgNames}}
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="介绍信编号">
-              {{formData.letterNo}}
+            <el-col :span="24">
+              <el-form-item label="来访事由">
+              {{formData.reasons}}
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item  label="出入有效期">
-                {{ formData.startTimeStr}}~{{formData.endTimeStr}}
+              <el-form-item  label="开具时间">
+              {{formData.startTimeStr}}
               </el-form-item>
             </el-col>
+           
             <el-col :span="12">
-              <el-form-item label="接待机构" prop="receptionOrgIds">
-                {{formData.receptionOrgNames}}
-                <!-- <org-tree-select v-model="formData.receptionOrgIds" ref="orgTreeSelect">
-                </org-tree-select> -->
+              <el-form-item  label="有效天数">
+                {{ formData.effectiveDays}}
               </el-form-item>
             </el-col>
+            
             <el-col :span="12">
-              <!-- <el-form-item label="介绍信" prop="letterNo">               
-              </el-form-item> -->
               <el-form-item label="介绍信">
                 <K-file-upload ref="upload" :isShowUploadBtn="false"
                                 :defaultValue="formFileListDefualtValue"
@@ -64,25 +62,42 @@
           </el-row>
 
           <el-row :gutter="10" class="mb8">
-            <el-col :span="24">
-              <el-form-item label="人员信息" prop="letterNo">
-                <el-table :data="formData.userInfos" height="300">
-                  <el-table-column label="人员姓名" width="150" align="center" prop="userName" />
-                  <el-table-column label="单位" width="200" align="center" prop="companyName" />
+            <el-col :span="12">
+                <h3 class="title">
+                  <i class="el-icon-collection-tag"></i>
+                  人员信息
+                </h3> 
+            </el-col>
+              
+          </el-row>   
+          <el-table border :data="formData.userInfos" height="300">
+                  <el-table-column label="序号"  align="center"  type="index" width="70" />
+                  <el-table-column label="来访单位" width="100" align="center" prop="companyName" />
+                  <el-table-column label="来访人员" width="100" align="center" prop="userName" />
+                  <el-table-column label="证件类型" width="100" align="center" prop="idType">
+                    <template slot-scope="scope">
+                    <dict-tag :options="dict.type.letter_id_type" :value="scope.row.idType"/>
+                  </template>
+                  </el-table-column>
                   <el-table-column label="证件号码" width="200" align="center" prop="idCard">
                   </el-table-column>
                   <el-table-column label="证件照" align="center" prop="imgFile">
-                    <template slot-scope="scope">
-                      <ImageListPreview v-model="scope.row.imgFile"></ImageListPreview>
-                      <!-- <img width="50" height="50" :src="scope.row.imgFile" /> -->
-                    </template> </el-table-column>            
-          </el-table>
-              </el-form-item>
-            </el-col>          
-          </el-row>          
+                    <template slot-scope="scope">                      
+                            <ImageListPreview v-model="scope.row.imgFile"></ImageListPreview>                  
+                          </template> 
+                    </el-table-column>             
+          </el-table>      
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="12">
+                <h3 class="title">
+                  <i class="el-icon-collection-tag"></i>
+                  审批信息
+                </h3> 
+            </el-col>              
+          </el-row>    
           <el-row>
             <el-col :span="12">
-              <el-form-item label="审批" prop="approveStatus">    
+              <el-form-item label="审批操作" prop="approveStatus">    
                 <el-radio v-model="formData.approveStatus" label="1">同意</el-radio>
                 <el-radio v-model="formData.approveStatus" label="2">不同意</el-radio>           
               </el-form-item>
@@ -123,7 +138,7 @@ export default {
     return {
       id: params ? params.id : null,
       isShow: false,
-      title: "出入事项审批",
+      title: "来访事项审批",
       formData: this.reset(),
       formDataRules: {
         approveStatus: [{ required: true, message: "请勾选审批结果" }],        
@@ -131,7 +146,7 @@ export default {
       formFileListDefualtValue: [],
     };
   },
-  dicts: ['out_in_type'],
+  dicts: ['out_in_type','letter_id_type'],
   props: {},
   watch: {},
   created() {},

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

@@ -4,7 +4,7 @@
           <div class="main-search-box">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" >
 
-      <el-form-item label="出入事由" prop="reasons">
+      <el-form-item label="来访事由" prop="reasons">
         <el-input
           v-model="queryParams.reasons"
           placeholder="请输入关键字"
@@ -12,8 +12,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="出入类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择出入类型" clearable>
+      <el-form-item label="介绍信类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择介绍信类型" clearable>
           <el-option
             v-for="dict in dict.type.out_in_type"
             :key="dict.value"
@@ -55,16 +55,17 @@
     </el-row>
           </div>
     <el-table v-loading="loading" height="650" border :data="letterList">
-      <el-table-column label="序号"  align="center"  type="index" width="70" />
-      <el-table-column label="出入类型" header-align="center" align="left" prop="type"  width="150">
+      <el-table-column label="介绍信编号" align="center" prop="letterNo" width="120">
+      </el-table-column>
+      <!-- <el-table-column label="序号"  align="center"  type="index" width="70" /> -->
+      <el-table-column label="介绍信类型" header-align="center" align="center" prop="type"  width="150">
         <template slot-scope="scope">
               <dict-tag :options="dict.type.out_in_type" :value="scope.row.type"/>
             </template>
       </el-table-column>
-      <el-table-column label="出入事由" header-align="center" align="left" prop="reasons"/>
-      <el-table-column label="介绍信编号" align="center" prop="letterNo" width="120">
-      </el-table-column>
-      <el-table-column label="介绍信" align="center" prop="letterNo" width="250">
+      <el-table-column label="来访事由" header-align="center" align="left" prop="reasons"/>
+    
+      <el-table-column label="介绍信" header-align="center" align="left" prop="letterNo" width="250">
         <template slot-scope="scope">
         <template v-if="scope.row.letterFile">
           <K-file-upload ref="upload" :isShowUploadBtn="false"
@@ -77,11 +78,12 @@
             </template>
        </template>
       </el-table-column>
-      <el-table-column label="出入有效期" align="center" width="250">
+      <el-table-column label="开具日期" align="center" width="150">
         <template slot-scope="scope">
-          <span>{{ scope.row.startTime}}~{{scope.row.endTime}}</span>
+          <span>{{ scope.row.startTime}}</span>
         </template>
       </el-table-column>
+      <el-table-column label="有效天数" width="120" header-align="center" align="center"  prop="effectiveDays" />
       <el-table-column label="审批时间" width="150" header-align="center" align="left"  prop="approveTime" />
 
       <el-table-column label="审批状态" align="center" width="100" prop="approveStatus" >

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

@@ -15,48 +15,54 @@
         >
           <el-row>
             <el-col :span="12">
-              <el-form-item prop="reasons" label="出入事由">
+              <el-form-item label="介绍信编号" prop="letterNo">
                 <el-input
-                  v-model="formData.reasons"
-                  placeholder="请输入出入事由"
-                  maxlength="100"
+                  v-model="formData.letterNo"
+                  placeholder="请输入介绍信编号"
+                  maxlength="10"
                 />
               </el-form-item>
-            </el-col>
-
+            </el-col>            
             <el-col :span="12">
               <el-form-item label="接待机构" prop="receptionOrgIds">
                 <org-tree-select v-model="formData.receptionOrgIds" ref="orgTreeSelect">
                 </org-tree-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="介绍信编号" prop="letterNo">
+            <el-col :span="24">
+              <el-form-item prop="reasons" label="来访事由">
                 <el-input
-                  v-model="formData.letterNo"
-                  placeholder="请输入介绍信编号"
-                  maxlength="10"
+                  v-model="formData.reasons"
+                  placeholder="请输入来访事由"
+                  maxlength="100"
                 />
               </el-form-item>
-            </el-col>
+            </el-col>            
             <el-col :span="12">
-              <el-form-item prop="range" label="介绍信有效期">
-                <!-- <DataRangePicker
-                  v-model="formData.range"
-                  key="daterange"
-                  type="daterange"
-                /> -->
-                <el-date-picker
+              <el-form-item prop="startTime" label="开具日期">
+                <!-- <el-date-picker
                   v-model="formData.range"
                   type="daterange"
                   :picker-options="startDatepickerOptions"
                   range-separator="至"
                   start-placeholder="有效期开始日期"
                   end-placeholder="有效期结束日期">
+                </el-date-picker> -->
+                <el-date-picker style="width:100%"
+                  v-model="formData.startTime"
+                  type="date"
+                  :picker-options="startDatepickerOptions"
+                  placeholder="请选择开具日期"
+                  >
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <el-form-item prop="effectiveDays" label="有效天数">
+                <el-input-number style="width: 100%" v-model="formData.effectiveDays" :min="1" :max="365"></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <el-form-item label="上传介绍信" prop="letterFile">
                 <K-file-upload
                   ref="upload"
@@ -78,21 +84,35 @@
           </el-row>
 
           <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button
+            <el-col :span="12">
+                <h3 class="title">
+                  <i class="el-icon-collection-tag"></i>
+                  人员信息
+                </h3> 
+            </el-col>
+            <el-col :offset="8" :span="2" justify="end" type="flex">
+              <h3 class="title">
+                <el-button
                 type="primary"
-                plain
                 icon="el-icon-plus"
                 size="mini"
                 @click="handleAddUser"
-                >新增人员</el-button
+                >新增来访人员</el-button
               >
+                </h3> 
+             
             </el-col>
           </el-row>
 
-          <el-table :data="formData.userInfos" max-height="500" style="margin-bottom: 10px;">
-            <el-table-column label="人员姓名" width="100" align="center" prop="userName" />
-            <el-table-column label="单位" width="100" align="center" prop="companyName" />
+          <el-table border :data="formData.userInfos" max-height="500" style="margin-bottom: 10px;">
+            <el-table-column label="序号"  align="center"  type="index" width="70" />
+            <el-table-column label="来访单位" width="100" align="center" prop="companyName" />
+            <el-table-column label="来访人员" width="100" align="center" prop="userName" />
+            <el-table-column label="证件类型" width="100" align="center" prop="idType">
+              <template slot-scope="scope">
+              <dict-tag :options="dict.type.letter_id_type" :value="scope.row.idType"/>
+            </template>
+            </el-table-column>
             <el-table-column label="证件号码" width="200" align="center" prop="idCard">
             </el-table-column>
             <el-table-column label="证件照" align="center" prop="imgFile">
@@ -102,7 +122,7 @@
                </el-table-column>
             <el-table-column
               label="操作"
-              align="center" width="150"
+              align="center" width="100"
               class-name="small-padding fixed-width"
             >
               <template slot-scope="scope">
@@ -130,12 +150,22 @@
           :model="userInfo"
           :rules="userInfoRules"
           label-width="120px"
-        >
-          <el-form-item label="人员姓名" prop="userName">
-            <el-input v-model="userInfo.userName" maxlength="10" placeholder="请输入姓名" />
+        >  
+          <el-form-item label="来访单位" prop="companyName">
+            <el-input v-model="userInfo.companyName" maxlength="20" placeholder="请输入来访单位" />
+          </el-form-item>
+          <el-form-item label="来访人员" prop="userName">
+            <el-input v-model="userInfo.userName" maxlength="10" placeholder="请输入来访人员" />
           </el-form-item>
-          <el-form-item label="单位" prop="companyName">
-            <el-input v-model="userInfo.companyName" maxlength="10" placeholder="请输入单位" />
+          <el-form-item label="证件类型" prop="idType">
+            <el-select style="width:100%" v-model="userInfo.idType" placeholder="请选择证件类型" clearable>
+            <el-option
+              v-for="dict in dict.type.letter_id_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            />
+        </el-select>
           </el-form-item>
           <el-form-item label="证件号码" prop="idCard">
             <el-input v-model="userInfo.idCard" maxlength="20" placeholder="请输入证件号码" />
@@ -186,13 +216,15 @@ export default {
         reasons: [{ required: true, message: "请输入出入事由" }],
         letterNo: [{ required: true, message: "请输入介绍信编号" }],
         receptionOrgIds: [{ required: true, message: "请选择接待机构" }],
-        range: [{ required: true, message: "请选择介绍信有效期" }],      
+        startDate: [{ required: true, message: "请选择开具日期" }],      
+        effectiveDays: [{ required: true, message: "请选择有效天数" }],   
         userInfos: [{ required: true, message: "请添加出入人员" }],
         letterFile:[{ required: true, message: "请上传介绍信" }],
       },
       userInfoRules: {
-        userName: [{ required: true, message: "请输入姓名" }],
-        companyName: [{ required: true, message: "请输入单位" }],
+        userName: [{ required: true, message: "请输入来访人员" }],
+        companyName: [{ required: true, message: "请输入来访单位" }],
+        idType: [{ required: true, message: "请选择证件类型" }],
         idCard: [{ required: true, message: "请输入证件号码" }],
         imgFile: [{ required: true, message: "请上传证件照" }],
       },
@@ -208,7 +240,7 @@ export default {
       imageList: [],
     };
   },
-  dicts: ["letter_status"],
+  dicts: ["letter_status","letter_id_type"],
   props: {},
   watch: {},
   created() {},
@@ -223,6 +255,8 @@ export default {
         letterNo:null,
         receptionOrgIds: [],
         range:[],
+        startTime:new Date(),
+        effectiveDays:1,
         description: null,
         letterFile: [],
         userInfos: [],
@@ -235,6 +269,7 @@ export default {
       return {
         userName: null,
         companyName: null,
+        idType:0,
         idCard: null,
         imgFile: null,
       };
@@ -328,7 +363,7 @@ export default {
           console.log("================", this.formData);
           if (this.formData.id != null) {
             updateLetter(this.formData).then((response) => {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess("编辑成功");
               this.isShow = false;
               this.formData = this.reset();
               this.$emit("success", this.formData);

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

@@ -14,11 +14,17 @@
           label-suffix=":"
         >
           <el-row>
+            <el-col :span="24">
+              <el-form-item label="当前状态">
+                <dict-tag :options="dict.type.letter_status" :value="formData.status"/>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
-              <el-form-item prop="reasons" label="出入事由">
-                {{formData.reasons}}
+              <el-form-item label="介绍信编号" prop="letterNo">
+                {{formData.letterNo}}
               </el-form-item>
             </el-col>
+          
 
             <el-col :span="12">
               <el-form-item label="接待机构" prop="receptionOrgIds">
@@ -27,19 +33,19 @@
                 {{formData.receptionOrgNames}}
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item prop="reasons" label="来访事由">
+                {{formData.reasons}}
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
-              <el-form-item label="介绍信编号" prop="letterNo">
-                {{formData.letterNo}}
+              <el-form-item  label="开具日期">
+                {{ formData.startTimeStr}}
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item prop="range" label="介绍信有效期">
-                {{ formData.startTimeStr}}~{{formData.endTimeStr}}
-                <!-- <DataRangePicker
-                  v-model="formData.range"
-                  key="daterange"
-                  type="daterange"
-                /> -->
+              <el-form-item  label="有效天数">
+                {{ formData.effectiveDays}}
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -56,34 +62,42 @@
                 {{formData.description}}
               </el-form-item>
             </el-col>
+           
+          </el-row>
+          <el-row :gutter="10" class="mb8">
             <el-col :span="12">
-              <el-form-item label="状态">
-                <dict-tag :options="dict.type.letter_status" :value="formData.status"/>
-              </el-form-item>
+                <h3 class="title">
+                  <i class="el-icon-collection-tag"></i>
+                  人员信息
+                </h3> 
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="出入人员">
-                <el-table border :data="formData.userInfos" style="margin-bottom: 10px;">
-                  <el-table-column label="人员姓名" width="150" header-align="center" align="center" prop="userName" />
-                  <el-table-column label="单位" width="150" header-align="center" align="center" prop="companyName" />
-                  <el-table-column label="证件号码" width="200" header-align="center" align="center" prop="idCard">
-                  </el-table-column>
-                  <el-table-column label="证件照" header-align="center" align="center" prop="imgFile">
-                    <template slot-scope="scope">                      
+          <el-table border :data="formData.userInfos" max-height="500" style="margin-bottom: 10px;">
+            <el-table-column label="序号"  align="center"  type="index" width="70" />
+            <el-table-column label="来访单位" width="150" align="center" prop="companyName" />
+            <el-table-column label="来访人员" width="100" align="center" prop="userName" />
+            <el-table-column label="证件类型" width="100" align="center" prop="idType">
+              <template slot-scope="scope">
+              <dict-tag :options="dict.type.letter_id_type" :value="scope.row.idType"/>
+            </template>
+            </el-table-column>
+            <el-table-column label="证件号码" width="200" align="center" prop="idCard">
+            </el-table-column>
+            <el-table-column label="证件照" align="center" prop="imgFile">
+              <template slot-scope="scope">                      
                       <ImageListPreview v-model="scope.row.imgFile"></ImageListPreview>                  
                     </template> 
-                  </el-table-column>
-                </el-table>
-              </el-form-item>
+               </el-table-column>            
+          </el-table>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="12">
+                <h3 class="title">
+                  <i class="el-icon-collection-tag"></i>
+                  接待机构
+                </h3> 
             </el-col>
           </el-row>
-         
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="接待机构">
-                <el-table border :data="formData.approveInfos" style="margin-bottom: 10px;">
+          <el-table border :data="formData.approveInfos" max-height="500" style="margin-bottom: 10px;">
                   <el-table-column label="机构名称" header-align="center" align="left" prop="orgName" />
                   <el-table-column label="审批状态" align="center" prop="approveStatus" >
                     <template slot-scope="scope">
@@ -93,9 +107,6 @@
                   <el-table-column label="审批说明" header-align="center" align="center" prop="approveRemark">
                   </el-table-column>
                 </el-table>
-              </el-form-item>
-            </el-col>
-          </el-row>
           
         </el-form>
       </div>
@@ -133,7 +144,7 @@ export default {
       imageList: [],
     };
   },
-  dicts: ["letter_status","out_in_approve_status"],
+  dicts: ["letter_status","out_in_approve_status","letter_id_type"],
   props: {},
   watch: {},
   created() {},

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

@@ -52,16 +52,19 @@
     </el-row>
           </div>
     <el-table v-loading="loading" height="650" border :data="letterList">
-      <el-table-column label="出入事由" header-align="center" align="left" prop="reasons"  width="300"/>
       <el-table-column label="介绍信编号" align="center" prop="letterNo" width="120">
       </el-table-column>
-      <el-table-column label="介绍信有效期" align="center" width="250">
+      
+      <el-table-column label="接待机构" header-align="center" align="left"  prop="receptionOrgNames" />
+
+      <el-table-column label="来访事由" header-align="center" align="left" prop="reasons"  width="300"/>
+      <el-table-column label="开具日期" header-align="center" align="left" prop="startTime"  width="150"/>
+      <el-table-column label="有效天数" header-align="center" align="center" prop="effectiveDays" width="100"/>
+      <!-- <el-table-column label="介绍信有效期" align="center" width="250">
         <template slot-scope="scope">
           <span>{{ scope.row.startTime}}~{{scope.row.endTime}}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="接待机构" header-align="center" align="left"  prop="receptionOrgNames" />
-
+      </el-table-column> -->
       <el-table-column label="状态" align="center" width="100" prop="status" >
         <template slot-scope="scope">
               <dict-tag :options="dict.type.letter_status" :value="scope.row.status"/>
@@ -74,29 +77,30 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-view"
-            @click="handleDetailInfo(scope.row)"
+            icon="el-icon-check"
+            v-if="scope.row.status==0"
+            @click="handleUseLetter(scope.row)"
             v-hasPermi="['core:letter:edit']"
-          >详情</el-button>
+          >下发</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-check"
-            v-if="scope.row.status==0"
-            @click="handleUseLetter(scope.row)"
+            icon="el-icon-view"
+            @click="handleDetailInfo(scope.row)"
             v-hasPermi="['core:letter:edit']"
-          >使用</el-button>
+          >详情</el-button>        
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit-outline"
-            v-if="!scope.row.haveOutInRecord"
+            v-if="!scope.row.haveOutInRecord && scope.row.status!=2"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['core:letter:edit']"
-          >修改</el-button>
+          >编辑</el-button>
           <el-button
             size="mini"
             type="text"
+            v-if="scope.row.status!=2"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['core:letter:remove']"

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

@@ -15,74 +15,95 @@
           label-suffix=":"
         >
           <el-row>
+            <el-col :span="24">
+              <el-form-item label="介绍信类型">
+              <dict-tag :options="dict.type.out_in_type" :value="formData.type"/>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
-              <el-form-item label="出入人员">
-             {{formData.userName}}
+              <el-form-item label="介绍信编号">
+              {{formData.letterNo}}
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="证件号">
-             {{formData.idCard}}
+              <el-form-item  label="接待机构">
+              {{formData.orgName}}
+              </el-form-item>
+            </el-col>
+            
+            <el-col :span="24">
+              <el-form-item label="来访事由">
+              {{formData.reasons}}
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="证件照">
-                <template>
-                      <ImageListPreview v-model="formData.imgFile"></ImageListPreview>
-                    </template> 
+              <el-form-item  label="开具日期">
+                {{ formData.startTime}}
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="核验结果">
-                <template>
-                  <ImageListPreview v-model="formData.checkImage"></ImageListPreview>
-                </template> 
+              <el-form-item  label="有效天数">
+                {{ formData.effectiveDays}}
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="单位">
+              <el-form-item label="来访单位">
              {{formData.companyName}}
               </el-form-item>
             </el-col> 
+           
             <el-col :span="12">
-              <el-form-item label="出入事由">
-              {{formData.reasons}}
+              <el-form-item label="来访人员">
+             {{formData.userName}}
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="出入类型">
-              <dict-tag :options="dict.type.out_in_type" :value="formData.type"/>
+              <el-form-item label="证件类型">
+             {{formData.idType}}
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item  label="出入机构">
-              {{formData.orgName}}
+              <el-form-item label="证件号码">
+             {{formData.idCard}}
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="介绍信编号">
-              {{formData.letterNo}}
+              <el-form-item label="进入时间">
+                {{ formData.arrivalTime}}
               </el-form-item>
-            </el-col>
+            </el-col>  
             <el-col :span="12">
-              <el-form-item  label="介绍信有效期">
-                {{ formData.startTime}}~{{formData.endTime}}
+              <el-form-item label="离开时间">
+                {{formData.departureTime}}
               </el-form-item>
-            </el-col>
+            </el-col>  
+            <!-- <el-col :span="12">
+              <el-form-item label="证件照">
+                <template>
+                      <ImageListPreview v-model="formData.imgFile"></ImageListPreview>
+                    </template> 
+              </el-form-item>
+            </el-col> -->
             <el-col :span="12">
-              <!-- <el-form-item label="介绍信" prop="letterNo">               
-              </el-form-item> -->
               <el-form-item label="介绍信">
                 <K-file-upload ref="upload" :isShowUploadBtn="false"
                                 :defaultValue="formData.letterFile"/>
               </el-form-item>
             </el-col>
-            
             <el-col :span="12">
-              <el-form-item label="出入时间">
-                {{ formData.arrivalTime}}~{{formData.departureTime}}
+              <el-form-item label="核验结果">
+                <template>
+                  <ImageListPreview v-model="formData.checkImage"></ImageListPreview>
+                </template> 
               </el-form-item>
-            </el-col>  
+            </el-col>
+          
+        
+           
+            
+           
+            
+           
           </el-row>
         </el-form>
       </div>

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

@@ -30,7 +30,7 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item> -->
-              <el-form-item label="出入人员" prop="userName">
+              <el-form-item label="来访人员" prop="userName">
                 <el-input
                   v-model="queryParams.userName"
                   placeholder="请输入关键字"
@@ -38,8 +38,8 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="出入类型" prop="type">
-                <el-select v-model="queryParams.type" placeholder="请选择出入类型" clearable>
+              <el-form-item label="介绍信类型" prop="type">
+                <el-select v-model="queryParams.type" placeholder="请选择介绍信类型" clearable>
                   <el-option
                     v-for="dict in dict.type.out_in_type"
                     :key="dict.value"
@@ -89,24 +89,29 @@
             :data="outInRecrodList"
 
           >
-          <el-table-column label="序号"  align="center"  type="index" width="70" />
-          <el-table-column label="出入人员" prop="userName"  align="center" width="100" />
-          <el-table-column label="证件号" prop="idCard"  align="center"  width="180" />
-          <el-table-column label="人员单位" prop="companyName"  align="center"  width="100" />
-          <el-table-column label="出入类型" header-align="center" align="left" prop="type"  width="150">
+          <el-table-column label="来访单位" prop="companyName"  align="center"  width="150" />
+          <el-table-column label="来访人员" prop="userName"  align="center" width="100" />
+         
+          <!-- <el-table-column label="证件类型" prop="idType"  align="center"  width="180" >
+            <template slot-scope="scope">
+                    <dict-tag :options="dict.type.letter_id_type" :value="scope.row.idType"/>
+                  </template>
+          </el-table-column> -->
+          <el-table-column label="证件号码" prop="idCard"  align="center"  width="160" />
+          
+          <el-table-column label="介绍信类型" header-align="center" align="center" prop="type"  width="150">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.out_in_type" :value="scope.row.type"/>
             </template>
           </el-table-column>
             <el-table-column
-              label="出入事由"
+              label="来访事由"
               header-align="center"
               align="left"
               prop="reasons"
-              width="100"
             />
             <el-table-column
-              label="出入机构"
+              label="接待机构"
               header-align="center"
               align="center"
               prop="orgName"
@@ -119,7 +124,7 @@
                 <span v-if="scope.row.departureTime">{{ scope.row.departureTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="核验结果" width="250" align="center" prop="checkImage">
+            <!-- <el-table-column label="核验结果" width="250" align="center" prop="checkImage">
                     <template slot-scope="scope">
                       <ImageListPreview v-model="scope.row.imgFile"></ImageListPreview>
                     </template> </el-table-column>
@@ -131,13 +136,13 @@
                                               />
                   </template>
           </template>
-          </el-table-column>
+          </el-table-column> -->
 
 
             <el-table-column
               label="操作"
               header-align="center"
-              align="left"
+              align="center"
               width="100"
               fixed="right"
               class-name="small-padding fixed-width"