-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击下载
+
+
+
+
@@ -173,9 +190,36 @@ export default {
form: {},
query: {},
search: {},
+ excelBox: false,
+ excelForm: {},
loading: true,
Detailspop: false,
- Formloading:false,
+ excelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: '文件上传',
+ prop: 'excelFile',
+ type: 'upload',
+ drag: true,
+ loadText: '文件上传，请稍等',
+ span: 24,
+ propsHttp: {
+ res: 'data',
+ },
+ tip: '请上传 .xls,.xlsx 标准格式文件',
+ action: '/api/logpm-basicdata/driverArtery/import-stockArticle',
+ },
+ {
+ label: '模板下载',
+ prop: 'excelTemplate',
+ formslot: true,
+ span: 24,
+ },
+ ],
+ },
+ Formloading: false,
formInfo: {}, //详情弹窗表格
groundlineZd: [], //干线
warehouseZd: [], //仓库
@@ -382,6 +426,13 @@ export default {
},
],
},
+ {
+ label: '发货单位',
+ prop: 'name',
+ type: 'input',
+ width: '150px',
+ span: 12,
+ },
// {
// label: "门店品牌",
// prop: "storeBrandId",
@@ -448,6 +499,14 @@ export default {
dicData: [],
disabled: true,
},
+ {
+ label: '品类',
+ prop: 'brandName',
+ type: 'select',
+ search: false,
+ dicData: [],
+ disabled: true,
+ },
// {
// label: '服务类型', //;1 干 2干仓 3干仓配 4干配
// prop: 'typeService',
@@ -483,20 +542,20 @@ export default {
// },
// ],
// },
- {
- label: '一口价',
- prop: 'fixedPrice',
- type: 'input',
- width: '150px',
- span: 12,
- rules: [
- {
- required: true,
- message: '请填写一口价',
- trigger: 'blur',
- },
- ],
- },
+ // {
+ // label: '一口价',
+ // prop: 'fixedPrice',
+ // type: 'input',
+ // width: '150px',
+ // span: 12,
+ // rules: [
+ // {
+ // required: true,
+ // message: '请填写一口价',
+ // trigger: 'blur',
+ // },
+ // ],
+ // },
{
label: '生效时间',
@@ -645,6 +704,23 @@ export default {
},
},
methods: {
+ uploadAfter(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBox = false;
+ this.refreshChange();
+ done();
+ },
+ //下载模板
+ handleTemplate() {
+ console.log('下载模板！！！');
+ exportBlob(
+ `/api/logpm-basicdata/driverArtery/export-basicdataDriverArteryMb?${
+ this.website.tokenHeader
+ }=${getToken()}`
+ ).then(res => {
+ downloadXls(res.data, '用户基础价格导入模板.xlsx');
+ });
+ },
fuzhi(led, ed) {
// console.log(">>>>",led,ed);
this.option.column[27].dicData = led;
@@ -767,54 +843,56 @@ export default {
});
});
},
-
- enrichDictionaryWithCosts(dictionary, dataArray, itemNameField) {
- dictionary.forEach(dictItem => {
- console.log(dictItem,'dictItem');
+
+ enrichDictionaryWithCosts(dictionary, dataArray, itemNameField) {
+ dictionary.forEach(dictItem => {
+ console.log(dictItem, 'dictItem');
dataArray.forEach(dataItem => {
- if (dictItem.label === dataItem[itemNameField]) {
- dictItem.formulaModeName = dataItem.formulaModeName;
- dictItem.cost = dataItem.cost;
- }
+ if (dictItem.label === dataItem[itemNameField]) {
+ dictItem.formulaModeName = dataItem.formulaModeName;
+ dictItem.cost = dataItem.cost;
+ }
});
- });
-},
+ });
+ },
// 查看按钮
beforeOpen(done, type) {
this.Detailspop = true; //开启弹窗
- this.Formloading=true
- this.formInfo={}
+ this.Formloading = true;
+ this.formInfo = {};
getDetail(this.form.id).then(res => {
console.log(res, 'res');
this.form = res.data.data;
this.formInfo.fixedPrice =
this.form.fixedPrice == 0 ? '否' : this.form.fixedPrice == 1 ? '是' : '暂无';
- this.formInfo.categoryName = this.form.categoryName?this.form.categoryName:'暂无'; //品类
- this.formInfo.effectiveTime = this.form.effectiveTime?this.form.effectiveTime:'暂无'; //生效时间
- this.formInfo.expirationTime = this.form.expirationTime?this.form.expirationTime:'暂无'; //截止时间
- this.formInfo.brand=this.form.brandName?this.form.brandName:'暂无'; //品牌
- this.formInfo.details = res.data.data.details?res.data.data.details.map(res => res.typeName).join(','):'未选择'; //服务类型
- if(res.data.data.details){
+ this.formInfo.categoryName = this.form.categoryName ? this.form.categoryName : '暂无'; //品类
+ this.formInfo.effectiveTime = this.form.effectiveTime ? this.form.effectiveTime : '暂无'; //生效时间
+ this.formInfo.expirationTime = this.form.expirationTime ? this.form.expirationTime : '暂无'; //截止时间
+ this.formInfo.brand = this.form.brandName ? this.form.brandName : '暂无'; //品牌
+ this.formInfo.details = res.data.data.details
+ ? res.data.data.details.map(res => res.typeName).join(',')
+ : '未选择'; //服务类型
+ if (res.data.data.details) {
res.data.data.details.forEach(res => {
- if (res.typeName == '干线') {
- this.groundlineInfo.push(res);
- } else if (res.typeName == '仓库') {
- this.warehouseInfo.push(res);
- } else if (res.typeName == '配送') {
- this.DeliveryInfo.push(res);
- }
- });
+ if (res.typeName == '干线') {
+ this.groundlineInfo.push(res);
+ } else if (res.typeName == '仓库') {
+ this.warehouseInfo.push(res);
+ } else if (res.typeName == '配送') {
+ this.DeliveryInfo.push(res);
+ }
+ });
}
-
- this.enrichDictionaryWithCosts( this.groundlineZd,this.groundlineInfo, 'itemName');
- this.enrichDictionaryWithCosts( this.DeliveryZd, this.DeliveryInfo,'itemName');
- this.enrichDictionaryWithCosts(this.warehouseZd,this.warehouseInfo, 'itemName');
- $_QueryUserName({
+
+ this.enrichDictionaryWithCosts(this.groundlineZd, this.groundlineInfo, 'itemName');
+ this.enrichDictionaryWithCosts(this.DeliveryZd, this.DeliveryInfo, 'itemName');
+ this.enrichDictionaryWithCosts(this.warehouseZd, this.warehouseInfo, 'itemName');
+ $_QueryUserName({
id: res.data.data.itemName,
}).then(res => {
this.formInfo.clientName = res.data.data.clientName;
console.log(res, '客户名称');
- this.Formloading=false;
+ this.Formloading = false;
});
// 查询品牌
// $_brand({
@@ -824,7 +902,7 @@ export default {
// console.log(res, '品牌');
// this.formInfo.brand = res.data.data.brandName;
// });
-
+
return;
$_category({
id: this.form.category,
@@ -847,10 +925,6 @@ export default {
done();
},
-
-
-
-
searchReset() {
this.query = {};
this.onLoad(this.page);
@@ -879,6 +953,10 @@ export default {
refreshChange() {
this.onLoad(this.page, this.query);
},
+ // 导入
+ handleImport() {
+ this.excelBox = true;
+ },
onLoad(page, params = {}) {
this.loading = true;
@@ -908,14 +986,12 @@ export default {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
- this.data.forEach(res=>{
- res.fixedPrice
- if(res.fixedPrice==0){
- res.fixedPrice='否'
- }else if(res.fixedPrice==1)(
- res.fixedPrice='是'
- )
- })
+ this.data.forEach(res => {
+ res.fixedPrice;
+ if (res.fixedPrice == 0) {
+ res.fixedPrice = '否';
+ } else if (res.fixedPrice == 1) res.fixedPrice = '是';
+ });
this.loading = false;
this.selectionClear();
});
@@ -957,10 +1033,10 @@ export default {
.el_groundline {
display: flex;
}
-.el_groundline_box{
+.el_groundline_box {
display: flex;
flex-wrap: wrap;
- .el_groundline{
+ .el_groundline {
width: 50%;
}
}
@@ -990,7 +1066,12 @@ export default {
opacity: 0; /* 初始时勾隐藏 */
}
-.checkbox.checked::after{
+.checkbox.checked::after {
opacity: 1; /* 勾显示 */
}
+:deep(.avue-form__group--flex) {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap !important;
+}
diff --git a/src/views/basicdata/brand/basicdataFreightFrom.vue b/src/views/basicdata/brand/basicdataFreightFrom.vue
index 6e95203f..e33de3b6 100644
--- a/src/views/basicdata/brand/basicdataFreightFrom.vue
+++ b/src/views/basicdata/brand/basicdataFreightFrom.vue
@@ -47,14 +47,14 @@
-
+
@@ -103,6 +103,28 @@
>
+
+
+
+
+
+
+
+
res.name).join(',')
this.form.name = this.CustomerName.find(res=>res.id==this.form.clientIds).clientName;//客户名称
+ this.form.sendgoods=this.sendgoods.find(res=>res.id==this.form.forwarding).clientName;//发货单位名称
this.form.brandName= this.brandList.find(res=>res.brandId==this.form.brand).brandName;//品牌名称
+ this.form.fixedPrice='0'
console.log('提交的数据》》》', this.form);
-
add(this.form).then(() => {
this.$store.commit('DEL_TAG_CURRENT'); //关闭当前页面
this.$router.push('/basicdata/brand/basicdataFreight'); //添加成功跳转到列表
@@ -561,7 +586,7 @@ export default {
this.activeName = '干';
this.DryWarehouseDistributionAID = ''; //先置空
console.log(it,'it=====');
- this.DryWarehouseDistributionAID = this.freightType.find(res => res.dictKey == it).id;
+ this.DryWarehouseDistributionAID = this.freightType.find(res => res.dictKey == it).dictKey;
break;
case '2':
console.log(num,'num');
@@ -569,14 +594,14 @@ export default {
this.bin = '仓';
this.activeName = '仓';
this.DryWarehouseDistributionBID = ''; //先置空
- this.DryWarehouseDistributionBID = this.freightType.find(res => res.dictKey == it).id;
+ this.DryWarehouseDistributionBID = this.freightType.find(res => res.dictKey == it).dictKey;
break;
case '3':
this.match = true;
this.allocate = '配';
this.activeName = '配';
this.DryWarehouseDistributionCID = ''; //先置空
- this.DryWarehouseDistributionCID = this.freightType.find(res => res.dictKey == it).id;
+ this.DryWarehouseDistributionCID = this.freightType.find(res => res.dictKey == it).dictKey;
break;
}
@@ -652,6 +677,33 @@ export default {
this.clientOptions = [];
}
},
+ // 发货单位
+ forwardingFn(query) {
+ //发货下拉
+ if (query !== '') {
+ this.loading = true;
+ setTimeout(async () => {
+ this.loading = false;
+ // this.options = this.list.filter(item => {
+ // return item.label.toLowerCase().indexOf(query.toLowerCase()) > -1;
+ // });
+ let a = await selectName(this.page.currentPage, this.page.pageSize, {
+ clientName: query,
+ });
+ console.log('>>>>>>>>>>发货单位', a.data.data.records);
+ this.sendgoods=a.data.data.records
+ console.log(this.sendgoods,'当前发货');
+ console.log(this.form.clientIds,'当前选中客户');
+ this.forwarding = a.data.data.records.filter(item => {
+ return item.clientName.toLowerCase().includes(query.toLowerCase());
+ });
+ }, 200);
+ } else {
+ this.forwarding = [];
+ }
+ },
+
+
textbox(e, index, ole) {
//费用价格填写
// console.log("e,index",e,index);
@@ -724,7 +776,7 @@ export default {
let resulta = this.DryWarehouseDistributionA.find(
item => item.itemName == resDataIdA.dictValue
); //筛选ID匹配的数据
- resulta.formulaMode = this.freight.find(res => res.dictKey == e.formulaMode).id;
+ resulta.formulaMode = this.freight.find(res => res.dictKey == e.formulaMode).dictKey;
resulta.formulaModeName = this.freight.find(
res => res.dictKey == e.formulaMode
).dictValue;
diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
index 11a7e5a9..3d9f561a 100644
--- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
+++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
@@ -31,7 +31,7 @@
>删 除
- 导 入
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index 808f27b2..596b1115 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -835,6 +835,7 @@ export default {
methods: {
rowSave(row, done, loading) {
console.log('>>>>>>', row);
+
let a = [];
//解析地址，添加精度、维度、详细地址
if (!!row.address) {
@@ -879,6 +880,7 @@ export default {
row.department = this.department;
}
console.log('-------------->row', row);
+
add(row).then(
() => {
this.onLoad(this.page);
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
index 0ed71d89..8e481f71 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
@@ -86,6 +86,7 @@
@@ -321,11 +322,13 @@ import {
getCurrentInstance,
} from 'vue';
import { columnList } from '@/option/basicdata/basicdataWarehouseTemp.js';
-import { $_getList, $_ObtainRegion, $_parentId } from '@/api/basicdata/basicdataWarehouse';
+import { $_getList, $_ObtainRegion, $_parentId ,$_addsave} from '@/api/basicdata/basicdataWarehouse';
import { getDictionaryBiz } from '@/api/system/dict'; //字典
import { getToken } from '@/utils/auth';
import { ElMessage } from 'element-plus';
+import dayjs from 'dayjs';
import { Delete, Download, Plus, ZoomIn } from '@element-plus/icons-vue';
+const props = { multiple: true }
const options = ref([]); //职能类型
const search = ref(false); //搜索展开
const imgs = ref([
@@ -360,11 +363,19 @@ const newlyaddload = ref(false); //新增弹窗
const AssessmentDepartment = ref([]); //考核部门
const department = ref();
const Addform = ref({
- map: [],
}); //表格新增数据表单
const WarehouseType = ref([]); //仓库类型
const FireProtection = ref([]); //消防等级
-const Isprotection = ref([]); //是否具有消防等级
+const Isprotection = ref([
+ {
+ dictValue:'是',
+ dictKey:'1'
+},
+{
+ dictValue:'否',
+ dictKey:'0'
+}
+]); //是否具有消防等级
const WarehouseStructureList = ref([]); //仓库结构
const Iselevated = ref([]); //是否高架
const powerConditionList = ref([]); //电力类型
@@ -633,6 +644,21 @@ const newlyadd = () => {
// 新增数据确定
const newlyaddSubmit = () => {
console.log(Addform.value);
+ Addform.value.warehouseAddress = Addform.value.address[2];//仓库地址
+ Addform.value.departmentName = AssessmentDepartment.value.find(res=>res.id == Addform.value.department).label;//部门名称
+ Addform.value.daterange[0] = dayjs(Addform.value.daterange[0] ).format('YYYY-MM-DD');
+ Addform.value.daterange[1] = dayjs(Addform.value.daterange[1] ).format('YYYY-MM-DD');
+ Addform.value.paymentCodeUrl=Addform.value.paymentCodeUrl[0].response.data.link
+
+ Addform.value.administrativeAreas = Addform.value.administrativeAreas.join(',')
+ console.log(Addform.value);
+ let data={
+ ...Addform.value
+ }
+ console.log(data,'准备提交的参数');
+ $_addsave(data).then(res=>{
+ console.log(res,'新增之后返回值');
+ })
};
// 部门选择
const AffiliationList = ref({
@@ -694,9 +720,11 @@ const AffiliationList = ref({
flex-wrap: wrap;
.el-form-item {
width: 46%;
+ align-items: flex-start;
}
.el-form-item__content {
width: 100% !important;
+ align-items: flex-start;
.el-select,
.avue-input-map,
.el-cascader {
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index 8b1206e0..ef550f54 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -308,6 +308,16 @@ export default {
fixed: false,
sortable: true,
},
+ {
+ prop: 'mallName',
+ label: '商场名称',
+ type: 2,
+ values: '',
+ width: '140',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
{
prop: 'kindName',
label: '配送种类',
diff --git a/src/views/distribution/inventory/distributionStockListMarket.vue b/src/views/distribution/inventory/distributionStockListMarket.vue
index 0009f560..7188c3e9 100644
--- a/src/views/distribution/inventory/distributionStockListMarket.vue
+++ b/src/views/distribution/inventory/distributionStockListMarket.vue
@@ -1154,6 +1154,10 @@ export default {
});
},
async handleViewDismantle(row) {
+ this.FromDis=true;
+ this.formInline={};
+ this.optionsName=[];
+ this.goodsDis=true;
let data = {
pid: row.row.materialId,
};
diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue
index 95ea60ec..166fba70 100644
--- a/src/views/distribution/stockup/distributionStockupDiscuss.vue
+++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue
@@ -327,6 +327,7 @@ import {
getListUser,
addAssign,
$_CommercialMarket,
+ $_exportStockUpDetail,
} from '@/api/distribution/distributionStockup';
import { getPostList } from '@/api/system/post';
import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
@@ -1085,9 +1086,12 @@ export default {
return;
}
console.log('row-------->', row);
- $_CommercialDetail(row.ids).then(res => {
+ let data={
+ stockUpIds:row.ids,
+ }
+ $_exportStockUpDetail(data).then(res => {
console.log(res.data);
- downloadXls(res.data, '市配备货列表.xlsx');
+ downloadXls(res.data, '备货清单.xlsx');
});
},
handleDelete() {
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index ff1f7e8e..8be8881b 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -313,6 +313,7 @@ import {
getListUser,
addAssign,
$_CommercialMarket,
+ $_exportStockUpDetail,
} from '@/api/distribution/distributionStockup';
import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
import { getListOwn, getUser } from '@/api/system/user';
@@ -955,11 +956,14 @@ export default {
if (row.ids === '') {
this.$message.warning('请选择备货任务!');
return;
- }
+ }
console.log('row-------->', row);
- $_CommercialDetail(row.ids).then(res => {
+ let data={
+ stockUpIds:row.ids,
+ }
+ $_exportStockUpDetail(data).then(res => {
console.log(res.data);
- downloadXls(res.data, '市配备货列表.xlsx');
+ downloadXls(res.data, '备货清单.xlsx');
});
},
searchReset() {
diff --git a/src/views/reportforms/DeliveryCustomers.vue b/src/views/reportforms/DeliveryCustomers.vue
index ccfcb9f9..68964e39 100644
--- a/src/views/reportforms/DeliveryCustomers.vue
+++ b/src/views/reportforms/DeliveryCustomers.vue
@@ -29,6 +29,7 @@
multiple
v-model="TopQuery.warehouseNameRange"
filterable
+ clearable
placeholder="多选仓库搜索"
style="width: 240px"
>
@@ -47,6 +48,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个配送车辆请用逗号隔开"
/>
@@ -56,6 +58,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个配送司机请用逗号隔开"
/>
@@ -64,6 +67,7 @@
v-model="TopQuery.consigneeRange"
style="width: 240px"
:rows="1"
+ clearable
type="textarea"
placeholder="多个客户请用逗号隔开"
/>
@@ -532,6 +536,7 @@ const exportReport=()=>{
width: 100%;
display: flex;
justify-content: space-between;
+ flex-wrap: wrap;
.el-form-item {
align-items: flex-start;
}
diff --git a/src/views/reportforms/DeliveryDetails.vue b/src/views/reportforms/DeliveryDetails.vue
index 5a5e4c26..e093245e 100644
--- a/src/views/reportforms/DeliveryDetails.vue
+++ b/src/views/reportforms/DeliveryDetails.vue
@@ -27,6 +27,7 @@
multiple
v-model="TopQuery.warehouseNameRange"
filterable
+ clearable
placeholder="多选仓库搜索"
style="width: 240px"
>
@@ -45,6 +46,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个配送车辆请用逗号隔开"
/>
@@ -54,6 +56,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个配送司机请用逗号隔开"
/>
@@ -62,6 +65,7 @@
v-model="TopQuery.consigneeRange"
style="width: 240px"
:rows="1"
+ clearable
type="textarea"
placeholder="多个客户名称请用逗号隔开"
/>
@@ -73,6 +77,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个运单收货人请用逗号隔开"
/>
diff --git a/src/views/reportforms/DeliveryTrainNumber.vue b/src/views/reportforms/DeliveryTrainNumber.vue
index 9b01836a..8714463c 100644
--- a/src/views/reportforms/DeliveryTrainNumber.vue
+++ b/src/views/reportforms/DeliveryTrainNumber.vue
@@ -29,6 +29,7 @@
filterable
placeholder="多选仓库搜索"
style="width: 240px"
+
>
@@ -53,6 +55,7 @@
v-model="TopQuery.driverNameRange"
style="width: 240px"
:rows="1"
+ clearable
type="textarea"
placeholder="多个配送司机请用逗号隔开"
/>
diff --git a/src/views/reportforms/Inventory.vue b/src/views/reportforms/Inventory.vue
index eefc6eef..f81d4ce2 100644
--- a/src/views/reportforms/Inventory.vue
+++ b/src/views/reportforms/Inventory.vue
@@ -32,6 +32,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个商场名称请用逗号隔开"
/>
@@ -41,6 +42,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个物料编码请用逗号隔开"
/>
@@ -51,6 +53,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个物料名称请用逗号隔开"
/>
@@ -61,6 +64,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个订单自编码请用逗号隔开"
/>
@@ -71,6 +75,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个包条码请用逗号隔开"
/>
diff --git a/src/views/reportforms/InventoryReceipt.vue b/src/views/reportforms/InventoryReceipt.vue
index ef14cbe2..64a569c3 100644
--- a/src/views/reportforms/InventoryReceipt.vue
+++ b/src/views/reportforms/InventoryReceipt.vue
@@ -44,6 +44,7 @@
v-model="TopQuery.marketNameRange"
style="width: 240px"
:rows="1"
+ clearable
type="textarea"
placeholder="多个商场名称请用逗号隔开"
/>
@@ -54,6 +55,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个物料编码请用逗号隔开"
/>
@@ -63,6 +65,7 @@
v-model="TopQuery.descriptionGoodsRange"
style="width: 240px"
:rows="1"
+ clearable
type="textarea"
placeholder="多个物料名称请用逗号隔开"
/>
@@ -73,6 +76,7 @@
v-model="TopQuery.orderCodeRange"
style="width: 240px"
:rows="1"
+ clearable
type="textarea"
placeholder="多个订单自编码请用逗号隔开"
/>
@@ -84,6 +88,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个包条码请用逗号隔开"
/>
diff --git a/src/views/reportforms/Selfpickupreport.vue b/src/views/reportforms/Selfpickupreport.vue
index d108a51a..c72ebdd1 100644
--- a/src/views/reportforms/Selfpickupreport.vue
+++ b/src/views/reportforms/Selfpickupreport.vue
@@ -45,6 +45,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个收货单位请用逗号隔开"
/>
@@ -53,6 +54,7 @@
v-model="TopQuery.orderCodeRange"
style="width: 240px"
:rows="1"
+ clearable
type="textarea"
placeholder="多个订单自编号请用逗号隔开"
/>
@@ -63,6 +65,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个文员复核人请用逗号隔开"
/>
diff --git a/src/views/reportforms/Selfpickuptask.vue b/src/views/reportforms/Selfpickuptask.vue
index 5b540575..db20b8b2 100644
--- a/src/views/reportforms/Selfpickuptask.vue
+++ b/src/views/reportforms/Selfpickuptask.vue
@@ -45,6 +45,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个收货单位请用逗号隔开"
/>
@@ -54,6 +55,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个收货人请用逗号隔开"
/>
@@ -63,6 +65,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个提货人请用逗号隔开"
/>
@@ -73,6 +76,7 @@
style="width: 240px"
:rows="1"
type="textarea"
+ clearable
placeholder="多个运单收货人请用逗号隔开"
/>
diff --git a/src/views/reportforms/Stockordertable.vue b/src/views/reportforms/Stockordertable.vue
index 6abd2453..f73df579 100644
--- a/src/views/reportforms/Stockordertable.vue
+++ b/src/views/reportforms/Stockordertable.vue
@@ -8,7 +8,7 @@
-
+