diff --git a/src/views/modules/inspection/inspectionRequestList.vue b/src/views/modules/inspection/inspectionRequestList.vue
index bf3880a..a01ed8e 100644
--- a/src/views/modules/inspection/inspectionRequestList.vue
+++ b/src/views/modules/inspection/inspectionRequestList.vue
@@ -398,8 +398,8 @@
highlight-current-row
@current-change="onPoSupplierCurrentChange"
@row-dblclick="onPoSupplierRowDblClick">
-
-
+
+
@@ -485,10 +485,10 @@
@current-change="onOrderSupplierCurrentChange"
@row-dblclick="onOrderSupplierRowDblClick"
:default-sort="{ prop: 'crd', order: 'descending' }">
-
-
-
-
+
+
+
+
@@ -1988,7 +1988,11 @@ export default {
.po-section {
/deep/ .el-table .cell {
- overflow: visible !important;
+ height: auto;
+ line-height: 20px;
+ overflow: hidden !important;
+ text-overflow: ellipsis;
+ white-space: nowrap;
padding-left: 4px;
padding-right: 4px;
}
diff --git a/src/views/modules/order/com_inspectionDetailList.vue b/src/views/modules/order/com_inspectionDetailList.vue
index 5549c0e..c93d271 100644
--- a/src/views/modules/order/com_inspectionDetailList.vue
+++ b/src/views/modules/order/com_inspectionDetailList.vue
@@ -146,6 +146,11 @@ export default {
// 查询数据
searchTable() {
+ if (!this.searchData.orderNo) {
+ this.dataList = []
+ this.totalPage = 0
+ return
+ }
this.dataListLoading = true
const params = {
...this.searchData,
diff --git a/src/views/modules/order/com_poOrderAdvancedQuery.vue b/src/views/modules/order/com_poOrderAdvancedQuery.vue
index cee46a4..a5fce16 100644
--- a/src/views/modules/order/com_poOrderAdvancedQuery.vue
+++ b/src/views/modules/order/com_poOrderAdvancedQuery.vue
@@ -35,7 +35,7 @@
@@ -111,9 +111,44 @@ export default {
},
methods: {
getOperatorsByDataType,
+ normalizeOperatorSet (operatorSet) {
+ if (!Array.isArray(operatorSet)) {
+ return []
+ }
+ return operatorSet
+ .map(item => String(item || '').trim().toLowerCase())
+ .filter(Boolean)
+ },
+ getOperatorOptions (row) {
+ const baseOptions = this.getOperatorsByDataType(row && row.dataType)
+ const operatorSet = this.normalizeOperatorSet(row && row.operatorSet)
+ if (!operatorSet.length) {
+ return baseOptions
+ }
+ return baseOptions.filter(op => operatorSet.includes(op.value))
+ },
+ ensureRowOperator (row) {
+ if (!row) {
+ return
+ }
+ const options = this.getOperatorOptions(row)
+ if (!options.length) {
+ row.operator = ''
+ return
+ }
+ const exists = options.some(op => op.value === row.operator)
+ if (!exists) {
+ row.operator = options[0].value
+ }
+ },
+ ensureAllRowsOperator () {
+ const rows = (this.advancedQueryData && this.advancedQueryData.rows) || []
+ rows.forEach(row => this.ensureRowOperator(row))
+ },
handleOpen () {
this.calcTableHeight()
window.addEventListener('resize', this.calcTableHeight)
+ this.ensureAllRowsOperator()
},
calcTableHeight () {
this.$nextTick(() => {
@@ -125,6 +160,7 @@ export default {
},
handleReset () {
resetAdvancedQueryData(this.advancedQueryData)
+ this.ensureAllRowsOperator()
this.$emit('reset')
},
handleQuery () {
diff --git a/src/views/modules/order/poOrder.vue b/src/views/modules/order/poOrder.vue
index 7996287..65037e1 100644
--- a/src/views/modules/order/poOrder.vue
+++ b/src/views/modules/order/poOrder.vue
@@ -296,7 +296,7 @@
@query="handleSearch" />
-