eoss-ui 0.5.51 → 0.5.53
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/eoss-ui.common.js +90 -46
- package/lib/flow.js +84 -40
- package/lib/index.js +1 -1
- package/lib/theme-chalk/flow.css +1 -1
- package/lib/theme-chalk/index.css +1 -1
- package/package.json +1 -1
- package/packages/flow/src/component/CommonOpinions.vue +40 -14
- package/packages/flow/src/main.vue +11 -12
- package/packages/theme-chalk/lib/flow.css +1 -1
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/src/flow.scss +1 -1
- package/src/index.js +1 -1
- package/CHANGELOG.md +0 -929
package/package.json
CHANGED
|
@@ -1,14 +1,23 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="commonOpinion">
|
|
3
|
-
<el-
|
|
4
|
-
|
|
5
|
-
:
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
3
|
+
<el-form
|
|
4
|
+
:model="form"
|
|
5
|
+
:rules="rules"
|
|
6
|
+
ref="ruleForm"
|
|
7
|
+
label-width="0"
|
|
8
|
+
>
|
|
9
|
+
<el-form-item label="" prop="value">
|
|
10
|
+
<el-input
|
|
11
|
+
v-model="form.value"
|
|
12
|
+
:disabled="isBanInputOpinion == '1' || disabled"
|
|
13
|
+
type="textarea"
|
|
14
|
+
clear="inp"
|
|
15
|
+
placeholder="请输入意见"
|
|
16
|
+
@change="changeOpinion"
|
|
17
|
+
:rows="10"
|
|
18
|
+
></el-input>
|
|
19
|
+
</el-form-item>
|
|
20
|
+
</el-form>
|
|
12
21
|
<el-input
|
|
13
22
|
v-model="input3"
|
|
14
23
|
placeholder="请输入内容"
|
|
@@ -103,6 +112,12 @@ export default {
|
|
|
103
112
|
data() {
|
|
104
113
|
return {
|
|
105
114
|
value: '',
|
|
115
|
+
form: {
|
|
116
|
+
value: ''
|
|
117
|
+
},
|
|
118
|
+
rules: {
|
|
119
|
+
value: [{ required: true, message: '请输入意见', trigger: 'blur' }]
|
|
120
|
+
},
|
|
106
121
|
input3: '',
|
|
107
122
|
selectValue: '',
|
|
108
123
|
optionList: [],
|
|
@@ -138,11 +153,22 @@ export default {
|
|
|
138
153
|
},
|
|
139
154
|
watch: {
|
|
140
155
|
opinion(val) {
|
|
141
|
-
this.value = val;
|
|
156
|
+
this.form.value = val;
|
|
142
157
|
this.changeOpinion();
|
|
143
158
|
}
|
|
144
159
|
},
|
|
145
160
|
methods: {
|
|
161
|
+
validate(){
|
|
162
|
+
let validSate = true
|
|
163
|
+
this.$refs.ruleForm.validate((valid) => {
|
|
164
|
+
if (valid) {
|
|
165
|
+
validSate = true
|
|
166
|
+
} else {
|
|
167
|
+
validSate = false;
|
|
168
|
+
}
|
|
169
|
+
});
|
|
170
|
+
return validSate
|
|
171
|
+
},
|
|
146
172
|
/**
|
|
147
173
|
* changeOpinion
|
|
148
174
|
* @desc:监听意见变化
|
|
@@ -150,7 +176,7 @@ export default {
|
|
|
150
176
|
* @date 2022年10月28日
|
|
151
177
|
**/
|
|
152
178
|
changeOpinion() {
|
|
153
|
-
this.$emit('change', this.value);
|
|
179
|
+
this.$emit('change', this.form.value);
|
|
154
180
|
},
|
|
155
181
|
/**
|
|
156
182
|
* getCommonOpion
|
|
@@ -210,10 +236,10 @@ export default {
|
|
|
210
236
|
.then((res) => {
|
|
211
237
|
if (res.status == 'success') {
|
|
212
238
|
res.data == 2
|
|
213
|
-
? (that.value = that.value + val)
|
|
214
|
-
: (that.value = val);
|
|
239
|
+
? (that.form.value = that.form.value + val)
|
|
240
|
+
: (that.form.value = val);
|
|
215
241
|
} else {
|
|
216
|
-
that.value = val;
|
|
242
|
+
that.form.value = val;
|
|
217
243
|
}
|
|
218
244
|
this.$emit('change', that.value);
|
|
219
245
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div
|
|
3
3
|
class="es-flow-index"
|
|
4
|
-
:class="{ 'es-flow-narrow': shrink
|
|
4
|
+
:class="{ 'es-flow-narrow': shrink }"
|
|
5
5
|
:style="styles"
|
|
6
6
|
v-if="!shrinkAbled"
|
|
7
7
|
>
|
|
@@ -745,7 +745,6 @@ export default {
|
|
|
745
745
|
nextCurrentOrgObjSelect: [],
|
|
746
746
|
loading: null, // 加载中
|
|
747
747
|
newTypeCode: '',
|
|
748
|
-
requiredValue: false,
|
|
749
748
|
NodeName: '', // 当前节点值
|
|
750
749
|
radioList: [],
|
|
751
750
|
value: '',
|
|
@@ -1332,21 +1331,18 @@ export default {
|
|
|
1332
1331
|
**/
|
|
1333
1332
|
rejectBtn() {
|
|
1334
1333
|
if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
|
|
1334
|
+
if (!this.value) {
|
|
1335
|
+
if(!this.$refs.commonOpinions.validate()) return
|
|
1336
|
+
}
|
|
1335
1337
|
if (this.beforeSubmit != undefined) {
|
|
1336
1338
|
this.beforeSubmit()
|
|
1337
1339
|
.then((next) => {
|
|
1338
|
-
|
|
1339
|
-
// return this.$message.warning('请填写意见');
|
|
1340
|
-
return (this.requiredValue = true);
|
|
1341
|
-
}
|
|
1340
|
+
|
|
1342
1341
|
this.showReject = true;
|
|
1343
1342
|
})
|
|
1344
1343
|
.catch((e) => {});
|
|
1345
1344
|
} else {
|
|
1346
|
-
|
|
1347
|
-
// return this.$message.warning('请填写意见');
|
|
1348
|
-
return (this.requiredValue = true);
|
|
1349
|
-
}
|
|
1345
|
+
|
|
1350
1346
|
this.showReject = true;
|
|
1351
1347
|
}
|
|
1352
1348
|
},
|
|
@@ -1648,7 +1644,11 @@ export default {
|
|
|
1648
1644
|
* @date 2022年9月29日
|
|
1649
1645
|
**/
|
|
1650
1646
|
rejectAndEnd(res) {
|
|
1647
|
+
if (this.isOpinionRequired == 1 && (this.value == '' || !this.value)){
|
|
1648
|
+
if(!this.$refs.commonOpinions.validate()) return
|
|
1649
|
+
}
|
|
1651
1650
|
if (this.beforeSubmit != undefined) {
|
|
1651
|
+
|
|
1652
1652
|
this.beforeSubmit()
|
|
1653
1653
|
.then((next) => {
|
|
1654
1654
|
this.saveRejectAndEnd(res);
|
|
@@ -1661,8 +1661,7 @@ export default {
|
|
|
1661
1661
|
saveRejectAndEnd(res) {
|
|
1662
1662
|
this.$confirm('确认' + res.value + '?')
|
|
1663
1663
|
.then(() => {
|
|
1664
|
-
|
|
1665
|
-
return (this.requiredValue = true);
|
|
1664
|
+
|
|
1666
1665
|
// return this.$message.warning('请填写意见');
|
|
1667
1666
|
let params = {
|
|
1668
1667
|
url: rejectAndEnd,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
@charset "UTF-8";.commonOpinion-set,.es-flow-index{-webkit-box-orient:vertical;-webkit-box-direction:normal}.es-common-opinions,.es-fenyue-buttons,.es-flow-buttons,.es-flow-title,.es-opinion{padding:0 12px}.es-user-defined{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.es-user-defined .el-button--primary{-webkit-box-flex:1;-ms-flex:1;flex:1}.required .el-textarea__inner::-webkit-input-placeholder{color:red}.required .el-textarea__inner::-moz-placeholder{color:red}.required .el-textarea__inner:-ms-input-placeholder{color:red}.required .el-textarea__inner::-ms-input-placeholder{color:red}.required .el-textarea__inner::placeholder{color:red}.no-checked .el-checkbox__input{display:none!important}.es-flow-index{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-bottom:12px;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;position:relative}.es-flow-index .em-flow-more-btn{display:block;width:100%}.es-flow-index .el-checkbox-group{display:contents}.es-flow-index .es-eidt-title{font-size:13px;color:#333;line-height:20px}.es-flow-index .es-flow-top{height:
|
|
1
|
+
@charset "UTF-8";.commonOpinion-set,.es-flow-index{-webkit-box-orient:vertical;-webkit-box-direction:normal}.es-common-opinions,.es-fenyue-buttons,.es-flow-buttons,.es-flow-title,.es-opinion{padding:0 12px}.es-user-defined{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.es-user-defined .el-button--primary{-webkit-box-flex:1;-ms-flex:1;flex:1}.required .el-textarea__inner::-webkit-input-placeholder{color:red}.required .el-textarea__inner::-moz-placeholder{color:red}.required .el-textarea__inner:-ms-input-placeholder{color:red}.required .el-textarea__inner::-ms-input-placeholder{color:red}.required .el-textarea__inner::placeholder{color:red}.no-checked .el-checkbox__input{display:none!important}.es-flow-index{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-bottom:12px;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;position:relative}.es-flow-index .em-flow-more-btn{display:block;width:100%}.es-flow-index .el-checkbox-group{display:contents}.es-flow-index .es-eidt-title{font-size:13px;color:#333;line-height:20px}.es-flow-index .es-flow-top{height:380px}.es-flow-index .es-flow-top .es-flow-title{height:40px;line-height:40px}.es-flow-index .es-flow-top .es-flow-title .es-icon{position:absolute;right:8px;top:4px}.es-flow-index .es-flow-top .es-opinion{display:-webkit-box;display:-ms-flexbox;display:flex;margin:8px 0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.es-flow-index .es-flow-top .es-opinion .es-opinion-file{cursor:pointer;position:relative}.es-flow-index .es-flow-top .es-opinion .es-opinion-file .es-file-num{color:red}.es-flow-index .es-button-agree{width:calc(43% - 15px)}.es-flow-index .es-button-agree-save{margin-top:10px}.commonOpinion-set{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100%}.commonOpinion-set .el-table__body-wrapper{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-flow-index-shrink{width:24px}.es-flow-index-shrink img{cursor:pointer;width:24px;height:24px}.es-flow-btn:hover{background-color:#f5f5f5;color:#1890ff}.es-flow-btn:hover ::v-deep .el-popover{padding:12px 0!important}.es-flow-form .el-checkbox-group{display:contents}.es-flow-index .el-input-group--prepend>.el-input__inner,.es-flow-index .select-process>.el-input__inner{display:none!important}.es-flow-form .el-textarea:first-child,.es-flow-index .el-textarea{width:100%;margin-bottom:10px!important}.es-flow-form .es-opinions .el-select,.es-flow-index .el-select{width:calc(100% + 40px)!important}.es-flow-index .el-select .el-input{width:100%;height:40px}.es-flow-index .process .el-select{width:calc(100% + 40px)!important}.es-flow-index .input-with-select .el-input-group__prepend{background-color:#fff;width:100%}.es-flow-index .select-process .el-input-group__append{height:40px}.es-flow-index button.el-button.sub.el-button--primary.el-button--medium{width:calc(100% - 85px)}.es-flow-index .el-input-group--prepend>.el-input-group__append{height:40px}.es-flow-index .demo-dynamic .el-select{width:100%!important}.es-flow-index .demo-dynamic .select-process .el-select,.es-flow-index .demo-dynamic .selectUser,.es-flow-index.task-union-examine .el-select{width:calc(100% + 40px)!important}.es-flow-index .el-input.el-input-group.el-input-group--append.el-input-group--prepend{margin:0!important}.es-flow-index .demo-dynamic,.es-flow-index .es-footer-btn{margin-top:10px}.es-flow-index .es-footer-btn .el-button+.el-button{margin:10px 10px 0 0}.es-flow-index .el-input.is-disabled .el-input__inner{color:#606266}.es-flow-index .es-flow-btn{margin-right:10px}.es-flow-index .es-info{padding:0 8px;-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;overflow-x:hidden}.es-flow-index .es-info::-webkit-scrollbar{width:5px}.es-flow-index .news{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;cursor:pointer;padding:10px 0}.es-flow-index .news .sj,.show{width:10px;height:10px;border-right:1px solid #000;border-bottom:1px solid #000;margin-right:10px;-webkit-transform:rotate(-135deg);transform:rotate(-135deg);-webkit-transition:.5s;transition:.5s}.es-flow-index .news .show{-webkit-transform:rotate(45deg);transform:rotate(45deg)}.es-flow-index .el-checkbox{margin:0 10px 10px 0}.es-flow-index .info::-webkit-scrollbar-track{-webkit-box-shadow:inset006pxrgba(0,0,0,.3);border-radius:10px}::-webkit-scrollbar-thumb{border-radius:10px;background:rgba(0,0,0,.1);-webkit-box-shadow:inset006pxrgba(0,0,0,.5)}.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after{right:5px!important}.es-flow-form .input-with-select{width:100%;margin-top:0}.es-flow-form .el-select{width:100%}.es-flow-form .es-opinions .el-select{width:calc(100% + 40px)!important}.select-users .el-input-group__append .el-button span,.select-users .no-icon .el-input-group__append{display:none}.select-users .el-input-group__append{background-color:#1890ff}.select-users .el-input-group__append .el-button i{font-size:18px;color:#fff}.es-flow-form .input-with-select .el-input-group__prepend{background-color:#fff;width:100%}.es-flow-form .el-input-group--prepend>.el-input__inner{display:none!important}.es-flow-form button.el-button.sub.el-button--danger.el-button--medium{width:calc(100% - 85px)}.es-flow-form .el-input-group--prepend>.el-input-group__append{height:40px}.es-flow-form .el-form-item__label{font-weight:700}.es-flow-form .el-input.is-disabled .el-input__inner{color:#000}.select-user{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.select-user .left{width:30%}.select-user .right{padding:3px;width:69%}.select-user .el-checkbox{width:170px;margin-top:11px;margin-bottom:11px}.select-user .all{margin:0!important}
|