分支合并后提交

feature-order-fix
anthonyywj2 3 years ago
commit 7601cb7d86

@ -477,7 +477,7 @@ export const asyncRouterMap = [
redirect: "/platformManage/platform", redirect: "/platformManage/platform",
icon: "", icon: "",
meta: { meta: {
authRule: [""] authRule: ["platformManage"]
}, },
children: [ children: [
{ {
@ -1060,7 +1060,7 @@ export const asyncRouterMap = [
component: stockOrderRecedLog, component: stockOrderRecedLog,
name: "单据接收日志", name: "单据接收日志",
meta: { meta: {
authRule: ["busOrderUpload/uploadLog"] authRule: ["busOrderUpload/RecedLog"]
} }
} }
@ -1446,6 +1446,55 @@ export const asyncRouterMap = [
authRule: ["invManage/invGoodsPlacement"] authRule: ["invManage/invGoodsPlacement"]
} }
}, },
{
path: "/invMaintenance",
component: Empty,
name: "库存养护",
icon: "",
meta: {
authRule: ["invMaintenance/manage"]
},
children: [
{
path: "/maintenanceOrder",
component: Empty,
name: "养护记录",
icon: "",
meta: {
authRule: ["invMaintenance/order"]
},
children: [
{
path: "maintenanceOrderNew",
component: invGoodsPlacement,
name: "新增养护记录",
icon: "",
meta: {
authRule: ["invMaintenance/orderNew"]
},
},
{
path: "maintenanceOrderAudit",
component: invGoodsPlacement,
name: "审核养护记录",
icon: "",
meta: {
authRule: ["invMaintenance/orderAudit"]
},
}
]
},
{
path: "maintenanceOrderCompleted",
component: invGoodsPlacement,
name: "养护记录查询",
icon: "",
meta: {
authRule: ["invMaintenance/orderCompleted"]
}
}
]
},
] ]
}, },
{ {

@ -1543,8 +1543,9 @@ export default {
var busQuery = { var busQuery = {
code: this.currentCode, code: this.currentCode,
page: 1, page: 1,
limit: 10000 limit: 50
} }
warehouseBussinessTypeList(busQuery).then((res) => { warehouseBussinessTypeList(busQuery).then((res) => {
this.userBussinessTypeList = res.data.list; this.userBussinessTypeList = res.data.list;
}).catch((error) => { }).catch((error) => {
@ -1592,9 +1593,10 @@ export default {
var busQuery = { var busQuery = {
code: this.currentCode, code: this.currentCode,
page: 1, page: 1,
limit: 100000 limit: 50
} }
warehouseBussinessTypeList(busQuery).then((res) => { warehouseBussinessTypeList(busQuery).then((res) => {
this.userBussinessTypeList = res.data.list || []; this.userBussinessTypeList = res.data.list || [];
}).catch((error) => { }).catch((error) => {
}); });

@ -1214,6 +1214,10 @@ export default {
// }); // });
// }, // },
getBusType() { getBusType() {
if( this.formData.id==null){
this.formData.billType=null;
}
let query = { let query = {
code: this.formData.invWarehouseCode, code: this.formData.invWarehouseCode,
enabled: true, enabled: true,
@ -1288,7 +1292,7 @@ export default {
this.formData.fromSubInvCode = ''; this.formData.fromSubInvCode = '';
} }
// ''; // '';
this.locInChange(); // this.locInChange();
this.findMethod(); this.findMethod();
}, },
locInChange() { locInChange() {
@ -1376,7 +1380,9 @@ export default {
// this.generateBillNo(); // this.generateBillNo();
} }
this.findMethod(); this.findMethod();
if(this.formData.invWarehouseCode!=null){
this.getBusType(); this.getBusType();
}
this.getStorage(); this.getStorage();
this.findSubInvByInv(); this.findSubInvByInv();
this.findSubStorageMethod(); this.findSubStorageMethod();

@ -76,7 +76,7 @@
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产企业" label="医疗器械注册人"
prop="ylqxzcrbarmc" prop="ylqxzcrbarmc"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -193,6 +193,7 @@ export default {
erpName: "", erpName: "",
keys: [], keys: [],
}, },
ids:[],
radioCheck: null, radioCheck: null,
dataList: [], dataList: [],
pageTotal: 1, pageTotal: 1,
@ -248,20 +249,12 @@ export default {
this.$router.push({ this.$router.push({
path: "", path: "",
}); });
this.listQuery = { this.listQuery.udiCode=null
unionCode: null, this.listQuery.unionCode=null
udiCode: null, this.listQuery.cpmctymc=null
ylqxzcrbarmc: "", this.listQuery.ggxh=null
cpmctymc: "", this.listQuery.ylqxzcrbarmc=null
thrPiId: null, this.listQuery.thrPiId=null
nameCode: "",
ggxh: null,
page: 1,
limit: 20,
addType: 1,
billType: this.data.formData.billType,
corpId: this.data.formData.corpId,
};
this.getList(); this.getList();
}, },
tableRowClassName({row}) { tableRowClassName({row}) {
@ -352,6 +345,15 @@ export default {
this.$message.error('未选择产品'); this.$message.error('未选择产品');
return; return;
} }
if(this.ids.length>0){
for(var i=0;i<this.ids.length;i++){
if(this.ids[i]==this.multipleSelection.rlId){
this.$message.error("该产品已录入!");
return
}
}
}
let str = this.multipleSelection.zczbhhzbapzbh; let str = this.multipleSelection.zczbhhzbapzbh;
if (str.search(",") != -1) { if (str.search(",") != -1) {
this.currentCert = null; this.currentCert = null;
@ -397,26 +399,34 @@ export default {
selectCert() { selectCert() {
if (this.currentCert == null) { if (this.currentCert == null) {
this.$message.error("请先选择对应的注册证!"); this.$message.error("请先选择对应的注册证!");
}else{
this.multipleSelection.zczbhhzbapzbh = this.currentCert;
this.combine();
} }
this.multipleSelection.zczbhhzbapzbh = this.currentCert;
this.combine();
}, },
}, },
components: {udiRlDetailDialog}, components: {udiRlDetailDialog},
created() { created() {
if (this.$isNotBlank(this.data)) { if (this.$isNotBlank(this.data)) {
this.listQuery.nameCode = this.data.udi; // this.listQuery.nameCode = this.data.udi;
if (this.data.billType != null) { // if (this.data.billType != null) {
this.listQuery.billType = this.data.billType; // this.listQuery.billType = this.data.billType;
} else // } else
this.listQuery.billType = this.data.formData.billType; // this.listQuery.billType = this.data.formData.billType;
if (this.data.formData != null) { // if (this.data.formData != null) {
this.listQuery.corpId = this.data.formData.corpId; // this.listQuery.corpId = this.data.formData.corpId;
// }
// this.orderEditor = this.data.orderEditor;
// this.orderId = this.data.orderId;
this.ids=[];
if(this.data.stockOrderLists.length>0){
for(var i=0;i<this.data.stockOrderLists.length;i++){
this.ids.push(this.data.stockOrderLists[i].productId);
}
} }
this.orderEditor = this.data.orderEditor;
this.orderId = this.data.orderId;
} }
this.getList(); this.getList();
}, },

@ -700,6 +700,7 @@ export default {
}); });
}, },
addCode(event) { addCode(event) {
this.originCode = ""; this.originCode = "";
this.sictomText = ""; this.sictomText = "";
this.formData.corpOrderId = this.formData.corpOrderId.trim(); this.formData.corpOrderId = this.formData.corpOrderId.trim();
@ -764,6 +765,7 @@ export default {
}, },
addCodeSubmit(tQuery) { addCodeSubmit(tQuery) {
addOrderWeb(tQuery).then((response) => { addOrderWeb(tQuery).then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.idQuery.id = response.data.orderId; this.idQuery.id = response.data.orderId;
@ -918,6 +920,7 @@ export default {
this.$router.go(-1); this.$router.go(-1);
}, },
getBusType() { getBusType() {
this.formData.billType=null;
let query = { let query = {
code: this.formData.invWarehouseCode, code: this.formData.invWarehouseCode,
enabled: true, enabled: true,
@ -927,7 +930,7 @@ export default {
} }
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
if (this.formData.action != null) { if (this.formData.action != null) {
this.curAction = this.getActionItem(this.formData.action); this.curAction = this.getActionItem(this.formData.action);
@ -965,6 +968,7 @@ export default {
} }
, ,
findMethod(query) { findMethod(query) {
this.fromOptions = []; this.fromOptions = [];
let cQuery = { let cQuery = {
key: query, key: query,
@ -976,7 +980,7 @@ export default {
this.formData.fromCorpId = this.curAction.defaultUnit; this.formData.fromCorpId = this.curAction.defaultUnit;
} else if (this.curAction.corpType == 2)// } else if (this.curAction.corpType == 2)//
{ {
cQuery.corpType = 4; cQuery.corpType = 1;
cQuery.outType = 2; cQuery.outType = 2;
} else if (this.curAction.corpType == 0) { } else if (this.curAction.corpType == 0) {
@ -986,6 +990,7 @@ export default {
getBasicUnitMaintains(cQuery) getBasicUnitMaintains(cQuery)
.then((response) => { .then((response) => {
debugger
this.loading = false; this.loading = false;
this.fromOptions = response.data.page.list || []; this.fromOptions = response.data.page.list || [];
if (this.curAction.corpType == 3) { if (this.curAction.corpType == 3) {
@ -1094,6 +1099,7 @@ export default {
} }
, ,
actionChange(item) { actionChange(item) {
this.curAction = this.getActionItem(item); this.curAction = this.getActionItem(item);
this.findMethod(); this.findMethod();
@ -1221,7 +1227,7 @@ export default {
this.formData.code = ''; this.formData.code = '';
this.formData.actDate = new Date(); this.formData.actDate = new Date();
this.codeArray = []; this.codeArray = [];
this.getBusType();
this.getStorage(this.formData.action); this.getStorage(this.formData.action);
if (this.$isNotBlank(this.idQuery.id)) { if (this.$isNotBlank(this.idQuery.id)) {
@ -1264,7 +1270,9 @@ export default {
} }
} }
this.findSubInvByInv(this.formData.locStorageCode); this.findSubInvByInv(this.formData.locStorageCode);
if(this.formData.invWarehouseCode!=null){
this.getBusType();
}
// //
selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => { selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {

@ -531,7 +531,8 @@ export default {
"6": "缺量补录单据", "6": "缺量补录单据",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10":"手动补单" "10":"手动补单",
"11": "仓库盘点"
}, },
busTypes: [], busTypes: [],
enableDept: false, enableDept: false,

@ -436,7 +436,8 @@ export default {
"6": "缺量补录单据", "6": "缺量补录单据",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10":"手动补单" "10":"手动补单",
"11": "仓库盘点"
}, },
exportQuery: { exportQuery: {
orderId: "", orderId: "",

@ -333,7 +333,8 @@ export default {
"6": "缺量补录单据", "6": "缺量补录单据",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单" "10": "手动补单",
"11": "仓库盘点"
}, },
storageList: [], storageList: [],
subInvList: [], subInvList: [],

@ -448,7 +448,8 @@ export default {
"6": "缺量补录单据", "6": "缺量补录单据",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单" "10": "手动补单",
"11": "仓库盘点"
}, },
// //
unitquery: {key: "", page: 1, limit: 20}, unitquery: {key: "", page: 1, limit: 20},

@ -351,7 +351,8 @@ export default {
"6": "缺量补录单据", "6": "缺量补录单据",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单" "10": "手动补单",
"11": "仓库盘点"
}, },
deleteData: { deleteData: {
id: "", id: "",

@ -185,8 +185,10 @@ export default {
getCodeList() { getCodeList() {
this.loading = true; this.loading = true;
this.query.orderIdFk = this.idQuery.orderIdFk; this.query.orderIdFk = this.idQuery.orderIdFk;
debugger
let query = { let query = {
orderIdFk: this.idQuery.orderIdFk orderIdFk: this.idQuery.orderIdFk,
code:this.query.code
} }
filterDetailProducts(query) // filterDetailProducts(query) //
.then((response) => { .then((response) => {

@ -22,6 +22,12 @@
width="500" width="500"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column
label="扫码数量"
prop="count"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
width="120" width="120"

@ -116,8 +116,7 @@
<el-card> <el-card>
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="盘点单号" prop="orderIdFk" width="180"></el-table-column> <el-table-column label="产品名称" prop="productName" width="220"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="180" <el-table-column label="批次号" prop="batchNo" width="180"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column> <el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column>
@ -142,14 +141,6 @@
>详情 >详情
</el-button </el-button
> >
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -400,6 +391,7 @@ export default {
this.codeQuery = { this.codeQuery = {
orderIdFk: row.orderIdFk, orderIdFk: row.orderIdFk,
productId: row.productId, productId: row.productId,
batchNo: row.batchNo,
edit: false edit: false
}; };
this.codesVisible = true; this.codesVisible = true;

@ -98,8 +98,7 @@
<el-card> <el-card>
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="盘点单号" prop="orderIdFk" width="180"></el-table-column> <el-table-column label="产品名称" prop="productName" width="220"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="180" <el-table-column label="批次号" prop="batchNo" width="180"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column> <el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column>
@ -371,6 +370,7 @@ export default {
this.codeQuery = { this.codeQuery = {
orderIdFk: row.orderIdFk, orderIdFk: row.orderIdFk,
productId: row.productId, productId: row.productId,
batchNo: row.batchNo,
edit: false edit: false
}; };
this.codesVisible = true; this.codesVisible = true;

@ -305,6 +305,18 @@ export default {
return; return;
} }
if (status === '2') { if (status === '2') {
if(this.formData.billDate=="" || this.formData.billDate==null){
return this.$message.error("单据日期不能为空!");
}
if(this.formData.locStorageCode=="" || this.formData.locStorageCode==null){
return this.$message.error("仓库不能为空!");
}
if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){
return this.$message.error("分库不能为空!");
}
for (let i = 0; i < this.codeArray.length; i++) { for (let i = 0; i < this.codeArray.length; i++) {
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
return this.$message.error('单据数量不能为0'); return this.$message.error('单据数量不能为0');

@ -247,7 +247,6 @@ export default {
listApplyDetail(query) // listApplyDetail(query) //
.then((response) => { .then((response) => {
this.detailList = response.data.list || []; this.detailList = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false; this.loading = false;
}) })
.catch(() => { .catch(() => {

@ -182,7 +182,7 @@
type='number' type='number'
@change="tableCountChange(scope.row)" @change="tableCountChange(scope.row)"
:disabled="scope.row.index !== selectedIndex" :disabled="scope.row.index !== selectedIndex"
oninput="value=value.replace(/[^\d]/g,'')"></el-input> oninput="value=value.replace(/[^d]/g,'')"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column--> <!-- <el-table-column-->

@ -245,7 +245,6 @@ export default {
listApplyDetail(query) // listApplyDetail(query) //
.then((response) => { .then((response) => {
this.detailList = response.data.list || []; this.detailList = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false; this.loading = false;
}) })
.catch(() => { .catch(() => {

@ -255,7 +255,6 @@ export default {
listApplyDetail(query) // listApplyDetail(query) //
.then((response) => { .then((response) => {
this.detailList = response.data.list || []; this.detailList = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false; this.loading = false;
}) })
.catch(() => { .catch(() => {

@ -255,7 +255,6 @@ export default {
listApplyDetail(query) // listApplyDetail(query) //
.then((response) => { .then((response) => {
this.detailList = response.data.list || []; this.detailList = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false; this.loading = false;
}) })
.catch(() => { .catch(() => {

@ -32,7 +32,7 @@
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="name"> <el-form-item prop="code">
<el-input v-model="formData.code" auto-complete="off" <el-input v-model="formData.code" auto-complete="off"
:disabled="formData.auditStatus == 1"></el-input> :disabled="formData.auditStatus == 1"></el-input>
</el-form-item> </el-form-item>
@ -206,7 +206,10 @@ export default {
}, },
formRules: { formRules: {
name: [ name: [
{required: true, message: "电子档名称", trigger: "blur"} {required: true, message: "请输入证书名称", trigger: "blur"}
],
code: [
{required: true, message: "请输入证书编号", trigger: "blur"}
], ],
}, },
loading: false, loading: false,
@ -268,6 +271,9 @@ export default {
onSubmit() { onSubmit() {
this.loading = true; this.loading = true;
this.formData.customerId = this.inputQuery.customerId; this.formData.customerId = this.inputQuery.customerId;
if(this.formData.customerId==null){
this.formData.customerId=store.getters.customerId
}
this.formData.type = this.addType; this.formData.type = this.addType;
//1:2.3. //1:2.3.
if (this.addType == 2) { if (this.addType == 2) {

@ -87,6 +87,7 @@
</el-table> </el-table>
<el-pagination <el-pagination
:page-size="filterQuery.limit" :page-size="filterQuery.limit"
:current-page.sync="filterQuery.page"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="total"
@ -187,6 +188,7 @@
</el-table> </el-table>
<el-pagination <el-pagination
:page-size="filterManufacturerQuery.limit" :page-size="filterManufacturerQuery.limit"
:current-page.sync="filterManufacturerQuery.page"
@current-change="handleManuChange" @current-change="handleManuChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="manufacturerTotal" :total="manufacturerTotal"
@ -292,6 +294,7 @@
</el-table> </el-table>
<el-pagination <el-pagination
:page-size="registrationQuery.limit" :page-size="registrationQuery.limit"
:current-page.sync="registrationQuery.page"
@current-change="certHandleCurrentChange" @current-change="certHandleCurrentChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="certTotal" :total="certTotal"
@ -553,7 +556,7 @@ export default {
.then((response) => { .then((response) => {
this.manufacturerLoading = false; this.manufacturerLoading = false;
this.manufacturerList = response.data.list || []; this.manufacturerList = response.data.list || [];
this.total = response.data.total || 0; this.manufacturerTotal = response.data.total || 0;
}) })
.catch(() => { .catch(() => {
this.manufacturerLoading = false; this.manufacturerLoading = false;
@ -575,10 +578,14 @@ export default {
this.addInfoVisible = true; this.addInfoVisible = true;
}, },
closeManufacturerDialog(type) { closeManufacturerDialog(type) {
if(type==true){
this.addInfoVisible = false; this.addInfoVisible = false;
this.enterpriseId = null; this.enterpriseId = null;
this.manufacturerList = []; this.manufacturerList = [];
this.getManufacturerList(); this.getManufacturerList();
}else{
this.getManufacturerList();
}
}, },
handleManuChange(val) { handleManuChange(val) {
@ -639,6 +646,7 @@ export default {
.then((response) => { .then((response) => {
this.registrationLoading = false; this.registrationLoading = false;
this.registrationList = response.data.list || []; this.registrationList = response.data.list || [];
this.certTotal= response.data.total
}) })
.catch(() => { .catch(() => {
this.registrationLoading = false; this.registrationLoading = false;
@ -647,7 +655,7 @@ export default {
}, },
certHandleCurrentChange(val) { certHandleCurrentChange(val) {
this.registrationQuery.page = val; this.registrationQuery.page = val;
this.registrationList(); this.getRegistrationList();
} }
}, },

@ -160,10 +160,10 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
:page-size="query.limit" :page-size="manufacturerQuery.limit"
@current-change="handleCurrentChange" @current-change="handleManufacturerChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="manufacturerTotal"
> >
</el-pagination> </el-pagination>
<el-dialog <el-dialog
@ -252,7 +252,7 @@
<div> <div>
<p class="form-title">产品资质设置</p> <p class="form-title">产品资质设置</p>
</div> </div>
<div style=" float: right; <div style="float:right;
text-align: right; text-align: right;
margin-bottom: 8px;" margin-bottom: 8px;"
> >
@ -305,10 +305,10 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
:page-size="query.limit" :page-size="productQuery.limit"
@current-change="handleCurrentChange" @current-change="handleProductChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="productTotal"
> >
</el-pagination> </el-pagination>
@ -354,7 +354,7 @@
<el-row> <el-row>
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span>产品类型</span> <span>器械类别</span>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -501,7 +501,7 @@ export default {
{required: true, message: "证书名称", trigger: "blur"} {required: true, message: "证书名称", trigger: "blur"}
], ],
need: [ need: [
{required: true, message: "请选择是否禁用", trigger: "blur"} {required: true, message: "请选择产地", trigger: "blur"}
], ],
}, },
@ -537,9 +537,7 @@ export default {
name: [ name: [
{required: true, message: "请输入证书名称", trigger: "blur"} {required: true, message: "请输入证书名称", trigger: "blur"}
], ],
need: [
{required: true, message: "请选择是否必传", trigger: "blur"}
],
}, },
/**--------产品资质设置--------------*/ /**--------产品资质设置--------------*/
@ -618,7 +616,11 @@ export default {
this.currentSup.type = 1; this.currentSup.type = 1;
addSupCertSet(this.currentSup) addSupCertSet(this.currentSup)
.then((response) => { .then((response) => {
this.getList(); if(response.code==20000){
this.getList();
}else{
this.$message.error(response.message);
}
}) })
.catch(() => { .catch(() => {
}); });
@ -628,6 +630,7 @@ export default {
this.getList(); this.getList();
this.$message.success("保存成功!"); this.$message.success("保存成功!");
} else { } else {
this.getList();
this.$message.error(res.message); this.$message.error(res.message);
} }
}) })
@ -638,6 +641,9 @@ export default {
}, },
cancelDialog() { cancelDialog() {
this.getList();
this.getManufacturerList();
this.getProductList();
this.addDialogVisible = false; this.addDialogVisible = false;
this.addManufacturerDialogVisible = false; this.addManufacturerDialogVisible = false;
this.addProductDialogVisible = false; this.addProductDialogVisible = false;
@ -645,6 +651,10 @@ export default {
/**--------生产企业资质设置--------------*/ /**--------生产企业资质设置--------------*/
handleManufacturerChange(val) {
this.manufacturerQuery.page = val;
this.getManufacturerList();
},
getManufacturerList() { getManufacturerList() {
this.manufacturerLoading = true; this.manufacturerLoading = true;
filterCertSet(this.manufacturerQuery) filterCertSet(this.manufacturerQuery)
@ -690,7 +700,12 @@ export default {
this.currentManufacturer.type = 2; this.currentManufacturer.type = 2;
addSupCertSet(this.currentManufacturer) addSupCertSet(this.currentManufacturer)
.then((response) => { .then((response) => {
this.getManufacturerList(); if(response.code==20000){
this.getManufacturerList();
}else{
this.$message.error(response.message);
}
}) })
.catch(() => { .catch(() => {
}); });
@ -700,6 +715,7 @@ export default {
this.getManufacturerList(); this.getManufacturerList();
this.$message.success("保存成功!"); this.$message.success("保存成功!");
} else { } else {
this.getManufacturerList();
this.$message.error(res.message); this.$message.error(res.message);
} }
}) })
@ -711,6 +727,10 @@ export default {
/**--------产品资质设置--------------*/ /**--------产品资质设置--------------*/
handleProductChange(val) {
this.productQuery.page = val;
this.getProductList();
},
getProductList() { getProductList() {
this.productLoading = true; this.productLoading = true;
filterCertSet(this.productQuery) filterCertSet(this.productQuery)
@ -757,7 +777,11 @@ export default {
this.currentProduct.type = 3; this.currentProduct.type = 3;
addSupCertSet(this.currentProduct) addSupCertSet(this.currentProduct)
.then((response) => { .then((response) => {
this.getProductList(); if(response.code==20000){
this.getProductList();
}else{
this.$message.error(response.message);
}
}) })
.catch(() => { .catch(() => {
}); });
@ -767,6 +791,7 @@ export default {
this.getProductList(); this.getProductList();
this.$message.success("保存成功!"); this.$message.success("保存成功!");
} else { } else {
this.getProductList();
this.$message.error(res.message); this.$message.error(res.message);
} }
}) })

@ -33,7 +33,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="产品类型" prop="cplx" v-if="certType == 3"> <el-table-column label="器械类别" prop="cplx" v-if="certType == 3">
</el-table-column> </el-table-column>
<el-table-column label="产品类别" prop="hchzsb" v-if="certType == 3"> <el-table-column label="产品类别" prop="hchzsb" v-if="certType == 3">
</el-table-column> </el-table-column>

@ -22,6 +22,7 @@
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option label="草稿" value="0"></el-option> <el-option label="草稿" value="0"></el-option>
<el-option label="未审核" value="6"></el-option> <el-option label="未审核" value="6"></el-option>
<el-option label="变更未审核" value="3"></el-option>
<el-option label="已审核" value="1"></el-option> <el-option label="已审核" value="1"></el-option>
<el-option label="已拒绝" value="2"></el-option> <el-option label="已拒绝" value="2"></el-option>
</el-select> </el-select>
@ -93,6 +94,7 @@
</el-table> </el-table>
<el-pagination <el-pagination
:page-size="filterQuery.limit" :page-size="filterQuery.limit"
:current-page.sync="filterQuery.page"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="total"
@ -195,6 +197,7 @@
</el-table> </el-table>
<el-pagination <el-pagination
:page-size="registrationQuery.limit" :page-size="registrationQuery.limit"
:current-page.sync="registrationQuery.page"
@current-change="certHandleCurrentChange" @current-change="certHandleCurrentChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="certTotal" :total="certTotal"
@ -353,6 +356,7 @@ export default {
this.registrationList = []; this.registrationList = [];
}, },
onSubmit() { onSubmit() {
this.filterQuery.page=1
this.getList(); this.getList();
this.registrationList = []; this.registrationList = [];
}, },
@ -470,6 +474,7 @@ export default {
this.$message.error("请先选中生产企业!"); this.$message.error("请先选中生产企业!");
return return
} }
this.registrationQuery.page=1;
this.getRegistrationList(); this.getRegistrationList();
}, },
registrationDialog(row) { registrationDialog(row) {
@ -481,13 +486,15 @@ export default {
if (this.$isNotBlank(row)) { if (this.$isNotBlank(row)) {
this.registrationId = row.id; this.registrationId = row.id;
this.curProductQuery = row; this.curProductQuery = row;
this.curProductQuery.cuStatus=this.currentManufacturer.auditStatus;
this.formName = "update"; this.formName = "update";
this.editProductType = 1; this.editProductType = 1;
} else { } else {
this.editProductType = 0; this.editProductType = 0;
this.formName = "add"; this.formName = "add";
this.curProductQuery = { this.curProductQuery = {
auditStatus: 0 auditStatus: 0,
cuStatus:this.currentManufacturer.auditStatus
}; };
} }
this.registrationVisible = true; this.registrationVisible = true;
@ -536,6 +543,7 @@ export default {
.then((response) => { .then((response) => {
this.registrationLoading = false; this.registrationLoading = false;
this.registrationList = response.data.list || []; this.registrationList = response.data.list || [];
this.certTotal = response.data.total;
}) })
.catch(() => { .catch(() => {
this.registrationLoading = false; this.registrationLoading = false;
@ -548,7 +556,7 @@ export default {
}, },
certHandleCurrentChange(val) { certHandleCurrentChange(val) {
this.registrationQuery.page = val; this.registrationQuery.page = val;
this.registrationList(); this.getRegistrationList();
} }
}, },

@ -505,10 +505,13 @@ export default {
this.certLoading = true; this.certLoading = true;
this.certQuery.customerId = this.inputQuery.customerId; this.certQuery.customerId = this.inputQuery.customerId;
this.certQuery.type = 1; this.certQuery.type = 1;
this.certQuery.auditStatus=25;
filterCompanyCert(this.certQuery) filterCompanyCert(this.certQuery)
.then((response) => { .then((response) => {
this.certLoading = false; this.certLoading = false;
this.certList = response.data.list || []; this.certList = response.data.list || [];
this.certTotal=response.data.total
}) })
.catch(() => { .catch(() => {
this.certLoading = false; this.certLoading = false;

@ -610,6 +610,7 @@ export default {
.then((response) => { .then((response) => {
this.certLoading = false; this.certLoading = false;
this.certList = response.data.list || []; this.certList = response.data.list || [];
this.certTotal=response.data.total;
}) })
.catch(() => { .catch(() => {
this.certLoading = false; this.certLoading = false;

@ -197,6 +197,11 @@
<el-table-column label="有效期" prop="vailDate"></el-table-column> <el-table-column label="有效期" prop="vailDate"></el-table-column>
<el-table-column label="失效期" prop="expireDate"></el-table-column> <el-table-column label="失效期" prop="expireDate"></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="证书状态" prop="status">
<template slot-scope="scope">
{{ supStatus[scope.row.status] }}
</template>
</el-table-column>
<el-table-column label="审核状态" prop="auditStatus" width="120"> <el-table-column label="审核状态" prop="auditStatus" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.auditStatus) | statusFilterType"> <el-tag :type="(scope.row.auditStatus) | statusFilterType">
@ -404,6 +409,10 @@ export default {
3: "变更未审核", 3: "变更未审核",
6: "未审核", 6: "未审核",
}, },
supStatus: {
0: "有效",
1: "失效",
},
certAuditVisible: false, certAuditVisible: false,
currentAudit: {}, currentAudit: {},
}; };
@ -418,7 +427,9 @@ export default {
this.selectedOptions = this.inputQuery.placeAreaCode.split(","); this.selectedOptions = this.inputQuery.placeAreaCode.split(",");
if(this.inputQuery.productionAreaCode!=null){
this.selectedOptions2 = this.inputQuery.productionAreaCode.split(","); this.selectedOptions2 = this.inputQuery.productionAreaCode.split(",");
}
this.getCompanyCertList(); this.getCompanyCertList();
this.findMethod(); this.findMethod();
@ -451,6 +462,7 @@ export default {
} }
}); });
}).catch(() => { }).catch(() => {
this.addCloseDialog(false);
}); });
}, },
@ -484,12 +496,16 @@ export default {
this.getCompanyCertList(); this.getCompanyCertList();
}, },
getCompanyCertList() { getCompanyCertList() {
if(this.editType!=2 && this.editType!=0){
this.certQuery.auditStatus = 20;
}
this.certLoading = true; this.certLoading = true;
this.certQuery.type = 2; this.certQuery.type = 2;
filterCompanyCert(this.certQuery) filterCompanyCert(this.certQuery)
.then((response) => { .then((response) => {
this.certLoading = false; this.certLoading = false;
this.certList = response.data.list || []; this.certList = response.data.list || [];
this.certTotal=response.data.total;
}) })
.catch(() => { .catch(() => {
this.certLoading = false; this.certLoading = false;

@ -521,7 +521,6 @@ export default {
.then((response) => { .then((response) => {
if(response.data.auditStatus!=1){ if(response.data.auditStatus!=1){
this.$message.error("本企业信息还未通过审核!"); this.$message.error("本企业信息还未通过审核!");
falg=false;
return; return;
}else{ }else{
this.addOrModifyCompany(type); this.addOrModifyCompany(type);
@ -562,6 +561,7 @@ export default {
.then((response) => { .then((response) => {
this.certLoading = false; this.certLoading = false;
this.certList = response.data.list || []; this.certList = response.data.list || [];
this.certTotal=response.data.total
}) })
.catch(() => { .catch(() => {
this.certLoading = false; this.certLoading = false;
@ -575,6 +575,7 @@ export default {
this.editTye = 2; this.editTye = 2;
} else { } else {
this.formName = 1; this.formName = 1;
this.inputQuery.formData = {};
this.editTye = 1; this.editTye = 1;
} }
this.addCertVisible = true; this.addCertVisible = true;

@ -211,6 +211,11 @@
<el-table-column label="有效期" prop="vailDate"></el-table-column> <el-table-column label="有效期" prop="vailDate"></el-table-column>
<el-table-column label="失效期" prop="expireDate"></el-table-column> <el-table-column label="失效期" prop="expireDate"></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="证书状态" prop="status">
<template slot-scope="scope">
{{ supStatus[scope.row.status] }}
</template>
</el-table-column>
<el-table-column label="审核状态" prop="auditStatus" width="120"> <el-table-column label="审核状态" prop="auditStatus" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.auditStatus) | statusFilterType"> <el-tag :type="(scope.row.auditStatus) | statusFilterType">
@ -423,7 +428,10 @@ export default {
3: "变更未审核", 3: "变更未审核",
6: "未审核", 6: "未审核",
}, },
supStatus: {
0: "有效",
1: "失效",
},
certAuditVisible: false, certAuditVisible: false,
currentAudit: {}, currentAudit: {},
}; };
@ -432,6 +440,9 @@ export default {
if (this.editType == 0) { if (this.editType == 0) {
this.inputQuery.productId = getUUID(""); this.inputQuery.productId = getUUID("");
} else { } else {
if(this.editType!=2 && this.editType!=0){
this.certQuery.auditStatus = 20;
}
this.getCompanyCertList(); this.getCompanyCertList();
this.pmQuery.customerId = this.inputQuery.customerId; this.pmQuery.customerId = this.inputQuery.customerId;
this.findPMMethod(); this.findPMMethod();
@ -578,6 +589,7 @@ export default {
.then((response) => { .then((response) => {
this.certLoading = false; this.certLoading = false;
this.certList = response.data.list || []; this.certList = response.data.list || [];
this.certTotal=response.data.total;
}) })
.catch(() => { .catch(() => {
this.certLoading = false; this.certLoading = false;

@ -425,6 +425,7 @@ export default {
}, },
loading: false, loading: false,
classesDisplay: false, classesDisplay: false,
cuStatus:0,
selectedOptions: [], selectedOptions: [],
selectedOptions2: [], selectedOptions2: [],
options: regionDataPlus, options: regionDataPlus,
@ -544,6 +545,7 @@ export default {
this.pmQuery.customerId = this.inputQuery.customerId; this.pmQuery.customerId = this.inputQuery.customerId;
} }
this.cuStatus=this.inputQuery.cuStatus;
this.manufacturerId = this.inputQuery.manufacturerIdFk this.manufacturerId = this.inputQuery.manufacturerIdFk
this.productId = this.inputQuery.productId this.productId = this.inputQuery.productId
this.findMethod(); this.findMethod();
@ -556,7 +558,12 @@ export default {
}, },
methods: { methods: {
onModifySubmit(val) { onModifySubmit(val) {
if(val!=0){
if(this.cuStatus!=1){
this.$message.error("生产企业未通过审核不能提交!");
return;
}
}
this.$refs['inputQuery'].validate(valid => { this.$refs['inputQuery'].validate(valid => {
if (valid) { if (valid) {
// this.inputQuery.auditStatus = val; // this.inputQuery.auditStatus = val;
@ -703,6 +710,10 @@ export default {
}).catch(() => { }).catch(() => {
}); });
}, },
certHandleCurrentChange(val) {
this.certQuery.page = val;
this.getCompanyCertList();
},
getCompanyCertList() { getCompanyCertList() {
this.certLoading = true; this.certLoading = true;
this.certQuery.customerId = this.inputQuery.customerId; this.certQuery.customerId = this.inputQuery.customerId;
@ -712,6 +723,7 @@ export default {
.then((response) => { .then((response) => {
this.certLoading = false; this.certLoading = false;
this.certList = response.data.list || []; this.certList = response.data.list || [];
this.certTotal=response.data.total
}) })
.catch(() => { .catch(() => {
this.certLoading = false; this.certLoading = false;

@ -476,11 +476,7 @@ export default {
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
return this.$message.error('单据数量不能为0'); return this.$message.error('单据数量不能为0');
} }
if (this.$isBlank(this.codeArray[i].batchNo)) {
return this.$message.error('批次号不能为空');
}
} }
} }
if (status === '0') { if (status === '0') {

Loading…
Cancel
Save