Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/BasicDocuments.vue

@@ -998,7 +998,7 @@
                                 
                                 <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;">
                                     <tr>
-                                        <th>账户分类 收支冲抵</th>
+                                        <th>账户分类</th>
                                         <th>付款方式</th>
                                         <th>账户</th>
                                         <!-- <th width="100px">账户余额</th> -->

src/components/FinancialModule/addFinancialProcess.vue

@@ -327,8 +327,17 @@
 					<el-radio v-model="addMsg.IsUploadPic" :label="1">{{$t('fnc.qiyong')}}</el-radio>
 				</el-form-item>
 				<el-form-item :label="$t('ios.sfxianshi')">
-					<el-radio v-model="addMsg.IsShow" :label="1">{{$t('pub.yes')}}</el-radio>
-					<el-radio v-model="addMsg.IsShow" :label="2">{{$t('pub.no')}}</el-radio>
+					<el-radio @change="RadioShow" v-model="addMsg.IsShow" :label="1">{{$t('pub.yes')}}</el-radio>
+					<el-radio @change="RadioShow" v-model="addMsg.IsShow" :label="2">{{$t('pub.no')}}</el-radio>
+				</el-form-item>
+				<el-form-item v-show="addMsg.IsShow==2" label="可显示人">
+					<el-select filterable multiple v-model='addMsg.ShowEmployeeList' class="w200" style="max-height:100px;overflow:hidden" size="small">
+						<el-option v-for='item in EmployeeList'
+							:label='item.EmName'
+							:value='item.EmployeeId'
+							:key='item.EmployeeId'>
+						</el-option>
+					</el-select>
 				</el-form-item>
 				<el-form-item :label="$t('fnc.syfeiyong')" v-if="addMsg.TemplateType==8" class="_treeselect">
 					<!-- <el-select  filterable multiple v-model='CostIdS' class="w200" @change="disabledOption2">
@@ -525,6 +534,7 @@ export default {
 	components: { Treeselect },
 	data(){
 		return{
+			EmployeeList:[],
 			Auditshow:false,
      		accListShow: true,
 			TemplateId:0,
@@ -544,6 +554,7 @@ export default {
 					AuditUserList:[],
 				},
 				IsShow: 1,
+				ShowEmployeeList:[],
 			},
 			AuditUserList:{
 				EmName:'',
@@ -714,8 +725,27 @@ export default {
     }
 		this.getFinancialFlowTemplate_post_GetNodeList();
 		this.getRole()
+		this.getEmployeeList();
 	},
 	methods:{
+		RadioShow(val){
+			console.log(val);
+			if(val==1){
+				this.addMsg.ShowEmployeeList=[];
+			}
+		},
+		getEmployeeList () {
+        this.apipost(
+          'admin_get_EmployeeGetList', {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.EmployeeList = res.data.data
+            }
+          },
+          err => {
+          }
+        )
+      },
 		AuditSort(){
 			let sum=0;
 			let sortnum=0;
@@ -771,6 +801,8 @@ export default {
 					this.addMsg.TempLateClass = data.TempLateClass;
 					this.addMsg.IsUploadPic = data.IsUploadPic;
 					this.addMsg.IsShow = data.IsShow;
+					this.addMsg.ShowEmployeeList = data.ShowEmployeeList;
+					
 					if (data.list && data.list[0] !== -1) {
             this.accListMsg = data.list;
           }