diff --git a/jero-web/src/components/OcrAddForm/index.vue b/jero-web/src/components/OcrAddForm/index.vue
index c49a84c67..f5ae9586b 100644
--- a/jero-web/src/components/OcrAddForm/index.vue
+++ b/jero-web/src/components/OcrAddForm/index.vue
@@ -215,6 +215,9 @@
@@ -283,6 +286,10 @@
this.getForm()
},
methods: {
+ StandardselectionChange(value, id) {
+ this.formInline[value + '_id'] = id
+ this.formInline = { ...this.formInline }
+ },
sumber() {
// console.log('vilidate',this.formInline)
this.$refs.ruleForm1.validate(valid => {
diff --git a/jero-web/src/components/SplitBatForm/index.vue b/jero-web/src/components/SplitBatForm/index.vue
index acdf19cb9..04c428002 100644
--- a/jero-web/src/components/SplitBatForm/index.vue
+++ b/jero-web/src/components/SplitBatForm/index.vue
@@ -207,6 +207,9 @@
@@ -305,6 +308,10 @@
// console.log('idssss111',this.ids)
},
methods: {
+ StandardselectionChange(value, id) {
+ this.formInline[value + '_id'] = id
+ this.formInline = { ...this.formInline }
+ },
sumber() {
// console.log('vilidate',this.formInline)
this.$refs.ruleForm1.validate(valid => {
diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue
index d7edda414..941325af4 100644
--- a/jero-web/src/components/Standardselection/index.vue
+++ b/jero-web/src/components/Standardselection/index.vue
@@ -1,13 +1,27 @@
-
-
-
- {{this.$t('standardSelection')}}
-
-
+
+
+
+ {{ item.standNumber }}
+
+
+
+
+
+
+
+ {{this.$t('standardSelection')}}
+
{
+ if (res.success) {
+ if (res.result && res.result.length > 0) {
+ let content = []
+ res.result.forEach(val => {
+ this.content.push(val)
+ this.dictOptions.push({
+ id: val.id,
+ standNumber: val.serial_number
+ })
+ content.push(val.id + '-' + val.serial_number)
+ })
+ this.selectedRowKeys = content
+ }
+ }
+ })
+ },
replacePage() {
let query = {
...this.queryParam,
pageNo: this.pageNo,
pageSize: this.pageSize
}
- this.selectedRowKeys = []
this.loading = true
postAction('document/bussDocumentLibraryEO/replacePageInfo', query).then((res) => {
this.loading = false
if (res.success) {
this.dataList = res.result.records
this.total = res.result.total
- this.selectedRowKeys = this.standard[this.query.db_field_name] ? this.standard[this.query.db_field_name].split(',') : []
} else {
this.dataList = []
}
@@ -150,18 +187,21 @@
this.visible = false
},
handleSubmit() {
- let serial_number = []
- let replace_standard_id = []
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
- // let content = JSON.parse(JSON.stringify(this.selectedRowList))
- this.selectedRowList.forEach(res => {
- serial_number.push(res.serial_number)
- replace_standard_id.push(res.id)
+ let number = []
+ let id = []
+ this.arrayValue = []
+ this.content.forEach(res => {
+ id.push(res.id)
+ number.push(res.serial_number)
+ this.dictOptions.push({
+ id: res.id,
+ standNumber: res.serial_number
+ })
+ this.arrayValue.push(res.id)
})
- this.$emit('input', serial_number.join(','))
- console.log(replace_standard_id)
- this.$emit('change', this.query.db_field_name, replace_standard_id.join(','))
- // this.$emit('changecontent', this.content)
+ this.$emit('input', number.join(','))
+ this.$emit('change', this.query.db_field_name, id.join(','))
this.visible = false
} else {
this.$message.warning(this.$t('selectLeastOne'))
@@ -170,19 +210,19 @@
indexclick(event) {
this.$emit('input', event.target.value)
},
- onSelectChange(value,row) {
- console.log(value)
- console.log(row)
+ onSelectChange(value, row) {
this.selectedRowKeys = value
- this.selectedRowList = row
- // this.content = []
- // value.forEach(val => {
- // this.dataList.forEach((res) => {
- // if (res.id === val) {
- // this.content.push(res)
- // }
- // })
- // })
+ this.content = []
+ this.selectedRowKeys.forEach(res => {
+ let index = res.indexOf('-')
+ let index1 = res.length
+ let id = res.slice(0, index)
+ let standNumber = res.slice(index + 1, index1)
+ this.content.push({
+ id: id,
+ serial_number: standNumber
+ })
+ })
},
searchQuery(queryParam) {
let queryParamQuery = JSON.parse(JSON.stringify(queryParam))
@@ -206,6 +246,38 @@
this.pageNo = 1
this.pageSize = pageSize
this.replacePage()
+ },
+ selectOnChange(value) {
+ let content = []
+ let standNumber = []
+ this.content = []
+ let newArr = []
+ let dictOptions = JSON.parse(JSON.stringify(this.dictOptions))
+ if (value.length == 0) {
+ this.dictOptions = []
+ } else {
+ for (let i = 0; i < value.length; i++) {
+ for (let j = 0; j < dictOptions.length; j++) {
+ if (dictOptions[j].id === value[i]) {
+ newArr.push(dictOptions[j])
+ }
+ }
+ }
+ }
+ this.dictOptions = newArr
+ if (this.dictOptions && this.dictOptions.length > 0) {
+ this.dictOptions.forEach(val => {
+ content.push(val.id)
+ standNumber.push(val.standNumber)
+ this.content.push({
+ id: val.id,
+ serial_number: val.standNumber
+ })
+ })
+ }
+ this.$emit('input', standNumber.join(','))
+ this.$emit('change', this.query.db_field_name, content.join(','))
+ this.arrayValue = content
}
}
}
@@ -227,7 +299,10 @@
margin-left: 10px;
height: 38px;
line-height: 38px;
-
+ display: inline-block;
+ width: 80px;
+ overflow: hidden;
+ padding: 0;
}
.drawer-bootom-button {
@@ -257,11 +332,11 @@
margin-right: 16px;
}
- .box-input-index {
+ .box-input-select {
display: inline-block;
- width: 80%;
+ width: calc(100% - 90px);
height: 38px;
- margin-top: 2px;
+ float: left;
}
.box-button {
@@ -274,15 +349,33 @@
margin-top: 20px;
}
- /deep/.ant-table-thead > tr > th {
+ /deep/ .ant-table-thead > tr > th {
font-weight: bolder;
}
/*/deep/.ant-table-tbody > tr > td {*/
/* color: #040B29 ;*/
/*}*/
+
+ ::v-deep .box-input-select .ant-select-selection--multiple::-webkit-scrollbar {
+ /*height: 52px!important;*/
+ display: block;
+ }
+
+ .itemOption {
+ display: inline-block;
+ width: 100%;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ }