Browse Source

完善调拨管理

zhanglei
guoxing 9 months ago
parent
commit
0f301b96ea
  1. 10
      yxt-as-ui/src/api/Common/dictcommons.js
  2. 7
      yxt-as-ui/src/api/storage/allocation.js
  3. 29
      yxt-as-ui/src/api/storage/oldPartsRecovery.js
  4. 5
      yxt-as-ui/src/router/index.js
  5. 316
      yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
  6. 12
      yxt-as-ui/src/views/storage/allocation/allocationInfo.vue
  7. 4
      yxt-as-ui/src/views/storage/allocation/index.vue
  8. 170
      yxt-as-ui/src/views/storage/allocation/relation/chooseproducts.vue
  9. 2
      yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue
  10. 138
      yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue
  11. 191
      yxt-as-ui/src/views/storage/oldPartsRecovery/index.vue
  12. 230
      yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue
  13. 796
      yxt-as-ui/src/views/storage/oldPartsRecovery/repairbillInfo.vue

10
yxt-as-ui/src/api/Common/dictcommons.js

@ -60,6 +60,16 @@ export function getListDeptByOrgSid(data) {
})
}
// 根据分公司Sid获取分公司下所有的服务站
export function getServiceStationByOrgSid(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/portal/v1/sysorganization/getServiceStationByOrgSid/' + data,
method: 'GET'
})
}
// 获取所有岗位
export function postName(data) {
return request({

7
yxt-as-ui/src/api/storage/allocation.js

@ -5,6 +5,7 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/listPage',
method: 'post',
data: params,
@ -16,6 +17,7 @@ export default {
deleteBySids: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/delBySids',
method: 'DELETE',
data: data,
@ -28,6 +30,7 @@ export default {
// 保存物流信息
saveLogisticsInfo: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/saveLogisticsInfo',
method: 'post',
data: data,
@ -39,6 +42,7 @@ export default {
// 新增、保存
save: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/save',
method: 'post',
data: data,
@ -51,6 +55,7 @@ export default {
// 初始化
init: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/fetchDetailsBySid/' + data,
method: 'get'
});
@ -59,6 +64,7 @@ export default {
// 调拨
allocation: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/allocation',
method: 'post',
data: data,
@ -72,6 +78,7 @@ export default {
// 查询所有商品
getGoods: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventory/alloGoodsListPage',
method: 'post',
data: params,

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

@ -5,6 +5,7 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/as/v1/AsBusrepairBill/pageBillList',
method: 'post',
data: params,
@ -17,15 +18,16 @@ export default {
// 获取维修工单详情
getOneByBillNo: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/as/v1/AsBusrepairBill/getOneByBillNo?sid=' + data,
method: 'get',
});
},
// 保存旧件回收登记
save: function(data) {
saveorUpdateOldRegister: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/WmsOldRegister/saveorUpdateOldRegister',
method: 'post',
data: data,
@ -35,4 +37,27 @@ export default {
});
},
// 获取旧件入库详情
init: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/WmsOldInventory/getInit?sid=' + data,
method: 'get',
});
},
// 保存旧件入库
saveInventory: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/WmsOldInventory/saveInventory',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
}

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

