Browse Source

完善旧件

master
guoxing 12 months ago
parent
commit
4002bb535b
  1. 12
      yxt-as-ui/src/api/storage/oldPartsFactory.js
  2. 11
      yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js
  3. 15
      yxt-as-ui/src/api/storage/oldPartsInvertory.js
  4. 3
      yxt-as-ui/src/api/storage/oldPartsRecovery.js
  5. 1
      yxt-as-ui/src/api/storage/receivingGoods.js
  6. 1489
      yxt-as-ui/src/router/index.js
  7. 14
      yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue
  8. 1
      yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue
  9. 8
      yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue
  10. 3
      yxt-as-ui/src/views/storage/oldPartsCope/index.vue
  11. 63
      yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue
  12. 25
      yxt-as-ui/src/views/storage/oldPartsFactory/index.vue
  13. 110
      yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue
  14. 4
      yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue
  15. 3
      yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue
  16. 3
      yxt-as-ui/src/views/storage/oldPartsInStorage/index.vue
  17. 14
      yxt-as-ui/src/views/storage/oldPartsInStorage/oldPartsInStorageAdd.vue
  18. 3
      yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue
  19. 23
      yxt-as-ui/src/views/storage/oldPartsRecovery/index.vue
  20. 372
      yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue
  21. 4
      yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryInfo.vue
  22. 580
      yxt-as-ui/src/views/storage/oldPartsRecovery/repairbillInfo.vue

12
yxt-as-ui/src/api/storage/oldPartsFactory.js

