Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 8 months ago
parent
commit
36d181c9c4
  1. 46
      yxt-as-ui/src/api/storage/oldPartsInvertory.js
  2. 2
      yxt-as-ui/src/router/index.js
  3. 16
      yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactory.vue
  4. 10
      yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactoryAdd.vue
  5. 8
      yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactoryInfo.vue
  6. 4
      yxt-as-ui/src/views/operation/repairbill/repairbill.vue
  7. 17
      yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
  8. 4
      yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue
  9. 4
      yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue
  10. 4
      yxt-as-ui/src/views/operation/repairbill/repairbillByMaintain.vue
  11. 4
      yxt-as-ui/src/views/operation/repairbill/repairbillBySendWork.vue
  12. 4
      yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue
  13. 5
      yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
  14. 603
      yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue
  15. 145
      yxt-as-ui/src/views/storage/oldPartsInvertory/oldPartsInvertoryInfo.vue
  16. 8
      yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryDaiBan.vue
  17. 8
      yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryEdit.vue
  18. 8
      yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryYiBan.vue

46
yxt-as-ui/src/api/storage/oldPartsInvertory.js

@ -13,16 +13,13 @@ export default {
}
})
},
// 获取旧件出入库记录详情
// 获取旧件出入库记录详情
init: function(data) {
return request({
url: '/wms/apiadmin/WmsOldInventory/getDetailsList?sid='+data,
method: 'get',
});
url: '/wms/apiadmin/WmsOldInventory/getDetailsList?sid=' + data,
method: 'get'
})
},
deleteBySids: function(data) {
return request({
url: '/wms/apiadmin/WmsOldInventory/delBySids',
@ -33,7 +30,6 @@ export default {
}
})
},
// 导出报表
exportExcel: function(data) {
return request({
@ -44,44 +40,26 @@ export default {
headers: {
'Content-Type': 'application/json'
}
});
})
},
// 选择厂家
choiceManufacturer: function(params) {
return request({
url: '/yxtbase/apiadmin/base/basemanufacturer/listAll',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 查询所有仓库
getWarehouses: function(params) {
return request({
url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
method: 'post',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 根据仓库查询库位
getWarehouseareas: function(data) {
return request({
url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
method: 'get',
params: data,
headers: { 'Content-Type': 'application/json' }
});
},
url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
method: 'get',
params: data,
headers: { 'Content-Type': 'application/json' }
})
}
}

2
yxt-as-ui/src/router/index.js

@ -153,7 +153,7 @@ export const constantRoutes = [{
component: () => import('@/views/operation/arrearsleavefactory/arrearsleavefactory.vue'),
name: 'ArrearsLeaveFactory',
meta: {
title: '保外欠款出厂管理',
title: '欠款出厂管理',
noCache: true
}
},

16
yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactory.vue

@ -2,7 +2,7 @@
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="保外欠款出厂管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<button-bar view-title="欠款出厂管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
@ -31,10 +31,10 @@
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="维修单编号">
<el-form-item label="维修单编号">
<el-input v-model="listQuery.params.pairBillNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="单类型">
<el-form-item label="维修单类型">
<el-select v-model="listQuery.params.billTypeValue" placeholder="请选择" clearable filterable>
<el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
@ -57,7 +57,7 @@
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">保外欠款出厂列表</div>
<div class="tit">欠款出厂列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--Start 主页面主要部分 -->
@ -82,13 +82,13 @@
<el-table-column prop="deptName" label="申请部门" align="center" width="120" />
<el-table-column prop="createTime" label="申请日期" align="center" width="120" />
<el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
<el-table-column prop="pairBillNo" label="单编号" align="center" width="170" />
<el-table-column prop="billTypeValue" label="单类型" align="center" width="100" />
<el-table-column prop="pairBillNo" label="维修单编号" align="center" width="170" />
<el-table-column prop="billTypeValue" label="维修单类型" align="center" width="100" />
<el-table-column prop="customerName" label="客户名称" align="center" width="100" />
<el-table-column prop="customerPhone" label="联系电话" align="center" width="110" />
<el-table-column prop="vinNo" label="车架号" align="center" min-width="150" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="pairReceivableMoney" label="单应收金额" align="center" width="140" />
<el-table-column prop="pairReceivableMoney" label="维修单应收金额" align="center" width="140" />
<el-table-column prop="pairReceivedMoney" label="已交金额" align="center" width="120" />
<el-table-column prop="pairArrearsMoney" label="欠款金额" align="center" width="120" />
</el-table>
@ -108,7 +108,7 @@
<arrearsleavefactoryInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
<!-- 流程审批记录 -->
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url : ''"></iframe>
</el-dialog>
</div>
</template>

10
yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactoryAdd.vue

@ -27,11 +27,11 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">维修单编号</div>
<div class="span-sty">维修单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.pairBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单类型</div>
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -55,7 +55,7 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单应收金额</div>
<div class="span-sty">维修单应收金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.pairReceivableMoney }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -137,7 +137,7 @@ export default {
},
methods: {
showAdd(value) {
this.viewTitle = '【新增】保外欠款出厂申请'
this.viewTitle = '【新增】欠款出厂申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -155,7 +155,7 @@ export default {
this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
},
showEdit(row) {
this.viewTitle = '【编辑】保外欠款出厂申请'
this.viewTitle = '【编辑】欠款出厂申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})

8
yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactoryInfo.vue

@ -25,11 +25,11 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">维修单编号</div>
<div class="span-sty">维修单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.pairBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单类型</div>
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -53,7 +53,7 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单应收金额</div>
<div class="span-sty">维修单应收金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.pairReceivableMoney }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -130,7 +130,7 @@ export default {
},
methods: {
showInfo(row) {
this.viewTitle = '保外欠款出厂详情'
this.viewTitle = '欠款出厂申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})

4
yxt-as-ui/src/views/operation/repairbill/repairbill.vue

@ -51,9 +51,6 @@
<el-form-item label="联系电话">
<el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
</el-form-item>
<el-form-item label="客户单位">
<el-input v-model="listQuery.params.customerOrg" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车牌号">
<el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
</el-form-item>
@ -108,7 +105,6 @@
<el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="160" />
<el-table-column prop="customerName" label="客户名称" align="center" width="160" />
<el-table-column prop="mobile" label="联系电话" align="center" width="100" />
<el-table-column prop="customerOrg" label="客户单位" align="center" width="100" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="vehModel" label="车型" align="center" width="200" />

17
yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

@ -825,7 +825,7 @@ export default {
let gsf = '0'
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
if (e.serviceItem !== '') {
if (e.serviceItemSid !== '') {
gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
@ -874,7 +874,7 @@ export default {
let yh = '0'
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
if (e.serviceItem !== '') {
if (e.serviceItemSid !== '') {
yh = Math.round((parseFloat(yh) + parseFloat(e.discountAmount !== '' ? e.discountAmount : '0')) * 100) / 100
}
})
@ -1062,6 +1062,14 @@ export default {
const choose = this.billType_list.filter((item) => item.dictValue === value)
if (choose.length > 0 && choose !== null) {
this.formobj.billTypeKey = choose[0].dictKey
//
if (this.formobj.billTypeKey === '2' && this.formobj.customerSid !== '') {
req.getListByCustomerSid({ customerSid: this.formobj.customerSid }).then((res) => {
if (res.success) {
this.people_list = res.data
}
})
}
} else {
this.formobj.billTypeKey = ''
}
@ -1788,6 +1796,7 @@ export default {
}
this.serviceData = []
this.subjoinData = []
this.activeNames = '1'
this.settleVisible = false
this.submitdisabled = false
this.$emit('doback')
@ -1821,4 +1830,8 @@ export default {
line-height: 1px;
vertical-align: middle;
}
/deep/ .el-collapse .el-collapse-item .el-collapse-item__header {
height: 42px !important;
line-height: 42px !important;
}
</style>

4
yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue

@ -51,9 +51,6 @@
<el-form-item label="联系电话">
<el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
</el-form-item>
<el-form-item label="客户单位">
<el-input v-model="listQuery.params.customerOrg" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车牌号">
<el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
</el-form-item>
@ -108,7 +105,6 @@
<el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="160" />
<el-table-column prop="customerName" label="客户名称" align="center" width="160" />
<el-table-column prop="mobile" label="联系电话" align="center" width="100" />
<el-table-column prop="customerOrg" label="客户单位" align="center" width="100" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="vehModel" label="车型" align="center" width="200" />

4
yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue

@ -51,9 +51,6 @@
<el-form-item label="联系电话">
<el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
</el-form-item>
<el-form-item label="客户单位">
<el-input v-model="listQuery.params.customerOrg" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车牌号">
<el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
</el-form-item>
@ -108,7 +105,6 @@
<el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="160" />
<el-table-column prop="customerName" label="客户名称" align="center" width="160" />
<el-table-column prop="mobile" label="联系电话" align="center" width="100" />
<el-table-column prop="customerOrg" label="客户单位" align="center" width="100" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="vehModel" label="车型" align="center" width="200" />

4
yxt-as-ui/src/views/operation/repairbill/repairbillByMaintain.vue

@ -45,9 +45,6 @@
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="客户名称">
<el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
</el-form-item>
@ -108,7 +105,6 @@
<el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="160" />
<el-table-column prop="customerName" label="客户名称" align="center" width="160" />
<el-table-column prop="mobile" label="联系电话" align="center" width="100" />
<el-table-column prop="customerOrg" label="客户单位" align="center" width="100" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="vehModel" label="车型" align="center" width="200" />

4
yxt-as-ui/src/views/operation/repairbill/repairbillBySendWork.vue

@ -51,9 +51,6 @@
<el-form-item label="联系电话">
<el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
</el-form-item>
<el-form-item label="客户单位">
<el-input v-model="listQuery.params.customerOrg" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车牌号">
<el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
</el-form-item>
@ -108,7 +105,6 @@
<el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="160" />
<el-table-column prop="customerName" label="客户名称" align="center" width="160" />
<el-table-column prop="mobile" label="联系电话" align="center" width="100" />
<el-table-column prop="customerOrg" label="客户单位" align="center" width="100" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="vehModel" label="车型" align="center" width="200" />

4
yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue

@ -51,9 +51,6 @@
<el-form-item label="联系电话">
<el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
</el-form-item>
<el-form-item label="客户单位">
<el-input v-model="listQuery.params.customerOrg" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车牌号">
<el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
</el-form-item>
@ -108,7 +105,6 @@
<el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="160" />
<el-table-column prop="customerName" label="客户名称" align="center" width="160" />
<el-table-column prop="mobile" label="联系电话" align="center" width="100" />
<el-table-column prop="customerOrg" label="客户单位" align="center" width="100" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="vehModel" label="车型" align="center" width="200" />

5
yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue

@ -592,6 +592,7 @@ export default {
useOrgSid: '',
createOrgSid: ''
}
this.activeNames = '1'
this.$emit('doback')
}
}
@ -611,4 +612,8 @@ export default {
.addinputInfo-one {
margin-left: 170px !important;
}
/deep/ .el-collapse .el-collapse-item .el-collapse-item__header {
height: 42px !important;
line-height: 42px !important;
}
</style>

603
yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue

@ -1,48 +1,38 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="旧件库存查询" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<button-bar ref="btnbar" view-title="旧件库存查询" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">
{{ searchxianshitit }}
</el-button>
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="商品ID">
<el-input v-model="queryParams.params.goodsID" placeholder="" clearable />
<el-input v-model="queryParams.params.goodsID" placeholder="" clearable/>
</el-form-item>
<el-form-item label="商品名称">
<el-input v-model="queryParams.params.goodsSpuName" placeholder="" clearable />
<el-input v-model="queryParams.params.goodsSpuName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="商品编码">
<el-input v-model="queryParams.params.goodsSkuCode" placeholder="" clearable />
<el-form-item label="图号">
<el-input v-model="queryParams.params.goodsSkuCode" placeholder="" clearable/>
</el-form-item>
<el-form-item label="仓库">
<el-select v-model="queryParams.params.warehouseName" filterable clearable placeholder="请选择"
style="width:100%" @change="warehouseNameSelect">
<el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName"
:value="item.sid">
<el-select v-model="queryParams.params.warehouseName" filterable clearable placeholder="请选择" @change="warehouseNameSelect">
<el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="库位">
<el-select v-model="queryParams.params.warehouseRackCode" filterable clearable placeholder="请选择"
style="width:100%" @change="warehouseRackCodeSelect">
<el-select v-model="queryParams.params.warehouseRackCode" filterable clearable placeholder="请选择" @change="warehouseRackCodeSelect">
<el-option v-for="item in warehouseRackList" :key="item.sid" :label="item.areaCode" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="厂家">
<el-select v-model="queryParams.params.manufacturerName" filterable clearable placeholder="请选择"
style="width:100%" @change="manufacturerNameSelect">
<el-option v-for="item in manufacturerList" :key="item.sid" :label="item.manufacturerName"
:value="item.sid">
</el-option>
</el-select>
<el-input v-model="queryParams.params.manufacturerName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="queryParams.params.vinNo" placeholder="" clearable />
<el-input v-model="queryParams.params.vinNo" placeholder="" clearable/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -58,383 +48,300 @@
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center" />
<el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="goodsID" label="商品ID" width="120" align="center" />
<el-table-column prop="goodsSpuName" label="商品名称" width="150" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" width="120" align="center" />
<el-table-column prop="vinNo" label="车架号" width="150" align="center" />
<el-table-column prop="vehMark" label="车牌号" width="150" align="center" />
<el-table-column prop="sourceBillNo" label="维修单号" width="190" align="center" />
<el-table-column prop="goodsID" label="商品ID" width="120" align="center" />
<el-table-column prop="goodsSpuName" label="商品名称" width="150" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" width="120" align="center" />
<el-table-column prop="manufacturerName" label="厂家" width="180" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" width="120" align="center" />
<el-table-column prop="unit" label="单位" width="120" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
<el-table-column prop="warehouseInfo" label="仓库-库区" width="150" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="120" align="center" />
<el-table-column prop="inventoryCount" label="库存数量" width="120" align="center" />
</el-table>
</div>
<!-- End 项目列表 -->
<div class="pages">
<div class="tit" />
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
</div>
</div>
</div>
<!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 -->
<!-- <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" /> -->
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
</div>
</template>
<script>
import req from '@/api/storage/oldPartsInvertory.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
// import divAdd from './oldPartsInStorageAdd.vue'
import divInfo from './oldPartsInvertoryInfo.vue'
export default {
components: {
ButtonBar,
Pagination,
pageye,
// divAdd,
divInfo
},
data() {
return {
dialogVisible: false,
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import req from '@/api/storage/oldPartsInvertory.js'
import divInfo from './oldPartsInvertoryInfo.vue'
{
type: 'success',
size: 'small',
icon: 'export',
btnKey: 'toBuild',
btnLabel: '导出'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
goodsID: '',
goodsSpuName: "",
goodsSkuCode: "",
warehouseName: "",
warehouseRackCode: "",
manufacturerName: "",
vinNo: "",
createBySid: "",
orgPath: "",
}
export default {
components: {
ButtonBar,
Pagination,
divInfo
},
data() {
return {
dialogVisible: false,
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
sids: [],
selectionList: [],
manufacturerList: [],
warehouseList: [],
warehouseRackList: [],
{
type: 'success',
size: 'small',
icon: 'export',
btnKey: 'toBuild',
btnLabel: '导出'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
goodsID: '',
goodsSpuName: '',
goodsSkuCode: '',
warehouseName: '',
warehouseRackCode: '',
manufacturerName: '',
vinNo: '',
createBySid: '',
orgPath: ''
}
},
sids: [],
multipleSelection: [],
warehouseList: [],
warehouseRackList: []
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.loadList()
this.getWarehouseList()
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.loadList()
this.getWarehouseList()
this.getManufacturerList()
btnHandle(btnKey) {
switch (btnKey) {
case 'doDel':
this.doDel()
break
case 'toBuild':
this.toBuild()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
methods: {
selectionLineChangeHandle(val) {
console.log("val", val);
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
} else {
this.searchxianshitit = '显示查询条件'
// resp.code
this.dataList = []
this.queryParams.total = 0
}
},
btnHandle(btnKey) {
switch (btnKey) {
case 'doDel':
this.doDel()
break
case 'toBuild':
this.toBuild()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
} else {
// resp.code
this.dataList = []
this.queryParams.total = 0
}
}).catch(() => {
this.tableLoading = false
})
},
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
return pageindex
},
dosearch() {
this.queryParams.current = 1
this.loadList()
},
resetQuery() {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
goodsID: '',
goodsSpuName: "",
goodsSkuCode: "",
warehouseName: "",
warehouseRackCode: "",
manufacturerName: "",
vinNo: "",
createBySid: "",
orgPath: "",
}
}).catch(() => {
this.tableLoading = false
})
},
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
return pageindex
},
selectionLineChangeHandle(val) {
this.multipleSelection = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
dosearch() {
this.queryParams.current = 1
this.loadList()
},
resetQuery() {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
goodsID: '',
goodsSpuName: '',
goodsSkuCode: '',
warehouseName: '',
warehouseRackCode: '',
manufacturerName: '',
vinNo: '',
createBySid: '',
orgPath: ''
}
this.loadList()
},
doDel() {
for (var i = 0; i < this.selectionList.length; i++) {
if (this.selectionList[i].inventoryCount != 0) {
this.$message({
type: 'warning',
message: "只有库存数量为0的,才可以删除",
showClose: true
})
}
this.loadList()
},
doDel() {
if (this.sids.length > 0) {
for (var i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].inventoryCount !== '0') {
this.$message({ showClose: true, type: 'warning', message: '请选择库存数量为0的记录进行操作' })
return
}
}
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// resp.code
}
}).catch(e => {
loading.close()
})
}).catch(() => {})
} else {
this.$message({
showClose: true,
message: '请至少选择一条记录进行删除操作'
})
}
},
toBuild() {
// if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.exportExcel(this.queryParams.params).then((resp) => {
req.deleteBySids(this.sids).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '旧件库存' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// resp.code
}
}).catch(e => {
loading.close()
})
// } else {
// this.$message({
// type:"warning",
// showClose: true,
// message: ''
// })
// }
},
toRelevancy(row) {
this.viewState = 4
this.$refs['divinfo'].showAdd(row)
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
resetState() {
this.viewState = 1
},
manufacturerNameSelect(val) {
console.log("supplierNameSelect", val);
const choose = this.manufacturerList.filter((item) => item.sid == val)
console.log('>>>>>>>>>supplierNameSelect', choose)
this.queryParams.params.manufacturerName = choose[0].manufacturerName
this.queryParams.params.manufacturerSid = choose[0].sid
},
getManufacturerList() {
var params = {
userSid : window.sessionStorage.getItem('userSid'),
orgPath :window.sessionStorage.getItem('defaultOrgPath'),
menuUrl : this.$route.path
}
req.choiceManufacturer(params).then((res) => {
if (res.success) {
this.manufacturerList = res.data
console.log("aaaaaa", this.manufacturerList);
}
}).catch(() => {
})
},
getWarehouseList() {
var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}
req.getWarehouses(parpams).then((res) => {
if (res.success) {
this.warehouseList = res.data
console.log("aaaaaa", this.warehouseList);
}
} else {
this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行删除操作' })
}
},
toBuild() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.exportExcel(this.queryParams.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
},
getWarehouseAreaList(sid) {
var query = {
ckSid: sid
const fileName = '旧件库存' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
toRelevancy(row) {
this.viewState = 4
this.$refs['divinfo'].showInfo(row)
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
resetState() {
this.viewState = 1
},
getWarehouseList() {
req.getWarehouses({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.warehouseList = res.data
}
req.getWarehouseareas(query).then((res) => {
if (res.success) {
this.warehouseRackList = res.data
console.log("aaaaaa", this.warehouseRackList);
}
})
},
warehouseNameSelect(val) {
console.log("selectWarehouseName", val);
const choose = this.warehouseList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseName', choose)
this.queryParams.params.warehouseName = choose[0].warehouseName
this.queryParams.params.warehouseSid = choose[0].sid
this.getWarehouseAreaList(choose[0].sid)
},
warehouseRackCodeSelect(val) {
console.log("selectWarehouseAreaCode", val);
const choose = this.warehouseRackList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
this.queryParams.params.warehouseRackCode = choose[0].areaCode
this.queryParams.params.warehouseRackSid = choose[0].sid
},
})
},
getWarehouseAreaList(sid) {
req.getWarehouseareas({ ckSid: sid }).then((res) => {
if (res.success) {
this.warehouseRackList = res.data
}
})
},
warehouseNameSelect(val) {
const choose = this.warehouseList.filter((item) => item.sid === val)
this.queryParams.params.warehouseName = choose[0].warehouseName
this.queryParams.params.warehouseSid = choose[0].sid
this.getWarehouseAreaList(choose[0].sid)
},
warehouseRackCodeSelect(val) {
const choose = this.warehouseRackList.filter((item) => item.sid === val)
this.queryParams.params.warehouseRackCode = choose[0].areaCode
this.queryParams.params.warehouseRackSid = choose[0].sid
}
}
}
</script>
<style scoped>
</style>

