Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 8 months ago
parent
commit
20e5cdc699
  1. 2
      yxt-as-ui/src/api/storage/manufacturerconfirm.js
  2. 13
      yxt-as-ui/src/api/storage/oldPartsFactory.js
  3. 19
      yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue
  4. 510
      yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue
  5. 9
      yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue
  6. 2
      yxt-as-ui/src/views/storage/oldPartsCope/index.vue
  7. 64
      yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue
  8. 30
      yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeInfo.vue
  9. 73
      yxt-as-ui/src/views/storage/oldPartsFactory/index.vue
  10. 172
      yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue
  11. 468
      yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue
  12. 10
      yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue
  13. 75
      yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingReportDetail.vue
  14. 10
      yxt-as-ui/src/views/storage/stocktaking/index.vue
  15. 31
      yxt-as-ui/src/views/storage/stocktakingLoss/stocktakingLossAdd.vue
  16. 17
      yxt-as-ui/src/views/storage/stocktakingLoss/stocktakingLossInfo.vue
  17. 23
      yxt-as-ui/src/views/storage/stocktakingSurplus/stocktakingSurplusAdd.vue
  18. 19
      yxt-as-ui/src/views/storage/stocktakingSurplus/stocktakingSurplusInfo.vue

2
yxt-as-ui/src/api/storage/manufacturerconfirm.js

@ -17,7 +17,7 @@ export default {
// 获取确认结果详情
saveConfirmResult: function(data) {
return request({
url: '/as/v1/asoldpartreturnconfirm/save',
url: ' ',
method: 'post',
data: data,
headers: {

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

@ -71,7 +71,7 @@ export default {
// 查询分页列表
getGoodsListPage: function(params) {
return request({
url: '/wms/apiadmin/WmsOutBill/getInventoryList',
url: '/wms/apiadmin/inventory/wmsinventory/returnFactGoodsListPage',
method: 'post',
data: params,
headers: {
@ -92,6 +92,17 @@ export default {
})
},
// 下载待出库明细
downloadTobeOutExcel: function(data) {
return request({
url: '/as/v1/asoldpartreturnapply/downloadTobeOutExcel/' + data,
method: 'post',
responseType: 'blob', // 表明返回服务器返回的数据类型
headers: {
'Content-Type': 'application/json'
}
})
},

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

@ -83,7 +83,7 @@
</div>
</template>
</el-table-column>
<el-table-column prop="needReturnCount" label="厂家确认数量" width="180" align="center" />
<el-table-column prop="confirmCount" label="厂家确认数量" width="180" align="center" />
<!-- <el-table-column label="厂家确认结果" align="center">
<template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;" @click="showResult(scope.row)">
@ -105,7 +105,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" />
@ -236,7 +236,7 @@
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
// import divAdd from './manufacturerconfirmAdd.vue'
import divAdd from './manufacturerconfirmAdd.vue'
import divInfo from './manufacturerconfirmInfo.vue'
import uploadImg from '@/components/uploadFile/uploadImg'
export default {
@ -245,7 +245,7 @@
ButtonBar,
Pagination,
pageye,
// divAdd,
divAdd,
divInfo,
uploadImg
},
@ -483,14 +483,13 @@
toAdd() {
// this.viewState = 2
// this.$refs['divadd'].showAdd()
if (this.sids.length == 1) {
this.dialogVisible3 = true
// this.dialogVisible3 = true
// this.orderInfo.mainSid = this.sids[0]
this.orderInfo.mainSid = this.sids[0]
this.viewState = 2
this.$refs['divadd'].showAdd(this.sids[0])
} else {
this.$message({

510
yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue

@ -1,29 +1,30 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>{{title}}旧件返厂确认</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="importDetail">导入厂家返件明细</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit">提交</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 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" 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> -->
<div class="span-sty">单据编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col> -->
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -32,107 +33,56 @@
<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"><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>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :span="12">
<div class="span-sty">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">流程状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.nodeState }}</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 addinputInfo" type="textarea"
:rows="4" clearable />
<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" :preview-src-list="[item]">
</el-image>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<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' }" />
<div class="span-sty">备注</div>
<el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
type="textarea" :rows="4" clearable />
</el-form-item>
</el-col>
</el-row>
<div class="title">
<div class="title"
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div>已返厂旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
:row-style="{height: '40px'}">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column align="center" width="100" :render-header="commodityHeader">
<el-table-column label="商品名称" prop="goodsSkuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="厂家" prop="manufacturerName" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="车架号" prop="vinNo" align="center" />
<el-table-column label="维修单号" prop="sourceBillNo" align="center" />
<el-table-column label="索赔单号" prop="claimBillNo" align="center" />
<el-table-column label="需返厂数量" prop="needReturnCount" align="center" />
<el-table-column label="实际返厂数量" prop="actualReturnCount" align="center" />
<el-table-column label="差异说明" prop="remarks" align="center" />
<el-table-column label="确认数量" align="center" width="180">
<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="manufacturerName" 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="" />
<el-input ref="focusAssumptionInput" v-model="scope.row.confirmCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" @input="commodityComputeYHAndXSJE(scope.row)" />
</template>
</el-table-column>
</el-table>
@ -141,413 +91,73 @@
</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/manufacturerconfirm.js'
import uploadImg from '@/components/uploadFile/uploadImg'
import {
getOrgSidByPath
} from '@/api/Common/dictcommons'
export default {
components: {
uploadImg
},
components: {},
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'),
"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": window.sessionStorage.getItem('orgSidPath'),
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldpartreturnList": [
]
},
hideUploadBtn: false,
// commodity
commodityKey: 1,
commodityLoading: false,
commodityQuery: {
current: 1,
size: 2,
total: 0,
params: {
name: '',
inOrg: "",
outOrg: ""
}
},
commodityData: [],
isUpdata: false,
imgList: [],
rules: {
createTime: [{
required: true,
message: '申请日期不能为空',
trigger: 'change'
}],
filePaths: [{
required: true,
message: '附件不能为空',
trigger: 'blur'
}],
}
title: "新增",
formobj: {},
}
},
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
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.manufacturerName
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)
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.save(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
})
}
})
return index + 1
},
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.imgList = []
this.formobj = {
"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": '',
"orgSidPath": window.sessionStorage.getItem('orgSidPath'),
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldpartreturnList": [
]
}
this.submitdisabled = false
this.isUpdata = false
this.$emit('doback')
},
showAdd() {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.title = "【新增】"
this.isUpdata = false
showAdd(sid) {
req.init(sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
this.formobj = {}
})
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.title = "【修改】"
this.isUpdata = true
var params = {
sid: row.sid
}
req.init(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
for (var i = 0; i < resp.data.filePaths.length; i++) {
this.imgList.push({
url: resp.data.filePaths[i].url
})
}
}
})
.catch(e => {
this.formobj = {}
})
},
commodityComputeYHAndXSJE(row) {
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
if (resp.success) {
for (var i = 0; i < resp.data.length; i++) {
this.formobj.asOldpartreturnList.push(resp.data[i])
}
if (Number(row.actualReturnCount) < Number(row.confirmCount)) {
row.confirmCount = Number(row.actualReturnCount)
}
},
handleConfirm() {
if (!this.uploadSuccess) {
this.$message({
showClose: true,
type: 'error',
message: '请先上传导入厂家返件明细'
})
return
}
this.dialogVisible = false
},
backData(value) {
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
for (var i = 0; i < this.imgList.length; i++) {
this.formobj.filePaths.push(this.imgList[i].url)
}
saveOrUpdate() {
}
},
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
}