@ -68,6 +68,18 @@ export default {
})
},
// 查询分页列表
getGoodsListPage: function(params) {
return request({
url: '/wms/apiadmin/WmsOutBill/getInventoryList',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 下载模板
downloadExcel: function() {
return request({

11
yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js

@ -29,10 +29,13 @@ export default {
// 选择厂家
choiceManufacturer: function(params) {
return request({
url: '/wms/apiadmin/base/basemanufacturer/listAll',
method: 'get',
data: params,
return request({
url: '/yxtbase/apiadmin/base/basemanufacturer/listAll',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},

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

@ -51,12 +51,15 @@ export default {
// 选择厂家
choiceManufacturer: function(params) {
return request({
url: '/wms/apiadmin/base/basemanufacturer/listAll',
method: 'get',
data: params,
})
},
return request({
url: '/yxtbase/apiadmin/base/basemanufacturer/listAll',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 查询所有仓库
getWarehouses: function(params) {

3
yxt-as-ui/src/api/storage/oldPartsRecovery.js

@ -17,9 +17,8 @@ export default {
// 获取维修工单详情
getOneByBillNo: function(data) {
return request({
url: '/as/v1/AsBusrepairBill/getOneByBillNo',
url: '/as/v1/AsBusrepairBill/getOneByBillNo?sid=' + data,
method: 'get',
data: data,
});
},

1
yxt-as-ui/src/api/storage/receivingGoods.js

@ -74,7 +74,6 @@ export default {
},
deleteBySids: function(data) {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/delBySids',

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

File diff suppressed because it is too large

14
yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue

@ -185,14 +185,20 @@
<el-table-column label="商品名称" align="center" min-width="120">
<template slot-scope="scope">
<el-popover placement="right" width="900" trigger="click">
<el-popover placement="right" width="1000" trigger="click">
<div>
<el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row
@current-change="commodityCurrentChange($event, scope.row)">
<el-table-column fixed prop="goodsSpuName" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column fixed prop="goodsID" label="商品ID" width="150"align="center" />
<el-table-column fixed prop="goodsSpuName" label="商品名称" width="180" align="center" />
<el-table-column fixed prop="goodsSkuCode" label="商品图号" width="100"align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="150"align="center" />
<el-table-column prop="warehouseRackCode" label="库位"width="100" align="center" />
<el-table-column prop="price" label="入库单价" width="100"align="center" />
<el-table-column prop="count" label="库存数量"width="100" align="center" />
<el-table-column prop="supplierName" label="供应商"width="200" align="center" />
</el-table>
<pagination v-show="commodityData.length > 0" :total="commodityQuery.total" :page.sync="commodityQuery.current"

1
yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue

@ -53,6 +53,7 @@
</el-table-column>
<el-table-column prop="billNo" label="工单编号" align="center" />
<el-table-column prop="billType" label="工单类型" align="center" />
<el-table-column prop="billType" label="是否外出" align="center" />
<el-table-column prop="customerName" label="客户名称" align="center" />
<el-table-column prop="mobile" label="联系电话" align="center" />
<el-table-column prop="vinNo" label="车架号" align="center" />

8
yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue

@ -0,0 +1,8 @@
<template>
</template>
<script>
</script>
<style>
</style>

3
yxt-as-ui/src/views/storage/oldPartsCope/index.vue

@ -213,6 +213,9 @@
},
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) {

63
yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue

@ -237,8 +237,10 @@
"remarks": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptSid": window.sessionStorage.getItem('departmentSid'),
"deptName": window.sessionStorage.getItem('departmentName'),
"deptSid": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": "",
"billNo": "",
"filePaths": [],
@ -329,14 +331,14 @@
}
},
created() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
}
})
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
}
})
},
methods: {
@ -511,25 +513,28 @@
if (isreload === 'true') this.$emit('reloadlist')
this.imgList = []
this.formobj = {
"sid": "",
"remarks": "",
"createBySid": "",
"createByName": "",
"createDeptSid": "",
"createDeptName": "",
"createTime": "",
"billNo": "",
"filePaths": [],
"useOrgSid": "",
"useOrgName": "",
"orgSidPath": "",
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldparthandleList": []
"sid": "",
"remarks": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptSid": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": "",
"billNo": "",
"filePaths": [],
"useOrgSid": '',
"useOrgName": '',
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldparthandleList": [
]
}
this.submitdisabled = false
this.isUpdata = false

25
yxt-as-ui/src/views/storage/oldPartsFactory/index.vue

@ -10,28 +10,28 @@
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
<el-input v-model="queryParams.params.useOrgName" placeholder="" clearable />
</el-form-item>
<el-form-item label="申请部门">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
<el-input v-model="queryParams.params.deptName" placeholder="" clearable />
</el-form-item>
<el-form-item label="单据编号">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期"
<el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期"
<el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="办结日期">
<el-date-picker v-model="queryParams.params.deliveryDateStart" type="date" placeholder="选择日期"
<el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.deliveryDateEnd" type="date" placeholder="选择日期"
<el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
@ -61,18 +61,18 @@
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" :disabled="scope.row.billState=='完成'"
<el-button type="primary" size="mini" :disabled="scope.row.nodeState!='待提交'"
@click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="nodeState" label="流程状态" align="center" />
<el-table-column prop="billNo" label="单据编号" align="center" />
<el-table-column prop="useOrgName" label="分公司" align="center" />
<el-table-column prop="createDeptName" label="申请部门" align="center" />
<el-table-column prop="billNo" label="单据编号" width="180" align="center" />
<el-table-column prop="useOrgName" label="分公司" width="120"align="center" />
<el-table-column prop="deptName" label="申请部门" width="120"align="center" />
<el-table-column prop="createByName" label="申请人" align="center" />
<el-table-column prop="createTime" label="申请日期" align="center" />
<el-table-column prop="needReturnCount" label="应返厂数量合计" align="center" />
<el-table-column prop="needReturnCount" label="应返厂数量合计"width="180" align="center" />
<el-table-column prop="actualReturnCount" label="实际返厂数量合计" width="180" align="center" />
<el-table-column label="附件" align="center" width="100">
<template slot-scope="scope">
@ -315,6 +315,9 @@
},
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) {

110
yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue

@ -14,7 +14,7 @@
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<div class="title">
<div>基础信息</div>
</div>
@ -30,11 +30,11 @@
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.createDeptName }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item>
<div class="span-sty"><span class="must">*</span> 申请日期</div>
<el-form-item prop="createTime">
<el-date-picker v-model="formobj.createTime" class="addinputw addinputInfo" type="date"
value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
@ -76,9 +76,9 @@
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputw" v-model="formobj.filePaths" :limit="50" bucket="map"
<div class="span-sty"><span class="must">*</span> 附件</div>
<el-form-item prop="imgList">
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" />
</el-form-item>
</el-col>
@ -102,7 +102,7 @@
@current-change="commodityCurrentChange($event, scope.row)">
<el-table-column fixed prop="goodsSpuName" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="厂家" align="center" />
<el-table-column prop="manufacturerName" label="厂家" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
</el-table>
@ -175,6 +175,10 @@
<script>
import req from '@/api/storage/oldPartsFactory.js'
import uploadImg from '@/components/uploadFile/uploadImg'
import {
getOrgSidByPath
} from '@/api/Common/dictcommons'
export default {
components: {
uploadImg
@ -198,16 +202,18 @@
formobj: {
"sid": "",
"remarks": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"createDeptSid": window.sessionStorage.getItem('departmentSid'),
"createDeptName": window.sessionStorage.getItem('departmentName'),
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptSid": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": "",
"billNo": "",
"filePaths": [],
"useOrgSid": window.sessionStorage.getItem('orgSid'),
"useOrgName": window.sessionStorage.getItem('Orgname'),
"orgSidPath": window.sessionStorage.getItem('orgSidPath'),
"useOrgSid": '',
"useOrgName": '',
"orgSidPath": window.sessionStorage.getItem('orgSidPath'),
"procDefId": "",
"nodeId": "",
"procInstId": "",
@ -235,15 +241,39 @@
},
commodityData: [],
isUpdata: false,
imgList: []
imgList: [],
rules: {
createTime: [{
required: true,
message: '申请日期不能为空',
trigger: 'change'
}],
filePaths: [{
required: true,
message: '附件不能为空',
trigger: 'blur'
}],
}
}
},
created() {},
created() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
}
})
},
methods: {
commodityInput(value) {
this.commodityQuery.params.name = value
this.commodityLoading = true
this.commodityQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.commodityQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.commodityQuery.params.menuUrl = this.$route.path
req.getGoodsListPage(this.commodityQuery).then((response) => {
if (response.success) {
this.commodityLoading = false
@ -265,7 +295,7 @@
row.sid = ''
row.remarks = ''
row.mainSid = ''
row.manufacturerName = value.goodsSkuOwnSpec
row.manufacturerName = value.manufacturerName
row.goodsSkuName = value.goodsSpuName
row.goodsSkuCode = value.goodsSkuCode
row.goodsSkuOwnSpec = value.goodsSkuOwnSpec
@ -381,23 +411,27 @@
this.formobj = {
"sid": "",
"remarks": "",
"createBySid": "",
"createByName": "",
"createDeptSid": "",
"createDeptName": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptSid": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": "",
"billNo": "",
"filePaths": [],
"useOrgSid": "",
"useOrgName": "",
"orgSidPath": "",
"useOrgSid": '',
"useOrgName": '',
"orgSidPath": window.sessionStorage.getItem('orgSidPath'),
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldpartreturnList": []
"asOldpartreturnList": [
]
}
this.submitdisabled = false
this.isUpdata = false
@ -405,17 +439,23 @@
},
showAdd() {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.title = "【新增】"
this.isUpdata = false
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.title = "【修改】"
this.isUpdata = true
var params = {
sid: row.sid
}
req.init(params)
req.init(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
@ -486,16 +526,28 @@
}
this.dialogVisible = false
},
backData() {
backData(value) {
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
this.formobj.filePaths = this.imgList
for (var i = 0; i < this.imgList.length; i++) {
this.formobj.filePaths.push(this.imgList[i].url)
}
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
}

4
yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue

@ -69,7 +69,7 @@
<div class="span-sty">附件</div>
<el-form-item class="trightb_item">
<el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo"
v-for="(item,index) in formobj.filePaths" :src="item.url" :preview-src-list="[item.url]">
v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
</el-image>
</el-form-item>
</el-col>
@ -131,7 +131,7 @@
var params = {
sid: row.sid
}
req.init(params)
req.init(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data

3
yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue

@ -243,6 +243,9 @@
},
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) {

3
yxt-as-ui/src/views/storage/oldPartsInStorage/index.vue

@ -210,6 +210,9 @@
},
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) {

14
yxt-as-ui/src/views/storage/oldPartsInStorage/oldPartsInStorageAdd.vue

@ -101,7 +101,9 @@
<script>
import req from '@/api/storage/oldPartsInStorage.js'
import {
getOrgSidByPath
} from '@/api/Common/dictcommons'
export default {
components: {},
data() {
@ -111,6 +113,16 @@
formobj: {},
}
},
created() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
}
})
},
methods: {
indexMethod(index) {
return index + 1

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

@ -216,6 +216,9 @@
},
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) {

23
yxt-as-ui/src/views/storage/oldPartsRecovery/index.vue

@ -91,7 +91,7 @@
</div>
<!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 -->
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
<!-- <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" /> -->
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
<el-dialog title="旧件照片" :visible.sync="dialogVisible" :before-close="handleClose">
@ -137,8 +137,8 @@
<el-col :span="24">
<div class="span-sty">旧件照片</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputInfo" :accept="accept" v-model="orderInfo.photos" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" />
<upload-img ref="uploadImg" class="addinputInfo" :accept="accept" v-model="imgList" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" @change="backData"/>
</el-form-item>
</el-col>
@ -162,7 +162,7 @@
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './oldPartsRecoveryAdd.vue'
import divInfo from './oldPartsRecoveryInfo.vue'
import divInfo from './repairbillInfo.vue'
import uploadImg from '@/components/uploadFile/uploadImg'
export default {
components: {
@ -225,7 +225,10 @@
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
this.orderInfo.photos = this.imgList
for (var i = 0; i < this.imgList.length; i++) {
this.orderInfo.photos.push(this.imgList[i].url)
}
},
selectionLineChangeHandle(val) {
@ -265,6 +268,9 @@
},
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) {
@ -314,7 +320,7 @@
return
}
req.getOneByBillNo(this.selectionList[0].billNo).then((resp) => {
req.getOneByBillNo(this.selectionList[0].sid).then((resp) => {
this.orderInfo = resp.data
@ -364,7 +370,8 @@
req.save(this.orderInfo).then((resp) => {
this.orderInfo={}
this.imgList = []
this.loadList()
this.dialogVisible2 = false
}).catch(() => {})
@ -377,7 +384,7 @@
showOrder(row) {
this.viewState = 4
this.$refs['divinfo'].showEdit(row)
this.$refs['divinfo'].showInfo(row)
},

372
yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue

@ -12,19 +12,18 @@
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<div class="title">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div>
</div> -->
<el-row class="first_row">
<el-col :span="12">
<div class="span-sty">维修工单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">申请</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.billTime }}</span></el-form-item>
</el-col>
</el-row>
@ -32,142 +31,65 @@
<el-row>
<el-col :span="12">
<div class="span-sty">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
<div class="span-sty">客户名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.createDeptName }}</span></el-form-item>
<div class="span-sty">车牌号</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">申请日期</div>
<el-form-item><el-date-picker v-model="formobj.createTime" type="date" class="addinputInfo"value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<div class="span-sty">车架号</div>
<el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">流程状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.nodeState }}</span></el-form-item>
<!-- <div class="span-sty"></div>
<el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item> -->
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw" type="textarea" :rows="4" clearable />
</el-form-item>
<div class="span-sty">旧件回收说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.shortss }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item >
<upload style="margin-top: 20px;margin-bottom: 20px;" class="addinputw" ref="uploadImg2" v-model="imgList"
:limit="9" @change="backData" bucket="map" :upload-data="{ type: '0001' }"></upload>
<div class="span-sty">旧件照片</div>
<el-form-item>
<upload style="margin-top: 20px;margin-bottom: 20px;" class="addinputw" ref="uploadImg2"
v-model="formobj.photos" :limit="9" @change="backData" bucket="map" :upload-data="{ type: '0001' }">
</upload>
</el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>返厂旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border >
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column align="center" width="100" :render-header="commodityHeader">
<template slot-scope="scope">
<i class="el-icon-delete" @click="commodityDelete(scope.$index)"></i>
</template>
</el-table-column>
<el-table-column label="商品名称" align="center" min-width="200">
<template slot-scope="scope">
<el-popover placement="right" width="900" trigger="click">
<div>
<el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row
@current-change="commodityCurrentChange($event, scope.row)">
<el-table-column fixed prop="goodsSpuName" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="厂家" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
</el-table>
<el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size"
layout="total, pager" :total="commodityQuery.total" />
</div>
<el-input slot="reference" v-model="scope.row.goodsSkuName"
@input="commodityInput(scope.row.goodsSkuName)" clearable placeholder="商品名称" />
</el-popover>
</template>
</el-table-column>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
<el-table-column prop="manufacturerName" label="厂家" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column label="需返厂数量" align="center" width="180">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.needReturnCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column label="实际返厂数量" align="center" width="180">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.actualReturnCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column label="差异说明" align="center" width="200">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.remarks" clearable placeholder="" />
</template>
</el-table-column>
</el-table>
</el-form>
</div>
<!-- 导入 -->
<el-dialog :visible.sync="dialogVisible" width="60%" :show-close="false">
<div style="margin-top: -40px;">
<el-button size="medium" type="text" style="font-weight: bold" @click="downLoad">下载导入厂家返厂明细模板</el-button>
</div>
<el-card class="box-card">
<div>
<el-upload ref="upload" class="upload-demo" accept=".xls,.xlsx" name="file" :action="updateAction"
:on-success="handleSuccess" :file-list="fileList" :auto-upload="false" :multiple="false" :limit="1"
:data="uploadData" :headers="headers">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传</el-button>
</el-upload>
</div>
<div>
<h3>文件上传结果</h3>
<el-card class="box-card">
<div>{{ uploadResultMesssage }}</div>
</el-card>
</div>
</el-card>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/storage/oldPartsFactory.js'
import req from '@/api/storage/oldPartsRecovery.js'
import upload from '@/components/uploadFile/upload'
import {
getOrgSidByPath
} from '@/api/Common/dictcommons'
export default {
components: {
upload
@ -175,58 +97,23 @@
data() {
return {
dialogVisible: false,
updateAction: process.env.VUE_APP_BASE_API + '/as/v1/asoldpartreturnapply/getExcelInfo',
fileList: [],
uploadSuccess: false,
uploadResultMesssage: '',
uploadData: {
sid: ''
},
headers: {
token: window.sessionStorage.getItem('token')
},
title: '【新增】',
listLoading: false,
submitdisabled: false,
formobj: {
"sid": "",
"remarks": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"createDeptSid": window.sessionStorage.getItem('departmentSid'),
"createDeptName": window.sessionStorage.getItem('departmentName'),
"createTime": "",
"billNo": "",
"filePaths": [],
"useOrgSid": window.sessionStorage.getItem('orgSid'),
"useOrgName": window.sessionStorage.getItem('Orgname'),
"orgSidPath": window.sessionStorage.getItem('orgSidPath'),
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldpartreturnList": [
"billTime": "",
"customerSid": "",
"customerName": "",
"vehMark": "",
"vinNo": "",
"shortss": "",
"photos": [
]
},
hideUploadBtn: false,
// commodity
commodityKey: 1,
commodityLoading: false,
commodityQuery: {
current: 1,
size: 2,
total: 0,
params: {
name: '',
inOrg: "",
outOrg: ""
}
},
commodityData: [],
isUpdata: false,
imgList: []
}
@ -234,94 +121,6 @@
created() {},
methods: {
commodityInput(value) {
this.commodityQuery.params.name = value
this.commodityLoading = true
req.getGoodsListPage(this.commodityQuery).then((response) => {
if (response.success) {
this.commodityLoading = false
this.commodityData = response.data.records
this.commodityQuery.total = response.data.total
} else {
this.serviceLoading = false
this.commodityData = []
this.commodityQuery.total = 0
}
})
},
commodityDelete(index) {
this.formobj.asOldpartreturnList.splice(index, 1)
},
commodityCurrentChange(value, row) {
console.log("commodityCurrentChange》》》》", value)
console.log("commodityCurrentChange》》》》", row)
row.sid = ''
row.remarks = ''
row.mainSid = ''
row.manufacturerName = value.goodsSkuOwnSpec
row.goodsSkuName = value.goodsSpuName
row.goodsSkuCode = value.goodsSkuCode
row.goodsSkuOwnSpec = value.goodsSkuOwnSpec
row.unit = value.unit
row.needReturnCount = 0
row.actualReturnCount = 0
document.body.click()
},
//
commodityHeader(h, {
column
}) {
return h(
'div',
[
h('span', column.label),
h('i', {
class: 'add-btn-icon el-icon-plus',
style: 'color: red;font-size:20px',
on: {
click: this.commodityAdd //
}
})
]
)
},
commodityAdd() {
this.formobj.asOldpartreturnList.push({
"sid": "",
"remarks": "",
"mainSid": "",
"manufacturerName": "",
"goodsSkuName": "",
"goodsSkuCode": "",
"goodsSkuOwnSpec": "",
"unit": "",
"needReturnCount": 0,
"actualReturnCount": 0
})
},
doGoodsDel(sid) {
console.log("doGoodsDel》》》》", sid)
this.$confirm("是否确定删除此商品?", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const index = this.formobj.asOldpartreturnList.findIndex((item) => item === row)
console.log("index》》》》", index)
this.formobj.asOldpartreturnList.splice(index, 1)
})
},
indexMethod(index) {
return Number(index) + 1
},
importDetail() {
this.dialogVisible = true
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
@ -345,52 +144,22 @@
}
})
},
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
"sid": "",
"remarks": "",
"createBySid": "",
"createByName": "",
"createDeptSid": "",
"createDeptName": "",
"createTime": "",
"billNo": "",
"filePaths": [],
"useOrgSid": "",
"useOrgName": "",
"orgSidPath": "",
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldpartreturnList": []
"billTime": "",
"customerSid": "",
"customerName": "",
"vehMark": "",
"vinNo": "",
"shortss": "",
"photos": [
]
}
this.imgList = []
this.submitdisabled = false
this.isUpdata = false
this.$emit('doback')
@ -407,7 +176,7 @@
sid: row.sid
}
req.init(params)
req.init(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
@ -418,53 +187,12 @@
})
},
downLoad() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.downloadExcel().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(() => {
loading.close()
})
},
submitUpload() {
this.$refs.upload.submit()
},
handleSuccess(resp, file, fileList) {
const _this = this
_this.uploadResultMesssage = resp.msg
_this.uploadSuccess = resp.success
backData(value) {
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
},
handleConfirm() {
if (!this.uploadSuccess) {
this.$message({
showClose: true,
type: 'error',
message: '请先上传导入厂家返件明细'
})
return
}
this.dialogVisible = false
this.getList()
},
backData() {
this.formobj.photos = this.imgList
}
}

