Browse Source

年后第一次提交

FoShanPG
yunfeng.liu 3 years ago
parent
commit
001f3efaf4
  1. 10
      vue/src/components/ImportExcel-base/index.vue
  2. 16
      vue/src/router/index.js
  3. 11
      vue/src/router/modules/basedata.js
  4. 65
      vue/src/router/modules/hq_menu.js
  5. 10
      vue/src/router/modules/vwFisData.js
  6. 29
      vue/src/router/modules/vw_menu.js
  7. 30
      vue/src/router/modules/vw_out_order.js
  8. 469
      vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
  9. 10
      vue/src/views/pg-fis/basedate/m100BIll/index.vue
  10. 4
      vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
  11. 4
      vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
  12. 19
      vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
  13. 4
      vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
  14. 830
      vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
  15. 2
      vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
  16. 2
      vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
  17. 4
      vue/src/views/pg-fis/basedate/m100Online/index-old.vue
  18. 4
      vue/src/views/pg-fis/basedate/m100Online/index.vue
  19. 130
      vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
  20. 28
      vue/src/views/pg-fis/basedate/r100Online/index.vue
  21. 35
      vue/src/views/pg-fis/basedate/repeatR100/index.vue
  22. 327
      vue/src/views/pg-fis/basedate/select/index.vue
  23. 138
      vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue
  24. 91
      vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
  25. 13
      vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
  26. 605
      vue/src/views/ux/basedata/partsSettlement/index.vue
  27. 364
      vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
  28. 6
      vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
  29. 37
      vue/src/views/ux/billManage/IssuedUnsettled/index.vue
  30. 12
      vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue
  31. 15
      vue/src/views/ux/billManage/UnSettleDiffExport/index.vue
  32. 4
      vue/src/views/ux/billManage/UnSettledDiff/index.vue
  33. 343
      vue/src/views/ux/billManage/kanBanWithCode/index.vue
  34. 223
      vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
  35. 33
      vue/src/views/ux/billManage/kanbanOutOrder/index.vue
  36. 658
      vue/src/views/ux/billManage/sparePart/index.vue
  37. 26
      vue/src/views/ux/billManage/vwOutOrder/index.vue
  38. 139
      vue/src/views/ux/vw/dataInput/hq_f/index.vue
  39. 71
      vue/src/views/ux/vw/dataInput/hq_h/index.vue
  40. 66
      vue/src/views/ux/vw/dataInput/hq_m/index.vue
  41. 7
      vue/src/views/ux/vw/dataInput/index.vue
  42. 7
      vue/static/config.js
  43. 108
      vue/static/tableFieldForSearch.json

10
vue/src/components/ImportExcel-base/index.vue

@ -301,11 +301,8 @@ export default {
vWKanBan: "大众看板结算明细",
scrapClaims: "CP7报废和索赔",
sparePart: "大众备件结算明细",
hqHPlatform: "红旗H平台",
hqMPlatform: "红旗M平台",
vwoutorder: "准时化出库单",
sparepartoutorder:"大众备件出库单",
kanbanoutorder: "大众看板出库单",
hqHPlatform: "红旗H平台导入",
hqMPlatform: "红旗M平台导入",
bomdatabase: "产品结构BOM",
prebatch: "预批量",
secondaryPriceRatio: "二配结算价格比例",
@ -333,9 +330,6 @@ export default {
sparePart: "/api/settleaccount/SparePart/ExcelImport", //
hqHPlatform: "/api/settleaccount/HQHPlatform/ExcelImport", //H
hqMPlatform: "/api/settleaccount/HQMPlatform/ExcelImport", //M
vwoutorder: "/api/settleaccount/wmsjitoutput/ExcelImport", //
kanbanoutorder: "/api/settleaccount/wmskanbanoutput/ExcelImport", //
sparepartoutorder: "/api/settleaccount/wmsSharePartoutput/ExcelImport", //
bomdatabase: "/api/settleaccount/bom/ExcelImport",
prebatch: "/api/settleaccount/Prebatch/ExcelImport",
secondaryPriceRatio:

16
vue/src/router/index.js

@ -90,8 +90,8 @@ export const constantRoutes = [
children: [
{
path: 'dashboard',
//component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),//fis
component: () => import('@/views/ux/backGroundWork'),
component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),//fis
//component: () => import('@/views/ux/backGroundWork'),
name: 'Dashboard',
meta: {
title: '系统首页',
@ -174,17 +174,17 @@ export const asyncRoutes = [
/** when your routing map is too long, you can split it into small modules **/
managerRouter,//系统首页
personRouter,//系统管理
basedataRouter,//基础数据维护
vwMenudataRouter,//大众
hqMenudataRouter,//红旗
vwOutOrderDataRouter,
// basedataRouter,//基础数据维护
//vwMenudataRouter,//大众
//hqMenudataRouter,//红旗
//vwOutOrderDataRouter,
//btcarDataRouter,//一汽轿车
//vwFisDataRouter,//结算与开票数据导入
//billdataRouter,//销售结算与开票报表
//businessdataRouter,
//wheeldataRouter,//大众看板和备件
// pgfisPrint,//排序单打印
// pgfis,//派格fis
pgfisPrint,//排序单打印
pgfis,//派格fis
JobTimeDataRouter,//后台作业监控
// 404 page must be placed at the end !!!

11
vue/src/router/modules/basedata.js

@ -38,7 +38,16 @@ const basedataRouter = {
name: 'codeSetting',//命名路由
meta: { title: '通用代码设置', roles: ['SettleAccount.CodeSettings'], icon: '通用' }
},
{
path: 'part-settlement',
component: () => import('@/views/ux/basedata/partsSettlement/index'),
name: 'partsSettlement',//命名路由
meta: {
title: '总成与结算件关系',
roles: ['SettleAccount.MaterialRelationships'],
icon: '零件'
}
},
{
path: 'priceList',
component: () => import('@/views/ux/basedata/priceList/index'),

65
vue/src/router/modules/hq_menu.js

@ -4,7 +4,7 @@ import Layout from '@/layout'
const hqMenudataRouter = {
path: '/capt-hq',
component: Layout,
redirect: 'ux/vw/dataInput/index',
redirect: 'ux/vw/dataInput/hq_h',
name: 'HQData',
meta: {
title: '红旗工厂',
@ -14,10 +14,10 @@ const hqMenudataRouter = {
},
children: [
{
path: '/H',
path: '/import-h-data',
name: 'import-h-data',//命名路由-二级
component: () => import('@/views/ux/vw/dataInput/index'),
redirect: 'ux/vw/dataInput/index',
component: () => import('@/views/ux/vw/dataInput/hq_h'),
redirect: 'ux/vw/dataInput/hq_h',
meta: {
title: 'H平台',
// roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'],
@ -36,23 +36,21 @@ const hqMenudataRouter = {
},
{
path: 'hq-H-platform-export',
component: () => import('@/views/ux/vw/dataInput/hq_h_report'),
name: 'HQH',
component: () => import('@/views/ux/vw/dataInput/ScrapClaims'),
name: 'ScrapClaims',
meta: {
title: 'H平台结算差异输出',
//roles: ['SettleAccount.FISs'],
roles: ['SettleAccount.FISs'],
icon: '文件'
}
}
]
},
{
path: '/M',
component: () => import('@/views/ux/vw/dataInput/index'),
path: '/export-m-data',
component: () => import('@/views/ux/vw/dataInput/hq_m'),
name: 'export-m-data',//命名路由
redirect: 'ux/vw/dataInput/index',
redirect: '/ux/vw/dataInput/hq_m',
meta: {
title: 'M平台',
//roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'],
@ -83,10 +81,10 @@ const hqMenudataRouter = {
]
},
{
path: '/F',
component: () => import('@/views/ux/vw/dataInput/index'),
path: '/export-f-data',
component: () => import('@/views/ux/vw/dataInput/hq_f'),
name: 'export-f-data',//命名路由
redirect: 'ux/vw/dataInput/index',
redirect: '/ux/vw/dataInput/hq_f',
meta: {
title: 'F平台',
//roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'],
@ -114,43 +112,8 @@ const hqMenudataRouter = {
icon: '二配'
}
}
],
},
{
path: '/hqcar',
name: 'import-y-data',//命名路由-二级
component: () => import('@/views/ux/vw/dataInput/index'),
redirect: 'ux/vw/dataInput/index',
meta: {
title: '一汽轿车平台',
// roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'],
icon: '看板'
},
children: [
{
path: 'hq-Y-platform',
component: () => import('@/views/ux/vw/dataInput/hq_y'),
name: 'ERPEI',//命名路由
meta: {
title: '一汽轿车平台导入',
roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色)
icon: '结算'
}
},
{
path: 'hq-Y-platform-export',
component: () => import('@/views/ux/vw/dataInput/ScrapClaims'),
name: 'ScrapClaims',
meta: {
title: '一汽轿车平台结算差异输出',
roles: ['SettleAccount.FISs'],
icon: '文件'
}
}
]
},
}
]
}

10
vue/src/router/modules/vwFisData.js

@ -88,16 +88,6 @@ const vwFisDataRouter = {
icon: '结算'
}
},
{
path: 'hq-Y-platform',
component: () => import('@/views/ux/vw/dataInput/hq_y'),
name: 'ERPEI',//命名路由
meta: {
title: '一汽轿车平台',
//roles: ['SettleAccount.Boms'],//控制页面角色(可以设置多个角色)
icon: '结算'
}
},
{
path: 'hq-M-platform',
component: () => import('@/views/ux/vw/dataInput/hq_m'),

29
vue/src/router/modules/vw_menu.js

@ -142,11 +142,11 @@ const vwMenudataRouter = {
component: () => import('@/views/ux/billManage/IssuedUnsettled/index'),
name: 'UnsettledDetail',//命名路由
meta: {
title: '准时化未结明细',
roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色)
icon: '报表'
title: '准时化未结明细',
roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色)
icon: '报表'
}
},
},
{
path: '/kbwithcode',
component: () => import('@/views/ux/billManage/kanBanWithCode'),
@ -157,26 +157,7 @@ const vwMenudataRouter = {
icon: '看板'
}
},
{
path: '/kbunsettle',
component: () => import('@/views/ux/billManage/KanbanUnSettled'),
name: 'KanbanUnSettled',//命名路由
meta: {
title: '看板未结输出',
//roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色(可以设置多个角色)
icon: '看板'
}
},
{
path: '/kbwithoutcode',
component: () => import('@/views/ux/billManage/kanBanWithOutCode'),
name: 'KanBanWithOutCode',//命名路由
meta: {
title: '无条码看板结算输出',
//roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色(可以设置多个角色)
icon: '看板'
}
},
{
path: '/vwsparepart',
component: () => import('@/views/ux/billManage/sparePart'),

30
vue/src/router/modules/vw_out_order.js

@ -36,26 +36,16 @@ const vwOutOrderDataRouter = {
icon: '结算'
}
},
{
path: 'kanban-without-order',
component: () => import('@/views/ux/billManage/kanbanWithOutOrder/index'),
name: 'SettleAccount',//命名路由
meta: {
title: '大众无条码看板出库单',
roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色)
icon: '结算'
}
},
{
path: 'sparepart-out-order',
component: () => import('@/views/ux/billManage/sparepartOutOrder/index'),
name: 'Invoices',//命名路由
meta: {
title: '大众备件出库单',
roles: ['SettleAccount.Invoices'],
icon: '对比'
}
},
// {
// path: 'invoice',
// component: () => import('@/views/ux/basedata/Invoice/index'),
// name: 'Invoices',//命名路由
// meta: {
// title: '大众发票汇总导入',
// roles: ['SettleAccount.Invoices'],
// icon: '对比'
// }
// },
]
}

469
vue/src/views/pg-fis/basedate/assemblyCfg/index.vue

