diff --git a/src/components/hzwlComponents/RadioGroupFormItem.vue b/src/components/hzwlComponents/RadioGroupFormItem.vue
new file mode 100644
index 000000000..49fcca456
--- /dev/null
+++ b/src/components/hzwlComponents/RadioGroupFormItem.vue
@@ -0,0 +1,61 @@
+
+
+
+ {{ item.value }}
+
+
+
+
+
+
+
diff --git a/src/components/hzwlComponents/SelectMultipleFormItem.vue b/src/components/hzwlComponents/SelectMultipleFormItem.vue
index 571dbd025..511d10ff1 100644
--- a/src/components/hzwlComponents/SelectMultipleFormItem.vue
+++ b/src/components/hzwlComponents/SelectMultipleFormItem.vue
@@ -23,6 +23,7 @@ export default {
name: "SelectMultipleFormItem",
props: {
value: {
+ type: [Array, String],
required: true
},
prop: {
@@ -49,21 +50,39 @@ export default {
default: true
},
},
+ data () {
+ return {
+ basicType: 'Array'
+ }
+ },
computed: {
placeholder () {
return `请选择${this.label}`
},
data () {
- if (this.value && this.value !== '') {
- return this.value.split(',')
- } else {
+ if (!this.value) {
return []
+ } else {
+ if (this.getType(this.value) === 'Array') {
+ this.basicType = 'Array'
+ return this.value
+ } else if (this.getType(this.value) === 'String'){
+ this.basicType = 'String'
+ return this.value.split(',')
+ }
}
}
},
methods: {
+ getType (target) {
+ return Object.prototype.toString.call(target).slice(8, -1)
+ },
handleChange (event) {
- this.$emit('input', event.join(','))
+ if (this.basicType === 'Array') {
+ this.$emit('input', event)
+ } else if (this.basicType === 'String') {
+ this.$emit('input', event.join(','))
+ }
}
}
}
diff --git a/src/components/hzwlComponents/UploadFormItem.vue b/src/components/hzwlComponents/UploadFormItem.vue
index 2765699e3..08ad292e9 100644
--- a/src/components/hzwlComponents/UploadFormItem.vue
+++ b/src/components/hzwlComponents/UploadFormItem.vue
@@ -7,16 +7,21 @@
clearable
>
-
-
- {{ file.name }}
-
+
+
+
+ {{ file.name }}
+
+
+
+ -
+
-
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue b/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue
index e62b55566..ee5a5a3ce 100644
--- a/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue
+++ b/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue
@@ -73,12 +73,14 @@
}
.process-title {
width: 100%;
- margin-left: 10px;
+ //margin-left: 10px;
font-size: 18px;
font-weight: bold;
display: inline-block;
height: 30px;
line-height: 30px;
+ box-sizing: border-box;
+ padding-left: 10px;
.smallText {
font-size: 14px;
margin-left: 5px;