Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 days ago
parent
commit
412f16a4f0
  1. 327
      yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue
  2. 87
      yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue
  3. 91
      yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue
  4. 233
      yxt-as-ui/src/views/storage/oldPartsFactory/index.vue
  5. 172
      yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue
  6. 371
      yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue
  7. 94
      yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue
  8. 66
      yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue
  9. 62
      yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue
  10. 61
      yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue
  11. 17
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java
  12. 18
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java
  13. 18
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java
  14. 15
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApply.java
  15. 14
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java
  16. 14
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java
  17. 14
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java
  18. 16
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java
  19. 16
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java
  20. 14
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmQuery.java
  21. 14
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmVo.java
  22. 16
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.java
  23. 13
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyRest.java
  24. 19
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java
  25. 13
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java
  26. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml
  27. 7
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java
  28. 13
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.java
  29. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml
  30. 13
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java
  31. 17
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java
  32. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java
  33. 10
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

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

@ -22,28 +22,21 @@
<el-input v-model="queryParams.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
<span style="padding: 0 8px"></span>
<el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
</el-form-item>
<el-form-item label="办结日期">
<el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
<span style="padding: 0 8px"></span>
<el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
</el-form-item>
<!-- <el-form-item label="厂家确认结果">
<el-select v-model="queryParams.params.billState" placeholder="请选择">
<el-form-item label="厂家确认结果">
<el-select v-model="queryParams.params.confirmResult" 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>
@ -58,14 +51,11 @@
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="selectionLineChangeHandle">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope">
<!-- <el-button type="primary" size="mini" :disabled="scope.row.nodeState!='待提交'"
@click="toEdit(scope.row)">办理</el-button> -->
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>
@ -84,22 +74,13 @@
</template>
</el-table-column>
<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)">
{{ scope.row.confirmResult }}
</div>
</template>
</el-table-column> -->
</el-table>
</div>
<!-- End 项目列表 -->
<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" />
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
</div>
</div>
</div>
@ -108,126 +89,16 @@
<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">
<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;"
v-for="(item,index) in fileList" :src="item" :preview-src-list="[item]">
<el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;" v-for="(item,index) in fileList" :key="index" :src="item" :preview-src-list="[item]">
</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">
<el-row class="first_row">
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">返件数量确认</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<el-radio-group v-model="orderInfo.isUnanimous" size="small" :disabled="true">
<el-radio :label="0">一致</el-radio>
<el-radio :label="1">不一致</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">备注</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<span class="addinputw" style="width:100%">{{orderInfo.remarks}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">附件</span>
</el-form-item>
</el-col>
<el-col :span="16" class="trightb">
<el-form-item class="trightb_item">
<el-image style="width: 120px;height: 120px; margin: 10px; " v-for="(item,index) in orderInfo.filePaths"
:src="item" :preview-src-list="[item]">
</el-image>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
<el-dialog title="旧件返厂厂家确认" :visible.sync="dialogVisible3" :before-close="handleClose3">
<el-form ref="dataForm1" class="formadd" style="margin-top: -40px;" :model="orderInfo">
<el-row class="first_row">
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">返件数量确认</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<el-radio-group v-model="orderInfo.isUnanimous" size="small">
<el-radio :label="0">一致</el-radio>
<el-radio :label="1">不一致</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">备注</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<!-- <span class="addinputw" style="width:100%">{{orderInfo.remarks}}</span> -->
<el-input v-model="orderInfo.remarks" placeholder="" class="addinputw addinputInfo" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">附件</span>
</el-form-item>
</el-col>
<el-col :span="16" class="trightb">
<el-form-item class="trightb_item">
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" @change="backData" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="btn" style="text-align: center; margin-top: 20px;">
<el-button type="primary" size="mini" @click="saveResult()">保存</el-button>
<el-button type="primary" size="mini" @click="handleClose3()">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
@ -235,36 +106,29 @@
import req from '@/api/storage/manufacturerconfirm.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './manufacturerconfirmAdd.vue'
import divInfo from './manufacturerconfirmInfo.vue'
import uploadImg from '@/components/uploadFile/uploadImg'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divAdd,
divInfo,
uploadImg
divInfo
},
data() {
return {
dialogVisible: false,
dialogVisible2: false,
dialogVisible3: false,
fileList: [],
orderInfo: {
filePaths: []
},
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [{
btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
@ -285,22 +149,32 @@
size: 10,
total: 0,
params: {
name: ''
useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createStartTime: '',
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
confirmResult: '',
userSid: '',
orgPath: '',
menuUrl: ''
}
},
sids: [],
selectionList: [],
confirmResultsList: [{
name: "一致",
sid: "1"
confirmResultsList: [
{
name: '未确认',
sid: '1'
},
{
name: "不一致",
sid: "2"
name: '已确认',
sid: '2'
}
],
pathList: [],
imgList: []
]
}
},
mounted() {
@ -313,67 +187,17 @@
handleClose() {
this.dialogVisible = false
},
handleClose2() {
this.dialogVisible2 = false
},
handleClose3() {
this.dialogVisible3 = false
},
showAdjunct(paths) {
this.fileList = paths
this.dialogVisible = true
},
saveResult() {
console.log("saveResult", this.orderInfo);
req.saveConfirmResult(this.orderInfo).then((resp) => {
this.dialogVisible3 = false
this.orderInfo = {
filePaths: []
}
this.loadList()
}).catch(() => {
})
},
showResult(row) {
if (row.confirmResult == '未确认') {
this.$message({
type: 'warning',
showClose: true,
message: '厂家暂未确认'
})
} else {
req.fetchDetailsByMainSid(row.sid).then((resp) => {
console.log("fetchDetailsByMainSid", resp);
this.orderInfo = resp.data
this.dialogVisible2 = true
}).catch(() => {
})
}
},
selectionLineChangeHandle(val) {
console.log("val", val);
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
clicksearchShow() {
@ -386,9 +210,6 @@
},
btnHandle(btnKey) {
switch (btnKey) {
case 'doDel':
this.doDel()
break
case 'toAdd':
this.toAdd()
break
@ -436,61 +257,26 @@
size: 10,
total: 0,
params: {
name: ''
useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createStartTime: '',
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
confirmResult: '',
userSid: '',
orgPath: '',
menuUrl: ''
}
}
this.loadList()
},
doDel() {
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// resp.code
}
}).catch(e => {
loading.close()
})
}).catch(() => {})
} else {
this.$message({
type: 'warning',
showClose: true,
message: '请至少选择一条记录进行删除操作'
})
}
},
toAdd() {
if (this.sids.length == 1) {
// this.dialogVisible3 = true
// this.orderInfo.mainSid = this.sids[0]
if (this.sids.length === 1) {
this.viewState = 2
this.$refs['divadd'].showAdd(this.sids[0])
} else {
this.$message({
type: 'warning',
@ -498,16 +284,11 @@
message: '请选择一条记录'
})
}
},
toEdit(row) {
this.viewState = 3
this.$refs['divadd'].showEdit(row)
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
@ -516,21 +297,9 @@
this.viewState = 4
this.$refs['divinfo'].showEdit(row)
},
resetState() {
this.viewState = 1
},
backData(value) {
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
for (var i = 0; i < this.imgList.length; i++) {
this.orderInfo.filePaths.push(this.imgList[i].url)
}
}
}
}
</script>

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

