diff --git a/SC-web/src/views/scm/basicInformation/supplier/Detail.vue b/SC-web/src/views/scm/basicInformation/supplier/Detail.vue index 292e5e1c..0b8308eb 100644 --- a/SC-web/src/views/scm/basicInformation/supplier/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/supplier/Detail.vue @@ -6,13 +6,6 @@ @@ -97,17 +156,37 @@ dataForm: { id :'', supplierCode : '', + companyId : "", supplierName : '', - supplierSiteId : '', - supplierSiteCode : '', - companyId : [], - address : '', + country : "CHINA", + supply : '', + province : [], contactName : '', - contactPhone : '', supplierLevel : "1", - status : 1, + contactPhone : '', + enterprise : "0", + address : '', + classification : "0", + bank : '', + taxCode : "0", + vatRegistrationNum : '', + isPurchase : "0", + bankAccount : '', + isPayment : "0", + payable : '', + status : "1", + prepaid : '', + supplierSiteCode : '', + creatorTime : "", + lastModifyTime : "", }, supplierLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"},{"fullName":"四级","id":"4"}], + enterpriseOptions:[{"fullName":"民营","id":"0"},{"fullName":"私营","id":"1"}], + classificationOptions:[{"fullName":"国内","id":"0"},{"fullName":"国外","id":"1"}], + taxCodeOptions:[{"fullName":"13个点","id":"0"},{"fullName":"9个点","id":"1"},{"fullName":"6个点","id":"2"},{"fullName":"5个点","id":"3"}], + isPurchaseOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}], + isPaymentOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}], + statusOptions:[{"fullName":"启用","id":"1"},{"fullName":"停用","id":"2"}], } }, @@ -130,7 +209,7 @@ if(this.dataForm.id){ this.loading = true request({ - url: '/api/supplier/Supplier/detail/'+this.dataForm.id, + url: '/api/example/Supplier/detail/'+this.dataForm.id, method: 'get' }).then(res => { this.dataInfo(res.data) diff --git a/SC-web/src/views/scm/basicInformation/supplier/Form.vue b/SC-web/src/views/scm/basicInformation/supplier/Form.vue index 95925d7e..0666e829 100644 --- a/SC-web/src/views/scm/basicInformation/supplier/Form.vue +++ b/SC-web/src/views/scm/basicInformation/supplier/Form.vue @@ -6,13 +6,6 @@ @@ -127,15 +237,29 @@ isDetail: false, dataForm: { supplierCode : '', + companyId : "", supplierName : '', - supplierSiteId : '', - supplierSiteCode : '', - companyId : [], - address : '', + country : "CHINA", + supply : '', + province : [], contactName : '', - contactPhone : '', supplierLevel : "1", - status : 1, + contactPhone : '', + enterprise : "0", + address : '', + classification : "0", + bank : '', + taxCode : "0", + vatRegistrationNum : '', + isPurchase : "0", + bankAccount : '', + isPayment : "0", + payable : '', + status : "1", + prepaid : '', + supplierSiteCode : '', + creatorTime : "", + lastModifyTime : "", }, rules: { @@ -153,8 +277,21 @@ trigger: 'blur' }, ], + supply: [ + ], + contactPhone: [ + ], + bankAccount: [ + ], }, + companyIdcolumnOptions:[ {"label":"公司编码","value":"F_EnCode"}, {"label":"公司名称","value":"F_FullName"},], supplierLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"},{"fullName":"四级","id":"4"}], + enterpriseOptions:[{"fullName":"民营","id":"0"},{"fullName":"私营","id":"1"}], + classificationOptions:[{"fullName":"国内","id":"0"},{"fullName":"国外","id":"1"}], + taxCodeOptions:[{"fullName":"13个点","id":"0"},{"fullName":"9个点","id":"1"},{"fullName":"6个点","id":"2"},{"fullName":"5个点","id":"3"}], + isPurchaseOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}], + isPaymentOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}], + statusOptions:[{"fullName":"启用","id":"1"},{"fullName":"停用","id":"2"}], } }, @@ -184,7 +321,7 @@ if(this.dataForm.id){ this.loading = true request({ - url: '/api/supplier/Supplier/'+this.dataForm.id, + url: '/api/example/Supplier/'+this.dataForm.id, method: 'get' }).then(res => { this.dataInfo(res.data) @@ -208,7 +345,7 @@ var _data =this.dataList() if (!this.dataForm.id) { request({ - url: '/api/supplier/Supplier', + url: '/api/example/Supplier', method: 'post', data: _data }).then((res) => { @@ -224,7 +361,7 @@ }) }else{ request({ - url: '/api/supplier/Supplier/'+this.dataForm.id, + url: '/api/example/Supplier/'+this.dataForm.id, method: 'PUT', data: _data }).then((res) => { @@ -242,14 +379,12 @@ }, dataList(){ var _data = JSON.parse(JSON.stringify(this.dataForm)); - _data.companyId = JSON.stringify(_data.companyId) - _data.status = parseInt(_data.status) + _data.province = JSON.stringify(_data.province) return _data; }, dataInfo(dataAll){ let _dataAll =dataAll - _dataAll.companyId = JSON.parse( _dataAll.companyId) - _dataAll.status = parseInt( _dataAll.status) + _dataAll.province = JSON.parse( _dataAll.province) this.dataForm = _dataAll }, }, diff --git a/SC-web/src/views/scm/basicInformation/supplier/index.vue b/SC-web/src/views/scm/basicInformation/supplier/index.vue index 31c56887..ea4f6a93 100644 --- a/SC-web/src/views/scm/basicInformation/supplier/index.vue +++ b/SC-web/src/views/scm/basicInformation/supplier/index.vue @@ -14,10 +14,33 @@ + + + + + + 查询 重置 + + 展开 + + + 收起 + @@ -43,17 +66,17 @@ - - - - + + + - @@ -61,26 +84,66 @@ {{ scope.row.supplierLevel | dynamicText(supplierLevelOptions) }} + + + + - - - + + + + + + + + + + + + + + + + + + + + + + width="100" > @@ -105,10 +168,14 @@ width="150" > components: {JNPFForm, ExportBox,Detail}, data() { return { + showAll: false, detailVisible: false, query: { supplierCode:undefined, supplierName:undefined, + contactName:undefined, + contactPhone:undefined, + supplierSiteCode:undefined, }, treeProps: { children: 'children', @@ -122,24 +189,48 @@ width="150" > currentPage: 1, pageSize: 20, sort: "desc", - sidx: "supplierCode", + sidx: "creatorTime", }, formVisible: false, exportBoxVisible: false, columnList: [ {prop: 'supplierCode', label: '供应商编码'}, + {prop: 'companyId', label: '所属公司'}, {prop: 'supplierName', label: '供应商名称'}, - {prop: 'supplierSiteId', label: '供应商地点ID'}, - {prop: 'supplierSiteCode', label: '供应商地点名称'}, - {prop: 'companyId', label: '公司名称'}, + {prop: 'country', label: '国家'}, + {prop: 'supply', label: '供货指标'}, + {prop: 'province', label: '省'}, {prop: 'contactName', label: '联系人'}, - {prop: 'contactPhone', label: '联系电话'}, {prop: 'supplierLevel', label: '供应商等级'}, + {prop: 'contactPhone', label: '联系电话'}, + {prop: 'enterprise', label: '供应商性质'}, {prop: 'address', label: '地址'}, - {prop: 'status', label: '启用'}, + {prop: 'classification', label: '供应商类型'}, + {prop: 'bank', label: '开户行'}, + {prop: 'vatRegistrationNum', label: '纳税编号'}, + {prop: 'bankAccount', label: '银行账户'}, + {prop: 'taxCode', label: '默认税码'}, + {prop: 'payable', label: '应付科目'}, + {prop: 'isPurchase', label: '是否采购'}, + {prop: 'prepaid', label: '预付科目'}, + {prop: 'isPayment', label: '是否付款'}, + {prop: 'status', label: '是否启用'}, + {prop: 'supplierSiteCode', label: '供应商地点'}, ], supplierLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"},{"fullName":"四级","id":"4"}], supplierLevelProps:{"label":"fullName","value":"id"}, + enterpriseOptions:[{"fullName":"民营","id":"0"},{"fullName":"私营","id":"1"}], + enterpriseProps:{"label":"fullName","value":"id"}, + classificationOptions:[{"fullName":"国内","id":"0"},{"fullName":"国外","id":"1"}], + classificationProps:{"label":"fullName","value":"id"}, + taxCodeOptions:[{"fullName":"13个点","id":"0"},{"fullName":"9个点","id":"1"},{"fullName":"6个点","id":"2"},{"fullName":"5个点","id":"3"}], + taxCodeProps:{"label":"fullName","value":"id"}, + isPurchaseOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}], + isPurchaseProps:{"label":"fullName","value":"id"}, + isPaymentOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}], + isPaymentProps:{"label":"fullName","value":"id"}, + statusOptions:[{"fullName":"启用","id":"1"},{"fullName":"停用","id":"2"}], + statusProps:{"label":"fullName","value":"id"}, } }, computed: { @@ -170,7 +261,7 @@ width="150" > menuId:this.menuId }; request({ - url: `/api/supplier/Supplier/getList`, + url: `/api/example/Supplier/getList`, method: 'post', data: _query }).then(res => { @@ -190,7 +281,7 @@ width="150" > type: 'warning' }).then(() => { request({ - url: `/api/supplier/Supplier/${id}`, + url: `/api/example/Supplier/${id}`, method: 'DELETE' }).then(res => { this.$message({ @@ -222,7 +313,7 @@ width="150" > type: 'warning' }).then(() => { request({ - url: `/api/supplier/Supplier/batchRemove/${ids}`, + url: `/api/example/Supplier/batchRemove/${ids}`, method: 'DELETE' }).then(res => { this.$message({ @@ -251,7 +342,7 @@ width="150" > download(data) { let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} request({ - url: `/api/supplier/Supplier/Actions/Export`, + url: `/api/example/Supplier/Actions/Export`, method: 'GET', data: query }).then(res => { @@ -266,7 +357,7 @@ width="150" > currentPage: 1, pageSize: 20, sort: "desc", - sidx: "supplierCode", + sidx: "creatorTime", } this.initData() },