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

pre-production
pref_mail@163.com 1 year ago
parent
eb41ae9400 658f862650
commit
24b79fb486
9 changed files with 589 additions and 466 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. 51
      src/api/distribution/createTask.js
  2. 10
      src/option/distribution/BookingNote.js
  3. 2
      src/option/waybill/TemporaryStorageList.js
  4. 2
      src/option/waybill/WarehousingByTrainNumber.js
  5. 651
      src/views/basicdata/brand/basicClient.vue
  6. 98
      src/views/distribution/checkInventoryTask/createTask.vue
  7. 22
      src/views/waybill/CreateZeroOrder.vue
  8. 113
      src/views/waybill/TemporaryStorageList.vue
  9. 104
      src/views/waybill/WarehousingByTrainNumber.vue

51
src/api/distribution/createTask.js
Unescape View File

@ -63,32 +63,32 @@ export const $_postBatchDelete = params => {
});
};
// 新增盘点任务
export const $_submit = (data) => {
export const $_submit = data => {
return request({
url: '/api/logpm-basic/material/submit',
method: 'post',
data
})
}
data,
});
};
/**
* 盘点详情
*/
export const $_getDetailInfo = params => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/getDetailInfo',
method:'get',
method: 'get',
params,
});
};
// 查询货位信息
export const $_getList = ( params) => {
export const $_getList = params => {
return request({
url: '/api/logpm-basicdata/goodsAllocation/list',
method: 'get',
params
})
}
params,
});
};
/**
* 盘点状态修改
@ -96,7 +96,7 @@ export const $_getList = ( params) => {
export const $_updateQuestChildInfo = data => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/updateQuestChildInfo',
method:'put',
method: 'put',
data,
});
};
@ -107,42 +107,33 @@ export const $_updateQuestChildInfo = data => {
export const $_getQuestChildInfo = params => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/getQuestChildInfo',
method:'get',
method: 'get',
params,
});
};
/**
* 盘点查询
*/
export const $_materialList = params => {
return request({
url: '/api/logpm-basic/material/list',
method:'get',
method: 'get',
params,
});
};
/**
* 删除盘点数据接口
*/
export const $_deleteQuestChild = params => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/deleteQuestChild',
method:'get',
method: 'get',
params,
});
};
/**
* 盘点详情保存
*/
@ -154,8 +145,6 @@ export const $_updateDetailInfo = data => {
});
};
/**
* 盘点日期延期
*/
@ -167,7 +156,6 @@ export const $_updateDate = data => {
});
};
/**
* 盘点对比数据
*/
@ -205,7 +193,6 @@ export const $_exportGetContrastInfo = params => {
});
};
// 盘点任务库存品
export const $_QuestSelectInventory = params => {
return request({
@ -216,7 +203,6 @@ export const $_QuestSelectInventory = params => {
};
// 盘点任务零担
export const $_taskQuestSelectZreo = params => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/SelectZreo',
@ -224,3 +210,14 @@ export const $_taskQuestSelectZreo = params => {
params,
});
};
/**
* 未盘点数据导出
*/
export const postExportContrastStockInfo = params => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/exportContrastStockInfo',
method: 'get',
params,
});
};

10
src/option/distribution/BookingNote.js
Unescape View File

