diff --git a/.env.development b/.env.development index e29fc9f..ec3f881 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ VUE_APP_TITLE = 供应商自助管理平台 # 开发环境配置 ENV = 'development' -VUE_APP_BASE_API = 'http://127.0.0.1:9993' +VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/' diff --git a/.env.production b/.env.production index b6cdd40..8ffcfd6 100644 --- a/.env.production +++ b/.env.production @@ -7,7 +7,7 @@ ENV = 'production' #林纪裕 # VUE_APP_BASE_API = 'http://www.linjiyu.lol:82/UDI_SPMS_SERVER/' -VUE_APP_BASE_API = 'http://www.linjiyu.lol:84/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://www.linjiyu.lol:84/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_SPMS_SERVER/' @@ -23,6 +23,7 @@ VUE_APP_BASE_API = 'http://www.linjiyu.lol:84/UDI_SPMS_SERVER/' # 刘恩典 # VUE_APP_BASE_API = 'http://192.168.0.117:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_SPMS_SERVER/' # 漳州中医院 # VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/' @@ -32,8 +33,20 @@ VUE_APP_BASE_API = 'http://www.linjiyu.lol:84/UDI_SPMS_SERVER/' # 长泰医院 # VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://192.168.0.139:9150/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/' + +#诏安医院 +# VUE_APP_BASE_API = 'http://139.9.174.242:9150/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://192.168.0.17:9150/UDI_SPMS_SERVER/' +# 大田 +VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/' +# 云霄妇幼 +# VUE_APP_BASE_API = 'http://122.112.160.36:9160/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://192.168.0.72:9150/UDI_SPMS_SERVER/' # 应用访问路径 例如使用前缀 /admin/ diff --git a/src/views/basic/product/SelectDIDetailDialog.vue b/src/views/basic/product/SelectDIDetailDialog.vue index b23941c..4899f98 100644 --- a/src/views/basic/product/SelectDIDetailDialog.vue +++ b/src/views/basic/product/SelectDIDetailDialog.vue @@ -312,6 +312,15 @@ > + +
+
+ 产品货号或编号:  +
+ +
+ diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 21a18be..6db8862 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -997,7 +997,17 @@ - + + +
+
+ 产品货号或编号:  +
+ +
+ + + + + + +
+
+ 产品货号或编号:  +
+ +
+ diff --git a/src/views/biz/UdiTrace.vue b/src/views/biz/UdiTrace.vue index bd31ae2..23fe2c5 100644 --- a/src/views/biz/UdiTrace.vue +++ b/src/views/biz/UdiTrace.vue @@ -325,6 +325,15 @@ > + +
+
+ 产品货号或编号:  +
+ +
+ diff --git a/src/views/inout/DialogInvoice.vue b/src/views/inout/DialogInvoice.vue index 27cdbc9..c0a7762 100644 --- a/src/views/inout/DialogInvoice.vue +++ b/src/views/inout/DialogInvoice.vue @@ -164,18 +164,18 @@ export default { // machineNo: [ // {required: true, message: "请输入机器编码", trigger: "blur"} // ], - invoiceCode: [ - {required: true, message: "请输入发票代码", trigger: "blur"} - ], + // invoiceCode: [ + // {required: true, message: "请输入发票代码", trigger: "blur"} + // ], invoiceEncode: [ {required: true, message: "请输入发票编码", trigger: "blur"} ], price: [ {required: true, message: "请输入发票价格", trigger: "blur"} ], - remark: [ - {required: true, message: "请输入备注", trigger: "blur"} - ], + // remark: [ + // {required: true, message: "请输入备注", trigger: "blur"} + // ], }, loading: false, uploadUrl: "", @@ -196,10 +196,10 @@ export default { // this.$message.error("机器编码不能为空！"); // return; // } - if (this.$isBlank(this.inputQuery.invoiceCode)) { - this.$message.error("发票代码不能为空！"); - return; - } + // if (this.$isBlank(this.inputQuery.invoiceCode)) { + // this.$message.error("发票代码不能为空！"); + // return; + // } if (this.$isBlank(this.inputQuery.invoiceEncode)) { this.$message.error("发票编码不能为空！"); return; @@ -208,10 +208,10 @@ export default { this.$message.error("发票价格不能为空！"); return; } - if (this.$isBlank(this.inputQuery.remark)) { - this.$message.error("备注不能为空！"); - return; - } + // if (this.$isBlank(this.inputQuery.remark)) { + // this.$message.error("备注不能为空！"); + // return; + // } updateById(this.inputQuery).then((res) => { if (res.code == 20000) { this.$message({ diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue index 4411bd6..0b7e632 100644 --- a/src/views/inout/InvoiceRegByOrder.vue +++ b/src/views/inout/InvoiceRegByOrder.vue @@ -984,15 +984,19 @@ export default { }); }, getInvList() { - getInvListByUser() + let query = { + advanceType:1, + spUse:1 + } + getInvListByUser(query) .then((response) => { - let invlist1 = response.data || []; - for (var i = 0; i < invlist1.length; i++) { - if (invlist1[i].code == 1000000) { - this.invList.push(invlist1[i]); - this.filterQuery.invCode = invlist1[i].code; - } - } + this.invList = response.data || []; + // for (var i = 0; i < invlist1.length; i++) { + // if (invlist1[i].code == 1000000) { + // this.invList.push(invlist1[i]); + // this.filterQuery.invCode = invlist1[i].code; + // } + // } }) .catch(() => { diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue index b0c269e..0f9f992 100644 --- a/src/views/purchase/cert/supCertAudit.vue +++ b/src/views/purchase/cert/supCertAudit.vue @@ -133,9 +133,9 @@ - + + placeholder="请输入生产企业/代理人" clearable> @@ -159,7 +159,7 @@ - +