Browse Source

盘点修复

fix_bug_pro20231227
马远东 1 year ago
parent
commit
8c35d8642c
  1. 154
      src/views/aftersales/VueTemp.vue
  2. 616
      src/views/distribution/checkInventoryTask/createTask.vue

154
src/views/aftersales/VueTemp.vue

@ -100,38 +100,54 @@
<basic-container>
<div class="avue-crud">
<!-- 搜索模块 -->
<el-row v-if="!search">
<el-row v-if="search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query" class="el-fr-d">
<el-form-item label="交期:" class="el-times">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
<div class="el_tims_box">
<el-form-item label="上报日期" class="el-times">
<el-date-picker
v-model="stockupDate"
v-model="value1"
type="daterange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
start-placeholder="开始日期"
end-placeholder="结束日期"
:size="size"
/>
</el-form-item>
<el-form-item label="创建时间:" class="el-times">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
<el-form-item label="处理时间" class="el-times">
<el-date-picker
v-model="stockupDate"
v-model="value1"
type="daterange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
start-placeholder="开始日期"
end-placeholder="结束日期"
:size="size"
/>
</el-form-item>
<el-form-item label="送货时间" class="el-times">
<el-date-picker
v-model="value1"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:size="size"
/>
</el-form-item>
<el-form-item label="运损发现" class="el-times">
<el-date-picker
v-model="value1"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:size="size"
/>
</el-form-item>
</div>
<!-- 查询按钮 -->
<el-form-item class="el-btn">
<el-button type="primary" icon="el-icon-search" @click="searchChange"> </el-button>
<el-button type="primary" icon="el-icon-search"> </el-button>
<el-button icon="el-icon-delete" @click="searchReset()"> </el-button>
</el-form-item>
</el-form>
@ -398,12 +414,21 @@
label="配送司机"
v-if="groundlineSet || groundlineType == 3 || groundlineType == 4"
>
<el-input
<el-select
v-model="Indexform.deliveryDriver"
:disabled="FromDisabled"
multiple
filterable
default-first-option
:reserve-keyword="false"
placeholder="请输入配送司机"
clearable
/>
>
<el-option
v-for="item in DeliveryDriver"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<!-- 必填 -->
<el-form-item label="异常问题描述">
@ -530,7 +555,7 @@
</el-form-item>
<el-form-item label="运损发现节点">
<el-select v-model="endFrom.a" class="m-2" placeholder="Select">
<el-select v-model="endFrom.a" class="m-2" clearable placeholder="请选择运损发现节点">
<el-option
v-for="item in TransportLossNode"
:key="item.value"
@ -781,7 +806,7 @@ import { getDictionaryBiz } from '@/api/system/dict'; //字典
import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //
import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
import { columnList, recordList } from '@/option/aftersales/vueTvemp.js';
import { processRowProperty } from '@/utils/util';
import { processRowProperty } from '@/utils/util';
import dayjs from 'dayjs';
const currentPage = ref(1); //
const pageSize = ref(30); //
@ -810,10 +835,24 @@ const eightyPercentHeight = ref(0); // 80% 高度
const list = ref([]);
const options = ref([]);
const ProcessingList = ref([]); //
const DeliveryDriver = ref([
{
value: '0',
label: '兰溪',
},
{
value: '1',
label: '李华',
},
{
value: '2',
label: '唐飞',
},
]); //
const CompensationParty = ref([{ name: '', state: 0, num: 0, reason: '', cld: 1 }]); //
const details = reactive({
/** 是否开启搜索 */
search: true,
search: false,
/** 表格搜索条件 */
query: {},
/** 时间快捷选择设置 */
@ -1272,7 +1311,7 @@ const IndexTable = val => {
let data = {
...val,
};
columnList[2].checkarr = [];//
columnList[2].checkarr = []; //
columnList[3].checkarr = [];
data.current = page.value.currentPage; //
data.size = page.value.pageSize; //
@ -1303,7 +1342,7 @@ const IndexTable = val => {
} else if (item.workOrderType == 5) {
item.workOrderTypeName = columnList[2].checkarr[4].label; //
}
//
if (item.discoveryNode == 1) {
item.discoveryNodeName = columnList[3].checkarr[0].label; //
} else if (item.discoveryNode == 2) {
@ -1385,7 +1424,13 @@ const AddInfo = () => {
//
const ConfirmForm = () => {
console.log(Indexform.value.deliveryDriver, 'Indexform.value.deliveryDriver');
console.log(Indexform.value.processor, 'Indexform.value.processor');
//
Indexform.value.deliveryDriver = DeliveryDriver.value.find(
item => item.value == Indexform.value.deliveryDriver
).label;
console.log(Indexform.value.deliveryDriver); //
FromDisabled.value = false; //
let processorEntityList = [];
let ProcessingParty = {
@ -1410,17 +1455,22 @@ const ConfirmForm = () => {
delete DataSubmit.processor; //
console.log(DataSubmit, '处理好的表单信息');
Indexdialog.value = false; //
$_submit(DataSubmit).then(res => {
if (res.data.code == 200) {
ElMessage({
message: res.data.msg,
type: 'success',
});
IndexTable();
}
});
// $_submit(DataSubmit).then(res => {
// if (res.data.code == 200) {
// ElMessage({
// message: res.data.msg,
// type: 'success',
// });
Indexform.value = {}; //
// IndexTable();
// }
// });
};
//
const searchHide = () => {
console.log(details);
details.search = !details.search;
};
//
const view = val => {
console.log(val, '当前行数据');
@ -1564,8 +1614,6 @@ const btnsc = val => {
console.log(val);
};
// //
// const updateDetailQuery = (index, propName, obj) => {
// //
@ -1578,7 +1626,7 @@ const btnsc = val => {
// const processRowProperty = (index, row, details) => {
// const nameRegex = /(\w+)Name$/; // 'Name'
// const match = row.prop.match(nameRegex);
// // 'Name'
// if (match) {
// const basePropName = match[1]; // 'Name'
@ -1592,12 +1640,11 @@ const btnsc = val => {
// }
// };
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
console.log('index :>> ', index);
console.log('row :>> ', row);
processRowProperty(index, row, details);
console.log(details.query, details.query);
IndexTable(details.query);
@ -1837,7 +1884,7 @@ const changeProcessingResults = val => {
}
.lptime {
margin-top: 30px;
padding-left: 50px;
padding-left: 60px;
display: flex;
flex-direction: column;
font-size: 14px;
@ -1893,10 +1940,23 @@ const changeProcessingResults = val => {
height: 38px;
}
}
.el-fy{
.el-fy {
flex: 1;
display: flex;
align-items: flex-end;
margin-bottom: 10px;
display: flex;
align-items: flex-end;
margin-bottom: 10px;
}
.el-times{
:deep(.el-input__wrapper){
height: 30px !important;
}
}
.el_tims_box{
display: flex;
}
.el-btn{
width: 100%;
}
</style>

616
src/views/distribution/checkInventoryTask/createTask.vue

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save