diff --git a/vue/src/router/modules/basedata.js b/vue/src/router/modules/basedata.js index 7937c43f..ac1945e3 100644 --- a/vue/src/router/modules/basedata.js +++ b/vue/src/router/modules/basedata.js @@ -13,6 +13,7 @@ const basedataRouter = { index: 0, type: 'crm', icon: '基础数据', + roles: ['SettleAccount.CentralizedControls', 'SettleAccount.CodeSettings', 'SettleAccount.PriceLists', 'SettleAccount.Materials'], keepAlive: false, }, children: [ @@ -59,26 +60,26 @@ const basedataRouter = { icon: '结算' } }, - // { - // path: 'wms-kanban', - // component: () => import('@/views/ux/vw/dataInput/wmsKanban'), - // name: 'WMSVWKanBan', - // meta: { - // title: '大众看板发货明细', - // roles: ['SettleAccount.Reports'], - // icon: '供货' - // } - // }, - // { - // path: 'wms-sparepart', - // component: () => import('@/views/ux/vw/dataInput/wmsSparePart'), - // name: 'WMSSparePart',//命名路由 - // meta: { - // title: '大众备件发货明细', - // roles: ['SettleAccount.Reports'], - // icon: '客户零件' - // } - // } + // { + // path: 'wms-kanban', + // component: () => import('@/views/ux/vw/dataInput/wmsKanban'), + // name: 'WMSVWKanBan', + // meta: { + // title: '大众看板发货明细', + // roles: ['SettleAccount.Reports'], + // icon: '供货' + // } + // }, + // { + // path: 'wms-sparepart', + // component: () => import('@/views/ux/vw/dataInput/wmsSparePart'), + // name: 'WMSSparePart',//命名路由 + // meta: { + // title: '大众备件发货明细', + // roles: ['SettleAccount.Reports'], + // icon: '客户零件' + // } + // } ] } diff --git a/vue/src/router/modules/wms_out_order.js b/vue/src/router/modules/wms_out_order.js index 39f20df2..f0dea4ce 100644 --- a/vue/src/router/modules/wms_out_order.js +++ b/vue/src/router/modules/wms_out_order.js @@ -53,7 +53,7 @@ const vwsOutOrderDataRouter = { component: () => import('@/views/ux/billManage/WMSOutputDetailDiffReport'), name: 'WMSOutputDetailDiffReport',//命名路由 meta: { - title: '结算单出库接口', + title: '出库差异清单', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '零件' } diff --git a/vue/src/views/ux/basedata/codeSetting/index.vue b/vue/src/views/ux/basedata/codeSetting/index.vue index 01479723..d765b263 100644 --- a/vue/src/views/ux/basedata/codeSetting/index.vue +++ b/vue/src/views/ux/basedata/codeSetting/index.vue @@ -7,6 +7,7 @@ size="mini" type="primary" icon="el-icon-plus" + v-permission="['SettleAccount.CodeSettings.Create']" @click="handleCreate" >新增 @@ -23,6 +24,7 @@ type="danger" icon="el-icon-delete" size="mini" + v-permission="['SettleAccount.CodeSettings.Delete']" @click="handleDelete()" >批量删除 @@ -31,6 +33,7 @@ size="mini" type="warning" icon="el-icon-upload2" + v-permission="['SettleAccount.CodeSettings.Create']" @click="handleImportExcel()" >导入 @@ -236,7 +239,7 @@ export default { components: { Pagination, importExcel, CRMTableHead }, directives: { permission }, data() { - const validVersion = (rule, value, callback) => { + const validVersion = (rule, value, callback) => { let numberReg = /^\d{6}$/; if (!numberReg.test(value)) { callback(new Error("只能为6位数字！")); @@ -270,7 +273,7 @@ export default { }, }, listQuery: { - Filters: [ + Filters: [ { logic: 0, column: "enabled", diff --git a/vue/src/views/ux/billManage/FisUpdateExport/index.vue b/vue/src/views/ux/billManage/FisUpdateExport/index.vue index 47523f02..23ea2467 100644 --- a/vue/src/views/ux/billManage/FisUpdateExport/index.vue +++ b/vue/src/views/ux/billManage/FisUpdateExport/index.vue @@ -396,11 +396,11 @@ export default { /* 主表头 */ getDefaultField() { var tempsTabs = []; - tempsTabs.push({ - label: "版本号", - prop: "type", - width: 85, - }); + // tempsTabs.push({ + // label: "版本号", + // prop: "type", + // width: 85, + // }); tempsTabs.push({ label: "单据流水号", prop: "taskId", @@ -855,7 +855,8 @@ export default { this.listLoading = true; //导入界面中超链接过来的参数 this.listQuery.name = "Fis发货数据更新状态"; - this.listQuery.type = this.JobversionValue; + //this.listQuery.type = this.JobversionValue; + console.log("FIS更新传入条件："+this.listQuery) this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { diff --git a/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue index 54a8e86c..bc77097a 100644 --- a/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue +++ b/vue/src/views/ux/billManage/WMSOutputSumReport/index.vue @@ -231,17 +231,67 @@ - + + + + + + + + + + + + + + + + + + + +
@@ -294,6 +344,7 @@ export default { crmType: "wmsOutputSumReport", versionValue: "", dataValue: "", + selectType: "", //出库类型 versionList: [], //版本列表 JobVersionList: [], rules: { @@ -346,6 +397,8 @@ export default { MaxResultCount: 15, version: "", state: undefined, + accountDate: undefined, + type: "", }, listExportQuery: { Filters: [ @@ -414,7 +467,7 @@ export default { }); tempsTabs.push({ label: "销售渠道", prop: "saleCode", width: 120 }); tempsTabs.push({ label: "客户代码", prop: "clientCode", width: 120 }); - tempsTabs.push({ label: "结算单", prop: "billNum", width: 150 }); + tempsTabs.push({ label: "结算单号", prop: "billNum", width: 150 }); tempsTabs.push({ label: "物料号", prop: "materialCode", @@ -578,16 +631,23 @@ export default { this.$refs.formCount.validate((valid) => { if (valid) { this.formLoading = true; - if (this.dataValue === "") { - this.$message.error("必需选择过账日期！"); + if (this.dataValue === "" || this.selectType === "") { + this.$message.error("必需选择过账日期和出库类型！"); this.formLoading = false; return; } - console.log("日期传值：" + this.dataValue); + + if (this.JobversionValue != "") { + this.listQuery.version = this.JobversionValue; + } + this.listQuery.accountDate = this.dataValue; + this.listQuery.type = this.selectType; //出库类型 + console.log("同步SAP传参：" + JSON.stringify(this.listQuery)); this.$axios - .posts("/api/settleaccount/WMSOutputSumReport/SyncSap", { - accountDate: this.dataValue, - }) + .posts( + "/api/settleaccount/WMSOutputSumReport/SyncSap", + this.listQuery + ) .then((res) => { if (res == true) { this.$notify({ diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue index 3a9954a1..e49473e2 100644 --- a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue @@ -294,10 +294,12 @@ export default { }); tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 }); tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 }); - tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 100 }); + tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 150 }); + tempsTabs.push({ label: "看板号", prop: "kanban", width: 150 }); tempsTabs.push({ label: "数量", prop: "qty", width: 100 }); tempsTabs.push({ label: "开票单价", prop: "price", width: 100 }); tempsTabs.push({ label: "开票金额", prop: "amt", width: 100 }); + tempsTabs.push({ label: "单据", prop: "billNum", width: 100 }); tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; }, diff --git a/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue index d06e63b7..dc85b30a 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue @@ -302,7 +302,8 @@ export default { }); tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 }); tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 }); - tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 100 }); + tempsTabs.push({ label: "备件订单号", prop: "orderBillNum", width: 150 }); + tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 150 }); tempsTabs.push({ label: "数量", prop: "qty", width: 100 }); tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index 9a1d3cea..8a912528 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -2975,23 +2975,29 @@ "id": "36", "data": [ { - "fieldId": 3, - "formType": "text", + "fieldId": 2, + "formType": "select", + "isNull": 0, "name": "客户", - "type": 1, + "options": "", + "type": 3, "value": "", - "fieldType": 1, + "fieldType": 0, "fieldName": "client", - "setting": [] + "setting": [ + "大众,大众", + "红旗,红旗", + "一轿,一轿" + ] }, { "fieldId": 3, "formType": "text", - "name": "出库类型", + "name": "结算单号", "type": 1, "value": "", "fieldType": 1, - "fieldName": "type", + "fieldName": "billNum", "setting": [] }, { @@ -3498,7 +3504,6 @@ "fieldName": "extend2", "setting": [] } - ] }, "wmsOutputSum": { @@ -3540,7 +3545,6 @@ "fieldName": "materialCode", "setting": [] } - ] } } \ No newline at end of file