@ -536,7 +536,7 @@ export const constantRoutes = [{
component: () => import('@/views/storage/oldPartsRecovery/index'),
name: 'OldPartsRecovery',
meta: {
title: '旧件回收',
title: '旧件入库',
noCache: true
}
},
@ -875,7 +875,8 @@ export const constantRoutes = [{
},
{
path: '/sparePartsCommissionFiling/sparePartsCommissionFiling',
component: () => import('@/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFiling.vue'),
component: () => import(
'@/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFiling.vue'),
name: 'SparePartsCommissionFiling',
meta: {
title: '配件销售提成备案管理',

316
yxt-as-ui/src/views/storage/allocation/allocationAdd.vue

@ -5,7 +5,7 @@
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="confirm()">调拨</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="confirm()">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -43,9 +43,7 @@
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item> <el-date-picker v-model="formobj.createTime" type="date" class="addinputw addinputInfo"
value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
<span class="addinputInfo">{{ formobj.createTime }}</span>
</el-form-item>
</el-col>
</el-row>
@ -59,7 +57,7 @@
<el-col :span="5">
<div class="span-sty">调入站</div>
<el-form-item> <el-select v-model="formobj.inOrgName" placeholder="请选择分公司" @change="selectInOrg"
class="addinputInfo">
class="addinputInfo addinputw">
<el-option v-for="(item,i) in orgList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
@ -95,12 +93,13 @@
<div class="title titleOne">
<div>调拨商品列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="seleGoods()">添加</el-button>
</div>
<el-table :key="commodityKey" :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border
style="width: 100%;" show-summary :summary-method="getSummaries">
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column align="center" width="70" :render-header="commodityHeader">
<!-- <el-table-column align="center" width="70" :render-header="commodityHeader">
<template slot-scope="scope">
<i class="el-icon-delete" @click="commodityDelete(scope.$index)"></i>
</template>
@ -119,22 +118,38 @@
<el-table-column prop="warehouseRackCode" label="库位" align="center" />
<el-table-column prop="count" label="库存数量" align="center" />
</el-table>
<el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size"
layout="total, pager" :total="commodityQuery.total" />
<pagination v-show="commodityData.length > 0" :total="commodityQuery.total"
:limit.sync="commodityQuery.size" class="pagination"
@pagination="commodityInput(scope.row.goodsSpuName)" />
</div>
<el-input slot="reference" v-model="scope.row.goodsSpuName"
@input="commodityInput(scope.row.goodsSpuName)" clearable placeholder="商品名称" />
</el-popover>
</template>
</el-table-column> -->
<el-table-column fixed label="操作" wid align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="deleteGoods(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" />
<el-table-column prop="goodsID" label="商品ID" width="100" 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="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
<el-table-column prop="warehouseAreaName" label="库区" width="150" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" />
<el-table-column prop="warehouseRackCode" label="单价" align="center" />
<el-table-column prop="stockCount" label="库存数量" align="center" />
<el-table-column label="调入仓库" align="center" width="200">
<el-table-column prop="stockCount" label="库存数量" width="100" align="center" />
<!-- <el-table-column prop="taxPrice" label="单价" width="100" align="center" /> -->
<el-table-column prop="markupRatio" label="加价比例(%)" width="120" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.markupRatio" clearable placeholder=""
oninput="value=value.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')"
@input="commodityComputeYHAndXSJE(scope.row)" />
</template>
</el-table-column>
<!-- <el-table-column label="调入仓库" align="center" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.inWarehouseName" placeholder="请选择"
@change="selectWarehouseName(scope.row,$event)">
@ -143,7 +158,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="调入库位" align="center" width="120">
<el-table-column label="调入库位" align="center" width="150">
<template slot-scope="scope">
<el-select v-model="scope.row.inWarehouseRackCode" placeholder="请选择"
@change="selectWarehouseAreaCode(scope.row,$event)">
@ -151,46 +166,39 @@
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="count" label="调拨数量" align="center">
</el-table-column> -->
<el-table-column prop="transferPrice" label="调拨单价" align="center" width="100" />
<el-table-column prop="count" label="调拨数量" width="120" align="center">
<template slot-scope="scope">
<el-input @input="commodityComputeYHAndXSJE(scope.row,$event)" v-model="scope.row.count" clearable
<el-input @input="commodityComputeYHAndXSJE2(scope.row)" v-model="scope.row.count" clearable
placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column prop="amount" label="调拨金额" align="center" width="100" />
</el-table>
<!-- <el-row>
<el-col :span="24">
<el-form-item><span>调拨数量{{ totalQuantity }} , 调拨金额{{ materialCost }}</span></el-form-item>
</el-col>
<el-col :span="1">
<el-form-item><span>备注</span></el-form-item>
</el-col>
<el-col :span="23">
<el-form-item><el-input v-model="formobj.remarks" clearable placeholder="请填写备注..." /></el-form-item>
</el-col>
</el-row> -->
</el-form>
</div>
</div>
<!-- 选择商品 -->
<chooseproducts v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState" />
</div>
</template>
<script>
import req from '@/api/storage/allocation.js'
import chooseproducts from './relation/chooseproducts'
import {
getCurrentDate
} from '@/utils/index.js'
import {
fetchBySid,
getOrgSidByPath,
selectOrgSidList,
getListDeptByOrgSid,
getServiceStationByOrgSid,
selAllByOrgSidPath
} from '@/api/Common/dictcommons'
export default {
components: {
chooseproducts,
},
data() {
return {
viewTitle: '',
@ -198,19 +206,6 @@
submitdisabled: false,
activeNames: '1',
index: 0,
// commodity
commodityKey: 1,
commodityLoading: false,
commodityQuery: {
current: 1,
size: 2,
total: 0,
params: {
name: '',
}
},
commodityData: [],
formobj: {
"sid": "",
"billNo": "",
@ -222,8 +217,10 @@
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"outOrgName": "",
"outOrgSid": '',
"outOrgName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"outOrgSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"outPlatName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"outPlatSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
@ -232,6 +229,8 @@
"inOrgSid": "",
"inPlatName": "",
"inPlatSid": "",
"inOrgAttributeKey": "",
"inOrgAttributeValue": "",
"confirmName": "",
"confirmSid": "",
"remarks": "",
@ -245,54 +244,8 @@
warehouseRackList: []
}
},
computed: {
//
totalQuantity() {
let quantity = 0
if (this.formobj.wmsInventoryAllocateBillDetailNewList.length > 0) {
this.formobj.wmsInventoryAllocateBillDetailNewList.forEach((e) => {
quantity += Number(e.count)
})
}
this.formobj.count = quantity
return quantity
},
//
materialCost() {
let material = 0
if (this.formobj.wmsInventoryAllocateBillDetailNewList.length > 0) {
this.formobj.wmsInventoryAllocateBillDetailNewList.forEach((e) => {
material += Number((Number(e.count) * Number(e.taxPrice)))
})
}
this.formobj.amount = material.toFixed(2)
return material.toFixed(2)
},
},
methods: {
init() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.outOrgSid = res.data
this.formobj.useOrgSid = res.data
fetchBySid(res.data).then((res) => {
if (res.success) {
this.formobj.outOrgName = res.data.name
}
})
}
})
selectOrgSidList().then((res) => {
if (res.success) {
console.log("selectOrgSidList", res);
@ -309,17 +262,18 @@
}
})
var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}
req.getWarehouses(parpams).then((res) => {
if (res.success) {
this.warehouseList = res.data
// var parpams = {
// orgPath: window.sessionStorage.getItem('defaultOrgPath'),
// }
// req.getWarehouses(parpams).then((res) => {
// if (res.success) {
// this.warehouseList = res.data
console.log("aaaaaa", this.warehouseList);
// console.log("aaaaaa", this.warehouseList);
// }
// })
}
})
},
//
@ -368,17 +322,17 @@
this.formobj.inOrgSid = choose[0].sid
this.formobj.inOrgName = choose[0].name
getListDeptByOrgSid(choose[0].sid).then((res) => {
getServiceStationByOrgSid(choose[0].sid).then((res) => {
if (res.success) {
this.formobj.inDeptSid = ''
this.formobj.inDeptName = ''
this.formobj.inOrgAttributeKey = ''
this.formobj.inOrgAttributeValue = ''
console.log("getListDeptByOrgSid", res);
this.deptList = res.data
}
})
},
selectInDeptName(val) {
@ -388,6 +342,8 @@
console.log('>>>>>>>>>selectInDeptName', choose)
this.formobj.inPlatSid = choose[0].sid
this.formobj.inPlatName = choose[0].name
this.formobj.inOrgAttributeKey = choose[0].orgAttributeKey
this.formobj.inOrgAttributeValue = choose[0].orgAttributeValue
},
selectOperatorName(val) {
@ -438,7 +394,7 @@
showAdd() {
this.init(),
this.viewTitle = '【新增】调拨记录'
this.viewTitle = '【新增】商品调拨申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -447,7 +403,7 @@
this.init()
this.viewTitle = '【修改】调拨记录'
this.viewTitle = '【修改】商品调拨申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
@ -457,100 +413,66 @@
}
})
},
//
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 //
}
backData(value) {
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.wmsInventoryAllocateBillDetailNewList.push({
"goodsSpuSid": e.goodsSpuSid,
"billSid": this.formobj.sid,
"inventorySid": e.inventorySid,
"warehouseSid": e.warehouseSid,
"warehouseName": e.warehouseName,
"warehouseAreaSid": e.warehouseRackSid,
"warehouseAreaName": e.warehouseAreaName,
"warehouseRackSid": e.warehouseAreaSid,
"warehouseRackCode": e.warehouseRackCode,
"taxPrice": e.taxPrice,
"stockCount": e.count,
"inWarehouseSid": '',
"inWarehouseName": '',
"inWarehouseRackSid": '',
"inWarehouseRackCode": '',
"count": 0,
"amount": 0,
"transferPrice": 0,
"markupRatio": 0,
"goodsSpuName": e.goodsSpuName,
"goodsSkuCode": e.goodsSkuCode,
"goodsSkuOwnSpec": e.goodsSkuOwnSpec,
"unit": e.unit,
"goodsID": e.goodsID
})
]
)
})
}
},
commodityAdd() {
this.formobj.wmsInventoryAllocateBillDetailNewList.push({
"sid": "",
"billSid": "",
"inventorySid": "",
"goodsSpuName": "",
"goodsSkuCode": "",
"goodsSkuOwnSpec": "",
"carModel": "",
"unit": "",
"warehouseSid": "",
"warehouseName": "",
"warehouseRackSid": "",
"warehouseRackCode": "",
"taxPrice": "",
"stockCount": "",
"inWarehouseSid": "",
"inWarehouseName": "",
"inWarehouseRackSid": "",
"inWarehouseRackCode": "",
"count": "",
"amount": ""
})
deleteGoods(index) {
this.formobj.wmsInventoryAllocateBillDetailNewList.splice(index, 1)
},
commodityInput(value) {
this.commodityQuery.params.name = value
this.commodityLoading = true
req.getGoods(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
}
})
resetState() {
this.viewState = 1
},
commodityDelete(index) {
this.formobj.wmsInventoryAllocateBillDetailNewList.splice(index, 1)
seleGoods() {
this.viewState = 2
const aa = []
this.$refs['divSp'].showData(aa, this.formobj.createOrgSid)
},
commodityCurrentChange(value, row) {
row.inventorySid = value.sid
row.goodsSpuName = value.goodsSpuName
row.goodsSkuCode = value.goodsSkuCode
row.goodsSkuOwnSpec = value.goodsSkuOwnSpec
row.unit = value.unit
row.warehouseName = value.warehouseName
row.warehouseSid = value.warehouseSid
row.warehouseRackCode = value.warehouseRackCode
row.warehouseRackSid = value.warehouseRackSid
row.taxPrice = value.taxPrice
row.stockCount = value.count
// row.count = ''
// row.amount = ''
document.body.click()
this.commodityComputeYHAndXSJE(row, row.count)
//
commodityComputeYHAndXSJE(row) {
console.log("commodityComputeYHAndXSJE", row);
row.transferPrice = (Number(row.taxPrice) * Number(1 + Number(row.markupRatio) / 100)).toFixed(2)
row.amount = (Number(row.count) * Number(row.transferPrice)).toFixed(2)
},
//
commodityComputeYHAndXSJE(row, val) {
console.log("aaaaaaaaa", row);
console.log("aaaaaaaaa", val);
row.count = val
//
commodityComputeYHAndXSJE2(row) {
if (Number(row.stockCount) < Number(row.count)) {
row.count = ''
row.amount = ''
row.count = Number(row.stockCount)
} else {
row.amount = (Number(row.count) * Number(row.taxPrice)).toFixed(2)
row.amount = (Number(row.count) * Number(row.transferPrice)).toFixed(2)
}
},
@ -612,8 +534,10 @@
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"outOrgName": "",
"outOrgSid": '',
"outOrgName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"outOrgSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"outPlatName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"outPlatSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
@ -622,6 +546,8 @@
"inOrgSid": "",
"inPlatName": "",
"inPlatSid": "",
"inOrgAttributeKey": "",
"inOrgAttributeValue": "",
"confirmName": "",
"confirmSid": "",
"remarks": "",

12
yxt-as-ui/src/views/storage/allocation/allocationInfo.vue

@ -22,7 +22,7 @@
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTimeoutOrgName }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
@ -36,9 +36,8 @@
<div class="span-sty">调入站</div>
<el-form-item><span class="addinputInfo">{{ formobj.inOrgName }}</span></el-form-item>
</el-col>
<el-col :span="3">
<el-form-item><span class="addinputInfo">{{ formobj.inPlatName }}</span></el-form-item>
<el-form-item><span style="width: 100%;">{{ formobj.inPlatName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">经办人</div>
@ -61,16 +60,17 @@
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsID" label="商品ID" align="center" />
<el-table-column 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="unit" label="单位" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
<el-table-column prop="warehouseAreaName" label="仓库" width="150" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" />
<el-table-column prop="warehouseRackCode" label="单价" align="center" />
<el-table-column prop="stockCount" label="库存数量" align="center" />
<el-table-column prop="inWarehouseName" label="调入仓库" align="center" />
<el-table-column prop="inWarehouseRackCode" label="调入库位" align="center" />
<el-table-column prop="markupRatio" label="加价比例" align="center" />
<el-table-column prop="transferPrice" label="调拨单价" align="center" />
<el-table-column prop="count" label="调拨数量" align="center" />
<el-table-column prop="amount" label="调拨金额" align="center" width="100" />
</el-table>

4
yxt-as-ui/src/views/storage/allocation/index.vue

@ -332,6 +332,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) {
@ -470,7 +473,6 @@
this.formobj.sids = this.sids
req.saveLogisticsInfo(this.formobj).then((resp) => {
loading.close()
if (resp.success) {
this.dialogVisible = false
this.$message({

170
yxt-as-ui/src/views/storage/allocation/relation/chooseproducts.vue

@ -0,0 +1,170 @@
<template>
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>选择商品</div>
<div>
<el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
<el-form-item label="商品ID" class="searchlist">
<el-input v-model="listQuery.params.goodsID" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品编码" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品名称" class="searchlist">
<el-input v-model="listQuery.params.goodsSpuName" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<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>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center" />
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="goodsID" label="商品ID" align="center" />
<el-table-column 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="unit" label="单位" align="center" />
<el-table-column prop="warehouseName" label="仓库" align="center" />
<el-table-column prop="warehouseAreaName" label="库区" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" />
<el-table-column prop="count" label="库存数量" align="center" />
</el-table>
</div>
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
</div>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import req from '@/api/storage/allocation.js'
export default {
name: 'SelectVehicle',
components: {
Pagination
},
data() {
return {
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
tableKey: 0,
sids: [],
list: [],
number: '',
listLoading: false,
listQuery: {
current: 1,
size: 10,
params: {
createOrgSid: '',
goodsSpuName: '',
goodsSkuCode: '',
},
total: 0
}
}
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
req.getGoods(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.listQuery.total = response.data.total
this.list = response.data.records
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery.current = 1
this.listQuery.size = 10
this.listQuery.total = 0
this.listQuery.params.goodsSpuName = ''
this.listQuery.params.goodsSkuCode = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, createOrgSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.createOrgSid = createOrgSid
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
})
}
},
//
handleReturn() {
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

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

@ -65,7 +65,7 @@
<el-col :span="24">
<div class="span-sty"><span class="must">*</span> 附件</div>
<el-form-item prop="imgList">
<el-form-item prop="filePaths">
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" @change="backData" />
</el-form-item>

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

@ -50,14 +50,16 @@
<el-form-item label="单据类型">
<el-select v-model="queryParams.params.billType" filterable clearable placeholder="请选择"
style="width:100%">
<el-option v-for="item in busTypeList" :key="item.sid" :label="item.name" :value="item.sid">
<el-option v-for="item in billStateList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="业务类型">
<el-select v-model="queryParams.params.busTypeValue" filterable clearable placeholder="请选择"
style="width:100%">
<el-option v-for="item in billStateList" :key="item.sid" :label="item.name" :value="item.sid">
<el-option v-for="item in busTypeList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
@ -88,10 +90,10 @@
@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 prop="vinNo" label="车架号" width="120" align="center" />
<el-table-column prop="goodsID" label="商品ID" width="120" align="center" />
<el-table-column prop="goodsSpuName" label="商品名称" width="120" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" width="120" align="center" />
<el-table-column prop="vinNo" 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" />
@ -130,6 +132,10 @@
import pageye from '@/components/pagination/pageye'
// import divAdd from './oldPartsInStorageAdd.vue'
// import divInfo from './oldPartsInvertoryInfo.vue'
import {
typeValues
} from '@/api/Common/dictcommons'
import req2 from '@/api/goods/factory.js'
export default {
components: {
ButtonBar,
@ -184,15 +190,7 @@
sid: "2"
}
],
billStateList: [{
name: "业务类型1",
sid: "0"
},
{
name: "业务类型2",
sid: "1"
}
],
billStateList: [],
}
},
mounted() {
@ -200,11 +198,51 @@
},
created() {
this.loadList()
this.getWarehouseList()
this.getManufacturerList()
this.init()
},
methods: {
init() {
var parpams1 = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}
req.getWarehouses(parpams1).then((res) => {
if (res.success) {
this.warehouseList = res.data
console.log("aaaaaa", this.warehouseList);
}
})
typeValues({
type: 'wms_busType'
}).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
})
typeValues({
type: 'billsType'
}).then((res) => {
if (res.success) {
this.billStateList = res.data
}
})
var parpams2 = {
useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1)
}
req2.getAllFacturer(parpams2).then(resp => {
this.manufacturerList = resp.data
})
console.log("aaaaaa", this.manufacturerList);
},
selectionLineChangeHandle(val) {
console.log("val", val);
@ -324,31 +362,31 @@
toBuild() {
// if (this.sids.length > 0) {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
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'
})
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()
req.exportExcel(this.queryParams.params).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()
})
// } else {
// this.$message({
// type: "warning",
@ -379,34 +417,6 @@
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);
}
})
},
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);
}
})
},
getWarehouseAreaList(sid) {
var query = {
ckSid: sid

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

@ -1,7 +1,7 @@
<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">
@ -9,10 +9,10 @@
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="维修号">
<el-form-item label="维修单号">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="工单创建日期">
<el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
@ -20,9 +20,15 @@
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="客户">
<el-input v-model="queryParams.params.customerName" placeholder="" clearable />
</el-form-item>
<el-form-item label="车牌号">
<el-input v-model="queryParams.params.vehMark" placeholder="" clearable />
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="queryParams.params.vinNo" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
@ -32,7 +38,7 @@
</div>
<!-- Start 项目列表头部 -->
<div class="listtop">
<div class="tit">维修单列表</div>
<div class="tit">维修单列表</div>
</div>
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
@ -48,14 +54,15 @@
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column> -->
<el-table-column label="维修号" align="center">
<el-table-column label="维修单号" align="center">
<template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;" @click="showOrder(scope.row)">
{{ scope.row.billNo }}
</div>
</template>
</el-table-column>
<el-table-column prop="billTime" label="工单创建日期" align="center" />
<el-table-column prop="taskName" label="环节" align="center" />
<el-table-column prop="billTime" label="单据日期" align="center" />
<el-table-column prop="customerName" label="客户名称" align="center" />
<el-table-column prop="vehMark" label="车牌号" align="center" />
<el-table-column prop="vinNo" label="车架号" align="center" />
@ -91,7 +98,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">
@ -100,8 +107,8 @@
<el-row class="first_row">
<el-col :span="24" class="trightb">
<el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;"
v-for="(item,index) in fileList" :src="item.url" :preview-src-list="[item]">
<el-image style="width: 120px;height: 120px; margin: 10px; background: #f1f1f1;"
v-for="(item,index) in fileList" :src="item" :preview-src-list="[item]">
</el-image>
</el-col>
</el-row>
@ -110,12 +117,12 @@
</el-dialog>
<el-dialog title="旧件回收登记" :visible.sync="dialogVisible2" :before-close="handleClose2">
<el-form ref="dataForm1" class="formaddcopy02" style="margin-top: -30px;" :model="orderInfo">
<el-form ref="form_obj" class="formaddcopy02" :rules="rules" style="margin-top: -30px;" :model="orderInfo">
<el-row class="first_row">
<el-col :span="24">
<div class="span-sty">维修</div>
<div class="span-sty">维修单号</div>
<el-form-item><span class="addinputInfo">{{ orderInfo.billNo }}</span></el-form-item>
</el-col>
@ -123,8 +130,8 @@
<el-row>
<el-col :span="24">
<div class="span-sty">旧件回收说明</div>
<el-form-item>
<div class="span-sty"><span class="must">*</span> 旧件回收说明</div>
<el-form-item prop="shortss">
<el-input v-model="orderInfo.shortss" placeholder="" class="addinputw addinputInfo"
style="padding-top: 5px;padding-bottom: 5px;" type="textarea" :rows="4" clearable />
@ -135,10 +142,10 @@
<el-row>
<el-col :span="24">
<div class="span-sty">旧件照片</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputInfo" :accept="accept" v-model="imgList" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" @change="backData"/>
<div class="span-sty"><span class="must">*</span> 旧件照片</div>
<el-form-item prop="photos">
<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>
@ -192,6 +199,13 @@
btnKey: 'toAdd',
btnLabel: '回收登记'
},
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toUp',
btnLabel: '上架'
},
{
type: 'info',
size: 'small',
@ -205,13 +219,33 @@
size: 10,
total: 0,
params: {
name: ''
"billNo": "",
"createTimeStart": "",
"createTimeEnd": "",
"vehMark": "",
"customerName": "",
"vinNo": "",
"userSid": "",
"orgPath": "",
"menuUrl": ""
}
},
sids: [],
selectionList: [],
imgList: [],
accept: '.jpg,.jpeg,.png,.pdf,.JPG,.JPEG'
accept: '.jpg,.jpeg,.png,.pdf,.JPG,.JPEG',
rules: {
shortss: [{
required: true,
message: '回收说明不能为空',
trigger: 'change'
}],
photos: [{
required: true,
message: '旧件不能为空',
trigger: 'blur'
}],
}
}
},
mounted() {
@ -224,7 +258,8 @@
backData(value) {
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
this.imgList = value
this.orderInfo.photos = []
for (var i = 0; i < this.imgList.length; i++) {
this.orderInfo.photos.push(this.imgList[i].url)
}
@ -259,6 +294,9 @@
case 'toAdd':
this.toAdd()
break
case 'toUp':
this.toUp()
break
case 'doClose':
this.doClose()
break
@ -303,7 +341,15 @@
size: 10,
total: 0,
params: {
name: ''
"billNo": "",
"createTimeStart": "",
"createTimeEnd": "",
"vehMark": "",
"customerName": "",
"vinNo": "",
"userSid": "",
"orgPath": "",
"menuUrl": ""
}
}
this.loadList()
@ -319,25 +365,49 @@
})
return
}
this.imgList = []
this.orderInfo = JSON.parse(JSON.stringify(this.selectionList[0]));
for (var i = 0; i < this.selectionList[0].photos.length; i++) {
this.imgList.push({
url: this.selectionList[0].photos[i]
})
}
req.getOneByBillNo(this.selectionList[0].sid).then((resp) => {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.dialogVisible2 = true
this.orderInfo = resp.data
// req.getOneByBillNo(this.selectionList[0].sid).then((resp) => {
// this.orderInfo = resp.data
for (var i = 0; i < resp.data.photos.length; i++) {
this.imgList.push({
url: resp.data.photos[i].url
})
}
this.dialogVisible2 = true
// for (var i = 0; i < resp.data.photos.length; i++) {
// this.imgList.push({
// url: resp.data.photos[i].url
// })
// }
}).catch(() => {})
// this.dialogVisible2 = true
// }).catch(() => {})
},
toUp() {
if (this.selectionList.length != 1) {
this.$message({
showClose: true,
type: 'warning',
message: '请选择一条记录操作.'
})
return
}
this.viewState = 2
this.$refs['divadd'].showEdit(this.selectionList[0])
},
showImage(paths) {
this.fileList = paths
this.dialogVisible = true
@ -350,31 +420,35 @@
console.log('saveExamine》》》》', this.orderInfo)
if (this.orderInfo.shortss == '') {
this.$message({
showClose: true,
type: 'warning',
message: '旧件回收说明不能为空'
})
return
}
if (this.orderInfo.photos.length == 0) {
this.$message({
showClose: true,
type: 'warning',
message: '旧件照片不能为空'
})
return
}
// if (this.orderInfo.shortss == '') {
// this.$message({
// showClose: true,
// type: 'warning',
// message: ''
// })
// return
// }
// if (this.orderInfo.photos.length == 0) {
// this.$message({
// showClose: true,
// type: 'warning',
// message: ''
// })
// return
// }
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.saveorUpdateOldRegister(this.orderInfo).then((resp) => {
this.orderInfo = {}
this.imgList = []
this.loadList()
this.dialogVisible2 = false
}).catch(() => {})
req.save(this.orderInfo).then((resp) => {
this.orderInfo={}
this.imgList = []
this.loadList()
this.dialogVisible2 = false
}).catch(() => {})
}
})
},
handleClose2() {
@ -401,6 +475,13 @@
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
@ -415,7 +496,7 @@
width: calc(100% - 115px);
}
.first_row{
.first_row {
border-top: 1px solid #E0E3EB;
}

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

@ -2,10 +2,10 @@
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>旧件回收登记</div>
<div>旧件上架</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">确认</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
@ -17,65 +17,68 @@
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<el-col :span="12">
<div class="span-sty">维修</div>
<el-col :span="6">
<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.billTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="6">
<div class="span-sty">客户名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<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">
<el-col :span="6">
<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.vehMark }}</span></el-form-item> -->
</el-col>
</el-row>
<el-row>
<div class="title titleOne">
<div>待上架旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.list" border>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="goodsID" label="商品ID" align="center" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" />
<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 prop="count" label="数量" align="center" />
<el-table-column label="仓库" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
@change="selectWarehouseChange(scope.row,$event)">
<el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="库区" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseAreaName" :disabled="scope.row.warehouseName==''" clearable
@focus="getWarehouseArea(scope.row)" placeholder="请选择"
@change="selectWarehouseAreaChange(scope.row,$event)">
<el-option v-for="(item,i) in warehouseAreaList" :key="i" :label="item.areaName" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="库位" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseRackCode" :disabled="scope.row.warehouseAreaName==''" clearable
@focus="getAllTypeByAreaSid(scope.row)" placeholder="请选择"
@change="selectWarehouseRackChange(scope.row,$event)">
<el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.rackCode" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column>
</el-table>
<el-col :span="24">
<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="formobj.photos" :limit="9" @change="backData" bucket="map" :upload-data="{ type: '0001' }">
</upload>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -86,40 +89,91 @@
<script>
import req from '@/api/storage/oldPartsRecovery.js'
import upload from '@/components/uploadFile/upload'
import {
getOrgSidByPath
} from '@/api/Common/dictcommons'
import req2 from '@/api/warehouse/warehouse.js'
import req3 from '@/api/warehouse/warehouseArea.js'
import req4 from '@/api/warehouse/goodsShelves.js'
export default {
components: {
upload
},
components: {},
data() {
return {
dialogVisible: false,
title: '【新增】',
listLoading: false,
submitdisabled: false,
formobj: {
"billNo": "",
"billTime": "",
"customerSid": "",
"customerName": "",
"vehMark": "",
"vinNo": "",
"shortss": "",
"photos": [
]
},
hideUploadBtn: false,
isUpdata: false,
imgList: []
formobj: {},
warehouseList: [],
warehouseAreaList: [],
warehouseRackList: []
}
},
created() {},
methods: {
indexMethod(index) {
return index + 1
},
init() {
var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}
req2.getAllWarehouse(parpams).then(resp => {
this.warehouseList = resp.data
})
},
getWarehouseArea(row) {
var params = {
ckSid: row.warehouseSid
}
req3.getAllWarehouseareaBysid(params).then(resp => {
console.log('>>>>>>>>>getAllWarehousearea', resp)
this.warehouseAreaList = resp.data
}).catch(() => {})
},
getAllTypeByAreaSid(row) {
var params = {
areaSid: row.warehouseAreaSid
}
req4.getAllTypeByAreaSid(params).then(resp => {
console.log('>>>>>>>>>getAllTypeByAreaSid', resp)
this.warehouseRackList = resp.data
}).catch(() => {})
},
selectWarehouseChange(row, val) {
const choose = this.warehouseList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseChange', choose)
row.warehouseSid = choose[0].sid
row.warehouseName = choose[0].warehouseName
row.warehouseAreaSid = ''
row.warehouseAreaName = ''
row.warehouseRackSid = ''
row.warehouseRackCode = ''
this.getWarehouseArea(row)
},
selectWarehouseAreaChange(row, val) {
const choose = this.warehouseAreaList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseAreaChange', choose)
row.warehouseAreaSid = choose[0].sid
row.warehouseAreaName = choose[0].areaName
row.warehouseRackSid = ''
row.warehouseRackCode = ''
this.getAllTypeByAreaSid(row)
},
selectWarehouseRackChange(row, val) {
const choose = this.warehouseRackList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseRackChange', choose)
row.warehouseRackSid = choose[0].sid
row.warehouseRackCode = choose[0].rackCode
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
@ -127,7 +181,7 @@
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.save(this.formobj).then((res) => {
req.saveInventory(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
@ -148,30 +202,15 @@
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
"billNo": "",
"billTime": "",
"customerSid": "",
"customerName": "",
"vehMark": "",
"vinNo": "",
"shortss": "",
"photos": [
]
}
this.imgList = []
this.submitdisabled = false
this.isUpdata = false
this.$emit('doback')
},
showAdd() {
this.title = "【新增】"
this.isUpdata = false
},
showAdd() {},
showEdit(row) {
this.title = "【修改】"
this.isUpdata = true
this.init()
var params = {
sid: row.sid
}
@ -186,15 +225,6 @@
this.formobj = {}
})
},
backData(value) {
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
this.formobj.photos = this.imgList
}
}
}
</script>

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