@ -1,30 +1,15 @@
<template>
<div>
<div class="app-container">
<div class="tab-header webtop">
<!-- 标题 -->
<div>{{ title }}厂家确认</div>
<!-- start 添加修改按钮 -->
<div>
<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">
<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>
@ -33,7 +18,6 @@
<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>
@ -43,30 +27,20 @@
<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' }" @change="backData" />
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map" :upload-data="{ type: '0001' }" @change="backData"/>
</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 />
<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"
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.asOldpartreturnConfirmDetailDetailsList" border
style="width: 100%;" :row-style="{height: '40px'}">
<div class="title">已返厂旧件列表</div>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" 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="goodsSpuName" align="center"/>
<el-table-column label="商品编码" prop="goodsSkuCode" align="center"/>
@ -81,23 +55,19 @@
<el-table-column label="差异说明" prop="remarks" align="center"/>
<el-table-column label="确认数量" align="center" width="180">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.confirmCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" @input="commodityComputeYHAndXSJE(scope.row)" />
<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>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/storage/manufacturerconfirm.js'
import uploadImg from '@/components/uploadFile/uploadImg'
export default {
components: {
uploadImg
@ -106,15 +76,11 @@
return {
listLoading: false,
submitdisabled: false,
title: "新增",
title: '新增',
formobj: {},
imgList: [],
rules: {
filePaths: [{
required: true,
message: '附件不能为空',
trigger: 'blur'
}],
filePaths: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
}
}
},
@ -129,13 +95,11 @@
this.submitdisabled = false
this.$emit('doback')
},
showAdd(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.init(sid)
.then(resp => {
req.init(sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
for (var i = 0; i < resp.data.filePaths.length; i++) {
@ -144,8 +108,7 @@
})
}
}
})
.catch(e => {
}).catch(e => {
this.formobj = {}
})
},
@ -153,39 +116,28 @@
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
var params = {
sid: row.sid
}
req.init(row.sid)
.then(resp => {
req.init(row.sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
}).catch(e => {
this.formobj = {}
})
},
backData(value) {
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
this.imgList = value
this.formobj.filePaths = []
for (var i = 0; i < this.imgList.length; i++) {
this.formobj.filePaths.push(this.imgList[i].url)
}
},
commodityComputeYHAndXSJE(row) {
if (Number(row.actualReturnCount) < Number(row.confirmCount)) {
row.confirmCount = Number(row.actualReturnCount)
}
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
@ -205,8 +157,7 @@
})
}
})
},
}
}
}
</script>
@ -235,12 +186,4 @@
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

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

