Merge remote-tracking branch 'origin/master'

陈威
2 parents 3a2601a1 738ab1f6
Showing 3 changed files with 7 additions and 6 deletions Show diff stats
frontend/front/src/components/dialog/projectSubmissionDialog.vue
frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue
frontend/manage/src/components/form/dataTemplate/ManageSetting.vue
@@ -41,7 +41,7 @@ export default {
       },
       rules:{
         textarea:[
-          { required: true, message: '请填写入库说明', trigger: 'blur' }
+          { required: true, message: this.dialogType =='rk'?'请填写入库说明':this.dialogType=='zf'?'请填写作废说明':this.dialogType == 'xmjz'?'请填写本次项目进展说明':'请填写内容', trigger: 'blur' }
         ]
       }
     }
@@ -51,6 +51,7 @@ export default {
       console.log('打印type',type);
       console.log('打印row',row);
       this.dialogType = type;
+      console.log('打印this.dialogType',this.dialogType);
       this.dialogForm.fProjectId = row.id_;
       this.dialogForm.dialogVisible = true;
       switch (type){
@@ -69,7 +70,7 @@ export default {
           this.dialogForm.label ='本次项目进展说明:';
           this.dialogForm.fEventType = 'xiangmujinzhan';
           break;
-        case 'zf':
+        case 'ck':
           this.dialogForm.label = '出库说明:';
           this.dialogForm.title = '出库';
           this.dialogForm.fEventType = 'chuku';
@@ -88,7 +89,9 @@ export default {
             console.log('打印res',res);
             if(res.code == 200){
               this.$emit('handleRefresh');
+              // this.$emit("RefreshTable");
             }
+            this.$emit("RefreshTable");
             this.dialogForm.dialogVisible = false;
           })
  
@@ -12,9 +12,6 @@ export default {
     searchForms:{
       type:Object
     },
-    selectRows: {
-      type: Object
-    }
   },
   data(){
     return {
@@ -3159,7 +3159,8 @@ export default {
           'addData',
           'searchData',
           'batchSave',
-          'js'
+          'js',
+          'moduleButton'
         ].indexOf(row.name) === -1
       )
     },
...	...	@@ -41,7 +41,7 @@ export default {
41	41	},
42	42	rules:{
43	43	textarea:[
44		- { required: true, message: '请填写入库说明', trigger: 'blur' }
	44	+ { required: true, message: this.dialogType =='rk'?'请填写入库说明':this.dialogType=='zf'?'请填写作废说明':this.dialogType == 'xmjz'?'请填写本次项目进展说明':'请填写内容', trigger: 'blur' }
45	45	]
46	46	}
47	47	}
...	...	@@ -51,6 +51,7 @@ export default {
51	51	console.log('打印type',type);
52	52	console.log('打印row',row);
53	53	this.dialogType = type;
	54	+ console.log('打印this.dialogType',this.dialogType);
54	55	this.dialogForm.fProjectId = row.id_;
55	56	this.dialogForm.dialogVisible = true;
56	57	switch (type){
...	...	@@ -69,7 +70,7 @@ export default {
69	70	this.dialogForm.label ='本次项目进展说明:';
70	71	this.dialogForm.fEventType = 'xiangmujinzhan';
71	72	break;
72		- case 'zf':
	73	+ case 'ck':
73	74	this.dialogForm.label = '出库说明:';
74	75	this.dialogForm.title = '出库';
75	76	this.dialogForm.fEventType = 'chuku';
...	...	@@ -88,7 +89,9 @@ export default {
88	89	console.log('打印res',res);
89	90	if(res.code == 200){
90	91	this.$emit('handleRefresh');
	92	+ // this.$emit("RefreshTable");
91	93	}
	94	+ this.$emit("RefreshTable");
92	95	this.dialogForm.dialogVisible = false;
93	96	})
94	97
...	...
...	...	@@ -12,9 +12,6 @@ export default {
12	12	searchForms:{
13	13	type:Object
14	14	},
15		- selectRows: {
16		- type: Object
17		- }
18	15	},
19	16	data(){
20	17	return {
...	...
...	...	@@ -3159,7 +3159,8 @@ export default {
3159	3159	'addData',
3160	3160	'searchData',
3161	3161	'batchSave',
3162		- 'js'
	3162	+ 'js',
	3163	+ 'moduleButton'
3163	3164	].indexOf(row.name) === -1
3164	3165	)
3165	3166	},
...	...