@ -4,7 +4,7 @@
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<!-- <el-button type="primary" size="small" @click="negativeSettlement()">反结算</el-button> -->
<!-- <el-button type="primary" size="small" v-show="formobj.showReSettleBtn" @click="negativeSettlement()">反结算</el-button> -->
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -26,7 +26,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.billType }}</span></el-form-item>
</el-col>
<el-col :span="8">
@ -34,16 +34,20 @@
<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>
<div class="span-sty">索赔厂家</div>
<el-form-item><span class="addinputInfo">{{ formobj.claimManufacturer }}</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.isGoOut == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<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">
<el-col :span="8">
<div class="span-sty">预计完工</div>
<el-form-item><span class="addinputInfo">{{ formobj.estimatedFinishTime }}</span></el-form-item>
</el-col>
@ -63,10 +67,6 @@
</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>
@ -75,6 +75,11 @@
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">特殊标注</div>
<el-form-item><span
class="addinputInfo">{{ formobj.isSpecialSign == '1' ? '有' : '否' }}</span></el-form-item>
</el-col>
</el-row>
<el-collapse v-model="activeNames">
<el-collapse-item title="客户信息" name="1">
@ -88,8 +93,8 @@
<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>
<div class="span-sty">客户来源</div>
<el-form-item><span class="addinputInfo">{{ formobj.customerSource }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
@ -121,152 +126,196 @@
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="送修人信息" name="2">
<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>
<div class="span-sty">对接人姓名</div>
<el-form-item><span class="addinputInfo">{{ formobj.dockingPeople }}</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 :span="16">
<div class="span-sty">对接人电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.dockingPhone }}</span></el-form-item>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="保险信息" name="3">
<el-collapse-item title="保险信息" name="3" v-show="formobj.billTypeKey == '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.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-form-item><span
class="addinputInfo">{{ formobj.insuranceVo.responsibility }}</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>
<div class="span-sty">责任比例</div>
<el-form-item><span
class="addinputInfo">{{ formobj.insuranceVo.responsibilityRatio }}</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>
<div class="span-sty">是否存在人伤</div>
<el-form-item><span
class="addinputInfo">{{ formobj.insuranceVo.isPersonInjuries == '1' ? '是' : formobj.insuranceVo.isPersonInjuries == '0' ? '否' : '' }}</span></el-form-item>
</el-col>
</el-row>
<el-table :key="insuranceKey" :data="formobj.insuranceVo.insuranceList" :index="index" border
style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="useInsurer" label="使用保险方" align="center" min-width="150" />
<el-table-column prop="insuranceType" label="使用险种" align="center" min-width="150" />
<el-table-column prop="insuranceCompany" label="保险公司" align="center" min-width="150" />
<el-table-column prop="claimBillNo" label="报案号" align="center" min-width="180" />
<el-table-column prop="investigator" label="勘察员及电话" align="center" min-width="220" />
<el-table-column prop="lossAdjuster" label="定损员及电话" align="center" min-width="220" />
</el-table>
</el-collapse-item>
<el-collapse-item title="发票信息" name="4">
<el-collapse-item title="发票信息" name="4" v-show="formobj.subject == '保外'">
<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-form-item><span
class="addinputInfo">{{ formobj.invoiceVo.isInvoicing == '1' ? '是' : formobj.invoiceVo.isInvoicing == '0' ? '否' : '' }}</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>
<div class="span-sty">税率</div>
<el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.taxRate }}</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>
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.invoiceCompany }}</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 :span="16">
<div class="span-sty">加税点的项目</div>
<el-form-item>
<el-checkbox-group class="addinputInfo" v-model="formobj.invoiceVo.taxItems">
<el-checkbox disabled label="维修项目"></el-checkbox>
<el-checkbox disabled label="维修用料"></el-checkbox>
<el-checkbox disabled label="附加项目"></el-checkbox>
<el-checkbox disabled label="其它附加项目"></el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
</el-row>
</el-collapse-item>
</el-collapse>
<div class="title">服务项目</div>
<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 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="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="amount" label="金额" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">商品</div>
<div class="title">维修用料</div>
<el-row>
<el-col :span="24">
<div class="span-sty span-sty-one" style="width: 300px;!important;">前台登记时对商品要求备注</div>
<el-form-item><span class="addinputInfo-one">{{ formobj.registerRemarks }}</span></el-form-item>
</el-col>
</el-row>
<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="serviceItem" label="维修项目" width="200" align="center" />
<el-table-column prop="goodsID" label="商品ID" width="200" 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="price" label="单价" align="center" width="150" />
<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="amount" label="销售金额" width="100" align="center" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
<el-table-column prop="operName" label=领料人 width="100" align="center" />
<el-table-column prop="receivedTime" label="接收时间" width="120" align="center" />
<el-table-column prop="partsSellers" label="配件销售人" min-width="150" align="center" />
</el-table>
<div class="title">附加项目</div>
<el-row>
<el-col :span="8">
<div class="span-sty">外出费()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.outAmount }}</span>
<span v-show="formobj.outKPAmount !== ''">开票金额{{ formobj.outKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">厂家补助()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.subsidyAmount }}</span>
<span v-show="formobj.subsidyKPAmount !== ''">开票金额{{ formobj.subsidyKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">施救费()</div>
<el-form-item>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="addinputInfo">{{ formobj.rescueAmount }}</span>
<span v-show="formobj.rescueKPAmount !== ''">开票金额{{ formobj.rescueKPAmount }}</span>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<div style="display: flex;flex-direction: column;justify-content:flex-start;align-items: flex-start;">
<el-button type="text" v-for="(item, index) in formobj.fileName" :key="index"
@click="handleOpen(item.url)">{{ item.name }}</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
<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 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>
<div class="span-sty" style="border-right: 0px">应收合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.receivableAmount }} = 工时费{{ formobj.hourAmount }} +
材料费{{ formobj.goodsAmount }} + 附加费{{ formobj.addAmount }}</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>
<div class="span-sty" style="border-right: 0px">实收合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.actualAmount }} = 应收合计{{ formobj.receivableAmount }}
- 优惠{{ formobj.discountAmount }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
@ -277,304 +326,307 @@
</template>
<script>
import req from '@/api/operation/repairbill'
// import workslrsettlementAdd from '../workslrsettlement/workslrsettlementAdd'
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: '',
export default {
name: 'RepairBillInfo',
components: {
// workslrsettlementAdd
},
data() {
return {
viewTitle: '',
viewState: 1,
activeNames: '1',
tableKey: 0,
index: 0,
// service
serviceKey: 1,
// subjoin
subjoinKey: 2,
// insuranceKey
insuranceKey: 3,
formobj: {
sid: '',
registerRemarks: '',
billNo: '',
createByName: '',
createBySid: '',
deptName: '',
deptSid: '',
createDate: '',
billTypeKey: '',
billType: '',
subjectSid: '',
subject: '',
claimManufacturerSid: '',
claimManufacturer: '',
isGoOut: '',
estimatedFinishTime: '',
entryTime: '',
nodeName: '',
waitorName: '',
waitorSid: '',
groupSid: '',
groupName: '',
mainRepairers: '',
printRemarks: '',
remarks: '',
isSpecialSign: '',
accidentType: '',
accidentTypeKey: ''
},
otherVo: {
manufacturer: '',
senderName: '',
senderMobile: ''
},
sitemVos: [],
aitemVos: [],
goodsDetailsVos: [],
orgPath: '',
createBySid: '',
deptSid: '',
deptName: '',
operatorSid: '',
nodeCode: '',
settleVo: {
payerNo: '',
payerName: '',
discountAmount: '',
coupon: '',
scoreDeduct: '',
nodeTime: '',
outDoorState: '',
outDoorTime: '',
customerSid: '',
customerName: '',
mobile: '',
customerOrg: '',
customerSource: '',
memberCardSid: '',
memberCarNumber: '',
vehMark: '',
vinNo: '',
vehModel: '',
mileage: '',
oil: '',
currentMileage: '',
dockingPeopleSid: '',
dockingPeople: '',
dockingPhone: '',
invoiceVo: {
isInvoicing: '',
invoiceType: '',
invoiceTypeKey: '',
invoiceCompanySid: '',
invoiceCompany: '',
taxRate: '',
taxItems: []
},
insuranceVo: {
responsibility: '',
responsibilityKey: '',
isPersonInjuries: '',
responsibilityRatioKey: '',
responsibilityRatio: '',
insuranceList: []
},
sitemVos: [],
aitemVos: [],
goodsDetailsVos: [],
operatorSid: '',
nodeCode: '',
settleVo: {
payerNo: '',
payerName: '',
receivableAmount: '',
depositdeductAmount: '',
settleKey: '',
settleValue: '',
settleAmount: '',
otherSettleKey: '',
otherSettleValue: '',
debts: '',
settleTime: '',
otherSettleAmount: ''
},
showReSettleBtn: true,
hourAmount: '',
otherAmount: '',
goodsAmount: '',
addAmount: '',
taxAmount: '',
outAmount: '',
outKPAmount: '',
subsidyAmount: '',
subsidyKPAmount: '',
rescueAmount: '',
rescueKPAmount: '',
actualAmount: '',
receivableAmount: '',
depositdeductAmount: '',
settleKey: '',
settleValue: '',
settleAmount: '',
otherSettleKey: '',
otherSettleValue: '',
debts: '',
settleTime: ''
subsidyRemarks: '',
rescueRemarks: '',
outRemarks: '',
fileName: [],
operator: '',
useOrgSid: '',
createOrgSid: ''
},
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
}
})
rules: {}
}
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
}
methods: {
showInfo(row) {
this.viewTitle = '维修单详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
}
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
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(',')
}
})
}
if (this.formobj.goodsDetailsVos.length > 0) {
this.formobj.goodsDetailsVos.forEach((e) => {
if (e.partsSellers.length > 0) {
e.partsSellers = e.partsSellers.join(',')
}
})
}
}
})
}
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.billSid).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: '',
},
resetState() {
this.viewState = 1
},
handleOpen(value) {
window.open(value, '_blank')
},
negativeSettlement() {
this.viewState = 2
this.$refs['divFJS'].showAdd(this.formobj.sid)
},
handleReturn() {
this.formobj = {
sid: '',
registerRemarks: '',
billNo: '',
createByName: '',
createBySid: '',
deptName: '',
deptSid: '',
createDate: '',
billTypeKey: '',
billType: '',
subjectSid: '',
subject: '',
claimManufacturerSid: '',
claimManufacturer: '',
isGoOut: '',
estimatedFinishTime: '',
entryTime: '',
nodeName: '',
waitorName: '',
waitorSid: '',
groupSid: '',
groupName: '',
mainRepairers: '',
printRemarks: '',
remarks: '',
isSpecialSign: '',
accidentType: '',
accidentTypeKey: ''
},
otherVo: {
manufacturer: '',
senderName: '',
senderMobile: ''
},
sitemVos: [],
aitemVos: [],
goodsDetailsVos: [],
orgPath: '',
createBySid: '',
deptSid: '',
deptName: '',
operatorSid: '',
nodeCode: '',
settleVo: {
payerNo: '',
payerName: '',
discountAmount: '',
coupon: '',
scoreDeduct: '',
nodeTime: '',
outDoorState: '',
outDoorTime: '',
customerSid: '',
customerName: '',
mobile: '',
customerOrg: '',
customerSource: '',
memberCardSid: '',
memberCarNumber: '',
vehMark: '',
vinNo: '',
vehModel: '',
mileage: '',
oil: '',
currentMileage: '',
dockingPeopleSid: '',
dockingPeople: '',
dockingPhone: '',
invoiceVo: {
isInvoicing: '',
invoiceType: '',
invoiceTypeKey: '',
invoiceCompanySid: '',
invoiceCompany: '',
taxRate: '',
taxItems: []
},
insuranceVo: {
responsibility: '',
responsibilityKey: '',
isPersonInjuries: '',
responsibilityRatioKey: '',
responsibilityRatio: '',
insuranceList: []
},
sitemVos: [],
aitemVos: [],
goodsDetailsVos: [],
operatorSid: '',
nodeCode: '',
settleVo: {
payerNo: '',
payerName: '',
receivableAmount: '',
depositdeductAmount: '',
settleKey: '',
settleValue: '',
settleAmount: '',
otherSettleKey: '',
otherSettleValue: '',
debts: '',
settleTime: '',
otherSettleAmount: ''
},
showReSettleBtn: true,
hourAmount: '',
otherAmount: '',
goodsAmount: '',
addAmount: '',
taxAmount: '',
outAmount: '',
outKPAmount: '',
subsidyAmount: '',
subsidyKPAmount: '',
rescueAmount: '',
rescueKPAmount: '',
actualAmount: '',
receivableAmount: '',
depositdeductAmount: '',
settleKey: '',
settleValue: '',
settleAmount: '',
otherSettleKey: '',
otherSettleValue: '',
debts: '',
settleTime: ''
},
showReSettleBtn: true
subsidyRemarks: '',
rescueRemarks: '',
outRemarks: '',
fileName: [],
operator: '',
useOrgSid: '',
createOrgSid: ''
}
this.activeNames = '1'
this.$emit('doback')
}
this.$emit('doback')
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.span-sty-one {
width: 180px !important;
}
.addinputInfo-one {
margin-left: 170px !important;
}
/deep/ .el-collapse .el-collapse-item .el-collapse-item__header {
height: 42px !important;
line-height: 42px !important;
}
</style>

Loading…
Cancel
Save