소스 검색

出入管理相关界面 调整

zhulu 1 년 전
부모
커밋
07310804ac

+ 2 - 2
src/components/K-FileUpload/index.vue

@@ -328,8 +328,8 @@ export default {
 
 .upload-file-list .el-upload-list__item {
   // border: 1px solid #e4e7ed;
-  line-height: 2;
-  margin-bottom: 5px;
+  // line-height: 2;
+  // margin-bottom: 5px;
   position: relative;
 }
 

+ 1 - 1
src/views/core/outIn/approve/dialog.approve.letter.detail.vue

@@ -10,7 +10,7 @@
           ref="form"
           :model="formData"
           label-width="120px"
-        >
+          label-suffix=":">
           <el-row>
             <el-col :span="12">
               <el-form-item label="出入类型">

+ 1 - 0
src/views/core/outIn/approve/dialog.approve.letter.vue

@@ -12,6 +12,7 @@
           :model="formData"
           :rules="formDataRules"
           label-width="120px"
+          label-suffix=":"
         >
           <el-row>
             <el-col :span="12">

+ 1 - 1
src/views/core/outIn/approve/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="main-right-box">
           <div class="main-search-box">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" >
       
       <el-form-item label="出入事由" prop="reasons">
         <el-input

+ 13 - 5
src/views/core/outIn/letter/dialog.addletter.vue

@@ -41,11 +41,19 @@
             </el-col>
             <el-col :span="12">
               <el-form-item prop="range" label="介绍信有效期">
-                <DataRangePicker
+                <!-- <DataRangePicker
                   v-model="formData.range"
                   key="daterange"
                   type="daterange"
-                />
+                /> -->
+                <el-date-picker
+                  v-model="formData.range"
+                  type="daterange"
+                  :picker-options="startDatepickerOptions"
+                  range-separator="至"
+                  start-placeholder="有效期开始日期"
+                  end-placeholder="有效期结束日期">
+                </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -191,9 +199,9 @@ export default {
       startDatepickerOptions: {
         disabledDate: this.endDisabledDate,
       },
-      endDatepickerOptions: {
-        disabledDate: this.endDisabledDate,
-      },
+      // endDatepickerOptions: {
+      //   disabledDate: this.endDisabledDate,
+      // },
       formFileListDefualtValue: [],
       open: false,
       userInfo: this.resetUserInfo(),

+ 165 - 0
src/views/core/outIn/letter/dialog.letter.detail.vue

@@ -0,0 +1,165 @@
+<template>
+  <div class="edu-training-edit">
+    <DialogCom
+      :title="title"
+      @close="onHide"
+      :visible.sync="isShow"
+      width="1000px"
+    >
+      <div class="page-body">
+        <el-form
+          ref="form"
+          :model="formData"
+          label-width="120px"          
+          label-suffix=":"
+        >
+          <el-row>
+            <el-col :span="12">
+              <el-form-item prop="reasons" label="出入事由">
+                {{formData.reasons}}
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="接待机构" prop="receptionOrgIds">
+                <!-- <org-tree-select v-model="formData.receptionOrgIds" ref="orgTreeSelect">
+                </org-tree-select> -->
+                {{formData.receptionOrgNames}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="介绍信编号" prop="letterNo">
+                {{formData.letterNo}}
+              </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>
+            </el-col>
+            <el-col :span="12">
+              <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.description}}
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态">
+                <dict-tag :options="dict.type.letter_status" :value="formData.status"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-table :data="formData.userInfos" style="margin-bottom: 10px;">
+            <el-table-column label="人员姓名" align="center" prop="userName" />
+            <el-table-column label="单位" align="center" prop="companyName" />
+            <el-table-column label="证件号码" align="center" prop="idCard">
+            </el-table-column>
+            <el-table-column label="证件照" align="center" prop="imgFile">
+              <template slot-scope="scope">
+                <img width="50" height="50" :src="scope.row.imgFile" />
+              </template> </el-table-column>
+          </el-table>
+        </el-form>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="onHide">关 闭</el-button>
+      </div>
+    </DialogCom>
+  </div>
+</template>
+<script>
+import { mapState, mapMutations } from "vuex";
+import {
+  listLetter,
+  getLetter,
+  delLetter,
+  addLetter,
+  updateLetter,
+} from "@/api/core/letter";
+import OrgTreeSelect from "@/components/orgTreeSelect";
+import KFileUpload from "@/components/K-FileUpload/index.vue";
+import dayjs from "dayjs";
+import imgUpload from "@/components/ImageUpload";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
+export default {
+  components: { OrgTreeSelect, KFileUpload, imgUpload,DataRangePicker },
+  data() {
+    const params = this.$route.params;
+    return {
+      id: params ? params.id : null,
+      isShow: false,
+      title: "录入介绍信",
+      formData: this.reset(),
+      open: false,
+      userInfo: this.resetUserInfo(),
+      imageList: [],
+    };
+  },
+  dicts: ["letter_status"],
+  props: {},
+  watch: {},
+  created() {},
+  computed: {
+    ...mapState(["loginUser", "org"]),
+  },
+  methods: {
+    ...mapMutations([]),
+    reset(other = {}) {
+      return {
+        reasons: null,
+        letterNo:null,
+        receptionOrgIds: [],
+        range:[],
+        description: null,
+        letterFile: [],
+        userInfos: [],
+        type:1,
+        status:null,
+        ...other,
+      };
+    },
+    resetUserInfo() {
+      return {
+        userName: null,
+        companyName: null,
+        idCard: null,
+        imgFile: null,
+      };
+    },
+
+    async show(id) {   
+        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;
+          this.formData = response.data;          
+        });
+    },
+    onHide() {
+      this.isShow = false;
+      this.formData = this.reset();
+    },
+  },
+  mounted() {},
+};
+</script>
+
+
+
+

+ 4 - 3
src/views/core/outIn/letter/index.vue

@@ -112,6 +112,7 @@
       @pagination="getList"
     />
     <dialog-add-letter ref="dialogAddLetter" @success="handleQuery(true)"></dialog-add-letter>
+    <dialog-letter-detail ref="dialogLetterDetail" @success="handleQuery(true)"></dialog-letter-detail>
   </div>
   </div>
 </template>
@@ -119,9 +120,9 @@
 <script>
 import { listLetter, getLetter, delLetter, addLetter, updateLetter,updateLetterStatus } from "@/api/core/letter";
 import dialogAddLetter from "./dialog.addletter";
-
+import dialogLetterDetail from "./dialog.letter.detail.vue";
 export default {
-  components: {dialogAddLetter},
+  components: {dialogAddLetter,dialogLetterDetail},
   dicts: ['letter_status'],
   name: "Letter",
   data() {
@@ -211,7 +212,7 @@ export default {
     },
     handleDetailInfo(row)
     {
-
+      this.$refs["dialogLetterDetail"].show(row.id);
     },
     /** 提交按钮 */
     submitForm() {

+ 1 - 0
src/views/core/outIn/outInLog/dialog.outIn.detail.vue

@@ -12,6 +12,7 @@
           :model="formData"
           :rules="formDataRules"
           label-width="120px"
+          label-suffix=":"
         >
           <el-row>
             <el-col :span="12">

+ 1 - 1
src/views/core/outIn/outInLog/index.vue

@@ -148,7 +148,7 @@
                   type="text"
                   icon="el-icon-view"
                   @click="handleDetailInfo(scope.row)"
-                  v-hasPermi="['core:letter:edit']"
+                  v-hasPermi="['core:record:list']"
                   >详情</el-button
                 >                
               </template>