aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-29 12:54:27 +08:00
parent 17b21cf356
commit 652d4e79da
2 changed files with 69 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/emis/emisSite/emisSiteForm.vue
View File

@ -1,7 +1,8 @@
<template> <template>
<div > <div >
<el-row :gutter="0" style="flex-direction: column;"> <el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
<el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="网点编号" prop="siteCode"> <el-form-item label="网点编号" prop="siteCode">
<el-input v-model="form.siteCode" placeholder="网点编号" :disabled="form.id !=null" /> <el-input v-model="form.siteCode" placeholder="网点编号" :disabled="form.id !=null" />
@ -54,9 +55,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="运输方式" prop="transTypeId"> <el-form-item label="运输方式" prop="transTypeIdArr">
<el-select multiple clearable v-model="form.transTypeId" placeholder="运输方式" > <el-select multiple clearable v-model="form.transTypeIdArr" placeholder="运输方式" >
<el-option <el-option
v-for="item in dict.type.emis_biz_shipping_method" v-for="item in dict.type.emis_biz_shipping_method"
v-bind:key="item.value" v-bind:key="item.value"
@ -281,8 +282,8 @@
<el-input v-model="form.incrementService" type="textarea" placeholder="请输入增值服务" /> <el-input v-model="form.incrementService" type="textarea" placeholder="请输入增值服务" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form>
</el-row> </el-row>
</el-form>
<div style="text-align: center;margin-bottom: 10px;"> <div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
@ -386,6 +387,13 @@ export default {
this.loading = true; this.loading = true;
getEmisSite(this.id).then(response => { getEmisSite(this.id).then(response => {
this.form = response.data; this.form = response.data;
if(this.form.transTypeId){
// this.form.transTypeId=[];
// let typeArr=this.form.transTypeId.split(",");
// typeArr.forEach()
this.$set(this.form,"transTypeIdArr",this.form.transTypeId.split(","))
// this.form.transTypeIdArr=this.form.transTypeId.split(",");
}
this.loading = false; this.loading = false;
}); });
}else{ }else{
@ -592,6 +600,7 @@ export default {
address: null, address: null,
dispDeliveryMode: null, dispDeliveryMode: null,
transTypeId: null, transTypeId: null,
transTypeIdArr:[],
transTypeName: null, transTypeName: null,
orgId: null, orgId: null,
orgName: null, orgName: null,
@ -650,6 +659,11 @@ export default {
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if(this.form.transTypeIdArr){
this.form.transTypeId=this.form.transTypeIdArr.join(",");
}
if (this.form.id != null) { if (this.form.id != null) {
updateEmisSite(this.form).then(response => { updateEmisSite(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");

96
src/views/emis/emisWarehouseInBatch/WarehouseStockIn.vue
View File

@ -1,11 +1,10 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form ref="form" :model="form" size="mini" :rules="rules" label-width="100px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="18" style=" border-right: 1px solid #e6ebf5; <el-col :span="18" style=" border-right: 1px solid #e6ebf5;padding-right: 20px;">
padding-right: 20px;">
<div class="head-container"> <div class="head-container">
<el-form ref="form" :model="form" size="mini" :rules="rules" label-width="100px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="主进仓单号" prop="inNo"> <el-form-item label="主进仓单号" prop="inNo">
@ -99,10 +98,10 @@
</el-col> --> </el-col> -->
</el-row> </el-row>
</el-form>
</div> </div>
<el-collapse v-model="activeNames"> <el-collapse v-model="activeNames">
<el-collapse-item title="" name="2"> <el-collapse-item title="" name="1">
<template slot="title"> <template slot="title">
<div class="form-group-title"><span class="title">{{ $t('录入入仓明细') }}</span></div> <div class="form-group-title"><span class="title">{{ $t('录入入仓明细') }}</span></div>
</template> </template>
@ -131,18 +130,19 @@
'padding': '0px!important', 'padding': '0px!important',
'padding-left': '0px!important', 'padding-left': '0px!important',
'padding-right': '0px!important', 'padding-right': '0px!important',
'font-size':'13px' 'font-size':'12px'
}" }"
:header-cell-style="{ :header-cell-style="{
'font-size':'13x' 'font-size':'12x'
}" }"
border border
stripe stripe
:data="form.cargoList" :data="form.cargoList"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
max-height="300px"
> >
<!-- max-height="400px" -->
<el-table-column :label="$t('序号')" align="center" width="60"> <el-table-column :label="$t('序号')" align="center" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
@ -155,17 +155,18 @@
<!-- <el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input> --> <!-- <el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.goodsModel" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<!-- <el-table-column prop="goodsName" label="品牌" align="center" width="60" :show-overflow-tooltip="true"> <!-- <el-table-column prop="goodsName" label="品牌" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.brand" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.brand" size="mini" placeholder=""></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.goodsModel" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true"> <el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
@ -199,22 +200,22 @@
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column prop="length" :label="$t('长(cm)')" align="center" width="60"> <el-table-column prop="length" :label="$t('长(cm)')" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.length" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.length" size="mini" placeholder=""></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="width" :label="$t('宽(cm)')" align="center" width="60"> <el-table-column prop="width" :label="$t('宽(cm)')" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.width" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.width" size="mini" placeholder=""></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="height" :label="$t('高(cm)')" align="center" width="60"> <el-table-column prop="height" :label="$t('高(cm)')" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.height" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.height" size="mini" placeholder=""></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="price" label="单价" align="center" width="60" :show-overflow-tooltip="true"> <el-table-column prop="price" label="单价" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.price" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.price" size="mini" placeholder=""></el-input>
</template> </template>
@ -252,13 +253,35 @@
<FileUpload :showTip="true" :fileSize="10" v-model="form.filePath" :isNeedUpload="true" :fileType="['pdf','xlsx','xls','jpg','bmp','png']" :limit="10"></FileUpload> <FileUpload :showTip="true" :fileSize="10" v-model="form.filePath" :isNeedUpload="true" :fileType="['pdf','xlsx','xls','jpg','bmp','png']" :limit="10"></FileUpload>
</div> </div>
</el-col> --> </el-col> -->
</el-row>
<div style="text-align: center;margin-bottom: 50px;margin-top: 50px;">
</el-row >
</el-collapse-item>
<el-collapse-item title="" name="2">
<template slot="title">
<div class="form-group-title"><span class="title">{{ $t('收货图片') }}</span></div>
</template>
<div>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="收货图片" prop="xxx" label-width="80px">
<ImageUpload ref="imageUpload" v-model="form.picUrl" :fileSize="1" :limit="20" @input="handleInput" ></ImageUpload>
</el-form-item>
</el-col>
</el-row >
</div>
</el-collapse-item>
</el-collapse>
<div style="text-align: center;margin-bottom: 50px;margin-top: 50px;">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-collapse-item>
</el-collapse>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -267,7 +290,7 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</el-form>
@ -418,6 +441,7 @@ export default {
totalVolume: null, totalVolume: null,
totalWeight: null, totalWeight: null,
remark: null, remark: null,
picUrl:null,
tenantId: null, tenantId: null,
delFlag: null, delFlag: null,
createBy: null, createBy: null,
@ -448,32 +472,10 @@ export default {
} }
}); });
}, },
// /** 转换菜单数据结构 */ async handleInput(item, size){
// normalizer(node) {
// if (node.children && !node.children.length) {
// delete node.children;
// }
// return {
// id: node.id,
// label: node.idName,
// children: node.children
// };
// },
// /** 查询菜单下拉树结构 */
// getTreeselect() {
// const queryParams = {}
// listEmisWarehouseInBatch(queryParams).then(response => {
// this.emisWarehouseInBatchOptions = [];
// const rootItem = { idId: 0, emisWarehouseInBatchName: '-', children: [] };
// rootItem.children = this.handleTree(response.data, "id");
// this.emisWarehouseInBatchOptions.push(rootItem);
// if(this.parentId != undefined) { },
// this.form.parentId = this.parentId;
// }
// });
// },
} }
}; };
</script> </script>