@ -2,114 +2,140 @@
<template>
<div class="cr-body-content">
<div ref="box">
<flexbox class="content-header">
<el-form
:model="listQuery"
ref="queryForm"
v-show="showSearch"
:inline="true"
>
<el-form-item label="总成编码" prop="ErpAssemblyCode" class="forimitem">
<el-input
v-model="listQuery.ErpAssemblyCode"
placeholder="请输入总成编码"
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="总成名称" prop="ErpAssemblyName" class="forimitem">
<el-input
v-model="listQuery.ErpAssemblyName"
placeholder="请输入总成名称"
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="车型:" prop="vehicleModelCode" class="forimitem">
<el-select
v-model="listQuery.vehicleModelCode"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="valueselectChange"
<flexbox class="content-header">
<el-form
:model="listQuery"
ref="queryForm"
v-show="showSearch"
:inline="true"
>
<el-option
v-for="item in vehicleModelList"
:key="item.id"
:label="item.dicItemName"
:value="item.dicItemCode"/>
</el-select>
</el-form-item>
<el-form-item
label="总成编码"
prop="ErpAssemblyCode"
class="forimitem"
>
<el-input
v-model="listQuery.ErpAssemblyCode"
placeholder="请输入总成编码"
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item class="formitem">
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleFilter"
>搜索</el-button
<el-form-item
label="总成名称"
prop="ErpAssemblyName"
class="forimitem"
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery('queryForm')"
>重置</el-button
<el-input
v-model="listQuery.ErpAssemblyName"
placeholder="请输入总成名称"
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item
label="车型:"
prop="vehicleModelCode"
class="forimitem"
>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
style="margin-left: 15px"
@click="handleDownload()"
>导出(Excel)
</el-button>
</el-form-item>
<el-divider class="divider1" ></el-divider>
<el-form-item style="margin-bottom: 0px;margin-top: 10px">
<el-button
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="handleCreate"
>新增
</el-button>
<el-button
class="filter-item"
size="mini"
type="primary"
icon="el-icon-edit"
@click="handleUpdate"
>修改
</el-button>
<el-button
class="filter-item"
size="mini"
type="primary"
icon="el-icon-delete"
@click="handleDelete"
>删除
</el-button>
<el-button
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="handleImportSAP"
>导入SAP对接
</el-button>
</el-form-item>
</el-form>
</flexbox>
<el-select
v-model="listQuery.vehicleModelCode"
clearable
placeholder="请选择"
size="medium"
style="margin-right: 15px"
@change="valueselectChange"
>
<el-option
v-for="item in vehicleModelList"
:key="item.id"
:label="item.dicItemName"
:value="item.dicItemCode"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="listQuery.CreateTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
:default-time="['00:00:00', '23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item class="formitem">
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleFilter"
>搜索</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery('queryForm')"
>重置</el-button
>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
style="margin-left: 15px"
@click="handleDownload()"
>导出(Excel)
</el-button>
</el-form-item>
<!-- <el-divider class="divider1" ></el-divider> -->
<el-form-item style="margin-bottom: 0px; ">
<el-button
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="handleCreate"
>新增
</el-button>
<el-button
class="filter-item"
size="mini"
type="primary"
icon="el-icon-edit"
@click="handleUpdate"
>修改
</el-button>
<el-button
class="filter-item"
size="mini"
type="primary"
icon="el-icon-delete"
@click="handleDelete"
>删除
</el-button>
<el-button
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="handleImportSAP"
>导入SAP对接
</el-button>
</el-form-item>
</el-form>
</flexbox>
</div>
<div class="l-table">
<!--表格渲染-->
@ -139,7 +165,6 @@
prop="erpAssemblyCode"
sortable="custom"
align="center"
width="180px"
>
<template slot-scope="scope">
@ -171,7 +196,7 @@
:close-on-click-modal="false"
:title="formTitle"
width="700px"
@close='closeDialog'
@close="closeDialog"
>
<el-form
ref="form"
@ -241,7 +266,8 @@
v-for="item in vehicleModelList"
:key="item.id"
:label="item.dicItemName"
:value="item.dicItemCode"/>
:value="item.dicItemCode"
/>
</el-select>
</el-form-item>
</el-col>
@ -265,22 +291,48 @@
@row-click="handleRowClick"
>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<el-table-column prop="partCode" label="客户零件代码" width="150px" >
<el-table-column
prop="partCode"
label="客户零件代码"
width="150px"
>
<template slot-scope="scope">
<el-input v-model="scope.row.partCode" size="mini" style="width:135px"></el-input>
<el-input
v-model="scope.row.partCode"
size="mini"
style="width: 135px"
></el-input>
</template>
</el-table-column>
<el-table-column prop="description" label="客户零件名称">
<template slot-scope="scope">
<el-input v-model="scope.row.description" size="mini"></el-input>
<el-input
v-model="scope.row.description"
size="mini"
></el-input>
</template>
</el-table-column>
<el-table-column prop="partNum" label="客户零件数量" width="120px" >
<el-table-column
prop="partNum"
label="客户零件数量"
width="120px"
>
<template slot-scope="scope">
<el-input-number v-model="scope.row.partNum" :min="1" size="mini" style="width:100px"></el-input-number>
<el-input-number
v-model="scope.row.partNum"
:min="1"
size="mini"
style="width: 100px"
></el-input-number>
</template>
</el-table-column>
<el-table-column prop="isKey" label="是否Key件" align="center" width="80px" > <!-- label-class-name="DisabledSelection" 去除列头全选-->
<el-table-column
prop="isKey"
label="是否Key件"
align="center"
width="80px"
>
<!-- label-class-name="DisabledSelection" 去除列头全选-->
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isKey"></el-checkbox>
</template>
@ -292,10 +344,18 @@
</el-table-column> -->
<el-table-column prop="description" width="35px">
<template slot="header">
<el-button @click="handleAddDetails" icon="el-icon-plus" type="text"></el-button>
<el-button
@click="handleAddDetails"
icon="el-icon-plus"
type="text"
></el-button>
</template>
<template slot-scope="scope">
<el-button @click="handleDeleteDetails(scope.$index, scope.row)" icon="el-icon-minus" type="text"></el-button>
<el-button
@click="handleDeleteDetails(scope.$index, scope.row)"
icon="el-icon-minus"
type="text"
></el-button>
</template>
</el-table-column>
</el-table>
@ -330,21 +390,21 @@
@close="importExcelData"
/>
</div>
<!-- 抽屉控件 -->
<el-drawer
title="信息详细页"
size="75%"
direction="rtl"
:visible.sync="drawer"
:before-close="handleDrawerClose"
>
<div>
<Detail
v-bind:customerInfos="customerInfos"
style="margin-top: -35px"
></Detail>
</div>
</el-drawer>
<!-- 抽屉控件 -->
<el-drawer
title="信息详细页"
size="75%"
direction="rtl"
:visible.sync="drawer"
:before-close="handleDrawerClose"
>
<div>
<Detail
v-bind:customerInfos="customerInfos"
style="margin-top: -35px"
></Detail>
</div>
</el-drawer>
</div>
</template>
@ -420,26 +480,30 @@ export default {
},
},
listQuery: {
CreateTimeValue: [],
BeginCreateTime: undefined,
EndCreateTime: undefined,
SkipCount: 0,
MaxResultCount: 15,
ErpAssemblyName: undefined,
ErpAssemblyCode: undefined,
vehicleModel:undefined,
vehicleModel: undefined,
},
listExportQuery: {
erpAssemblyCode: undefined,
erpAssemblyName: undefined,
},
vehicleModelQuery:{
dicTypeName:"派格车型",
vehicleModelQuery: {
dicTypeName: "派格车型",
},
form:{
details:[]
form: {
details: [],
},
page: 1,
//
showSearch: true,
bomUnit,
multipleSelection: [],
drawer: false,
dialogFormVisible: false,
@ -448,20 +512,20 @@ export default {
formLoading: false,
dialogFormVisible: false,
tableHeight: document.documentElement.clientHeight - 280,
detailTableHeight:250,
details:[], //
vehicleModelList:[],//list
detailTableHeight: 250,
details: [], //
vehicleModelList: [], //list
};
},
mounted() {
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79;//57footer79
//this.$refs.form.rendered=true;
//console.log(boxH);
//console.log(this.tableHeight);
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79; //57footer79
//this.$refs.form.rendered=true;
//console.log(boxH);
//console.log(this.tableHeight);
});
},
created() {
@ -481,6 +545,11 @@ export default {
prop: "erpAssemblyVersion",
width: 100,
});
tempsTabs.push({
label: "创建时间",
prop: "creationTime",
width: 100,
});
tempsTabs.push({
label: "车型代码",
prop: "vehicleModel",
@ -571,40 +640,46 @@ export default {
this.isEdit = true;
this.details = [];
//this.getvehicleModel();
if (this.multipleSelection.length != 1) {
this.$message({
message: "编辑必须选择单行",
type: "warning",
});
return;
} else {
this.fetchData(this.multipleSelection[0].id);
this.dialogFormVisible = true;
}
if (this.multipleSelection.length != 1) {
this.$message({
message: "编辑必须选择单行",
type: "warning",
});
return;
} else {
this.fetchData(this.multipleSelection[0].id);
this.dialogFormVisible = true;
}
},
/** 删除 */
handleDelete(row) {
if (this.multipleSelection.length != 1) {
this.$message({
message: "编辑必须选择单行",
type: "warning",
});
return;
this.$message({
message: "编辑必须选择单行",
type: "warning",
});
return;
}
// this.$alert("", "", {
// confirmButtonText: "",
// callback: (action) => {
// //
// },
// });
this.$confirm("是否删除总成" + this.multipleSelection[0].erpAssemblyCode + "?", "提示", {
// this.$alert("", "", {
// confirmButtonText: "",
// callback: (action) => {
// //
// },
// });
this.$confirm(
"是否删除总成" + this.multipleSelection[0].erpAssemblyCode + "?",
"提示",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
}
)
.then(() => {
this.$axios
.deletes("/api/newjit/assembly-cfg-erp/"+ this.multipleSelection[0].id)
.deletes(
"/api/newjit/assembly-cfg-erp/" + this.multipleSelection[0].id
)
.then((response) => {
const index = this.list.indexOf(this.multipleSelection[0]);
this.$notify({
@ -676,7 +751,7 @@ export default {
this.$refs[refName].resetFields();
this.getvehicleModel();
this.handleQuery();
this.listQuery.CreateTimeValue = [];
},
/** 搜索按钮操作 */
handleQuery() {
@ -724,7 +799,7 @@ export default {
this.form.details.push(obj);
//console.log(688);
},
handleDeleteDetails(index){
handleDeleteDetails(index) {
this.form.details.splice(index, 1);
//console.log(693);
},
@ -748,7 +823,12 @@ export default {
},
getList() {
this.listLoading = true;
console.log("创建时间:" + JSON.stringify(this.listQuery));
this.listQuery.SkipCount = (this.page - 1) * 10;
if (this.listQuery.CreateTimeValue !== undefined) {
this.listQuery.BeginCreateTime = this.listQuery.CreateTimeValue[0];
this.listQuery.EndCreateTime = this.listQuery.CreateTimeValue[1];
}
this.$axios
.gets("/api/newjit/assembly-cfg-erp/list", this.listQuery)
.then((response) => {
@ -762,8 +842,8 @@ export default {
.catch(() => {
this.listLoading = false;
});
},
},
getDetialList(partCode) {
this.listLoading = true;
@ -771,14 +851,13 @@ export default {
this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
.then((response) => {
console.log(partCode)
if(partCode !== "" && partCode !== undefined)
{
console.log(partCode);
if (partCode !== "" && partCode !== undefined) {
//console.log(partCode)
this.list = response.item.details.filter(u => u.partCode === partCode);
}
else
{
this.list = response.item.details.filter(
(u) => u.partCode === partCode
);
} else {
this.list = response.item.details;
}
//alert(JSON.stringify(response.Items))
@ -793,8 +872,8 @@ export default {
});
},
valueselectChange(){},
handleImportSAP(){
valueselectChange() {},
handleImportSAP() {
//
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
@ -837,21 +916,17 @@ export default {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
getvehicleModel()
{
getvehicleModel() {
this.$axios
.gets(
"/api/newjit/dic/list",this.vehicleModelQuery
)
.then((response) => {
//console.log(response);
this.vehicleModelList = response.item;
//console.log()
})
.catch(() => {
});
.gets("/api/newjit/dic/list", this.vehicleModelQuery)
.then((response) => {
//console.log(response);
this.vehicleModelList = response.item;
//console.log()
})
.catch(() => {});
},
closeDialog(){
closeDialog() {
//this.multipleSelection = [];//
},
},
@ -873,11 +948,11 @@ export default {
// position: absolute;
// left: 7px;
// }
.divider1{
margin: 0 ;
.divider1 {
margin: 0;
//width: 100%;
}
.formitem{
.formitem {
margin-bottom: 0;
}
</style>

10
vue/src/views/pg-fis/basedate/m100BIll/index.vue

@ -125,7 +125,7 @@
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
type="datetimerange" :default-time="['00:00:00','23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
@ -133,20 +133,20 @@
</el-form-item>
<!-- </el-row> -->
<!-- <el-row> -->
<el-form-item label="接收日期" style="margin-top: -15px">
<el-form-item label="接收日期" >
<el-date-picker
v-model="listQuery.ReceiveTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
type="datetimerange" :default-time="['00:00:00','23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item style="margin-top: -15px">
<el-form-item >
<el-button
type="primary"
icon="el-icon-search"
@ -171,7 +171,7 @@
</el-button>
</el-form-item>
<!-- </el-row> -->
<el-divider class="divider1" ></el-divider>
<!-- <el-divider class="divider1" ></el-divider> -->
<el-form-item style="margin-bottom: 0px;margin-top: -1px">
<el-button
class="filter-item"

4
vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue

@ -106,7 +106,7 @@
></el-date-picker>
</el-form-item>
<el-form-item style="margin-top: -20px">
<el-form-item >
<el-button
type="primary"
icon="el-icon-search"
@ -751,7 +751,7 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property == "printDate" || column.property == "receiveTime") {
var date = row[column.property];

4
vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue

@ -584,7 +584,7 @@ export default {
}
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=zhuhuban&returnfile="+partNum,
"/Handlers/Handler1.ashx?report="+partNum+"&returnfile=0",
qs.stringify(this.fileQuery)
)
.then((response) => {
@ -796,7 +796,7 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property == "printDate" || column.property == "receiveTime") {
var date = row[column.property];

19
vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue

@ -79,7 +79,7 @@
></el-date-picker>
</el-form-item>
<el-form-item style="margin-top: -20px">
<el-form-item >
<el-button
type="primary"
icon="el-icon-search"
@ -195,6 +195,7 @@
/>
</div>
</div>
<div>
<el-dialog
title="作废信息"
@ -205,12 +206,12 @@
<el-table-column
property="billNum"
label="装箱单号"
width="100"
width="105"
></el-table-column>
<el-table-column
property="billSerialNum"
label="单据顺号"
width="100"
width="95"
></el-table-column>
<el-table-column
property="billLocation"
@ -230,12 +231,12 @@
<el-table-column
property="capacity"
label="器具容量"
width="100"
width="110"
></el-table-column>
<el-table-column
property="printDate"
label="打印日期"
width="100"
width="90"
></el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
@ -416,9 +417,9 @@ export default {
computed: {
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 });
tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 150 });
tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 115 });
tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 115 });
tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 });
tempsTabs.push({
label: "左或右",
@ -807,7 +808,7 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property == "printDate" || column.property == "receiveTime") {
var date = row[column.property];

4
vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue

@ -91,7 +91,7 @@
></el-date-picker>
</el-form-item>
<el-form-item style="margin-top: -20px">
<el-form-item >
<el-button
type="primary"
icon="el-icon-search"
@ -806,7 +806,7 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property == "printDate" || column.property == "receiveTime") {
var date = row[column.property];

830
vue/src/views/pg-fis/basedate/m100Online/budaMB.vue

@ -0,0 +1,830 @@
<!--总成模块信息管理页-->
<template>
<div class="cr-body-content">
<div ref="box">
<flexbox class="content-header">
<el-form
:model="listQuery"
ref="queryForm"
v-show="showSearch"
:inline="true"
>
<el-form-item>
<el-col :span="12">
<el-form-item prop="billNum" label="装箱单号">
<el-input
v-model="listQuery.billNum"
placeholder=""
clearable
size="small"
style="width: 140px"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="partType" label="零件类型">
<el-input
v-model="listQuery.partType"
placeholder=""
clearable
size="small"
style="width: 140px"
/>
</el-form-item>
</el-col>
</el-form-item>
<el-form-item label="大众顺序号">
<el-col :span="11">
<el-form-item prop="HostSN">
<el-input
v-model="listQuery.HostSN"
placeholder=""
clearable
size="small"
style="width: 170px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<!-- <el-col class="line" :span="2">-</el-col>
<el-col :span="11">
<el-form-item prop="endHostSN">
<el-input
v-model="listQuery.endHostSN"
placeholder=""
clearable
size="small"
style="width: 170px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
-->
</el-form-item>
<!-- <el-form-item label="底盘号码">
<el-col :span="11">
<el-form-item prop="Vin">
<el-input
v-model="listQuery.Vin"
placeholder=""
clearable
size="small"
style="width: 140px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- </el-col> -->
<!-- <el-col class="line" :span="2">-</el-col>
<el-col :span="11">
<el-form-item prop="endVin">
<el-input
v-model="listQuery.endVin"
placeholder=""
clearable
size="small"
style="width: 140px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
-->
<!-- </el-form-item> -->
<el-form-item label="打印日期">
<el-date-picker
v-model="PrintTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
<el-form-item >
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleFilter"
>搜索</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery('queryForm')"
>重置</el-button
>
<el-button
class="filter-item"
size="mini"
type="success"
icon="el-icon-s-shop"
@click="handleUpdate()"
>补打</el-button
>
</el-form-item>
</el-form>
</flexbox>
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeightMB"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%; margin-top: -25px"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
:row-key="getRowKeys"
:expand-row-keys="expands"
@expand-change="exChange"
>
<el-table-column type="selection" width="44px"></el-table-column>
<el-table-column type="expand" prop="details" label="详表">
<template slot-scope="scope">
<el-table :data="scope.row.details">
<el-table-column prop="knr" label="KNR订单号"></el-table-column>
<el-table-column prop="vin" label="底盘号"></el-table-column>
<el-table-column
prop="hostSN"
label="大众顺序号"
></el-table-column>
<el-table-column
prop="vehicleModel_DoorPlankCode"
label="车型门板代码"
></el-table-column>
<el-table-column
prop="topBoxPositionNum"
label="上箱位号"
></el-table-column>
<el-table-column
prop="topSAPMaterialNum"
label="上箱位 SAP物料号"
></el-table-column>
<el-table-column
prop="topMaterialDescription"
label="上箱位 物料描述"
></el-table-column>
<el-table-column
prop="belowBoxPositionNum"
label="下箱位号"
></el-table-column>
<el-table-column
prop="belowSAPMaterialNum"
label="下箱位 SAP物料号"
></el-table-column>
<el-table-column
prop="belowMaterialDescription "
label="下箱位 物料描述"
></el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in getDefaultField"
:key="index"
:prop="item.prop"
:label="item.label"
:min-width="item.width"
:formatter="fieldFormatter"
sortable="custom"
show-overflow-tooltip
:gutter="0"
>
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
</el-table-column>
</el-table>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination
v-show="totalCount > 0"
:total="totalCount"
style="margin-bottom: -5px; float: right"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
</div>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination";
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import Lockr from "lockr";
import { mapGetters } from "vuex";
import moment from "moment";
import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js";
import qs from "qs";
export default {
name: "M100Online-MB",
components: { Pagination, CRMTableHead, importExcel, Detail },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
props: {
customerInfosMB: {
type: Array,
default: () => {
return [];
},
},
},
data() {
const validVersion = (rule, value, callback) => {
let numberReg = /^\d{6}$/;
if (!numberReg.test(value)) {
callback(new Error("只能为6位数字!"));
} else {
callback();
}
};
return {
crmType: "M100Online-MB",
getRowKeys: (row) => {
return row.id; //id
},
expands: [], //id
PrintTimeValue: [],
activeNames: ["1"],
multipleSelection: [],
valueSelect: "",
customerInfos: [],
dialogOptions: [],
versionValue: "",
searchContent: "", //
showExcelImport: false,
form: {},
drawer: false,
list: null,
totalCount: 0,
listLoading: true,
customerInfo: {
printType: "",
productLine: "",
},
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
SkipCount: 0,
MaxResultCount: 15,
billNum: undefined,
partType: undefined,
Vin: undefined,
HostSN: undefined,
beginPrintDate: undefined,
endPrintDate: undefined,
},
listPLQuery: {
BillType: 2,
//UserId: this.userinfo.UserId,
},
hostSNQuery: {
productLine: undefined,
},
hostCheckQuery: {
printType: undefined, //0:;1:;2:;
productLine: undefined,
Vin: undefined,
HostSN: undefined,
},
hostPrintQuery: {
printType: undefined, //0:;1:;2:;
productLine: undefined,
Vin: undefined,
HostSN: undefined,
},
fileQuery: {
dataname: undefined,
},
form: {
details: [],
},
page: 1,
//
showSearch: true,
drawer: false,
dialogFormVisible: false,
formTitle: "",
isEdit: false,
formLoading: false,
tableHeight: document.documentElement.clientHeight - 335,
tableHeightMB: document.documentElement.clientHeight - 300,
detailTableHeight: 250,
details: [], //
PLList: [], //线
isShowHostSN: false,
isShowVin: false,
isShowState: true,
};
},
mounted() {
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79; //57footer79
//this.tableHeight = offsetHei -260
});
},
created() {
this.getList();
},
watch: {
customerInfosMB: {
handler(newVal) {
console.log("门板-接收的父组件的值:" + JSON.stringify(newVal));
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
newVal.forEach((element) => {
this.customerInfo.printType = element.PrintType;
this.customerInfo.productLine = element.ProductLine;
});
if (this.customerInfo.productLine != "") {
this.getList();
}
}
},
immediate: true,
},
},
computed: {
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 });
tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 });
tempsTabs.push({
label: "左或右",
prop: "billLocation",
width: 150,
});
tempsTabs.push({
label: "供应商厂家代码",
prop: "providerCode",
width: 150,
});
tempsTabs.push({
label: "零件类型",
prop: "partType",
width: 180,
});
tempsTabs.push({
label: "器具容量",
prop: "capacity",
width: 150,
});
tempsTabs.push({
label: "打印日期",
prop: "printDate",
width: 180,
});
tempsTabs.push({
label: "打印类型",
prop: "printType",
width: 120,
});
tempsTabs.push({
label: "生产线",
prop: "productLine",
width: 120,
});
tempsTabs.push({
label: "起始底盘号",
prop: "beginVin",
width: 160,
});
tempsTabs.push({
label: "结束底盘号",
prop: "endVin",
width: 160,
});
return tempsTabs;
},
...mapGetters(["userInfo"]), //
},
methods: {
//base64dataurlbase64
dataURLtoBlob(dataurl) {
var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
var n = bstr.length;
var u8arr = new Uint8Array(n);
while (n--) {
u8arr[n] = bstr.charCodeAt(n);
}
return new Blob([u8arr], { type: "application/pdf" });
},
doPrint(val) {
var ordonnance = document.getElementById(val).contentWindow;
setTimeout(() => {
// window.print()
ordonnance.print();
this.pdfLoading = false;
}, 100);
},
printpdf(dataResult) {
//dataResultbase64
let blob = this.dataURLtoBlob(dataResult);
var date = new Date().getTime();
var ifr = document.createElement("iframe");
ifr.style.frameborder = "no";
ifr.style.display = "none";
ifr.style.pageBreakBefore = "always";
ifr.setAttribute("id", "printPdf" + date);
ifr.setAttribute("name", "printPdf" + date);
ifr.src = window.URL.createObjectURL(blob);
document.body.appendChild(ifr);
this.doPrint("printPdf" + date);
window.URL.revokeObjectURL(ifr.src); // URL
this.dialogFormVisible = false;
},
handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
exChange(row, rowList) {
//this.listLoading = true;
var that = this;
if (rowList.length) {
that.expands = [];
if (row) {
that.expands.push(row.id); // id
}
} else {
that.expands = [];
}
},
//
getList(data) {
this.listLoading = true;
if (data != undefined) {
this.listQuery.SkipCount = (this.page - 1) * data.limit;
} else {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
if (this.listQuery.billNum != "") {
this.listQuery.billNum = this.listQuery.billNum;
}
if (this.listQuery.Vin != "") {
this.listQuery.Vin = this.listQuery.Vin;
}
if (this.listQuery.HostSN != "") {
this.listQuery.HostSN = this.listQuery.HostSN;
}
this.listQuery.partType = this.listQuery.partType;
var getdate5 = JSON.stringify(this.PrintTimeValue);
if (getdate5 != "[]") {
this.listQuery.beginPrintDate = this.PrintTimeValue
? this.PrintTimeValue[0] || undefined
: undefined;
this.listQuery.endPrintDate = this.PrintTimeValue
? this.PrintTimeValue[1] || undefined
: undefined;
} else {
this.listQuery.beginPrintDate = undefined;
this.listQuery.endPrintDate = undefined;
}
if (this.customerInfo.productLine != "") {
this.listQuery.ProductLine = this.customerInfo.productLine;
}
console.log(JSON.stringify(this.listQuery));
this.$axios
.posts(
"/api/newjit/MenBanPackingList/MenBanPackingList-List",
this.listQuery
)
.then((response) => {
response.items.forEach((item)=>{
if(item.printType == 0)
{
item.printType = "正常打印";
}
else if(item.printType == 1)
{
item.printType = "重打";
}
else
{
item.printType = "补打";
}
});
this.list = response.items;
this.totalCount = response.totalCount;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
//-
handleUpdate(row) {
var MBVin1 = [];
let myalert = ""; //使
if (row) {
//
MBVin1.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
MBVin1.push(id);
});
myalert = "选中项";
}
// let MBVin1 = this.multipleSelection[0].id;
let MBId = MBVin1;
var params = {
printType: 1,
productLine: this.customerInfo.productLine,
reportIdList: MBId,
};
console.log("门板打印-主界面传过来的值:" + JSON.stringify(params));
this.$axios
.posts("/api/newjit/bill-m100/print-menban-packing-list", params)
.then((response) => {
//alert(response.status);
const index = this.list.indexOf(row);
if (response.status === false) {
this.$message({
message: response.message,
type: "error",
});
return;
} else {
this.fileQuery.dataname = JSON.stringify(response.item);
console.log(
"门板-调用Handlers/Handler1.ashx?report=menban传的值:" +
JSON.stringify(this.fileQuery.dataname)
);
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=menban",
qs.stringify(this.fileQuery)
)
.then((response) => {
this.printpdf(response); //
});
this.getList();
}
})
.catch(() => {});
// this.isEdit = true;
// if (this.multipleSelection.length != 1) {
// this.$message({
// message: "",
// type: "warning",
// });
// return;
// } else {
// //this.fetchData(this.multipleSelection[0].id);
// //
// let MBVin1 = this.multipleSelection[0].id;
// let MBId = [MBVin1];
// var params = {
// printType: 1,
// productLine: this.customerInfo.productLine,
// reportIdList: MBId,
// };
// console.log("-" + JSON.stringify(params));
// this.$axios
// .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
// .then((response) => {
// //alert(response.status);
// const index = this.list.indexOf(row);
// if (response.status === false) {
// this.$message({
// message: response.message,
// type: "error",
// });
// return;
// } else {
// this.fileQuery.dataname = JSON.stringify(response.item);
// console.log(
// "-Handlers/Handler1.ashx?report=menban" +
// JSON.stringify(this.fileQuery.dataname)
// );
// this.$axios
// .posts(
// "/Handlers/Handler1.ashx?report=menban",
// qs.stringify(this.fileQuery)
// )
// .then((response) => {
// this.printpdf(response); //
// });
// this.getList();
// }
// })
// .catch(() => {});
// }
},
//-
handleDelete(row) {
//
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否作废" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/newjit/MenBanPackingList/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "作废成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
fetchData(id) {
//
this.$axios
.gets("/api/newjit/assembly-cfg-erp/" + id)
.then((response) => {
this.form = response.item;
//this.details = response.item.details;
//console.log(this.details);
});
},
/** 重置按钮操作 */
resetQuery(refName) {
this.$refs[refName].resetFields();
this.PrintTimeValue = [];
this.handleQuery();
this.getProductLine();
},
/** 搜索按钮操作 */
handleQuery() {
this.listQuery.SkipCount = 1;
//this.getList();
},
selectValue(params) {
//
this.versionValue = params.value;
this.getList();
},
selectOptionsChange(item) {
this.getList();
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property == "printDate" || column.property == "receiveTime") {
var date = row[column.property];
if (date == undefined) {
return "";
}
return moment(date).format("YYYY-MM-DD HH:mm:ss");
}
return row[column.property] || "--";
},
roleFilter(type) {
return projectTypeKeyValue[type];
},
//
handleFilter() {
this.page = 1;
this.getList();
},
sortChange(data) {
const { prop, order } = data;
if (!prop || !order) {
this.handleFilter();
return;
}
this.listQuery.Sorting = prop + " " + order;
this.handleFilter();
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
if (column.property === "qty") {
return { textAlign: "right" };
} else {
return { textAlign: "left" };
}
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
if (column.property === "qty") {
return { textAlign: "right", background: "#FAFAFA" };
} else {
return { textAlign: "left", background: "#FAFAFA" };
}
},
handleRowClick(row, column, event) {
//this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
closeDialog() {},
},
};
</script>
<style lang="scss" scoped>
@import "../../../pg-fis/styles/crmtable.scss";
.divider1 {
margin: 0;
}
.divider2 {
margin: 10px;
margin-bottom: 20px;
width: 95%;
}
.label1 {
margin-left: 5px;
margin-right: 5px;
}
</style>

2
vue/src/views/pg-fis/basedate/m100Online/detailMB.vue

@ -686,7 +686,7 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property == "printDate" || column.property == "receiveTime") {
var date = row[column.property];

2
vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue

@ -667,7 +667,7 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property == "printDate" || column.property == "receiveTime") {
var date = row[column.property];

4
vue/src/views/pg-fis/basedate/m100Online/index-old.vue

@ -497,7 +497,7 @@ export default {
],
},
billState: [
{ id: 2, name: "已匹配" },
{ id: 2, name: "未打印" },
{ id: 3, name: "已打印" },
],
valueSelect: "",
@ -817,7 +817,7 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property == "onlineTime" || column.property == "receiveTime") {
var date = row[column.property];

4
vue/src/views/pg-fis/basedate/m100Online/index.vue

@ -515,7 +515,7 @@ export default {
],
},
billState: [
{ id: 2, name: "已匹配" },
{ id: 2, name: "未打印" },
{ id: 3, name: "已打印" },
],
valueSelect: "",
@ -841,7 +841,7 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property == "onlineTime" || column.property == "receiveTime") {
var date = row[column.property];

130
vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue

@ -85,6 +85,15 @@
>
<strong>重新打印门板</strong></el-button
>
<!-- <el-button
v-show="this.listQuery.productType === 1"
@click="drawerbudaMBPrint = true"
size="mini"
type="warning"
plain
>
<strong>门板补打</strong></el-button
> -->
<el-button
v-show="this.listQuery.productType === 1"
@click="drawerMBDelete = true"
@ -150,11 +159,21 @@
>
<RepetitionMB v-bind:customerInfosMB="customerInfosMB"></RepetitionMB>
</el-drawer>
<!--门板补打-->
<el-drawer
title="门板补打"
:visible.sync="drawerbudaMBPrint"
direction="rtl"
size="65%"
>
<budaMB v-bind:customerInfosMB="customerInfosMB"></budaMB>
</el-drawer>
<!--门板作废-->
<el-drawer
title="门板作废"
:visible.sync="drawerMBDelete"
direction="rtl"
@open="opens()"
size="65%"
>
<ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB>
@ -406,6 +425,7 @@ import ZHBDetail from "./detailZHB.vue";
import { downloadFile } from "@/utils/crmindex.js";
import qs from "qs";
import RepetitionMB from "./RepetitionMB.vue";
import budaMB from "./budaMB.vue";
import RepetitionZHB from "./RepetitionZHB.vue";
import ScrapMB from "./ScrapMB.vue";
import ScrapZHB from "./ScrapZHB.vue";
@ -424,6 +444,7 @@ export default {
RepetitionZHB,
ScrapMB,
ScrapZHB,
budaMB,
},
directives: { permission },
filters: {
@ -447,17 +468,18 @@ export default {
};
return {
content01: "",
content05: "",
content07: "",
content08: "",
// minute01: this.timeoutMinutes,
// minute05: this.timeoutMinutes,
// lastTime01: "14:00",
// lastTime05: "14:40",
content05: "",
content07: "",
content08: "",
// minute01: this.timeoutMinutes,
// minute05: this.timeoutMinutes,
// lastTime01: "14:00",
// lastTime05: "14:40",
crmType: "M100Online",
//productLineList:null,
isDisable: false,
drawerMBPrint: false,
drawerbudaMBPrint: false,
drawerMBDelete: false,
drawerZHBPrint: false,
drawerZHBDelete: false,
@ -507,6 +529,7 @@ export default {
productType: 1, //1:2:
ProductLine: undefined,
Version: undefined,
printBillNum: undefined,
serialNumBegin: undefined,
serialNumEnd: undefined,
HostSNBegin: undefined,
@ -606,7 +629,7 @@ export default {
let timer = setInterval(() => {
this.open();
}, 50000);
}, 5000);
},
created() {
this.billState.forEach((element, index) => {
@ -674,7 +697,7 @@ export default {
tempsTabs.push({
label: "柱护板状态",
prop: "printbillnum",
prop: "printBillNum",
width: 120,
});
@ -688,16 +711,36 @@ export default {
...mapGetters(["userInfo"]), //
},
methods: {
opens() {
debugger;
this.getList();
},
open() {
//console.log("-11111111111111111111111111111111111111111" );
// let productLineList = [];
// //console.log("-11111111111111111111111111111111111111111" );
// productLineList.forEach(element => {
// element=this.listQuery.productLine;
// });
//let productLineList = { productLineList: [this.listQuery.productLine] };
this.$refs.sp01.Visible = false;
this.$refs.sp05.Visible = false;
this.$refs.sp07.Visible = false;
this.$refs.sp08.Visible = false;
let productLineList = { productLineList: [this.listQuery.productLine] };
let productLineListMain = { productLineList: [] };
this.PLChildList.forEach((itm) => {
productLineListMain.productLineList.push(itm.productLineCode);
});
console.log("门版-主界面传过来的值:" + JSON.stringify(productLineList));
console.log(
"门版-主界面传过来的值:" + JSON.stringify(productLineListMain)
);
this.$axios
.posts(
"/api/newjit/bill-m100/product-line-timeout-remind",
productLineList
productLineListMain
)
.then((response) => {
if (response.status == false) {
@ -713,60 +756,72 @@ export default {
if (response.item !== null) {
response.item.forEach((JKITEM) => {
if (JKITEM.productLine = "01") {
this.content01 = "01生产线已经" + JKITEM.timeoutMinutes + "分钟没收到报文";
if (JKITEM.productLine == "01") {
this.$refs.sp01.Visible = true;
this.content01 =
"01生产线已经" +
JKITEM.timeoutMinutes +
"分钟没收到报文\xa0\xa0\xa0\xa0";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//
console.log(
"222222222222222222222222222222222222222222222222"
);
this.$refs.sp01.style.color = "red";
this.$refs.sp01.style.fontWeight = "bold";
}
else{
this.$refs.sp01.style.fontWeight = "bold";
} else {
this.$refs.sp01.style.color = "green";
}
}
if(JKITEM.productLine = "05") {
this.content05 = "05生产线已经" + JKITEM.timeoutMinutes + "分钟没收到报文";
if (JKITEM.productLine == "05") {
this.$refs.sp05.Visible = true;
this.content05 =
"05生产线已经" +
JKITEM.timeoutMinutes +
"分钟没收到报文\xa0\xa0\xa0\xa0";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//
console.log(
"222222222222222222222222222222222222222222222222"
);
this.$refs.sp05.style.color = "red";
this.$refs.sp05.style.fontWeight = "bold";
}
else{
this.$refs.sp05.style.fontWeight = "bold";
} else {
this.$refs.sp05.style.color = "green";
}
}
if(JKITEM.productLine = "07") {
this.content07 = "07生产线已经" + JKITEM.timeoutMinutes + "分钟没收到报文";
if (JKITEM.productLine == "07") {
this.$refs.sp07.Visible = true;
this.content07 =
"07生产线已经" +
JKITEM.timeoutMinutes +
"分钟没收到报文\xa0\xa0\xa0\xa0";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//
console.log(
"222222222222222222222222222222222222222222222222"
);
this.$refs.sp07.style.color = "red";
this.$refs.sp07.style.fontWeight = "bold";
}
else{
this.$refs.sp07.style.fontWeight = "bold";
} else {
this.$refs.sp07.style.color = "green";
}
}
if(JKITEM.productLine = "08") {
this.content08 = JKITEM.productLine+"生产线已经" + JKITEM.timeoutMinutes + "分钟没收到报文";
if (JKITEM.productLine == "08") {
this.$refs.sp08.Visible = true;
this.content08 =
JKITEM.productLine +
"生产线已经" +
JKITEM.timeoutMinutes +
"分钟没收到报文";
if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
//
console.log(
"222222222222222222222222222222222222222222222222"
);
this.$refs.sp08.style.color = "red";
this.$refs.sp08.style.fontWeight = "bold";
}
else{
this.$refs.sp08.style.fontWeight = "bold";
} else {
this.$refs.sp08.style.color = "green";
}
}
@ -1018,6 +1073,9 @@ export default {
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property === "zHBBillStatus") {
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property == "onlineTime" || column.property == "receiveTime") {
var date = row[column.property];
if (date == undefined) {
@ -1350,6 +1408,7 @@ export default {
},
save() {
this.$refs.form.validate((valid) => {
if (valid) {
//this.listLoaddingPrint = true;
if (this.isShowHostSN === true) {
@ -1429,6 +1488,7 @@ export default {
// setTimeout(() => {
// this.isDisable = false;
// }, 1000);
if (response.item.length > 0) {
//
this.$confirm(
@ -1506,6 +1566,8 @@ export default {
message: response.message,
type: "error",
});
this.isDisable=false;
return;
} else {
//grid++jsonbase64

28
vue/src/views/pg-fis/basedate/r100Online/index.vue

@ -127,7 +127,7 @@
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
type="datetimerange" :default-time="['00:00:00','23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
@ -141,7 +141,7 @@
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
type="datetimerange" :default-time="['00:00:00','23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
@ -211,7 +211,7 @@
stripe
border
highlight-current-row
style="width: 100%"
style="width: 100%;margin-top:30px"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
@ -239,6 +239,7 @@
sortable="custom"
show-overflow-tooltip
:gutter="0"
>
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
@ -406,6 +407,7 @@ export default {
};
},
mounted() {
this.getList();
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
@ -426,7 +428,7 @@ export default {
computed: {
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120});
// tempsTabs.push({
// label: "",
// prop: "vin",
@ -439,7 +441,7 @@ export default {
// });
tempsTabs.push({
label: "单据状态",
prop: "billState",
prop: "billStatus",
width: 150,
});
tempsTabs.push({
@ -470,18 +472,18 @@ export default {
tempsTabs.push({
label: "总成名称",
prop: "erpAssemblyName",
width: 180,
width: 400,
});
tempsTabs.push({
label: "产线",
prop: "productLine",
width: 120,
});
tempsTabs.push({
label: "状态",
prop: "billStatus",
width: 120,
});
// tempsTabs.push({
// label: "",
// prop: "billStatus",
// width: 120,
// });
tempsTabs.push({
label: "备注",
prop: "remark",
@ -512,7 +514,7 @@ export default {
this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
console.log(JSON.stringify(this.listQuery));
this.$axios
.posts("//api/newjit/bill-r100/export-erp-assembly-code", this.listQuery)
.posts("/api/newjit/bill-r100/export-erp-assembly-code", this.listQuery)
.then((res) => {
let filename = res.item;
this.$axios
@ -603,7 +605,7 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "billStatus") {
return { 0: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
return { 0: "未匹配", 2: "未导出", 3: "已导出" }[row[column.property]];
}
if (column.property == "onlineTime" || column.property == "receiveTime") {
var date = row[column.property];

35
vue/src/views/pg-fis/basedate/repeatR100/index.vue

@ -101,18 +101,27 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="底盘号:" prop="VINBegin" v-show="isVINShowState">
<el-input
v-model="listQuery.VINBegin"
placeholder=""
clearable
size="small"
style="width: 240px"
:visible.sync="dialogTableVisible"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="底盘号:" prop="VINBegin">
<el-input
v-model="listQuery.VINBegin"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="VINEnd">
<el-input
v-model="listQuery.VINEnd"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="车型代码" prop="vehicleModelCode">
<el-select
@ -384,6 +393,8 @@ export default {
HostSNBegin: undefined,
HostSNEnd: undefined,
VIN: undefined,
VINBegin: undefined,
VINEnd: undefined,
OnlineTimeBegin: undefined,
OnlineTimeEnd: undefined,
ReceiveTimeBegin: undefined,
@ -482,7 +493,7 @@ export default {
});
tempsTabs.push({
label: "产线",
prop: "printNum",
prop: "productLine",
width: 150,
});
tempsTabs.push({

327
vue/src/views/pg-fis/basedate/select/index.vue

@ -9,7 +9,7 @@
v-show="showSearch"
:inline="true"
>
<el-form-item label="生产线:" prop="productType">
<el-form-item label="生产线:" prop="productType">
<el-select
v-model="listQuery.productType"
clearable
@ -43,148 +43,150 @@
/>
</el-select>
</el-form-item>
<el-form-item label="版本:" prop="Version">
<el-input
v-model="listQuery.Version"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- </el-row> -->
<el-form-item label="流水号:" prop="serialNumBegin">
<el-input
v-model="listQuery.serialNumBegin"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="serialNumEnd">
<el-input
v-model="listQuery.serialNumEnd"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-row> -->
<el-form-item label="大众顺序号:" prop="HostSNBegin">
<el-input
v-model="listQuery.HostSNBegin"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="HostSNEnd">
<el-input
v-model="listQuery.HostSNEnd"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="KNR:" prop="KNRBegin">
<el-input
v-model="listQuery.KNRBegin"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="KNREnd">
<el-input
v-model="listQuery.KNREnd"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- </el-row> -->
<!-- <el-row> -->
<el-form-item label="底盘号:" prop="VINBegin">
<el-input
v-model="listQuery.VINBegin"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="VINEnd">
<el-input
v-model="listQuery.VINEnd"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="版本:" prop="Version">
<el-input
v-model="listQuery.Version"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- </el-row> -->
<el-form-item label="流水号:" prop="serialNumBegin">
<el-input
v-model="listQuery.serialNumBegin"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="serialNumEnd">
<el-input
v-model="listQuery.serialNumEnd"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-row> -->
<el-form-item label="大众顺序号:" prop="hostSN">
<el-input
v-model="listQuery.HostSNBegin"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="-" prop="HostSNEnd">
<el-input
v-model="listQuery.HostSNEnd"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="上线日期">
<el-date-picker
v-model="listQuery.OnlineTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<!-- </el-row> -->
<!-- <el-row> -->
<el-form-item label="接收日期">
<el-date-picker
v-model="listQuery.ReceiveTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="单据状态" prop="State" v-show="isShowState">
<el-checkbox-group v-model="listQuery.state">
<el-checkbox
v-for="(item, index) in billState"
:key="item.id"
:label="item.id"
@change="checkedListChange(index)"
>
{{ item.name }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="KNR:" prop="KNRBegin">
<el-input
v-model="listQuery.KNRBegin"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="KNREnd">
<el-input
v-model="listQuery.KNREnd"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- </el-row> -->
<!-- <el-row> -->
<el-form-item label="底盘号:" prop="VINBegin">
<el-input
v-model="listQuery.VINBegin"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="VINEnd">
<el-input
v-model="listQuery.VINEnd"
placeholder=""
clearable
size="small"
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="上线日期">
<el-date-picker
v-model="listQuery.OnlineTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
:default-time="['00:00:00', '23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<!-- </el-row> -->
<!-- <el-row> -->
<el-form-item label="接收日期">
<el-date-picker
v-model="listQuery.ReceiveTimeValue"
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
:default-time="['00:00:00', '23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="单据状态" prop="State" v-show="isShowState">
<el-checkbox-group v-model="listQuery.state">
<el-checkbox
v-for="(item, index) in billState"
:key="item.id"
:label="item.id"
@change="checkedListChange(index)"
>
{{ item.name }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item style="margin-top: -10px">
<el-form-item >
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleFilter"
>搜索</el-button
>
<el-button
@ -441,6 +443,7 @@ export default {
}
};
return {
chkindex: 0, //
crmType: "select",
drawerZHB: false,
drawerMB: false,
@ -484,6 +487,7 @@ export default {
productType: 1, //1:2:
ProductLine: undefined,
Version: undefined,
printBillNum: undefined,
serialNumBegin: undefined,
serialNumEnd: undefined,
HostSNBegin: undefined,
@ -501,6 +505,7 @@ export default {
billStatus: undefined,
state: [],
ZHBBillStatus: undefined,
Description:undefined
},
listExportQuery: {
erpAssemblyCode: undefined,
@ -628,12 +633,17 @@ export default {
prop: "billStatus",
width: 120,
});
tempsTabs.push({
label: "柱护板状态",
prop: "printBillNum",
width: 120,
});
tempsTabs.push({
label: "不可打印",
prop: "CanNotPrint",
prop: "canNotPrint",
width: 120,
});
tempsTabs.push({
tempsTabs.push({
label: "R100上线时间",
prop: "r100OnlineTime",
width: 150,
@ -645,7 +655,7 @@ export default {
});
tempsTabs.push({
label: "备注",
prop: "remark",
prop: "description",
width: 120,
});
return tempsTabs;
@ -775,8 +785,17 @@ export default {
/** 格式化字段 */
fieldFormatter(row, column) {
if(column.property === "printBillNum"){
let value = row[column.property]
if(value!=null&&value.length > 0){
return "柱护板已打印";
}
else{
return "柱护板未打印";
}
}
if (column.property === "billStatus") {
return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
}
if (column.property == "onlineTime" || column.property == "receiveTime") {
var date = row[column.property];
@ -785,6 +804,9 @@ export default {
}
return moment(date).format("YYYY-MM-DD HH:mm:ss");
}
if (column.property === "canNotPrint") {
return { true: "是", false: "否" }[row[column.property]];
}
return row[column.property] || "--";
},
roleFilter(type) {
@ -805,19 +827,32 @@ export default {
this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
}
if (this.listQuery.state !== undefined) {
this.listQuery.billStatus = this.listQuery.state[0];
}
if (this.listQuery.productType === 2) {
this.listQuery.ZHBBillStatus = 2;
if (this.chkindex == 2) {
//
this.listQuery.canNotPrint = true;
this.listQuery.billStatus = null;
this.listQuery.ZHBBillStatus = null;
} else {
this.listQuery.ZHBBillStatus = 0;
this.listQuery.canNotPrint = null;
if (this.listQuery.state !== undefined) {
this.listQuery.billStatus = this.listQuery.state[0];
}
if (this.listQuery.productType === 2) {
this.listQuery.ZHBBillStatus = this.listQuery.billStatus;
} else {
this.listQuery.ZHBBillStatus = null;
}
}
console.log("M100查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.gets("/api/newjit/bill-m100/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
console.log("M100结果:" + JSON.stringify(this.list));
setTimeout(() => {
//
this.listLoading = false;
@ -1495,6 +1530,8 @@ export default {
},
/*单据状态变更 */
checkedListChange(index) {
this.chkindex = index;
if (this.listQuery.state.length <= 1) {
this.listQuery.state.push(this.billState[index].id);
} else {

138
vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue

@ -1,64 +1,68 @@
<!--未知总成-明细数据-->
<template>
<div class="cr-body-content">
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<el-table-column
label="客户零件代码"
prop="partCode "
sortable="custom"
align="center"
width="220px"
>
<template slot-scope="scope">
<span>{{ scope.row.partCode }}</span>
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in getDefaultField"
:key="index"
:prop="item.prop"
:label="item.label"
:min-width="item.width"
:formatter="fieldFormatter"
sortable="custom"
show-overflow-tooltip
:gutter="0"
>
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
</el-table-column>
</el-table>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination
v-show="totalCount > 0"
:total="totalCount"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
</div>
<div>
<table style="width: 99%">
<tr>
<td>
<div class="cr-body-content">
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<el-table-column
label="客户零件代码"
prop="partCode "
sortable="custom"
align="center"
width="220px"
>
<template slot-scope="scope">
<span>{{ scope.row.partCode }}</span>
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in getDefaultField"
:key="index"
:prop="item.prop"
:label="item.label"
:min-width="item.width"
:formatter="fieldFormatter"
sortable="custom"
show-overflow-tooltip
:gutter="0"
>
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
</el-table-column>
</el-table>
</div>
</td>
</tr>
<tr style="height: 20px">
<td>
<div align="center">{{ pagecount }}条数据</div>
</td>
</tr>
</table>
</div>
</template>
@ -68,6 +72,7 @@ import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import { downloadFile } from "@/utils/crmindex.js";
import Detail from "./detail";
import { logger } from "runjs/lib/common";
export default {
name: "sendUnsettledDiffReport",
@ -83,6 +88,7 @@ export default {
return statusMap[status];
},
},
pagecount: 0,
props: {
customerInfos: {
type: Array,
@ -139,15 +145,23 @@ export default {
formTitle: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 30,
tableHeight: document.documentElement.clientHeight - 30 - 50,
isEdit: false,
};
},
mounted() {
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 67 - 79 - 50; //57footer79
//this.tableHeight = offsetHei -260
});
var self = this;
window.onresize = function () {
var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 30;
self.tableHeight = offsetHei - 30 - 50;
};
},
created() {
@ -203,6 +217,8 @@ export default {
.gets("/api/newjit/unknown-assembly/" + this.customerInfo.parentId)
.then((response) => {
this.list = response.item.unknownAssemblyParts;
this.pagecount = response.item.unknownAssemblyParts.length;
//console.log("pagecountpagecountpagecountpagecountpagecount" + JSON.stringify(this.pagecount));
setTimeout(() => {
//
this.listLoading = false;

91
vue/src/views/pg-fis/basedate/unknownAssembly/index.vue

@ -87,6 +87,7 @@
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
:default-time="['00:00:00', '23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
@ -156,6 +157,16 @@
>导出(Excel)
</el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
style="margin-left: 15px"
@click="handleDownloadNotRepeat()"
>导出(不重复)
</el-button>
<el-button
class="filter-item"
plain
@ -185,22 +196,22 @@
size="small"
stripe
highlight-current-row
style="width: 100%;margin-top: -25px"
style="width: 100%; margin-top: -25px"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<el-table-column type="selection" width="44px"></el-table-column>
<el-table-column
label="底盘号"
prop="vin"
label="大众顺序号"
prop="hostSN"
sortable
align="center"
width="180px"
width="110px"
>
<template slot-scope="scope">
<span class="link-type" @click="handleDrawerOpen(scope.row)">{{
scope.row.vin
scope.row.hostSN
}}</span>
</template>
</el-table-column>
@ -603,6 +614,7 @@ export default {
KNR: undefined,
VIN: undefined,
ScanPoint: undefined,
BillDescription: undefined,
},
listUnknownAssemblyQuery: {
billId: "",
@ -697,10 +709,15 @@ export default {
computed: {
getDefaultField() {
var tempsTabs = [];
// tempsTabs.push({
// label: "",
// prop: "hostSN",
// width: 150,
// });
tempsTabs.push({
label: "大众顺序号",
prop: "hostSN",
width: 150,
label: "底盘号",
prop: "vin",
width: 180,
});
tempsTabs.push({
label: "KNR",
@ -724,7 +741,7 @@ export default {
});
tempsTabs.push({
label: "车型名称",
prop: "vehicleModelName",
prop: "",
width: 150,
});
tempsTabs.push({
@ -732,12 +749,22 @@ export default {
prop: "version",
width: 150,
});
tempsTabs.push({ label: "客户零件数量", prop: "partNum", width: 135 });
tempsTabs.push({
label: "文件名",
prop: "fileName",
width: 180,
label: "单据描述",
prop: "billDescription",
width: 150,
});
tempsTabs.push({
label: "备注",
prop: "description",
width: 120,
});
// tempsTabs.push({
// label: "",
// prop: "version",
// width: 150,
// });
tempsTabs.push({ label: "客户零件数量", prop: "partNum", width: 135 });
return tempsTabs;
},
},
@ -892,11 +919,46 @@ export default {
});
});
},
/** 不重复导出功能 */
handleDownloadNotRepeat() {
this.listLoading = true;
this.$axios
.posts("/api/newjit/unknown-assembly/export-not-repeat", this.listQuery)
.then((res) => {
let filename = res.item;
this.$axios
.BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
.then((response) => {
if (filename.indexOf("_") != -1) {
let downName =
filename.slice(0, filename.lastIndexOf("_")) +
filename.slice(filename.lastIndexOf("."));
downloadFile(response, downName);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
} else {
downloadFile(response, filename);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
}
this.listLoading = false;
});
});
},
/** 重置按钮操作 */
resetQuery(refName) {
this.OnlineTimeValue = [];
this.$refs[refName].resetFields();
this.handleQuery();
},
/** 搜索按钮操作 */
handleQuery() {
@ -989,6 +1051,7 @@ export default {
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
console.log("未知总成" + JSON.stringify(this.listQuery));
setTimeout(() => {
//
this.listLoading = false;
@ -1519,7 +1582,7 @@ export default {
alert("输入不正确,请确认!");
}
} else if (this.rightRowTemp.length !== 0) {
/* 右侧移动到左侧 */
/* 右侧移动到左侧 */
console.log("R->F");
if (
this.numFormData.num <= this.rightRowTemp[0].partNum &&

13
vue/src/views/pg-fis/basedate/weldingAssembly/index.vue

@ -45,9 +45,9 @@
</el-select>
</el-form-item>
<el-form-item label="版本:" prop="Version">
<el-form-item label="版本:" prop="version">
<el-input
v-model="listQuery.Version"
v-model="listQuery.version"
placeholder=""
clearable
size="small"
@ -147,7 +147,7 @@
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
type="datetimerange" :default-time="['00:00:00','23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
@ -161,7 +161,7 @@
size="small"
style="width: 380px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
type="datetimerange" :default-time="['00:00:00','23:59:59']"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
@ -179,7 +179,7 @@
</el-checkbox-group>
</el-form-item>
<el-form-item style="margin-top: -20px;">
<el-form-item >
<el-button
type="primary"
icon="el-icon-search"
@ -425,6 +425,7 @@ export default {
};
},
mounted() {
this.getList();
this.$nextTick(() => {
var offsetHei = document.documentElement.clientHeight;
//console.log(offsetHei);
@ -693,7 +694,7 @@ export default {
column.property == "r100BillStatus" ||
column.property == "m100BillStatus"
) {
return { 1: "未匹配", 2: "已匹配", 3: "已发布" }[row[column.property]];
return { 1: "未匹配", 2: "未打印", 3: "已发布" }[row[column.property]];
}
return row[column.property] || "--"; //|| "--"m1000
},

605
vue/src/views/ux/basedata/partsSettlement/index.vue

@ -0,0 +1,605 @@
<!--总成与结算件关系页-->
<template>
<div class="cr-body-content">
<flexbox class="content-header">
<span>版本:</span>
<XhJSSelect
:options="versionList"
style="width: 200px"
class="search-container"
@value-change="selectValue"
></XhJSSelect>
<span>适用功能</span>
<el-select
v-model="valueSelect"
clearable
placeholder="请选结算或二配"
size="medium"
style="margin-right: 15px"
@change="valueselectChange"
>
<el-option label="结算" value="R0003"></el-option>
<el-option label="二配" value="R0001"></el-option>
</el-select>
<el-button
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="handleImportExcel()"
>导入文件Excel
</el-button>
<el-button
class="filter-item"
size="mini"
type="warning"
icon="el-icon-bottom"
@click="handleDownload()"
>导出Excel
</el-button>
<el-input
v-model="searchContent"
clearable
size="small"
placeholder="按照ERP物料号搜索..."
style="width: 200px"
class="search-container"
@keyup.enter.native="handleFilter"
/>
<el-button
size="mini"
type="success"
icon="el-icon-search"
@click="handleFilter"
>搜索
</el-button>
<!--表格头组件filter查询-->
<c-r-m-table-head
ref="crmTableHead"
:crm-type="crmType"
@handle="handleHandle"
@filter="handleFilters"
>
</c-r-m-table-head>
</flexbox>
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading.fullscreen.lock="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<el-table-column
label="版本"
prop="version"
sortable="custom"
align="center"
width="100px"
><!-- fixed 默认固定在左边-->
<template slot-scope="scope">
<el-tooltip :content="scope.row.version" placement="top">
<span class="link-type">{{ scope.row.version }}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
v-for="(item, index) in getDefaultField"
:key="index"
:prop="item.prop"
:label="item.label"
:min-width="item.width"
:formatter="fieldFormatter"
sortable="custom"
show-overflow-tooltip
:gutter="0"
>
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
</el-table-column>
</el-table>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination
v-show="totalCount > 0"
:total="totalCount"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
<!-- 导入Excel组件 -->
<importExcel
ref="importexcel"
:show="showExcelImport"
:crmType="crmType"
@close="importExcelData"
/>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import importExcel from "@/components/ImportExcel-hq";
import CRMTableHead from "../../components/CRMTableHead";
import moment from "moment";
import Lockr from "lockr";
import { downloadFile } from "@/utils/crmindex.js";
import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
export default {
name: "MaterialRelationshipDetail",
components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
props: {
customerInfos: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
crmType: "materialRelation",
versionValue: "",
valueSelect: "R0003",
versionList: [], //
rules: {
//
erpMaterialCode: [
{ required: true, message: "必须输入!", trigger: "blur" },
],
},
searchContent: "", //
customerInfo: {
settleAccountId: "",
},
form: {
dicDetailID: "",
customerId: "",
projectId: "",
},
list: null,
totalCount: 0,
listLoading: true,
formLoading: false,
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listVersionQuery: {
SkipCount: 0,
MaxResultCount: 15,
},
listQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
//OrgID:"",
SkipCount: 0,
MaxResultCount: 15,
version: "",
customerCode: ""
},
listExportQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
//OrgID:"",
SkipCount: 0,
MaxResultCount: 15,
version: "",
fileType: 0,
userId: "",
},
page: 1,
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 260,
isEdit: false,
};
},
mounted() {
var self = this;
window.onresize = function () {
var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 260;
};
},
created() {
this.getVersionInfo();
//if (this.versionList == []) {
this.getList();
// }
},
computed: {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({
label: "适配功能",
prop: "customerCode",
width: 150,
});
tempsTabs.push({
label: "ERP物料号",
prop: "erpMaterialCode",
width: 150,
});
tempsTabs.push({
label: "ERP物料描述",
prop: "materialDesc",
width: 250,
});
tempsTabs.push({
label: "结算物料号",
prop: "settleMaterialCode",
width: 120,
});
tempsTabs.push({
label: "数量",
prop: "qty",
width: 120,
});
return tempsTabs;
},
MoreTypes() {
var moreTypes = [];
moreTypes.push({ type: "updateFis", name: "更新FIS结算数据" });
//moreTypes.push({ type: "enter", name: "" });
return moreTypes;
},
},
methods: {
handleImportExcel() {
//
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
},
selectValue(params) {
//
this.versionValue = params.value;
this.getList();
},
valueselectChange(data) {
//alert(data);
//
this.valueSelect = data;
this.getList();
},
handleTypeDrop(command, params = {}) {
if (command == "updateFis") {
this.listLoading = true;
//this.listQuery.SkipCount = (this.page - 1) * 10000;
this.$axios
.posts("/api/settleaccount/MaterialRelationshipDetail/updateFis")
.then((res) => {
if (res == true) {
this.$notify({
title: "成功",
message: "FIS数据-更新成功!",
type: "success",
duration: 2000,
});
} else {
this.$message({
type: "warning",
message: "FIS数据-更新失败!",
});
}
this.listLoading = false;
});
} else if (command == "enter") {
}
},
selectOptionsChange(item) {
this.getList();
},
getVersionInfo() {
//
//this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 1000;
this.$axios
.posts(
"/api/settleaccount/MaterialRelationshipDetail/versionlist",
this.listQuery
)
.then((response) => {
this.versionList = [];
response.items.forEach((element) => {
let options = {};
options.value = element.id;
options.label = element.version;
this.versionList.push(options);
});
const res = new Map()
this.versionList = this.versionList.filter((item) => !res.has(item.label) && res.set(item.label, 1))
if (JSON.stringify(this.versionList) != "[]") {
//
this.versionValue = this.versionList[0].label;
this.getList();
}
})
.catch(() => {
this.listLoading = false;
});
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "customerCode") {
if (row[column.property] === "R0001") {
var vname = "二配";
return vname;
} else if (row[column.property] === "R0003") {
var vname = "结算";
return vname;
} else {
return row[column.property];
}
}
return row[column.property] || "--";
},
importExcelData() {
this.getVersionInfo();
this.listLoading = false;
//
this.showExcelImport = false;
},
//
async handleDownload() {
this.listLoading = true;
if (this.versionValue === "") {
this.$message.error("必需选择版本!");
this.listLoading = false;
return;
}
if (this.valueSelect === "") {
this.$message.error("必需选择适用功能!");
this.listLoading = false;
return;
}
if (this.valueSelect != "") {
this.listQuery.customerCode = this.valueSelect;
}
if (this.versionValue != "") {
this.listQuery.version = this.versionValue;
}
console.log("总成与结算件的导出条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(
"/api/settleaccount/MaterialRelationshipDetail/Export",
this.listQuery
)
.then((res) => {
let fileNameOfProject = res;
this.$axios
.BolbGets(
"/api/settleaccount/getblobfile/download/" + fileNameOfProject
)
.then((response) => {
if (fileNameOfProject.indexOf("_") != -1) {
let downName =
fileNameOfProject.slice(
0,
fileNameOfProject.lastIndexOf("_")
) +
fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
downloadFile(response, downName);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
} else {
downloadFile(response, fileNameOfProject);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
}
this.listLoading = false;
});
});
},
getList() {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
if (this.versionValue != "") {
this.listQuery.version = this.versionValue;
}
if (this.valueSelect != "") {
this.listQuery.customerCode = this.valueSelect;
} else {
this.listQuery.customerCode = "";
}
console.log("列表查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(
"/api/settleaccount/MaterialRelationshipDetail/list",
this.listQuery
)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
fetchData(id) {
//
this.$axios
.gets("/api/settleaccount/MaterialRelationshipDetail/" + id)
.then((response) => {
this.form = response;
});
},
/** 筛选操作 */
handleFilter() {
this.page = 1;
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "erpMaterialCode";
let filter = {
logic: 0,
column: column,
action: 0,
value: this.searchContent,
};
this.listQuery.Filters.push(filter);
}
this.getList();
},
/** 多项筛选操作 */
/** 筛选操作 */
handleFilters(data) {
if (data === null) {
this.listQuery.Filters = [];
this.getList(); //
} else {
this.filterObj = data;
console.log("筛选" + JSON.stringify(data));
var offsetHei = document.documentElement.clientHeight;
var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
this.tableHeight = offsetHei - removeHeight;
this.currentPage = 1;
let Filter = [];
data.forEach((item) => {
let filter = {};
if (item.formType === "datetime" || item.formType === "datetime") {
// (datetime >= a and datetime <=b)
filter["Column"] = item.fieldName;
filter["Logic"] = 0;
filter["Value"] = item.value[0];
filter["Action"] = item.action;
Filter.push(filter);
if (item.value[1] != null) {
filter["Value"] = item.value[1];
filter["Action"] = 5;
Filter.push(filter);
}
} else {
filter["Column"] = item.fieldName;
filter["Value"] = item.value;
filter["Logic"] = 0;
filter["Action"] = item.action;
Filter.push(filter);
}
});
console.log("筛选条件" + JSON.stringify(Filter));
this.listQuery.Filters = Filter;
this.getList();
}
},
resetQuery() {},
sortChange(data) {
const { prop, order } = data;
if (!prop || !order) {
this.handleFilter();
return;
}
this.listQuery.Sorting = prop + " " + order;
console.log(this.listQuery.Sorting);
this.handleFilter();
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
if (column.property === "qty") {
return { textAlign: "left" };
} else {
return { textAlign: "left" };
}
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
if (column.property === "qty") {
return { textAlign: "left", background: "#FAFAFA" };
} else {
return { textAlign: "left", background: "#FAFAFA" };
}
},
handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
},
};
</script>
<style lang="scss" scoped>
@import "../../styles/crmtable.scss";
</style>
<style lang="scss">
.el-table .cell.el-tooltip {
white-space: pre-wrap;
}
</style>

364
vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue

@ -32,17 +32,16 @@
type="success"
icon="el-icon-check"
size="mini"
@click="handleConfirm()"
>已确认(支持批量)</el-button
@click="handleCreateBills()"
>生成出库单(支持批量)</el-button
>
<el-button
class="filter-item"
type="warning"
icon="el-icon-edit"
type="success"
icon="el-icon-check"
size="mini"
v-loading="formLoading"
@click="handleCreateBills()"
>生成出库单(支持批量)</el-button
@click="handleConfirm()"
>已确认</el-button
>
</flexbox>
</div>
@ -64,7 +63,7 @@
</el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔3分钟进行自动刷新</span
>说明每间隔30秒进行自动刷新</span
>
</flexbox>
</div>
@ -107,7 +106,7 @@
</el-table-column>
<!-- 操作名称 -->
<!-- <el-table-column
<el-table-column
prop="actionName"
label="操作名称(单击箭头过滤)"
width="165"
@ -131,7 +130,7 @@
</el-tag>
</div>
</template>
</el-table-column> -->
</el-table-column>
<!-- 状态 -->
<el-table-column
prop="stateName"
@ -817,8 +816,8 @@ export default {
version: "",
materialCode: undefined,
sapCode: undefined,
cp7Begin: undefined,
cp7End: undefined,
cp7begin: undefined,
cp7end: undefined,
kenncode: undefined,
chassisNumber: undefined,
materialGroup: undefined,
@ -863,7 +862,7 @@ export default {
this.listQuery.taskId = "";
this.listQuery.stateName = "";
setTimeout(this.getList, 0);
}, 1000 * 180); //30
}, 1000 * 30); //30
// $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => {
clearInterval(timer);
@ -896,15 +895,15 @@ export default {
prop: "taskId",
width: 120,
});
// tempsTabs.push({
// label: "",
// prop: "name",
// width: 180,
// });
tempsTabs.push({
label: "模块名称",
prop: "name",
width: 170,
});
tempsTabs.push({
label: "创建人",
prop: "email",
width: 150,
width: 110,
});
tempsTabs.push({
label: "创建时间",
@ -914,12 +913,12 @@ export default {
tempsTabs.push({
label: "说明",
prop: "remark",
width: 350,
width: 220,
});
tempsTabs.push({
label: "审批状态",
prop: "fileName",
width: 350,
width: 150,
});
return tempsTabs;
},
@ -935,7 +934,7 @@ export default {
console.log(this.listQuery.Sorting);
this.handleFilter();
},
/** 筛选操作 */
/** 筛选操作 */
handleFilter() {
this.page = 1;
this.getList();
@ -953,234 +952,163 @@ export default {
this.getList();
},
handleSelectionChange(val) {
this.isEdit = false;
this.multipleSelection = [];
this.multipleSelection = val;
},
//
handleConfirm(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
var getbillNum = "";
//
//
this.multipleSelection.forEach((element) => {
let state = element.fileName;
if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
if (this.isEdit == true) {
this.$message({
message:
"已经生成出库单的不能再确认!单号:" +
getbillNum.substr(0, getbillNum.length - 1),
type: "warning",
});
return;
} else {
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否确认" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit",
params
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "操作成功",
type: "success",
duration: 2000,
});
this.getList();
this.$confirm("是否确认" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "操作成功",
type: "success",
duration: 2000,
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
}
});
},
//
handleCreateBills(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
// if (this.multipleSelection.length == 0) {
// this.$message({
// message: "",
// type: "warning",
// });
// return;
// }
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
var getbillNum = "";
//
//
this.multipleSelection.forEach((element) => {
let state = element.fileName;
if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
if (this.isEdit == true) {
this.$message({
message:
"已经生成出库单的不能再重新生成!单号:" +
getbillNum.substr(0, getbillNum.length - 1),
type: "warning",
});
return;
} else {
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.listBillQuery.guids = params;
this.listBillQuery.version = this.JobversionValue;
console.log("出库单条件:" + JSON.stringify(this.listBillQuery));
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.formLoading = true;
this.$axios
.posts(
"/api/settleaccount/wmsjitoutput/WmsJitOutPut",
this.listBillQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
this.formLoading = false;
})
.catch(() => {
this.formLoading = false;
this.listBillQuery.guids = params;
this.listBillQuery.version = this.JobversionValue;
console.log("出库单条件:" + JSON.stringify(this.listBillQuery));
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmsjitoutput/WmsJitOutPut",
this.listBillQuery
)
.then((response) => {
console.log(
"检查柱护板-hostCheckQuery" + JSON.stringify(response)
);
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
}
});
},
//
handleDelete(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
var getbillNum = "";
//
//
this.multipleSelection.forEach((element) => {
let state = element.fileName;
if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
if (this.isEdit == true) {
this.$message({
message:
"已经生成出库单的不能删除!单号:" +
getbillNum.substr(0, getbillNum.length - 1),
type: "warning",
});
return;
} else {
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
}
});
},
//
JobVersionValue(params) {
@ -1351,7 +1279,7 @@ export default {
project: "物料组",
maxResultCount: 1000,
skipCount: 0,
sorting: "value ascending",
sorting:"value ascending"
})
.then((response) => {
this.materialGroupList = [];
@ -1395,10 +1323,10 @@ export default {
this.listExportQuery.end = this.cp5endTime
? this.cp5endTime
: undefined;
this.listExportQuery.cp7Begin = this.startTime
this.listExportQuery.cp7begin = this.startTime
? this.startTime
: undefined;
this.listExportQuery.cp7End = this.endTime ? this.endTime : undefined;
this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
}
@ -1415,7 +1343,7 @@ export default {
JSON.stringify(this.listExportQuery)
);
this.$axios
.posts(
.gets(
"/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
this.listExportQuery
)
@ -1602,11 +1530,13 @@ export default {
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
var item = this.list[rowIndex];
if (column.property === "fileName") {
if (item.fileName === "已确认") {
return { color: "#13CE66", cursor: "pointer", fontWeight: 700 };
} else {
return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 };
if (column.property === "stateName") {
if (item.stateName === "Succeeded") {
return { color: "#71d87f", cursor: "pointer" };
} else if (item.stateName === "Processing") {
return { color: "#d87171", cursor: "pointer" };
} else if (item.stateName === "Failed") {
return { color: "#ff5640", cursor: "pointer" };
}
}
return { textAlign: "left" };

6
vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue

@ -47,7 +47,7 @@
</el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔3分钟进行自动刷新</span
>说明每间隔15秒进行自动刷新</span
>
</flexbox>
</div>
@ -595,7 +595,7 @@ export default {
this.listQuery.taskId = "";
this.listQuery.stateName = "";
setTimeout(this.getList, 0);
}, 1000 * 180); //180
}, 1000 * 15); //15
// $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => {
clearInterval(timer);
@ -989,7 +989,7 @@ export default {
getList() {
this.listLoading = true;
//
this.listQuery.name = "发票与结算核对汇总";
this.listQuery.name = "发票与结算核对汇总";
this.listQuery.type = this.JobversionValue;
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)

37
vue/src/views/ux/billManage/IssuedUnsettled/index.vue

@ -1,4 +1,4 @@
<!--准时化发出未结算明细页-->
<!--发出未结算明细页-->
<template>
<div class="cr-body-content">
<!--功能栏-->
@ -47,7 +47,7 @@
</el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔3分钟进行自动刷新</span
>说明每间隔15秒进行自动刷新</span
>
</flexbox>
</div>
@ -636,14 +636,15 @@ export default {
searchContent: "", //
form: {},
formCount: {
version: "",
materialCode: undefined,
kenncode: undefined,
chassisNumber: undefined,
materialGroup: undefined,
begin: undefined,
end: undefined,
sapMaterialCode: undefined,
startTime: "",
endTime: "",
// name: "",
// settledate: "",
// materialCode: "",
// sapMaterialCode: "",
// chassisNumber: "",
// kennCode: "",
// version: "",
},
list: null,
totalCount: 0,
@ -698,7 +699,7 @@ export default {
this.listQuery.taskId = "";
this.listQuery.stateName = "";
setTimeout(this.getList, 0);
}, 1000 * 180); //15
}, 1000 * 15); //15
// $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => {
clearInterval(timer);
@ -731,11 +732,11 @@ export default {
prop: "taskId",
width: 130,
});
// tempsTabs.push({
// label: "",
// prop: "name",
// width: 170,
// });
tempsTabs.push({
label: "模块名称",
prop: "name",
width: 170,
});
tempsTabs.push({
label: "创建人",
prop: "email",
@ -968,7 +969,7 @@ export default {
JSON.stringify(this.listExportQuery)
);
this.$axios
.posts(
.gets(
"/api/settleaccount/ReportMakeService/UnsettledDetailReportService-Make",
this.listExportQuery
)
@ -1118,7 +1119,7 @@ export default {
getList() {
this.listLoading = true;
//
this.listQuery.name = "准时化未结明细表";
this.listQuery.name = "大众准时化未结明细表";
this.listQuery.type = this.JobversionValue;
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)

12
vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue

@ -708,8 +708,8 @@ export default {
listExportQuery: {
version: "",
materialCode: undefined,
cp7Begin: undefined,
cp7End: undefined,
cp7begin: undefined,
cp7end: undefined,
kenncode: undefined,
chassisNumber: undefined,
materialGroup: undefined,
@ -1014,10 +1014,10 @@ export default {
this.listExportQuery.end = this.cp5endTime
? this.cp5endTime
: undefined;
this.listExportQuery.cp7Begin = this.startTime
this.listExportQuery.cp7begin = this.startTime
? this.startTime
: undefined;
this.listExportQuery.cp7End = this.endTime ? this.endTime : undefined;
this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
}
@ -1029,7 +1029,7 @@ export default {
JSON.stringify(this.listExportQuery)
);
this.$axios
.posts(
.gets(
"/api/settleaccount/ReportMakeService/UnInvoiceSettledDetailDiff-Make",
this.listExportQuery
)
@ -1181,7 +1181,7 @@ export default {
getList() {
this.listLoading = true;
//
this.listQuery.name = "准时化结算数量差异比对输出";
this.listQuery.name = "准时化量差输出";
this.listQuery.type = this.JobversionValue;
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)

15
vue/src/views/ux/billManage/UnSettleDiffExport/index.vue

@ -17,7 +17,7 @@
size="mini"
type="primary"
icon="el-icon-plus"
@click="handleCreate()"
@click="handleCreate"
>统计
</el-button>
<el-button
@ -641,10 +641,6 @@ export default {
formCount: {
startTime: "",
endTime: "",
materialCode: undefined,
kenncode: undefined,
chassisNumber: undefined,
sapCode: undefined,
// name: "",
// settledate: "",
// materialCode: "",
@ -979,7 +975,7 @@ export default {
JSON.stringify(this.listExportQuery)
);
this.$axios
.posts(
.gets(
"/api/settleaccount/ReportMakeService/UnSettleDiffExport-Make",
this.listExportQuery
)
@ -1005,12 +1001,9 @@ export default {
});
},
handleCreate() {
if (this.$refs["formCount"] !== undefined) {
this.$nextTick(() => {
this.$refs["formCount"].resetFields();
}
// this.$nextTick(() => {
// this.$refs["formCount"].resetFields();
// });
});
this.formTitle = "报表统计";
this.isEdit = false;
this.form = {};

4
vue/src/views/ux/billManage/UnSettledDiff/index.vue

@ -966,7 +966,7 @@ export default {
JSON.stringify(this.listExportQuery)
);
this.$axios
.posts(
.gets(
"/api/settleaccount/ReportMakeService/UnSettledDiff-Make",
this.listExportQuery
)
@ -1116,7 +1116,7 @@ export default {
getList() {
this.listLoading = true;
//
this.listQuery.name = "准时化未结明细表";
this.listQuery.name = "未结算对比";
this.listQuery.type = this.JobversionValue;
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)

343
vue/src/views/ux/billManage/kanBanWithCode/index.vue

@ -32,17 +32,16 @@
type="success"
icon="el-icon-check"
size="mini"
@click="handleConfirm()"
>已确认(支持批量)</el-button
@click="handleCreateBills()"
>生成出库单(支持批量)</el-button
>
<el-button
class="filter-item"
type="warning"
icon="el-icon-edit"
type="success"
icon="el-icon-check"
size="mini"
v-loading="formLoading"
@click="handleCreateBills()"
>生成出库单(支持批量)</el-button
@click="handleConfirm()"
>已确认</el-button
>
</flexbox>
</div>
@ -64,7 +63,7 @@
</el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔3分钟进行自动刷新</span
>说明每间隔30秒进行自动刷新</span
>
</flexbox>
</div>
@ -106,7 +105,7 @@
</el-table-column>
<!-- 操作名称 -->
<!-- <el-table-column
<el-table-column
prop="actionName"
label="操作名称(单击箭头过滤)"
width="165"
@ -130,7 +129,7 @@
</el-tag>
</div>
</template>
</el-table-column> -->
</el-table-column>
<!-- 状态 -->
<el-table-column
prop="stateName"
@ -636,10 +635,6 @@ export default {
icon: "el-icon-check",
},
],
listBillQuery: {
version: "",
guids: [],
},
customerInfos: "",
searchContent: "", //
JobversionValue: "",
@ -669,8 +664,8 @@ export default {
},
},
listExportQuery: {
version: undefined,
kanBan: undefined, //
version: "",
kanBan: "", //
customerPartCode: undefined, //
sapMaterialCode: undefined, //
cp7begin: undefined,
@ -712,7 +707,7 @@ export default {
this.listQuery.taskId = "";
this.listQuery.stateName = "";
setTimeout(this.getList, 0);
}, 1000 * 180); //30
}, 1000 * 30); //30
// $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => {
clearInterval(timer);
@ -745,11 +740,11 @@ export default {
prop: "taskId",
width: 120,
});
// tempsTabs.push({
// label: "",
// prop: "name",
// width: 170,
// });
tempsTabs.push({
label: "模块名称",
prop: "name",
width: 170,
});
tempsTabs.push({
label: "创建人",
prop: "email",
@ -760,7 +755,7 @@ export default {
prop: "createdAt",
width: 150,
});
tempsTabs.push({
tempsTabs.push({
label: "说明",
prop: "remark",
width: 220,
@ -768,7 +763,7 @@ export default {
tempsTabs.push({
label: "审批状态",
prop: "fileName",
width: 350,
width: 150,
});
return tempsTabs;
},
@ -779,228 +774,149 @@ export default {
},
//
handleDelete(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
var getbillNum = "";
//
//
this.multipleSelection.forEach((element) => {
let state = element.fileName;
if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
if (this.isEdit == true) {
this.$message({
message:
"已经生成出库单的不能删除!单号:" +
getbillNum.substr(0, getbillNum.length - 1),
type: "warning",
});
return;
} else {
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
}
});
},
//
handleConfirm(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
var getbillNum = "";
//
//
this.multipleSelection.forEach((element) => {
let state = element.fileName;
if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
if (this.isEdit == true) {
this.$message({
message:
"已经生成出库单的不能再确认!单号:" +
getbillNum.substr(0, getbillNum.length - 1),
type: "warning",
});
return;
} else {
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否确认" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanOutPutAudit",
params
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "操作成功",
type: "success",
duration: 2000,
});
this.getList();
this.$confirm("是否确认" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/wms/WmsJitOutPut", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
}
});
},
//
handleCreateBills(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
var getbillNum = "";
//
//
this.multipleSelection.forEach((element) => {
let state = element.fileName;
if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
if (this.isEdit == true) {
this.$message({
message:
"已经生成出库单的不能再重新生成!单号:" +
getbillNum.substr(0, getbillNum.length - 1),
type: "warning",
});
return;
} else {
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.listBillQuery.guids = params;
this.listBillQuery.version = this.JobversionValue;
console.log("出库单条件:" + JSON.stringify(this.listBillQuery));
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.formLoading = true;
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut",
this.listBillQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
this.formLoading = false;
})
.catch(() => {
this.formLoading = false;
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/wms/WmsJitOutPut", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
}
});
},
valueChange(data) {
this.getmaterialGroupValue = "";
@ -1144,7 +1060,7 @@ export default {
JSON.stringify(this.listExportQuery)
);
this.$axios
.posts(
.gets(
"/api/settleaccount/ReportMakeService/SettleKanBan-WithCode",
this.listExportQuery
)
@ -1170,12 +1086,9 @@ export default {
});
},
handleCreate() {
// this.$nextTick(() => {
// this.$refs["formCount"].resetFields();
// });
if (this.$refs["formCount"] !== undefined) {
this.$nextTick(() => {
this.$refs["formCount"].resetFields();
}
});
this.formTitle = "报表统计";
this.isEdit = false;
this.form = {};
@ -1293,7 +1206,7 @@ export default {
getList() {
this.listLoading = true;
//
this.listQuery.name = "看板结算输出";
this.listQuery.name = "看板结算数量差异输出";
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => {
@ -1319,11 +1232,13 @@ export default {
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
var item = this.list[rowIndex];
if (column.property === "fileName") {
if (item.fileName === "已确认") {
return { color: "#13CE66", cursor: "pointer", fontWeight: 700 };
} else {
return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 };
if (column.property === "stateName") {
if (item.stateName === "Succeeded") {
return { color: "#71d87f", cursor: "pointer" };
} else if (item.stateName === "Processing") {
return { color: "#d87171", cursor: "pointer" };
} else if (item.stateName === "Failed") {
return { color: "#ff5640", cursor: "pointer" };
}
}
return { textAlign: "left" };

223
vue/src/views/ux/billManage/kanbanOutOrder/detail.vue

@ -10,12 +10,6 @@
@click="handleDownload()"
>导出全部
</el-button> -->
<JobSelectVerson
:options="JobVersionList"
style="width: 150px; margin-left: -10px"
class="search-container"
@value-change="JobVersionValue"
></JobSelectVerson>
<el-button
class="filter-item"
type="success"
@ -27,7 +21,7 @@
<el-button
class="filter-item"
size="mini"
type="warning"
type="info"
icon="el-icon-download"
@click="handleCancelBills()"
>取消出库(支持批量)
@ -112,11 +106,10 @@ import Pagination from "@/components/Pagination"; // secondary package based on
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import { downloadFile } from "@/utils/crmindex.js";
import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
export default {
name: "sendUnsettledDiffReport",
components: { Pagination, CRMTableHead, CRMTableHead, JobSelectVerson },
components: { Pagination, CRMTableHead, CRMTableHead },
directives: { permission },
props: {
customerInfos: {
@ -128,7 +121,7 @@ export default {
},
data() {
return {
crmType: "kanbanOutOrder",
crmType: "vwOutOrder",
rules: {
//
erpMaterialCode: [
@ -138,7 +131,6 @@ export default {
searchContent: "", //
customerInfo: {
parentId: "",
version: "",
},
form: {
dicDetailID: "",
@ -149,13 +141,6 @@ export default {
totalCount: 0,
listLoading: true,
formLoading: false,
JobVersionList: [
{ value: "0", label: "未处理" },
{ value: "1", label: "申请出库" },
{ value: "2", label: "确认出库" },
{ value: "3", label: "不能出库" },
{ value: "4", label: "取消出库" },
],
//
filterObj: {
type: Object,
@ -167,29 +152,27 @@ export default {
Filters: [
{
logic: 0,
column: "Enabled",
column: "",
action: 0,
value: "true",
value: "",
}, //
],
//OrgID:"",
SkipCount: 0,
MaxResultCount: 15,
billNum: "",
ParentId: "",
},
listOutPutQuery: {
version: "",
guids: "",
billNum: "",
ids: "",
},
page: 1,
JobversionValue: "",
JobversionValueVerson: "",
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 230,
tableHeight: document.documentElement.clientHeight - 260,
isEdit: false,
};
},
@ -211,7 +194,6 @@ export default {
} else {
newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId;
this.customerInfo.version = element.Version;
});
if (this.customerInfo.parentId != "") {
this.getList();
@ -228,7 +210,7 @@ export default {
tempsTabs.push({
label: "版本",
prop: "version",
width: 110,
width: 150,
});
tempsTabs.push({
label: "零件号",
@ -237,27 +219,11 @@ 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: "qty", width: 100 });
tempsTabs.push({ label: "状态", prop: "state", width: 100 });
tempsTabs.push({ label: "数量", prop: "wmsBillNum", width: 100 });
return tempsTabs;
},
},
methods: {
//
JobVersionValue(params) {
//
this.listQuery.Filters = [];
var column = "state";
let filter = {
logic: 0,
column: column,
action: 0,
value: params.value,
};
this.listQuery.Filters.push(filter);
this.getList();
},
//
handleCancelBills(row) {
if (this.multipleSelection.length == 0) {
@ -267,7 +233,8 @@ export default {
});
return;
}
var params = [];
//var params = [];
var params = "";
let myalert = ""; //使
if (row) {
//
@ -277,14 +244,13 @@ export default {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
//params.push(id);
params += id + ",";
});
myalert = "选中项";
}
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.guids = params;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
console.log("取消出库条件:" + JSON.stringify(this.listOutPutQuery));
this.listOutPutQuery.version = row.version;
this.listOutPutQuery.ids = params.substr(0, params.length - 1);
this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
@ -294,7 +260,7 @@ export default {
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel",
"/api/settleaccount/wmsjitoutput/WmsJitOutPut-Cancel",
this.listOutPutQuery
)
.then((response) => {
@ -318,96 +284,59 @@ export default {
//
handleCreateBills(row) {
if (this.multipleSelection.length == 0) {
this.listLoading = true;
this.listOutPutQuery.guids = [];
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
console.log(
"未选择时全部确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
this.$confirm("是否全部确认出库?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
this.$message({
message: "至少选择一行!",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
this.listLoading = false;
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
this.listLoading = false;
});
});
return;
}
//var params = [];
var params = "";
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
this.listLoading = true;
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.guids = params;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
console.log(
"部分选择时确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
this.$confirm("是否确认将选中的出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
this.listLoading = false;
//
this.multipleSelection.forEach((element) => {
let id = element.id;
//params.push(id);
params += id + ",";
});
myalert = "选中项";
}
this.listOutPutQuery.version = row.version;
this.listOutPutQuery.ids = params.substr(0, params.length - 1);
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
this.getList();
});
this.listLoading = false;
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
}
});
},
/** 刷新列表 */
handleHandle(data) {
@ -417,15 +346,6 @@ export default {
},
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property == "state") {
return {
0: "未处理",
1: "申请出库",
2: "确认出库",
3: "不能出库",
4: "取消出库",
}[row[column.property]];
}
return row[column.property] || "--";
},
importExcelData() {
@ -482,11 +402,18 @@ export default {
} else {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.listQuery.billNum = this.customerInfo.parentId;
let filter = {
logic: 0,
column: "wmsBillNum",
action: 6,
value: this.customerInfo.parentId,
};
this.listQuery.Filters.push(filter);
//this.listQuery.ParentId = this.customerInfo.parentId;
console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanDetailList",
"/api/settleaccount/wmsjitoutput/WmsJitDetailList",
this.listQuery
)
.then((response) => {

33
vue/src/views/ux/billManage/kanbanOutOrder/index.vue

@ -18,14 +18,6 @@
@click="handleFilter"
>搜索
</el-button>
<el-button
class="filter-item"
size="mini"
type="warning"
icon="el-icon-upload2"
@click="handleImportExcel()"
>导入文件Excel
</el-button>
</flexbox>
<!--表格渲染-->
<el-table
@ -86,13 +78,6 @@
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
<!-- 导入Excel组件 -->
<importExcel
ref="importexcel"
:show="showExcelImport"
:crmType="crmType"
@close="importExcelData"
/>
<!-- 抽屉控件 -->
<el-drawer
@ -118,16 +103,15 @@ import Pagination from "@/components/Pagination"; // secondary package based on
import permission from "@/directive/permission/index.js";
import Detail from "./detail";
import moment from "moment";
import importExcel from "@/components/ImportExcel-base";
import { formatTimeToTimestamp } from "@/utils/index";
export default {
name: "sendUnsettledDiffReport",
components: { Pagination, Detail,importExcel },
components: { Pagination, Detail },
directives: { permission },
data() {
return {
crmType: "kanbanoutorder",
crmType: "sendUnsettledDiffReport",
rules: {
// version: [{ required: true, message: "", trigger: "change" }],
// beginTime: [{ required: true, message: "", trigger: "change" }],
@ -209,11 +193,6 @@ export default {
},
},
methods: {
handleImportExcel() {
//
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
},
getVersionInfo() {
//
this.listLoading = true;
@ -237,11 +216,9 @@ export default {
handleDrawerOpen(param) {
this.drawer = true;
var parentId = param.billNum; //
var version = param.version; //
this.customerInfos = [
{
ParentId: parentId,
Version: version,
},
];
},
@ -257,8 +234,8 @@ export default {
}
return moment(date).format("YYYY-MM-DD HH:mm:ss");
}
if (column.property == "state") {
return { 0: "已提交", 1: "已出库", 2: "不能出库" }[
if (column.property == "documentStatus") {
return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
row[column.property]
];
}
@ -277,7 +254,7 @@ export default {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.$axios
.posts("/api/settleaccount/wmskanbanoutput/WmsKanbanList", this.listQuery)
.posts("/api/settleaccount/wmsjitoutput/WmsJitList", this.listQuery)
.then((response) => {
this.list = response.items;
//alert(JSON.stringify(response.Items))

658
vue/src/views/ux/billManage/sparePart/index.vue

@ -32,26 +32,17 @@
type="success"
icon="el-icon-check"
size="mini"
@click="handleConfirm()"
>已确认(支持批量)</el-button
>
<el-button
class="filter-item"
type="warning"
icon="el-icon-edit"
size="mini"
v-loading="formLoading"
@click="handleCreateBills()"
>生成出库单(支持批量)</el-button
>
<el-button
class="filter-item"
type="success"
icon="el-icon-check"
size="mini"
type="primary"
icon="el-icon-plus"
@click="handleCreateNoBill"
>备件未结明细统计
</el-button>
@click="handleConfirm()"
>已确认</el-button
>
</flexbox>
</div>
<!-- 刷新 -->
@ -72,7 +63,7 @@
</el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔3分钟进行自动刷新</span
>说明每间隔30秒进行自动刷新</span
>
</flexbox>
</div>
@ -114,7 +105,7 @@
</el-table-column>
<!-- 操作名称 -->
<!-- <el-table-column
<el-table-column
prop="actionName"
label="操作名称(单击箭头过滤)"
width="165"
@ -138,7 +129,7 @@
</el-tag>
</div>
</template>
</el-table-column> -->
</el-table-column>
<!-- 状态 -->
<el-table-column
prop="stateName"
@ -404,32 +395,50 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="采购订单号" />
<el-form-item label="物料组(车型)" />
</el-col>
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="purchaseOrderNo">
<el-input
type="textarea"
v-model="formCount.purchaseOrderNo"
style="width: 450px"
/>
<el-form-item prop="materialGroupValue">
<el-select
v-model="formCount.materialGroupValue"
size="medium"
multiple
filterable
clearable
style="width: 380px; margin-right: 15px"
@change="valueChange"
placeholder="请选择"
>
<el-option
v-for="item in materialGroupList"
:key="item.value"
:label="item.value"
:value="item.value"
>
<span style="float: left">{{ item.label }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.value
}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="订单日期:" />
<el-form-item label="CP5时间:" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item>
<el-date-picker
v-model="startTime"
v-model="cp5startTime"
:picker-options="pickerOptions2"
type="datetime"
size="small"
:picker-options="pickerOptions0"
@change="getdateValue"
@change="getdateValueCp5"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="00:00:00"
>
@ -439,11 +448,11 @@
<el-col :md="10" :xs="24" style="margin-left: -40px">
<el-form-item>
<el-date-picker
v-model="endTime"
v-model="cp5endTime"
:picker-options="pickerOptions3"
type="datetime"
:picker-options="pickerOptions1"
size="small"
@change="getdateVal"
@change="getdateValCp5"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="23:59:59"
>
@ -451,86 +460,17 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="厂内零件号" />
</el-col>
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="sapCode">
<el-input
v-model="formCount.sapCode"
style="width: 450px"
type="textarea"
:rows="4"
placeholder="多个厂内零件号,请以回车换行形式添加!"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<!-- <el-button type="text" @click="dialogFormVisible = false"
>取消</el-button
> -->
<el-button @click="resetForm('formCount')">重置</el-button>
<el-button v-loading="formLoading" type="primary" @click="save"
>确认</el-button
>
</div>
</el-dialog>
<!--统计-备件无条码报表-->
<el-dialog
:visible.sync="dialogFormNoBillVisible"
:close-on-click-modal="false"
:title="formTitle"
append-to-body
width="680px"
>
<el-form
ref="formNoBill"
:inline="true"
:rules="rulesNoBill"
:model="formNoBill"
size="mini"
>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="选择版本" required />
</el-col>
<el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="versionValue">
<el-select
v-model="formNoBill.versionValue"
size="medium"
clearable
style="width: 188px; margin-right: 15px"
placeholder="请选择"
>
<el-option
v-for="item in versionList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="查询日期:" />
<el-form-item label="CP7时间:" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item>
<el-date-picker
v-model="startTimeNoBill"
v-model="startTime"
type="datetime"
size="small"
:picker-options="pickerOptions4"
:picker-options="pickerOptions0"
@change="getdateValue"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="00:00:00"
@ -541,9 +481,9 @@
<el-col :md="10" :xs="24" style="margin-left: -40px">
<el-form-item>
<el-date-picker
v-model="endTimeNoBill"
v-model="endTime"
type="datetime"
:picker-options="pickerOptions5"
:picker-options="pickerOptions1"
size="small"
@change="getdateVal"
value-format="yyyy-MM-dd HH:mm:ss"
@ -555,7 +495,37 @@
</el-row>
<el-row>
<!-- <el-col :md="4" :xs="24">
<el-col :md="4" :xs="24">
<el-form-item label="KEEN号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="kennCode">
<el-input
type="textarea"
v-model="formCount.kennCode"
style="width: 170px"
:rows="4"
placeholder="多个KENN号,请以回车换行形式添加!"
/>
</el-form-item>
</el-col>
<el-col :md="4" :xs="24">
<el-form-item label="底盘号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item prop="chassisNumber">
<el-input
v-model="formCount.chassisNumber"
style="width: 170px"
type="textarea"
:rows="4"
placeholder="多个底盘号,请以回车换行形式添加!"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="客户零件号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
@ -568,15 +538,15 @@
placeholder="多个客户零件号,请以回车换行形式添加!"
/>
</el-form-item>
</el-col> -->
</el-col>
<el-col :md="4" :xs="24">
<el-form-item label="厂内零件号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item prop="sapCode">
<el-input
v-model="formNoBill.sapCode"
style="width: 450px"
v-model="formCount.sapCode"
style="width: 170px"
type="textarea"
:rows="4"
placeholder="多个厂内零件号,请以回车换行形式添加!"
@ -586,8 +556,11 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="resetNoBillForm('formNoBill')">重置</el-button>
<el-button v-loading="formNoBillLoading" type="primary" @click="saveNoBill"
<!-- <el-button type="text" @click="dialogFormVisible = false"
>取消</el-button
> -->
<el-button @click="resetForm('formCount')">重置</el-button>
<el-button v-loading="formLoading" type="primary" @click="save"
>确认</el-button
>
</div>
@ -616,11 +589,6 @@ export default {
{ required: true, message: "必须输入!", trigger: "change" },
],
},
rulesNoBill: {
versionValue: [
{ required: true, message: "必须输入!", trigger: "change" },
],
},
pickerOptionsCp5: {
disabledDate: (time) => {
let now = new Date();
@ -648,6 +616,12 @@ export default {
return time.getTime() <= new Date(this.startTime).getTime();
},
},
pickerOptions1: {
disabledDate: (time) => {
//return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
return time.getTime() <= new Date(this.startTime).getTime();
},
},
pickerOptions2: {
disabledDate: (time) => {
@ -661,23 +635,8 @@ export default {
return time.getTime() <= new Date(this.cp5startTime).getTime();
},
},
pickerOptions4: {
disabledDate: (time) => {
//if (this.endTime != "") {
return time.getTime() > new Date(this.endTimeNoBill).getTime();
//}
},
},
pickerOptions5: {
disabledDate: (time) => {
return time.getTime() <= new Date(this.startTimeNoBill).getTime();
},
},
startTime: "",
endTime: "",
startTimeNoBill: "",
endTimeNoBill: "",
pickerOptionsCp7: {
disabledDate: (time) => {
let now = new Date();
@ -729,7 +688,6 @@ export default {
customerInfos: "",
searchContent: "", //
form: {},
formNoBill: {},
formCount: {
startTime: "",
endTime: "",
@ -749,7 +707,6 @@ export default {
totalCount: 0,
listLoading: true,
formLoading: false,
formNoBillLoading: false,
//
filterObj: {
type: Object,
@ -759,26 +716,21 @@ export default {
},
listExportQuery: {
version: "",
purchaseOrderNo: undefined,
materialCode: undefined,
cp7begin: undefined,
cp7end: undefined,
kenncode: undefined,
chassisNumber: undefined,
materialGroup: undefined,
begin: undefined,
end: undefined,
sapCode: undefined,
},
listNoBillExportQuery: {
version: "",
sapCode: undefined,
},
listQuery: {
taskId: "",
name: "",
},
listBillQuery: {
version: "",
guids: [],
},
page: 1,
dialogFormVisible: false,
dialogFormNoBillVisible: false,
multipleSelection: [],
tableHeight: document.documentElement.clientHeight - 260,
isEdit: false,
@ -804,7 +756,7 @@ export default {
this.listQuery.taskId = "";
this.listQuery.stateName = "";
setTimeout(this.getList, 0);
}, 1000 * 180); //30
}, 1000 * 30); //30
// $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => {
clearInterval(timer);
@ -835,13 +787,13 @@ export default {
tempsTabs.push({
label: "单据流水号",
prop: "taskId",
width: 140,
width: 130,
});
tempsTabs.push({
label: "模块名称",
prop: "name",
width: 170,
});
// tempsTabs.push({
// label: "",
// prop: "name",
// width: 170,
// });
tempsTabs.push({
label: "创建人",
prop: "email",
@ -855,12 +807,12 @@ export default {
tempsTabs.push({
label: "说明",
prop: "remark",
width: 350,
width: 220,
});
tempsTabs.push({
label: "审批状态",
prop: "fileName",
width: 350,
width: 150,
});
return tempsTabs;
},
@ -869,238 +821,168 @@ export default {
//cp5
getdateValueCp5(val) {
this.cp5startTime = val;
//this.getbalanceIndexData();
this.getbalanceIndexData();
},
getdateValCp5(val) {
this.cp5endTime = val;
this.getbalanceIndexData();
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
//
handleDelete(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
var getbillNum = "";
//
//
this.multipleSelection.forEach((element) => {
let state = element.fileName;
if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
if (this.isEdit == true) {
this.$message({
message:
"已经生成出库单的不能删除!单号:" +
getbillNum.substr(0, getbillNum.length - 1),
type: "warning",
});
return;
} else {
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/Job/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
}
});
},
//
handleConfirm(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
var getbillNum = "";
//
//
this.multipleSelection.forEach((element) => {
let state = element.fileName;
if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
if (this.isEdit == true) {
this.$message({
message:
"已经生成出库单的不能再确认!单号:" +
getbillNum.substr(0, getbillNum.length - 1),
type: "warning",
});
return;
} else {
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否确认" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPutAudit",
params
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "操作成功",
type: "success",
duration: 2000,
});
this.getList();
this.$confirm("是否确认" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccounWmsJitOutPutt/wms/", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
}
});
},
//
handleCreateBills(row) {
this.isEdit = false;
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
var getbillNum = "";
//
//
this.multipleSelection.forEach((element) => {
let state = element.fileName;
if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
if (this.isEdit == true) {
this.$message({
message:
"已经生成出库单的不能再重新生成!单号:" +
getbillNum.substr(0, getbillNum.length - 1),
type: "warning",
});
return;
} else {
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.listBillQuery.guids = params;
this.listBillQuery.version = this.JobversionValue;
console.log("出库单条件:" + JSON.stringify(this.listBillQuery));
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.formLoading = true;
this.$axios
.posts(
"/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut",
this.listBillQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
this.formLoading = false;
})
.catch(() => {
this.formLoading = false;
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/wms/WmsJitOutPut", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
}
});
},
valueChange(data) {
this.getmaterialGroupValue = "";
this.getmaterialGroupValue += data + ",";
this.getmaterialGroupValue = this.getmaterialGroupValue.substring(
0,
this.getmaterialGroupValue.length - 1
);
},
//
JobVersionValue(params) {
@ -1135,9 +1017,11 @@ export default {
},
getdateValue(val) {
this.startTime = val;
this.getbalanceIndexData();
},
getdateVal(val) {
this.endTime = val;
this.getbalanceIndexData();
},
getCurrentMonthFirst() {
@ -1207,35 +1091,44 @@ export default {
this.cp5startTime = "";
this.cp5endTime = "";
},
resetNoBillForm(formName) {
this.formNoBill = {};
this.startTimeNoBill = "";
this.endTimeNoBill = "";
},
save() {
this.$refs.formCount.validate((valid) => {
if (valid) {
this.formLoading = true;
this.listExportQuery.version = this.formCount.versionValue; //
if (this.formCount.purchaseOrderNo != "") {
this.listExportQuery.purchaseOrderNo = this.formCount.purchaseOrderNo; //
if (this.formCount.materialCode != "") {
this.listExportQuery.materialCode = this.formCount.materialCode; //
}
if (this.formCount.sapCode != "") {
this.listExportQuery.sapCode = this.formCount.sapCode; //
}
//
this.listExportQuery.begin = this.startTime
? this.startTime
if (this.formCount.kennCode != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN
}
this.listExportQuery.begin = this.cp5startTime
? this.cp5startTime
: undefined;
this.listExportQuery.end = this.endTime
? this.endTime
this.listExportQuery.end = this.cp5endTime
? this.cp5endTime
: undefined;
if (this.startTime != "") {
this.listExportQuery.cp7begin = this.startTime; //CP7
}
if (this.endTime != "") {
this.listExportQuery.cp7end = this.endTime; //CP5
}
if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
}
if (this.formCount.materialGroupValue != "") {
this.listExportQuery.materialGroup = this.getmaterialGroupValue; //
}
console.log(
"大众备件结算核对-导出条件:" + JSON.stringify(this.listExportQuery)
);
this.$axios
.gets(
"/api/settleaccount/ReportMakeService/SettleSparePartExport",
"/api/settleaccount/ReportMakeService/SettleDoorPanel",
this.listExportQuery
)
.then((res) => {
@ -1259,64 +1152,13 @@ export default {
}
});
},
//
saveNoBill() {
this.$refs.formNoBill.validate((valid) => {
if (valid) {
this.formNoBillLoading = true;
this.listNoBillExportQuery.version = this.formNoBill.versionValue; //
// if (this.formCount.materialCode != "") {
// this.listExportQuery.materialCode = this.formCount.materialCode; //
// }
if (this.formNoBill.sapCode != "") {
this.listNoBillExportQuery.sapCode = this.formNoBill.sapCode; //
}
this.listNoBillExportQuery.begin = this.startTimeNoBill
? this.startTimeNoBill
: undefined;
this.listNoBillExportQuery.end = this.endTimeNoBill
? this.endTimeNoBill
: undefined;
console.log(
"大众备件未结明细-导出条件:" + JSON.stringify(this.listNoBillExportQuery)
);
this.$axios
.gets(
"/api/settleaccount/ReportMakeService/SharePartUnSettledExport",
this.listExportQuery
)
.then((res) => {
let taskid = res;
if (Number.isInteger(taskid)) {
this.$notify({
title: "成功",
message: "任务生成成功!任务号:" + taskid,
type: "success",
duration: 2000,
});
}
this.getList();
this.formNoBillLoading = false;
this.dialogFormNoBillVisible = false;
})
.catch(() => {
this.formNoBillLoading = false;
this.dialogFormNoBillVisible = false;
});
}
});
},
handleCreate() {
// this.$nextTick(() => {
// this.$refs["formCount"].resetFields();
// });
if (this.$refs["formCount"] !== undefined) {
this.$nextTick(() => {
this.$refs["formCount"].resetFields();
}
});
this.formTitle = "报表统计";
this.isEdit = false;
this.formCount = {};
this.form = {};
this.datetime5 = [];
this.startTime = "";
this.endTime = "";
@ -1324,18 +1166,6 @@ export default {
this.cp5endTime = "";
this.dialogFormVisible = true;
},
//
handleCreateNoBill() {
if (this.$refs["formNoBill"] !== undefined) {
this.$refs["formNoBill"].resetFields();
}
this.formTitle = "无条码备件明细报表统计";
this.isEdit = false;
this.formNoBill = {};
this.startTimeNoBill = "";
this.endTimeNoBill = "";
this.dialogFormNoBillVisible = true;
},
filterHandler(value, row, column) {
const property = column["property"];
return row[property] === value;
@ -1448,7 +1278,7 @@ export default {
getList() {
this.listLoading = true;
//
this.listQuery.name = "备件结算输出";
this.listQuery.name = "备件结算数量差异输出";
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => {

26
vue/src/views/ux/billManage/vwOutOrder/index.vue

@ -18,14 +18,6 @@
@click="handleFilter"
>搜索
</el-button>
<el-button
class="filter-item"
size="mini"
type="warning"
icon="el-icon-upload2"
@click="handleImportExcel()"
>导入文件Excel
</el-button>
</flexbox>
<!--表格渲染-->
<el-table
@ -86,13 +78,6 @@
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
<!-- 导入Excel组件 -->
<importExcel
ref="importexcel"
:show="showExcelImport"
:crmType="crmType"
@close="importExcelData"
/>
<!-- 抽屉控件 -->
<el-drawer
@ -118,16 +103,16 @@ import Pagination from "@/components/Pagination"; // secondary package based on
import permission from "@/directive/permission/index.js";
import Detail from "./detail";
import moment from "moment";
import importExcel from "@/components/ImportExcel-base";
import { formatTimeToTimestamp } from "@/utils/index";
export default {
name: "sendUnsettledDiffReport",
components: { Pagination, Detail,importExcel },
components: { Pagination, Detail},
directives: { permission },
data() {
return {
crmType: "vwoutorder",
crmType: "sendUnsettledDiffReport",
rules: {
// version: [{ required: true, message: "", trigger: "change" }],
// beginTime: [{ required: true, message: "", trigger: "change" }],
@ -209,11 +194,6 @@ export default {
},
},
methods: {
handleImportExcel() {
//
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
},
getVersionInfo() {
//
this.listLoading = true;

139
vue/src/views/ux/vw/dataInput/hq_f/index.vue

@ -46,7 +46,7 @@
v-model="searchContent"
clearable
size="small"
placeholder="按照看板号搜索..."
placeholder="按照采购订单号搜索..."
style="width: 200px"
class="search-container"
@keyup.enter.native="handleFilter"
@ -149,7 +149,7 @@ import { downloadFile } from "@/utils/crmindex.js";
import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
export default {
name: "HQFPlatform",
name: "HQHPlatform",
components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
directives: { permission },
filters: {
@ -172,7 +172,7 @@ export default {
},
data() {
return {
crmType: "hqFPlatform",
crmType: "hqHPlatform",
versionValue: "",
versionList: [], //
rules: {
@ -264,108 +264,63 @@ export default {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 });
tempsTabs.push({
label: "看板号",
prop: "hqhKanBan",
label: "采购订单号",
prop: "purchaseOrderNo",
width: 220,
});
tempsTabs.push({
label: "采购订单行项目",
prop: "purchaseOrderNoItem",
width: 170,
});
tempsTabs.push({ label: "看板编号", prop: "kanbanNumber", width: 250 });
tempsTabs.push({
label: "物料凭证号",
prop: "materialVoucherNo",
width: 200,
label: "采购订单文本",
prop: "purchaseOrderNoText",
width: 170,
});
tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 });
tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 });
tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 });
tempsTabs.push({
label: "物料号",
prop: "materialCode",
label: "采购价格不含税",
prop: "purchasePriceNoTax",
width: 200,
});
tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 });
tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 });
tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 });
tempsTabs.push({
label: "验收单号",
prop: "acceptanceNo",
width: 130,
label: "日期",
prop: "spareDate",
width: 150,
formType: "datetime",
});
tempsTabs.push({
label: "验收单日期",
prop: "acceptanceDate",
width: 170,
label: "交货单号",
prop: "deliveryOrderNo",
width: 150,
});
tempsTabs.push({ label: "数量", prop: "price", width: 100 });
tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
tempsTabs.push({
label: "存储地点",
prop: "storageLocation",
width: 120,
label: "交货行号",
prop: "deliveryLineNum",
width: 150,
});
tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 });
tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 });
tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 });
tempsTabs.push({
label: "存储地点描述",
prop: "storageLocationDesc",
width: 250,
label: "德国发票号",
prop: "germanInvoiceNo",
width: 150,
});
tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 });
return tempsTabs;
},
// getDefaultField() {
// var tempsTabs = [];
// tempsTabs.push({ label: "", prop: "lineNumber", width: 100 });
// tempsTabs.push({ label: "", prop: "purchaseType", width: 150 });
// tempsTabs.push({
// label: "",
// prop: "purchaseOrderNo",
// width: 220,
// });
// tempsTabs.push({
// label: "",
// prop: "purchaseOrderNoItem",
// width: 170,
// });
// tempsTabs.push({
// label: "",
// prop: "purchaseOrderNoText",
// width: 170,
// });
// tempsTabs.push({ label: "", prop: "receiptQty", width: 120 });
// tempsTabs.push({ label: "", prop: "invoicedQty", width: 120 });
// tempsTabs.push({ label: "", prop: "amountNoTax", width: 150 });
// tempsTabs.push({
// label: "",
// prop: "purchasePriceNoTax",
// width: 200,
// });
// tempsTabs.push({ label: "", prop: "accountNum", width: 150 });
// tempsTabs.push({ label: "", prop: "materialCode", width: 180 });
// tempsTabs.push({ label: "", prop: "materialDesc", width: 250 });
// tempsTabs.push({
// label: "",
// prop: "spareDate",
// width: 150,
// formType: "datetime",
// });
// tempsTabs.push({
// label: "",
// prop: "deliveryOrderNo",
// width: 150,
// });
// tempsTabs.push({
// label: "",
// prop: "deliveryLineNum",
// width: 150,
// });
// tempsTabs.push({ label: "", prop: "batchNo", width: 150 });
// tempsTabs.push({ label: "", prop: "taxRate", width: 100 });
// tempsTabs.push({ label: "", prop: "taxCode", width: 110 });
// tempsTabs.push({
// label: "",
// prop: "germanInvoiceNo",
// width: 150,
// });
// tempsTabs.push({ label: "", prop: "factory", width: 150 });
// tempsTabs.push({ label: "", prop: "factoryName", width: 220 });
// return tempsTabs;
// },
},
methods: {
handleCommand(command) {
@ -393,9 +348,9 @@ export default {
if (this.versionValue != "") {
this.listQuery.version = this.versionValue;
}
console.log("红旗F平台导出:" + JSON.stringify(this.listQuery));
console.log("红旗H平台导出:" + JSON.stringify(this.listQuery));
this.$axios
.posts("/api/settleaccount/HQFPlatform/Export", this.listQuery)
.posts("/api/settleaccount/HQHPlatform/Export", this.listQuery)
.then((res) => {
let fileNameOfProject = res;
this.$axios
@ -444,7 +399,7 @@ export default {
//this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 1000;
this.$axios
.posts("/api/settleaccount/HQFPlatform/listVersion", this.listQuery)
.posts("/api/settleaccount/HQHPlatform/listVersion", this.listQuery)
.then((response) => {
this.versionList = [];
response.items.forEach((element) => {
@ -507,7 +462,7 @@ export default {
}
console.log("列表查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts("/api/settleaccount/HQFPlatform/list", this.listQuery)
.posts("/api/settleaccount/HQHPlatform/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
@ -523,7 +478,7 @@ export default {
fetchData(id) {
//
this.$axios
.gets("/api/settleaccount/HQFPlatform/" + id)
.gets("/api/settleaccount/HQHPlatform/" + id)
.then((response) => {
this.form = response;
});
@ -534,7 +489,7 @@ export default {
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "hqhKanBan";
var column = "purchaseOrderNo";
let filter = {
logic: 0,
column: column,

71
vue/src/views/ux/vw/dataInput/hq_h/index.vue

@ -46,7 +46,7 @@
v-model="searchContent"
clearable
size="small"
placeholder="按照看板号搜索..."
placeholder="按照采购订单号搜索..."
style="width: 200px"
class="search-container"
@keyup.enter.native="handleFilter"
@ -264,47 +264,61 @@ export default {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 });
tempsTabs.push({
label: "看板号",
prop: "hqhKanBan",
label: "采购订单号",
prop: "purchaseOrderNo",
width: 220,
});
tempsTabs.push({
label: "采购订单行项目",
prop: "purchaseOrderNoItem",
width: 170,
});
tempsTabs.push({ label: "看板编号", prop: "kanbanNumber", width: 250 });
tempsTabs.push({
label: "物料凭证号",
prop: "materialVoucherNo",
width: 200,
label: "采购订单文本",
prop: "purchaseOrderNoText",
width: 170,
});
tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 });
tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 });
tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 });
tempsTabs.push({
label: "物料号",
prop: "materialCode",
label: "采购价格不含税",
prop: "purchasePriceNoTax",
width: 200,
});
tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 });
tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 });
tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 });
tempsTabs.push({
label: "验收单号",
prop: "acceptanceNo",
width: 130,
label: "日期",
prop: "spareDate",
width: 150,
formType: "datetime",
});
tempsTabs.push({
label: "验收单日期",
prop: "acceptanceDate",
width: 170,
label: "交货单号",
prop: "deliveryOrderNo",
width: 150,
});
tempsTabs.push({ label: "数量", prop: "price", width: 100 });
tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
tempsTabs.push({
label: "存储地点",
prop: "storageLocation",
width: 120,
label: "交货行号",
prop: "deliveryLineNum",
width: 150,
});
tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 });
tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 });
tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 });
tempsTabs.push({
label: "存储地点描述",
prop: "storageLocationDesc",
width: 250,
label: "德国发票号",
prop: "germanInvoiceNo",
width: 150,
});
tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 });
return tempsTabs;
},
},
@ -421,7 +435,10 @@ export default {
// if (column.property === "state") {
// return { 0: "", 2: "" }[row[column.property]];
// }
if (column.property == "acceptanceDate") {
if (
column.property == "settleInputDate" ||
column.property == "settleDate"
) {
var date = row[column.property];
if (date == undefined) {
return "";
@ -472,7 +489,7 @@ export default {
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "hqhKanBan";
var column = "purchaseOrderNo";
let filter = {
logic: 0,
column: column,

66
vue/src/views/ux/vw/dataInput/hq_m/index.vue

@ -46,7 +46,7 @@
v-model="searchContent"
clearable
size="small"
placeholder="按照看板号搜索..."
placeholder="按照采购订单号搜索..."
style="width: 200px"
class="search-container"
@keyup.enter.native="handleFilter"
@ -264,47 +264,61 @@ export default {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 });
tempsTabs.push({
label: "看板号",
prop: "hqmKanBan",
label: "采购订单号",
prop: "purchaseOrderNo",
width: 220,
});
tempsTabs.push({
label: "采购订单行项目",
prop: "purchaseOrderNoItem",
width: 170,
});
tempsTabs.push({ label: "看板编号", prop: "kanbanNumber", width: 250 });
tempsTabs.push({
label: "物料凭证号",
prop: "materialVoucherNo",
width: 200,
label: "采购订单文本",
prop: "purchaseOrderNoText",
width: 170,
});
tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 });
tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 });
tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 });
tempsTabs.push({
label: "物料号",
prop: "materialCode",
label: "采购价格不含税",
prop: "purchasePriceNoTax",
width: 200,
});
tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 });
tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 });
tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 });
tempsTabs.push({
label: "验收单号",
prop: "acceptanceNo",
width: 130,
label: "日期",
prop: "spareDate",
width: 150,
formType: "datetime",
});
tempsTabs.push({
label: "验收单日期",
prop: "acceptanceDate",
width: 170,
label: "交货单号",
prop: "deliveryOrderNo",
width: 150,
});
tempsTabs.push({ label: "数量", prop: "price", width: 100 });
tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
tempsTabs.push({
label: "存储地点",
prop: "storageLocation",
width: 120,
label: "交货行号",
prop: "deliveryLineNum",
width: 150,
});
tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 });
tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 });
tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 });
tempsTabs.push({
label: "存储地点描述",
prop: "storageLocationDesc",
width: 250,
label: "德国发票号",
prop: "germanInvoiceNo",
width: 150,
});
tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 });
return tempsTabs;
},
},
@ -475,7 +489,7 @@ export default {
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "hqmKanBan";
var column = "purchaseOrderNo";
let filter = {
logic: 0,
column: column,

7
vue/src/views/ux/vw/dataInput/index.vue

@ -1,7 +0,0 @@
<!-- 父级路由组件 -->
<template>
<div>
<!-- xxx html 内容 -->
<router-view />
</div>
</template>

7
vue/static/config.js

@ -2,8 +2,8 @@ let configJSON
if (process.env.NODE_ENV === 'development') {
configJSON = {
base: {
ip: 'http://192.168.0.67',
//ip: 'http://192.168.0.140',
//ip: 'http://192.168.0.63',
ip: 'http://192.168.0.140',
//ip: 'http://149.223.116.5',
auth_port: '8066',
public_port: '8092',
@ -37,8 +37,9 @@ if (process.env.NODE_ENV === 'development') {
configJSON = {
base: {
ip: 'http://192.168.0.67',
//ip: 'http://192.168.0.67',
//ip: 'http://192.168.0.140',
ip: 'http://192.168.0.63',
//ip: 'http://149.223.116.5',
//ip: 'http://114.116.225.148',
//ip: 'http://10.123.148.162',

108
vue/static/tableFieldForSearch.json

@ -2775,41 +2775,6 @@
]
},
"hqHPlatform": {
"id": "36",
"data": [
{
"fieldId": 3,
"formType": "text",
"name": "看板号",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "hqhKanBan",
"setting": []
},
{
"fieldId": 5,
"formType": "text",
"name": "物料号",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "materialCode",
"setting": []
},
{
"fieldId": 5,
"formType": "text",
"name": "存储地点描述",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "storageLocationDesc",
"setting": []
}
]
},
"hqMPlatform": {
"id": "36",
"data": [
{
@ -2874,93 +2839,72 @@
}
]
},
"vwOutOrder": {
"hqMPlatform": {
"id": "36",
"data": [
{
"fieldId": 3,
"formType": "text",
"name": "零件号",
"name": "采购订单号",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "materialCode",
"fieldName": "purchaseOrderNo",
"setting": []
},
{
"fieldId": 5,
"formType": "text",
"name": "物料",
"name": "物料代码",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "materialGroup",
"fieldName": "materialCode",
"setting": []
},
{
"fieldId": 2,
"formType": "select",
"isNull": 0,
"name": "状态",
"options": "",
"type": 3,
"fieldId": 5,
"formType": "text",
"name": "科目号",
"type": 1,
"value": "",
"fieldType": 0,
"fieldName": "state",
"setting": [
"未处理,0",
"申请出库,1",
"确认出库,2",
"不能出库,3",
"取消出库,4"
]
}
]
},
"sparepartOutOrder": {
"id": "36",
"data": [
"fieldType": 1,
"fieldName": "accountNum",
"setting": []
},
{
"fieldId": 3,
"fieldId": 5,
"formType": "text",
"name": "零件号",
"name": "交货单号",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "materialCode",
"fieldName": "deliveryOrderNo",
"setting": []
},
{
"fieldId": 5,
"formType": "text",
"name": "物料组",
"name": "工厂",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "materialGroup",
"fieldName": "factory",
"setting": []
},
{
"fieldId": 2,
"formType": "select",
"isNull": 0,
"name": "状态",
"options": "",
"type": 3,
"fieldId": 5,
"formType": "text",
"name": "工厂名称",
"type": 1,
"value": "",
"fieldType": 0,
"fieldName": "state",
"setting": [
"未处理,0",
"申请出库,1",
"确认出库,2",
"不能出库,3",
"取消出库,4"
]
"fieldType": 1,
"fieldName": "factoryName",
"setting": []
}
]
},
"kanbanOutOrder": {
"vwOutOrder": {
"id": "36",
"data": [
{

Loading…
Cancel
Save