9
yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue

@ -38,7 +38,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<!-- <el-row>
<el-col :span="12">
<div class="span-sty">分公司</div>
@ -78,7 +78,7 @@
<div class="title"
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div>商品列表</div>
<div>已返厂旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
:row-style="{height: '40px'}">
@ -88,11 +88,14 @@
<el-table-column label="厂家" prop="manufacturerName" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="车架号" prop="vinNo" align="center" />
<el-table-column label="维修单号" prop="sourceBillNo" align="center" />
<el-table-column label="索赔单号" prop="claimBillNo" align="center" />
<el-table-column label="需返厂数量" prop="needReturnCount" align="center" />
<el-table-column label="实际返厂数量" prop="actualReturnCount" align="center" />
<el-table-column label="差异说明" prop="remarks" align="center" />
<el-table-column label="确认数量" prop="confirmCount" align="center" />
</el-table>
</el-form>
</div>

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

@ -84,7 +84,7 @@
<el-table-column prop="finishTime" label="办结日期" align="center" />
<el-table-column prop="handleReasonValue" label="处理原因" width="180" align="center" />
<el-table-column prop="handleModeValue" label="处理方式" width="180" align="center" />
<el-table-column prop="totalRevenue" label="收益总额" width="180" align="center" />
<el-table-column prop="profitTotal" label="收益总额" width="180" align="center" />
</el-table>
</div>

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

