java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

master
qb 1 year ago
parent
d74c6aa9b4 a45da50ff2
commit
6bcd9e02b7
5 changed files with 593 additions and 382 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/page/index/index.vue
  2. 245
      src/views/aftersales/VueTemp.vue
  3. 702
      src/views/distribution/checkInventoryTask/createTask.vue
  4. 8
      src/views/distribution/signdetail/distributionSigndetail.vue
  5. 4
      vite.config.js

2
src/page/index/index.vue
Unescape View File

@ -15,7 +15,7 @@
<!-- 主体视图层 -->
<div id="avue-view" v-show="!isSearch" v-if="isRefresh">
<router-view #="{ Component }">
<keep-alive :include="$store.getters.tagsKeep">
<keep-alive>
<component :is="Component" />
</keep-alive>
</router-view>

245
src/views/aftersales/VueTemp.vue
Unescape View File

@ -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>-->
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<el-form-item label="创建时间:" class="el-times">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
<el-date-picker
v-model="stockupDate"
type="daterange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
clearable
/>
</el-form-item>
<div class="el_tims_box">
<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>
<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,8 +806,9 @@ 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';
import { join } from 'lodash';
const currentPage = ref(1); // 默认页码
const pageSize = ref(30); // 默认每一页几条
const total = ref(0); //页码总页数
@ -810,10 +836,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 +1312,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 +1343,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,42 +1425,99 @@ const AddInfo = () => {
// 首页新增表单确定
const ConfirmForm = () => {
console.log(Indexform.value.processor, 'Indexform.value.processor');
console.log(warehouseData.value, '准备好的数据');
console.log(Indexform.value.duty, '要筛选的数据');
let filteredB = warehouseData.value.filter(item => Indexform.value.duty.includes(item.id));
console.log(filteredB);
// 匹配司机名字
Indexform.value.deliveryDriver = DeliveryDriver.value.find(
item => item.value == Indexform.value.deliveryDriver
).label;
console.log(Indexform.value.deliveryDriver); // 输出李华
FromDisabled.value = false; //启用输入框
let processorEntityList = [];
const matchingObjects = warehouseData.value.filter(obj =>
Indexform.value.processor.includes(obj.value)
);
let name = matchingObjects.map(item => item.label);
name = name.join(',');
const matchingObjectsT = warehouseData.value.filter(obj =>
Indexform.value.duty.includes(obj.value)
);
let nameS = matchingObjectsT.map(item => item.label);
nameS = nameS.join(',');
//处理方
let ProcessingParty = {
//处理方
businessName: warehouseData.value.find(row => row.value == Indexform.value.processor)?.label,
businessId: Indexform.value.processor,
businessName: name,
businessId: Indexform.value.processor.join(','),
conditions: 1,
typesOf: 2,
};
processorEntityList.push(ProcessingParty);
//责任方
let ResponsibleParty = {
//责任方
businessName: warehouseData.value.find(row => row.value == Indexform.value.duty).label,
businessId: Indexform.value.duty,
businessName: nameS,
businessId: Indexform.value.duty.join(','),
conditions: 1,
typesOf: 1,
};
let a = [
{
value: '1',
label: '张三',
},
{
value: '2',
label: '张四',
},
{
value: '3',
label: '张五',
},
{
value: '4',
label: '张六',
},
];
let Tc = [2, 4];
Tc.forEach(item => {
console.log(item, '责任方');
processorEntityList.push({
businessName: nameS,
businessId: item,
conditions: 1,
typesOf: 1,
});
});
processorEntityList.push(ResponsibleParty);
Indexform.value.processorEntityList = processorEntityList;
let DataSubmit = { ...Indexform.value };
console.log(processorEntityList, 'processorEntityList');
let DataSubmit = { ...Indexform.value }; //定义初始化
DataSubmit.processorEntityList = processorEntityList;
delete DataSubmit.duty, //移除多余字段
delete DataSubmit.processor; //移除多余字段
console.log(DataSubmit, '处理好的表单信息');
console.log(warehouseData.value, 'warehouseData.value');
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 +1661,6 @@ const btnsc = val => {
console.log(val);
};
// // 下拉框搜索公共函数
// const updateDetailQuery = (index, propName, obj) => {
// // 更新或删除查询参数
@ -1592,7 +1687,6 @@ const btnsc = val => {
// }
// };
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
console.log('index :>> ', index);
@ -1612,10 +1706,16 @@ const selectionChange = list => {
};
/** 页码改变执行的回调 */
const currentChange = () => {
console.log('');
const currentChange = val => {
page.value.currentPage = val;
IndexTable();
};
// 每页多少条
const sizeChange = val => {
console.log(val);
page.value.pageSize = val;
IndexTable();
};
const changeProcessingResults = val => {
// 首先删除取消的项目
ProcessingList.value = ProcessingList.value.filter(item => val.includes(item.state - 1));
@ -1837,7 +1937,7 @@ const changeProcessingResults = val => {
}
.lptime {
margin-top: 30px;
padding-left: 50px;
padding-left: 60px;
display: flex;
flex-direction: column;
font-size: 14px;
@ -1893,10 +1993,21 @@ 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>

702
src/views/distribution/checkInventoryTask/createTask.vue
View File

File diff suppressed because it is too large Load Diff

8
src/views/distribution/signdetail/distributionSigndetail.vue
Unescape View File

@ -48,14 +48,14 @@
</el-select>
<!-- <el-input v-model="query.deliveryType" placeholder="请选择业务类型"></el-input>-->
</el-form-item>
<el-form-item label="文员名称:">
<el-input v-model="query.deliveryPhone" placeholder="请输入客户电话"></el-input>
<el-form-item label="审核人名称:">
<el-input v-model="query.examineUserName" placeholder="请输入客户电话"></el-input>
</el-form-item>
<el-form-item label="司机名称:">
<el-input v-model="query.deliveryPhone" placeholder="请输入客户电话"></el-input>
<el-input v-model="query.driverName" placeholder="请输入客户电话"></el-input>
</el-form-item>
<el-form-item label="车牌:">
<el-input v-model="query.deliveryPhone" placeholder="请输入客户电话"></el-input>
<el-input v-model="query.vehicleName" placeholder="请输入客户电话"></el-input>
</el-form-item>
<el-form-item label="配送时间:">

4
vite.config.js
Unescape View File

@ -23,8 +23,12 @@ export default ({ mode, command }) => {
// 新zyc
// target: 'http://192.168.6.116:8777',
// target: 'http://192.168.6.141:8777',
target: 'http://192.168.6.116:8777',
// tjj
// target: 'http://192.168.10.25:13000',
// cg
// target: 'http://192.168.10.200:13000',
// target: 'http://192.168.10.94:8888',
target: 'http://test.api.huitongys.com',
// target: 'http://h5uapi.huitongys.com',

Write Preview
Loading…
Cancel
Save