Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

examples/entries.js

@@ -2,7 +2,7 @@
 const install = function(Vue) {
 	if (install.installed) return Promise.resolve();
 	else {
-		let contexts = require.context('../project/xiushan/apps', true, /(\/.+)\/App[^\/]+\.vue$/);
+		let contexts = require.context('../packages', true, /(\/.+)\/App[^\/]+\.vue$/);
 		if (contexts) {
 			contexts.keys().map((e) => {
 				if (contexts(e).default) {

packages/processManagement/approvalManage/components/approvalDetail.vue

@@ -186,7 +186,7 @@
             </ai-card>
           </template>
 
-          <template v-if="currentMenu==4">
+          <template v-if="currentMenu==4 && detailObj.tableType && detailObj.tableType === '2'">
             <ai-card title="签署文件">
               <template #right>
                 <el-button type="primary" @click="handleDownload">下载文件</el-button>