UDI
/
udiwms-vue-frame
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 28fd822925 29dc1ac139
commit 375acda365
6 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File

4
.env.production
Unescape Escape View File

@ -31,13 +31,13 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
# 平潭正式 # 平潭正式
# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# 吴总测试服务器 # 吴总测试服务器
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
# 漳州中医院 # 漳州中医院
VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
# 片仔癀诊断 # 片仔癀诊断
# VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'

1
src/api/inout/order.js
Unescape Escape View File

@ -48,6 +48,7 @@ export function submitBiz(query) {
data: query data: query
}); });
} }
export function delmitBiz(query) { export function delmitBiz(query) {
return axios({ return axios({
url: "/warehouse/inout/delmitBiz", url: "/warehouse/inout/delmitBiz",

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

@ -180,6 +180,9 @@ export default {
originCode: this.originCode, originCode: this.originCode,
code: this.udiCode.trim(), code: this.udiCode.trim(),
} }
if (tQuery.code.includes(tQuery.originCode.substr(0, tQuery.originCode.length - 1))) {
tQuery.originCode = "";
}
enterCodeWeb(tQuery).then((response) => { enterCodeWeb(tQuery).then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();

21
src/views/inout/DialogThrReviewOrder.vue
Unescape Escape View File

@ -108,14 +108,14 @@
</el-table-column> </el-table-column>
<el-table-column label="注册/备案号" width="150" prop="certCode"></el-table-column> <el-table-column label="注册/备案号" width="150" prop="certCode"></el-table-column>
<!-- <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">--> <!-- <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column label="销售发票号（第一票）" width="180" prop="firstSalesInvNo">--> <!-- <el-table-column label="销售发票号（第一票）" width="180" prop="firstSalesInvNo">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column label="销售发票号（第二票）" width="180" prop="secSalesInvNo">--> <!-- <el-table-column label="销售发票号（第二票）" width="180" prop="secSalesInvNo">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column label="发票日期" width="150" prop="invoiceDate">--> <!-- <el-table-column label="发票日期" width="150" prop="invoiceDate">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
</el-table> </el-table>
</el-card> </el-card>
</div> </div>
@ -189,6 +189,9 @@ export default {
originCode: this.originCode, originCode: this.originCode,
code: this.udiCode.trim(), code: this.udiCode.trim(),
} }
if (tQuery.code.includes(tQuery.originCode.substr(0,tQuery.originCode.length-1))) {
tQuery.originCode = "";
}
enterCodeWeb(tQuery).then((response) => { enterCodeWeb(tQuery).then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
@ -203,8 +206,6 @@ export default {
this.originCode = this.udiCode; this.originCode = this.udiCode;
} else if (response.code == 501) { } else if (response.code == 501) {
this.checkSuccess = false; this.checkSuccess = false;
// this.$refs.inputRef.focus();
// this.$refs.inputRef.select();
this.originCode = ""; this.originCode = "";
this.$message.error(response.message); this.$message.error(response.message);
} else if (response.code == 503) { } else if (response.code == 503) {

21
src/views/inout/InvoiceRegByFp.vue
Unescape Escape View File

@ -253,6 +253,11 @@
prop="count" prop="count"
width="100" width="100"
></el-table-column> ></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
width="100"
></el-table-column>
<el-table-column <el-table-column
label="价格" label="价格"
prop="price" prop="price"
@ -283,11 +288,7 @@
prop="certCode" prop="certCode"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
width="100"
></el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="productTotal>0" v-show="productTotal>0"
@ -311,6 +312,7 @@
<el-table-column label="规格型号" width="150" prop="spec"></el-table-column> <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="批次号" width="100" prop="batchNo"></el-table-column>
<el-table-column label="数量" prop="count" width="100"></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="price" width="100"></el-table-column>
<el-table-column label="金额" prop="amount" 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> <el-table-column label="生产日期" prop="productDate" width="100"></el-table-column>
@ -318,7 +320,7 @@
<el-table-column width="100" label="计量单位" prop="measname"></el-table-column> <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="生产企业" 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="注册/备案号" width="160" prop="certCode" show-overflow-tooltip></el-table-column>
<el-table-column label="扫码数量" prop="reCount" width="100"></el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="codeTotal>0" v-show="codeTotal>0"
@ -449,7 +451,7 @@ export default {
imgList: [], imgList: [],
imgViewerVisible: false, imgViewerVisible: false,
cowEn:null,
//单据相关参数 //单据相关参数
orderLoading: false, orderLoading: false,
orderList: [], orderList: [],
@ -686,6 +688,7 @@ export default {
// this.resultDetailList = []; // this.resultDetailList = [];
}, },
handleInvoiceChange(val) { handleInvoiceChange(val) {
this.cowEn=val;
this.getOrderList(val) this.getOrderList(val)
this.getProductDetailList(val) this.getProductDetailList(val)
}, },
@ -694,11 +697,11 @@ export default {
getProductDetailList(row) { getProductDetailList(row) {
this.productDetailLoading = true this.productDetailLoading = true
this.productDetailList = [] this.productDetailList = []
if (row == null || isBlank(row.invoiceEncode)) { if (this.cowEn == null || isBlank(this.cowEn.invoiceEncode)) {
this.$message.error('请选择对应发票！') this.$message.error('请选择对应发票！')
return return
} }
this.productQuery.invoiceEncode = row.invoiceEncode this.productQuery.invoiceEncode = this.cowEn.invoiceEncode
productDetail(this.productQuery).then((res) => { productDetail(this.productQuery).then((res) => {
this.productDetailLoading = false this.productDetailLoading = false
if (res.code === 20000) { if (res.code === 20000) {

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

@ -334,7 +334,7 @@ export default {
{ required: true, message: '请输入发票编码', trigger: 'blur' } { required: true, message: '请输入发票编码', trigger: 'blur' }
], ],
price: [{ required: true, message: '请输入发票价格', trigger: 'blur' }], price: [{ required: true, message: '请输入发票价格', trigger: 'blur' }],
invoiceDate: [{ required: true, message: '请输入备注', trigger: 'blur' }] invoiceDate: [{ required: true, message: '请选择开票日期', trigger: 'blur' }]
}, },
certFileUrl: '', certFileUrl: '',
Upinvoice: false, Upinvoice: false,

Write Preview
Loading…
Cancel
Save