145
yxt-as-ui/src/views/storage/oldPartsInvertory/oldPartsInvertoryInfo.vue

@ -1,25 +1,14 @@
<template>
<div>
<div class="app-container">
<div class="tab-header webtop">
<!-- 标题 -->
<div>库存出入库记录</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">车架号</div>
<el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
@ -29,17 +18,15 @@
<el-form-item><span class="addinputInfo">{{ formobj.goodsSpuName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">商品编码</div>
<div class="span-sty">图号</div>
<el-form-item><span class="addinputInfo">{{ formobj.goodsSkuCode }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">厂家</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufacturerName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">仓库</div>
<el-form-item><span class="addinputInfo">{{ formobj.warehouseName }}</span></el-form-item>
@ -48,15 +35,10 @@
<div class="span-sty">库位</div>
<el-form-item><span class="addinputInfo">{{ formobj.warehouseRackCode }}</span></el-form-item>
</el-col>
</el-row>
<div class="title"
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div>出入库记录列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.list" border>
<el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
<div class="title">出入库记录列表</div>
<el-table :key="tableKey" :data="formobj.list" :index="index" border style="width: 100%">
<el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="来源单号" prop="billNo" align="center" />
<el-table-column label="单据类型" prop="billType" align="center" />
<el-table-column label="发生时间" prop="createTime" align="center" />
@ -64,85 +46,66 @@
<el-table-column label="数量" prop="count" align="center" />
<el-table-column label="出入库后的库存" prop="currentCount" align="center" />
</el-table>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/storage/oldPartsInvertory.js'
export default {
components: {},
data() {
return {
listLoading: false,
submitdisabled: false,
formobj: {},
import req from '@/api/storage/oldPartsInvertory.js'
export default {
components: {},
data() {
return {
tableKey: 1,
index: 0,
formobj: {
sid: '',
vinNo: '',
goodsSpuName: '',
goodsSkuCode: '',
manufacturerName: '',
warehouseName: '',
warehouseRackCode: '',
list: []
}
},
methods: {
indexMethod(index) {
return index + 1
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
}
this.submitdisabled = false
this.$emit('doback')
},
showAdd(row) {
var params = {
sid: row.sid
}
},
methods: {
showInfo(row) {
req.init({ sid: row.sid }).then(resp => {
if (resp.success) {
this.formobj = resp.data
}
req.init(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
this.formobj = {}
})
},
showEdit() {
}).catch(e => {
this.formobj = {}
})
},
handleReturn() {
this.formobj = {
sid: '',
vinNo: '',
goodsSpuName: '',
goodsSkuCode: '',
manufacturerName: '',
warehouseName: '',
warehouseRackCode: '',
list: []
}
this.$emit('doback')
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.first_row {
border-top: 1px solid #E0E3EB;
}
</style>

8
yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryDaiBan.vue

@ -28,11 +28,11 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">维修单编号</div>
<div class="span-sty">维修单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.pairBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单类型</div>
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -56,7 +56,7 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单应收金额</div>
<div class="span-sty">维修单应收金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.pairReceivableMoney }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -236,7 +236,7 @@ export default {
},
methods: {
showInfo(sid) {
this.viewTitle = '保外欠款出厂详情'
this.viewTitle = '欠款出厂申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})

8
yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryEdit.vue

@ -26,11 +26,11 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">维修单编号</div>
<div class="span-sty">维修单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.pairBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单类型</div>
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -54,7 +54,7 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单应收金额</div>
<div class="span-sty">维修单应收金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.pairReceivableMoney }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -153,7 +153,7 @@ export default {
},
methods: {
showInfo(sid) {
this.viewTitle = '【编辑】保外欠款出厂申请'
this.viewTitle = '【编辑】欠款出厂申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})

8
yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryYiBan.vue

@ -25,11 +25,11 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">维修单编号</div>
<div class="span-sty">维修单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.pairBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单类型</div>
<div class="span-sty">维修单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -53,7 +53,7 @@
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单应收金额</div>
<div class="span-sty">维修单应收金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.pairReceivableMoney }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -165,7 +165,7 @@ export default {
},
methods: {
showInfo(sid) {
this.viewTitle = '保外欠款出厂详情'
this.viewTitle = '欠款出厂申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})

Loading…
Cancel
Save