qb 1 year ago
parent
commit
8721b39ab5
  1. 20
      src/api/distribution/createTask.js
  2. 8
      src/option/basicdata/basicdataGoodsAllocation.js
  3. 51
      src/router/views/index.js
  4. 249
      src/views/aftersales/VueTemp.vue
  5. 61
      src/views/aftersales/abnormalworkOrder.vue
  6. 6
      src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
  7. 323
      src/views/distribution/checkInventoryTask/createTask.vue
  8. 0
      src/views/distribution/checkInventoryTask/createTaska.vue
  9. 8
      vite.config.js

20
src/api/distribution/createTask.js

@ -74,7 +74,14 @@ export const $_getDetailInfo = params => {
}); });
}; };
// 查询货位信息
export const $_getList = ( params) => {
return request({
url: '/api/logpm-basicdata/goodsAllocation/list',
method: 'get',
params
})
}
/** /**
* 盘点状态修改 * 盘点状态修改
@ -181,8 +188,15 @@ export const $_taskQuestSelectStrip = params => {
params, params,
}); });
}; };
// 盘点导出
export const $_exportGetContrastInfo = params => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/export-getContrastInfo',
method: 'get',
params,
responseType: 'blob',
});
};
// 盘点任务库存品 // 盘点任务库存品

8
src/option/basicdata/basicdataGoodsAllocation.js

@ -200,8 +200,8 @@ export default {
], ],
}, },
{ {
label: '所在', label: '所在',
prop: 'columnNum', prop: 'layerNum',
type: 'input', type: 'input',
align: 'center', align: 'center',
labelWidth: '100', labelWidth: '100',
@ -213,8 +213,8 @@ export default {
width: 'fit-content', width: 'fit-content',
}, },
{ {
label: '所在', label: '所在',
prop: 'layerNum', prop: 'columnNum',
type: 'input', type: 'input',
align: 'center', align: 'center',
labelWidth: '100', labelWidth: '100',

51
src/router/views/index.js

@ -1114,18 +1114,9 @@ export default [
}, },
], ],
}, },
{
path: '/aftersales/AbnormalworkOrder',
component: Layout,
redirect: '/aftersales/AbnormalworkOrder',
children: [
{
path: '/aftersales/AbnormalworkOrder',
name: '异常工单',
component: () => import('@/views/aftersales/abnormalworkOrder.vue'),
},
],
},
// 下面的代码为 商场客户端的页面 // 下面的代码为 商场客户端的页面
{ {
@ -1141,30 +1132,18 @@ export default [
], ],
}, },
{ {
path: '/distribution/checkInventoryTask/createTaskTemp', path: '/aftersales/VueTemp',
component: Layout, component: Layout,
redirect: '/distribution/checkInventoryTask/createTaskTemp', redirect: '/aftersales/VueTemp',
children: [ children: [
{ {
path: '/distribution/checkInventoryTask/createTaskTemp', path: '/aftersales/VueTemp',
name: '盘点重构', name: '工单',
component: () => import('@/views/distribution/checkInventoryTask/createTaskTemp.vue'), component: () => import('@/views/aftersales/VueTemp.vue'),
}, },
], ],
}, },
// {
// path: '/distribution/checkInventoryTask/createTaskTemp',
// component: Layout,
// redirect: '/distribution/checkInventoryTask/createTaskTemp',
// children: [
// {
// path: '/distribution/checkInventoryTask/createTaskTemp',
// name: '盘点重构',
// component: () => import('@/views/distribution/checkInventoryTask/createTaskTemp.vue'),
// },
// ],
// },
// { // {
// path: '/distribution/turndelivery/devtmp', // path: '/distribution/turndelivery/devtmp',

249
src/views/aftersales/VueTemp.vue

@ -0,0 +1,249 @@
<template>
<el-card class="box-card">
<el-table
v-loading="loading"
element-loading-text="数据正在更新中..."
:data="ElData"
border
style="width: 100%"
ref="tableRef"
@select-all="selectAll"
@select="selectChange"
>
<el-table-column type="selection" width="55" fixed />
<el-table-column type="index" fixed width="50" height="100" label="#" align="center" />
<!--
Type ===1 普通文本
Type ===2 图片显示
Type ===3 操作功能
label: 标题
width: 宽度
prop: 数据字段
-->
<el-table-column
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
align="center"
v-for="(item, index) in ElmenuData"
:key="item.label"
>
<el-table-column
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
align="center"
>
<!-- 头部搜索 -->
<template #header>
<el-input
clearable
v-if="item.type == 4"
v-model="item.values"
:placeholder="`请输入${item.label}`"
/>
</template>
<!-- 内容主体 -->
<template #default="props">
<span v-if="4">{{ props.row[item.prop] ? props.row[item.prop] : '/' }}</span>
<div :class="ElBtnClass" v-if="item.type == 3">
<el-button
:link="ElButtonS[0].link"
:class="ElButtonS[0].class"
:auto-insert-space="ElButtonS[0].space"
:size="ElButtonS[0].size"
:icon="ElButtonS[0].icon"
@click="ViewEvent(props.row)"
>明细</el-button
>
</div>
</template>
</el-table-column>
</el-table-column>
</el-table>
</el-card>
</template>
<script setup>
//
const ElButtonS = ref([
// 1.link (-false ,-tre)
// 2.class ()
// 3.space (true ,false)
// 4.size ('large'| 'default'| 'small')
// 5.icon
// 6.table
{
link: false,
class: 'el-btn-view',
space: true,
size: 'small',
icon: 'el-icon-view',
table: '详情',
},
{
link: false,
class: 'el-btn-view',
space: true,
size: 'small',
icon: 'el-icon-view',
table: '延期',
},
{
link: false,
class: 'el-btn-view',
space: true,
size: 'small',
icon: 'el-icon-view',
table: '编辑',
},
{
link: false,
class: 'el-btn-view',
space: true,
size: 'small',
icon: 'el-icon-view',
table: '对比数据',
},
]);
const ElData=ref([
{
name:'产品名称1',
currentUsageWarehouse:'北京仓库1'
},
{
name:'产品名称2',
currentUsageWarehouse:'北京仓库2'
}
])
const ElmenuData = ref([
{
prop: 'name',
label: '异常类型',
type: 4,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
header: true,
},
{
prop: 'currentUsageWarehouse',
label: '发现节点',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
header: true,
},
{
prop: 'model',
label: '异常工单',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
header: true,
},
{
prop: 'purchaseAmount',
label: '运单号',
type: 1,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
header: true,
},
{
prop: 'state',
label: '订单自编号',
type: 1,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
header: true,
},
{
prop: 'user',
label: '车次号',
type: 1,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
header: true,
},
{
prop: 'deviceSerialNumber',
label: '一级品',
type: 1,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
header: true,
},
{
prop: 'userPosition',
label: '二级品',
type: 1,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
header: true,
},
{
prop: 'isDeposit',
label: '车辆线路',
type: 1,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
header: true,
},
{
prop: '',
label: '操作',
type: 10,
values: '',
width: '280',
checkarr: [],
fixed: false,
sortable: true,
header: true,
},
]);
</script>
<style scoped lang='scss'>
</style>

61
src/views/aftersales/abnormalworkOrder.vue

@ -1,61 +0,0 @@
<template>
<el-tabs type="border-card" class="demo-tabs">
<el-tab-pane v-for="item in Tabs" :key="item.name">
<template #label>
<span class="custom-tabs-label">
<el-icon><component :is="item.icon" /></el-icon>
<span>{{ item.label }}</span>
</span>
</template>
<!-- 顶部搜索框 -->
<el-form :inline="true" :model="formInput" class="demo-form-inline">
<el-form-item label="Approved by">
<el-input v-model="formInput.user" placeholder="Approved by" clearable />
</el-form-item>
<el-form-item label="Activity zone">
<el-select v-model="formInput.region" placeholder="Activity zone" clearable>
<el-option label="Zone one" value="shanghai" />
<el-option label="Zone two" value="beijing" />
</el-select>
</el-form-item>
<el-form-item label="Activity time">
<el-date-picker
v-model="formInput.date"
type="date"
placeholder="Pick a date"
clearable
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">Query</el-button>
</el-form-item>
</el-form>
</el-tab-pane>
</el-tabs>
</template>
<script setup>
import { ref, reactive, onMounted, computed, watch } from 'vue';
//
const Tabs = ref([
{ label: '处理中', name: 0, icon: 'Monitor' },
{ label: '理赔金额未出', name: 1, icon: 'Coin' },
{ label: '处理完毕', name: 2, icon: 'Check' },
{ label: '完结', name: 3, icon: 'Reading' },
{ label: '仲裁中', name: 4, icon: 'List' },
{ label: '全部', name: 5, icon: 'Notification' },
]);
//
const formInput = ref({}); //
</script>
<style lang="scss" scoped>
.custom-tabs-label {
display: flex;
align-items: center;
justify-content: center;
i {
margin-right: 6px;
}
}
</style>

6
src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue

@ -586,4 +586,10 @@ export default {
margin-right: 0; margin-right: 0;
} }
} }
:deep(.el-card){
height: 100%;
.el-card__body{
height: 100%;
}
}
</style> </style>

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

@ -128,6 +128,13 @@
>对比数据</el-button >对比数据</el-button
> >
</div> </div>
<div v-if="item.type == 5 && item.prop == 'questNum'">
{{
props.row[item.prop] ? props.row[item.prop] : '/'
}}
<span class="el-exDc" @click="ExportDC(props.row)">导出</span>
</div>
<span v-if="item.type == 7">{{ <span v-if="item.type == 7">{{
props.row[item.prop] == 1 ? '全部' : props.row[item.prop] == 2 ? '全仓' : '/' props.row[item.prop] == 1 ? '全部' : props.row[item.prop] == 2 ? '全仓' : '/'
}}</span> }}</span>
@ -166,7 +173,7 @@
</div> </div>
<!-- 弹窗详情 --> <!-- 弹窗详情 -->
<el-dialog v-model="PopupDetails" title="盘点数据" width="70%" :before-close="handleClose"> <el-dialog v-model="PopupDetails" :title="!InventoryState?'盘点数据':'未盘点数据'" width="80%" :before-close="handleClose" :fullscreen="fullScreen">
<div style="margin-bottom: 10px"> <div style="margin-bottom: 10px">
<div style="display: flex"> <div style="display: flex">
<!-- v-if="TcMInventoryStatus" --> <!-- v-if="TcMInventoryStatus" -->
@ -181,6 +188,11 @@
<!-- v-if="NotCounted" --> <!-- v-if="NotCounted" -->
<el-button type="primary" @click="NotInventoried">盘点</el-button> <el-button type="primary" @click="NotInventoried">盘点</el-button>
</div> </div>
<div class="fullScreen" @click="BtnfullScreen">
<el-icon><FullScreen /></el-icon>
</div>
</div> </div>
</div> </div>
<!-- 表格开始 --> <!-- 表格开始 -->
@ -250,7 +262,7 @@
</el-select> </el-select>
</template> </template>
<template #default="props"> <template #default="props">
<span v-if="item.type == 6 && item.prop == 'questStatus'"> <span v-if="item.type == 6 && item.prop == 'questStatus'">
{{ {{
props.row[item.prop] == 0 props.row[item.prop] == 0
? '待盘点' ? '待盘点'
@ -278,7 +290,6 @@
<span v-if="item.type == 10"> <span v-if="item.type == 10">
<el-input <el-input
@change="InputSo(item)"
clearable clearable
:disabled="props.row.Checkbox" :disabled="props.row.Checkbox"
v-model="props.row[item.prop]" v-model="props.row[item.prop]"
@ -423,8 +434,19 @@
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label="新的货位:">
<el-input v-model="WrapBarEditing.groundingPositionCode" placeholder="请输入" />
<el-form-item label="新的货位">
<el-select-v2
v-model="WrapBarEditing.groundingPositionCode"
style="width:240px"
filterable
remote
:remote-method="remoteMethod"
clearable
:options="optionss"
placeholder="请输入货位"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -492,7 +514,6 @@
v-model="InventoryPopup" v-model="InventoryPopup"
title="创建盘点任务" title="创建盘点任务"
width="30%" width="30%"
:before-close="InventoryPopupClose"
> >
<el-form :model="formInventory" label-width="120px"> <el-form :model="formInventory" label-width="120px">
<el-form-item label="商场名称"> <el-form-item label="商场名称">
@ -532,7 +553,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="InventoryPopup = false">取消</el-button> <el-button @click="InventoryPopup = false">取消</el-button>
<el-button type="primary" @click="InventorySubmit"> 提交 </el-button> <el-button type="primary" @click="InventorySubmit"> 提交 </el-button>
</span> </span>
@ -557,7 +578,7 @@
<!-- 对比信息弹窗 --> <!-- 对比信息弹窗 -->
<el-dialog v-model="dialogcontrast" title="对比信息" width="70%"> <el-dialog v-model="dialogcontrast" title="对比信息" width="70%">
<div class="dbExPo"> <div class="dbExPo">
<!-- <el-button type="primary" @click="MXexport">导出</el-button> --> <el-button type="primary" @click="MXexport">导出</el-button>
</div> </div>
<!-- 表格开始 --> <!-- 表格开始 -->
<el-table <el-table
@ -641,6 +662,8 @@ import {
$_materialList, $_materialList,
$_submit, $_submit,
$_questDetailIds, $_questDetailIds,
$_exportGetContrastInfo,
$_getList,
} from '@/api/distribution/createTask'; } from '@/api/distribution/createTask';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { downloadXls } from '@/utils/util'; import { downloadXls } from '@/utils/util';
@ -682,7 +705,7 @@ const NotCounted = ref(false); //为盘点信息
const UncheckedRow = ref({}); // const UncheckedRow = ref({}); //
const InventoryStatus = ref(false); // const InventoryStatus = ref(false); //
const InventoryInput = ref(null); //input const InventoryInput = ref(null); //input
// const InventoryData=ref([]);// const InventoryState=ref(false);//
const TcMInventoryStatus = ref(true); // const TcMInventoryStatus = ref(true); //
const TcStatusModification = ref(false); // const TcStatusModification = ref(false); //
const TcStateSwitching = ref(false); // const TcStateSwitching = ref(false); //
@ -692,6 +715,8 @@ const TcReaJoin = ref([]); //零担库存品状态10,20,30...
const TcDataaddition = ref(false); // const TcDataaddition = ref(false); //
const Fromnewlyadded = ref({}); // const Fromnewlyadded = ref({}); //
const Statusjudgment = ref(false); // const Statusjudgment = ref(false); //
const DbEx=ref(null);//
const fullScreen=ref(false);//
const radioList = ref([ const radioList = ref([
{ label: 0, txt: '在库', input: 'stockNum', disabled: true }, { label: 0, txt: '在库', input: 'stockNum', disabled: true },
{ label: 1, txt: '破损', input: 'wornNum', disabled: true }, { label: 1, txt: '破损', input: 'wornNum', disabled: true },
@ -752,6 +777,17 @@ const menuData = ref([
search: true, search: true,
head: true, head: true,
}, },
{
prop: 'marketName',
label: '收货单位',
type: 4,
values: '',
width: '250',
checkarr: [],
fixed: false,
search: true,
head: true,
},
{ {
prop: 'brandName', prop: 'brandName',
label: '品牌名称', label: '品牌名称',
@ -822,28 +858,29 @@ const menuData = ref([
// //
const InventoryDetails = ref([ const InventoryDetails = ref([
{ {
prop: 'orderPackageCode', prop: 'orderCode',
label: '包条', label: '订单自编号',
type: 5, type: 5,
values: '', values: '',
width: '260', width: '260',
checkarr: [], checkarr: [],
fixed: false, fixed: true,
search: true, search: true,
head: true, head: true,
}, },
{ {
prop: 'orderCode', prop: 'orderPackageCode',
label: '订单自编号', label: '包条',
type: 5, type: 5,
values: '', values: '',
width: '260', width: '260',
checkarr: [], checkarr: [],
fixed: false, fixed: true,
search: true, search: true,
head: true, head: true,
}, },
{ {
prop: 'questTarget', prop: 'questTarget',
label: '品类', label: '品类',
@ -899,6 +936,17 @@ const InventoryDetails = ref([
{ {
prop: 'positionCode', prop: 'positionCode',
label: '货位', label: '货位',
type: 5,
values: '',
width: '260',
checkarr: [],
fixed: false,
search: true,
head: true,
},
{
prop: 'materialName',
label: '物料名称',
type: 4, type: 4,
values: '', values: '',
width: '260', width: '260',
@ -918,7 +966,39 @@ const InventoryDetails = ref([
search: true, search: true,
head: true, head: true,
}, },
{
prop: 'trayName',
label: '托盘名称',
type: 4,
values: '',
width: '150',
checkarr: [],
fixed: false,
search: false,
head: true,
},
{
prop: 'updateUser',
label: '盘点人',
type: 4,
values: '',
width: '150',
checkarr: [],
fixed: false,
search: false,
head: true,
},
{
prop: 'updateTime',
label: '盘点时间',
type: 4,
values: '',
width: '150',
checkarr: [],
fixed: false,
search: false,
head: true,
},
{ {
prop: 'firsts', prop: 'firsts',
label: '一级品类', label: '一级品类',
@ -952,7 +1032,17 @@ const InventoryDetails = ref([
search: true, search: true,
head: true, head: true,
}, },
{
prop: 'brandName',
label: '品牌',
type: 4,
values: '',
width: '250',
checkarr: [],
fixed: false,
search: true,
head: true,
},
{ {
prop: 'categoryName', prop: 'categoryName',
label: '产品名称', label: '产品名称',
@ -996,7 +1086,18 @@ const contrast = ref([
values: '', values: '',
width: '260', width: '260',
checkarr: [], checkarr: [],
fixed: false, fixed: true,
search: true,
head: true,
},
{
prop: 'orderPackageCode',
label: '包条',
type: 5,
values: '',
width: '260',
checkarr: [],
fixed: true,
search: true, search: true,
head: true, head: true,
}, },
@ -1154,6 +1255,17 @@ const contrast = ref([
search: false, search: false,
head: true, head: true,
}, },
{
prop: 'trayName',
label: '托盘名称',
type: 4,
values: '',
width: '150',
checkarr: [],
fixed: false,
search: false,
head: true,
},
{ {
prop: 'groundingPositionCode', prop: 'groundingPositionCode',
label: '新货位', label: '新货位',
@ -1243,7 +1355,10 @@ const IndexPd=(val)=>{
} }
}); });
} }
//
const BtnfullScreen=()=>{
fullScreen.value=!fullScreen.value;
}
function onLoad() { function onLoad() {
getDictionaryBiz('logpm_unit').then(res => { getDictionaryBiz('logpm_unit').then(res => {
@ -1327,6 +1442,7 @@ const InputSo = val => {
}); });
} }
}); });
return; return;
} }
if (val.prop == 'materialCode') { if (val.prop == 'materialCode') {
@ -1378,14 +1494,29 @@ const InputSo = val => {
const TcAddData = () => { const TcAddData = () => {
TcDataaddition.value = true; // TcDataaddition.value = true; //
}; };
// //
const MXexport = () => { const DbExTc=(data)=>{
$_exportGetContrastInfo({
id:data.id,
questNum:data.questNum
}).then(res=>{
console.log(res,'导出');
downloadXls(res.data, `${data.questNum}对比明细.xlsx`)
})
}
//
const ExportDC = (val) => {
// //
downloadXls(url, '滞留运单.xlsx'); console.log(val);
DbExTc(val)
// URL
// URL.revokeObjectURL(url);
}; };
//
const MXexport=()=>{
//
DbExTc(DbEx.value)
}
// () // ()
const TcDataadditionsubmit = () => { const TcDataadditionsubmit = () => {
console.log(Fromnewlyadded.value); console.log(Fromnewlyadded.value);
@ -1523,6 +1654,7 @@ const comparativeData = val => {
dialogcontrast.value = true; // dialogcontrast.value = true; //
contrastloading.value = true; // contrastloading.value = true; //
console.log(val, '对比数据当前行'); console.log(val, '对比数据当前行');
DbEx.value=val;//
let data = {}; let data = {};
data.questNum = val.questNum; data.questNum = val.questNum;
data.questId = val.id; data.questId = val.id;
@ -1537,7 +1669,7 @@ const searchReset = () => {
SoInfoData.value = {}; SoInfoData.value = {};
}; };
const TcViewEvent = val => { const TcViewEvent = (val,Inso) => {
Statusjudgment.value = false; // Statusjudgment.value = false; //
TcPdloading.value = true; TcPdloading.value = true;
console.log(val, '要传递的对象'); console.log(val, '要传递的对象');
@ -1546,6 +1678,7 @@ const TcViewEvent = val => {
questId: val.id, questId: val.id,
current: TccurrentPage.value, // current: TccurrentPage.value, //
size: TcpageSize.value, // size: TcpageSize.value, //
...Inso
}; };
console.log(data, '要提交的数据'); console.log(data, '要提交的数据');
@ -1561,6 +1694,10 @@ const TcViewEvent = val => {
}; };
// //
const ViewEvent = val => { const ViewEvent = val => {
InventoryDetails.value.forEach(item=>{
item.values=null
})
InventoryState.value=false;//
TccurrentPage.value = 1; // TccurrentPage.value = 1; //
NotCounted.value = false; // NotCounted.value = false; //
row.value = val; row.value = val;
@ -1576,7 +1713,7 @@ const ViewEvent = val => {
}; };
// //
const NotCountedFn = row => { const NotCountedFn = (row,Inso) => {
TcPdloading.value = true; TcPdloading.value = true;
$_getDetailInfo({ $_getDetailInfo({
questStatus: 0, questStatus: 0,
@ -1584,6 +1721,7 @@ const NotCountedFn = row => {
questId: row.id, questId: row.id,
current: TccurrentPage.value, // current: TccurrentPage.value, //
size: TcpageSize.value, // size: TcpageSize.value, //
...Inso
}).then(res => { }).then(res => {
TcPdloading.value = false; TcPdloading.value = false;
console.log(res, '未盘点明细返回值'); console.log(res, '未盘点明细返回值');
@ -1597,14 +1735,20 @@ const NotCountedFn = row => {
// //
const DetailsNotCounted = row => { const DetailsNotCounted = row => {
InventoryDetails.value.forEach(item=>{
item.values=null
})
InventoryState.value=true;//
TcFrom.value={};//
TccurrentPage.value = 1; // TccurrentPage.value = 1; //
UncheckedRow.value = row; // UncheckedRow.value = row; //
console.log(row.value, '点击盘点了'); console.log(row.value,'存储好的数据');
NotCounted.value = true; // NotCounted.value = true; //
TcPdloading.value = true; TcPdloading.value = true;
PopupDetails.value = true; PopupDetails.value = true;
NotCountedFn(UncheckedRow.value); NotCountedFn(row);
row.value = row;
}; };
// //
const NotInventoried = val => { const NotInventoried = val => {
@ -1623,7 +1767,7 @@ const NotInventoried = val => {
id: item.id, id: item.id,
questStatus: (item.questStatus = 1), questStatus: (item.questStatus = 1),
questId: item.questId, questId: item.questId,
questNum: UncheckedRow.value.questNum, questNum:UncheckedRow.value.questNum,
}); });
}); });
console.log(data, '未盘点处理好的值'); console.log(data, '未盘点处理好的值');
@ -1848,6 +1992,19 @@ const StatusDetermination = () => {
} }
}; };
const optionss = ref([])
const loadings = ref(false)
const list = ref([])
const remoteMethod = (query) => {
if (query !== '') {
optionss.value = list.value.filter((item) => {
return item.label.toLowerCase().includes(query.toLowerCase())
})
} else {
optionss.value = []
}
}
// //
const Tclist = val => { const Tclist = val => {
console.log(val); console.log(val);
@ -1865,6 +2022,22 @@ const Tclist = val => {
}; };
// //
const InventoryEditing = val => { const InventoryEditing = val => {
$_getList({
current: 1, //
size: 10000, //
warehouseId:val.warehouseId,
}).then(res=>{
console.log(res);
if(res.data.data.records){
list.value= res.data.data.records.map((item) => {
return { value:`${item.id}`, label: `${item.qrCode}` }
})
console.log(list.value);
}
})
counting.value = {}; // counting.value = {}; //
WrapBarEditing.value.radio = null; WrapBarEditing.value.radio = null;
readList.value = []; readList.value = [];
@ -1898,10 +2071,11 @@ const InventoryEditing = val => {
// //
const InformationEditing = () => { const InformationEditing = () => {
TcPdloading.value = true; TcPdloading.value = true;
console.log(WrapBarEditing.value,'WrapBarEditing.value');
let data = [ let data = [
{ {
orderCode: WrapBarEditing.value.orderCode, // orderCode: WrapBarEditing.value.orderCode, //
groundingPositionCode: WrapBarEditing.value.positionCode, // groundingPositionCode: WrapBarEditing.value.groundingPositionCode, //
stockNum: counting.value.stockNum, // stockNum: counting.value.stockNum, //
lossNum: counting.value.lossNum, // lossNum: counting.value.lossNum, //
deliveNum: counting.value.deliveNum, // deliveNum: counting.value.deliveNum, //
@ -1914,6 +2088,12 @@ const InformationEditing = () => {
id: Tcrow.value.id, id: Tcrow.value.id,
}, },
]; ];
if(WrapBarEditing.value.groundingPositionCode){
let val = list.value.find(obj => obj.value == WrapBarEditing.value.groundingPositionCode);
console.log(data,'货位处理好的数据');
data[0].groundingAllocationId=val.value;
data[0].groundingPositionCode=val.label
}
if (!TcStateSwitching.value) { if (!TcStateSwitching.value) {
// //
let InputMax = counting.value[radioList.value[InventoryInput.value].input]; // let InputMax = counting.value[radioList.value[InventoryInput.value].input]; //
@ -1967,13 +2147,18 @@ const InformationEditing = () => {
const TcChenge = (event, val) => { const TcChenge = (event, val) => {
console.log(event, val); console.log(event, val);
TcPdloading.value = true; TcPdloading.value = true;
console.log(row.value,'必须参数');
console.log(row.value.questNum,'questNum');
let quest=row.value.questNum
let qstId=row.value.id
let data = { let data = {
questNum: row.value.questNum,
questId: row.value.id,
current: TccurrentPage.value, // current: TccurrentPage.value, //
size: TcpageSize.value, // size: TcpageSize.value, //
...TcFrom.value, ...TcFrom.value,
questNum:quest,
questId:qstId,
}; };
console.log(data, '要提交的数据'); console.log(data, '要提交的数据');
$_getDetailInfo(data).then(res => { $_getDetailInfo(data).then(res => {
@ -1992,10 +2177,10 @@ const TcPageSizeChange = val => {
TcpageSize.value = val; TcpageSize.value = val;
if (NotCounted.value) { if (NotCounted.value) {
// //
NotCountedFn(UncheckedRow.value); NotCountedFn(UncheckedRow.value,TcFrom.value);
} else { } else {
console.log(val); console.log(val);
TcViewEvent(row.value); TcViewEvent(row.value,TcFrom.value);
} }
}; };
@ -2006,10 +2191,10 @@ const TcSizeChange = val => {
if (NotCounted.value) { if (NotCounted.value) {
// //
NotCountedFn(UncheckedRow.value); NotCountedFn(UncheckedRow.value,TcFrom.value);
} else { } else {
console.log(val); console.log(val);
TcViewEvent(row.value); TcViewEvent(row.value,TcFrom.value);
} }
}; };
// //
@ -2116,11 +2301,12 @@ const InventorySubmit = () => {
// //
SubData.list = []; SubData.list = [];
// //
SubData.endTime = formInventory.value.time[0]; SubData.endTime = formInventory.value.time[1];
// //
SubData.startTime = formInventory.value.time[1]; SubData.startTime = formInventory.value.time[0];
InventoryPopup.value = false; // InventoryPopup.value = false; //
loading.value = true; // loading.value = true; //
console.log(SubData,'处理好的数据');
postAddtaskQuest(SubData).then(res => { postAddtaskQuest(SubData).then(res => {
onLoad(); // onLoad(); //
if ((res.data.code = 200)) { if ((res.data.code = 200)) {
@ -2149,15 +2335,15 @@ const InventorySubmit = () => {
} }
// //
SubData.endTime = formInventory.value.time[0]; SubData.endTime = formInventory.value.time[1];
// //
SubData.startTime = formInventory.value.time[1]; SubData.startTime = formInventory.value.time[0];
console.log(SubData, '处理好要提交的数据'); console.log(SubData, '处理好要提交的数据');
InventoryPopup.value = false; // InventoryPopup.value = false; //
postAddtaskQuest(SubData).then(res => { // postAddtaskQuest(SubData).then(res => {
console.log(res, '盘点计划提交成功'); // console.log(res, '');
onLoad(); // // onLoad(); //
}); // });
}; };
</script> </script>
@ -2201,9 +2387,7 @@ const InventorySubmit = () => {
padding: 0 10px; padding: 0 10px;
} }
:deep(.cell) {
padding: 0;
}
.demo-pagination-block { .demo-pagination-block {
flex: 1; flex: 1;
@ -2242,6 +2426,7 @@ const InventorySubmit = () => {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
margin-top: 80px; margin-top: 80px;
} }
.Tcstate { .Tcstate {
@ -2286,4 +2471,42 @@ const InventorySubmit = () => {
justify-content: flex-end; justify-content: flex-end;
margin-bottom: 10px; margin-bottom: 10px;
} }
.el-exDc{
margin-left: 20px;
color: #10d070;
cursor: pointer;
}
:deep(.el-dialog){
display: flex;
flex-direction: column;
justify-content: flex-start;
.el-dialog__footer{
flex: 1;
}
.dialog-footer{
display: flex;
align-items: flex-end;
}
}
.fullScreen{
display: flex;
margin-left: auto;
align-items: center;
justify-content: center;
i{
width: 20px;
height: 20px;
svg{
height: 100%;
width: 100%;
}
}
}
:deep(.el-input__wrapper){
height: 30px;
}
:deep(.el-input__inner){
height: 100% !important;
}
</style> </style>

0
src/views/distribution/checkInventoryTask/createTaskaaa.vue → src/views/distribution/checkInventoryTask/createTaska.vue

8
vite.config.js

@ -20,9 +20,11 @@ export default ({ mode, command }) => {
// target: 'http://192.168.10.101:8888', // target: 'http://192.168.10.101:8888',
// 老zyc // 老zyc
// target: 'http://192.168.10.75:8777', // target: 'http://192.168.10.75:8777',
target: 'http://192.168.6.137:8777', // 新zyc
// 新zyc target: 'http://192.168.6.141:8777',
// target: 'http://192.168.10.200:13000',
// tjj
// target: 'http://192.168.10.25:13000',
// target: 'http://192.168.10.94:8888', // target: 'http://192.168.10.94:8888',
// target: 'http://test.api.huitongys.com', // target: 'http://test.api.huitongys.com',
// target: 'http://h5uapi.huitongys.com', // target: 'http://h5uapi.huitongys.com',

Loading…
Cancel
Save