@ -1,29 +1,14 @@
<template>
<div>
<div class="app-container">
<div class="tab-header webtop">
<!-- 标题 -->
<div>厂家确认</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<!-- <el-col :span="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>
@ -32,60 +17,31 @@
<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 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 style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" v-for="(item, index) in formobj.filePaths" :key="index" :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">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title"
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div>已返厂旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" border
style="width: 100%;" :row-style="{height: '40px'}">
<div class="title">已返厂旧件列表</div>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" 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="goodsSpuName" align="center"/>
<el-table-column label="商品编码" prop="goodsSkuCode" 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"/>
@ -98,10 +54,7 @@
<el-table-column label="确认数量" prop="confirmCount" align="center"/>
</el-table>
</el-form>
</div>
</div>
</template>
@ -114,34 +67,23 @@
return {
listLoading: false,
submitdisabled: false,
formobj: {},
formobj: {}
}
},
methods: {
indexMethod(index) {
return index + 1
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
handleReturn() {
this.formobj = {}
this.$emit('doback')
},
showAdd() {
},
showEdit(row) {
var params = {
sid: row.sid
}
req.init(row.sid)
.then(resp => {
req.init(row.sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
}).catch(e => {
this.formobj = {}
})
}
@ -157,20 +99,7 @@
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>

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

@ -22,28 +22,21 @@
<el-input v-model="queryParams.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
<span style="padding: 0 8px"></span>
<el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
</el-form-item>
<el-form-item label="办结日期">
<el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
<span style="padding: 0 8px"></span>
<el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
</el-form-item>
<!-- <el-form-item label="厂家确认结果">
<el-select v-model="queryParams.params.billState" placeholder="请选择">
<el-form-item label="厂家确认结果">
<el-select v-model="queryParams.params.confirmResult" 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>
@ -58,14 +51,12 @@
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="selectionLineChangeHandle">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" :disabled="scope.row.nodeState!='待提交'"
@click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true" @click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>
@ -84,34 +75,22 @@
<el-table-column prop="actualReturnCount" label="实际返厂数量合计" width="180" align="center"/>
<el-table-column label="附件" align="center" width="100">
<template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;cursor: pointer;"
@click="showAdjunct(scope.row.filePaths)">查看
</div>
<span class="bluezi" @click="showAdjunct(scope.row.filePaths)">查看</span>
</template>
</el-table-column>
<el-table-column label="返厂情况" prop="state" align="center" width="100"/>
<!-- <template slot-scope="scope">
<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 ;cursor: pointer;"
v-show="scope.row.confirmSid!=''" @click="showDetail(scope.row)">
查看
</div>
<span class="bluezi" v-show="scope.row.confirmSid!=''" @click="showDetail(scope.row)">查看</span>
</template>
</el-table-column>
</el-table>
</div>
<!-- End 项目列表 -->
<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" />
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
</div>
</div>
</div>
@ -119,74 +98,22 @@
<!-- 新增修改部分组件 -->
<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" />
<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;"
v-for="(item,index) in fileList" :src="item" :preview-src-list="[item]">
</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">
<el-row class="first_row">
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">返件数量确认</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<el-radio-group v-model="orderInfo.isUnanimous" size="small" :disabled="true">
<el-radio :label="0">一致</el-radio>
<el-radio :label="1">不一致</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">备注</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<span class="addinputw" style="width:100%">{{orderInfo.remarks}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">附件</span>
</el-form-item>
</el-col>
<el-col :span="16" class="trightb">
<el-form-item class="trightb_item">
<el-image style="width: 120px;height: 120px; margin: 10px; " v-for="(item,index) in orderInfo.filePaths"
:src="item" :preview-src-list="[item]">
<el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;" v-for="(item, index) in fileList" :key="index" :src="item" :preview-src-list="[item]">
</el-image>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
<!-- 流程审批记录 -->
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no"
:src="this.centerDialogVisible === true ? url :''"></iframe>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog>
</div>
</template>
@ -194,18 +121,15 @@
import req from '@/api/storage/oldPartsFactory.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './oldPartsFactoryAdd.vue'
import divInfo from './oldPartsFactoryInfo.vue'
import manufacturerconfirmInfo from './manufacturerconfirmInfo.vue'
import {
getStorage
} from '@/utils/auth'
import manufacturerconfirmInfo from '../manufacturerconfirm/manufacturerconfirmInfo'
import { getStorage } from '@/utils/auth'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divAdd,
divInfo,
manufacturerconfirmInfo
@ -216,16 +140,15 @@
dialogHeight: '80%',
centerDialogVisible: false,
dialogVisible: false,
dialogVisible2: false,
fileList: [],
orderInfo: {},
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [{
btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
@ -252,33 +175,33 @@
size: 10,
total: 0,
params: {
"useOrgName": "",
"deptName": "",
"createByName": "",
"billNo": "",
"createStartTime": "",
"createEndTime": "",
"finishStartTime": "",
"finishEndTime": "",
"billState": "",
"userSid": "",
"orgPath": "",
"menuUrl": "",
"menuSid": ""
useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createStartTime: '',
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
confirmResult: '',
userSid: '',
orgPath: '',
menuUrl: '',
menuSid: ''
}
},
sids: [],
selectionList: [],
confirmResultsList: [{
name: "一致",
sid: "1"
confirmResultsList: [
{
name: '未确认',
sid: '1'
},
{
name: "不一致",
sid: "2"
name: '已确认',
sid: '2'
}
],
pathList: []
]
}
},
mounted() {
@ -321,52 +244,21 @@
handleClose() {
this.dialogVisible = false
},
handleClose2() {
this.dialogVisible2 = false
},
showAdjunct(paths) {
this.fileList = paths
this.dialogVisible = true
},
showDetail(row) {
this.viewState = 5
this.$refs['manufacturerconfirmInfo'].showEdit(row.confirmSid)
},
showResult(row) {
if (row.confirmResult == '未确认') {
this.$message({
type: 'warning',
showClose: true,
message: '厂家暂未确认'
})
} else {
req.fetchDetailsByMainSid(row.sid).then((resp) => {
console.log("fetchDetailsByMainSid", resp);
this.orderInfo = resp.data
this.dialogVisible2 = true
}).catch(() => {
})
}
},
selectionLineChangeHandle(val) {
console.log("val", val);
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
clicksearchShow() {
@ -429,25 +321,24 @@
size: 10,
total: 0,
params: {
"useOrgName": "",
"deptName": "",
"createByName": "",
"billNo": "",
"createStartTime": "",
"createEndTime": "",
"finishStartTime": "",
"finishEndTime": "",
"billState": "",
"userSid": "",
"orgPath": "",
"menuUrl": "",
"menuSid": ""
useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createStartTime: '',
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
confirmResult: '',
userSid: '',
orgPath: '',
menuUrl: '',
menuSid: ''
}
}
this.loadList()
},
doDel() {
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
@ -476,7 +367,8 @@
}).catch(e => {
loading.close()
})
}).catch(() => {})
}).catch(() => {
})
} else {
this.$message({
showClose: true,
@ -484,21 +376,14 @@
})
}
},
toAdd() {
this.viewState = 2
this.$refs['divadd'].showAdd()
},
toEdit(row) {
this.viewState = 3
this.$refs['divadd'].showEdit(row)
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
@ -507,11 +392,9 @@
this.viewState = 4
this.$refs['divinfo'].showEdit(row)
},
resetState() {
this.viewState = 1
},
}
}
}
</script>

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

