UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
prod
anthonywj 2 years ago
parent 664704f929 c23656bdd2
commit 4730aa3396
8 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File

15
src/views/basic/busType/bussinessType.vue
Unescape Escape View File

@ -366,8 +366,21 @@ export default {
this.$message.error('请选择预验收退库单据类型！') this.$message.error('请选择预验收退库单据类型！')
return return
} }
}
if (isBlank(this.inputQuery.sortNum)) {
this.$message.error("排序不能为空！");
return;
} else {
if (this.inputQuery.sortNum < 0) {
this.$message.error("排序不能小于0！");
return;
} else if (this.inputQuery.sortNum > 999) {
this.$message.error("排序不能大于999！");
return;
}
} }
// if (isBlank(this.inputQuery.busType)) { // if (isBlank(this.inputQuery.busType)) {
// this.$message.error("请选择特定页面！"); // this.$message.error("请选择特定页面！");
// return; // return;
@ -384,7 +397,7 @@ export default {
}) })
.catch(() => { .catch(() => {
this.loading = false this.loading = false
}) });
}, },
onModifySubmit() { onModifySubmit() {

2
src/views/basic/corpMaintain/corpMaintain.vue
Unescape Escape View File

@ -349,7 +349,7 @@ export default {
hideForm() { hideForm() {
// 更改值 // 更改值
this.formVisible = !this.formVisible; this.formVisible = !this.formVisible;
// this.getList(); this.getList();
return true; return true;
}, },
// 显示表单 // 显示表单

5
src/views/basic/locUdi/UdiInfoDb.vue
Unescape Escape View File

@ -67,7 +67,7 @@
<el-form-item label="规格型号:" class="query-form-item"> <el-form-item label="规格型号:" class="query-form-item">
<el-input <el-input
v-model="unionQuery.ggxh" clearable="true" v-model="unionQuery.ggxh" clearable="true"
:disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && unionQuery.ylqxzcrbarmc==null)" :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
placeholder="规格型号" placeholder="规格型号"
size="mini" size="mini"
></el-input> ></el-input>
@ -77,7 +77,7 @@
<el-form-item label="注册证/备案号:" class="query-form-item"> <el-form-item label="注册证/备案号:" class="query-form-item">
<el-input <el-input
v-model="unionQuery.zczbhhzbapzbh" clearable="true" v-model="unionQuery.zczbhhzbapzbh" clearable="true"
:disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && unionQuery.ylqxzcrbarmc==null)" :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
placeholder="注册证/备案号" placeholder="注册证/备案号"
size="mini" size="mini"
></el-input> ></el-input>
@ -254,6 +254,7 @@ export default {
zczbhhzbapzbh: "", zczbhhzbapzbh: "",
isCheck: 1 isCheck: 1
}; };
this.udidlList=[];
}, },
searchList() { searchList() {
this.unionQuery.page = 1; this.unionQuery.page = 1;

8
src/views/inout/codeRel/ioCodeRelEdit.vue
Unescape Escape View File

@ -4,18 +4,18 @@
<el-form :model="filterQuery" class="query-form" label-width="100px" > <el-form :model="filterQuery" class="query-form" label-width="100px" >
<el-row> <el-row>
<el-col :span="10"> <el-col :span="12">
<el-form-item label="上级产品"> <el-form-item label="上级产品">
<el-input v-model="filterQuery.upProduct " :disabled="isUp" style="width: 90%" placeholder="请输入多级产品" clearable></el-input> <el-input v-model="filterQuery.upProduct " :disabled="isUp" style="width: 80%" placeholder="请输入多级产品" clearable></el-input>
<el-button style="margin-left: 10px" :disabled="isUp" type="primary" @click="addUpProduct()">添加</el-button> <el-button style="margin-left: 10px" :disabled="isUp" type="primary" @click="addUpProduct()">添加</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="12">
<el-form-item label="下级产品"> <el-form-item label="下级产品">
<el-input v-model="filterQuery.lowProduct" style="width: 90%" placeholder="请输入下级产品" clearable></el-input> <el-input v-model="filterQuery.lowProduct" style="width: 80%" placeholder="请输入下级产品" clearable></el-input>
<el-button style="margin-left: 10px" :disabled="isLow" type="primary" @click="addLowProduct()">添加</el-button> <el-button style="margin-left: 10px" :disabled="isLow" type="primary" @click="addLowProduct()">添加</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>

15
src/views/inventory/InvSpaceManage.vue
Unescape Escape View File

@ -26,14 +26,13 @@
<!-- show-overflow-tooltip></el-table-column>--> <!-- show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="所属分库" prop="invSubStorageName"--> <!-- <el-table-column label="所属分库" prop="invSubStorageName"-->
<!-- show-overflow-tooltip width="150"></el-table-column>--> <!-- show-overflow-tooltip width="150"></el-table-column>-->
<!-- <el-table-column label="状态" prop="status"--> <el-table-column label="状态" prop="status" show-overflow-tooltip width="150">
<!-- show-overflow-tooltip width="150">--> <template slot-scope="scope">
<!-- <template slot-scope="scope">--> <el-tag>
<!-- <el-tag>--> {{ statusMap[scope.row.status] }}
<!-- {{ statusMap[scope.row.status] }}--> </el-tag>
<!-- </el-tag>--> </template>
<!-- </template>--> </el-table-column>
<!-- </el-table-column>-->
<el-table-column label="备注" prop="remark"></el-table-column> <el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">

16
src/views/inventory/InvStatistics.vue
Unescape Escape View File

@ -3,28 +3,28 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="产品标识DI:"> <el-form-item class="query-form-item" label="产品标识DI:">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="产品名称:"> <el-form-item class="query-form-item" label="产品名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称" <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="批次号:"> <el-form-item class="query-form-item" label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="批次号" <el-input v-model="filterQuery.batchNo" placeholder="批次号"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="供应商名称:"> <el-form-item class="query-form-item" label="供应商名称:">
<el-select <el-select
v-model="filterQuery.supId" v-model="filterQuery.supId"
@ -53,28 +53,28 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="规格型号:"> <el-form-item class="query-form-item" label="规格型号:">
<el-input v-model="filterQuery.ggxh" placeholder="规格型号" <el-input v-model="filterQuery.ggxh" placeholder="规格型号"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="批准文号:"> <el-form-item class="query-form-item" label="批准文号:">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号" <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="生产企业:"> <el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业" <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="所属仓库:"> <el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true" <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%" style="width: 90%"

2
src/views/inventory/supInoutSearchOrder.vue
Unescape Escape View File

@ -96,6 +96,7 @@
<el-table-column label="单据类型" prop="billTypeName" width="120"></el-table-column> <el-table-column label="单据类型" prop="billTypeName" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productDate" width="120" show-overflow-tooltip></el-table-column> <el-table-column label="生产日期" prop="productDate" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column> <el-table-column label="失效日期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="出入库时间" prop="auditTime" width="170" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufacturer" width="160" show-overflow-tooltip></el-table-column> <el-table-column label="生产企业" prop="manufacturer" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" prop="certCode" width="160" show-overflow-tooltip></el-table-column> <el-table-column label="注册/备案号" prop="certCode" width="160" show-overflow-tooltip></el-table-column>
</el-table> </el-table>
@ -191,6 +192,7 @@ export default {
startAduditTime: null, startAduditTime: null,
endAduditTime: null, endAduditTime: null,
}; };
this.actDateRange=[]
this.getList(); this.getList();
}, },

2
src/views/system/param/systemParamConfig.vue
Unescape Escape View File

@ -8,12 +8,12 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button icon="el-icon-refresh" type="primary" @click="onReset">重置</el-button>
<el-button type="primary" <el-button type="primary"
@click.native="search" @click.native="search"
icon="el-icon-search"> icon="el-icon-search">
搜索 搜索
</el-button> </el-button>
<el-button icon="el-icon-refresh" type="primary" @click="onReset">重置</el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-row> </el-row>

Write Preview
Loading…
Cancel
Save