diff --git a/src/option/distribution/TripartiteTransfer.js b/src/option/distribution/TripartiteTransfer.js
index 750574d8..2458c9f8 100644
--- a/src/option/distribution/TripartiteTransfer.js
+++ b/src/option/distribution/TripartiteTransfer.js
@@ -279,7 +279,7 @@ export const detailsColumnList = [
{
prop: 'loadCode',
label: '配载批次',
- type: 2,
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -391,7 +391,7 @@ export const detailsColumnList = [
{
prop: 'unloadTrayName',
label: '卸车托盘名称',
- type: 2,
+ type: 1,
values: '',
width: '130',
checkarr: [],
@@ -401,7 +401,7 @@ export const detailsColumnList = [
{
prop: 'unloadTrayCode',
label: '卸车托盘码',
- type: 2,
+ type: 1,
values: '',
width: '130',
checkarr: [],
@@ -451,7 +451,7 @@ export const detailsColumnList = [
{
prop: 'unloadTime',
label: '卸车时间',
- type: 2,
+ type: 1,
values: '',
width: '130',
checkarr: [],
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index e890e427..ecdb6eee 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -1052,7 +1052,7 @@
-
+
inputsc(index, row, 2)"
@timeCheck="timesc"
@btnCheck="btnsc"
- @selectCheck="selectsc"
+ @selectCheck="(index, row) => selectsc(index, row, 2)"
@selection="list => (details.package.selectionList = list)"
:isShowRefresh="false"
>
@@ -1261,7 +1261,7 @@
@inputTxt="(index, row) => inputsc(index, row, 1)"
@timeCheck="timesc"
@btnCheck="btnsc"
- @selectCheck="selectsc"
+ @selectCheck="(index, row) => selectsc(index, row, 1)"
@selection="selectionChange"
:isShowRefresh="false"
>
@@ -1422,6 +1422,8 @@ import {
getObjType,
handleInputQuery,
handleFilterData,
+ handleClearTableQuery,
+ handleSelectQuery,
} from '@/utils/util';
import { columnList, packageColumnList } from '@/option/waybill/TemporaryStorageList';
import { getopenOrderAdvancePageList } from '@/api/waybill/TemporaryStorageList';
@@ -2060,6 +2062,7 @@ const details = reactive({
/** 筛选条件 */
query: {
inputQuery: {},
+ selectQuery: {},
},
/** 品类 */
goodsListOptions: [],
@@ -2727,11 +2730,23 @@ const timesc = (index, row) => {
const btnsc = () => {};
/** 表格表头下拉框选择 */
-const selectsc = (index, row) => {
- const _key = row.prop.replace('Name', '');
- details.tableQuery[_key] = index;
- if (!index && index !== 0) delete details.tableQuery[_key];
- init();
+const selectsc = (index, row, type) => {
+ switch (type) {
+ case 1:
+ handleSelectQuery(index, row, details.tableQuery);
+ init();
+ break;
+ case 2:
+ handleSelectQuery(index, row, details.package.query.selectQuery);
+ details.package.renderData = handleFilterData(
+ details.package.data,
+ [],
+ details.package.query
+ );
+ break;
+ default:
+ break;
+ }
};
/** 表格表头复选框选择 */
@@ -4181,6 +4196,8 @@ const handleClearPackageQuery = () => {
details.package.query[key] = {};
}
+ handleClearTableQuery(details.package.columnList);
+
packageTableNode.value.handleClearSelect();
details.package.renderData = handleFilterData(details.package.data, [], details.package.query);
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index 5391c37a..9c0412d0 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -385,26 +385,28 @@
>
-
-
+
+
+
+
+
+
+
+ inputsc(value, row, item.type)"
>
-
-
-
-
-
- inputsc(value, row, item.type)"
- >
-
+
+
@@ -2759,6 +2761,8 @@ const handleChooseSigneState = val => {
// 表格
.goodsTable {
flex: 1;
+ min-width: 50%;
+ // width: fit-content;
}
.el_Server {
.el-tab-pane {