Merge pull request '审批任务增加模型ID字段' (#17) from feature_approval into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_MY_WEBFRONT/pulls/17
Reviewed-by: Liwei <wei.li@le-it.com.cn>

src/views/approval/pend.vue

@@ -145,6 +145,11 @@
             </template>
           </el-table>
         </template>
+      </el-table-column>
+			<el-table-column :label="getColumnName('approvalmodelid')" align="center" show-overflow-tooltip width="135">
+        <template slot-scope="scope">
+          <span>{{ filterContent(scope.row['approvalmodelid'], 'approvalmodelid') }}</span>
+        </template>
       </el-table-column>
       <el-table-column v-if="roles.includes('finance') ||  roles.includes('CFO') || roles.includes('accounting') || roles.includes('FM') || roles.includes('admin') && queryParams.reqtype == 0 || roles.includes('pm') && queryParams.reqtype == 0 || roles.includes('topm') && queryParams.reqtype == 0 "
                        label="票据"
@@ -231,6 +236,7 @@
   </div>
 </template>
 <script>
+import { getAllModel } from '@/api/approval/applyReimburse'
 import { getApprovalList, commitApproval } from '@/api/approval/record'
 export default {
   name: 'ApprovalRecord',
@@ -277,7 +283,8 @@ export default {
           value: 1
         }
       ],
-      type: 0
+      type: 0,
+			options: [],
     }
   },
   created() {
@@ -296,6 +303,9 @@ export default {
       this.queryParams.reqtype = 1
     }
     this.getList()
+		getAllModel().then(res => {
+      this.options = res.data
+    })
   },
   methods: {
     changeType(e) {