diff --git a/.env.production b/.env.production index 0fe478f..6350e01 100644 --- a/.env.production +++ b/.env.production @@ -7,9 +7,9 @@ ENV = 'production' #林纪裕 # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/' -VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/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/' @@ -23,6 +23,9 @@ VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/' # 实施测试服务器 wqq # VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_SPMS_SERVER/' +# 平潭内网 +# VUE_APP_BASE_API = 'http://10.200.200.253:9160/UDI_SPMS_SERVER/' + # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/' diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue index 6cb3c76..268436e 100644 --- a/src/views/inout/IoSupSearchOrder.vue +++ b/src/views/inout/IoSupSearchOrder.vue @@ -3,7 +3,7 @@ - + --> - + - + - + + + + + + + {{ item.name }} + + + + +
@@ -158,7 +186,7 @@ import {getInvListByUser} from "@/api/system/invWarehouse"; import {getInvPreInProduct, deleteInvPreInProduct} from "@/api/inventory/invPreInSearch"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {isBlank} from "@/utils/strUtil"; -import invPreProductsDetail from "@/views/inventory/InvPreProductsDetail.vue"; +import invPreProductsDetail from "@/views/inventory/InvPreInProductsDetail.vue"; export default { name: "InvPreProducts", @@ -173,7 +201,7 @@ export default { supId: null, zczbhhzbapzbh: null, ylqxzcrbarmc: null, - invCode: this.$store.getters.locInvCode, + invCode: null, page: 1, limit: 10, }, @@ -217,9 +245,9 @@ export default { supId: null, zczbhhzbapzbh: null, ylqxzcrbarmc: null, - invCode: this.$store.getters.locInvCode, page: 1, limit: 10, + invCode: null, }; this.getList(); }, diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue index 65984a3..9d25ca0 100644 --- a/src/views/inventory/InvSupPreProducts.vue +++ b/src/views/inventory/InvSupPreProducts.vue @@ -73,6 +73,33 @@ + + + + + + {{ item.name }} + + + +
@@ -217,7 +244,7 @@ export default { supId: null, zczbhhzbapzbh: null, ylqxzcrbarmc: null, - invCode: this.$store.getters.locInvCode, + invCode: null, page: 1, limit: 10, }; @@ -246,7 +273,7 @@ export default { getList() { this.loading = true; - this.filterQuery.supId = this.$store.getters.customerId; + // this.filterQuery.supId = this.$store.getters.customerId; getInvPreProduct(this.filterQuery).then((res) => { this.loading = false; if (res.code === 20000) { diff --git a/src/views/inventory/InvSupProuducts.vue b/src/views/inventory/InvSupProuducts.vue index 9dd109a..70b6026 100644 --- a/src/views/inventory/InvSupProuducts.vue +++ b/src/views/inventory/InvSupProuducts.vue @@ -74,7 +74,7 @@ - + + value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择同步时间"> @@ -33,7 +33,7 @@ + v-if="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird"> 同步单据类型 同步基础信息 同步国家库DI数据 + v-if="configParms.dbDiProducts==2">同步国家库DI数据 @@ -79,12 +79,12 @@ diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue index a77ae0c..7cb543f 100644 --- a/src/views/system/dept/authDept.vue +++ b/src/views/system/dept/authDept.vue @@ -30,10 +30,11 @@ 重置重置 + 查询 + >查询 @@ -44,7 +45,7 @@ type="primary" icon="el-icon-sort" @click="toggleExpandAll" - >展开/折叠 + >展开/折叠 @@ -71,29 +72,29 @@ - + @@ -124,7 +125,7 @@ @@ -183,7 +184,7 @@ @@ -213,13 +214,13 @@ type="primary" icon="el-icon-refresh" @click="onUserReset" - >重置 + >重置 查询 + >查询 - + @@ -287,13 +288,13 @@ type="primary" icon="el-icon-refresh" @click="onInvReset" - >重置 + >重置 查询 + >查询 - + @@ -347,11 +348,11 @@ import { saveWarehouse, } from "@/api/system/invWarehouse"; -import { treeList, treeSelectedList } from "@/api/system/dataStatus"; +import {treeList, treeSelectedList} from "@/api/system/dataStatus"; import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; -import { listDeptUser, removeUser } from "@/api/system/deptUser"; -import { filterSubAll } from "@/api/system/invSubWarehouse"; +import {listDeptUser, removeUser} from "@/api/system/deptUser"; +import {filterSubAll} from "@/api/system/invSubWarehouse"; export default { data() { @@ -382,9 +383,9 @@ export default { deptOptions: [], rules: { name: [ - { required: true, message: "部门名称不能为空", trigger: "blur" }, + {required: true, message: "部门名称不能为空", trigger: "blur"}, ], - status: [{ required: true, message: "状态不能为空", trigger: "blur" }], + status: [{required: true, message: "状态不能为空", trigger: "blur"}], }, menuExpand: false, menuNodeAll: false, @@ -628,7 +629,8 @@ export default { } }); }) - .catch(() => {}); + .catch(() => { + }); }, toggleExpandAll() { this.refreshTable = false; @@ -666,7 +668,7 @@ export default { }); }, getDeptStatusMenuTreeselect(deptId) { - let query = { deptId: deptId }; + let query = {deptId: deptId}; return treeSelectedList(query).then((response) => { this.menuOptions = response.data.menus; return response; @@ -749,7 +751,8 @@ export default { } }); }) - .catch(() => {}); + .catch(() => { + }); }, //仓库相关 @@ -770,8 +773,9 @@ export default { this.getInvList(); }, }, - components: { Treeselect }, - mounted() {}, + components: {Treeselect}, + mounted() { + }, created() { this.getList(); }, diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index 6ad7fd8..186799f 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -432,8 +432,8 @@ export default { total: 0, advanceTypeTypeMap: { 1: "入账库", - 2: "寄售库", - 3: "预验收库", + 3: "寄售库", + 2: "预验收库", }, formMap: { add: "仓库信息-新增",