diff --git a/.env.production b/.env.production index e9a74d9..46a73b1 100644 --- a/.env.production +++ b/.env.production @@ -9,10 +9,10 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/' # 吴总测试服务器 -# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/' +VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/' # 平潭 -VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' # 文明点 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' diff --git a/src/assets/login.jpg b/src/assets/login.jpg index 3b6d3f1..0af0bea 100644 Binary files a/src/assets/login.jpg and b/src/assets/login.jpg differ diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue index 8438bff..0ebb7dc 100644 --- a/src/views/basic/busType/bussinessType.vue +++ b/src/views/basic/busType/bussinessType.vue @@ -227,7 +227,7 @@ export default { vailDispatch: null, vailGroupBuy: null, inStock: false, - actionType: 0, + actionType: 1, fillCodeRel: false, thrCheckEnable: null, @@ -240,9 +240,9 @@ export default { thrCheckChange: null, thrCheckBalance: null, thrCheckCopy: null, - checkVailDate:true, //校验近效期 - checkExpire:true, //校验过期 - checkCertExpire:true, //校验证书过期 + checkVailDate: false, //校验近效期 + checkExpire: true, //校验过期 + checkCertExpire: false, //校验证书过期 }, enableMap: { @@ -312,7 +312,7 @@ export default { onAddSubmit() { //默认初始化 - if(this.inputQuery.corpType == null){ + if (this.inputQuery.corpType == null) { this.inputQuery.corpType = 2; } if (isBlank(this.inputQuery.name)) { @@ -473,7 +473,7 @@ export default { vailDispatch: null, vailGroupBuy: null, inStock: false, - actionType: 0, + actionType: 1, fillCodeRel: false, thrCheckEnable: null, thrCheckWebNew: null, @@ -486,14 +486,15 @@ export default { thrCheckBalance: null, thrCheckCopy: null, - checkVailDate:true, //校验近效期 - checkExpire:true, //校验过期 - checkCertExpire:true, //校验证书过期 + checkVailDate: false, //校验近效期 + checkExpire: true, //校验过期 + checkCertExpire: false, //校验证书过期 } this.addDialogVisible = true; }, handleModifyClick(row) { + debugger this.inputQuery = row; this.modifyDialogVisible = true; }, diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 6a3babe..7576dae 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -62,23 +62,16 @@ - - - + + - - {{ item.name }} - + placeholder="请选择入库方式"> + + + @@ -95,21 +88,29 @@ - - - - + + - - - - + placeholder="单据类型" + > + + {{ item.name }} + + + @@ -301,7 +302,7 @@ - +
@@ -1179,10 +1180,9 @@ export default { }).catch(() => { }) - - if (this.inputQuery.mainAction != 'WareHouseIn') { - this.inputQuery.actionType = null - } + // if (this.inputQuery.mainAction != 'WareHouseIn') { + // this.inputQuery.actionType = null + // } }, // 单据类型高级设置弹窗 diff --git a/src/views/inout/IoDeliveryAuditOrder.vue b/src/views/inout/IoDeliveryAuditOrder.vue index 1c21842..44f0376 100644 --- a/src/views/inout/IoDeliveryAuditOrder.vue +++ b/src/views/inout/IoDeliveryAuditOrder.vue @@ -835,7 +835,7 @@ export default { this.loading = true; this.currentRow = {billNo: ""}; this.clearDetailList(); - this.filterQuery.vueType = "supDelivery"; + this.filterQuery.vueType = "supDelAudit"; getOrderList(this.filterQuery) .then((response) => { this.loading = false; diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue index f1b0b3e..724e30d 100644 --- a/src/views/myLogin.vue +++ b/src/views/myLogin.vue @@ -12,7 +12,7 @@ label-position="left" > -
+
element-logo

用户登录

@@ -326,7 +326,7 @@ $light_gray: #eee; .login-form { //@include fxied-center; - margin: 0px 100px auto auto; + margin: 0px 80px auto auto; width: 50em; /*background-color: silver;*/ /*background: #fff;*/ diff --git a/vue.config.js b/vue.config.js index 17b0105..04fab1f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -35,7 +35,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://192.168.0.166:9993/`, + target: `http://127.0.0.1:9993/`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''