diff --git a/src/api/basic/busTypeChange.js b/src/api/basic/busTypeChange.js new file mode 100644 index 0000000..ef586b9 --- /dev/null +++ b/src/api/basic/busTypeChange.js @@ -0,0 +1,33 @@ +import axios from "../../utils/axios"; + +export function getBusChange(query) { + return axios({ + url: "/basic/bustype/change/filter", + method: "get", + params: query + }); +} + +export function updateBusChange(query) { + return axios({ + url: "/basic/bustype/change/update", + method: "post", + data: query + }); +} + +export function insertBusChange(query) { + return axios({ + url: "/basic/bustype/change/insert", + method: "post", + data: query + }); +} + +export function delBusChange(query) { + return axios({ + url: "/basic/bustype/change/delete", + method: "post", + data: query + }); +} diff --git a/src/api/inout/erpOrder.js b/src/api/inout/erpOrder.js index 4535a6b..6e47cff 100644 --- a/src/api/inout/erpOrder.js +++ b/src/api/inout/erpOrder.js @@ -116,3 +116,12 @@ export function addStockOrder(query) { params: query }); } + +export function addReceiveOrder(query) { + return axios({ + url: "/udiwms/receive/addStockOrder", + method: "get", + params: query + }); +} + diff --git a/src/api/inout/receiveOrder.js b/src/api/inout/receiveOrder.js new file mode 100644 index 0000000..c4460a8 --- /dev/null +++ b/src/api/inout/receiveOrder.js @@ -0,0 +1,13 @@ +import axios from "../../utils/axios"; + +//--------------获取领用单据------------------- +export function getReceiveOrder(query) { + return axios({ + url: "/udiwms/receive/order/filter", + method: "get", + params: query + }); +} + + + diff --git a/src/api/purchase/classifyCode.js b/src/api/purchase/classifyCode.js new file mode 100644 index 0000000..af5ff56 --- /dev/null +++ b/src/api/purchase/classifyCode.js @@ -0,0 +1,11 @@ +import axios from "../../utils/axios"; + +export function filterClassify(query) { + return axios( + { + url: "/spms/classify/code/filter", + method: "get", + params: query + } + ); +} diff --git a/src/api/purchase/purPlan.js b/src/api/purchase/purPlan.js index 1697c65..a6f21b6 100644 --- a/src/api/purchase/purPlan.js +++ b/src/api/purchase/purPlan.js @@ -1,6 +1,6 @@ import axios from "@/utils/axios"; -export function listApply(query) { +export function listPlan(query) { return axios({ url: '/purchase/plan/list', method: 'get', @@ -8,7 +8,7 @@ export function listApply(query) { }) } -export function auditListApply(query) { +export function auditListPlan(query) { return axios({ url: '/purchase/plan/auditList', method: 'get', diff --git a/src/api/purchase/suppliersRegistrationBasic.js b/src/api/purchase/suppliersRegistrationBasic.js index 8fc9538..38cf6b1 100644 --- a/src/api/purchase/suppliersRegistrationBasic.js +++ b/src/api/purchase/suppliersRegistrationBasic.js @@ -45,3 +45,11 @@ export function auditSupProduct(data) { }) } +export function bindProduct(data) { + return axios({ + url: '/sup/product/selectBind', + method: 'post', + data: data + }) +} + diff --git a/src/api/thrsys/thrOrderReceive.js b/src/api/thrsys/thrOrderReceive.js index ac7680f..df455c7 100644 --- a/src/api/thrsys/thrOrderReceive.js +++ b/src/api/thrsys/thrOrderReceive.js @@ -7,3 +7,12 @@ export function inserThrOrderWeb(query) { data: query }); } + +export function updateReceive(query) { + return axios({ + url: "/udiwms/receive/order/update", + method: "post", + data: query + }); +} + diff --git a/src/router/index.js b/src/router/index.js index c6992db..1c8803f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -28,6 +28,9 @@ import invWarehouse from "../views/basic/invWarehouse" import BussinessType from "../views/basic/BussinessType.vue"; import BussinessTypeLocl from "../views/basic/BussinessTypeLocl.vue"; import bussinessTypeThird from "../views/basic/BussinessTypeThird.vue"; +import bussinessTypeChange from "../views/basic/BusTypeChange.vue"; + + import basicUnitMaintain from "../views/basic/CorpMaintain.vue"; import corpImport from "../views/basic/CorpImport.vue"; import corpExport from "../views/basic/CorpExport.vue"; @@ -52,6 +55,7 @@ import supProductAudit from "../views/purchase/supProductAudit.vue"; import supProductSearch from "../views/purchase/supProductSearch.vue"; import supCertAudit from "../views/purchase/supCertAudit.vue"; import supCertSearch from "../views/purchase/supCertSearch.vue"; +import supCertificationAdd from "../views/purchase/supCertificationAdd.vue"; import UdiInfoSmpUpload from "../views/smp/UdiInfoSmpUpload.vue"; // import ErpOrderSmpUpload from "../views/smp/ErpOrderSmpUpload.vue"; @@ -147,7 +151,10 @@ import sysUdimsDownloadData from "../views/thrsys/SysUdimsDownloadData"; import purApply from "../views/purchase/purApply"; import pureApplyAudit from "../views/purchase/pureApplyAudit"; +import pureApplySearch from "../views/purchase/pureApplySearch"; import purPlan from "../views/purchase/purPlan"; +import purPlanAudit from "../views/purchase/purPlanAudit"; +import purPlanSearch from "../views/purchase/purPlanSearch"; // Vue.use(VueRouter); @@ -329,6 +336,15 @@ export const asyncRouterMap = [ authRule: ["system/BussinessTypeLocl"] } }, + { + path: "bussinessTypeChange", + name: "单据流转设置", + component: bussinessTypeChange, + meta: { + authRule: ["admin/bussinessTypeChange"] + } + }, + ] }, @@ -614,7 +630,7 @@ export const asyncRouterMap = [ children: [ { path: "supplierAdd", - name: "供应商资质新增", + name: "配送企业资质新增", component: supCompany, meta: { authRule: ["firstCamp/certAdd/supplierAdd"] @@ -623,6 +639,7 @@ export const asyncRouterMap = [ { path: "manufacturerAdd", name: "生产企业资质新增", + hidden: true, component: supManufacturer, meta: { authRule: ["firstCamp/certAdd/manufacturerAdd"] @@ -631,8 +648,8 @@ export const asyncRouterMap = [ { path: "productAdd", - name: "产品资质新增", - component: supProduct, + name: "配送产品资质新增", + component: supCertificationAdd, meta: { authRule: ["firstCamp/certAdd/productAdd"] } @@ -666,6 +683,7 @@ export const asyncRouterMap = [ path: "/supplierManage", redirect: "/supplierManage/supplierAdd", name: "供应商资质管理", + hidden: true, component: Empty, meta: { authRule: ["firstCamp/supplierManage"] @@ -704,6 +722,7 @@ export const asyncRouterMap = [ path: "/manufacturerManage", redirect: "/manufacturerManage/manufacturerAdd", name: "生产企业资质管理", + hidden: true, component: Empty, meta: { authRule: ["firstCamp/manufacturerManage"] @@ -742,6 +761,7 @@ export const asyncRouterMap = [ redirect: "/productManage/productAdd", name: "产品资质管理", component: Empty, + hidden: true, meta: { authRule: ["firstCamp/productManage"] }, @@ -1044,8 +1064,16 @@ export const asyncRouterMap = [ } }, { - path: "applySearch", + path: "applyAudit", component: pureApplyAudit, + name: "申购单据审核", + meta: { + authRule: ["purchase/apply/audit"] + } + }, + { + path: "applySearch", + component: pureApplySearch, name: "申购单据查询", meta: { authRule: ["purchase/apply/search"] @@ -1072,9 +1100,17 @@ export const asyncRouterMap = [ authRule: ["purchase/plan/planAdd"] } }, + { + path: "planAudit", + component: purPlanAudit, + name: "采购计划审核", + meta: { + authRule: ["purchase/plan/planAudit"] + } + }, { path: "planSearch", - component: purPlan, + component: purPlanSearch, name: "采购计划查询", meta: { authRule: ["purchase/plan/planSearch"] diff --git a/src/views/basic/BusTypeChange.vue b/src/views/basic/BusTypeChange.vue new file mode 100644 index 0000000..f3d96af --- /dev/null +++ b/src/views/basic/BusTypeChange.vue @@ -0,0 +1,289 @@ + + diff --git a/src/views/basic/BusTypeChangeModify.vue b/src/views/basic/BusTypeChangeModify.vue new file mode 100644 index 0000000..b44656c --- /dev/null +++ b/src/views/basic/BusTypeChangeModify.vue @@ -0,0 +1,220 @@ + + + + + diff --git a/src/views/business/selectThrOrder.vue b/src/views/business/selectThrOrderDialog.vue similarity index 92% rename from src/views/business/selectThrOrder.vue rename to src/views/business/selectThrOrderDialog.vue index c10eea9..d54141b 100644 --- a/src/views/business/selectThrOrder.vue +++ b/src/views/business/selectThrOrderDialog.vue @@ -1,8 +1,7 @@ diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue index ae579c1..4fd5264 100644 --- a/src/views/business/stockOrderEditor.vue +++ b/src/views/business/stockOrderEditor.vue @@ -501,7 +501,7 @@ import {BASE_URL} from "../../config/app"; import stockOrderDistribution from "./stockOrderDistribution"; import stockOrderEditDistribution from "./stockOrderEditDistribution"; import stockQRCodeExport from "./stockQRCodeExport"; -import selectThrOrder from "./selectThrOrder"; +import selectThrOrder from "./selectThrOrderDialog"; import draggable from "vuedraggable"; import codeDetail from "./errorCode"; import addOrder from "./addOrder"; diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue index 813d08e..c23e10d 100644 --- a/src/views/business/stockOrderNewSelectProduct.vue +++ b/src/views/business/stockOrderNewSelectProduct.vue @@ -39,7 +39,7 @@ 查询 - 确定 + 确定 @@ -54,9 +54,14 @@ @current-change="handleChange" ref="multipleTable" > - + + + + + + @@ -127,6 +132,21 @@ > + + + + + + {{ item }} + + + +
+ 确 定 + 取 消 +
+ + @@ -139,7 +159,7 @@ import store from "../../store"; import udiRlDetailDialog from "./../basic/UdiRlDetailDialog"; export default { - name: "closeDialog", + name: "stockOrderNewSelectProduct", props: { data: { type: Object, @@ -168,12 +188,13 @@ export default { erpName: "", keys: [], }, + radioCheck: null, dataList: [], - pageTotal: 0, + pageTotal: 1, + total: 1, currentRow: null, loading: false, udiRlDetailVisible: false, - multipleUdiSelection: [], thirdSys: [], thirdSysFk: null, busTypes: [], @@ -211,6 +232,10 @@ export default { }, orderEditor: false, orderId: "", + currentCert: null, + certList: [], + dialogFormVisible: false, + multipleSelection: null, }; }, methods: { @@ -227,7 +252,7 @@ export default { nameCode: "", ggxh: null, page: 1, - limit: 10, + limit: 20, addType: 1, billType: this.data.formData.billType, corpId: this.data.formData.corpId, @@ -246,7 +271,9 @@ export default { this.getList(); }, handleChange(val) { + this.radioCheck = val.id; this.currentRow = val; + this.multipleSelection = val }, handleDetailClick(row) { this.currentRow = row; @@ -313,41 +340,63 @@ export default { intentBack() { this.closeDialog(); }, - combine() { - let selection = this.$refs.multipleTable.selection; - if (selection.length < 1) { + + + confirmSelect() { + if (this.multipleSelection == null) { this.$message.error('未选择产品'); return; } - let ids = []; + let str = this.multipleSelection.zczbhhzbapzbh; + if (str.search(",") != -1) { + this.currentCert = null; + this.certList = str.split(','); + this.dialogFormVisible = true; + } else { + this.combine(); + } + }, - selection.forEach((obj, index) => { - let data = { - relId: obj.rlId, - } - ids.push(data); - }); + combine() { + let ids = []; + let data = { + relId: this.multipleSelection.rlId, + } + ids.push(data); this.loading = true; let tQuery = { datas: ids, stockOrderLists: this.data.stockOrderLists, + zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh }; getStockOrderDetailInstrumentById(tQuery).then((response) => { this.loading = false; if (response.code === 20000) { this.closeDialog(response.data); } else { - this.$message.error(response.message); + if (response.code == 601) { + this.$alert(response.message, "提示", { + confirmButtonText: "确定", + }); + } else + this.$message.error(response.message); } }).catch(() => { this.loading = false; }); }, - handleSelectionUdiChange(val) { - this.multipleUdiSelection = val; + + selectCert() { + if (this.currentCert == null) { + this.$message.error("请先选择对应的注册证！"); + } + this.multipleSelection.zczbhhzbapzbh = this.currentCert; + this.combine(); }, }, + components: {udiRlDetailDialog}, + created() { if (this.$isNotBlank(this.data)) { this.listQuery.nameCode = this.data.udi; @@ -355,13 +404,15 @@ export default { this.listQuery.billType = this.data.billType; } else this.listQuery.billType = this.data.formData.billType; - this.listQuery.corpId = this.data.formData.corpId; + + if (this.data.formData != null) { + this.listQuery.corpId = this.data.formData.corpId; + } this.orderEditor = this.data.orderEditor; this.orderId = this.data.orderId; - this.getList(); } + this.getList(); }, - components: {udiRlDetailDialog}, }; diff --git a/src/views/inout/selectReceiveOrderDialog.vue b/src/views/inout/selectReceiveOrderDialog.vue new file mode 100644 index 0000000..0d2459a --- /dev/null +++ b/src/views/inout/selectReceiveOrderDialog.vue @@ -0,0 +1,393 @@ + + + + + diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue index eee4f9f..912a487 100644 --- a/src/views/inventory/DialogInvProduct.vue +++ b/src/views/inventory/DialogInvProduct.vue @@ -96,7 +96,11 @@ export default { type: Function, required: true, }, - invQueryData:{ + invQueryData: { + type: Object, + required: true, + }, + type: { type: Object, required: true, } @@ -290,6 +294,7 @@ export default { let tQuery = { datas: ids, stockOrderLists: this.data.stockOrderLists, + type: this.type, }; getStockOrderDetailInstrumentById(tQuery).then((response) => { this.loading = false; diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue index c015a27..c8f40f5 100644 --- a/src/views/inventory/InvPreInProductsDetail.vue +++ b/src/views/inventory/InvPreInProductsDetail.vue @@ -184,11 +184,11 @@ export default { getCodeList() { this.loading = true; - this.query.productIdFk = this.idQuery.relIdFk; - this.query.batchNo = this.idQuery.batchNo; - this.query.supId = this.idQuery.supId; - this.query.invStorageCode = this.idQuery.invStorageCode; - filterDetailProducts(this.query) //查找该单号下的所有条码 + this.query.orderIdFk = this.idQuery.orderIdFk; + let query = { + orderIdFk: this.idQuery.orderIdFk + } + filterDetailProducts(query) //查找该单号下的所有条码 .then((response) => { this.loading = false; this.codeArry = response.data.list || []; diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue index b2afb0a..a9bbe73 100644 --- a/src/views/inventory/invPreInProducts.vue +++ b/src/views/inventory/invPreInProducts.vue @@ -86,14 +86,19 @@ + width="180"> + width="180"> + + + + + + diff --git a/src/views/purchase/purPlanDetailDialog.vue b/src/views/purchase/purPlanDetailDialog.vue new file mode 100644 index 0000000..5e9d7b3 --- /dev/null +++ b/src/views/purchase/purPlanDetailDialog.vue @@ -0,0 +1,504 @@ + + + + + + + diff --git a/src/views/purchase/purPlanEdit.vue b/src/views/purchase/purPlanEditDialog.vue similarity index 99% rename from src/views/purchase/purPlanEdit.vue rename to src/views/purchase/purPlanEditDialog.vue index b3a0276..de750cc 100644 --- a/src/views/purchase/purPlanEdit.vue +++ b/src/views/purchase/purPlanEditDialog.vue @@ -320,6 +320,7 @@ export default { }) }, selectProductFunction() { + this.thisData.stockOrderLists = this.codeArray; this.selectProductVisible = true; }, closeDialogC2(rData) { diff --git a/src/views/purchase/purPlanSearch.vue b/src/views/purchase/purPlanSearch.vue new file mode 100644 index 0000000..30a7322 --- /dev/null +++ b/src/views/purchase/purPlanSearch.vue @@ -0,0 +1,363 @@ + + + + diff --git a/src/views/purchase/pureApplyAudit.vue b/src/views/purchase/pureApplyAudit.vue index 04fc235..545edfa 100644 --- a/src/views/purchase/pureApplyAudit.vue +++ b/src/views/purchase/pureApplyAudit.vue @@ -74,9 +74,9 @@ >审核 - 删除 - + + + @@ -112,6 +112,7 @@ @@ -138,7 +139,7 @@ export default { formName: null, formMap: { add: "新增申购单据", - update: "编辑申购单据", + update: "审核申购单据", }, statusMap: { 1: "草稿", @@ -147,6 +148,7 @@ export default { 4: "已拒绝" }, idQuery: {}, + editType: 1, total: 0, thirdSys: [], thirdSysDetail: null, @@ -335,8 +337,9 @@ export default { filters: { statusFilterType(status) { const statusMap = { - 1: "warning", - 2: "success", + 2: "warning", + 3: "success", + 4: "danger", }; return statusMap[status]; } diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue index 9c2dbf7..4a6e369 100644 --- a/src/views/purchase/pureApplyDetailDialog.vue +++ b/src/views/purchase/pureApplyDetailDialog.vue @@ -1,191 +1,191 @@ diff --git a/src/views/purchase/pureApplySearch.vue b/src/views/purchase/pureApplySearch.vue new file mode 100644 index 0000000..0d13c15 --- /dev/null +++ b/src/views/purchase/pureApplySearch.vue @@ -0,0 +1,392 @@ + + + + diff --git a/src/views/purchase/supCertAddDialog.vue b/src/views/purchase/supCertAddDialog.vue index ed7a15c..edd6d57 100644 --- a/src/views/purchase/supCertAddDialog.vue +++ b/src/views/purchase/supCertAddDialog.vue @@ -20,7 +20,9 @@ - + @@ -31,7 +33,8 @@ - + @@ -48,6 +51,7 @@ @@ -66,6 +70,7 @@ @@ -74,9 +79,22 @@ + + +
+ 状态： +
+ + + + + + + + + -
备注： @@ -88,6 +106,19 @@ + + + + + + + + + + + + +
文件： @@ -96,6 +127,7 @@ - {{ choiceFile }} + + {{ choiceFile }} +
只能上传 .jpg,.png 文件，且不超过 2 MB
 @@ -123,19 +157,6 @@ - - - - - - - - - - - - -
@@ -147,6 +168,7 @@ import store from "../../store"; import {BASE_URL} from "../../config/app"; import {insertCompanyCert, updateCompanyCert} from "../../api/purchase/companyCert"; import ThrInvWarehouse from "@/views/thrsys/ThrInvWarehouse"; +import {removeRl} from "@/api/basic/udiRelevance"; export default { name: "supCompanyCertAdd", @@ -203,26 +225,46 @@ export default { this.$refs["dataForm"].validate(valid => { if (valid) { - if (this.$isNotBlank(this.formData.filePath)) { - if (this.$refs.upload.uploadFiles.length > 0) { - this.$refs.upload.submit(); - } else { - this.onSubmit(); - } + if (this.formData.auditStatus == 1) { + this.$confirm("该证书已审核通过，是否重新提交审核？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.onConfirmSubmit(1); + }) + .catch(() => { + }); } else { - if (this.$refs.upload.uploadFiles.length > 0) { - this.$refs.upload.submit(); - } else { - this.$message.warning(`请选择文件`); - } + this.onConfirmSubmit(); } - } }); }, + + onConfirmSubmit(val) { + this.formData.repeatUpload = val; + if (this.$isNotBlank(this.formData.filePath)) { + if (this.$refs.upload.uploadFiles.length > 0) { + this.$refs.upload.submit(); + } else { + this.onSubmit(); + } + + } else { + if (this.$refs.upload.uploadFiles.length > 0) { + this.$refs.upload.submit(); + } else { + this.$message.warning(`请选择文件`); + } + } + + }, + onSubmit() { this.loading = true; this.formData.customerId = this.inputQuery.customerId; @@ -234,8 +276,8 @@ export default { this.formData.manufacturerIdFk = this.inputQuery.manufacturerIdFk; this.formData.productIdFk = this.inputQuery.productId; } - - this.formData.auditStatus = "6"; + if (this.formData.auditStatus != 1) + this.formData.auditStatus = "6"; if (this.editTye == 1) { insertCompanyCert(this.formData).then(response => { diff --git a/src/views/purchase/supCertAudit.vue b/src/views/purchase/supCertAudit.vue index b616583..c1ffb94 100644 --- a/src/views/purchase/supCertAudit.vue +++ b/src/views/purchase/supCertAudit.vue @@ -349,7 +349,7 @@ export default { 0: "草稿", 1: "已通过", 2: "已拒绝", - 4: "变更未审核", + 3: "变更未审核", 6: "未审核", }, supCompanyVisible: false, diff --git a/src/views/purchase/supCertSearch.vue b/src/views/purchase/supCertSearch.vue index 9b52782..122e5e1 100644 --- a/src/views/purchase/supCertSearch.vue +++ b/src/views/purchase/supCertSearch.vue @@ -349,7 +349,7 @@ export default { 0: "草稿", 1: "已通过", 2: "已拒绝", - 4: "变更未审核", + 3: "变更未审核", 6: "未审核", }, supCompanyVisible: false, diff --git a/src/views/purchase/supCertSet.vue b/src/views/purchase/supCertSet.vue index e3d2534..b9c143c 100644 --- a/src/views/purchase/supCertSet.vue +++ b/src/views/purchase/supCertSet.vue @@ -57,8 +57,6 @@ - -
证书名称： @@ -77,7 +75,7 @@
- + @@ -132,17 +130,17 @@ - - - + + +