@ -33,11 +33,11 @@
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col> -->
<el-col :span="8">
<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"
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span>
<!-- <el-date-picker v-model="formobj.createTime" class="addinputw addinputInfo" type="date"
value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
</el-date-picker> -->
</el-form-item>
</el-col>
@ -137,11 +137,11 @@
</template>
</el-table-column> -->
<!-- <el-table-column prop="vinNo" label="车架号" align="center" /> -->
<el-table-column prop="goodsSkuId" label="商品ID" align="center" />
<el-table-column prop="goodsSkuName" label="商品名称" 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="supplierName" label="厂家" align="center" /> -->
<el-table-column prop="supplierName" label="供应商" align="center" />
<el-table-column prop="manufacturerName" label="厂家" align="center" />
<!-- <el-table-column prop="supplierName" 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" />
@ -182,7 +182,7 @@
<el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
</el-form-item> -->
<el-form-item label="厂家">
<el-input v-model="queryParams.params.manufactor" placeholder="" clearable />
<el-input v-model="queryParams.params.manufacturerName" placeholder="" clearable />
</el-form-item>
</el-form>
@ -200,20 +200,21 @@
<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="manufactor" label="厂家" align="center" />
<el-table-column prop="manufacturerName" label="厂家" align="center" />
<el-table-column prop="vinNo" label="车架号" align="center" />
<el-table-column prop="sourceBillNo" label="维修单号" align="center" />
<!-- <el-table-column prop="warehouseName" label="仓库" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" />
<el-table-column prop="supplierName" label="供应商" align="center" /> -->
<el-table-column prop="price" label="单价" align="center" />
<!-- <el-table-column prop="price" label="单价" align="center" /> -->
<el-table-column prop="count" label="库存数量" align="center" />
</el-table>
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
:limit.sync="queryParams.size" class="pagination" @pagination="importDetail" />
</div>
<div class="btn" style="text-align: center; margin-top: 20px;">
@ -234,9 +235,15 @@
import {
getOrgSidByPath
} from '@/api/Common/dictcommons'
import {
getCurrentDate
} from '@/utils/index.js'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
export default {
components: {
Pagination,
pageye,
uploadImg
},
data() {
@ -257,7 +264,7 @@
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"createTime": "",
"createTime": getCurrentDate(),
"billNo": "",
"filePaths": [],
"useOrgSid": '',
@ -324,11 +331,11 @@
},
dataList: [],
rules: {
createTime: [{
required: true,
message: '申请日期不能为空',
trigger: 'change'
}],
// createTime: [{
// required: true,
// message: '',
// trigger: 'change'
// }],
handleReasonValue: [{
required: true,
message: '处理原因不能为空',
@ -446,18 +453,28 @@
var item = {
count: this.selectionList[i].count,
goodsSkuCode: this.selectionList[i].goodsSkuCode,
goodsSkuId: this.selectionList[i].goodsID,
goodsSkuName: this.selectionList[i].goodsSpuName,
goodsID: this.selectionList[i].goodsID,
goodsSpuSid: this.selectionList[i].goodsSpuSid,
goodsSkuSid: this.selectionList[i].goodsSkuSid,
goodsSpuName: this.selectionList[i].goodsSpuName,
goodsSkuTitle: this.selectionList[i].goodsSkuTitle,
goodsSkuOwnSpec: this.selectionList[i].goodsSkuOwnSpec,
mainSid: '',
sid: '',
supplierName: this.selectionList[i].supplierName,
unit: this.selectionList[i].unit,
vinNo: '',
vinNo: this.selectionList[i].vinNo,
warehouseName: this.selectionList[i].warehouseName,
warehouseRackCode: this.selectionList[i].warehouseRackCode,
warehouseRackSid: this.selectionList[i].warehouseRackSid,
warehouseSid: this.selectionList[i].warehouseSid,
price: this.selectionList[i].price,
sourceBillNo: this.selectionList[i].sourceBillNo,
manufacturerSid: this.selectionList[i].manufacturerSid,
manufacturerName: this.selectionList[i].manufacturerName,
supplierSid: this.selectionList[i].supplierSid,
supplierName: this.selectionList[i].supplierName,
profit: (Number(this.selectionList[i].count) * Number(this.selectionList[i].price)).toFixed(2)
}
@ -553,7 +570,7 @@
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"createTime": "",
"createTime": getCurrentDate(),
"billNo": "",
"filePaths": [],
"useOrgSid": '',
@ -620,6 +637,7 @@
},
commodityComputeYHAndXSJE(row) {
console.log('commodityComputeYHAndXSJE》》》》', row)
row.profit = (Number(row.count) * Number(row.price)).toFixed(2)
}

30
yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeInfo.vue

@ -50,7 +50,7 @@
</el-col>
<el-col :span="8">
<div class="span-sty">收益总额</div>
<el-form-item><span class="addinputInfo">{{ formobj.totalProfit }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ totalQuantity }}</span></el-form-item>
</el-col>
</el-row>
@ -83,20 +83,21 @@
<el-table v-loading="listLoading" :data="formobj.asOldparthandleList" border>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<!-- <el-table-column prop="vinNo" label="车架号" align="center" /> -->
<el-table-column prop="goodsSkuId" label="商品ID" align="center" />
<el-table-column prop="goodsSkuName" label="商品名称" 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="supplierName" label="供应商" align="center" /> -->
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="manufactor" label="厂家" align="center" />
<el-table-column prop="vinNo" label="车架号" align="center" />
<el-table-column prop="sourceBillNo" label="维修单号" align="center" />
<el-table-column prop="manufacturerName" label="厂家" align="center" />
<!-- <el-table-column prop="vinNo" label="车架号" align="center" /> -->
<!-- <el-table-column prop="sourceBillNo" label="维修单号" align="center" /> -->
<!-- <el-table-column prop="warehouseName" label="仓库" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" />
<el-table-column prop="supplierName" label="供应商" align="center" /> -->
<el-table-column prop="price" label="单价" align="center" />
<!-- <el-table-column prop="price" label="单价" align="center" /> -->
<el-table-column prop="count" label="库存数量" align="center" />
<el-table-column prop="profit" label="收益金额" align="center" />
</el-table>
</el-form>
@ -158,6 +159,21 @@
}
},
created() {},
computed: {
//
totalQuantity() {
let quantity = 0
if (this.formobj.asOldparthandleList.length > 0) {
this.formobj.asOldparthandleList.forEach((e) => {
quantity += Number(e.profit)
})
}
this.formobj.totalProfit = quantity
return quantity
},
},
methods: {
indexMethod(index) {

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

@ -15,6 +15,9 @@
<el-form-item label="申请部门">
<el-input v-model="queryParams.params.deptName" placeholder="" clearable />
</el-form-item>
<el-form-item label="申请人">
<el-input v-model="queryParams.params.createByName" placeholder="" clearable />
</el-form-item>
<el-form-item label="单据编号">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
</el-form-item>
@ -35,12 +38,12 @@
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="厂家确认结果">
<!-- <el-form-item label="厂家确认结果">
<el-select v-model="queryParams.params.billState" placeholder="请选择">
<el-option v-for="(item,i) in confirmResultsList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
</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>
@ -66,12 +69,12 @@
<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="nodeState" label="流程状态" width="120" 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="createByName" label="申请人" width="100" align="center" />
<el-table-column prop="createTime" label="申请日期" width="120" 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">
@ -80,10 +83,16 @@
</div>
</template>
</el-table-column>
<el-table-column label="厂家确认结果" align="center" width="150">
<el-table-column label="返厂情况" align="center" width="100">
<template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;" @click="showResult(scope.row)">
{{ scope.row.confirmResult }}
<div style="color: #1890FF; text-decoration: underline ;">{{scope.row.state}}
</div>
</template>
</el-table-column>
<el-table-column label="厂家确认情况" align="center" width="150">
<template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;" @click="showDetail(scope.row)">
查看
</div>
</template>
</el-table-column>
@ -103,12 +112,11 @@
<!-- 新增修改部分组件 -->
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
<manufacturerconfirmInfo v-show="viewState == 5" ref="manufacturerconfirmInfo" @doback="resetState"
@reloadlist="loadList" />
<el-dialog title="附件" :visible.sync="dialogVisible" :before-close="handleClose">
<el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
<el-row class="first_row">
<el-col :span="24" class="trightb">
<el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;"
@ -116,13 +124,9 @@
</el-image>
</el-col>
</el-row>
</el-form>
</el-dialog>
<el-dialog title="确认结果详情" :visible.sync="dialogVisible2" :before-close="handleClose2">
<el-form ref="dataForm1" class="formadd" style="margin-top: -40px;" :model="orderInfo">
@ -181,13 +185,15 @@
import pageye from '@/components/pagination/pageye'
import divAdd from './oldPartsFactoryAdd.vue'
import divInfo from './oldPartsFactoryInfo.vue'
import manufacturerconfirmInfo from './manufacturerconfirmInfo.vue'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divAdd,
divInfo
divInfo,
manufacturerconfirmInfo
},
data() {
return {
@ -228,7 +234,19 @@
size: 10,
total: 0,
params: {
name: ''
"useOrgName": "",
"deptName": "",
"createByName": "",
"billNo": "",
"createStartTime": "",
"createEndTime": "",
"finishStartTime": "",
"finishEndTime": "",
"billState": "",
"userSid": "",
"orgPath": "",
"menuUrl": "",
"menuSid": ""
}
},
sids: [],
@ -262,9 +280,12 @@
this.fileList = paths
this.dialogVisible = true
},
showDetail(row) {
this.viewState = 5
this.$refs['manufacturerconfirmInfo'].showEdit(row.sid)
},
showResult(row) {
if (row.confirmResult == '未确认') {
this.$message({
type: 'warning',
@ -285,8 +306,6 @@
})
}
},
selectionLineChangeHandle(val) {
console.log("val", val);
@ -360,7 +379,19 @@
size: 10,
total: 0,
params: {
name: ''
"useOrgName": "",
"deptName": "",
"createByName": "",
"billNo": "",
"createStartTime": "",
"createEndTime": "",
"finishStartTime": "",
"finishEndTime": "",
"billState": "",
"userSid": "",
"orgPath": "",
"menuUrl": "",
"menuSid": ""
}
}
this.loadList()

172
yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue

@ -0,0 +1,172 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>旧件返厂</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<!-- <el-col :span="12">
<div class="span-sty">单据编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col> -->
<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.createTime }}</span></el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :span="12">
<div class="span-sty">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">流程状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.nodeState }}</span></el-form-item>
</el-col>
</el-row> -->
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<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" :preview-src-list="[item]">
</el-image>
</el-form-item>
</el-col>
</el-row>
<div class="title"
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div>已返厂旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
:row-style="{height: '40px'}">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="商品名称" prop="goodsSkuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="厂家" prop="manufacturerName" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="车架号" prop="vinNo" align="center" />
<el-table-column label="维修单号" prop="sourceBillNo" align="center" />
<el-table-column label="索赔单号" prop="claimBillNo" align="center" />
<el-table-column label="需返厂数量" prop="needReturnCount" align="center" />
<el-table-column label="实际返厂数量" prop="actualReturnCount" align="center" />
<el-table-column label="差异说明" prop="remarks" align="center" />
<el-table-column label="确认数量" prop="confirmCount" align="center" />
</el-table>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/storage/manufacturerconfirm.js'
export default {
components: {},
data() {
return {
listLoading: false,
submitdisabled: false,
formobj: {},
}
},
methods: {
indexMethod(index) {
return index + 1
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.$emit('doback')
},
showAdd() {
},
showEdit(sid) {
req.init(sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
this.formobj = {}
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

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

@ -8,19 +8,17 @@
<el-button type="primary" size="small" :disabled="submitdisabled" @click="importDetail">导入厂家返件明细</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit">提交</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="downLoadDetail">下载待出库旧件明细</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<div class="title">
<div>基础信息</div>
</div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="first_row">
<!-- <el-col :span="12">
<!-- <el-col :span="12">
<div class="span-sty">单据编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col> -->
@ -33,16 +31,17 @@
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<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"
<div class="span-sty">申请日期</div>
<el-form-item prop="createTime">
<span class="addinputInfo">{{ formobj.createTime }}</span>
<!-- <el-date-picker v-model="formobj.createTime" class="addinputw addinputInfo" type="date"
value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
</el-date-picker> -->
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<!-- <el-row>
<el-col :span="12">
<div class="span-sty">分公司</div>
@ -77,34 +76,38 @@
<el-col :span="24">
<div class="span-sty"><span class="must">*</span> 附件</div>
<el-form-item prop="imgList">
<el-form-item prop="imgList">
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" @change="backData"/>
:upload-data="{ type: '0001' }" @change="backData" />
</el-form-item>
</el-col>
</el-row>
<div class="title">
<div class="title titleOne">
<div>返厂旧件列表</div>
<el-button type="primary" size="mini" @click="seleGoods3()">添加</el-button>
</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">
<!-- <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">
</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="商品ID" align="center" />
<el-table-column fixed 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="unit" 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" />
@ -113,28 +116,30 @@
@input="commodityInput(scope.row.goodsSkuName)" clearable placeholder="商品名称" />
</el-popover>
</template>
</el-table-column> -->
<el-table-column fixed label="操作" align="center" width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" :disabled="scope.row.isCf=='否'"
@click="delGoods(scope.$index)">删除</el-button>
<el-button type="primary" size="mini" @click="seleGoods(scope.row)">选择旧件</el-button>
</template>
</el-table-column>
<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 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 prop="vinNo" label="车架号" align="center" />
<el-table-column prop="sourceBillNo" label="维修单号" align="center" />
<el-table-column prop="claimBillNo" label="索赔单号" align="center" />
<el-table-column prop="needReturnCount" label="需返厂数量" width="120" align="center" />
<el-table-column prop="actualReturnCount" label="实际返厂数量" width="120" align="center" />
<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-column prop="isCf" label="是否迟返" align="center" />
</el-table>
</el-form>
@ -168,6 +173,86 @@
</div>
</el-dialog>
<el-dialog title="选择旧件" :visible.sync="dialogVisible2" :before-close="handleClose2"
style="width:150%;margin-left: -20%;">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%;margin-top: -20px;"
@selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center" />
<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 label="仓库-库区" align="center" width="150">
<template slot-scope="scope">
<div>
{{scope.row.warehouseName}} - {{scope.row.warehouseAreaName}}
</div>
</template>
</el-table-column>
<el-table-column prop="warehouseRackName" label="库位" align="center" />
<el-table-column prop="count" label="库存数量" align="center" />
<el-table-column prop="vinNo" label="车架号" align="center" />
<el-table-column prop="sourceBillNo" label="维修单号" align="center" />
</el-table>
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="importDetail" />
</div>
<div class="btn" style="text-align: center; margin-top: 20px;">
<el-button type="primary" size="mini" @click="addDialogList()">确认</el-button>
<el-button type="primary" size="mini" @click="handleClose2()">关闭</el-button>
</div>
</el-dialog>
<el-dialog title="选择旧件" :visible.sync="dialogVisible3" :before-close="handleClose3"
style="width:150%;margin-left: -20%;">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%;margin-top: -20px;"
@selection-change="selectionLineChangeHandle3">
<el-table-column fixed width="50" type="selection" align="center" />
<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 label="仓库-库区" align="center" width="150">
<template slot-scope="scope">
<div>
{{scope.row.warehouseName}} - {{scope.row.warehouseAreaName}}
</div>
</template>
</el-table-column>
<el-table-column prop="warehouseRackName" label="库位" align="center" />
<el-table-column prop="count" label="库存数量" align="center" />
<el-table-column prop="vinNo" label="车架号" align="center" />
<el-table-column prop="sourceBillNo" label="维修单号" align="center" />
</el-table>
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="importDetail" />
</div>
<div class="btn" style="text-align: center; margin-top: 20px;">
<el-button type="primary" size="mini" @click="addDialogList3()">确认</el-button>
<el-button type="primary" size="mini" @click="handleClose3()">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
@ -178,6 +263,9 @@
import {
getOrgSidByPath
} from '@/api/Common/dictcommons'
import {
getCurrentDate
} from '@/utils/index.js'
export default {
components: {
@ -186,6 +274,8 @@
data() {
return {
dialogVisible: false,
dialogVisible2: false,
dialogVisible3: false,
updateAction: process.env.VUE_APP_BASE_API + '/as/v1/asoldpartreturnapply/getExcelInfo',
fileList: [],
uploadSuccess: false,
@ -202,18 +292,18 @@
formobj: {
"sid": "",
"remarks": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"createTime": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"billNo": "",
"filePaths": [],
"useOrgSid": '',
"useOrgName": '',
"orgSidPath": window.sessionStorage.getItem('orgSidPath'),
"orgSidPath": window.sessionStorage.getItem('orgSidPath'),
"procDefId": "",
"nodeId": "",
"procInstId": "",
@ -224,24 +314,23 @@
]
},
hideUploadBtn: false,
// commodity
commodityKey: 1,
commodityLoading: false,
commodityQuery: {
imgList: [],
dataList: [],
itemInfo: {},
selectionList: [],
selectionList3: [],
tableLoading: false,
queryParams: {
current: 1,
size: 2,
size: 10,
total: 0,
params: {
name: '',
inOrg: "",
outOrg: ""
"vinNo": "",
"goodsSkuCode": "",
"sourceBillNo": "",
"orgPath": "",
}
},
commodityData: [],
isUpdata: false,
imgList: [],
rules: {
createTime: [{
required: true,
@ -267,92 +356,6 @@
})
},
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
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.manufacturerName
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
},
@ -411,13 +414,13 @@
this.formobj = {
"sid": "",
"remarks": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"createTime": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"billNo": "",
"filePaths": [],
"useOrgSid": '',
@ -451,9 +454,9 @@
})
this.title = "【修改】"
this.isUpdata = true
var params = {
sid: row.sid
}
// var params = {
// sid: row.sid
// }
req.init(row.sid)
.then(resp => {
@ -472,7 +475,31 @@
this.formobj = {}
})
},
downLoadDetail() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.downloadTobeOutExcel(this.formobj.sid).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()
})
},
downLoad() {
const loading = this.$loading({
lock: true,
@ -529,13 +556,154 @@
backData(value) {
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
this.imgList = value
for (var i = 0; i < this.imgList.length; i++) {
this.formobj.filePaths.push(this.imgList[i].url)
}
for (var i = 0; i < this.imgList.length; i++) {
this.formobj.filePaths.push(this.imgList[i].url)
}
}
},
seleGoods(row) {
this.itemInfo = row
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
"vinNo": row.vinNo,
"goodsSkuCode": row.goodsSkuCode,
"sourceBillNo": row.sourceBillNo,
"orgPath": window.sessionStorage.getItem('defaultOrgPath'),
}
}
req.getGoodsListPage(this.queryParams).then(resp => {
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
this.dialogVisible2 = true
} else {
// resp.code
this.dataList = []
this.queryParams.total = 0
}
})
.catch(e => {})
},
delGoods(index) {
this.formobj.asOldpartreturnList.splice(index, 1)
},
selectionLineChangeHandle(val) {
this.selectionList = val
},
addDialogList() {
this.dialogVisible2 = false
if (this.selectionList.length > 0) {
const choose = this.formobj.asOldpartreturnList.filter((item) => item == this.itemInfo)
console.log('>>>>>>>>>addDialogList', choose)
var num = 0
if (choose != null && choose.length > 0) {
for (var i = 0; i < this.selectionList.length; i++) {
var item = this.selectionList[i]
num += Number(item.count)
}
choose[0].actualReturnCount = num
}
}
},
handleClose2() {
this.dialogVisible2 = false
},
seleGoods3(row) {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
"vinNo": '',
"goodsSkuCode": '',
"sourceBillNo": '',
"orgPath": window.sessionStorage.getItem('defaultOrgPath'),
}
}
req.getGoodsListPage(this.queryParams).then(resp => {
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
this.dialogVisible3 = true
} else {
// resp.code
this.dataList = []
this.queryParams.total = 0
}
})
.catch(e => {})
},
selectionLineChangeHandle3(val) {
this.selectionList3 = val
},
addDialogList3() {
this.dialogVisible3 = false
for (var i = 0; i < this.selectionList3.length; i++) {
var item = this.selectionList3[i]
this.formobj.asOldpartreturnList.push({
"sid": '',
"remarks": '',
"mainSid": '',
"vinNo": item.vinNo,
"goodsSpuSid": item.goodsSpuSid,
"goodsSpuName": item.goodsSpuName,
"goodsSkuSid": item.goodsSkuSid,
"goodsSkuTitle": item.goodsSkuTitle,
"goodsSkuCode": item.goodsSkuCode,
"goodsSkuOwnSpec": item.goodsSkuOwnSpec,
"manufacturerSid": item.manufacturerSid,
"manufacturerName": item.manufacturerName,
"warehouseSid": item.warehouseSid,
"warehouseName": item.warehouseName,
"warehouseAreaSid": item.warehouseAreaSid,
"warehouseAreaName": item.warehouseAreaName,
"warehouseRackSid": item.warehouseRackSid,
"warehouseRackName": item.warehouseRackName,
"unit": item.unit,
"sourceBillNo": item.sourceBillNo,
"claimBillNo": '',
"isCf": "是",
"needReturnCount": item.count,
"actualReturnCount": item.count
})
}
},
handleClose3() {
this.dialogVisible3 = false
},
}
}
</script>

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

