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

申购新增备注字段搜索

Browse Source
master
anthonywj 2 years ago
parent 960f1585fb
commit cb60883b26
3 changed files with 55 additions and 20 deletions
Show Stats Download Patch File Download Diff File

6
src/views/purchase/purApply/purApplyEditDiaolog.vue
Unescape Escape View File

@ -97,7 +97,7 @@
<el-button-group style="display: flex"> <el-button-group style="display: flex">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px"> <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button> <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
<!-- <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入计划单</el-button>--> <!-- <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入计划单</el-button>-->
</el-button-group> </el-button-group>
</el-button-group> </el-button-group>
</el-row> </el-row>
@ -297,7 +297,7 @@ export default {
if (this.formData.arrivalTime == "" || this.formData.arrivalTime == null) { if (this.formData.arrivalTime == "" || this.formData.arrivalTime == null) {
return this.$message.error("到货时间不能为空！"); return this.$message.error("到货时间不能为空！");
} }
if (this.formData.arrivalTime<this.formData.createTime) { if (this.formData.arrivalTime < this.formData.createTime) {
return this.$message.error("到货时间不能比单据日期早！！！"); return this.$message.error("到货时间不能比单据日期早！！！");
} }
for (let i = 0; i < this.codeArray.length; i++) { for (let i = 0; i < this.codeArray.length; i++) {
@ -426,7 +426,7 @@ export default {
} }
}, },
deleteCodeArray(index, row) { deleteCodeArray(index, row) {
this.orderEditor=true; this.orderEditor = true;
this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", { this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",

59
src/views/purchase/purApply/purOrderSelectProduct.vue
Unescape Escape View File

@ -3,7 +3,7 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="listQuery" label-width="120px" v-show="showSearch"> <el-form :model="listQuery" label-width="120px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="15"> <el-col :span="18">
<el-form-item label="UDI码:" class="query-form-item"> <el-form-item label="UDI码:" class="query-form-item">
<el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true" <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
@keyup.enter.native="keyup_submit($event)"></el-input> @keyup.enter.native="keyup_submit($event)"></el-input>
@ -12,26 +12,26 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="物资简称:" class="query-form-item"> <el-form-item label="拼音简写:" class="query-form-item">
<el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 90%" placeholder="请输入物资拼音简写" <el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 100%" placeholder="请输入物资拼音简写"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="第三方物资编码:" class="query-form-item"> <el-form-item label="第三方物资编码:" class="query-form-item">
<el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="第三方物资编码" <el-input v-model="listQuery.thrPiId" style="width: 100%" placeholder="第三方物资编码"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="分类编码:" class="query-form-item"> <el-form-item label="分类编码:" class="query-form-item">
<el-input v-model="listQuery.flbm" style="width: 90%" placeholder="请输入分类编码" <el-input v-model="listQuery.flbm" style="width: 100%" placeholder="请输入分类编码"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="供应商:" class="query-form-item"> <el-form-item label="供应商:" class="query-form-item">
<el-input v-model="listQuery.companyName" style="width: 90%" placeholder="请输入供应商" <el-input v-model="listQuery.companyName" style="width: 100%" placeholder="请输入供应商"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -39,24 +39,39 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="物品编码:" class="query-form-item"> <el-form-item label="物品编码:" class="query-form-item">
<el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码" <el-input v-model="listQuery.unionCode" style="width: 100%" placeholder="请输入DI/医保编码/商品条码"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="产品通用名:" class="query-form-item"> <el-form-item label="产品通用名:" class="query-form-item">
<el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名" <el-input v-model="listQuery.cpmctymc" style="width: 100%" placeholder="请输入产品通用名"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="规格型号:" class="query-form-item"> <el-form-item label="规格型号:" class="query-form-item">
<el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input> <el-input v-model="listQuery.ggxh" style="width: 100%" placeholder="请输入规格型号" clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="生产企业:" class="query-form-item"> <el-form-item label="生产企业:" class="query-form-item">
<el-input v-model="listQuery.manufactory" style="width: 90%" placeholder="请输入生产企业/注册备案人" <el-input v-model="listQuery.manufactory" style="width: 100%" placeholder="请输入生产企业/注册备案人"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1+':'" class="query-form-item">
<el-input v-model="listQuery.basicPrductRemak1" style="width: 100%" :placeholder="productRemarkSet.remarkTitle1"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-if="productRemarkSet.remarkEnable2">
<el-form-item :label="productRemarkSet.remarkTitle2 +':'" class="query-form-item">
<el-input v-model="listQuery.basicPrductRemak2" style="width: 100%" :placeholder="productRemarkSet.remarkTitle2"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -109,7 +124,6 @@
></pagination> ></pagination>
</el-card> </el-card>
<el-dialog <el-dialog
title="耗材字典详情" title="耗材字典详情"
:visible.sync="udiRlDetailVisible" :visible.sync="udiRlDetailVisible"
@ -126,7 +140,10 @@
<el-form :model="form"> <el-form :model="form">
<el-form-item label="" prop="isGive"> <el-form-item label="" prop="isGive">
<el-radio-group v-model="currentCert"> <el-radio-group v-model="currentCert">
<el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio> <el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
item
}}
</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -144,6 +161,7 @@ import {filterCompanyProductplanRelevance, filterCompanyProductRelevance} from "
import {addApplyDetail, addApply} from "../../../api/purchase/purApply"; import {addApplyDetail, addApply} from "../../../api/purchase/purApply";
import store from "../../../store"; import store from "../../../store";
import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog"; import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
import {finProductSet} from "@/api/param/systemParamConfig";
export default { export default {
name: "stockOrderNewSelectProduct", name: "stockOrderNewSelectProduct",
@ -211,6 +229,7 @@ export default {
orderIdFk: "", orderIdFk: "",
supId: "", supId: "",
}, },
productRemarkSet: {},
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
{ {
@ -401,13 +420,19 @@ export default {
this.multipleSelection.zczbhhzbapzbh = this.currentCert; this.multipleSelection.zczbhhzbapzbh = this.currentCert;
this.combine(); this.combine();
} }
},
findBasicProductSet() {
finProductSet().then((response) => {
if (response.code == 20000) {
this.productRemarkSet = response.data;
}
});
}, },
}, },
components: {udiRlDetailDialog}, components: {udiRlDetailDialog},
created() { created() {
console.log(this.data) this.findBasicProductSet();
if (this.$isNotBlank(this.data)) { if (this.$isNotBlank(this.data)) {
this.ids = []; this.ids = [];
if (this.data.stockOrderLists.length > 0) { if (this.data.stockOrderLists.length > 0) {
@ -416,13 +441,17 @@ export default {
} }
} }
} }
}, },
}; };
</script> </script>
<style scoped> <style scoped>
.query-form-item {
display: block !important;
margin-right: 1px;
margin-bottom: 5px;
}
div /deep/ .el-table .warning-row { div /deep/ .el-table .warning-row {
background: #bebebe; background: #bebebe;

10
src/views/purchase/purOrder/purOrderSelectProduct.vue
Unescape Escape View File

@ -116,7 +116,10 @@
<el-form :model="form"> <el-form :model="form">
<el-form-item label="" prop="isGive"> <el-form-item label="" prop="isGive">
<el-radio-group v-model="currentCert"> <el-radio-group v-model="currentCert">
<el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio> <el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{
item
}}
</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -175,6 +178,9 @@ export default {
limit: 10, limit: 10,
zczbhhzbapzbh: null, zczbhhzbapzbh: null,
manufactory: null, manufactory: null,
basicPrductRemak1: null,
basicPrductRemak2: null,
}, },
combineQuery: { combineQuery: {
thirdId: "", thirdId: "",
@ -351,7 +357,7 @@ export default {
orderIdFk: this.pId, orderIdFk: this.pId,
supId: this.multipleSelection.customerId, supId: this.multipleSelection.customerId,
zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh, zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh,
price:this.multipleSelection.price price: this.multipleSelection.price
}; };
addOrderDetail(tQuery).then((response) => { addOrderDetail(tQuery).then((response) => {
this.loading = false; this.loading = false;

Write Preview
Loading…
Cancel
Save