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

隐藏按库存品上架

fix_bug_pro20231227
马远东 1 year ago
parent
d7f6d12e93
commit
7da6feab42
3 changed files with 134 additions and 95 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. 123
      src/option/aftersales/vueTvemp.js
  2. 104
      src/views/aftersales/aftersalesWorkOrder.vue
  3. 2
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

123
src/option/aftersales/vueTvemp.js
Unescape View File

@ -385,7 +385,7 @@ export const recordList = [
]
// 理赔
export const Claimsfield = [
{
prop: '',
@ -405,9 +405,9 @@ export const Claimsfield = [
{
prop: 'workOrderNumber',
label: '工单号',
type: 3,
type: 2,
values: '',
width: '100',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
@ -438,7 +438,7 @@ export const Claimsfield = [
{
prop: 'brandName',
label: '品牌',
type: 3,
type: 2,
values: '',
width: '100',
checkarr: [],
@ -449,7 +449,7 @@ export const Claimsfield = [
{
prop: 'mallName',
label: '商场名称',
type: 3,
type: 2,
values: '',
width: '100',
checkarr: [],
@ -460,29 +460,7 @@ export const Claimsfield = [
{
prop: 'waybillNumber',
label: '运单号',
type: 3,
values: '',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'workOrderType',
label: '异常类型',
type: 3,
values: '',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'workOrderTypeName',
label: '异常类型名称',
type: 3,
type: 2,
values: '',
width: '100',
checkarr: [],
@ -490,6 +468,17 @@ export const Claimsfield = [
sortable: true,
head: false,
},
// {
// prop: 'workOrderType',
// label: '异常类型',
// type: 3,
// values: '',
// width: '100',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'workOrderTypeName',
label: '异常类型名称',
@ -501,17 +490,17 @@ export const Claimsfield = [
sortable: true,
head: false,
},
{
prop: 'resultType',
label: '处理结果',
type: 3,
values: '',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'resultType',
// label: '处理结果',
// type: 3,
// values: '',
// width: '100',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'resultTypeName',
label: '处理结果名称',
@ -534,20 +523,20 @@ export const Claimsfield = [
// sortable: true,
// head: false,
// },
{
prop: 'discoveryNode',
label: '发现环节',
type: 3,
values: '',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'discoveryNode',
// label: '发现环节',
// type: 3,
// values: '',
// width: '100',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'discoveryNodeName',
label: '发现环境名称',
label: '发现环节名称',
type: 3,
values: '',
width: '100',
@ -559,7 +548,7 @@ export const Claimsfield = [
{
prop: 'resultDescription',
label: '处理结果说明',
type: 3,
type: 2,
values: '',
width: '100',
checkarr: [],
@ -570,7 +559,7 @@ export const Claimsfield = [
{
prop: 'vehicleRoute',
label: '车辆路线',
type: 3,
type: 2,
values: '',
width: '100',
checkarr: [],
@ -592,7 +581,7 @@ export const Claimsfield = [
{
prop: 'reason',
label: '判责原因',
type: 3,
type: 2,
values: '',
width: '100',
checkarr: [],
@ -603,7 +592,7 @@ export const Claimsfield = [
{
prop: 'money',
label: '金额',
type: 3,
type: 2,
values: '',
width: '100',
checkarr: [],
@ -625,18 +614,7 @@ export const Claimsfield = [
{
prop: 'processNumber',
label: '钉钉流程号',
type: 3,
values: '',
width: '100',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'workOrderStatus',
label: '工单状态',
type: 3,
type: 2,
values: '',
width: '100',
checkarr: [],
@ -644,6 +622,17 @@ export const Claimsfield = [
sortable: true,
head: false,
},
// {
// prop: 'workOrderStatus',
// label: '工单状态',
// type: 3,
// values: '',
// width: '100',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'workOrderStatusName',
label: '工单状态名称',

104
src/views/aftersales/aftersalesWorkOrder.vue
Unescape View File

@ -1084,7 +1084,7 @@ const TotalamountReceived = ref(0); //收款金额合计
const Reasonarbitration = ref(null); //仲裁原因
const BatchcompletionHeight = ref(0); //批量完结弹窗
const userInfo = ref(); //当前登录人信息
const ClaimStatus = ref(false);//理赔状态
const ClaimStatus = ref(false); //理赔状态
const TabList = ref([
{ name: 0, label: '全部' },
{ name: 1, label: '处理中' },
@ -1268,7 +1268,7 @@ const TransportLossNode = ref([
// 页面初始化数据
const IndexTable = val => {
ClaimStatus.value=false;
ClaimStatus.value = false;
// ProcessingPartyState.value = false; //关闭处理方
details.loadingObj.list = true; //开启动画加载
let data = {
@ -1356,6 +1356,7 @@ const OnLoad = () => {
updateDictionary(columnList[2].checkarr, 'pc_work_order'); //异常类型
updateDictionary(columnList[3].checkarr, 'pc_discovery_node'); //发现环节
IndexTable(details.query);
getDeptWarehouse({}).then(res => {
res.data.data.forEach(item => {
@ -1722,14 +1723,12 @@ const handlePictureCardPreview = uploadFile => {
const inputsc = (index, row) => {
processRowProperty(index, row, details);
details.query[row.prop] = index;
if(ClaimStatus.value){
if (ClaimStatus.value) {
// 这是理赔搜索
return
settlementclaim(details.query);
return;
}
if (!ProcessingPartyState.value) {
IndexTable(details.query); //首页初始化信息
console.log('首页');
@ -1740,14 +1739,13 @@ const inputsc = (index, row) => {
};
// 网页顶部搜索按钮
const searchChange = () => {
if( ClaimStatus.value){
if (ClaimStatus.value) {
// 表示这是理赔查询
settlementclaim()
settlementclaim();
details.search = false; //关闭搜索
return
return;
}
details.search = false; //关闭搜索
if (!ProcessingPartyState.value) {
IndexTable(details.query); //首页初始化信息
@ -1796,6 +1794,13 @@ const btnsc = val => {
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
processRowProperty(index, row, details);
if (ClaimStatus.value) {
// 这是理赔搜索
settlementclaim(details.query);
return;
}
if (!ProcessingPartyState.value) {
IndexTable(details.query); //首页初始化信息
} else {
@ -1814,6 +1819,13 @@ const selectionChange = list => {
/** 页码改变执行的回调 */
const currentChange = val => {
page.value.currentPage = val;
if (ClaimStatus.value) {
// 这是理赔
settlementclaim(details.query);
return;
}
if (!ProcessingPartyState.value) {
//表示当前不是处理方
IndexTable(details.query);
@ -1824,6 +1836,13 @@ const currentChange = val => {
// 每页多少条
const sizeChange = val => {
page.value.pageSize = val;
if (ClaimStatus.value) {
// 这是理赔
settlementclaim(details.query);
return;
}
if (!ProcessingPartyState.value) {
//表示当前不是处理方
IndexTable(details.query);
@ -1874,21 +1893,52 @@ const changeProcessingResults = val => {
});
};
// 查询理赔数据
const settlementclaim = (val) => {
ClaimStatus.value=true;//开启理赔查询状态
const settlementclaim = val => {
console.log(Claimsfield, '理赔数据');
ClaimStatus.value = true; //开启理赔查询状态
details.columnList = Claimsfield;
Claimsfield[3].checkarr = []; //营业部
Claimsfield[7].checkarr = []; //异常类型名称
Claimsfield[9].checkarr = []; //异常类型名称
getDeptWarehouse({}).then(res => {
res.data.data.forEach(item => {
Claimsfield[3].checkarr.push({
value: item.name,
label: item.name,
});
});
});
getDictionaryBiz('pc_work_order').then(res => {
res.data.data.forEach(item => {
Claimsfield[7].checkarr.push({
value: item.dictValue,
label: item.dictValue,
});
});
});
getDictionaryBiz('pc_discovery_node').then(res => {
res.data.data.forEach(item => {
Claimsfield[9].checkarr.push({
value: item.dictValue,
label: item.dictValue,
});
});
});
// details.columnList warehouseData.value
details.loadingObj.list = true; //开启动画加载
console.log(details,'details');
console.log(details, 'details');
let data = {
current: details.page.currentPage,
size: details.page.pageSize,
...val
...val,
};
console.log(data,'要传递的参数');
console.log(data, '要传递的参数');
$_listSettlement(data).then(res => {
details.loadingObj.list = false; //关闭动画加载
console.log(res, '查询理赔数据');
details.data = res.data.data.records;//数据
details.data = res.data.data.records; //数据
page.value.total = res.data.data.total;
});
};
@ -1901,7 +1951,7 @@ const tabChenge = val => {
ProcessingPartyState.value = false; //关闭处理方
details.query.workOrderStatus = null;
ArbitrationStatus.value = false; //不可以申请仲裁
Tableheaderswitching(columnList);
Tableheaderswitching(columnList);
IndexTable();
empty();
console.log('全部');
@ -1911,7 +1961,7 @@ const tabChenge = val => {
data.workOrderStatus = 20;
details.query.workOrderStatus = 20;
ArbitrationStatus.value = true; //可以申请仲裁
Tableheaderswitching(columnList);
Tableheaderswitching(columnList);
empty();
IndexTable(data);
} else if (val == 2) {
@ -1920,7 +1970,7 @@ const tabChenge = val => {
data.workOrderStatus = 30;
details.query.workOrderStatus = 30;
ArbitrationStatus.value = false; //不可以申请仲裁
Tableheaderswitching(columnList);
Tableheaderswitching(columnList);
empty();
IndexTable(data);
} else if (val == 3) {
@ -1928,7 +1978,7 @@ const tabChenge = val => {
ProcessingPartyState.value = true; //开启处理方
details.query.workOrderStatus = '';
ArbitrationStatus.value = true; //可以申请仲裁
Tableheaderswitching(columnList);
Tableheaderswitching(columnList);
empty();
ProcessingPartyFun(data);
} else if (val == 4) {
@ -1936,7 +1986,7 @@ const tabChenge = val => {
// 理赔金额未出
details.query.workOrderStatus = null;
ArbitrationStatus.value = false; //不可以申请仲裁
Tableheaderswitching(Claimsfield); //切换表格
Tableheaderswitching(Claimsfield); //切换表格
empty();
settlementclaim();
} else if (val == 5) {
@ -1945,7 +1995,7 @@ const tabChenge = val => {
data.workOrderStatus = 70;
details.query.workOrderStatus = 70;
ArbitrationStatus.value = false; //不可以申请仲裁
Tableheaderswitching(columnList);
Tableheaderswitching(columnList);
empty();
IndexTable(data);
} else if (val == 6) {
@ -1954,16 +2004,16 @@ const tabChenge = val => {
data.workOrderStatus = 80;
details.query.workOrderStatus = 80;
ArbitrationStatus.value = false; //不可以申请仲裁
Tableheaderswitching(columnList);
Tableheaderswitching(columnList);
empty();
IndexTable(data);
} else if (val == 7) {
} else if (val == 7) {
// 超时未处理
ProcessingPartyState.value = false; //关闭处理方
data.workOrderStatus = 60;
details.query.workOrderStatus = 60;
ArbitrationStatus.value = false; //不可以申请仲裁
Tableheaderswitching(columnList);
Tableheaderswitching(columnList);
empty();
IndexTable(data);
}
@ -1992,7 +2042,7 @@ const showdrawer = _flag => {
// 处理方数据公共函数
const ProcessingPartyFun = val => {
ClaimStatus.value=false;//关闭理赔状态
ClaimStatus.value = false; //关闭理赔状态
details.query.workOrderStatus = null;
details.loadingObj.list = true; //开启动画加载
let data = {

2
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
Unescape View File

@ -211,7 +211,7 @@
<el-button type="primary" @click="showupt(2)">按自编号</el-button>
<el-button type="primary" @click="showupt(3)">按包件</el-button>
<el-button type="primary" @click="showupt(4)">按托盘</el-button>
<el-button type="primary" @click="showupt(5)">按库存品</el-button>
<!-- <el-button type="primary" @click="showupt(5)">按库存品</el-button> -->
<el-button type="primary" @click="showupt(6)">按零担</el-button>
<el-button type="danger" @click="upgood">禁用</el-button>
</span>

Write Preview
Loading…
Cancel
Save