Browse Source

合并分支

fix_bug_pro20231227
qb 2 years ago
parent
commit
f03a2797ad
  1. 2
      index.html
  2. 302
      src/option/basic/basicMaterial.js
  3. 14
      src/views/basicdata/brand/basicClient.vue
  4. 56
      src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
  5. 18
      src/views/distribution/inventory/distributionStockList.vue
  6. 95
      src/views/distribution/inventory/distributionStockListDiscuss.vue
  7. 676
      src/views/distribution/inventory/distributionStockListMarket.vue
  8. 148
      src/views/distribution/inventory/distributionStockListSelf.vue
  9. 1
      src/views/distribution/signfor/distributionSignforedt.vue
  10. 72
      src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue
  11. 28
      src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue

2
index.html

@ -23,7 +23,7 @@
</script>
<script type="text/javascript"
src='https://webapi.amap.com/maps?v=2.0&key=f003ec4feb3fcc4cf0742e94f569fd33&plugin=AMap.PlaceSearch,AMap.Geocoder,Map3D,ElasticMarker,AMap.Driving,AMap.TruckDriving'></script>
src='https://webapi.amap.com/maps?v=1.4.15&key=f003ec4feb3fcc4cf0742e94f569fd33&plugin=AMap.PlaceSearch,AMap.Geocoder,Map3D,ElasticMarker,AMap.Driving,AMap.TruckDriving'></script>
<script src="//webapi.amap.com/ui/1.1/main.js"></script>
<script type="text/javascript"
src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=FpjVxjf9nGo47eLj9I0ZuUvSZm1wGGqr"></script>

302
src/option/basic/basicMaterial.js

