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

修改首营和供应商采购bug

Browse Source
tagView
zhengmingliang 2 years ago
parent 2f926c4167
commit 54de7f7e4f
10 changed files with 78 additions and 28 deletions
Show Stats Download Patch File Download Diff File

12
src/views/basic/basicCompany.vue
Unescape Escape View File

@ -504,8 +504,9 @@ export default {
},
onModifySubmit(val) {
var status= this.inputQuery.auditStatus;
if (this.editType == 0) { //新增保存
this.$refs["inputQuery"].validate(valid => {
if (valid) {
this.$confirm("是否确定提交保存?", "提示", {
@ -522,6 +523,7 @@ export default {
this.closeDialog();
} else {
this.$message.error(response.message);
this.inputQuery.auditStatus=status;
}
});
}).catch(() => {
@ -531,9 +533,14 @@ export default {
}
});
} else { //编辑保存
if(val!=0){
var str="企业信息已通过审核，是否确认重新提交审核？";
}else{
var str="是否确定提交保存？";
}
this.$refs["inputQuery"].validate(valid => {
if (valid) {
this.$confirm("企业信息已通过审核，是否确认重新提交审核？", "提示", {
this.$confirm(str, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
@ -547,6 +554,7 @@ export default {
this.closeDialog();
} else {
this.$message.error(response.message);
this.inputQuery.auditStatus=status;
}
});
}).catch(() => {

5
src/views/purchase/purApplyEditDiaolog.vue
Unescape Escape View File

@ -280,6 +280,7 @@ export default {
},
methods: {
saveOrder(status) {
debugger
this.$refs["dataForm"].validate(valid => {
if (valid) {
if (this.codeArray.length < 1) {
@ -287,7 +288,7 @@ export default {
return;
}
if (status === '2') {
if(this.formData.billDate==""){
if(this.formData.billDate=="" || this.formData.billDate==null){
return this.$message.error("单据日期不能为空！");
}
if(this.formData.locStorageCode=="" || this.formData.locStorageCode==null){
@ -348,7 +349,7 @@ export default {
this.thisData.stockOrderLists = this.codeArray;
},
closeDialogC2(rData) {
debugger
this.selectProductVisible = false;
this.thisData = {};
if (this.$isNotBlank(rData)) {

4
src/views/purchase/purPlanDetailDialog.vue
Unescape Escape View File

@ -114,7 +114,7 @@
</el-card>
<el-card>
<el-button-group style="display: flex">
<!-- <el-button-group style="display: flex">
<el-button
type="primary"
size="small"
@ -124,7 +124,7 @@
>产品录入
</el-button
>
</el-button-group>
</el-button-group> -->
<el-table v-loading="loading" :data="codeArray" style="width: 100%;"
:row-class-name="tableRowClassName"

3
src/views/purchase/purPlanEditDialog.vue
Unescape Escape View File

@ -304,6 +304,7 @@ export default {
},
methods: {
saveOrder(status) {
debugger
this.$refs["dataForm"].validate(valid => {
if (valid) {
if (this.codeArray.length < 1) {
@ -312,7 +313,7 @@ export default {
}
if (status === '2') {
if(this.formData.billDate==""){
if(this.formData.billDate=="" || this.formData.billDate==null){
return this.$message.error("单据日期不能为空！");
}
if(this.formData.billType=="" || this.formData.billType==null){

2
src/views/purchase/pureApplySearch.vue
Unescape Escape View File

@ -243,7 +243,7 @@ export default {
listApplyDetail(query) //查找该单号下的所有条码
.then((response) => {
this.detailList = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false;
})
.catch(() => {

7
src/views/purchase/supCertAddDialog.vue
Unescape Escape View File

@ -32,7 +32,7 @@
</div>
</el-col>
<el-col :span="8">
<el-form-item prop="name">
<el-form-item prop="code">
<el-input v-model="formData.code" auto-complete="off"
:disabled="formData.auditStatus == 1"></el-input>
</el-form-item>
@ -206,7 +206,10 @@ export default {
},
formRules: {
name: [
{required: true, message: "电子档名称", trigger: "blur"}
{required: true, message: "请输入证书名称", trigger: "blur"}
],
code: [
{required: true, message: "请输入证书编号", trigger: "blur"}
],
},
loading: false,

27
src/views/purchase/supCertSet.vue
Unescape Escape View File

@ -116,7 +116,7 @@
<div>
<p class="form-title">生产企业资质设置</p>
</div>
<div style=" float: right;
<div style="float: right;
text-align: right;
margin-bottom: 8px;"
>
@ -160,10 +160,10 @@
</el-table-column>
</el-table>
<el-pagination
:page-size="query.limit"
@current-change="handleCurrentChange"
:page-size="manufacturerQuery.limit"
@current-change="handleManufacturerChange"
layout="prev, pager, next"
:total="total"
:total="manufacturerTotal"
>
</el-pagination>
<el-dialog
@ -252,7 +252,7 @@
<div>
<p class="form-title">产品资质设置</p>
</div>
<div style=" float: right;
<div style="float: right;
text-align: right;
margin-bottom: 8px;"
>
@ -305,10 +305,10 @@
</el-table-column>
</el-table>
<el-pagination
:page-size="query.limit"
@current-change="handleCurrentChange"
:page-size="productQuery.limit"
@current-change="handleProductChange"
layout="prev, pager, next"
:total="total"
:total="productTotal"
>
</el-pagination>
@ -641,6 +641,9 @@ export default {
},
cancelDialog() {
this.getList();
this.getManufacturerList();
this.getProductList();
this.addDialogVisible = false;
this.addManufacturerDialogVisible = false;
this.addProductDialogVisible = false;
@ -648,6 +651,10 @@ export default {
/**--------生产企业资质设置--------------*/
handleManufacturerChange(val) {
this.manufacturerQuery.page = val;
this.getManufacturerList();
},
getManufacturerList() {
this.manufacturerLoading = true;
filterCertSet(this.manufacturerQuery)
@ -720,6 +727,10 @@ export default {
/**--------产品资质设置--------------*/
handleProductChange(val) {
this.productQuery.page = val;
this.getProductList();
},
getProductList() {
this.productLoading = true;
filterCertSet(this.productQuery)

4
src/views/purchase/supCertificationAdd.vue
Unescape Escape View File

@ -472,6 +472,10 @@ export default {
this.getRegistrationList();
},
onSubmit2() {
if(this.currentManufacturer==null){
this.$message.error("请先选中生产企业！");
return
}
this.getRegistrationList();
},
registrationDialog(row) {

1
src/views/purchase/supCompanyAduditDialog.vue
Unescape Escape View File

@ -505,6 +505,7 @@ export default {
this.certLoading = true;
this.certQuery.customerId = this.inputQuery.customerId;
this.certQuery.type = 1;
this.certQuery.auditStatus=20;
filterCompanyCert(this.certQuery)
.then((response) => {
this.certLoading = false;

41
src/views/warehouse/stockOrderNewSelectProduct.vue
Unescape Escape View File

@ -189,6 +189,7 @@ export default {
erpName: "",
keys: [],
},
ids:[],
radioCheck: null,
dataList: [],
pageTotal: 1,
@ -317,6 +318,16 @@ export default {
this.$message.error('未选择产品');
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;
if (str.search(",") != -1) {
this.currentCert = null;
@ -328,6 +339,7 @@ export default {
},
combine() {
let ids = [];
let data = {
relId: this.multipleSelection.rlId,
@ -362,26 +374,35 @@ export default {
selectCert() {
if (this.currentCert == null) {
this.$message.error("请先选择对应的注册证！");
}
}else{
this.multipleSelection.zczbhhzbapzbh = this.currentCert;
this.combine();
}
},
},
components: {udiRlDetailDialog},
created() {
if (this.$isNotBlank(this.data)) {
this.listQuery.nameCode = this.data.udi;
if (this.data.billType != null) {
this.listQuery.billType = this.data.billType;
} else
this.listQuery.billType = this.data.formData.billType;
// this.listQuery.nameCode = this.data.udi;
// if (this.data.billType != null) {
// this.listQuery.billType = this.data.billType;
// } else
// this.listQuery.billType = this.data.formData.billType;
if (this.data.formData != null) {
this.listQuery.corpId = this.data.formData.corpId;
// if (this.data.formData != null) {
// 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();
},

Write Preview
Loading…
Cancel
Save