diff --git a/public/config.json b/public/config.json index d9c3d49..b0ef407 100644 --- a/public/config.json +++ b/public/config.json @@ -1,4 +1,4 @@ { - "BASE_URL": "http://127.0.0.1:9996", - "SERVER_IP": "http://127.0.0.1:9996" + "BASE_URL": "http://192.168.0.109:9996", + "SERVER_IP": "http://192.168.0.109:9996" } diff --git a/src/api/basic/basicUnitMaintain.js b/src/api/basic/basicUnitMaintain.js index 62ac2c8..0be069e 100644 --- a/src/api/basic/basicUnitMaintain.js +++ b/src/api/basic/basicUnitMaintain.js @@ -7,6 +7,15 @@ export function getBasicUnitMaintains(query) { params: query }); } +export function getCorpFilter(query) { + return axios({ + url: "/sale/info/company/product/corp/filter", + method: "get", + params: query + }); +} + + export function getBasicUnitMaintains2(query) { return axios({ diff --git a/src/api/basic/udiRelevance.js b/src/api/basic/udiRelevance.js index e43a741..a57d404 100644 --- a/src/api/basic/udiRelevance.js +++ b/src/api/basic/udiRelevance.js @@ -112,6 +112,14 @@ export function uploadSmp(query) { }); } +export function disableUdi(query) { + return axios({ + url: "/udi/udirel/disable", + method: "post", + data: query + }); +} + export function thirdSysDetail(query) { return axios({ url: "/udiwms/udirel/thirdSys/detail", diff --git a/src/api/warehouse/order.js b/src/api/warehouse/order.js index ca7de18..72afbc2 100644 --- a/src/api/warehouse/order.js +++ b/src/api/warehouse/order.js @@ -237,6 +237,15 @@ export function updateBindSup(query) { ) } +export function updateCodeBindSup(query) { + return axios( + { + url: "/udiwms/addCode/updateBindSup", + method: "post", + data: query + } + ) +} export function backStock(query) { return axios( diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index db74888..d847b65 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -120,7 +120,6 @@ - @@ -146,34 +145,30 @@
特殊单据往来: 
- - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + {{ item.name }} + + @@ -373,6 +368,7 @@ import { } from "../../api/basic/busLocalType"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; import {getCandidateBussinessType} from "../../api/receipts/bussinessType"; +import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; export default { name: "inputQuery", @@ -392,6 +388,7 @@ export default { }, storageList: [], orderTypeList: [], + fromSpecialOptions: [], thirdSys: [], localTypes: [], options: [{ @@ -404,6 +401,9 @@ export default { { value: '2', label: '客户信息' + }, { + value: '3', + label: '特殊往来' }], twoCheck: false, @@ -440,6 +440,16 @@ export default { .catch(() => { }); }, + findSpecialMethod() { + let query = { + corpType: 4, + }; + getBasicUnitMaintains(query).then((response) => { + this.fromSpecialOptions = response.data.page.list || []; + }).catch(() => { + + }) + }, oneCheck(type) { console.log(type); if (!type) { @@ -490,6 +500,7 @@ export default { } this.getList(); this.getStorage(); + this.findSpecialMethod(); }, }; diff --git a/src/views/basic/CorpMaintain.vue b/src/views/basic/CorpMaintain.vue index b74880f..0deb45c 100644 --- a/src/views/basic/CorpMaintain.vue +++ b/src/views/basic/CorpMaintain.vue @@ -7,8 +7,10 @@ + + @@ -267,10 +269,17 @@ 往来单位类型:  + + - - - + + + + @@ -347,6 +356,21 @@ export default { 0: "选入往来单位信息", 1: "关联往来单位信息", }, + + corpTypeList: [ + { + value: 1, + label: "客户" + }, + { + value: 2, + label: "供应商" + }, + { + value: 4, + label: "特殊往来" + } + ], formRules: { // name: [ // {required: true, message: "请输入名称", trigger: "blur"} diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index 4a6a2d9..c556f0f 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -683,6 +683,7 @@ 是否禁用 @@ -769,7 +770,7 @@ import { updateErpProduct, uploadSmp, thirdSysDetail, - removeRl, sysFilter, spcombie, lockStatus, removeDiRl + removeRl, sysFilter, spcombie, lockStatus, removeDiRl, disableUdi } from "../../api/basic/udiRelevance"; import {selectSysParamByKey} from "../../api/param/systemParamConfig"; import {filterByUuid} from "../../api/basic/udiInfo"; @@ -871,6 +872,23 @@ export default { this.total = 0; }); }, + diableChange() { + let query = { + relId: this.editQuery.id + } + disableUdi(query) + .then((response) => { + if (response.code != 20000) { + this.editQuery.isDisable = false; + this.$message.error(response.message); + } + + }) + .catch(() => { + this.loading = false; + this.detailList = []; + }); + }, keyup_submit(event) { this.filterQuery.page = 1; this.getList(); diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 355b610..4ae148c 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -64,15 +64,18 @@