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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
dev
薛宇 2 years ago
parent 087eaf70a6 ce325bc45c
commit c60e10aa41
5 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File

11
src/views/inout/InvoiceRegByOrder.vue
Unescape Escape View File

@ -263,6 +263,11 @@
prop="count"
width="100"
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
width="100"
></el-table-column>
<el-table-column
label="价格"
prop="price"
@ -298,11 +303,7 @@
prop="certCode"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
width="100"
></el-table-column>
<!--<el-table-column label="操作" width="160" fixed="right">-->
<!-- <template slot-scope="scope">-->

3
src/views/inout/InvoiceRegCkeck.vue
Unescape Escape View File

@ -196,6 +196,7 @@
<el-table-column label="规格型号" width="150" prop="spec"></el-table-column>
<el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
<el-table-column label="数量" prop="count" width="100"></el-table-column>
<el-table-column label="扫码数量" prop="reCount" width="100"></el-table-column>
<el-table-column label="价格" prop="price" width="100"></el-table-column>
<el-table-column label="金额" prop="amount" width="100"></el-table-column>
<el-table-column label="生产日期" prop="productDate" width="100"></el-table-column>
@ -203,7 +204,7 @@
<el-table-column width="100" label="计量单位" prop="measname"></el-table-column>
<el-table-column label="生产企业" prop="manufacturer" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" width="160" prop="certCode" show-overflow-tooltip></el-table-column>
<el-table-column label="扫码数量" prop="reCount" width="100"></el-table-column>
</el-table>
<pagination
v-show="codeTotal>0"

11
src/views/inout/InvoiceSelectRegByOrder.vue
Unescape Escape View File

@ -219,6 +219,11 @@
prop="count"
width="100"
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
width="100"
></el-table-column>
<el-table-column
label="价格"
prop="price"
@ -254,11 +259,7 @@
prop="certCode"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
width="100"
></el-table-column>
</el-table>
<pagination

8
src/views/purchase/product/supProductEditDialog.vue
Unescape Escape View File

@ -552,12 +552,7 @@ export default {
}
}
if(val==3){
this.$confirm( "已审核通过，是否需要重新提交变更", {
confirmButtonText: "确定",
type: "warning",
showCancelButton: false,
})
.then(() => {
this.$refs['inputQuery'].validate(valid => {
if (valid) {
// this.inputQuery.auditStatus = val;
@ -581,7 +576,6 @@ export default {
return false;
}
});
});
}else{
this.$refs['inputQuery'].validate(valid => {
if (valid) {

34
src/views/supplier/company/basicCompany.vue
Unescape Escape View File

@ -578,19 +578,29 @@ export default {
});
} else {
//编辑保存
if (val == 0) {
var str = "是否确定草稿保存？";
} else if (val == 1) {
var str = "是否确定提交审核？";
} else if (val == 2) {
var str = "企业信息已拒绝审核，是否确认重新提交审核？";
} else if (val == 3) {
var str = "企业信息更变未确认，是否确认重新提交审核？";
} else if (val == 0) {
var str = "企业信息未认证，是否确认提交审核？";
}else {
var str = "企业信息已通过审核，是否确认重新提交审核？";
if (val == 0 && this.inputQuery.auditStatus == 0 ) {
var str = "是否确定草稿保存？";
}else if(val == 3 && this.inputQuery.auditStatus == 0) {
var str = "是否确定提交审核？";
}else if(val == 3 && this.inputQuery.auditStatus == 2){
var str = "企业信息已拒绝审核，是否确认重新提交审核？";
}else if(val == 3 && this.inputQuery.auditStatus == 3){
var str = "企业信息更变未确认，是否确认重新提交审核？";
}else if(val ==6 && this.inputQuery.auditStatus == 1){
var str = "企业信息已通过审核，是否确认重新提交审核？";
}
// else if (val == 1) {
// var str = "是否确定提交审核？";
// } else if (val == 2) {
// var str = "企业信息已拒绝审核，是否确认重新提交审核？";
// } else if (val == 3) {
// var str = "企业信息更变未确认，是否确认重新提交审核？";
// } else if (val == 0) {
// var str = "企业信息未认证，是否确认提交审核？";
// }else {
// var str = "企业信息已通过审核，是否确认重新提交审核？";
// }
this.$refs["inputQuery"].validate((valid) => {
if (valid) {
this.$confirm(str, "提示", {

Write Preview
Loading…
Cancel
Save