来访管理流程变更 界面调整

src/api/core/letter.js

@@ -23,6 +23,15 @@ export function getLetter(id) {
     method: 'get'
   })
 }
+
+// 查询详细介绍信
+export function getOutInRequest(id) {
+  return request({
+    url: '/core/letter/outinrequest/' + id,
+    method: 'get'
+  })
+}
+
 export function auditAllList(id) {
   return request({
     url: '/core/letter/auditAllList/' + id,

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

@@ -13,14 +13,14 @@
           :label-style="labelStyle"
           :contentStyle="content_style">
           <el-descriptions-item label="介绍信类型">
-            <dict-tag :options="dict.type.out_in_type" :value="formData.type"/>
+            <dict-tag :options="dict.type.out_in_type" :value="formData.letterType"/>
           </el-descriptions-item>
 <!--          <el-descriptions-item label="当前状态">-->
 <!--            <dict-tag :options="dict.type.letter_status" :value="formData.status"/>-->
 <!--          </el-descriptions-item>-->
           <el-descriptions-item label="介绍信编号">{{formData.letterNo}}</el-descriptions-item>
           <el-descriptions-item label="接待机构">{{formData.receptionOrgNames}}</el-descriptions-item>
-          <el-descriptions-item label="来访事由">{{formData.reasons}}</el-descriptions-item>
+          <el-descriptions-item label="来访事由">{{formData.letterReasons}}</el-descriptions-item>
           <el-descriptions-item label="开具日期">{{formData.startTimeStr}}</el-descriptions-item>
           <el-descriptions-item label="有效天数">{{formData.effectiveDays}}</el-descriptions-item>
           <el-descriptions-item label="介绍信附件">
@@ -30,7 +30,7 @@
               :defaultValue="formData.letterFile"
             />
           </el-descriptions-item>
-          <el-descriptions-item label="备注">{{formData.description}}</el-descriptions-item>
+          <el-descriptions-item label="备注">{{formData.letterDescription}}</el-descriptions-item>
 
         </el-descriptions >
 
@@ -74,10 +74,13 @@
           :label-style="labelStyle"
           :contentStyle="content_style">
           <el-descriptions-item label="审批状态">
-            <dict-tag :options="dict.type.out_in_approve_status" :value="formData.approveLog.approveStatus"/>
+            <dict-tag :options="dict.type.out_in_approve_status" :value="formData.approveStatus"/>
           </el-descriptions-item>
-          <el-descriptions-item label="审批时间"> {{formData.approveLog.approveTime}}</el-descriptions-item>
-          <el-descriptions-item label="审批说明">  {{formData.approveLog.approveRemark}}</el-descriptions-item>
+          <el-descriptions-item label="审批时间"> {{formData.approveTime}}</el-descriptions-item>
+          <el-descriptions-item label="审批说明"  :span="2">  {{formData.approveRemark}}</el-descriptions-item>
+          <el-descriptions-item v-if="formData.approveSignImg" label="审批签名">               
+              <ImageListPreview v-model="formData.approveSignImg"></ImageListPreview>
+            </el-descriptions-item>
         </el-descriptions >
       </div>
       <div slot="footer" class="dialog-footer">
@@ -89,8 +92,7 @@
 <script>
 import { mapState, mapMutations } from "vuex";
 import {
-  getLetter,
-  approveLetter,
+  getOutInRequest,
 } from "@/api/core/letter";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import dayjs from "dayjs";
@@ -135,21 +137,24 @@ export default {
         letterNo:null,
         receptionOrgIds: [],
         range:[],
-        description: null,
+        letterDescription: null,
         letterFile: [],
         userInfos: [],
-        type:null,
-        approveLog:{
-          approveStatus:null,
-          approveRemark:null
-        },
+        letterType:null,
+        approveStatus:null,
+        approveRemark:null,
+        approveTime:null,
+        // approveLog:{
+        //   approveStatus:null,
+        //   approveRemark:null
+        // },
         ...other,
       };
     },
     async show(id) {
         this.title = "来访事项审批详情";
         this.isShow = true;
-        getLetter(id).then((response) => {
+        getOutInRequest(id).then((response) => {
           this.formData = response.data;
           this.formFileListDefualtValue=this.formData.letterFile;
         });

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

@@ -17,7 +17,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="介绍信类型">
-              <dict-tag :options="dict.type.out_in_type" :value="formData.type"/>
+              <dict-tag :options="dict.type.out_in_type" :value="formData.letterType"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -32,7 +32,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="来访事由">
-              {{formData.reasons}}
+              {{formData.letterReasons}}
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -56,7 +56,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="备注" prop="letterNo">
-                {{formData.description}}
+                {{formData.letterDescription}}
               </el-form-item>
             </el-col>          
           </el-row>
@@ -123,7 +123,8 @@
 <script>
 import { mapState, mapMutations } from "vuex";
 import {
-  getLetter,
+  // getLetter,
+  getOutInRequest,
   approveLetter,
 } from "@/api/core/letter";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
@@ -179,7 +180,7 @@ export default {
       if (id) {
         this.title = "来访事项审批";   
         this.isShow = true;
-        getLetter(id).then((response) => {
+        getOutInRequest(id).then((response) => {
           // let tempRange=[];
           // tempRange.push(dayjs(response.data.startTime));
           // tempRange.push(new Date(response.data.endTime));

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

@@ -58,12 +58,12 @@
         <el-table-column align="center" label="介绍信编号" prop="letterNo" width="200">
         </el-table-column>
         <!-- <el-table-column label="序号"  align="center"  type="index" width="70" /> -->
-        <el-table-column align="center" label="介绍信类型" prop="type" width="150">
+        <el-table-column align="center" label="介绍信类型" prop="letterType" width="150">
           <template slot-scope="scope">
-            <dict-tag :options="dict.type.out_in_type" :value="scope.row.type"/>
+            <dict-tag :options="dict.type.out_in_type" :value="scope.row.letterType"/>
           </template>
         </el-table-column>
-        <el-table-column  :show-overflow-tooltip="true" align="center" label="来访事由" prop="reasons"/>
+        <el-table-column  :show-overflow-tooltip="true" align="center" label="来访事由" prop="letterReasons"/>
 
         <!-- <el-table-column label="介绍信" align="center" align="left" prop="letterNo" width="250">
           <template slot-scope="scope">
@@ -99,7 +99,7 @@
               @click="handleDetailInfo(scope.row)"
             >详情
             </el-button>
-            <el-button
+            <!-- <el-button
               v-if="canApprove(scope.row)"
               v-hasPermi="['core:letter:approve']"
               icon="el-icon-check"
@@ -107,7 +107,7 @@
               type="text"
               @click="handleApproveLetter(scope.row)"
             >审批
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -217,7 +217,7 @@ export default {
     canApprove(row) {
       console.log(row.status,row.approveStatus,'row')
       //  console.log("canApprove",row.status ==1,row.approveStatus ==0,dayjs(dayjs(row.endTime).add(1, 'day')).isAfter(dayjs(new Date())))
-      return row.status == 1 && row.approveStatus == 0
+      return row.approveStatus == 0
     },
     handleDetailInfo(row) {
       this.$refs["dialogApproveLetterDetail"].show(row.id);

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

@@ -115,7 +115,7 @@
           </el-table-column>
         </el-table>
 
-        <el-row :gutter="10">
+        <!-- <el-row :gutter="10">
           <el-col :span="12">
             <h3 >
               <i class="el-icon-collection-tag"></i>
@@ -132,7 +132,7 @@
           </el-table-column>
           <el-table-column label="审批说明" align="center"  prop="approveRemark">
           </el-table-column>
-        </el-table>
+        </el-table> -->
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="onHide">关 闭</el-button>

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

@@ -16,7 +16,7 @@
           :contentStyle="content_style"
         >
           <el-descriptions-item label="介绍信类型">
-            <dict-tag :options="dict.type.out_in_type" :value="formData.type" />
+            <dict-tag :options="dict.type.out_in_type" :value="formData.letterType" />
           </el-descriptions-item>
           <el-descriptions-item label="介绍信编号">{{
             formData.letterNo
@@ -25,7 +25,7 @@
             formData.orgName
           }}</el-descriptions-item>
           <el-descriptions-item label="来访事由">{{
-            formData.reasons
+            formData.letterReasons
           }}</el-descriptions-item>
           <el-descriptions-item label="开具日期">{{
             formData.startTime
@@ -64,6 +64,9 @@
           <el-descriptions-item label="核验结果" span="2" labelClassName="gx_info_label">
             <ImageListPreview v-model="formData.checkImage"></ImageListPreview>
           </el-descriptions-item>
+          <el-descriptions-item label="登记签名" span="2" labelClassName="gx_info_label">
+            <ImageListPreview v-model="formData.submitSign"></ImageListPreview>
+          </el-descriptions-item>
         </el-descriptions>
       </div>
       <div slot="footer" class="dialog-footer">

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

@@ -135,13 +135,13 @@
             <el-table-column
               label="介绍信类型"
               align="center"
-              prop="type"
+              prop="letterType"
               width="110"
             >
               <template slot-scope="scope">
                 <dict-tag
                   :options="dict.type.out_in_type"
-                  :value="scope.row.type"
+                  :value="scope.row.letterType"
                 />
               </template>
             </el-table-column>
@@ -150,7 +150,7 @@
               align="center"
               :show-overflow-tooltip="true"
               width="250"
-              prop="reasons"
+              prop="letterReasons"
             />
             <el-table-column
               label="地区"