@ -136,7 +136,7 @@ export const ChangeOrderColumnList = [
head: false,
},
{
prop: 'unloadNumber',
prop: 'operationRemark',
label: '修改内容',
type: 1,
values: '',
@ -146,7 +146,7 @@ export const ChangeOrderColumnList = [
sortable: true,
},
{
prop: 'NumberOfPiecesInTheCar',
prop: 'createTime',
label: '申请时间',
type: 1,
values: '',
@ -156,7 +156,7 @@ export const ChangeOrderColumnList = [
sortable: true,
},
{
prop: 'unloadNumber',
prop: 'warehouseName',
label: '申请网点',
type: 1,
values: '',
@ -166,7 +166,7 @@ export const ChangeOrderColumnList = [
sortable: true,
},
{
prop: 'NumberOfPiecesInTheCar',
prop: 'createUserName',
label: '申请人',
type: 1,
values: '',
@ -176,7 +176,7 @@ export const ChangeOrderColumnList = [
sortable: true,
},
{
prop: 'unloadNumber',
prop: 'aaa',
label: '修改原因',
type: 1,
values: '',

2
src/option/waybill/TemporaryStorageList.js
Unescape View File

@ -28,7 +28,7 @@ export const columnList = [
{
prop: 'htMallName',
label: '汇通商场',
type: 1,
type: 2,
values: '',
width: '150',
checkarr: [],

2
src/option/waybill/WarehousingByTrainNumber.js
Unescape View File

@ -16,7 +16,7 @@ export const columnList = [
fixed: true,
},
{
prop: 'billladingCode',
prop: 'orderCode',
label: '订单自编号',
type: 1,
values: '',

651
src/views/basicdata/brand/basicClient.vue
Unescape View File

@ -60,7 +60,7 @@
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
>删 除</el-button
>
<el-button type="danger" icon="el-icon-delete" @click="handleImport">导 入 </el-button>
<el-button type="danger" icon="Upload" @click="handleImport">导 入 </el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
@ -184,195 +184,201 @@
:close-on-click-modal="false"
append-to-body
>
<el-form :disabled="view" ref="form" :model="form" :rules="rules" label-width="120px">
<!-- 表单字段 -->
<el-form-item label="客户编码" prop="clientCode">
<el-input
v-model="form.clientCode"
:validate-method="validateInput"
placeholder="请输入客户编码"
style="width: 100%"
:disabled="viewClientEntd"
/>
</el-form-item>
<el-form-item label="客户名称" prop="clientName">
<el-input v-model="form.clientName" placeholder="请输入客户名称" style="width: 100%" />
</el-form-item>
<el-form-item label="客户类型" prop="clientType">
<!-- <el-input v-model="form.clientName" placeholder="请输入客户名称" style="width: 100%"/>-->
<!-- <el-select v-model="form.clientType" class="m-2" placeholder="请选择客户类型" style="width: 100%">-->
<!-- <el-option label="发货方" value="1"/>-->
<!-- <el-option label="收货方" value="2"/>-->
<!-- </el-select>-->
<el-select
v-model="form.clientType"
class="m-2"
placeholder="请选择客户端类型"
style="width: 100%"
>
<el-option
v-for="item in clientType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
<div v-loading="loadingObj.submitLoading">
<el-form :disabled="view" ref="form" :model="form" :rules="rules" label-width="120px">
<!-- 表单字段 -->
<el-form-item label="客户编码" prop="clientCode">
<el-input
v-model="form.clientCode"
:validate-method="validateInput"
placeholder="请输入客户编码"
style="width: 100%"
:disabled="viewClientEntd"
/>
</el-select>
</el-form-item>
<el-form-item label="服务类型" prop="typeServiceList">
<el-select
v-model="form.typeServiceList"
multiple
placeholder="请选择"
style="width: 100%"
@change="coverCharge"
>
<el-option
v-for="item in freightType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
</el-form-item>
<el-form-item label="客户名称" prop="clientName">
<el-input
v-model="form.clientName"
placeholder="请输入客户名称"
style="width: 100%"
/>
</el-form-item>
<el-form-item label="客户类型" prop="clientType">
<!-- <el-input v-model="form.clientName" placeholder="请输入客户名称" style="width: 100%"/>-->
<!-- <el-select v-model="form.clientType" class="m-2" placeholder="请选择客户类型" style="width: 100%">-->
<!-- <el-option label="发货方" value="1"/>-->
<!-- <el-option label="收货方" value="2"/>-->
<!-- </el-select>-->
<el-select
v-model="form.clientType"
class="m-2"
placeholder="请选择客户端类型"
style="width: 100%"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="配送类型" prop="businessType" v-if="distriType">
<el-radio-group
v-model="form.businessType"
class="ml-4"
v-for="item in distributionType"
>
<el-radio :label="item.dictKey" size="large" style="margin-right: 25px">{{
item.dictValue
}}</el-radio>
<!-- <el-radio label="2" size="large">Option 2</el-radio>-->
</el-radio-group>
<!-- </div>-->
</el-form-item>
<!-- <el-form-item label="客户端类型" prop="typeService">
&lt;!&ndash; <el-input v-model="form.typeService" placeholder="请输入客户类型"/>&ndash;&gt;
&lt;!&ndash; <el-input v-model="form.typeService" placeholder="请输入客户类型;1 C端 2 B端"/>&ndash;&gt;
<el-select v-model="form.typeService" class="m-2" placeholder="请选择客户端类型" style="width: 100%">
<el-option
v-for="item in clientType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
/>
</el-select>
</el-form-item>-->
<el-form-item label="联系人" prop="linkman" v-if="viewEntd">
<el-input v-model="form.linkman" placeholder="请输入联系人" style="width: 100%" />
</el-form-item>
<el-form-item label="联系电话" prop="phone" v-if="viewEntd">
<el-input v-model="form.phone" placeholder="请输入联系电话" style="width: 100%" />
</el-form-item>
<el-form-item label="地址" prop="bladeRegionProvinceId">
<!-- <el-input v-model="form.bladeRegionProvinceId" placeholder="请输入省份"/>-->
<el-cascader
:options="optioner"
style="width: 100%"
v-model="form.bladeRegionProvinceId"
:props="{
checkStrictly: false,
}"
filterable
>
<template #default="{ node, data }">
<span>{{ data.label }}</span>
<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
</template>
</el-cascader>
</el-form-item>
<el-form-item label="详细地址" prop="detailedly">
<el-input v-model="form.detailedly" placeholder="请填写详细地址" style="width: 100%" />
</el-form-item>
<!-- <el-form-item label="三方商城" prop="tripartiteMall">-->
<!-- <el-input v-model="form.tripartiteMall" placeholder="请填写三方商城" style="width: 100%" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="开票信息" prop="billingInformation">-->
<!-- <el-input v-model="form.billingInformation" placeholder="请填写开票信息" style="width: 100%" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="市" prop="bladeRegionCityId">-->
<!-- <el-input v-model="form.bladeRegionCityId" placeholder="请输入市"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="区/县" prop="bladeRegionAreaId">-->
<!-- <el-input v-model="form.bladeRegionAreaId" placeholder="请输入区/县"/>-->
<!-- </el-form-item>-->
<el-form-item label="合同附件" prop="leaseAccessories" style="width: 100%">
<!-- <el-input v-model="form.leaseAccessories" placeholder="请输入合同附件"/>-->
<el-upload
v-model:file-list="fileList"
class="upload-demo"
:action="action"
:headers="headers"
multiple
:on-preview="handlePreview"
:on-success="
(response, file, fileList) => {
uploadSuccess(fileList);
}
"
:on-remove="handleRemove"
:before-remove="beforeRemove"
:before-upload="beforeUploadFn"
:limit="3"
:on-exceed="handleExceed"
>
<el-button>上传</el-button>
<template #tip>
<div class="el-upload__tip">大小不超过500KB的jpg/png文件。</div>
</template>
</el-upload>
<el-image-viewer
v-if="showImgViewer"
:url-list="imgPreviewUrl"
@close="handleCo"
:z-index="300"
fit="cover"
/>
</el-form-item>
<el-form-item label="合同开始时间" prop="contractStartTime" label-width="120px">
<!-- <el-input v-model="form.contractStartTime" placeholder="请输入合同开始时间"/>-->
<div class="demo-date-picker" style="width: 60%">
<div class="block">
<!-- <span class="demonstration">Default</span>-->
<el-date-picker
v-model="form.contractStartTime"
type="date"
placeholder="选择时间"
format="YYYY/MM/DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
<el-option
v-for="item in clientType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
/>
</div>
</div>
</el-form-item>
</el-select>
</el-form-item>
<el-form-item label="服务类型" prop="typeServiceList">
<el-select
v-model="form.typeServiceList"
multiple
placeholder="请选择"
style="width: 100%"
@change="coverCharge"
>
<el-option
v-for="item in freightType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="配送类型" prop="businessType" v-if="distriType">
<el-radio-group
v-model="form.businessType"
class="ml-4"
v-for="item in distributionType"
>
<el-radio :label="item.dictKey" size="large" style="margin-right: 25px">{{
item.dictValue
}}</el-radio>
<!-- <el-radio label="2" size="large">Option 2</el-radio>-->
</el-radio-group>
<!-- </div>-->
</el-form-item>
<!-- <el-form-item label="客户端类型" prop="typeService">
&lt;!&ndash; <el-input v-model="form.typeService" placeholder="请输入客户类型"/>&ndash;&gt;
&lt;!&ndash; <el-input v-model="form.typeService" placeholder="请输入客户类型;1 C端 2 B端"/>&ndash;&gt;
<el-select v-model="form.typeService" class="m-2" placeholder="请选择客户端类型" style="width: 100%">
<el-option
v-for="item in clientType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
<el-form-item label="合同结束时间" prop="contractEntTime" label-width="120px">
<!-- <el-input v-model="form.contractEntTime" placeholder="请输入合同结束时间"/>-->
<div class="demo-date-picker">
<div class="block">
<!-- <span class="demonstration">Default</span>-->
<el-date-picker
v-model="form.contractEntTime"
type="date"
placeholder="选择时间"
format="YYYY/MM/DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-select>
</el-form-item>-->
<el-form-item label="联系人" prop="linkman" v-if="viewEntd">
<el-input v-model="form.linkman" placeholder="请输入联系人" style="width: 100%" />
</el-form-item>
<el-form-item label="联系电话" prop="phone" v-if="viewEntd">
<el-input v-model="form.phone" placeholder="请输入联系电话" style="width: 100%" />
</el-form-item>
<el-form-item label="地址" prop="bladeRegionProvinceId">
<!-- <el-input v-model="form.bladeRegionProvinceId" placeholder="请输入省份"/>-->
<el-cascader
:options="optioner"
style="width: 100%"
v-model="form.bladeRegionProvinceId"
:props="{
checkStrictly: false,
}"
filterable
>
<template #default="{ node, data }">
<span>{{ data.label }}</span>
<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
</template>
</el-cascader>
</el-form-item>
<el-form-item label="详细地址" prop="detailedly">
<el-input
v-model="form.detailedly"
placeholder="请填写详细地址"
style="width: 100%"
/>
</el-form-item>
<el-form-item label="默认付款方式" prop="defaultPaymentMethods">
<el-select v-model="form.defaultPaymentMethods" placeholder="请选择默认付款方式">
<el-option
v-for="item in defaultPaymentMethodsOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</div>
</div>
</el-form-item>
</el-form>
<!-- 表单按钮 -->
<template #footer>
<span v-if="!view" class="dialog-footer">
</el-select>
</el-form-item>
<!-- <el-form-item label="三方商城" prop="tripartiteMall">-->
<!-- <el-input v-model="form.tripartiteMall" placeholder="请填写三方商城" style="width: 100%" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="开票信息" prop="billingInformation">-->
<!-- <el-input v-model="form.billingInformation" placeholder="请填写开票信息" style="width: 100%" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="市" prop="bladeRegionCityId">-->
<!-- <el-input v-model="form.bladeRegionCityId" placeholder="请输入市"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="区/县" prop="bladeRegionAreaId">-->
<!-- <el-input v-model="form.bladeRegionAreaId" placeholder="请输入区/县"/>-->
<!-- </el-form-item>-->
<el-form-item label="合同附件" prop="leaseAccessories" style="width: 100%">
<!-- <el-input v-model="form.leaseAccessories" placeholder="请输入合同附件"/>-->
<el-upload
v-model:file-list="fileList"
class="upload-demo"
:action="action"
:headers="headers"
multiple
:on-preview="handlePreview"
:on-success="
(response, file, fileList) => {
uploadSuccess(fileList);
}
"
:on-remove="handleRemove"
:before-remove="beforeRemove"
:before-upload="beforeUploadFn"
:limit="3"
:on-exceed="handleExceed"
>
<el-button type="Primary" icon="Position">上传</el-button>
<template #tip>
<div class="el-upload__tip">大小不超过500KB的jpg/png文件。</div>
</template>
</el-upload>
<el-image-viewer
v-if="showImgViewer"
:url-list="imgPreviewUrl"
@close="handleCo"
:z-index="300"
fit="cover"
/>
</el-form-item>
<el-form-item label="合同开始时间" prop="contractStartTime" label-width="120px">
<el-date-picker
v-model="form.contractStartTime"
type="date"
placeholder="选择时间"
format="YYYY/MM/DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
<el-form-item label="合同结束时间" prop="contractEntTime" label-width="120px">
<el-date-picker
v-model="form.contractEntTime"
type="date"
placeholder="选择时间"
format="YYYY/MM/DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
</el-form>
<!-- 表单按钮 -->
<div v-if="!view" class="flex-c-c">
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')"
>提 交</el-button
>
<el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
</span>
</template>
</div>
</div>
</el-dialog>
<!-- 账号绑定弹出框页面
@ -756,24 +762,26 @@ export default {
{ required: true, message: '请输入客户名称', trigger: 'blur' },
// { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
],
typeService: [{ required: true, message: '请选择客户端类型', trigger: 'blur' }],
typeService: [{ required: true, message: '请选择客户端类型', trigger: ['blur', 'change'] }],
businessType: [
{ required: true, message: '请选择配送业务类型', trigger: 'change' },
// { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
// { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: ['blur', 'change'] }
],
clientType: [{ required: true, message: '请选择客户类型', trigger: 'change' }],
typeServiceList: [{ required: true, message: '请选择服务类型', trigger: 'change' }],
linkman: [{ required: true, message: '请填写联系人', trigger: 'blur' }],
detailedly: [{ required: true, message: '请填写详细地址', trigger: 'blur' }],
phone: [{ required: true, message: '请填写联系电话', trigger: 'blur' }],
contractEntTime: [
{ type: 'date', required: true, message: '请选择合同结束时间', trigger: 'change' },
],
contractStartTime: [
{ type: 'date', required: true, message: '请选择合同开始时间', trigger: 'change' },
],
linkman: [{ required: true, message: '请填写联系人', trigger: ['blur', 'change'] }],
detailedly: [{ required: true, message: '请填写详细地址', trigger: ['blur', 'change'] }],
phone: [{ required: true, message: '请填写联系电话', trigger: ['blur', 'change'] }],
// contractEntTime: [
// { type: 'date', required: true, message: '请选择合同结束时间', trigger: 'change' },
// ],
// contractStartTime: [
// { type: 'date', required: true, message: '请选择合同开始时间', trigger: 'change' },
// ],
bladeRegionProvinceId: [{ required: true, message: '请选择地址', trigger: 'change' }],
// leaseAccessories: [{ required: true, message: '请上传合同文件', trigger: 'blur' }],
defaultPaymentMethods: [
{ required: true, message: '请选择默认付款方式', trigger: 'change' },
],
},
bianji: false,
@ -782,6 +790,32 @@ export default {
name: '',
phone: '',
},
/** 付款方式 */
defaultPaymentMethodsOptions: [
{
value: '1',
label: '现付',
},
{
value: '2',
label: '到付',
},
{
value: '3',
label: '月结',
},
{
value: '4',
label: '回付',
},
{
value: '5',
label: '内部结算',
},
],
loadingObj: {
submitLoading: false,
},
};
},
created() {},
@ -1168,42 +1202,56 @@ export default {
if (!this.form.id) {
console.log('添加提交的数据：', this.form);
this.$refs[from].validate(valid => {
this.$refs[from].validate(async valid => {
if (valid) {
// this.form.typeService = !!this.form.typeService ? parseInt(this.form.typeService) : undefined;
this.form.bladeRegionCityId = this.form.bladeRegionProvinceId[1];
this.form.bladeRegionAreaId = this.form.bladeRegionProvinceId[2];
this.form.bladeRegionProvinceId = this.form.bladeRegionProvinceId[0];
console.log('上传llll>>>', this.form);
add(this.form).then(() => {
try {
this.loadingObj.submitLoading = true;
// this.form.typeService = !!this.form.typeService ? parseInt(this.form.typeService) : undefined;
this.form.bladeRegionCityId = this.form.bladeRegionProvinceId[1];
this.form.bladeRegionAreaId = this.form.bladeRegionProvinceId[2];
this.form.bladeRegionProvinceId = this.form.bladeRegionProvinceId[0];
console.log('上传llll>>>', this.form);
await add(this.form);
this.box = false;
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
});
} catch (error) {
console.log('error :>> ', error);
} finally {
this.loadingObj.submitLoading = false;
}
} else {
console.log('error submit!!');
return false;
}
});
} else {
this.$refs[from].validate(valid => {
this.$refs[from].validate(async valid => {
if (valid) {
console.log('修改提交的数据：', this.form);
// this.form.typeService = !!this.form.typeService ? parseInt(this.form.typeService) : undefined;
this.form.bladeRegionCityId = this.form.bladeRegionProvinceId[1];
this.form.bladeRegionAreaId = this.form.bladeRegionProvinceId[2];
this.form.bladeRegionProvinceId = this.form.bladeRegionProvinceId[0];
update(this.form).then(() => {
try {
this.loadingObj.submitLoading = true;
console.log('修改提交的数据：', this.form);
// this.form.typeService = !!this.form.typeService ? parseInt(this.form.typeService) : undefined;
this.form.bladeRegionCityId = this.form.bladeRegionProvinceId[1];
this.form.bladeRegionAreaId = this.form.bladeRegionProvinceId[2];
this.form.bladeRegionProvinceId = this.form.bladeRegionProvinceId[0];
await update(this.form);
this.box = false;
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
});
} catch (error) {
console.log('error :>> ', error);
} finally {
this.loadingObj.submitLoading = false;
}
} else {
console.log('error submit!!');
return false;
@ -1218,6 +1266,10 @@ export default {
this.box = true;
this.distriType = false;
this.viewClientEntd = false;
this.$nextTick(() => {
this.$refs.form.resetFields();
this.form.defaultPaymentMethods = '1';
});
},
handleAddSon(row) {
console.log(row);
@ -1455,102 +1507,104 @@ export default {
this.query.bladeRegionAreaId = this.query.bladeRegionProvinceId[2];
this.query.bladeRegionProvinceId = this.query.bladeRegionProvinceId[0];
}
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
console.log(data);
getList(page.currentPage, page.pageSize, Object.assign(params, this.query))
.then(res => {
const data = res.data.data;
console.log(data);
data.records.forEach(i => {
let ke = this.clientType.find(kh => parseInt(kh.dictKey) == parseInt(i.clientType));
// console.log("客户类型<><><>",ke);
if (!!ke) {
i.clientTypeName = ke.dictValue;
// console.log('==-=-=', i.clientType, ke.dictKey, ke.dictValue);
}
if (!i.clientType) {
i.clientTypeName = '无';
}
let typeServiceName = [];
if (!i.typeServiceBusiness) {
i.typeServiceName = '无';
} else {
i.typeServiceBusiness.forEach(ty => {
let fuw = this.freightType.find(
fw => parseInt(fw.dictKey) == parseInt(ty.typeService)
);
if (!!fuw) {
// console.log("fuw",fuw);
typeServiceName.push(fuw.dictValue);
// console.log('==-=-=', i.typeService, fuw.dictKey, fuw.dictValue);
}
});
i.typeServiceNameFy = typeServiceName.join(',');
}
});
// 缺少判断
// let dz = '';
// data.records.forEach(it => {
// let arrsheng = this.optioner.filter(i => {
// return it.bladeRegionProvinceId == i.value;
// });
// if (arrsheng.length == 0) return;
// // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
// let arrshi = arrsheng[0].children.filter(i => {
// return it.bladeRegionCityId == i.value;
// });
// // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
// let arrqu = arrshi[0].children.filter(i => {
// return it.bladeRegionAreaId == i.value;
// });
data.records.forEach(i => {
let ke = this.clientType.find(kh => parseInt(kh.dictKey) == parseInt(i.clientType));
// console.log("客户类型<><><>",ke);
if (!!ke) {
i.clientTypeName = ke.dictValue;
// console.log('==-=-=', i.clientType, ke.dictKey, ke.dictValue);
}
if (!i.clientType) {
i.clientTypeName = '无';
}
let typeServiceName = [];
// // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
// dz =
// arrsheng[0].label +
// (arrshi[0].label ? `/${arrshi[0].label}` : ``) +
// (arrqu[0]?.label ? `/${arrqu[0]?.label}` : '');
// it.bladeRegionProvinceId = dz;
// });
// 修改后
let dz = '';
data.records.forEach(it => {
let arrsheng = this.optioner.filter(i => {
return it.bladeRegionProvinceId == i.value;
if (!i.typeServiceBusiness) {
i.typeServiceName = '无';
} else {
i.typeServiceBusiness.forEach(ty => {
let fuw = this.freightType.find(
fw => parseInt(fw.dictKey) == parseInt(ty.typeService)
);
if (!!fuw) {
// console.log("fuw",fuw);
typeServiceName.push(fuw.dictValue);
// console.log('==-=-=', i.typeService, fuw.dictKey, fuw.dictValue);
}
});
i.typeServiceNameFy = typeServiceName.join(',');
}
});
let shengLabel = arrsheng.length > 0 ? arrsheng[0].label : ''; // 保存省级地址
// 缺少判断
// let dz = '';
// data.records.forEach(it => {
// let arrsheng = this.optioner.filter(i => {
// return it.bladeRegionProvinceId == i.value;
// });
// if (arrsheng.length == 0) return;
// // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
// let arrshi = arrsheng[0].children.filter(i => {
// return it.bladeRegionCityId == i.value;
// });
// // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
// let arrqu = arrshi[0].children.filter(i => {
// return it.bladeRegionAreaId == i.value;
// });
if (arrsheng.length === 0) {
it.bladeRegionProvinceId = shengLabel; // 若未找到省数据，直接将省级地址作为结果
return;
}
// // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
// dz =
// arrsheng[0].label +
// (arrshi[0].label ? `/${arrshi[0].label}` : ``) +
// (arrqu[0]?.label ? `/${arrqu[0]?.label}` : '');
// it.bladeRegionProvinceId = dz;
// });
// 修改后
let dz = '';
data.records.forEach(it => {
let arrsheng = this.optioner.filter(i => {
return it.bladeRegionProvinceId == i.value;
});
let shengLabel = arrsheng.length > 0 ? arrsheng[0].label : ''; // 保存省级地址
let arrshi = arrsheng[0].children.filter(i => {
return it.bladeRegionCityId == i.value;
});
let shiLabel = arrshi.length > 0 ? arrshi[0].label : ''; // 保存市级地址
if (arrsheng.length === 0) {
it.bladeRegionProvinceId = shengLabel; // 若未找到省数据，直接将省级地址作为结果
return;
}
if (arrshi.length === 0) {
dz = shengLabel; // 若未找到市数据，直接将省级地址作为结果
} else {
let arrqu = arrshi[0].children.filter(i => {
return it.bladeRegionAreaId == i.value;
let arrshi = arrsheng[0].children.filter(i => {
return it.bladeRegionCityId == i.value;
});
let shiLabel = arrshi.length > 0 ? arrshi[0].label : ''; // 保存市级地址
let quLabel = arrqu.length > 0 ? arrqu[0].label : ''; // 保存区级地址
if (arrshi.length === 0) {
dz = shengLabel; // 若未找到市数据，直接将省级地址作为结果
} else {
let arrqu = arrshi[0].children.filter(i => {
return it.bladeRegionAreaId == i.value;
});
dz = shengLabel + (shiLabel ? `/${shiLabel}` : '') + (quLabel ? `/${quLabel}` : '');
}
let quLabel = arrqu.length > 0 ? arrqu[0].label : ''; // 保存区级地址
it.bladeRegionProvinceId = dz;
dz = shengLabel + (shiLabel ? `/${shiLabel}` : '') + (quLabel ? `/${quLabel}` : '');
}
it.bladeRegionProvinceId = dz;
});
this.page.total = data.total;
this.data = data.records;
this.data = this.$functions.newdatas(this.columnList, this.data);
this.loading = false;
this.selectionClear();
})
.catch(() => {
this.data = [];
this.loading = false;
});
this.page.total = data.total;
this.data = data.records;
this.data = this.$functions.newdatas(this.columnList, this.data);
this.loading = false;
this.selectionClear();
}).catch(()=>{
this.data =[]
this.loading = false;
});
},
},
};
@ -1577,4 +1631,13 @@ export default {
:deep(.el-cascader) {
width: 100%;
}
:deep(.el-date-editor.el-input) {
height: 100% !important;
width: 100% !important;
}
:deep(.el-select) {
width: 100% !important;
}
</style>

98
src/views/distribution/checkInventoryTask/createTask.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<div class="maxContent">
<div class="maxContent" v-loading="loadingObj.pageLoading">
<!-- 搜索功能 -->
<div>
<!-- <div class="SoInput" v-show="searchSo">
@ -158,6 +158,9 @@
<el-button type="primary" @click="TcAddData" v-if="Statusjudgment">新 增</el-button>
<el-button type="primary" @click="InventoryModification">提交修改</el-button>
<el-button type="primary" @click="ModifyingStatus">修改状态</el-button>
<el-button icon="Download" type="primary" @click="handleUncountedExport">
导出
</el-button>
</div>
<div style="margin-left: 10px">
<!-- v-if="NotCounted" -->
@ -211,7 +214,7 @@
>
<template #header>
<el-input
@change="InputSo(item)"
@change="() => InputSo(item)"
clearable
v-if="item.type == 5 || item.prop == 'categoryName' || item.prop == 'materialCode'"
v-model="item.values"
@ -668,12 +671,13 @@ import {
$_exportGetContrastInfo,
$_getList,
$_postBatchDelete,
postExportContrastStockInfo,
} from '@/api/distribution/createTask';
import { ElMessageBox } from 'element-plus';
import { ElMessage } from 'element-plus';
import { downloadXls } from '@/utils/util';
import { getDictionaryBiz } from '@/api/system/dict';
import { ref } from 'vue';
import { ref, reactive } from 'vue';
import { off } from 'dom7';
const wLinput = ref(null); //物料编码搜索框
const wLinputState = ref(false); //标记是否显示下拉框
@ -730,6 +734,13 @@ const Statusjudgment = ref(false); //新增按钮
const DbEx = ref(null); //对比明细导出
const fullScreen = ref(false); //是否全屏
const BatchAbandonment = ref([]); //首页废弃
/** loading */
const loadingObj = reactive({
/** 页面loading */
pageLoading: false,
});
/** 未盘点query */
const uncountedQuery = reactive({});
const radioList = ref([
{ label: 0, txt: '在库', input: 'stockNum', disabled: true },
{ label: 1, txt: '破损', input: 'wornNum', disabled: true },
@ -1450,57 +1461,7 @@ const InputSo = val => {
console.log(row.value, 'row.value');
data.current = TccurrentPage.value;
data.size = TcpageSize.value;
// if (val.prop == 'categoryName') {
// //查询产品名称
// data.name = val.values;
// $_materialList(data).then(res => {
// console.log(res, '查询的返回值');
// if (res.data.data.records.length) {
// Tctotal.value = res.data.data.total;
// res.data.data.records.forEach(item => {
// item.Checkbox = true;
// });
// TcPdloading.value = false;
// console.log(res, '明细返回值');
// TcPD.value = res.data.data.records;
// } else {
// Statusjudgment.value = true; //显示新增按钮
// TcPD.value = res.data.data.records;
// ElMessage({
// message: '暂未查询到内容',
// type: 'warning',
// });
// }
// });
// return;
// }
// if (val.prop == 'materialCode') {
// //查询物料编码
// data.sku = val.values;
// $_materialList(data).then(res => {
// console.log(res, '查询的返回值');
// if (res.data.data.records.length) {
// Tctotal.value = res.data.data.total;
// res.data.data.records.forEach(item => {
// item.Checkbox = true;
// });
// TcPdloading.value = false;
// console.log(res, '明细返回值');
// TcPD.value = res.data.data.records;
// } else {
// Statusjudgment.value = true; //显示新增按钮
// TcPD.value = res.data.data.records;
// ElMessage({
// message: '暂未查询到内容',
// type: 'warning',
// });
// }
// });
// return;
// }
// if (val.prop != 'categoryName' || val.prop != 'materialCode') {
let dataS = {
questNum: UncountedDetails.value.questNum,
questId: UncountedDetails.value.id,
@ -2463,7 +2424,6 @@ const InventorySubmit = () => {
loading.value = true; //开启表格加载
console.log(SubData, '处理好的数据');
postAddtaskQuest(SubData).then(res => {
if ((res.data.code = 200)) {
ElMessage({
message: res.data.msg,
@ -2498,14 +2458,13 @@ const InventorySubmit = () => {
loading.value = true; //开启表格加载
postAddtaskQuest(SubData).then(res => {
if ((res.data.code = 200)) {
ElMessage({
message: res.data.msg,
type: 'success',
});
onLoad(); //体积之后初始化页面
}
ElMessage({
message: res.data.msg,
type: 'success',
});
onLoad(); //体积之后初始化页面
}
console.log(res, '盘点计划提交成功');
});
};
// 顶部废弃按钮
@ -2555,6 +2514,23 @@ const DelayButton = () => {
console.log('延期');
dialogTabData.value = true;
};
/** 未盘点数据导出 */
const handleUncountedExport = () => {
ElMessageBox.confirm('是否导出未盘点数据?').then(async () => {
try {
TcPdloading.value = true;
const res = await postExportContrastStockInfo({ questNum: UncountedDetails.value.questNum });
if (res.status !== 200) return;
downloadXls(res.data, '未盘点数据.xlsx');
} catch (error) {
console.log('error :>> ', error);
} finally {
TcPdloading.value = false;
}
});
};
</script>
<style lang="scss" scoped>

22
src/views/waybill/CreateZeroOrder.vue
Unescape View File

@ -1764,22 +1764,22 @@ let _ant1 = null;
const remoteMethod = val => {
if (_ant1) clearTimeout(_ant1);
_ant1 = setTimeout(async () => {
if (val) {
try {
details.loadingObj.loading = true;
const res = await getOpenOrderAdvanceFindWarehouseList({ warehouseName: val });
const { data, code } = res.data;
if (code !== 200) return;
details.options = data || [];
} catch (error) {
} finally {
details.loadingObj.loading = false;
}
try {
details.loadingObj.loading = true;
const res = await getOpenOrderAdvanceFindWarehouseList({ warehouseName: val });
const { data, code } = res.data;
if (code !== 200) return;
details.options = data || [];
} catch (error) {
} finally {
details.loadingObj.loading = false;
}
clearTimeout(_ant1);
}, 1000);
};
remoteMethod('');
/** 目的仓选择时给目的仓名称赋值 */
const destinationWarehouseNameChange = val => {
details.query.destinationWarehouseName = details.options.find(

113
src/views/waybill/TemporaryStorageList.vue
Unescape View File

@ -311,27 +311,25 @@
</el-form>
</div>
<template #footer>
<div class="flex-c-c dialog-footer">
<el-button
icon="Position"
type="primary"
:loading="details.loadingObj.addTagLoading"
@click="handleSubmitAddTag(ruleFormRef)"
>
提 交
</el-button>
<el-button
icon="Refresh"
type="primary"
:loading="details.loadingObj.addTagLoading"
@click="handleRefreshAddTag(ruleFormRef)"
>
重 置
</el-button>
<el-button icon="Close" @click="details.popUpShow.addTagVisited = false"> 取 消 </el-button>
</div>
</template>
<div class="flex-c-c dialog-footer">
<el-button icon="Close" @click="details.popUpShow.addTagVisited = false"> 取 消 </el-button>
<el-button
icon="Refresh"
type="primary"
:loading="details.loadingObj.addTagLoading"
@click="() => handleRefreshAddTag(ruleFormRef)"
>
重 置
</el-button>
<el-button
icon="Position"
type="primary"
:loading="details.loadingObj.addTagLoading"
@click="() => handleSubmitAddTag(ruleFormRef)"
>
提 交
</el-button>
</div>
</el-dialog>
<!-- 导入 -- 批量开标签 -->
@ -1237,50 +1235,63 @@ const handleClose = res => {
};
/** 开标签提交 */
const handleSubmitAddTag = async (formEl: FormInstance | undefined) => {
const handleSubmitAddTag = (formEl: FormInstance | undefined) => {
if (!formEl) return;
await formEl.validate(async (valid, fields) => {
if (valid) {
console.log('submit!');
console.log('details.addTagForm :>> ', details.addTagForm);
try {
if (details.addTagForm.area.length < 2) return ElMessage.warning('区域最少选择到市');
details.loadingObj.addTagLoading = true;
const res = await postOpenLabel({
...details.addTagForm,
area: details.addTagForm.area.join(','),
});
const { code } = res.data;
if (code !== 200) return;
ElMessage.success('添加成功');
details.popUpShow.addTagVisited = false;
initOnLoad({}, true);
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.addTagLoading = false;
formEl.validate((valid, fields) => {
ElMessageBox.confirm('确认提交吗?', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}).then(async () => {
if (valid) {
console.log('submit!');
console.log('details.addTagForm :>> ', details.addTagForm);
try {
if (details.addTagForm.area.length < 2) return ElMessage.warning('区域最少选择到市');
details.loadingObj.addTagLoading = true;
const res = await postOpenLabel({
...details.addTagForm,
area: details.addTagForm.area.join(','),
});
const { code } = res.data;
if (code !== 200) return;
ElMessage.success('添加成功');
details.popUpShow.addTagVisited = false;
initOnLoad({}, true);
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.addTagLoading = false;
}
} else {
console.log('error submit!', fields);
}
} else {
console.log('error submit!', fields);
}
});
});
};
/** 开标签重置 */
const handleRefreshAddTag = (formEl: FormInstance | undefined) => {
console.log('123123 :>> ', 123123);
if (!formEl) return;
formEl.resetFields();
ElMessageBox.confirm('确认重置吗?', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
formEl.resetFields();
});
};
/** 开启开标签弹窗 */
const handleOpenAddTagDlog = () => {
details.popUpShow.addTagVisited = true;
handleRefreshAddTag(ruleFormRef.value);
ruleFormRef.value.resetFields();
};
onActivated(() => {

104
src/views/waybill/WarehousingByTrainNumber.vue
Unescape View File

@ -1,6 +1,6 @@
<template>
<basic-container>
<div class="avue-crud">
<div class="avue-crud" v-loading="details.loadingObj.pageLoading">
<!-- 搜索模块 -->
<div v-h5uShow="!search">
<!-- 查询模块 -->
@ -32,7 +32,9 @@
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" icon="Van" @click="handlePutInStorage">批量入库</el-button>
<el-button type="primary" icon="Van" @click="handleBatchPutInStorage"
>批量入库</el-button
>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
@ -50,15 +52,24 @@
ref="tableNodeRef"
:columnList="details.columnList"
:tableData="details.data"
:loading="loadingObj.packageListLoading"
:loading="loadingObj.list"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
:isselectfun="handleIsSelect"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'"> </template>
<template v-if="slotProps.scope.column.label === '操作'">
<el-text
v-if="Number(slotProps.scope.row.isIncoming) === 1"
@click="handlePutInStorage(slotProps.scope)"
>
入库
</el-text>
<el-text @click="handleGoDetails(slotProps.scope)">包明细</el-text>
</template>
</template>
</tablecmt>
</el-row>
@ -152,7 +163,7 @@ const details = reactive<any>({
loadingObj: {
/** 列表加载loading */
list: false,
packageListLoading: false,
pageLoading: false,
},
/** 列表复选框选中的数据 */
selectionList: [],
@ -222,9 +233,10 @@ const searchChange = () => {
/** 清空表单 */
const searchReset = () => {
details.query = {};
details.stockupDate = [];
details.page.currentPage = 1;
onLoad();
details.data = [];
for (let i = 0; i < details.columnList.length; i++) {
details.columnList[i].values = '';
}
};
/** 展开列表控件 */
@ -242,6 +254,7 @@ const searchHide = () => {
/** 表格表头输入框搜索 */
const inputsc = (index, row) => {
details.query[row.prop] = index;
if (!index) delete details.query[row.prop];
onLoad();
};
@ -295,20 +308,83 @@ const setnewcolum = (newarr, headarr, type) => {
};
/** 入库 */
const handlePutInStorage = row => {
const handlePutInStorage = ({ row }) => {
ElMessageBox.confirm('确认批量入库吗?', '警告', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
})
.then(async () => {
try {
details.loadingObj.pageLoading = true;
const res = await postIncomingBatchOrder({
advanceIds: [row.id],
incomingType: details.searchType === 'orderCode' ? 5 : 4,
});
const { code, msg } = res.data;
if (code !== 200) return;
ElMessage.success(msg);
onLoad();
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
}
})
.catch(() => {});
};
/** 批量入库 */
const handleBatchPutInStorage = () => {
if (!details.selectionList.length) return ElMessage.error('请选择需要入库的数据');
ElMessageBox.confirm('确认批量入库吗?', '警告', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
ElMessage({
type: 'success',
message: '入库成功',
});
.then(async () => {
try {
details.loadingObj.pageLoading = true;
const res = await postIncomingBatchOrder({
advanceIds: details.selectionList.map(val => val.id),
incomingType: details.searchType === 'orderCode' ? 5 : 4,
});
const { code, msg } = res.data;
if (code !== 200) return;
ElMessage.success(msg);
onLoad();
} catch (error) {
console.log('error :>> ', error);
} finally {
details.loadingObj.pageLoading = false;
}
})
.catch(() => {});
};
/** 详情 */
const handleGoDetails = ({ row }) => {
$router.push({
path: '/waybill/orderPackageListDetails?name=包明细',
query: {
id: row.id,
name: `订单 -- ${row.orderCode} 包明细`,
},
});
};
const handleIsSelect = val => {
if (Number(val.isIncoming) === 1) {
return true;
} else {
return false;
}
};
</script>
<style scoped lang="scss">

Write Preview
Loading…
Cancel
Save