bug fixes

package-lock.json

@@ -348,9 +348,9 @@
       }
     },
     "@ezijing/vue-form": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@ezijing/vue-form/-/vue-form-2.0.6.tgz",
-      "integrity": "sha512-tTS4/ilJ7KGtsrvR6131UaZxlYzEGBV09FPSioaRGcxjzBbxS4DgwHVvY3AJIeCJWVmXkP5uPgFxVCNTbc5OQA==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@ezijing/vue-form/-/vue-form-2.0.7.tgz",
+      "integrity": "sha512-UZZ5IsQ3dLDlX9e/bFES0KTHMh+WwJfX/7NXRLJ4VIWRtY9p8rV7NTOOEDmwQGCK8zKaatcfWvI3XxcBruM+xw==",
       "requires": {
         "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
         "@vue/babel-preset-jsx": "^1.1.2",

package.json

@@ -67,7 +67,7 @@
     "webpack-merge": "^4.2.2"
   },
   "dependencies": {
-    "@ezijing/vue-form": "^2.0.6",
+    "@ezijing/vue-form": "^2.0.7",
     "animate.css": "^4.1.0",
     "axios": "^0.19.2",
     "cross-env": "^7.0.2",

src/pages/my/application/form/info/profile.js

@@ -2,6 +2,8 @@
  * 个人信息
  */
 
+import country from './country'
+
 export default function(_this) {
   return {
     id: 'application_info_profile',
@@ -198,11 +200,12 @@ export default function(_this) {
           rules: [{ required: true, message: '请选择性别', trigger: 'change' }]
         },
         {
-          type: 'v-input',
+          type: 'v-select',
           label: '国籍',
           model: 'nationality',
-          attrs: { placeholder: '请输入国籍' },
-          rules: [{ required: true, message: '请输入国籍', trigger: 'blur' }]
+          values: country,
+          attrs: { placeholder: '请选择国籍', filterable: true },
+          rules: [{ required: true, message: '请选择国籍', trigger: 'blur' }]
         },
         {
           type: 'v-datepicker',

src/pages/my/application/form/wfzzm.js

@@ -31,8 +31,7 @@ export default function(_this) {
             action: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
             deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
             data: { file_type: 'NO_CRIMINAL_CERT' },
-            limit: 1,
-            accept: 'image/*'
+            limit: 1
           },
           prepend: `
           <p>第一步：点击下载按键获取无犯罪证明模板</p>

src/pages/my/application/preview.vue

@@ -64,6 +64,25 @@
             </template>
           </div>
         </div>
+        <div class="preview-item is-success" v-if="isManager">
+          <div class="preview-item-hd">
+            <div class="title">照片/附件</div>
+            <div class="line"></div>
+          </div>
+          <div class="preview-item-bd">
+            <template v-if="material.attachments">
+              <ul class="attachments">
+                <li class="attachments-item" v-for="(item, index) in material.attachments" :key="index">
+                  <a class="inner" :href="item.oss_sign_url" target="_blank">
+                    <div class="pic"><img :src="item.oss_sign_url" /></div>
+                    <div class="name">{{ item.file_type_label }}</div>
+                    <div class="time">{{ item.upload_time }}</div>
+                  </a>
+                </li>
+              </ul>
+            </template>
+          </div>
+        </div>
       </div>
     </template>
   </div>
@@ -124,7 +143,7 @@ export default {
   name: 'Preview',
   props: {
     hasEdit: { type: Boolean, default: false },
-    hasContent: { type: Boolean, default: false }
+    isManager: { type: Boolean, default: false }
   },
   data() {
     return {
@@ -268,20 +287,22 @@ export default {
               label: '推荐信内容',
               code: 'letter_content',
               visible: () => {
-                return this.hasContent
+                return this.isManager
               }
             }
           ]
+        },
+        {
+          title: '无犯罪证明',
+          code: 'attachments',
+          edit: { to: { path: '/my/application', query: { active: 'application_wfzzm' } } },
+          computed(data) {
+            const found = data.find(item => item.file_type_id === 'NO_CRIMINAL_CERT')
+            return found
+              ? `<a href="${found.oss_sign_url}" target="_blank"><img src="${found.oss_sign_url}" style="max-width:300px;margin:10px 0;"></a>`
+              : ''
+          }
         }
-        // {
-        //   title: '无犯罪证明',
-        //   code: 'attachments',
-        //   edit: { to: { path: '/my/application', query: { active: 'application_wfzzm' } } },
-        //   computed(data) {
-        //     const found = data.find(item => item.file_type_id === 'NO_CRIMINAL_CERT')
-        //     return found ? `<img src="${found.oss_sign_url}" style="max-width:300px;margin:10px 0;">` : ''
-        //   }
-        // }
       ]
     }
   },
@@ -401,5 +422,36 @@ export default {
       word-break: break-all;
     }
   }
+  .attachments {
+    padding: 20px 0;
+  }
+  .attachments-item {
+    &:hover {
+      background-color: #f7f7f7;
+    }
+    .inner {
+      padding: 10px;
+      height: 40px;
+      display: flex;
+      align-items: center;
+      color: #222;
+    }
+    .pic {
+      width: 32px;
+      height: 32px;
+      img {
+        width: 100%;
+        height: 100%;
+        object-fit: contain;
+      }
+    }
+    .name {
+      flex: 1;
+      padding: 0 10px;
+    }
+    .time {
+      font-size: 12px;
+    }
+  }
 }
 </style>

src/router/routes.js

@@ -119,7 +119,7 @@ export const constantRoutes = [
   },
   {
     path: '/preview',
-    props: { hasContent: true },
+    props: { isManager: true },
     component: () => import(/* webpackChunkName: "preview" */ '@/pages/my/application/preview.vue')
   },
   {