4
yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryInfo.vue

@ -15,9 +15,9 @@
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<div class="title">
<!-- <div class="title">
<div>基础信息</div>
</div>
</div> -->
<el-row class="first_row">
<el-col :span="12">
<div class="span-sty">维修工单编号</div>

580
yxt-as-ui/src/views/storage/oldPartsRecovery/repairbillInfo.vue

@ -0,0 +1,580 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<!-- <el-button type="primary" size="small" @click="negativeSettlement()">反结算</el-button> -->
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">制单人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">制单部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">制单日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createDate }}</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.billType }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">科目</div>
<el-form-item><span class="addinputInfo">{{ formobj.subject }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">环节</div>
<el-form-item><span class="addinputInfo">{{ formobj.nodeName }}</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.entryTime }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">预计完工</div>
<el-form-item><span class="addinputInfo">{{ formobj.estimatedFinishTime }}</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.waitorName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">班组</div>
<el-form-item><span class="addinputInfo">{{ formobj.groupName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">主修人</div>
<el-form-item><span class="addinputInfo">{{ formobj.mainRepairers }}</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.shotRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注(打印)</div>
<el-form-item><span class="addinputInfo">{{ formobj.printRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-collapse v-model="activeNames">
<el-collapse-item title="客户信息" name="1">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">客户</div>
<el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">联系电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.mobile }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">客户单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.customerOrg }}</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.vehMark }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">车架号</div>
<el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">车型</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehModel }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">行驶里程(Km)</div>
<el-form-item><span class="addinputInfo">{{ formobj.mileage }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">油量(L)</div>
<el-form-item><span class="addinputInfo">{{ formobj.oil }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">当前里程(Km)</div>
<el-form-item><span class="addinputInfo">{{ formobj.currentMileage }}</span></el-form-item>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="送修人信息" name="2">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">送修人姓名</div>
<el-form-item><span class="addinputInfo">{{ formobj.otherVo.senderName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">送修人电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.otherVo.senderMobile }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">厂家</div>
<el-form-item><span class="addinputInfo">{{ formobj.otherVo.manufacturer }}</span></el-form-item>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="保险信息" name="3">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">责任划分</div>
<el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.responsibility }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">对方险种</div>
<el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.otherInsuranceType }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">保险公司1</div>
<el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.insuranceCompany1 }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">保险公司2</div>
<el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.insuranceCompany2 }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">保险索赔单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.claimBillNo }}</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.insuranceVo.insurer }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">勘察员</div>
<el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.investigator }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">定损员</div>
<el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.lossAdjuster }}</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.insuranceVo.isSpecialSign == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">出险类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.insuranceVo.accidentType }}</span></el-form-item>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="发票信息" name="4">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">是否开发票</div>
<el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.isInvoicing == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">发票类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.invoiceType }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开票名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.invoiceTitle }}</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.invoiceVo.taxpayerNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">发票号码</div>
<el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.invoiceCode }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">税率(%)</div>
<el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.taxRate }}</span></el-form-item>
</el-col>
</el-row>
</el-collapse-item>
</el-collapse>
<div class="title">服务项目</div>
<el-table :key="serviceKey" :data="formobj.sitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="serviceItem" label="服务项目" align="center" width="200" />
<el-table-column prop="serviceType" label="工种" align="center" width="150" />
<el-table-column prop="subject" label="科目" align="center" width="150" />
<el-table-column prop="repairerName" label="维修人" width="200" align="center" />
<el-table-column prop="examineHourPrice" label="考核工时" align="center" width="100" />
<el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
<el-table-column prop="hours" label="工时数" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="amount" label="销售金额" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">商品</div>
<el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
<el-table-column prop="unit" label="单位" width="100" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="count" label="数量" width="100" align="center" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
<el-table-column prop="amount" label="金额" width="100" align="center" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">附加项目</div>
<el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="aitemName" label="附加项目" align="center" width="200" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty" style="border-right: 0px">合计金额</div>
<el-form-item><span class="addinputInfo">{{ jeTotal }} = 工时费{{ gsfTotal }} + 材料费{{ clfTotal }} + 附加费{{ fjfTotal }} + 税额{{ seTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="border-right: 0px">应收金额</div>
<el-form-item><span class="addinputInfo">{{ ysjeTotal }} = 合计金额{{ jeTotal }} - 优惠<span>{{ formobj.discountAmount }}</span> - 优惠券<span>{{ formobj.coupon }}</span> - 积分抵扣<span>{{ formobj.scoreDeduct }}</span></span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<!-- <workslrsettlementAdd v-show="viewState == 2" ref="divFJS" @doback="resetState" /> -->
</div>
</template>
<script>
import req from '@/api/operation/repairbill'
// import workslrsettlementAdd from '../workslrsettlement/workslrsettlementAdd'
export default {
name: 'RepairBillInfo',
components: {
// workslrsettlementAdd
},
data() {
return {
viewTitle: '',
viewState: 1,
activeNames: '1',
tableKey: 0,
index: 0,
// service
serviceKey: 1,
// subjoin
subjoinKey: 2,
formobj: {
sid: '',
createByName: '',
operator: '',
billNo: '',
billType: '',
billTypeKey: '',
entryTime: '',
estimatedFinishTime: '',
subjectSid: '',
subject: '',
groupSid: '',
groupName: '',
waitorSid: '',
waitorName: '',
mainRepairers: '',
barCode: '',
shotRemarks: '',
printRemarks: '',
discountAmount: '',
coupon: '',
scoreDeduct: '',
nodeName: '',
nodeTime: '',
outDoorState: '',
outDoorTime: '',
customerSid: '',
customerName: '',
mobile: '',
customerOrg: '',
memberCardSid: '',
memberCarNumber: '',
vehMark: '',
vinNo: '',
vehModel: '',
mileage: '',
oil: '',
currentMileage: '',
invoiceVo: {
isInvoicing: '',
invoiceType: '',
invoiceTypeKey: '',
invoiceTitle: '',
taxpayerNo: '',
invoiceCode: '',
taxRate: ''
},
insuranceVo: {
responsibility: '',
responsibilityKey: '',
otherInsuranceType: '',
otherInsuranceTypeKey: '',
insuranceCompany1: '',
insuranceCompany2: '',
insurer: '',
claimBillNo: '',
investigator: '',
lossAdjuster: '',
isSpecialSign: '',
accidentType: '',
accidentTypeKey: ''
},
otherVo: {
manufacturer: '',
senderName: '',
senderMobile: ''
},
sitemVos: [],
aitemVos: [],
goodsDetailsVos: [],
orgPath: '',
createBySid: '',
deptSid: '',
deptName: '',
operatorSid: '',
nodeCode: '',
settleVo: {
payerNo: '',
payerName: '',
receivableAmount: '',
depositdeductAmount: '',
settleKey: '',
settleValue: '',
settleAmount: '',
otherSettleKey: '',
otherSettleValue: '',
debts: '',
settleTime: ''
},
showReSettleBtn: true
},
rules: {}
}
},
computed: {
// =
gsfTotal() {
let gsf = '0'
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
if (e.serviceItem !== '') {
gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return gsf
},
// =
clfTotal() {
let clf = '0'
if (this.formobj.goodsDetailsVos.length > 0) {
this.formobj.goodsDetailsVos.forEach((e) => {
if (e.goodsSpuName !== '') {
clf = Math.round((parseFloat(clf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return clf
},
// ==
fjfTotal() {
let fjf = '0'
if (this.formobj.aitemVos.length > 0) {
this.formobj.aitemVos.forEach((e) => {
if (e.aitemName !== '') {
fjf = Math.round((parseFloat(fjf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return fjf
},
// = *
seTotal() {
let se = '0'
se = Math.round((parseFloat(this.clfTotal) * (parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
return se
},
// = + + +
jeTotal() {
let je = '0'
je = Math.round((parseFloat(je) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal) + parseFloat(this.seTotal)) * 100) / 100
return je
},
//
ysjeTotal() {
let ysje = '0'
ysje = Math.round((parseFloat(ysje) + parseFloat(this.jeTotal) - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') - parseFloat(this.formobj.coupon !== '' ? this.formobj.coupon : '0') - parseFloat(this.formobj.scoreDeduct !== '' ? this.formobj.scoreDeduct : '0')) * 100) / 100
return ysje
}
},
methods: {
showInfo(row) {
this.viewTitle = '维修单详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
if (e.staffNameList.length > 0) {
e.repairerName = e.staffNameList.join(',')
}
})
}
}
})
},
resetState() {
this.viewState = 1
},
negativeSettlement() {
this.viewState = 2
this.$refs['divFJS'].showAdd(this.formobj.sid )
},
handleReturn() {
this.formobj = {
sid: '',
createByName: '',
operator: '',
billNo: '',
billType: '',
billTypeKey: '',
entryTime: '',
estimatedFinishTime: '',
subjectSid: '',
subject: '',
groupSid: '',
groupName: '',
waitorSid: '',
waitorName: '',
mainRepairers: '',
barCode: '',
shotRemarks: '',
printRemarks: '',
discountAmount: '',
coupon: '',
scoreDeduct: '',
nodeName: '',
nodeTime: '',
outDoorState: '',
outDoorTime: '',
customerSid: '',
customerName: '',
mobile: '',
customerOrg: '',
memberCardSid: '',
memberCarNumber: '',
vehMark: '',
vinNo: '',
vehModel: '',
mileage: '',
oil: '',
currentMileage: '',
invoiceVo: {
isInvoicing: '',
invoiceType: '',
invoiceTypeKey: '',
invoiceTitle: '',
taxpayerNo: '',
invoiceCode: '',
taxRate: ''
},
insuranceVo: {
responsibility: '',
responsibilityKey: '',
otherInsuranceType: '',
otherInsuranceTypeKey: '',
insuranceCompany1: '',
insuranceCompany2: '',
insurer: '',
claimBillNo: '',
investigator: '',
lossAdjuster: '',
isSpecialSign: '',
accidentType: '',
accidentTypeKey: ''
},
otherVo: {
manufacturer: '',
senderName: '',
senderMobile: ''
},
sitemVos: [],
aitemVos: [],
goodsDetailsVos: [],
orgPath: '',
createBySid: '',
deptSid: '',
deptName: '',
operatorSid: '',
nodeCode: '',
settleVo: {
payerNo: '',
payerName: '',
receivableAmount: '',
depositdeductAmount: '',
settleKey: '',
settleValue: '',
settleAmount: '',
otherSettleKey: '',
otherSettleValue: '',
debts: '',
settleTime: ''
},
showReSettleBtn: true
}
this.$emit('doback')
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>
Loading…
Cancel
Save