@ -15,7 +15,7 @@
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
@ -38,7 +38,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<!-- <el-row>
<el-col :span="12">
<div class="span-sty">分公司</div>
@ -83,14 +83,18 @@
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
:row-style="{height: '40px'}">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="商品名称" prop="goodsSkuName" align="center" />
<el-table-column label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="厂家" prop="manufacturerName" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="车架号" prop="vinNo" align="center" />
<el-table-column label="维修单号" prop="sourceBillNo" align="center" />
<el-table-column label="索赔单号" prop="claimBillNo" align="center" />
<el-table-column label="需返厂数量" prop="needReturnCount" align="center" />
<el-table-column label="实际返厂数量" prop="actualReturnCount" align="center" />
<el-table-column label="差异说明" prop="remarks" align="center" />
<el-table-column label="是否迟返" prop="isCf" align="center" />
</el-table>
</el-form>

75
yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingReportDetail.vue

@ -4,7 +4,7 @@
<div class="tab-header webtop">
<div>盘库报告</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="settle()">下载pdf</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="downLoadPDF()">下载pdf</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -43,7 +43,7 @@
<div class="title titleOne">
<div>总体盘点情况</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="seleMaintenance()">明细下载</el-button>
<el-button type="primary" size="mini" class="btntopblueline" @click="downLoadDetail()">明细下载</el-button>
</div>
<div style="display: flex;flex-direction: row;align-items: center;
@ -192,6 +192,77 @@
this.formobj = {}
this.submitdisabled = false
this.$emit('doback')
},
downLoadPDF() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.downloadPDF({
sid: this.formobj.sid
}).then((res) => {
if (res.success) {
loading.close()
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data +
'&outFileName=' + '盘点报告', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '盘点报告.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
}
}).catch(() => {
console.log(22222222);
loading.close()
})
},
downLoadDetail() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.downloadExcel({
sid: this.formobj.sid
}).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()
})
}
}
}