@ -7,157 +7,181 @@ export default {
border: true,
index: true,
viewBtn: true,
delBtn:true,
delBtn: true,
selection: false,
indexLabel: "序号",
indexLabel: '序号',
indexWidth: '80',
dialogClickModal: false,
column: [
{
label: "租户号",
prop: "tenantId",
type: "input",
label: '租户号',
prop: 'tenantId',
type: 'input',
width: '130',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建人",
prop: "createUser",
type: "input",
label: '创建人',
prop: 'createUser',
type: 'input',
width: '130',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建时间",
prop: "createTime",
type: "input",
label: '创建时间',
prop: 'createTime',
type: 'input',
width: '130',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "更新人",
prop: "updateUser",
type: "input",
label: '更新人',
prop: 'updateUser',
type: 'input',
width: '130',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "更新时间",
prop: "updateTime",
type: "input",
label: '更新时间',
prop: 'updateTime',
type: 'input',
width: '130',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "状态",
prop: "status",
type: "input",
label: '状态',
prop: 'status',
type: 'input',
width: '130',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "是否已删除",
prop: "isDeleted",
type: "input",
label: '是否已删除',
prop: 'isDeleted',
type: 'input',
width: '130',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建部门",
prop: "createDept",
type: "input",
label: '创建部门',
prop: 'createDept',
type: 'input',
width: '130',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "主键",
prop: "id",
type: "input",
label: '主键',
prop: 'id',
type: 'input',
width: '130',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留1",
prop: "reserve1",
type: "input",
label: '预留1',
prop: 'reserve1',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留2",
prop: "reserve2",
type: "input",
label: '预留2',
prop: 'reserve2',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留3",
prop: "reserve3",
type: "input",
label: '预留3',
prop: 'reserve3',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留4",
prop: "reserve4",
type: "input",
label: '预留4',
prop: 'reserve4',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留5",
prop: "reserve5",
type: "input",
label: '预留5',
prop: 'reserve5',
type: 'input',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "产品编码",
prop: "productCode",
type: "input",
label: '产品编码',
prop: 'productCode',
type: 'input',
search: true,
width: 100,
width: '130',
rules: [
{
required: true,
message: '请输入产品编码',
trigger: 'blur',
},
],
overHidden: true,
},
{
label: "物品sku",
prop: "sku",
type: "input",
width: 100,
label: '物品sku',
prop: 'sku',
type: 'input',
width: '130',
rules: [
{
required: true,
message: '请输入物品sku',
trigger: 'blur',
},
],
overHidden: true,
},
{
label: "计量单位",
prop: "logpmUnit",
type: "select",
label: '计量单位',
prop: 'logpmUnit',
type: 'select',
width: '130',
dicUrl: '/blade-system/dict-biz/dictionary?code=logpm_unit',
props: {
label: 'dictValue',
@ -173,11 +197,18 @@ export default {
],
},
{
label: "名称",
prop: "name",
type: "input",
label: '名称',
prop: 'name',
type: 'input',
rules: [
{
required: true,
message: '请输入名称',
trigger: 'blur',
},
],
search: true,
width: 200,
width: '130',
overHidden: true,
},
// {
@ -196,9 +227,17 @@ export default {
// hide: false,
// },
{
label: "属性",
prop: "property",
type: "input",
label: '属性',
prop: 'property',
rules: [
{
required: true,
message: '请输入属性',
trigger: 'blur',
},
],
width: '130',
type: 'input',
},
// {
// label: "规格",
@ -206,78 +245,129 @@ export default {
// type: "input",
// },
{
label: "包装规格",
prop: "packingSpecification",
type: "input",
label: '包装规格',
prop: 'packingSpecification',
type: 'input',
width: '130',
rules: [
{
required: true,
message: '请输入包装规格',
trigger: 'blur',
},
],
},
{
label: "包装数量",
prop: "packageNum",
type: "input",
label: '包装数量',
prop: 'packageNum',
type: 'input',
width: '130',
rules: [
{
required: true,
message: '请输入包装数量',
trigger: 'blur',
},
],
},
{
label: "包装材质",
prop: "packagingMaterial",
type: "input",
label: '包装材质',
prop: 'packagingMaterial',
type: 'input',
width: '130',
rules: [
{
required: true,
message: '请输入包装材质',
trigger: 'blur',
},
],
},
{
label: "长",
prop: "extent",
type: "input",
width: 100,
label: '长',
prop: 'extent',
type: 'input',
width: '130',
overHidden: true,
rules: [
{
required: true,
message: '请输入长度',
trigger: 'blur',
},
],
},
{
label: "宽",
prop: "breadth",
type: "input",
width: 100,
label: '宽',
prop: 'breadth',
type: 'input',
width: '130',
rules: [
{
required: true,
message: '请输入宽度',
trigger: 'blur',
},
],
overHidden: true,
},
{
label: "高度",
prop: "altitude",
type: "input",
width: 100,
label: '高度',
prop: 'altitude',
type: 'input',
width: '130',
rules: [
{
required: true,
message: '请输入高度',
trigger: 'blur',
},
],
overHidden: true,
},
{
label: "体积",
prop: "volume",
type: "input",
width: 100,
label: '体积',
prop: 'volume',
type: 'input',
width: '130',
rules: [
{
required: true,
message: '请输入体积',
trigger: 'blur',
},
],
overHidden: true,
},
{
label: "重量",
prop: "weight",
type: "input",
label: '重量',
prop: 'weight',
width: '130',
type: 'input',
},
{
label: "备注",
prop: "remark",
type: "input",
label: '备注',
prop: 'remark',
width: '130',
type: 'input',
},
{
label: "物料图片",
prop: "picture",
type: "upload",
label: '物料图片',
prop: 'picture',
type: 'upload',
dataType: 'string',
listType: 'picture-img',
// hide: true,
labelWidth:'150',
span:10,
multiple:false,
width:"200px",
align:'left',
labelWidth: '150',
span: 10,
multiple: false,
width: '200px',
align: 'left',
action: '/blade-resource/oss/endpoint/put-file',
propsHttp: {
res: 'data',
url: 'link',
},
},
]
}
],
};

14
src/views/basicdata/brand/basicClient.vue

@ -464,7 +464,7 @@ export default {
columnList: [
{
prop: '',
label: '序号',
label: '全选',
type: 0,
values: '',
width: 55,
@ -476,7 +476,7 @@ export default {
label: '客户名称',
type: 2,
values: '',
width: 'fit-content',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
@ -487,7 +487,7 @@ export default {
label: '客户编码',
type: 2,
values: '',
width: 'fit-content',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
@ -498,7 +498,7 @@ export default {
label: '客户类型',
type: 3,
values: '',
width: 'fit-content',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
@ -509,7 +509,7 @@ export default {
label: '服务类型',
type: 1,
values: '',
width: 'fit-content',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
@ -553,7 +553,7 @@ export default {
label: '合同开始时间',
type: 5,
values: '',
width: '100',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
@ -563,7 +563,7 @@ export default {
label: '合同结束时间',
type: 5,
values: '',
width: '100',
width: '150',
checkarr: [],
fixed: false,
sortable: true,

56
src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue

@ -89,7 +89,7 @@ export default {
dialogClickModal: false,
column: [
{
label: '租户号',
label: '租户号1',
prop: 'tenantId',
type: 'input',
addDisplay: false,
@ -228,7 +228,7 @@ export default {
],
span: 12,
labelWidth: '120',
width: 'fit-content',
width: '130',
},
{
label: '仓库编码',
@ -243,14 +243,14 @@ export default {
],
span: 12,
labelWidth: '120',
width: 'fit-conent',
width: '130',
},
{
label: '仓库简称',
prop: 'abbreviation',
type: 'input',
labelWidth: '120',
width: 'fit-conent',
width: '130',
},
{
label: '联系人',
@ -259,7 +259,7 @@ export default {
search: true,
span: 12,
labelWidth: '120',
width: 'fit-content',
width: '130',
rules: [
{
required: true,
@ -283,7 +283,7 @@ export default {
],
span: 12,
labelWidth: '120',
width: 'fit-content',
width: '130',
},
{
label: '事业线',
@ -324,7 +324,7 @@ export default {
leaf: 'leaf',
},
labelWidth: '120',
width: 'fit-conent',
width: '130',
},
{
label: '职能类型',
@ -332,7 +332,7 @@ export default {
type: 'select',
span: 12,
labelWidth: '120',
width: 'fit-conent',
width: '130',
search: true,
dicUrl: '/api/blade-system/dict-biz/dictionary?code=warehouse_function_type',
dataType: 'number',
@ -347,7 +347,7 @@ export default {
type: 'input',
span: 12,
labelWidth: '120',
width: 'fit-conent',
width: '130',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
@ -360,7 +360,7 @@ export default {
type: 'cascader',
search: true,
labelWidth: '120',
width: 'fit-conent',
width: '130',
clearable: true,
placeholder: '省/市/区',
dicUrl: '/blade-system/region/lazy-listAll',
@ -384,7 +384,7 @@ export default {
type: 'map',
span: 12,
labelWidth: '120',
width: 'fit-conent',
width: '130',
params: {
zoom: 8,
//
@ -397,10 +397,10 @@ export default {
{
required: true,
message: '请输入仓库地址',
trigger: 'blur',
trigger: 'change',
},
],
clearable: false,
clearable: true,
addDisplay: true,
editDisplay: true,
hide: true,
@ -411,7 +411,7 @@ export default {
type: 'input',
span: 12,
labelWidth: '120',
width: 'fit-content',
width: '130',
addDisplay: false,
editDisplay: false,
hide: true,
@ -422,7 +422,7 @@ export default {
type: 'input',
span: 12,
labelWidth: '120',
width: 'fit-content',
width: '130',
addDisplay: false,
editDisplay: false,
hide: true,
@ -433,7 +433,7 @@ export default {
type: 'input',
span: 12,
labelWidth: '120',
width: 'fit-content',
width: '130',
addDisplay: false,
editDisplay: false,
hide: true,
@ -445,7 +445,7 @@ export default {
type: 'tree',
span: 12,
labelWidth: '120',
width: 'fit-conent',
width: '130',
dicUrl: '/api/blade-system/dept/lazy-tree?parentId=0',
props: {
label: 'title',
@ -514,7 +514,7 @@ export default {
search: true,
span: 12,
labelWidth: '120',
width: 'fit-conent',
width: '130',
rules: [
{
required: true,
@ -535,7 +535,7 @@ export default {
},
span: 12,
labelWidth: '120',
width: 'fit-conent',
width: '130',
rules: [
{
required: true,
@ -583,7 +583,7 @@ export default {
},
span: 12,
labelWidth: '120',
width: 'fit-conent',
width: '130',
rules: [
{
required: true,
@ -603,7 +603,7 @@ export default {
},
span: 12,
labelWidth: '120',
width: 'fit-conent',
width: '130',
rules: [
{
required: true,
@ -618,7 +618,7 @@ export default {
type: 'input',
span: 12,
labelWidth: '120',
width: 'fit-content',
width: '130',
},
{
label: '电力类型',
@ -632,7 +632,7 @@ export default {
label: 'dictValue',
value: 'dictKey',
},
width: 'fit-conent',
width: '130',
rules: [
{
required: true,
@ -666,7 +666,7 @@ export default {
placeholder: '请选择租赁开始时间',
span: 12,
labelWidth: '120',
width: 'fit-content',
width: '130',
viewDisplay: true,
addDisplay: false,
editDisplay: false,
@ -681,7 +681,7 @@ export default {
placeholder: '请选择租赁结束时间',
span: 12,
labelWidth: '120',
width: 'fit-content',
width: '130',
viewDisplay: true,
addDisplay: false,
editDisplay: false,
@ -699,7 +699,7 @@ export default {
},
span: 12,
labelWidth: '120',
width: 'fit-conent',
width: '130',
rules: [
{
required: true,
@ -720,7 +720,7 @@ export default {
},
span: 12,
labelWidth: '120',
width: 'fit-conent',
width: '130',
rules: [
{
required: true,
@ -755,7 +755,7 @@ export default {
endPlaceholder: '租赁结束日期',
span: 12,
labelWidth: '120',
width: 'fit-content',
width: '130',
search: true,
searchRange: true,
searchSpan: 12,

18
src/views/distribution/inventory/distributionStockList.vue

@ -134,7 +134,7 @@
>
<el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="100">
<el-form-item label="SKU" style="width: 40%">
<el-input v-model="formInline.sku" placeholder="请输入sku" clearable />
<el-input v-model="formInline.sku" placeholder="请输入sku" clearable :disabled="Boolean(unpackFormDisable.sku)" />
</el-form-item>
<el-form-item label="货物名称" style="width: 40%">
<!-- <el-input v-model="formInline.descriptionGoods" placeholder="请输入货物名称" clearable />-->
@ -149,6 +149,7 @@
@change="getMethodName($event, '1')"
@blur="selectBlur"
:loading="loading"
clearable
>
<el-option
v-for="item in optionsName"
@ -167,6 +168,7 @@
reserve-keyword
remote-show-suffix
placeholder="请选择货物单位"
:disabled="Boolean(unpackFormDisable.cargoUnit)"
>
<el-option
v-for="item in distributionUnit"
@ -177,13 +179,13 @@
</el-select>
</el-form-item>
<el-form-item label="规格" style="width: 40%">
<el-input v-model="formInline.cargoNorms" placeholder="请输入规格" clearable />
<el-input v-model="formInline.cargoNorms" placeholder="请输入规格" clearable :disabled="Boolean(unpackFormDisable.cargoNorms)" />
</el-form-item>
<el-form-item label="产品编码" style="width: 40%">
<el-input v-model="formInline.cargoNumber" placeholder="请输入产品编码" clearable />
<el-input v-model="formInline.cargoNumber" placeholder="请输入产品编码" clearable :disabled="Boolean(unpackFormDisable.cargoNumber)"/>
</el-form-item>
<el-form-item label="包装数量" style="width: 40%">
<el-input v-model="formInline.packageNum" placeholder="请输入包装数量" clearable />
<el-input v-model="formInline.packageNum" placeholder="请输入包装数量" clearable :disabled="Boolean(unpackFormDisable.packageNum)"/>
</el-form-item>
<el-form-item label="拆箱数" style="width: 40%">
<el-input
@ -301,6 +303,8 @@ export default {
drawerShow: false,
distributionType: [],
distributionUnit: [],
//
unpackFormDisable: {},
columnList: [
{
prop: '',
@ -805,7 +809,10 @@ export default {
* 物料选择赋值
* */
getMethodName(row, num) {
console.log('名称选择事件', row);
if(!row) {
this.formInline = {}
this.unpackFormDisable = {}
}
switch (num) {
case '1':
let a = this.optionsName.find(i => i.id == row);
@ -818,6 +825,7 @@ export default {
this.formInline.packageNum = a.packageNum;
this.formInline.descriptionGoods = a.descriptionGoods;
this.formInline.sku = a.sku;
this.unpackFormDisable = this.formInline
}
break;
case '2':

95
src/views/distribution/inventory/distributionStockListDiscuss.vue

@ -132,7 +132,7 @@
padding-left: 1%;
"
>
<el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="100">
<!-- <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="100">
<el-form-item label="SKU" style="width: 40%">
<el-input v-model="formInline.sku" placeholder="请输入sku" clearable />
</el-form-item>
@ -171,6 +171,70 @@
clearable
/>
</el-form-item>
</el-form> -->
<el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="100">
<el-form-item label="SKU" style="width: 40%">
<el-input v-model="formInline.sku" placeholder="请输入sku" clearable :disabled="Boolean(unpackFormDisable.sku)" />
</el-form-item>
<el-form-item label="货物名称" style="width: 40%">
<!-- <el-input v-model="formInline.descriptionGoods" placeholder="请输入货物名称" clearable />-->
<el-select
style="width: 100%"
v-model="formInline.materialIdName"
filterable
remote
reserve-keyword
placeholder="请输入物料名称"
:remote-method="remoteMethodName"
@change="getMethodName($event, '1')"
@blur="selectBlur"
:loading="loading"
clearable
>
<el-option
v-for="item in optionsName"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="货物单位" style="width: 40%">
<el-select
style="width: 100%"
v-model="formInline.cargoUnit"
filterable
remote
reserve-keyword
remote-show-suffix
placeholder="请选择货物单位"
:disabled="Boolean(unpackFormDisable.cargoUnit)"
>
<el-option
v-for="item in distributionUnit"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
/>
</el-select>
</el-form-item>
<el-form-item label="规格" style="width: 40%">
<el-input v-model="formInline.cargoNorms" placeholder="请输入规格" clearable :disabled="Boolean(unpackFormDisable.cargoNorms)" />
</el-form-item>
<el-form-item label="产品编码" style="width: 40%">
<el-input v-model="formInline.cargoNumber" placeholder="请输入产品编码" clearable :disabled="Boolean(unpackFormDisable.cargoNumber)"/>
</el-form-item>
<el-form-item label="包装数量" style="width: 40%">
<el-input v-model="formInline.packageNum" placeholder="请输入包装数量" clearable :disabled="Boolean(unpackFormDisable.packageNum)"/>
</el-form-item>
<el-form-item label="拆箱数" style="width: 40%">
<el-input
v-model="formInline.unpackingQuantity"
placeholder="请输入拆箱数"
clearable
/>
</el-form-item>
</el-form>
</div>
</div>
@ -280,6 +344,8 @@ export default {
drawerShow: false,
distributionType: [],
distributionUnit: [],
//
unpackFormDisable: {},
columnList: [
{
prop: '',
@ -749,6 +815,33 @@ export default {
},
},
methods: {
/**
* 物料选择赋值
* */
getMethodName(row, num) {
if(!row) {
this.formInline = {}
this.unpackFormDisable = {}
}
switch (num) {
case '1':
let a = this.optionsName.find(i => i.id == row);
console.log('aaaa>>', a);
if (!!a) {
this.formInline.materialCode = a.productCode;
this.formInline.cargoUnit = a.logpmUnit;
this.formInline.cargoNorms = a.packingSpecification;
this.formInline.cargoNumber = a.productCode;
this.formInline.packageNum = a.packageNum;
this.formInline.descriptionGoods = a.descriptionGoods;
this.formInline.sku = a.sku;
this.unpackFormDisable = this.formInline
}
break;
case '2':
break;
}
},
showdrawer(value) {
this.drawerShow = value;
},

676
src/views/distribution/inventory/distributionStockListMarket.vue

File diff suppressed because it is too large Load Diff

148
src/views/distribution/inventory/distributionStockListSelf.vue

@ -108,20 +108,47 @@
</div>
<div style="border-width: 1px 0 0 0; border-style: solid; border-color: black;margin-top: 5%;padding-top: 2%;padding-left: 1%">
<el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="100">
<el-form-item label="SKU" style="width: 40%">
<el-input v-model="formInline.sku" placeholder="请输入sku" clearable />
<el-form-item label="SKU" style="width: 40%">
<el-input
v-model="formInline.sku"
placeholder="请输入sku"
clearable
:disabled="Boolean(unpackFormDisable.sku)"
/>
</el-form-item>
<el-form-item label="货物名称" style="width: 40%">
<el-input v-model="formInline.descriptionGoods" placeholder="请输入货物名称" clearable />
<el-form-item label="货物名称" style="width: 40%">
<!-- <el-input v-model="formInline.descriptionGoods" placeholder="请输入货物名称" clearable />-->
<el-select
style="width: 100%"
v-model="formInline.materialIdName"
filterable
remote
reserve-keyword
placeholder="请输入物料名称"
:remote-method="remoteMethodName"
@change="getMethodName($event, '1')"
@blur="selectBlur"
:loading="loading"
clearable
>
<el-option
v-for="item in optionsName"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="货物单位" style="width: 40%">
<el-select style="width: 100%;"
v-model="formInline.cargoUnit"
filterable
remote
reserve-keyword
remote-show-suffix
placeholder="请选择货物单位"
<el-form-item label="货物单位" style="width: 40%">
<el-select
style="width: 100%"
v-model="formInline.cargoUnit"
filterable
remote
reserve-keyword
remote-show-suffix
placeholder="请选择货物单位"
:disabled="Boolean(unpackFormDisable.cargoUnit)"
>
<el-option
v-for="item in distributionUnit"
@ -132,10 +159,35 @@
</el-select>
</el-form-item>
<el-form-item label="规格" style="width: 40%">
<el-input v-model="formInline.cargoNorms" placeholder="请输入规格" clearable />
<el-input
v-model="formInline.cargoNorms"
placeholder="请输入规格"
clearable
:disabled="Boolean(unpackFormDisable.cargoNorms)"
/>
</el-form-item>
<el-form-item label="产品编码" style="width: 40%">
<el-input
v-model="formInline.cargoNumber"
placeholder="请输入产品编码"
clearable
:disabled="Boolean(unpackFormDisable.cargoNumber)"
/>
</el-form-item>
<el-form-item label="包装数量" style="width: 40%">
<el-input
v-model="formInline.packageNum"
placeholder="请输入包装数量"
clearable
:disabled="Boolean(unpackFormDisable.packageNum)"
/>
</el-form-item>
<el-form-item label="拆箱数" style="width: 40%">
<el-input v-model="formInline.unpackingQuantity" placeholder="请输入拆箱数" clearable />
<el-input
v-model="formInline.unpackingQuantity"
placeholder="请输入拆箱数"
clearable
/>
</el-form-item>
</el-form>
</div>
@ -240,13 +292,17 @@ export default {
drawerShow: false,
distributionType:[],
distributionUnit:[],
//
unpackFormDisable: {},
//
optionsName: [],
columnList: [
{
prop: '',
label: '序号',
label: '全选',
type: 0,
values: '',
width: 55,
width: "55",
checkarr: [],
fixed: true,
},
@ -706,7 +762,63 @@ export default {
}
},
methods: {
selectBlur(e) {
// console.log(">>>>>><<<<<<<",e);
let value = e.target.value; //
if (value) {
//
// this.form.produce = value;
// console.log("",value);
this.formInline.materialIdName = value;
}
},
/**
* 查询
* */
async remoteMethodName(query) {
if (query) {
this.loading = true;
//
let asd = await getListMaterial(this.page.currentPage, this.page.pageSize, {
name: query,
pid: this.stockList.materialId,
}).then();
console.log('物料信息', asd.data.data);
if (!!asd.data.data) {
this.optionsName = asd.data.data.records;
}
this.loading = false;
} else {
this.optionsName = [];
}
},
/**
* 物料选择赋值
* */
getMethodName(row, num) {
if (!row) {
this.formInline = {};
this.unpackFormDisable = {};
}
switch (num) {
case '1':
let a = this.optionsName.find(i => i.id == row);
console.log('aaaa>>', a);
if (!!a) {
this.formInline.materialCode = a.productCode;
this.formInline.cargoUnit = a.logpmUnit;
this.formInline.cargoNorms = a.packingSpecification;
this.formInline.cargoNumber = a.productCode;
this.formInline.packageNum = a.packageNum;
this.formInline.descriptionGoods = a.descriptionGoods;
this.formInline.sku = a.sku;
this.unpackFormDisable = this.formInline;
}
break;
case '2':
break;
}
},
showdrawer(value){
this.drawerShow=value
},
@ -872,7 +984,7 @@ export default {
this.formInline.marketId =this.stockList.marketId;
this.formInline.storeId =this.stockList.storeId;
this.formInline.descriptionGoods = ''
console.log("提交的值",this.formInline);
addParcels(this.formInline).then(() => {
this.box = false;

1
src/views/distribution/signfor/distributionSignforedt.vue

@ -1617,6 +1617,7 @@ export default {
if (data.orderInfo) {
this.orderData = data.orderInfo;
}
console.log("data111>>>>>>",data)
this.stepActive = this.stepsList.findIndex(item => item.title === data.signingStatusAll);
this.signfordata = data;
this.signfordata.address = 'aa';

72
src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue

@ -1,6 +1,17 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left"></div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
</div>
</div>
</el-row>
<el-tabs type="border-card">
<el-tab-pane label="订制品">
<el-row>
@ -127,7 +138,14 @@
</template>
<script>
import { getDetail, getpage, update, remove,getinventorypage,gettruckloadpage } from '@/api/warehouse/warehouseUpdownGoodsLog';
import {
getDetail,
getpage,
update,
remove,
getinventorypage,
gettruckloadpage,
} from '@/api/warehouse/warehouseUpdownGoodsLog';
import option from '@/option/warehouse/warehouseUpdownGoodsLog';
import { mapGetters } from 'vuex';
@ -568,8 +586,8 @@ export default {
option: option,
//
data: [],
data1:[],
data2:[],
data1: [],
data2: [],
};
},
mounted() {
@ -664,6 +682,10 @@ export default {
},
},
methods: {
//
searchChange() {
this.onLoad(this.page);
},
showdrawer(value) {
this.drawerShow = value;
},
@ -744,28 +766,32 @@ export default {
},
onLoad(page, params = {}, uname) {
this.loading = true;
if (uname=='page1') {
getinventorypage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
if (uname) {
this[uname].total = data.total;
if (uname == 'page1') {
getinventorypage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
res => {
const data = res.data.data;
if (uname) {
this[uname].total = data.total;
}
this.data1 = data.records;
this.data1 = this.$functions.newdatas(this.columnList1, this.data1);
this.loading = false;
this.selectionClear();
}
this.data1 = data.records;
this.data1 = this.$functions.newdatas(this.columnList1, this.data1);
this.loading = false;
this.selectionClear();
});
}else if(uname=='page2'){
gettruckloadpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
if (uname) {
this[uname].total = data.total;
);
} else if (uname == 'page2') {
gettruckloadpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
res => {
const data = res.data.data;
if (uname) {
this[uname].total = data.total;
}
this.data2 = data.records;
this.data2 = this.$functions.newdatas(this.columnList2, this.data2);
this.loading = false;
this.selectionClear();
}
this.data2 = data.records;
this.data2 = this.$functions.newdatas(this.columnList2, this.data2);
this.loading = false;
this.selectionClear();
});
);
} else {
getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;

28
src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue

@ -15,6 +15,7 @@
<el-col :span="24">
<el-form-item label="入库批次" prop="receiptBatch">
<el-input v-model="form.receiptBatch" clearable placeholder="请输入入库批次" />
<el-input v-model="form.receiptBatch" clearable placeholder="请输入入库批次" />
</el-form-item>
<el-form-item label="入库时间" prop="receiptDate">
<!-- <el-input v-model="form.receiptDate" placeholder="请输入入库时间"/>-->
@ -23,6 +24,7 @@
placeholder="请选择入库时间"
type="datetime"
clearable
clearable
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
/>
@ -40,6 +42,7 @@
:remote-method="remoteMethod"
:loading="loading"
clearable
clearable
@change="getMenDian($event, 1)"
placeholder="请输入客户名称"
>
@ -65,6 +68,7 @@
@change="getMenDian($event, 2)"
placeholder="请输入客户编码"
clearable
clearable
>
<el-option
v-for="item in optionCodes"
@ -83,6 +87,7 @@
filterable
allow-create
clearable
clearable
default-first-option
:reserve-keyword="false"
@change="getMen($event, 1)"
@ -101,11 +106,13 @@
<!-- <el-form-item label="物流单号" prop="trainNumber">-->
<el-form-item label="物流车次">
<el-input v-model="form.trainNumber" clearable placeholder="请输入物流车次" />
<el-input v-model="form.trainNumber" clearable placeholder="请输入物流车次" />
</el-form-item>
<!-- <el-form-item label="入库车牌" prop="licensePlate">-->
<el-form-item label="入库车牌">
<el-input v-model="form.licensePlate" clearable placeholder="请输入入库车牌" />
<el-input v-model="form.licensePlate" clearable placeholder="请输入入库车牌" />
</el-form-item>
</el-col>
<el-col :span="24">
@ -171,10 +178,15 @@
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain> </el-button>-->
</div>
<!-- 头部右侧按钮模块 -->
<!-- <div class="avue-crud__right">-->
<!-- <el-button icon="el-icon-refresh" @click="searchChange" circle :disabled="view"></el-button>-->
<!-- <el-button icon="el-icon-search" @click="searchHide" circle :disabled="view"></el-button>-->
<!-- </div>-->
<div class="avue-crud__right">
<el-button
icon="el-icon-refresh"
@click="searchChange"
circle
:disabled="view"
></el-button>
<!-- <el-button icon="el-icon-search" @click="searchHide" circle :disabled="view"></el-button> -->
</div>
</div>
</el-row>
<el-row>
@ -966,6 +978,14 @@ export default {
this.search = !this.search;
},
searchChange() {
// \
if(!this.$route.query.type) {
//
this.form = {}
}
//
this.formDetail = {}
//
this.onLoad(this.page);
},
searchReset() {

Loading…
Cancel
Save