Browse Source

日常提交

branch_ccpg_220107
44673626 3 years ago
parent
commit
7bcfeb209e
  1. 41
      vue/src/router/modules/basedata.js
  2. 2
      vue/src/router/modules/wms_out_order.js
  3. 7
      vue/src/views/ux/basedata/codeSetting/index.vue
  4. 13
      vue/src/views/ux/billManage/FisUpdateExport/index.vue
  5. 78
      vue/src/views/ux/billManage/WMSOutputSumReport/index.vue
  6. 4
      vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
  7. 3
      vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue
  8. 22
      vue/static/tableFieldForSearch.json

41
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: '客户零件'
// }
// }
]
}

2
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: '零件'
}

7
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"
>新增
</el-button>
@ -23,6 +24,7 @@
type="danger"
icon="el-icon-delete"
size="mini"
v-permission="['SettleAccount.CodeSettings.Delete']"
@click="handleDelete()"
>批量删除
</el-button>
@ -31,6 +33,7 @@
size="mini"
type="warning"
icon="el-icon-upload2"
v-permission="['SettleAccount.CodeSettings.Create']"
@click="handleImportExcel()"
>导入
</el-button>
@ -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",

13
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) => {

78
vue/src/views/ux/billManage/WMSOutputSumReport/index.vue

@ -231,17 +231,67 @@
<el-col :md="4" :xs="24">
<el-form-item label="过账日期" required />
</el-col>
<el-col :md="20" :xs="24">
<el-col :md="8" :xs="24">
<el-form-item prop="dataValue">
<el-date-picker
v-model="dataValue"
style="width: 188px"
style="width: 200px"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
/>
</el-form-item>
</el-col>
<el-col :md="4" :xs="24">
<el-form-item label="出库类型" required />
</el-col>
<el-col :md="8" :xs="24">
<el-form-item prop="selectType">
<el-select
v-model="selectType"
placeholder="请选择出库类型"
style="width: 200px;"
>
<el-option
label="大众备件汇总出库"
:value="大众备件汇总出库"
></el-option>
<el-option
label="大众备件条码出库"
:value="大众备件条码出库"
></el-option>
<el-option
label="大众看板出库"
:value="大众看板出库"
></el-option>
<el-option
label="大众无看板出库"
:value="大众无看板出库"
></el-option>
<el-option
label="大众准时化出库"
:value="大众准时化出库"
></el-option>
<el-option
label="红旗手工出库"
:value="红旗手工出库"
></el-option>
<el-option
label="红旗手工出库(备件)"
:value="红旗手工出库(备件)"
></el-option>
<el-option
label="一轿手工出库"
:value="一轿手工出库"
></el-option>
<el-option
label="一轿手工出库(备件)"
:value="一轿手工出库(备件)"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
@ -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({

4
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;
},

3
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;

22
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": []
}
]
}
}
Loading…
Cancel
Save