java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

新增直接提交入库

fix_bug_pro20231227
qb 2 years ago
parent
33ddb263eb
commit
a31172e356
4 changed files with 229 additions and 211 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 312
      src/option/basic/basicPda.js
  2. 46
      src/views/basic/forklift/basicForklift.vue
  3. 78
      src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
  4. 4
      vite.config.js

312
src/option/basic/basicPda.js
Unescape View File

@ -1,5 +1,5 @@
export default { export default {
height:'auto', height: 'auto',
calcHeight: 30, calcHeight: 30,
tip: false, tip: false,
searchShow: true, searchShow: true,
@ -12,160 +12,160 @@ export default {
dialogClickModal: false, dialogClickModal: false,
column: [ column: [
{ {
label: "主键", label: '主键',
prop: "id", prop: 'id',
type: "input", type: 'input',
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: true,
}, },
{ {
label: "租户号", label: '租户号',
prop: "tenantId", prop: 'tenantId',
type: "input", type: 'input',
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: true,
}, },
{ {
label: "创建人", label: '创建人',
prop: "createUser", prop: 'createUser',
type: "input", type: 'input',
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: true,
}, },
{ {
label: "创建时间", label: '创建时间',
prop: "createTime", prop: 'createTime',
type: "input", type: 'input',
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: true,
}, },
{ {
label: "更新人", label: '更新人',
prop: "updateUser", prop: 'updateUser',
type: "input", type: 'input',
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: true,
}, },
{ {
label: "更新时间", label: '更新时间',
prop: "updateTime", prop: 'updateTime',
type: "input", type: 'input',
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: true,
}, },
{ {
label: "状态", label: '状态',
prop: "status", prop: 'status',
type: "input", type: 'input',
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: true,
}, },
{ {
label: "是否已删除;1-未删除，2-已删除", label: '是否已删除;1-未删除，2-已删除',
prop: "isDeleted", prop: 'isDeleted',
type: "input", type: 'input',
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: true,
}, },
{ {
label: "创建部门", label: '创建部门',
prop: "createDept", prop: 'createDept',
type: "input", type: 'input',
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: true,
}, },
{ {
label: "产品名称", label: '产品名称',
prop: "name", prop: 'name',
type: "input", type: 'input',
search: true, search: true,
labelWidth:'150', labelWidth: '150',
width:"100px", width: '130',
align:'center', align: 'center',
span:11, span: 11,
}, },
{ {
label: "型号", label: '型号',
prop: "model", prop: 'model',
type: "input", type: 'input',
search: true, search: true,
labelWidth:'150', labelWidth: '150',
width:"100px", width: '130',
align:'center', align: 'center',
span:11, span: 11,
}, },
{ {
label: "设备序列号S/N", label: '设备序列号S/N',
prop: "deviceSerialNumber", prop: 'deviceSerialNumber',
type: "input", type: 'input',
search: true, search: true,
labelWidth:'150', labelWidth: '150',
width:"150px", width: '150px',
align:'center', align: 'center',
span:11, span: 11,
}, },
{ {
label: "购买金额", label: '购买金额',
prop: "purchaseAmount", prop: 'purchaseAmount',
type: "input", type: 'input',
labelWidth:'150', labelWidth: '150',
width:"100px", width: '130',
align:'center', align: 'center',
span:11, span: 11,
}, },
{ {
label: "状态", label: '状态',
prop: "state", prop: 'state',
type: "select", type: 'select',
search: true, search: true,
labelWidth:'150', labelWidth: '150',
width:"100px", width: '130',
align:'center', align: 'center',
span:11, span: 11,
dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_pad_state', dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_pad_state',
props: { props: {
label: 'dictValue', label: 'dictValue',
value: 'dictKey', value: 'dictKey',
}, },
rules: [{ required: true, message: '请选择状态!',trigger: 'blur'}], rules: [{ required: true, message: '请选择状态!', trigger: 'blur' }],
}, },
{ {
label: "当前使用仓", label: '当前使用仓',
prop: "currentUsageWarehouse", prop: 'currentUsageWarehouse',
type: "input", type: 'input',
search: true, search: true,
labelWidth:'150', labelWidth: '150',
width:"120px", width: '130',
align:'center', align: 'center',
span:11, span: 11,
}, },
{ {
label: "使用人", label: '使用人',
prop: "user", prop: 'user',
type: "input", type: 'input',
search: true, search: true,
labelWidth:'150', labelWidth: '150',
width:"120px", width: '130',
align:'center', align: 'center',
span:11, span: 11,
}, },
// { // {
// label: "使用人岗位id", // label: "使用人岗位id",
@ -174,22 +174,22 @@ export default {
// search: true, // search: true,
// }, // },
{ {
label: "使用人岗位", label: '使用人岗位',
prop: "userPosition", prop: 'userPosition',
type: "input", type: 'input',
labelWidth:'150', labelWidth: '150',
width:"120px", width: '130',
align:'center', align: 'center',
span:11, span: 11,
}, },
{ {
label: "是否收取押金", label: '是否收取押金',
prop: "isDeposit", prop: 'isDeposit',
type: "select", type: 'select',
labelWidth:'150', labelWidth: '150',
width:"150px", width: '130',
align:'center', align: 'center',
span:11, span: 11,
dicUrl: '/api/blade-system/dict-biz/dictionary?code=yes_no', dicUrl: '/api/blade-system/dict-biz/dictionary?code=yes_no',
props: { props: {
label: 'dictValue', label: 'dictValue',
@ -197,66 +197,66 @@ export default {
}, },
}, },
{ {
label: "押金金额(元)", label: '押金金额(元)',
prop: "deposit", prop: 'deposit',
type: "input", type: 'input',
labelWidth:'150', labelWidth: '150',
width:"120px", width: '130',
align:'center', align: 'center',
span:11, span: 11,
}, },
{ {
label: "采购公司", label: '采购公司',
prop: "purchasingCompany", prop: 'purchasingCompany',
type: "input", type: 'input',
labelWidth:'150', labelWidth: '150',
width:"100px", width: '130',
align:'center', align: 'center',
span:11, span: 11,
}, },
{ {
label: "购买时间", label: '购买时间',
prop: "buyingTime", prop: 'buyingTime',
type: "date", type: 'date',
format: "YYYY-MM-DD", format: 'YYYY-MM-DD',
valueFormat: "YYYY-MM-DD", valueFormat: 'YYYY-MM-DD',
labelWidth:'150', labelWidth: '150',
width:"120px", width: '130',
align:'center', align: 'center',
span:11, span: 11,
}, },
{ {
label: "保修截止时间", label: '保修截止时间',
prop: "warrantyPeriodEndTime", prop: 'warrantyPeriodEndTime',
type: "date", type: 'date',
format: "YYYY-MM-DD", format: 'YYYY-MM-DD',
valueFormat: "YYYY-MM-DD", valueFormat: 'YYYY-MM-DD',
labelWidth:'150', labelWidth: '150',
width:"120px", width: '130',
align:'center', align: 'center',
span:11, span: 11,
}, },
{ {
label: "备注", label: '备注',
prop: "notes", prop: 'notes',
type: "input", type: 'input',
labelWidth:'150', labelWidth: '150',
width:"100px", width: '130',
align:'center', align: 'center',
span:11, span: 11,
}, },
{ {
label: "图片", label: '图片',
prop: "photo", prop: 'photo',
type: "upload", type: 'upload',
dataType: 'string', dataType: 'string',
listType: 'picture-img', listType: 'picture-img',
// hide: true, // hide: true,
labelWidth:'150', labelWidth: '150',
span:11, span: 11,
multiple:false, multiple: false,
width:"200px", width: '200px',
align:'left', align: 'left',
action: '/blade-resource/oss/endpoint/put-file', action: '/blade-resource/oss/endpoint/put-file',
propsHttp: { propsHttp: {
res: 'data', res: 'data',
@ -264,49 +264,49 @@ export default {
}, },
}, },
{ {
label: "预留1", label: '预留1',
prop: "reserve1", prop: 'reserve1',
type: "input", type: 'input',
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: true,
}, },
{ {
label: "预留2", label: '预留2',
prop: "reserve2", prop: 'reserve2',
type: "input", type: 'input',
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: true,
}, },
{ {
label: "预留3", label: '预留3',
prop: "reserve3", prop: 'reserve3',
type: "input", type: 'input',
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: true,
}, },
{ {
label: "预留4", label: '预留4',
prop: "reserve4", prop: 'reserve4',
type: "input", type: 'input',
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: true,
}, },
{ {
label: "预留5", label: '预留5',
prop: "reserve5", prop: 'reserve5',
type: "input", type: 'input',
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
hide: true, hide: true,
}, },
] ],
} };

46
src/views/basic/forklift/basicForklift.vue
Unescape View File

@ -405,7 +405,7 @@ export default {
label: '事业线', label: '事业线',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -416,7 +416,7 @@ export default {
label: '使用单位', label: '使用单位',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -427,7 +427,7 @@ export default {
label: '受票主体', label: '受票主体',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -437,7 +437,7 @@ export default {
label: '供应商', label: '供应商',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -447,7 +447,7 @@ export default {
label: '资产类型', label: '资产类型',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -457,7 +457,7 @@ export default {
label: '类型', label: '类型',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -467,7 +467,7 @@ export default {
label: '摘要', label: '摘要',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -477,7 +477,7 @@ export default {
label: '载重(T)', label: '载重(T)',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -487,7 +487,7 @@ export default {
label: '载高(M)', label: '载高(M)',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -497,7 +497,7 @@ export default {
label: '整车尺寸', label: '整车尺寸',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -507,7 +507,7 @@ export default {
label: '货叉宽(M)', label: '货叉宽(M)',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -517,7 +517,7 @@ export default {
label: '货叉长(M)', label: '货叉长(M)',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -527,7 +527,7 @@ export default {
label: '最小转弯半径(M)', label: '最小转弯半径(M)',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '180',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -537,7 +537,7 @@ export default {
label: '通道宽(M)', label: '通道宽(M)',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -547,7 +547,7 @@ export default {
label: '月租(元/月)', label: '月租(元/月)',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -557,7 +557,7 @@ export default {
label: '数量(台)', label: '数量(台)',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -567,7 +567,7 @@ export default {
label: '合同编号', label: '合同编号',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -577,7 +577,7 @@ export default {
label: '起租期限', label: '起租期限',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -617,7 +617,7 @@ export default {
label: '押金(元)', label: '押金(元)',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -627,7 +627,7 @@ export default {
label: '付款方式', label: '付款方式',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -637,7 +637,7 @@ export default {
label: '备注', label: '备注',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -647,7 +647,7 @@ export default {
label: '所属仓库', label: '所属仓库',
type: 2, type: 2,
values: '', values: '',
width: '150', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true sortable: true
@ -657,7 +657,7 @@ export default {
label: '操作', label: '操作',
type: 6, type: 6,
values: '', values: '',
width: '150', width: '200',
checkarr: [], checkarr: [],
fixed: 'right', fixed: 'right',
sortable: false sortable: false

78
src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
Unescape View File

@ -14,7 +14,7 @@
<!-- 表单字段 --> <!-- 表单字段 -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="入库批次" prop="receiptBatch"> <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>
<el-form-item label="入库时间" prop="receiptDate"> <el-form-item label="入库时间" prop="receiptDate">
<!-- <el-input v-model="form.receiptDate" placeholder="请输入入库时间"/>--> <!-- <el-input v-model="form.receiptDate" placeholder="请输入入库时间"/>-->
@ -22,7 +22,7 @@
v-model="form.receiptDate" v-model="form.receiptDate"
placeholder="请选择入库时间" placeholder="请选择入库时间"
type="datetime" type="datetime"
clearable clearable
format="YYYY-MM-DD" format="YYYY-MM-DD"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
/> />
@ -39,7 +39,7 @@
remote-show-suffix remote-show-suffix
:remote-method="remoteMethod" :remote-method="remoteMethod"
:loading="loading" :loading="loading"
clearable clearable
@change="getMenDian($event, 1)" @change="getMenDian($event, 1)"
placeholder="请输入客户名称" placeholder="请输入客户名称"
> >
@ -64,7 +64,7 @@
:loading="loading" :loading="loading"
@change="getMenDian($event, 2)" @change="getMenDian($event, 2)"
placeholder="请输入客户编码" placeholder="请输入客户编码"
clearable clearable
> >
<el-option <el-option
v-for="item in optionCodes" v-for="item in optionCodes"
@ -82,7 +82,7 @@
v-model="form.storeId" v-model="form.storeId"
filterable filterable
allow-create allow-create
clearable clearable
default-first-option default-first-option
:reserve-keyword="false" :reserve-keyword="false"
@change="getMen($event, 1)" @change="getMen($event, 1)"
@ -100,12 +100,12 @@
<el-col :span="24"> <el-col :span="24">
<!-- <el-form-item label="物流单号" prop="trainNumber">--> <!-- <el-form-item label="物流单号" prop="trainNumber">-->
<el-form-item label="物流车次"> <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>
<!-- <el-form-item label="入库车牌" prop="licensePlate">--> <!-- <el-form-item label="入库车牌" prop="licensePlate">-->
<el-form-item label="入库车牌"> <el-form-item label="入库车牌">
<el-input v-model="form.licensePlate" clearable placeholder="请输入入库车牌" /> <el-input v-model="form.licensePlate" clearable placeholder="请输入入库车牌" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -256,28 +256,24 @@
v-if="!typeView || this.$route.query.type == '3'" v-if="!typeView || this.$route.query.type == '3'"
> >
<span class="dialog-footer"> <span class="dialog-footer">
<el-button
type="primary"
icon="el-icon-circle-check"
@click="handleSubmit"
:disabled="view && !this.$route.query.type == '3'"
v-if="this.$route.query.type"
>提 交1</el-button
>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-circle-check" icon="el-icon-circle-check"
@click="showCommitButton" @click="showCommitButton"
:disabled="view && !this.$route.query.type == '3'" :disabled="view && !this.$route.query.type == '3'"
v-if="!hideButton" v-else-if="!hideButton"
>提 交</el-button >提 交</el-button
> >
<span v-else> <span v-else-if="hideButton">
<!-- <el-button <el-button icon="el-icon-circle-check" @click="handleSubmit"> 预约入库 </el-button>
v-if="this.$route.query.type !== '3'"
icon="el-icon-circle-check"
@click="handleSubmit"
>
预约入库
</el-button> -->
<el-button
icon="el-icon-circle-check"
@click="handleSubmit"
>
预约入库
</el-button>
<el-button icon="el-icon-circle-check" @click="handleHirectStorage"> <el-button icon="el-icon-circle-check" @click="handleHirectStorage">
直接入库 直接入库
</el-button> </el-button>
@ -987,6 +983,8 @@ export default {
console.log('this.form111', this.form); console.log('this.form111', this.form);
if (this.data.length > 0) { if (this.data.length > 0) {
this.form.list = this.data; this.form.list = this.data;
// 预约入库类型为1
this.form.type = '1';
add(this.form).then(() => { add(this.form).then(() => {
this.box = false; this.box = false;
this.onLoad(this.page); this.onLoad(this.page);
@ -1013,6 +1011,7 @@ export default {
if (!!this.form.totalInput && parseInt(this.form.totalInput) == '-1') { if (!!this.form.totalInput && parseInt(this.form.totalInput) == '-1') {
this.form.totalInput = null; this.form.totalInput = null;
} }
this.form.type = '1';
this.form.list = this.data; this.form.list = this.data;
update(this.form).then(() => { update(this.form).then(() => {
this.box = false; this.box = false;
@ -1032,15 +1031,34 @@ export default {
}, },
// 直接入库 // 直接入库
handleHirectStorage() { handleHirectStorage() {
this.$message({ this.$refs.form.validate(valid => {
type: 'success', if (valid) {
message: '功能还在开发中', if (!this.form.id) {
console.log('this.form111', this.form);
if (this.data.length > 0) {
this.form.list = this.data;
// 直接入库类型为2
this.form.type = '2';
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
});
this.form = {};
this.data = [];
// 操作完成后关闭本页标签
this.$store.commit('DEL_TAG', this.$store.state.tags.tag);
// 操作完成后返回入库列表页面
this.$router.push('/warehouse/warehousingentry/warehouseWarehousingEntry');
} else {
this.$message.warning('请添加物资详情！！！');
}
}
}
}); });
// 操作完成后关闭本页标签
this.$store.commit('DEL_TAG', this.$store.state.tags.tag);
// 返回入库列表页面
this.$router.push('/warehouse/warehousingentry/warehouseWarehousingEntry');
}, },
handleAdd() { handleAdd() {
this.title = '新增'; this.title = '新增';

4
vite.config.js
Unescape View File

@ -13,10 +13,10 @@ export default ({ mode, command }) => {
proxy: { proxy: {
'/api': { '/api': {
// target: 'http://192.168.10.101:8888', // target: 'http://192.168.10.101:8888',
target: 'http://192.168.10.123:8889', // target: 'http://192.168.10.123:8889',
// target: 'http://192.168.10.48:8888', // target: 'http://192.168.10.48:8888',
// target: 'http://192.168.10.101:8888', // target: 'http://192.168.10.101:8888',
// target: 'http://192.168.10.75:8777', target: 'http://192.168.10.75:8777',
// target: 'http://test.api.huitongys.com', // target: 'http://test.api.huitongys.com',
// target: 'http://192.168.10.101:8888', // target: 'http://192.168.10.101:8888',
// target: 'http://192.168.10.29:13000', // target: 'http://192.168.10.29:13000',

Write Preview
Loading…
Cancel
Save