diff --git a/package.json b/package.json index a0493bf..8b29152 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "author": "LionLi", "license": "MIT", "scripts": { - "dev": "vue-cli-service serve", - "build:prod": "vue-cli-service build --mode production", + "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --open", + "build:prod": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", "build:test": "vue-cli-service build --mode test", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src" diff --git a/src/api/collect/relCode.js b/src/api/collect/relCode.js new file mode 100644 index 0000000..bdc5d88 --- /dev/null +++ b/src/api/collect/relCode.js @@ -0,0 +1,63 @@ +import axios from '@/utils/request' + +export function getList(query) { + return axios({ + url: "/udiwms/relCode/batch/filter", + method: "get", + params: query + }); +} + +export function delRelCode(query) { + return axios({ + url: "/udiwms/relCode/batch/delete", + method: "get", + params: query + }); +} +export function deleteDetail(query) { + return axios({ + url: "/udiwms/relCode/batch/deleteDetail", + method: "get", + params: query + }); +} + +export function addRelCode(query) { + return axios({ + url: "/udiwms/relCode/batch/add", + method: "post", + data: query + }); +} +export function deleteAllDetail(query) { + return axios({ + url: "/udiwms/relCode/batch/deleteAllDetail", + method: "post", + data: query + }); +} +export function addRelCodeSpellBox(query) { + return axios({ + url: "/udiwms/relCode/batch/addRelCodeSpellBox", + method: "post", + data: query + }); +} + +export function getDetailList(query) { + return axios({ + url: "/udiwms/relCode/detail/filter", + method: "get", + params: query + }); +} + + +export function scanCodeRelCode(query) { + return axios({ + url: "/udiwms/relCode/detail/scanCode", + method: "post", + data: query + }); +} diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index e047b50..996c159 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -237,6 +237,15 @@ + + + + + + + + + diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue index 54cd212..9616184 100644 --- a/src/views/basic/product/productEdit.vue +++ b/src/views/basic/product/productEdit.vue @@ -402,6 +402,24 @@ + + + 是否需要收费 + + + + + + + + + + + 是否需要收费 + + + + 是否需要扫码 diff --git a/src/views/collect/relCode/operateRelCode.vue b/src/views/collect/relCode/operateRelCode.vue new file mode 100644 index 0000000..299d329 --- /dev/null +++ b/src/views/collect/relCode/operateRelCode.vue @@ -0,0 +1,896 @@ + + + + + + + diff --git a/src/views/collect/relCode/operateRelCodeSpell.vue b/src/views/collect/relCode/operateRelCodeSpell.vue new file mode 100644 index 0000000..38b92de --- /dev/null +++ b/src/views/collect/relCode/operateRelCodeSpell.vue @@ -0,0 +1,939 @@ + + + + + + + diff --git a/src/views/collect/relCode/relCode.vue b/src/views/collect/relCode/relCode.vue new file mode 100644 index 0000000..e7a45c5 --- /dev/null +++ b/src/views/collect/relCode/relCode.vue @@ -0,0 +1,382 @@ + + + + diff --git a/src/views/collect/relCode/sonRelCode.vue b/src/views/collect/relCode/sonRelCode.vue new file mode 100644 index 0000000..e740afe --- /dev/null +++ b/src/views/collect/relCode/sonRelCode.vue @@ -0,0 +1,781 @@ + + + + + + + diff --git a/src/views/collect/relCode/sonRelCodeSpell.vue b/src/views/collect/relCode/sonRelCodeSpell.vue new file mode 100644 index 0000000..4a791f8 --- /dev/null +++ b/src/views/collect/relCode/sonRelCodeSpell.vue @@ -0,0 +1,831 @@ + + + + + + + diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue index 2f37d0e..843c2dc 100644 --- a/src/views/supplier/company/basicCompanyproductEdit.vue +++ b/src/views/supplier/company/basicCompanyproductEdit.vue @@ -362,6 +362,18 @@ + + + + + + + + diff --git a/src/views/supplier/products/selectDIDetailDialog.vue b/src/views/supplier/products/selectDIDetailDialog.vue index ff6012e..10ec298 100644 --- a/src/views/supplier/products/selectDIDetailDialog.vue +++ b/src/views/supplier/products/selectDIDetailDialog.vue @@ -34,6 +34,14 @@ v-model="remark"> + + + + + + + + @@ -572,6 +580,7 @@ export default { status: val, uuid: this.editDate.uuid, customerId: this.editDate.customerId, + requireCost: this.editQuery.requireCost, remark: this.remark } updateDiProduct(query).then((res) => { diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue index 41bbeda..87f36b0 100644 --- a/src/views/supplier/products/supAddDiProductSelectUdi.vue +++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue @@ -517,6 +517,7 @@ export default { cpms: null, measname: null, sptm: null, + requireCost: null, uuids: null, devKeys: [], customerId: store.getters.customerId, diff --git a/src/views/supplier/products/supProductsDetail.vue b/src/views/supplier/products/supProductsDetail.vue index 688c8d6..5bd5a78 100644 --- a/src/views/supplier/products/supProductsDetail.vue +++ b/src/views/supplier/products/supProductsDetail.vue @@ -165,6 +165,15 @@ + + + + + + + + + { if (res.code === 20000) {