2 éve · a1a5ba4589
--- a/src/HDrpManagement/CommodityArchives/index.vue
+++ b/src/HDrpManagement/CommodityArchives/index.vue
--- a/src/HManagement/personalTarget/target/modules/add.vue
+++ b/src/HManagement/personalTarget/target/modules/add.vue
@@ -18,11 +18,15 @@
 
				           <el-input style="width:250px" size="small" placeholder="人员姓名" v-model="condition" @keyup.native.enter="listData()" @clear="listData()" clearable></el-input>
			
 
				         </div>
			
 
				       </div>
			
 
				-      <tablelayout :layout="tablecols" :data="list" :custom="true" :checkbox="true" height="calc(100vh - 452px)" @checkboxCallBack="checkboxCallBack">
			
 
				+      <tablelayout class="normal-margin" :layout="tablecols" :data="list" :custom="true" :checkbox="true" height="calc(100vh - 452px)" @checkboxCallBack="checkboxCallBack">
			
 
				         <template v-slot:customcol="scope">
			
 
				           <p>{{scope.column.data[scope.column.columnname]}}</p>
			
 
				         </template>
			
 
				       </tablelayout>
			
 
				+      <div class="flex-align-center">
			
 
				+        <p>已选{{selection.length}}人</p>&nbsp;
			
 
				+        <p>总共{{list.length}}人</p>
			
 
				+      </div>
			
 
				       <div class="dialog-footer">
			
 
				         <el-button size="small" @click="dialogTableVisible = false" class="normal-btn-width">取 消</el-button>
			
 
				         <el-button size="small" type="warning" :disabled="selection.length === 0" @click="onSubmit" class="normal-btn-width">确 定</el-button>
			
--- a/src/SDrpanagement/commdiityGroup/index.vue
+++ b/src/SDrpanagement/commdiityGroup/index.vue
--- a/src/router/HDrpManagement.js
+++ b/src/router/HDrpManagement.js
--- a/src/router/SDrpManagement.js
+++ b/src/router/SDrpManagement.js
@@ -0,0 +1,4 @@
 
				+const DrpManagement = [
			
 
				+  
			
 
				+]
			
 
				+export default DrpManagement
			
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -62,7 +62,7 @@ let routes = [
 
				   }
			
 
				 ];
			
 
				 
			
 
				-routes[2].children = [...routes[2].children,...HManagement,...SManagement,...DrpManagement]
			
 
				+routes[2].children = [...routes[2].children,...HManagement,...SManagement,...HDrpManagement,...SDrpManagement]
			
 
				 
			
 
				 const router = new VueRouter({
			
 
				   mode: 'hash',
			
--- a/yos/index.html
+++ b/yos/index.html
@@ -1,9 +1 @@
 
				-<<<<<<< HEAD
			
 
				-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.3b6f74f7.js"></script><link href="css/app.09f1a246.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.2f041322.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
			
 
				-=======
			
 
				-<<<<<<< HEAD
			
 
				-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.3ea5792b.js"></script><link href="css/app.09f1a246.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.d23bdc96.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
			
 
				-=======
			
 
				-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.d49521f5.js"></script><link href="css/app.1831ed6a.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.0163b094.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
			
 
				->>>>>>> xiaoqin
			
 
				->>>>>>> 1526631212b13265af8daa8a2296fefd9e1a6e8b
			
 
				+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.a591369e.js"></script><link href="css/app.09f1a246.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.888247d1.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>