sunlupeng před 1 rokem
rodič
revize
5d3a5224fe

+ 1 - 1
src/api/personnel/relations/contract/index.js

@@ -49,6 +49,6 @@ export function exportContract(query) {
     url: '/personnel/relations/contract/export-excel',
     method: 'get',
     params: query,
-    responseContract: 'blob'
+    responseType: 'blob'
   })
 }

+ 1 - 1
src/layout/components/Homebar.vue

@@ -4,7 +4,7 @@
       <el-popover popper-class="down-popover" placement="bottom" width="360" :visible-arrow="false" trigger="click">
         <div class="corp-switch">
           <div class="current-corp">{{ tenantName }}</div>
-          <el-button type="text" style="color: #00B899;" @click="showProcessInstance()">
+          <el-button type="text" style="color: #00B899;margin-top: 5px;" @click="showProcessInstance()">
             <i class="el-icon-s-operation"></i>
             切换企业/团队
           </el-button>

+ 18 - 0
src/views/stamp/list/index.vue

@@ -209,6 +209,24 @@
         <div class="field-component">
           <span :title="form.reason">{{ form.reason }}</span>
         </div>
+      </div>
+      <div class="fx-field x-grid-col-12">
+        <div class="field-label">
+          <div class="field-name">附件</div>
+        </div>
+        <div class="field-component">
+          <div v-for="(item, index) in form.fileList" :key="index">
+            <a :href="item.url" target="_blank" :title="item.name" style="color: #5094d5;">{{ item.name }}</a>
+          </div>
+        </div>
+      </div>
+      <div class="fx-field x-grid-col-12">
+        <div class="field-label">
+          <div class="field-name">备注</div>
+        </div>
+        <div class="field-component">
+          <span :title="form.birthday">{{ form.remarks }}</span>
+        </div>
       </div>
         </div>
       </div>

+ 2 - 2
src/views/system/user/profile/index.vue

@@ -27,14 +27,14 @@
                 <svg-icon icon-class="email" />用户邮箱
                 <div class="pull-right">{{ user.email }}</div>
               </li>
-              <!-- <li class="list-group-item">
+              <li class="list-group-item">
                 <svg-icon icon-class="tree" />所属部门
                 <div class="pull-right" v-if="user.dept">{{ user.dept.name }}</div>
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="tree" />所属岗位
                 <div class="pull-right" v-if="user.posts">{{ user.posts.map(post => post.name).join(',') }}</div>
-              </li> -->
+              </li>
               <li class="list-group-item">
                 <svg-icon icon-class="peoples" />所属角色
                 <div class="pull-right" v-if="user.roles">{{ user.roles.map(role => role.name).join(',') }}</div>