10
yxt-as-ui/src/views/storage/stocktaking/index.vue

@ -406,21 +406,15 @@
}).then((res) => {
if (res.success) {
this.financeList = res.data
console.log("aaaaaa", this.financeList);
}
})
var parpams = {
req2.getAllWarehouse({
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}
req2.getAllWarehouse(parpams).then(resp => {
}).then(resp => {
this.warehouseList = resp.data
})
},
methods: {
getWarehouseArea(sid) {

31
yxt-as-ui/src/views/storage/stocktakingLoss/stocktakingLossAdd.vue

@ -48,7 +48,7 @@
</el-col>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.businessVaule }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.businessValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
@ -85,7 +85,11 @@
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column label="金额" prop="money" align="center" />
<el-table-column label="金额" align="center">
<template #default="scope">
{{ totalQuantity(scope.row) }}
</template>
</el-table-column>
</el-table>
</el-form>
@ -124,7 +128,7 @@
"sourceBillNo": "",
"sourceBillSid": "",
"businessKey": "14",
"businessVaule": "盘亏出库",
"businessValue": "盘亏出库",
"remarks": "",
"goodsList": []
},
@ -143,6 +147,15 @@
created() {
},
computed: {
//
totalQuantity() {
return function(row) {
row.money = (Number(row.inStoragePrice) * Number(row.outStorageNum)).toFixed(2)
return (Number(row.inStoragePrice) * Number(row.outStorageNum)).toFixed(2)
}
},
},
methods: {
@ -156,7 +169,7 @@
}
})
req.getSourceBillNoBySid({
deptSid: window.sessionStorage.getItem('defaultOrgPath').sub(window.sessionStorage.getItem(
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
'defaultOrgPath').lastIndexOf('/') + 1)
}).then((resp) => {
if (resp.success) {
@ -246,15 +259,15 @@
"sid": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').sub(window
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').sub(window.sessionStorage
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"sourceBillNo": "",
"sourceBillSid": "",
"businessKey": "14",
"businessVaule": "盘亏出库",
"businessValue": "盘亏出库",
"remarks": "",
"goodsList": []
}
@ -281,9 +294,9 @@
if (resp.success) {
this.formobj = resp.data
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').sub(window
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').sub(window.sessionStorage
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1)
}

17
yxt-as-ui/src/views/storage/stocktakingLoss/stocktakingLossInfo.vue

@ -38,7 +38,7 @@
</el-col>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.businessVaule }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.businessValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
@ -62,7 +62,11 @@
<el-table-column label="入库单价" prop="inStoragePrice" align="center" />
<el-table-column label="盘亏数量" prop="pkNum" align="center" />
<el-table-column label="出库数量" prop="outStorageNum" align="center" />
<el-table-column label="金额" prop="money" align="center" />
<el-table-column label="金额" align="center">
<template #default="scope">
{{ totalQuantity(scope.row) }}
</template>
</el-table-column>
</el-table>
</el-form>
@ -83,6 +87,15 @@
}
},
created() {},
computed: {
//
totalQuantity() {
return function(row) {
row.money = (Number(row.inStoragePrice) * Number(row.outStorageNum)).toFixed(2)
return (Number(row.inStoragePrice) * Number(row.outStorageNum)).toFixed(2)
}
},
},
methods: {

23
yxt-as-ui/src/views/storage/stocktakingSurplus/stocktakingSurplusAdd.vue

@ -48,7 +48,7 @@
</el-col>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.businessVaule }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.businessValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
@ -97,7 +97,12 @@
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column label="金额" prop="money" align="center" />
<el-table-column label="金额" align="center">
<template #default="scope">
{{ totalQuantity(scope.row) }}
</template>
</el-table-column>
</el-table>
</el-form>
@ -137,7 +142,7 @@
"sourceBillNo": "",
"sourceBillSid": "",
"businessKey": "04",
"businessVaule": "盘盈入库",
"businessValue": "盘盈入库",
"remarks": "",
"goodsList": []
},
@ -158,6 +163,16 @@
},
computed: {
//
totalQuantity() {
return function(row) {
row.money = (Number(row.inStoragePrice) * Number(row.inStorageNum)).toFixed(2)
return (Number(row.inStoragePrice) * Number(row.inStorageNum)).toFixed(2)
}
},
},
methods: {
init() {
@ -296,7 +311,7 @@
"sourceBillNo": "",
"sourceBillSid": "",
"businessKey": "04",
"businessVaule": "盘盈入库",
"businessValue": "盘盈入库",
"remarks": "",
"goodsList": []
}

19
yxt-as-ui/src/views/storage/stocktakingSurplus/stocktakingSurplusInfo.vue

@ -38,7 +38,7 @@
</el-col>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.businessVaule }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.businessValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
@ -61,7 +61,12 @@
<el-table-column label="供应商" prop="supplierName" align="center" />
<el-table-column label="入库单价" prop="inStoragePrice" align="center" />
<el-table-column label="入库数量" prop="inStorageNum" align="center" />
<el-table-column label="金额" prop="money" align="center" />
<el-table-column label="金额" align="center">
<template #default="scope">
{{ totalQuantity(scope.row) }}
</template>
</el-table-column>
</el-table>
</el-form>
@ -82,7 +87,15 @@
}
},
created() {},
computed: {
//
totalQuantity() {
return function(row) {
row.money = (Number(row.inStoragePrice) * Number(row.inStorageNum)).toFixed(2)
return (Number(row.inStoragePrice) * Number(row.inStorageNum)).toFixed(2)
}
},
},
methods: {
handleReturn(isreload) {

Loading…
Cancel
Save