@ -1,172 +0,0 @@
<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="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="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>

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

@ -1,28 +1,18 @@
<template>
<div>
<div class="app-container">
<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" v-show="formobj.sid!=''" @click="downLoadDetail">导出待出库旧件明细</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" v-show="formobj.sid!=''"
@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">
<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>
@ -33,102 +23,41 @@
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item prop="createTime">
<el-form-item>
<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-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"><span class="must">*</span> 附件</div>
<el-form-item prop="filePaths">
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" @change="backData" />
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map" :upload-data="{ type: '0001' }" @change="backData" />
</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 />
<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 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">
<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="商品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" />
</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 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" :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="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" />
@ -144,9 +73,7 @@
</el-table-column>
<el-table-column prop="isCf" label="是否迟返" align="center" />
</el-table>
</el-form>
</div>
<!-- 导入 -->
@ -156,9 +83,19 @@
</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-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>
@ -176,16 +113,13 @@
</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-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="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" />
@ -204,22 +138,15 @@
<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="seleGoods" />
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="seleGoods" />
</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-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" />
@ -230,9 +157,7 @@
<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>
<span>{{scope.row.warehouseName}} - {{scope.row.warehouseAreaName}}</span>
</template>
</el-table-column>
<el-table-column prop="warehouseRackName" label="库位" align="center" />
@ -243,20 +168,13 @@
<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="seleGoods3" />
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="seleGoods3" />
</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>
@ -293,29 +211,25 @@
listLoading: false,
submitdisabled: false,
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": getCurrentDate(),
"billNo": "",
"filePaths": [],
"useOrgSid": '',
"useOrgName": '',
"orgSidPath": window.sessionStorage.getItem('orgSidPath'),
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldpartreturnList": [
]
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: getCurrentDate(),
billNo: '',
filePaths: [],
useOrgSid: '',
useOrgName: '',
orgSidPath: window.sessionStorage.getItem('orgSidPath'),
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
asOldpartreturnList: []
},
imgList: [],
dataList: [],
@ -328,23 +242,14 @@
size: 10,
total: 0,
params: {
"vinNo": "",
"goodsSkuCode": "",
"sourceBillNo": "",
"orgPath": "",
vinNo: '',
goodsSkuCode: '',
sourceBillNo: '',
orgPath: ''
}
},
rules: {
createTime: [{
required: true,
message: '申请日期不能为空',
trigger: 'change'
}],
filePaths: [{
required: true,
message: '附件不能为空',
trigger: 'blur'
}],
filePaths: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
}
}
},
@ -366,8 +271,6 @@
this.dialogVisible = true
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
@ -389,7 +292,6 @@
})
},
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
@ -409,72 +311,55 @@
})
}
})
},
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('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'),
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldpartreturnList": [
]
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: getCurrentDate(),
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
this.title = '【新增】'
},
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 => {
this.title = '【修改】'
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 => {
}).catch(e => {
this.formobj = {}
})
},
@ -493,7 +378,7 @@
const fileName = '待出库旧件明细' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.style.display = 'none'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
@ -535,15 +420,11 @@
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])
}
}
},
handleConfirm() {
if (!this.uploadSuccess) {
@ -560,22 +441,18 @@
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)
}
},
seleGoods(row) {
this.itemInfo = row
this.queryParams.params = {
"vinNo": row.vinNo,
"goodsSkuCode": row.goodsSkuCode,
"sourceBillNo": row.sourceBillNo,
"orgPath": window.sessionStorage.getItem('defaultOrgPath'),
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
@ -587,54 +464,38 @@
this.dataList = []
this.queryParams.total = 0
}
}).catch(e => {
})
.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() {
this.queryParams.params = {
"vinNo": '',
"goodsSkuCode": '',
"sourceBillNo": '',
"orgPath": window.sessionStorage.getItem('defaultOrgPath'),
vinNo: '',
goodsSkuCode: '',
sourceBillNo: '',
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}
req.getGoodsListPage(this.queryParams).then(resp => {
if (resp.success) {
@ -647,57 +508,47 @@
this.dataList = []
this.queryParams.total = 0
}
}).catch(e => {
})
.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
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>

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

@ -1,29 +1,14 @@
<template>
<div>
<div class="app-container">
<div class="tab-header webtop">
<!-- 标题 -->
<div>旧件返厂</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<!-- <el-col :span="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>
@ -32,61 +17,31 @@
<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 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 style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" v-for="(item, index) in formobj.filePaths" :key="index" :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">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title"
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
:row-style="{height: '40px'}">
<div class="title">商品列表</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="goodsSpuName" align="center"/>
<el-table-column label="商品编码" prop="goodsSkuCode" 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"/>
@ -98,12 +53,8 @@
<el-table-column label="差异说明" prop="remarks" align="center"/>
<el-table-column label="是否迟返" prop="isCf" align="center"/>
</el-table>
</el-form>
</div>
</div>
</template>
@ -116,7 +67,7 @@
return {
listLoading: false,
submitdisabled: false,
formobj: {},
formobj: {}
}
},
methods: {
@ -124,26 +75,16 @@
return index + 1
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
handleReturn() {
this.formobj = {}
this.$emit('doback')
},
showAdd() {
},
showEdit(row) {
var params = {
sid: row.sid
}
req.init(row.sid)
.then(resp => {
req.init(row.sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
}).catch(e => {
this.formobj = {}
})
}
@ -154,25 +95,10 @@
.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>

66
yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue

@ -31,27 +31,21 @@
<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 style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" v-for="(item, index) in formobj.filePaths" :key="index" :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" />
<div class="title">商品列表</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="index + 1" align="center"/>
<el-table-column label="商品名称" prop="goodsSkuName" align="center"/>
<el-table-column label="商品编码" prop="goodsSkuCode" 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"/>
@ -59,7 +53,6 @@
<el-table-column label="实际返厂数量" prop="actualReturnCount" align="center"/>
<el-table-column label="差异说明" prop="remarks" align="center"/>
</el-table>
</el-form>
</div>
</div>
@ -92,8 +85,9 @@
<span>意见:</span>
</el-col>
<el-col :span="20">
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input></el-form-item>
<el-form-item>
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
@ -107,9 +101,7 @@
<script>
import req from '@/api/storage/oldPartsFactory'
import {
selectStaffListss
} from '@/api/Common/dictcommons'
import { selectStaffListss } from '@/api/Common/dictcommons'
export default {
name: 'WorkSLRSettlementDaiBan',
@ -121,27 +113,25 @@
tableKey: 0,
index: 0,
formobj: {
"sid": "",
"remarks": "",
"createBySid": '',
"createByName": '',
"deptSid": '',
"deptName": '',
"createTime": "",
"billNo": "",
"filePaths": [],
"useOrgSid": '',
"useOrgName": '',
"orgSidPath": '',
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldpartreturnList": [
]
sid: '',
remarks: '',
createBySid: '',
createByName: '',
deptSid: '',
deptName: '',
createTime: '',
billNo: '',
filePaths: [],
useOrgSid: '',
useOrgName: '',
orgSidPath: '',
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
asOldpartreturnList: []
},
rules: {},
options: [],

62
yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue

@ -29,24 +29,17 @@
<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-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" v-for="(item, index) in formobj.filePaths" :key="index" :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'}">
<div class="title">商品列表</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"/>
@ -57,7 +50,6 @@
<el-table-column label="实际返厂数量" prop="actualReturnCount" align="center"/>
<el-table-column label="差异说明" prop="remarks" align="center"/>
</el-table>
</el-form>
</div>
</div>
@ -76,32 +68,26 @@
submitdisabled: false,
tableKey: 0,
index: 0,
// service
serviceKey: 1,
// subjoin
subjoinKey: 2,
formobj: {
"sid": "",
"remarks": "",
"createBySid": '',
"createByName": '',
"deptSid": '',
"deptName": '',
"createTime": "",
"billNo": "",
"filePaths": [],
"useOrgSid": '',
"useOrgName": '',
"orgSidPath": '',
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldpartreturnList": [
]
sid: '',
remarks: '',
createBySid: '',
createByName: '',
deptSid: '',
deptName: '',
createTime: '',
billNo: '',
filePaths: [],
useOrgSid: '',
useOrgName: '',
orgSidPath: '',
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
asOldpartreturnList: []
},
rules: {}
}
@ -123,9 +109,7 @@
}
}, '*')
},
computed: {
},
computed: {},
methods: {
showInfo(sid) {
this.viewTitle = '【编辑】旧件返厂申请'

61
yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue

@ -28,24 +28,18 @@
<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 style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" v-for="(item, index) in formobj.filePaths" :key="index" :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'}">
<div class="title">>商品列表</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"/>
@ -56,7 +50,6 @@
<el-table-column label="实际返厂数量" prop="actualReturnCount" align="center"/>
<el-table-column label="差异说明" prop="remarks" align="center"/>
</el-table>
</el-form>
</div>
</div>
@ -75,32 +68,26 @@
submitdisabled: false,
tableKey: 0,
index: 0,
// service
serviceKey: 1,
// subjoin
subjoinKey: 2,
formobj: {
"sid": "",
"remarks": "",
"createBySid": '',
"createByName": '',
"deptSid": '',
"deptName": '',
"createTime": "",
"billNo": "",
"filePaths": [],
"useOrgSid": '',
"useOrgName": '',
"orgSidPath": '',
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldpartreturnList": [
]
sid: '',
remarks: '',
createBySid: '',
createByName: '',
deptSid: '',
deptName: '',
createTime: '',
billNo: '',
filePaths: [],
useOrgSid: '',
useOrgName: '',
orgSidPath: '',
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
asOldpartreturnList: []
},
rules: {},
//
@ -140,9 +127,7 @@
}
}, '*')
},
computed: {
},
computed: {},
methods: {
showInfo(sid) {
this.viewTitle = '旧件返厂申请详情'

17
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java

@ -33,19 +33,6 @@ import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandle.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandle <br/>
* Description: 处理旧件列表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "处理旧件列表", description = "处理旧件列表")
@TableName("as_oldparthandle")
@ -84,6 +71,10 @@ public class AsOldparthandle extends BaseEntity {
private String warehouseSid; // 仓库sid
@ApiModelProperty("仓库名称")
private String warehouseName; // 仓库名称
@ApiModelProperty("库区sid")
private String warehouseAreaSid;
@ApiModelProperty("库区名称")
private String warehouseAreaName;
@ApiModelProperty("库位sid")
private String warehouseRackSid; // 库位sid
@ApiModelProperty("库位编码")

18
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldparthandle;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
@ -34,19 +33,6 @@ import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleVo.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo <br/>
* Description: 处理旧件列表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "处理旧件列表 视图数据详情", description = "处理旧件列表 视图数据详情")
public class AsOldparthandleDetailsVo implements Vo {
@ -85,6 +71,10 @@ public class AsOldparthandleDetailsVo implements Vo {
private String warehouseSid; // 仓库sid
@ApiModelProperty("仓库名称")
private String warehouseName; // 仓库名称
@ApiModelProperty("库区sid")
private String warehouseAreaSid;
@ApiModelProperty("库区名称")
private String warehouseAreaName;
@ApiModelProperty("库位sid")
private String warehouseRackSid; // 库位sid
@ApiModelProperty("库位编码")

18
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldparthandle;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
@ -34,19 +33,6 @@ import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleDto.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto <br/>
* Description: 处理旧件列表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "处理旧件列表 数据传输对象", description = "处理旧件列表 数据传输对象")
public class AsOldparthandleDto implements Dto {
@ -85,6 +71,10 @@ public class AsOldparthandleDto implements Dto {
private String warehouseSid; // 仓库sid
@ApiModelProperty("仓库名称")
private String warehouseName; // 仓库名称
@ApiModelProperty("库区sid")
private String warehouseAreaSid;
@ApiModelProperty("库区名称")
private String warehouseAreaName;
@ApiModelProperty("库位sid")
private String warehouseRackSid; // 库位sid
@ApiModelProperty("库位编码")

15
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApply.java

@ -28,24 +28,13 @@ package com.yxt.anrui.as.api.asoldparthandleapply;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApply.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApply <br/>
* Description: 旧件处理申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "旧件处理申请", description = "旧件处理申请")
@TableName("as_oldparthandle_apply")

14
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldparthandleapply;
import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo;
import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
import com.yxt.common.core.vo.Vo;
@ -40,19 +39,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyVo.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo <br/>
* Description: 旧件处理申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "旧件处理申请 视图数据详情", description = "旧件处理申请 视图数据详情")
public class AsOldparthandleApplyDetailsVo implements Vo {

14
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDto.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldparthandleapply;
import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
import com.yxt.common.core.dto.Dto;
@ -39,19 +38,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyDto.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDto <br/>
* Description: 旧件处理申请 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "旧件处理申请 数据传输对象", description = "旧件处理申请 数据传输对象")
public class AsOldparthandleApplyDto implements Dto {

14
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyQuery.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldparthandleapply;
import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -34,19 +33,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyQuery.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyQuery <br/>
* Description: 旧件处理申请 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "旧件处理申请 查询条件", description = "旧件处理申请 查询条件")
public class AsOldparthandleApplyQuery implements Query {

16
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java

@ -25,28 +25,16 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldparthandleapply;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyVo.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo <br/>
* Description: 旧件处理申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "旧件处理申请 视图数据对象", description = "旧件处理申请 视图数据对象")
public class AsOldparthandleApplyVo implements Vo {

16
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java

@ -25,28 +25,16 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldpartreturnapply;
import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-as(旧件返厂) <br/>
* File: AsOldpartreturnApplyQuery.java <br/>
* Class: com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyQuery <br/>
* Description: 旧件返厂申请 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-17 10:29:49 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "旧件返厂申请 查询条件", description = "旧件返厂申请 查询条件")
public class AsOldpartreturnApplyQuery implements Query {

14
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmQuery.java

@ -25,26 +25,12 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldpartreturnconfirm;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-as(旧件返厂厂家确认) <br/>
* File: AsOldpartreturnConfirmQuery.java <br/>
* Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmQuery <br/>
* Description: 旧件返厂厂家确认 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-26 15:52:00 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "旧件返厂厂家确认 查询条件", description = "旧件返厂厂家确认 查询条件")
public class AsOldpartreturnConfirmQuery implements Query {

14
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmVo.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldpartreturnconfirm;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
@ -37,19 +36,6 @@ import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* Project: yxt-as(旧件返厂厂家确认) <br/>
* File: AsOldpartreturnConfirmVo.java <br/>
* Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo <br/>
* Description: 旧件返厂厂家确认 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-26 15:52:00 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "旧件返厂厂家确认 视图数据对象", description = "旧件返厂厂家确认 视图数据对象")
public class AsOldpartreturnConfirmVo implements Vo {

16
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.java

@ -38,25 +38,9 @@ import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo;
import java.util.List;
import java.util.Map;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyMapper.java <br/>
* Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyMapper <br/>
* Description: 旧件处理申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface AsOldparthandleApplyMapper extends BaseMapper<AsOldparthandleApply> {
//@Update("update as_oldparthandle_apply set name=#{msg} where id=#{id}")
//IPage<AsOldparthandleApplyVo> voPage(IPage<AsOldparthandleApply> page, @Param(Constants.WRAPPER) QueryWrapper<AsOldparthandleApply> qw);
IPage<AsOldparthandleApplyVo> selectPageVo(IPage<AsOldparthandleApply> page, @Param(Constants.WRAPPER) Wrapper<AsOldparthandleApply> qw);
List<AsOldparthandleApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsOldparthandleApply> qw);

13
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyRest.java

@ -47,19 +47,6 @@ import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDto;
import javax.validation.Valid;
import java.util.List;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyRest <br/>
* Description: 旧件处理申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "旧件处理申请")
@RestController
@RequestMapping("v1/asoldparthandleapply")

19
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java

@ -33,12 +33,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo;
import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
import com.yxt.anrui.as.api.asoldparthandleapply.flowable.*;
import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo;
import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDto;
import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApply;
import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyQuery;
import com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyVo;
import com.yxt.anrui.as.api.asoldpartreturnapply.flowable.*;
import com.yxt.anrui.as.biz.asoldparthandle.AsOldparthandleService;
import com.yxt.anrui.as.feign.base.billno.Rule;
import com.yxt.anrui.as.feign.flowable.flow.*;
@ -74,19 +68,6 @@ import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyService.java <br/>
* Class: com.yxt.anrui.as.biz.asoldparthandleapply.AsOldparthandleApplyService <br/>
* Description: 旧件处理申请 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthandleApplyMapper, AsOldparthandleApply> {

13
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java

@ -39,19 +39,6 @@ import org.apache.ibatis.annotations.Update;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-as(旧件返厂) <br/>
* File: AsOldpartreturnApplyMapper.java <br/>
* Class: com.yxt.anrui.as.biz.asoldpartreturnapply.AsOldpartreturnApplyMapper <br/>
* Description: 旧件返厂申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-17 10:29:50 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface AsOldpartreturnApplyMapper extends BaseMapper<AsOldpartreturnApply> {

2
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml

@ -12,7 +12,7 @@
FROM
as_oldpartreturn_apply aoa
LEFT JOIN as_oldpartreturn AS ao
ON aoa.`sid` = ao.`mainSid`
ON aoa.sid = ao.mainSid
LEFT JOIN as_oldpartreturn_confirm ac
ON aoa.billNo = ac.billNo
LEFT JOIN anrui_portal.sys_organization AS s ON aoa.deptSid = s.sid

7
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java

@ -205,6 +205,9 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
if (StringUtils.isNotBlank(query.getBillNo())){
qw.like("aoa.billNo",query.getBillNo());
}
if (StringUtils.isNotBlank(query.getConfirmResult())){
qw.like("ac.state",query.getConfirmResult());
}
qw.groupBy("aoa.sid");
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
@ -688,6 +691,10 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
for (AsOldpartreturnExcelInfo asOldpartreturnExcelInfo : resultList) {
AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(asOldpartreturnExcelInfo.getClaimBillNo());
AsOldpartreturnDetailsVo asOldpartreturnDetailsVo = asBusrepairInventorybillDetailService.selByGdSidAndOldCode(asBusclaimBill.getRepairBillSid(),asOldpartreturnExcelInfo.getGoodsSkuCode());
if (asOldpartreturnDetailsVo == null){
importReturn.setCheckInfo(asOldpartreturnExcelInfo.getVinNo() + "维修出/退库信息不存在");
break;
}
asOldpartreturnDetailsVo.setVinNo(asOldpartreturnExcelInfo.getVinNo());
asOldpartreturnDetailsVo.setSourceBillNo(asBusclaimBill.getRepairBillNo());
asOldpartreturnDetailsVo.setClaimBillNo(asOldpartreturnExcelInfo.getClaimBillNo());

13
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.java

@ -37,19 +37,6 @@ import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo;
import java.util.List;
/**
* Project: yxt-as(旧件返厂厂家确认) <br/>
* File: AsOldpartreturnConfirmMapper.java <br/>
* Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmMapper <br/>
* Description: 旧件返厂厂家确认. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-26 15:52:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface AsOldpartreturnConfirmMapper extends BaseMapper<AsOldpartreturnConfirm> {

2
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml

@ -12,7 +12,7 @@
FROM
as_oldpartreturn_confirm aoc
LEFT JOIN as_oldpartreturn_confirm_detail AS aod
ON aoc.`sid` = aod.`mainSid`
ON aoc.sid = aod.mainSid
LEFT JOIN anrui_portal.sys_organization AS s ON aoc.deptSid = s.sid
<where> ${ew.sqlSegment} </where>
</select>

13
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java

@ -38,19 +38,6 @@ import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo;
import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDetailsVo;
import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDto;
/**
* Project: yxt-as(旧件返厂厂家确认) <br/>
* File: AsOldpartreturnConfirmFeignFallback.java <br/>
* Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmRest <br/>
* Description: 旧件返厂厂家确认. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-26 15:52:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "旧件返厂厂家确认")
@RestController
@RequestMapping("v1/asoldpartreturnconfirm")

17
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java

@ -56,19 +56,6 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* Project: yxt-as(旧件返厂厂家确认) <br/>
* File: AsOldpartreturnConfirmService.java <br/>
* Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmService <br/>
* Description: 旧件返厂厂家确认 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-26 15:52:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartreturnConfirmMapper, AsOldpartreturnConfirm> {
@ -138,6 +125,9 @@ public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartr
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("aoc.billNo", query.getBillNo());
}
if (StringUtils.isNotBlank(query.getConfirmResult())) {
qw.like("aoc.state", query.getConfirmResult());
}
qw.groupBy("aoc.sid");
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
@ -208,6 +198,7 @@ public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartr
}
AsOldpartreturnConfirm entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setState(2);
baseMapper.updateById(entity);
}

4
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryHandleSelectList.java

@ -39,6 +39,10 @@ public class WmsInventoryHandleSelectList {
private String warehouseSid;
//仓库名称
private String warehouseName;
//库区sid
private String warehouseAreaSid;
//库区名称
private String warehouseAreaName;
//库位sid
private String warehouseRackSid;
//库位编码

10
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@ -328,11 +328,13 @@
wi.goodsSkuOwnSpec,
wi.manufacturerSid,
wi.manufacturerName,
wi.billObjSid AS supplierSid,
wi.billObjName AS supplierName,
wi.supplierSid,
wi.supplierName,
wi.unit,
wi.warehouseSid,
wi.warehouseName,
wa.sid AS warehouseAreaSid,
wa.areaName AS warehouseAreaName,
wi.warehouseRackSid,
wi.warehouseRackCode,
wi.count,
@ -341,6 +343,10 @@
av.vinNo
FROM
wms_inventory wi
LEFT JOIN wms_warehouse_rack wr
ON wi.warehouseRackSid = wr.sid
LEFT JOIN wms_warehouse_area wa
ON wr.locationSid = wa.sid
LEFT JOIN yxt_4sas.as_busrepair_inventorybill_detail ad
ON wi.sid = ad.oldInventorySid
LEFT JOIN yxt_4sas.as_busrepair_inventorybill ai

Loading…
Cancel
Save