Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 days ago
parent
commit
412f16a4f0
  1. 663
      yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue
  2. 317
      yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue
  3. 175
      yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue
  4. 717
      yxt-as-ui/src/views/storage/oldPartsFactory/index.vue
  5. 172
      yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue
  6. 497
      yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue
  7. 178
      yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue
  8. 642
      yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue
  9. 282
      yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue
  10. 293
      yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue
  11. 35
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java
  12. 32
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java
  13. 32
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java
  14. 51
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApply.java
  15. 46
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java
  16. 46
      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. 20
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandleapply/AsOldparthandleApplyVo.java
  19. 18
      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. 28
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.java
  23. 173
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyRest.java
  24. 941
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyService.java
  25. 27
      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. 57
      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

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

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="viewState == 1"> <div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="旧件返厂确认管理" :btndisabled="btndisabled" @btnhandle="btnHandle" /> <button-bar ref="btnbar" view-title="旧件返厂确认管理" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content"> <div class="main-content">
<div class="searchcon"> <div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow"> <el-button size="small" class="searchbtn" @click="clicksearchShow">
@ -10,40 +10,33 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header"> <el-form :inline="true" class="tab-header">
<el-form-item label="分公司"> <el-form-item label="分公司">
<el-input v-model="queryParams.params.useOrgName" placeholder="" clearable /> <el-input v-model="queryParams.params.useOrgName" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="申请部门"> <el-form-item label="申请部门">
<el-input v-model="queryParams.params.deptName" placeholder="" clearable /> <el-input v-model="queryParams.params.deptName" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="申请人"> <el-form-item label="申请人">
<el-input v-model="queryParams.params.createByName" placeholder="" clearable /> <el-input v-model="queryParams.params.createByName" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="单据编号"> <el-form-item label="单据编号">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable /> <el-input v-model="queryParams.params.billNo" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="单据日期"> <el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" <el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"> <span style="padding: 0 8px"></span>
</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 v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="办结日期"> <el-form-item label="办结日期">
<el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期" <el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"> <span style="padding: 0 8px"></span>
</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 v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="厂家确认结果"> <el-form-item label="厂家确认结果">
<el-select v-model="queryParams.params.billState" placeholder="请选择"> <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 v-for="(item,i) in confirmResultsList" :key="i" :label="item.name" :value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item>
</el-form> </el-form>
<div class="btn" style="text-align: center;"> <div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
@ -58,481 +51,257 @@
<!-- End 项目列表头部 --> <!-- End 项目列表头部 -->
<!-- Start 项目列表 --> <!-- Start 项目列表 -->
<div class=""> <div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
@selection-change="selectionLineChangeHandle"> <el-table-column fixed width="50" type="selection" align="center"/>
<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 width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="100"> <el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope"> <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> <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="nodeState" label="流程状态" align="center" /> <el-table-column prop="nodeState" label="流程状态" align="center"/>
<el-table-column prop="billNo" label="单据编号" width="180" 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="useOrgName" label="分公司" width="120" align="center"/>
<el-table-column prop="deptName" 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="createByName" label="申请人" align="center"/>
<el-table-column prop="createTime" label="申请日期" align="center" /> <el-table-column prop="createTime" label="申请日期" align="center"/>
<el-table-column prop="needReturnCount" label="应返厂数量合计" width="180" 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 prop="actualReturnCount" label="实际返厂数量合计" width="180" align="center"/>
<el-table-column label="附件" align="center" width="100"> <el-table-column label="附件" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;" @click="showAdjunct(scope.row.filePaths)">查看 <div style="color: #1890FF; text-decoration: underline ;" @click="showAdjunct(scope.row.filePaths)">查看
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="confirmCount" 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)">
{{ scope.row.confirmResult }}
</div>
</template>
</el-table-column> -->
</el-table> </el-table>
</div> </div>
<!-- End 项目列表 --> <!-- End 项目列表 -->
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit"/>
<!-- 翻页 --> <!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" <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="loadList" />
</div> </div>
</div> </div>
</div> </div>
<!-- End 查询和其列表部分 --> <!-- 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" /> <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
<el-dialog title="附件" :visible.sync="dialogVisible" :before-close="handleClose"> <el-dialog title="附件" :visible.sync="dialogVisible" :before-close="handleClose">
<el-form ref="dataForm1" class="formadd" style="margin-top: -30px;"> <el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
<el-row class="first_row"> <el-row class="first_row">
<el-col :span="24" class="trightb"> <el-col :span="24" class="trightb">
<el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;" <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]">
v-for="(item,index) in fileList" :src="item" :preview-src-list="[item]">
</el-image> </el-image>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-dialog> </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> </div>
</template> </template>
<script> <script>
import req from '@/api/storage/manufacturerconfirm.js' import req from '@/api/storage/manufacturerconfirm.js'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination' 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 divInfo from './manufacturerconfirmInfo.vue'
import uploadImg from '@/components/uploadFile/uploadImg' export default {
export default {
components: {
components: { ButtonBar,
ButtonBar, Pagination,
Pagination, divAdd,
pageye, divInfo
divAdd, },
divInfo, data() {
uploadImg return {
}, dialogVisible: false,
data() { fileList: [],
return { btndisabled: false,
dialogVisible: false, viewState: 1, // 1 2 3 4
dialogVisible2: false, isSearchShow: false,
dialogVisible3: false, searchxianshitit: '显示查询条件',
fileList: [], tableLoading: false,
orderInfo: { dataList: [],
filePaths: [] btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '厂家确认'
}, },
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '厂家确认'
},
{ {
type: 'info', type: 'info',
size: 'small', size: 'small',
icon: 'cross', icon: 'cross',
btnKey: 'doClose', btnKey: 'doClose',
btnLabel: '关闭' btnLabel: '关闭'
} }
], ],
queryParams: { queryParams: {
current: 1, current: 1,
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
name: '' useOrgName: '',
} deptName: '',
createByName: '',
billNo: '',
createStartTime: '',
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
confirmResult: '',
userSid: '',
orgPath: '',
menuUrl: ''
}
},
sids: [],
selectionList: [],
confirmResultsList: [
{
name: '未确认',
sid: '1'
}, },
sids: [], {
selectionList: [], name: '已确认',
confirmResultsList: [{ sid: '2'
name: "一致", }
sid: "1" ]
}, }
{ },
name: "不一致", mounted() {
sid: "2" this.$refs['btnbar'].setButtonList(this.btnList)
} },
], created() {
pathList: [], this.loadList()
imgList: [] },
} methods: {
handleClose() {
this.dialogVisible = false
}, },
mounted() { showAdjunct(paths) {
this.$refs['btnbar'].setButtonList(this.btnList) this.fileList = paths
this.dialogVisible = true
}, },
created() { selectionLineChangeHandle(val) {
this.loadList() this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
}, },
methods: { //
handleClose() { clicksearchShow() {
this.dialogVisible = false this.isSearchShow = !this.isSearchShow
}, if (this.isSearchShow) {
handleClose2() { this.searchxianshitit = '隐藏查询条件'
this.dialogVisible2 = false } else {
}, this.searchxianshitit = '显示查询条件'
handleClose3() { }
this.dialogVisible3 = false },
}, btnHandle(btnKey) {
showAdjunct(paths) { switch (btnKey) {
this.fileList = paths case 'toAdd':
this.dialogVisible = true this.toAdd()
}, break
saveResult() { case 'doClose':
console.log("saveResult", this.orderInfo); this.doClose()
break
req.saveConfirmResult(this.orderInfo).then((resp) => { default:
break
}
this.dialogVisible3 = false },
this.orderInfo = { loadList() {
filePaths: [] this.tableLoading = true
} this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.loadList() this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
}).catch(() => { this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
}) this.tableLoading = false
if (resp.success) {
}, const data = resp.data
showResult(row) { this.queryParams.total = data.total
this.dataList = data.records
if (row.confirmResult == '未确认') {
this.$message({
type: 'warning',
showClose: true,
message: '厂家暂未确认'
})
} else { } else {
// resp.code
req.fetchDetailsByMainSid(row.sid).then((resp) => { this.dataList = []
this.queryParams.total = 0
console.log("fetchDetailsByMainSid", resp);
this.orderInfo = resp.data
this.dialogVisible2 = true
}).catch(() => {
})
} }
}).catch(() => {
this.tableLoading = false
})
},
//
}, indexMethod(index) {
selectionLineChangeHandle(val) { var pagestart = (this.queryParams.current - 1) * this.queryParams.size
console.log("val", val); var pageindex = index + 1 + pagestart
return pageindex
this.selectionList = val },
const aa = [] dosearch() {
val.forEach(element => { this.queryParams.current = 1
aa.push(element.sid) this.loadList()
}) },
this.sids = aa resetQuery() {
this.queryParams = {
}, current: 1,
// size: 10,
clicksearchShow() { total: 0,
this.isSearchShow = !this.isSearchShow params: {
if (this.isSearchShow) { useOrgName: '',
this.searchxianshitit = '隐藏查询条件' deptName: '',
} else { createByName: '',
this.searchxianshitit = '显示查询条件' billNo: '',
} createStartTime: '',
}, createEndTime: '',
btnHandle(btnKey) { finishStartTime: '',
switch (btnKey) { finishEndTime: '',
case 'doDel': confirmResult: '',
this.doDel() userSid: '',
break orgPath: '',
case 'toAdd': menuUrl: ''
this.toAdd()
break
case 'doClose':
this.doClose()
break
default:
break
} }
}, }
loadList() { this.loadList()
this.tableLoading = true },
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid') toAdd() {
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') if (this.sids.length === 1) {
this.queryParams.params.menuUrl = this.$route.path this.viewState = 2
req.listPage(this.queryParams).then((resp) => { this.$refs['divadd'].showAdd(this.sids[0])
this.tableLoading = false } else {
if (resp.success) { this.$message({
const data = resp.data type: 'warning',
this.queryParams.total = data.total showClose: true,
this.dataList = data.records message: '请选择一条记录'
} else {
// resp.code
this.dataList = []
this.queryParams.total = 0
}
}).catch(() => {
this.tableLoading = false
}) })
},
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
return pageindex
},
dosearch() {
this.queryParams.current = 1
this.loadList()
},
resetQuery() {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
name: ''
}
}
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]
this.viewState = 2
this.$refs['divadd'].showAdd(this.sids[0])
} else {
this.$message({
type: 'warning',
showClose: true,
message: '请选择一条记录'
})
}
},
toEdit(row) {
this.viewState = 3
this.$refs['divadd'].showEdit(row)
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toRelevancy(row) {
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)
}
} }
},
toEdit(row) {
this.viewState = 3
this.$refs['divadd'].showEdit(row)
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toRelevancy(row) {
this.viewState = 4
this.$refs['divinfo'].showEdit(row)
},
resetState() {
this.viewState = 1
} }
} }
}
</script> </script>
<style scoped> <style scoped>
</style> </style>

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

@ -1,30 +1,15 @@
<template> <template>
<div> <div class="app-container">
<div class="tab-header webtop"> <div class="tab-header webtop">
<!-- 标题 --> <div>{{ title }}厂家确认</div>
<div>{{title}}厂家确认</div>
<!-- start 添加修改按钮 -->
<div> <div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">确认</el-button> <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">确认</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div> </div>
<div class="listconadd"> <div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row"> <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"> <el-col :span="8">
<div class="span-sty">申请人</div> <div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -33,7 +18,6 @@
<div class="span-sty">申请部门</div> <div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请日期</div> <div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
@ -43,204 +27,163 @@
<el-col :span="24"> <el-col :span="24">
<div class="span-sty"><span class="must">*</span> 附件</div> <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-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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" <el-form-item>
type="textarea" :rows="4" clearable /> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="4" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">已返厂旧件列表</div>
<div class="title" <el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" border style="width: 100%;" :row-style="{height: '40px'}">
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;"> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<div>已返厂旧件列表</div> <el-table-column label="商品名称" prop="goodsSpuName" align="center"/>
</div> <el-table-column label="商品编码" prop="goodsSkuCode" align="center"/>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" border <el-table-column label="厂家" prop="manufacturerName" align="center"/>
style="width: 100%;" :row-style="{height: '40px'}"> <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column label="单位" prop="unit" align="center"/>
<el-table-column label="商品名称" prop="goodsSpuName" align="center" /> <el-table-column label="车架号" prop="vinNo" align="center"/>
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" /> <el-table-column label="维修单号" prop="sourceBillNo" align="center"/>
<el-table-column label="厂家" prop="manufacturerName" align="center" /> <el-table-column label="索赔单号" prop="claimBillNo" align="center"/>
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" /> <el-table-column label="需返厂数量" prop="needReturnCount" align="center"/>
<el-table-column label="单位" prop="unit" align="center" /> <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center"/>
<el-table-column label="车架号" prop="vinNo" align="center" /> <el-table-column label="差异说明" prop="remarks" 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"> <el-table-column label="确认数量" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.confirmCount" clearable placeholder="" <el-input ref="focusAssumptionInput" v-model="scope.row.confirmCount" clearable placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" @input="commodityComputeYHAndXSJE(scope.row)"/>
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" @input="commodityComputeYHAndXSJE(scope.row)" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-form> </el-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/storage/manufacturerconfirm.js' import req from '@/api/storage/manufacturerconfirm.js'
import uploadImg from '@/components/uploadFile/uploadImg' import uploadImg from '@/components/uploadFile/uploadImg'
export default {
components: { export default {
uploadImg components: {
}, uploadImg
data() { },
return { data() {
listLoading: false, return {
submitdisabled: false, listLoading: false,
title: "新增", submitdisabled: false,
formobj: {}, title: '新增',
imgList: [], formobj: {},
rules: { imgList: [],
filePaths: [{ rules: {
required: true, filePaths: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
message: '附件不能为空',
trigger: 'blur'
}],
}
} }
}
},
methods: {
indexMethod(index) {
return index + 1
}, },
methods: {
indexMethod(index) {
return index + 1
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.imgList = []
this.submitdisabled = false
this.$emit('doback')
},
showAdd(sid) { handleReturn(isreload) {
this.$nextTick(() => { if (isreload === 'true') this.$emit('reloadlist')
this.$refs['form_obj'].clearValidate() this.imgList = []
}) this.submitdisabled = false
req.init(sid) this.$emit('doback')
.then(resp => { },
if (resp.success) { showAdd(sid) {
this.formobj = resp.data this.$nextTick(() => {
for (var i = 0; i < resp.data.filePaths.length; i++) { this.$refs['form_obj'].clearValidate()
this.imgList.push({ })
url: resp.data.filePaths[i] req.init(sid).then(resp => {
}) if (resp.success) {
} this.formobj = resp.data
} for (var i = 0; i < resp.data.filePaths.length; i++) {
}) this.imgList.push({
.catch(e => { url: resp.data.filePaths[i]
this.formobj = {} })
}) }
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
var params = {
sid: row.sid
} }
req.init(row.sid) }).catch(e => {
.then(resp => { this.formobj = {}
if (resp.success) { })
this.formobj = resp.data },
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.init(row.sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
}
}).catch(e => {
this.formobj = {}
})
},
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
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
}) })
.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
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
})
}
})
},
} }
} }
}
</script> </script>
<style scoped> <style scoped>
/deep/ .el-form-item__error { /deep/ .el-form-item__error {
margin-left: 120px !important; margin-left: 120px !important;
} }
.must { .must {
color: #f00; color: #f00;
} }
.span-sty { .span-sty {
width: 130px !important; width: 130px !important;
} }
.addinputInfo { .addinputInfo {
margin-left: 120px !important; margin-left: 120px !important;
} }
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw { .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important; margin-left: 120px !important;
width: calc(100% - 115px); width: calc(100% - 115px);
} }
.first_row { .first_row {
border-top: 1px solid #E0E3EB; border-top: 1px solid #E0E3EB;
} }
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style> </style>

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

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

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

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="viewState == 1"> <div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="旧件返厂管理" :btndisabled="btndisabled" @btnhandle="btnHandle" /> <button-bar ref="btnbar" view-title="旧件返厂管理" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content"> <div class="main-content">
<div class="searchcon"> <div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow"> <el-button size="small" class="searchbtn" @click="clicksearchShow">
@ -10,40 +10,33 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header"> <el-form :inline="true" class="tab-header">
<el-form-item label="分公司"> <el-form-item label="分公司">
<el-input v-model="queryParams.params.useOrgName" placeholder="" clearable /> <el-input v-model="queryParams.params.useOrgName" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="申请部门"> <el-form-item label="申请部门">
<el-input v-model="queryParams.params.deptName" placeholder="" clearable /> <el-input v-model="queryParams.params.deptName" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="申请人"> <el-form-item label="申请人">
<el-input v-model="queryParams.params.createByName" placeholder="" clearable /> <el-input v-model="queryParams.params.createByName" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="单据编号"> <el-form-item label="单据编号">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable /> <el-input v-model="queryParams.params.billNo" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="单据日期"> <el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" <el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"> <span style="padding: 0 8px"></span>
</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 v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="办结日期"> <el-form-item label="办结日期">
<el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期" <el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"> <span style="padding: 0 8px"></span>
</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 v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="厂家确认结果"> <el-form-item label="厂家确认结果">
<el-select v-model="queryParams.params.billState" placeholder="请选择"> <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 v-for="(item,i) in confirmResultsList" :key="i" :label="item.name" :value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item>
</el-form> </el-form>
<div class="btn" style="text-align: center;"> <div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
@ -58,14 +51,12 @@
<!-- End 项目列表头部 --> <!-- End 项目列表头部 -->
<!-- Start 项目列表 --> <!-- Start 项目列表 -->
<div class=""> <div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
@selection-change="selectionLineChangeHandle"> <el-table-column fixed width="50" type="selection" align="center"/>
<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 width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="180"> <el-table-column fixed label="操作" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" :disabled="scope.row.nodeState!='待提交'" <el-button type="primary" size="mini" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true" @click="toEdit(scope.row)">办理</el-button>
@click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button> <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -75,445 +66,337 @@
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span> <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="billNo" label="单据编号" width="180" 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="useOrgName" label="分公司" width="120" align="center"/>
<el-table-column prop="deptName" label="申请部门" width="120" align="center" /> <el-table-column prop="deptName" label="申请部门" width="120" align="center"/>
<el-table-column prop="createByName" label="申请人" width="100" 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="createTime" label="申请日期" width="120" align="center"/>
<el-table-column prop="needReturnCount" label="应返厂数量合计" width="180" 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 prop="actualReturnCount" label="实际返厂数量合计" width="180" align="center"/>
<el-table-column label="附件" align="center" width="100"> <el-table-column label="附件" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;cursor: pointer;" <span class="bluezi" @click="showAdjunct(scope.row.filePaths)">查看</span>
@click="showAdjunct(scope.row.filePaths)">查看
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="返厂情况" prop="state" align="center" width="100" /> <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"> <el-table-column label="厂家确认情况" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;cursor: pointer;" <span class="bluezi" v-show="scope.row.confirmSid!=''" @click="showDetail(scope.row)">查看</span>
v-show="scope.row.confirmSid!=''" @click="showDetail(scope.row)">
查看
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<!-- End 项目列表 --> <!-- End 项目列表 -->
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit"/>
<!-- 翻页 --> <!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" <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="loadList" />
</div> </div>
</div> </div>
</div> </div>
<!-- End 查询和其列表部分 --> <!-- 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" /> <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
<manufacturerconfirmInfo v-show="viewState == 5" ref="manufacturerconfirmInfo" @doback="resetState" <manufacturerconfirmInfo v-show="viewState == 5" ref="manufacturerconfirmInfo" @doback="resetState" @reloadlist="loadList"/>
@reloadlist="loadList" />
<el-dialog title="附件" :visible.sync="dialogVisible" :before-close="handleClose"> <el-dialog title="附件" :visible.sync="dialogVisible" :before-close="handleClose">
<el-form ref="dataForm1" class="formadd" style="margin-top: -30px;"> <el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
<el-row class="first_row"> <el-row class="first_row">
<el-col :span="24" class="trightb"> <el-col :span="24" class="trightb">
<el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;" <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]">
v-for="(item,index) in fileList" :src="item" :preview-src-list="[item]">
</el-image> </el-image>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-dialog> </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="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center> <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
:src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/storage/oldPartsFactory.js' import req from '@/api/storage/oldPartsFactory.js'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye' import divAdd from './oldPartsFactoryAdd.vue'
import divAdd from './oldPartsFactoryAdd.vue' import divInfo from './oldPartsFactoryInfo.vue'
import divInfo from './oldPartsFactoryInfo.vue' import manufacturerconfirmInfo from '../manufacturerconfirm/manufacturerconfirmInfo'
import manufacturerconfirmInfo from './manufacturerconfirmInfo.vue' import { getStorage } from '@/utils/auth'
import {
getStorage
} from '@/utils/auth'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divAdd,
divInfo,
manufacturerconfirmInfo
},
data() {
return {
url: '',
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: [{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
}, {
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{ export default {
type: 'info', components: {
size: 'small', ButtonBar,
icon: 'cross', Pagination,
btnKey: 'doClose', divAdd,
btnLabel: '关闭' divInfo,
} manufacturerconfirmInfo
], },
queryParams: { data() {
current: 1, return {
size: 10, url: '',
total: 0, dialogHeight: '80%',
params: { centerDialogVisible: false,
"useOrgName": "", dialogVisible: false,
"deptName": "", fileList: [],
"createByName": "", btndisabled: false,
"billNo": "", viewState: 1, // 1 2 3 4
"createStartTime": "", isSearchShow: false,
"createEndTime": "", searchxianshitit: '显示查询条件',
"finishStartTime": "", tableLoading: false,
"finishEndTime": "", dataList: [],
"billState": "", btnList: [
"userSid": "", {
"orgPath": "", type: 'primary',
"menuUrl": "", size: 'small',
"menuSid": "" icon: 'plus',
} btnKey: 'toAdd',
btnLabel: '新增'
}, {
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
}, },
sids: [],
selectionList: [], {
confirmResultsList: [{ type: 'info',
name: "一致", size: 'small',
sid: "1" icon: 'cross',
}, btnKey: 'doClose',
{ btnLabel: '关闭'
name: "不一致",
sid: "2"
}
],
pathList: []
}
},
mounted() {
// vuewindowpostMessagehandleMessage
window.addEventListener('message', this.handleMessage)
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.loadList()
},
methods: {
async handleMessage(event) {
var code = ''
if (event.data.params !== null && event.data.params !== undefined) {
code = event.data.params.code
} }
if (code === 1) { ],
this.centerDialogVisible = false queryParams: {
} else if (code === 2) { current: 1,
this.dialogHeight = event.data.params.data size: 10,
this.setIframeHeight(document.getElementById('iframe')) total: 0,
params: {
useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createStartTime: '',
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
confirmResult: '',
userSid: '',
orgPath: '',
menuUrl: '',
menuSid: ''
} }
}, },
closeIt() { sids: [],
this.url = '' selectionList: [],
this.centerDialogVisible = false confirmResultsList: [
}, {
setIframeHeight(iframe) { name: '未确认',
iframe.height = this.dialogHeight sid: '1'
}, },
flowRecord(row) { {
this.centerDialogVisible = true name: '已确认',
var params = { sid: '2'
deployId: row.procDefId,
procInsId: row.procInstId,
token: getStorage()
} }
this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) ]
}, }
handleClose() { },
this.dialogVisible = false mounted() {
}, // vuewindowpostMessagehandleMessage
handleClose2() { window.addEventListener('message', this.handleMessage)
this.dialogVisible2 = false this.$refs['btnbar'].setButtonList(this.btnList)
}, },
showAdjunct(paths) { created() {
this.fileList = paths this.loadList()
this.dialogVisible = true },
}, methods: {
showDetail(row) { async handleMessage(event) {
var code = ''
if (event.data.params !== null && event.data.params !== undefined) {
this.viewState = 5 code = event.data.params.code
this.$refs['manufacturerconfirmInfo'].showEdit(row.confirmSid) }
}, if (code === 1) {
showResult(row) { this.centerDialogVisible = false
} else if (code === 2) {
if (row.confirmResult == '未确认') { this.dialogHeight = event.data.params.data
this.$message({ this.setIframeHeight(document.getElementById('iframe'))
type: 'warning', }
showClose: true, },
message: '厂家暂未确认' closeIt() {
}) this.url = ''
this.centerDialogVisible = false
},
setIframeHeight(iframe) {
iframe.height = this.dialogHeight
},
flowRecord(row) {
this.centerDialogVisible = true
var params = {
deployId: row.procDefId,
procInsId: row.procInstId,
token: getStorage()
}
this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
},
handleClose() {
this.dialogVisible = false
},
showAdjunct(paths) {
this.fileList = paths
this.dialogVisible = true
},
showDetail(row) {
this.viewState = 5
this.$refs['manufacturerconfirmInfo'].showEdit(row.confirmSid)
},
selectionLineChangeHandle(val) {
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
switch (btnKey) {
case 'doDel':
this.doDel()
break
case 'toAdd':
this.toAdd()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
} else { } else {
req.fetchDetailsByMainSid(row.sid).then((resp) => { // resp.code
this.dataList = []
console.log("fetchDetailsByMainSid", resp); this.queryParams.total = 0
this.orderInfo = resp.data
this.dialogVisible2 = true
}).catch(() => {
})
} }
}).catch(() => {
this.tableLoading = false
})
},
}, //
selectionLineChangeHandle(val) { indexMethod(index) {
console.log("val", val); var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
this.selectionList = val return pageindex
const aa = [] },
val.forEach(element => { dosearch() {
aa.push(element.sid) this.queryParams.current = 1
}) this.loadList()
this.sids = aa },
resetQuery() {
}, this.queryParams = {
// current: 1,
clicksearchShow() { size: 10,
this.isSearchShow = !this.isSearchShow total: 0,
if (this.isSearchShow) { params: {
this.searchxianshitit = '隐藏查询条件' useOrgName: '',
} else { deptName: '',
this.searchxianshitit = '显示查询条件' createByName: '',
} billNo: '',
}, createStartTime: '',
btnHandle(btnKey) { createEndTime: '',
switch (btnKey) { finishStartTime: '',
case 'doDel': finishEndTime: '',
this.doDel() confirmResult: '',
break userSid: '',
case 'toAdd': orgPath: '',
this.toAdd() menuUrl: '',
break menuSid: ''
case 'doClose':
this.doClose()
break
default:
break
} }
}, }
loadList() { this.loadList()
this.tableLoading = true },
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid') doDel() {
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') if (this.sids.length > 0) {
this.queryParams.params.menuUrl = this.$route.path const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
req.listPage(this.queryParams).then((resp) => { this.$confirm(tip, '提示', {
this.tableLoading = false confirmButtonText: '确定',
if (resp.success) { cancelButtonText: '取消',
const data = resp.data type: 'warning'
this.queryParams.total = data.total }).then(() => {
this.dataList = data.records const loading = this.$loading({
} else { lock: true,
// resp.code text: 'Loading',
this.dataList = [] spinner: 'el-icon-loading',
this.queryParams.total = 0 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(() => { }).catch(() => {
this.tableLoading = false
}) })
}, } else {
this.$message({
// showClose: true,
indexMethod(index) { message: '请至少选择一条记录进行删除操作'
var pagestart = (this.queryParams.current - 1) * this.queryParams.size })
var pageindex = index + 1 + pagestart }
return pageindex },
}, toAdd() {
dosearch() { this.viewState = 2
this.queryParams.current = 1 this.$refs['divadd'].showAdd()
this.loadList() },
}, toEdit(row) {
resetQuery() { this.viewState = 3
this.queryParams = { this.$refs['divadd'].showEdit(row)
current: 1, },
size: 10, doClose() {
total: 0, this.$store.dispatch('tagsView/delView', this.$route)
params: { this.$router.go(-1)
"useOrgName": "", },
"deptName": "", toRelevancy(row) {
"createByName": "", this.viewState = 4
"billNo": "", this.$refs['divinfo'].showEdit(row)
"createStartTime": "", },
"createEndTime": "", resetState() {
"finishStartTime": "", this.viewState = 1
"finishEndTime": "",
"billState": "",
"userSid": "",
"orgPath": "",
"menuUrl": "",
"menuSid": ""
}
}
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({
showClose: true,
message: '请至少选择一条记录进行删除操作'
})
}
},
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)
},
toRelevancy(row) {
this.viewState = 4
this.$refs['divinfo'].showEdit(row)
},
resetState() {
this.viewState = 1
},
} }
} }
}
</script> </script>
<style scoped> <style scoped>
</style> </style>

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>

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

@ -1,28 +1,18 @@
<template> <template>
<div> <div class="app-container">
<div class="tab-header webtop"> <div class="tab-header webtop">
<!-- 标题 -->
<div>{{title}}旧件返厂申请</div> <div>{{title}}旧件返厂申请</div>
<!-- start 添加修改按钮 -->
<div> <div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="importDetail">导入厂家返件明细</el-button> <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="saveOrUpdate">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit">提交</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> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div> </div>
<div class="listconadd"> <div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="first_row"> <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"> <el-col :span="8">
<div class="span-sty">申请人</div> <div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -33,102 +23,41 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请日期</div> <div class="span-sty">申请日期</div>
<el-form-item prop="createTime"> <el-form-item>
<span class="addinputInfo">{{ formobj.createTime }}</span> <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-form-item>
</el-col> </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-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"> <el-col :span="24">
<div class="span-sty"><span class="must">*</span> 附件</div> <div class="span-sty"><span class="must">*</span> 附件</div>
<el-form-item prop="filePaths"> <el-form-item prop="filePaths">
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map" <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item> <el-form-item>
<el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="4" clearable />
:rows="4" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title titleOne"> <div class="title titleOne">
<div>返厂旧件列表</div> <div>返厂旧件列表</div>
<el-button type="primary" size="mini" @click="seleGoods3()">添加</el-button> <el-button type="primary" size="mini" @click="seleGoods3()">添加</el-button>
</div> </div>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border> <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 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"> <el-table-column fixed label="操作" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" :disabled="scope.row.isCf=='否'" <el-button type="primary" size="mini" :disabled="scope.row.isCf=='否'" @click="delGoods(scope.$index)">删除</el-button>
@click="delGoods(scope.$index)">删除</el-button>
<el-button type="primary" size="mini" @click="seleGoods(scope.row)">选择旧件</el-button> <el-button type="primary" size="mini" @click="seleGoods(scope.row)">选择旧件</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodsSpuName" label="商品名称" 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="manufacturerName" label="厂家" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" /> <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="unit" label="单位" align="center" />
@ -144,9 +73,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="isCf" label="是否迟返" align="center" /> <el-table-column prop="isCf" label="是否迟返" align="center" />
</el-table> </el-table>
</el-form> </el-form>
</div> </div>
<!-- 导入 --> <!-- 导入 -->
@ -156,9 +83,19 @@
</div> </div>
<el-card class="box-card"> <el-card class="box-card">
<div> <div>
<el-upload ref="upload" class="upload-demo" accept=".xls,.xlsx" name="file" :action="updateAction" <el-upload
:on-success="handleSuccess" :file-list="fileList" :auto-upload="false" :multiple="false" :limit="1" ref="upload"
:data="uploadData" :headers="headers"> 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 slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传</el-button> <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传</el-button>
</el-upload> </el-upload>
@ -176,16 +113,13 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="选择旧件" :visible.sync="dialogVisible2" :before-close="handleClose2" <el-dialog title="选择旧件" :visible.sync="dialogVisible2" :before-close="handleClose2" style="width:150%;margin-left: -20%;">
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 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="50" type="selection" align="center" />
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" 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="goodsID" label="商品ID" align="center" />
<el-table-column prop="goodsSpuName" label="商品名称" 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="manufacturerName" label="厂家" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" /> <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="unit" label="单位" align="center" />
@ -204,22 +138,15 @@
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit" />
<!-- 翻页 --> <!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="seleGoods" />
:limit.sync="queryParams.size" class="pagination" @pagination="seleGoods" />
</div> </div>
<div class="btn" style="text-align: center; margin-top: 20px;"> <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="addDialogList()">确认</el-button>
<el-button type="primary" size="mini" @click="handleClose2()">关闭</el-button> <el-button type="primary" size="mini" @click="handleClose2()">关闭</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="选择旧件" :visible.sync="dialogVisible3" :before-close="handleClose3" style="width:150%;margin-left: -20%;">
<el-dialog title="选择旧件" :visible.sync="dialogVisible3" :before-close="handleClose3" <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%;margin-top: -20px;" @selection-change="selectionLineChangeHandle3">
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="50" type="selection" align="center" />
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" 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="goodsID" label="商品ID" align="center" />
@ -230,9 +157,7 @@
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="unit" label="单位" align="center" />
<el-table-column label="仓库-库区" align="center" width="150"> <el-table-column label="仓库-库区" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <span>{{scope.row.warehouseName}} - {{scope.row.warehouseAreaName}}</span>
{{scope.row.warehouseName}} - {{scope.row.warehouseAreaName}}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="warehouseRackName" label="库位" align="center" /> <el-table-column prop="warehouseRackName" label="库位" align="center" />
@ -243,20 +168,13 @@
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit" />
<!-- 翻页 --> <!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="seleGoods3" />
:limit.sync="queryParams.size" class="pagination" @pagination="seleGoods3" />
</div> </div>
<div class="btn" style="text-align: center; margin-top: 20px;"> <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="addDialogList3()">确认</el-button>
<el-button type="primary" size="mini" @click="handleClose3()">关闭</el-button> <el-button type="primary" size="mini" @click="handleClose3()">关闭</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -293,29 +211,25 @@
listLoading: false, listLoading: false,
submitdisabled: false, submitdisabled: false,
formobj: { formobj: {
"sid": "", sid: '',
"remarks": "", remarks: '',
"createBySid": window.sessionStorage.getItem('userSid'), createBySid: window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'), createByName: window.sessionStorage.getItem('name'),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
.getItem('defaultOrgPath').lastIndexOf('/') + 1), deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window createTime: getCurrentDate(),
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), billNo: '',
"createTime": getCurrentDate(), filePaths: [],
"billNo": "", useOrgSid: '',
"filePaths": [], useOrgName: '',
"useOrgSid": '', orgSidPath: window.sessionStorage.getItem('orgSidPath'),
"useOrgName": '', procDefId: '',
"orgSidPath": window.sessionStorage.getItem('orgSidPath'), nodeId: '',
"procDefId": "", procInstId: '',
"nodeId": "", nodeState: '',
"procInstId": "", taskId: '',
"nodeState": "", finishTime: '',
"taskId": "", asOldpartreturnList: []
"finishTime": "",
"asOldpartreturnList": [
]
}, },
imgList: [], imgList: [],
dataList: [], dataList: [],
@ -328,23 +242,14 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
"vinNo": "", vinNo: '',
"goodsSkuCode": "", goodsSkuCode: '',
"sourceBillNo": "", sourceBillNo: '',
"orgPath": "", orgPath: ''
} }
}, },
rules: { rules: {
createTime: [{ filePaths: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
required: true,
message: '申请日期不能为空',
trigger: 'change'
}],
filePaths: [{
required: true,
message: '附件不能为空',
trigger: 'blur'
}],
} }
} }
}, },
@ -366,8 +271,6 @@
this.dialogVisible = true this.dialogVisible = true
}, },
saveOrUpdate() { saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
if (valid) { if (valid) {
this.submitdisabled = true this.submitdisabled = true
@ -389,7 +292,6 @@
}) })
}, },
submit() { submit() {
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
if (valid) { if (valid) {
this.submitdisabled = true this.submitdisabled = true
@ -409,74 +311,57 @@
}) })
} }
}) })
}, },
handleReturn(isreload) { handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist') if (isreload === 'true') this.$emit('reloadlist')
this.imgList = [] this.imgList = []
this.formobj = { this.formobj = {
"sid": "", sid: '',
"remarks": "", remarks: '',
"createBySid": window.sessionStorage.getItem('userSid'), createBySid: window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'), createByName: window.sessionStorage.getItem('name'),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
.getItem('defaultOrgPath').lastIndexOf('/') + 1), deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window createTime: getCurrentDate(),
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), billNo: '',
"createTime": getCurrentDate(), filePaths: [],
"billNo": "", useOrgSid: '',
"filePaths": [], useOrgName: '',
"useOrgSid": '', orgSidPath: window.sessionStorage.getItem('orgSidPath'),
"useOrgName": '', procDefId: '',
"orgSidPath": window.sessionStorage.getItem('orgSidPath'), nodeId: '',
"procDefId": "", procInstId: '',
"nodeId": "", nodeState: '',
"procInstId": "", taskId: '',
"nodeState": "", finishTime: '',
"taskId": "", asOldpartreturnList: []
"finishTime": "",
"asOldpartreturnList": [
]
} }
this.submitdisabled = false this.submitdisabled = false
this.isUpdata = false
this.$emit('doback') this.$emit('doback')
}, },
showAdd() { showAdd() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
this.title = "【新增】" this.title = '【新增】'
this.isUpdata = false
}, },
showEdit(row) { showEdit(row) {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
this.title = "【修改】" this.title = '【修改】'
this.isUpdata = true req.init(row.sid).then(resp => {
// var params = { if (resp.success) {
// sid: row.sid this.formobj = resp.data
// } for (var i = 0; i < resp.data.filePaths.length; i++) {
this.imgList.push({
req.init(row.sid) url: resp.data.filePaths[i].url
.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 = {} this.formobj = {}
}) })
}, },
downLoadDetail() { downLoadDetail() {
const loading = this.$loading({ const loading = this.$loading({
@ -493,7 +378,7 @@
const fileName = '待出库旧件明细' + '.xls' const fileName = '待出库旧件明细' + '.xls'
const elink = document.createElement('a') const elink = document.createElement('a')
elink.download = fileName elink.download = fileName
elink.style.display = 'nonde' elink.style.display = 'none'
elink.href = URL.createObjectURL(blob) elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink) document.body.appendChild(elink)
elink.click() elink.click()
@ -535,15 +420,11 @@
const _this = this const _this = this
_this.uploadResultMesssage = resp.msg _this.uploadResultMesssage = resp.msg
_this.uploadSuccess = resp.success _this.uploadSuccess = resp.success
if (resp.success) { if (resp.success) {
for (var i = 0; i < resp.data.length; i++) { for (var i = 0; i < resp.data.length; i++) {
this.formobj.asOldpartreturnList.push(resp.data[i]) this.formobj.asOldpartreturnList.push(resp.data[i])
} }
} }
}, },
handleConfirm() { handleConfirm() {
if (!this.uploadSuccess) { if (!this.uploadSuccess) {
@ -560,178 +441,148 @@
console.log('backData》》》》', value) console.log('backData》》》》', value)
console.log('imgList', this.imgList) console.log('imgList', this.imgList)
this.imgList = value this.imgList = value
for (var i = 0; i < this.imgList.length; i++) { for (var i = 0; i < this.imgList.length; i++) {
this.formobj.filePaths.push(this.imgList[i].url) this.formobj.filePaths.push(this.imgList[i].url)
} }
}, },
seleGoods(row) { seleGoods(row) {
this.itemInfo = row this.itemInfo = row
this.queryParams.params = { this.queryParams.params = {
"vinNo": row.vinNo, vinNo: row.vinNo,
"goodsSkuCode": row.goodsSkuCode, goodsSkuCode: row.goodsSkuCode,
"sourceBillNo": row.sourceBillNo, sourceBillNo: row.sourceBillNo,
"orgPath": window.sessionStorage.getItem('defaultOrgPath'), orgPath: window.sessionStorage.getItem('defaultOrgPath')
} }
req.getGoodsListPage(this.queryParams).then(resp => { req.getGoodsListPage(this.queryParams).then(resp => {
if (resp.success) { if (resp.success) {
const data = resp.data const data = resp.data
this.queryParams.total = data.total this.queryParams.total = data.total
this.dataList = data.records this.dataList = data.records
this.dialogVisible2 = true this.dialogVisible2 = true
} else { } else {
// resp.code // resp.code
this.dataList = [] this.dataList = []
this.queryParams.total = 0 this.queryParams.total = 0
} }
}).catch(e => {
}) })
.catch(e => {})
}, },
delGoods(index) { delGoods(index) {
this.formobj.asOldpartreturnList.splice(index, 1) this.formobj.asOldpartreturnList.splice(index, 1)
}, },
selectionLineChangeHandle(val) { selectionLineChangeHandle(val) {
this.selectionList = val this.selectionList = val
}, },
addDialogList() { addDialogList() {
this.dialogVisible2 = false this.dialogVisible2 = false
if (this.selectionList.length > 0) { if (this.selectionList.length > 0) {
const choose = this.formobj.asOldpartreturnList.filter((item) => item == this.itemInfo) const choose = this.formobj.asOldpartreturnList.filter((item) => item == this.itemInfo)
console.log('>>>>>>>>>addDialogList', choose)
var num = 0 var num = 0
if (choose != null && choose.length > 0) { if (choose != null && choose.length > 0) {
for (var i = 0; i < this.selectionList.length; i++) { for (var i = 0; i < this.selectionList.length; i++) {
var item = this.selectionList[i] var item = this.selectionList[i]
num += Number(item.count) num += Number(item.count)
} }
choose[0].actualReturnCount = num choose[0].actualReturnCount = num
} }
} }
}, },
handleClose2() { handleClose2() {
this.dialogVisible2 = false this.dialogVisible2 = false
}, },
seleGoods3() { seleGoods3() {
this.queryParams.params = { this.queryParams.params = {
"vinNo": '', vinNo: '',
"goodsSkuCode": '', goodsSkuCode: '',
"sourceBillNo": '', sourceBillNo: '',
"orgPath": window.sessionStorage.getItem('defaultOrgPath'), orgPath: window.sessionStorage.getItem('defaultOrgPath')
} }
req.getGoodsListPage(this.queryParams).then(resp => { req.getGoodsListPage(this.queryParams).then(resp => {
if (resp.success) { if (resp.success) {
const data = resp.data const data = resp.data
this.queryParams.total = data.total this.queryParams.total = data.total
this.dataList = data.records this.dataList = data.records
this.dialogVisible3 = true this.dialogVisible3 = true
} else { } else {
// resp.code // resp.code
this.dataList = [] this.dataList = []
this.queryParams.total = 0 this.queryParams.total = 0
} }
}).catch(e => {
}) })
.catch(e => {})
}, },
selectionLineChangeHandle3(val) { selectionLineChangeHandle3(val) {
this.selectionList3 = val this.selectionList3 = val
}, },
addDialogList3() { addDialogList3() {
this.dialogVisible3 = false this.dialogVisible3 = false
for (var i = 0; i < this.selectionList3.length; i++) { for (var i = 0; i < this.selectionList3.length; i++) {
var item = this.selectionList3[i] var item = this.selectionList3[i]
this.formobj.asOldpartreturnList.push({ this.formobj.asOldpartreturnList.push({
"sid": '', sid: '',
"remarks": '', remarks: '',
"mainSid": '', mainSid: '',
"vinNo": item.vinNo, vinNo: item.vinNo,
"goodsSpuSid": item.goodsSpuSid, goodsSpuSid: item.goodsSpuSid,
"goodsSpuName": item.goodsSpuName, goodsSpuName: item.goodsSpuName,
"goodsSkuSid": item.goodsSkuSid, goodsSkuSid: item.goodsSkuSid,
"goodsSkuTitle": item.goodsSkuTitle, goodsSkuTitle: item.goodsSkuTitle,
"goodsSkuCode": item.goodsSkuCode, goodsSkuCode: item.goodsSkuCode,
"goodsSkuOwnSpec": item.goodsSkuOwnSpec, goodsSkuOwnSpec: item.goodsSkuOwnSpec,
"manufacturerSid": item.manufacturerSid, manufacturerSid: item.manufacturerSid,
"manufacturerName": item.manufacturerName, manufacturerName: item.manufacturerName,
"warehouseSid": item.warehouseSid, warehouseSid: item.warehouseSid,
"warehouseName": item.warehouseName, warehouseName: item.warehouseName,
"warehouseAreaSid": item.warehouseAreaSid, warehouseAreaSid: item.warehouseAreaSid,
"warehouseAreaName": item.warehouseAreaName, warehouseAreaName: item.warehouseAreaName,
"warehouseRackSid": item.warehouseRackSid, warehouseRackSid: item.warehouseRackSid,
"warehouseRackName": item.warehouseRackName, warehouseRackName: item.warehouseRackName,
"unit": item.unit, unit: item.unit,
"sourceBillNo": item.sourceBillNo, sourceBillNo: item.sourceBillNo,
"claimBillNo": '', claimBillNo: '',
"isCf": "是", isCf: '是',
"needReturnCount": item.count, needReturnCount: item.count,
"actualReturnCount": item.count actualReturnCount: item.count
}) })
} }
}, },
handleClose3() { handleClose3() {
this.dialogVisible3 = false this.dialogVisible3 = false
}, }
} }
} }
</script> </script>
<style scoped> <style scoped>
/deep/ .el-form-item__error { /deep/ .el-form-item__error {
margin-left: 120px !important; margin-left: 120px !important;
} }
.must { .must {
color: #f00; color: #f00;
} }
.span-sty { .span-sty {
width: 130px !important; width: 130px !important;
} }
.addinputInfo { .addinputInfo {
margin-left: 120px !important; margin-left: 120px !important;
} }
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw { .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important; margin-left: 120px !important;
width: calc(100% - 115px); width: calc(100% - 115px);
} }
.first_row { .first_row {
border-top: 1px solid #E0E3EB; border-top: 1px solid #E0E3EB;
} }
.titleOne { .titleOne {
padding: 7px; padding: 7px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
</style> </style>

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

@ -1,29 +1,14 @@
<template> <template>
<div> <div class="app-container">
<div class="tab-header webtop"> <div class="tab-header webtop">
<!-- 标题 -->
<div>旧件返厂</div> <div>旧件返厂</div>
<!-- start 添加修改按钮 -->
<div> <div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div> </div>
<div class="listconadd"> <div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row"> <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"> <el-col :span="8">
<div class="span-sty">申请人</div> <div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -32,147 +17,88 @@
<div class="span-sty">申请部门</div> <div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请日期</div> <div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col> </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-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-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">附件</div> <div class="span-sty">附件</div>
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" <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]">
v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
</el-image> </el-image>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">商品列表</div>
<div class="title" <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;" :row-style="{height: '40px'}">
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;"> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<div>商品列表</div> <el-table-column label="商品名称" prop="goodsSpuName" align="center"/>
</div> <el-table-column label="图号" prop="goodsSkuCode" align="center"/>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;" <el-table-column label="厂家" prop="manufacturerName" align="center"/>
:row-style="{height: '40px'}"> <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column label="单位" prop="unit" align="center"/>
<el-table-column label="商品名称" prop="goodsSpuName" align="center" /> <el-table-column label="车架号" prop="vinNo" align="center"/>
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" /> <el-table-column label="维修单号" prop="sourceBillNo" align="center"/>
<el-table-column label="厂家" prop="manufacturerName" align="center" /> <el-table-column label="索赔单号" prop="claimBillNo" align="center"/>
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" /> <el-table-column label="需返厂数量" prop="needReturnCount" align="center"/>
<el-table-column label="单位" prop="unit" align="center" /> <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center"/>
<el-table-column label="车架号" prop="vinNo" align="center" /> <el-table-column label="差异说明" prop="remarks" align="center"/>
<el-table-column label="维修单号" prop="sourceBillNo" align="center" /> <el-table-column label="是否迟返" prop="isCf" 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-table>
</el-form> </el-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/storage/oldPartsFactory.js' import req from '@/api/storage/oldPartsFactory.js'
export default { export default {
components: {}, components: {},
data() { data() {
return { return {
listLoading: false, listLoading: false,
submitdisabled: false, submitdisabled: false,
formobj: {}, formobj: {}
} }
},
methods: {
indexMethod(index) {
return index + 1
}, },
methods: {
indexMethod(index) {
return index + 1
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.$emit('doback')
},
showAdd() {
},
showEdit(row) {
var params = { handleReturn() {
sid: row.sid this.formobj = {}
this.$emit('doback')
},
showEdit(row) {
req.init(row.sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
} }
req.init(row.sid) }).catch(e => {
.then(resp => { this.formobj = {}
if (resp.success) { })
this.formobj = resp.data
}
})
.catch(e => {
this.formobj = {}
})
}
} }
} }
}
</script> </script>
<style scoped> <style scoped>
.span-sty { .span-sty {
width: 130px !important; width: 130px !important;
} }
.addinputInfo {
.addinputInfo { margin-left: 120px !important;
margin-left: 120px !important; }
} .first_row {
border-top: 1px solid #E0E3EB;
.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> </style>

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

@ -31,35 +31,28 @@
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">附件</div> <div class="span-sty">附件</div>
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" <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]">
v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
</el-image> </el-image>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title" <div class="title">商品列表</div>
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;"> <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;" :row-style="{height: '40px'}">
<div>商品列表</div> <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
</div> <el-table-column label="商品名称" prop="goodsSkuName" align="center"/>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;" <el-table-column label="图号" prop="goodsSkuCode" align="center"/>
:row-style="{height: '40px'}"> <el-table-column label="厂家" prop="manufacturerName" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center"/>
<el-table-column label="商品名称" prop="goodsSkuName" align="center" /> <el-table-column label="单位" prop="unit" align="center"/>
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" /> <el-table-column label="需返厂数量" prop="needReturnCount" align="center"/>
<el-table-column label="厂家" prop="manufacturerName" align="center" /> <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center"/>
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" /> <el-table-column label="差异说明" prop="remarks" align="center"/>
<el-table-column label="单位" prop="unit" 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> </el-table>
</el-form> </el-form>
</div> </div>
</div> </div>
@ -92,8 +85,9 @@
<span>意见:</span> <span>意见:</span>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" <el-form-item>
type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input></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-col>
</el-row> </el-row>
<div style="text-align:center;margin-top: 20px;"> <div style="text-align:center;margin-top: 20px;">
@ -106,339 +100,335 @@
</template> </template>
<script> <script>
import req from '@/api/storage/oldPartsFactory' import req from '@/api/storage/oldPartsFactory'
import { import { selectStaffListss } from '@/api/Common/dictcommons'
selectStaffListss
} from '@/api/Common/dictcommons'
export default { export default {
name: 'WorkSLRSettlementDaiBan', name: 'WorkSLRSettlementDaiBan',
data() { data() {
return { return {
viewTitle: '', viewTitle: '',
viewState: 1, viewState: 1,
submitdisabled: false, submitdisabled: false,
tableKey: 0, tableKey: 0,
index: 0, index: 0,
formobj: { formobj: {
"sid": "", sid: '',
"remarks": "", remarks: '',
"createBySid": '', createBySid: '',
"createByName": '', createByName: '',
"deptSid": '', deptSid: '',
"deptName": '', deptName: '',
"createTime": "", createTime: '',
"billNo": "", billNo: '',
"filePaths": [], filePaths: [],
"useOrgSid": '', useOrgSid: '',
"useOrgName": '', useOrgName: '',
"orgSidPath": '', orgSidPath: '',
"procDefId": "", procDefId: '',
"nodeId": "", nodeId: '',
"procInstId": "", procInstId: '',
"nodeState": "", nodeState: '',
"taskId": "", taskId: '',
"finishTime": "", finishTime: '',
"asOldpartreturnList": [ asOldpartreturnList: []
},
rules: {},
options: [],
operation: '', //
dialogList: {
comment: ''
},
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
countersignLink: false,
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
//
countersign: {
taskId: '',
assignee: '',
userSid: '',
instanceId: '',
views: ''
}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.countersign.taskId = obj.taskId
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
}
}, '*')
},
] methods: {
}, showInfo(sid) {
rules: {}, this.viewTitle = '旧件返厂申请详情'
options: [], this.$nextTick(() => {
operation: '', // this.$refs['form_obj'].clearValidate()
dialogList: { })
comment: '' req.fetchBySid(sid).then((res) => {
}, if (res.success) {
startTask: true, this.formobj = res.data
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
countersignLink: false,
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
//
countersign: {
taskId: '',
assignee: '',
userSid: '',
instanceId: '',
views: ''
} }
} })
selectStaffListss().then((res) => {
if (res.success) {
this.options = res.data
}
})
}, },
created() { //
console.log('url:' + window.location.href) openCountersign(val) {
var one = window.location.href.indexOf('&data') + 6 this.operation = val
const data = window.location.href.substr(one) // urlunescape()web,使 this.currentLink = true
const obj = JSON.parse(decodeURIComponent(data)) this.countersignLink = true
console.log('iframe页面获取的obj:', obj) this.dialogList.comment = ''
// req.getNextNodesForSubmit({
this.linkByParameter.businessSid = obj.businessSid taskDefKey: this.current.taskDefKey,
this.linkByParameter.instanceId = obj.instanceId businessSid: this.linkByParameter.businessSid
this.linkByParameter.taskId = obj.taskId }).then((resp) => {
this.linkByParameter.taskDefKey = obj.taskDefKey if (resp.success) {
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath') var arr = resp.data
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid') this.nextNode = arr[0]
this.current.taskDefKey = obj.taskDefKey this.nodeDialogVisible = true
this.current.taskName = obj.taskName }
// this.submitdisabled = false
this.countersign.taskId = obj.taskId })
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
}, },
mounted() { //
window.parent.postMessage({ openAgree(val) {
cmd: 'returnHeight', this.operation = val
params: { this.currentLink = true
// this.countersignLink = false
code: 2, this.dialogList.comment = '同意'
data: 500 + 'px' req.getNextNodesForSubmit({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
} }
}, '*') this.submitdisabled = false
})
}, },
//
methods: { openReject(val) {
showInfo(sid) { this.operation = val
this.viewTitle = '旧件返厂申请详情' this.currentLink = true
this.$nextTick(() => { this.countersignLink = false
this.$refs['form_obj'].clearValidate() this.dialogList.comment = ''
}) req.getPreviousNodesForReject({
req.fetchBySid(sid).then((res) => { taskDefKey: this.current.taskDefKey,
if (res.success) { businessSid: this.linkByParameter.businessSid
this.formobj = res.data }).then((resp) => {
} if (resp.success) {
}) var arr = resp.data
selectStaffListss().then((res) => { this.nextNode = arr[0]
if (res.success) { this.nodeDialogVisible = true
this.options = res.data
}
})
},
//
openCountersign(val) {
this.operation = val
this.currentLink = true
this.countersignLink = true
this.dialogList.comment = ''
req.getNextNodesForSubmit({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openReject(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = ''
req.getPreviousNodesForReject({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
if (this.dialogList.comment === '') {
this.$message({
showClose: true,
type: 'error',
message: '请填写审批意见'
})
} else {
this.handleReject()
}
} else if (this.operation === '终止') {
if (this.dialogList.comment === '') {
this.$message({
showClose: true,
type: 'error',
message: '请填写审批意见'
})
} else {
this.handleStop()
}
} else if (this.operation === '加签') {
this.handleCountersign()
} }
}, this.submitdisabled = false
/** 加签 */ })
handleCountersign() { },
if (this.countersign.assignee === '') { //
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
if (this.dialogList.comment === '') {
this.$message({ this.$message({
showClose: true, showClose: true,
type: 'error', type: 'error',
message: '请选择加签人员' message: '请填写审批意见'
}) })
return } else {
this.handleReject()
} }
} else if (this.operation === '终止') {
if (this.dialogList.comment === '') { if (this.dialogList.comment === '') {
this.$message({ this.$message({
showClose: true, showClose: true,
type: 'error', type: 'error',
message: '请填写审批意见' message: '请填写审批意见'
}) })
return } else {
this.handleStop()
} }
this.countersign.views = this.dialogList.comment } else if (this.operation === '加签') {
req.delegate(this.countersign).then((response) => { this.handleCountersign()
if (response.success) { }
this.$notify({ },
title: '提示', /** 加签 */
message: '执行成功', handleCountersign() {
type: 'success', if (this.countersign.assignee === '') {
duration: 2000 this.$message({
}) showClose: true,
this.nodeDialogVisible = false type: 'error',
// message: '请选择加签人员'
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
req.complete(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.linkByParameter.comment = this.dialogList.comment
req.reject(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
}) })
}, return
/** 终止任务 */ }
handleStop() { if (this.dialogList.comment === '') {
this.linkByParameter.comment = this.dialogList.comment this.$message({
req.breakProcess(this.linkByParameter).then((response) => { showClose: true,
if (response.success) { type: 'error',
this.$notify({ message: '请填写审批意见'
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
}) })
return
} }
this.countersign.views = this.dialogList.comment
req.delegate(this.countersign).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
req.complete(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.linkByParameter.comment = this.dialogList.comment
req.reject(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 终止任务 */
handleStop() {
this.linkByParameter.comment = this.dialogList.comment
req.breakProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
} }
} }
}
</script> </script>
<style scoped> <style scoped>
.span-sty { .span-sty {
width: 130px !important; width: 130px !important;
} }
.addinputInfo { .addinputInfo {
margin-left: 120px !important; margin-left: 120px !important;
} }
.rowClass { .rowClass {
border-top: 1px solid #E0E3EB; border-top: 1px solid #E0E3EB;
} }
</style> </style>

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

@ -29,35 +29,27 @@
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">附件</div> <div class="span-sty">附件</div>
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" <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>
v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
</el-image>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title" <div class="title">商品列表</div>
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;"> <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;" :row-style="{height: '40px'}">
<div>商品列表</div> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
</div> <el-table-column label="商品名称" prop="goodsSkuName" align="center"/>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;" <el-table-column label="商品编码" prop="goodsSkuCode" align="center"/>
:row-style="{height: '40px'}"> <el-table-column label="厂家" prop="manufacturerName" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center"/>
<el-table-column label="商品名称" prop="goodsSkuName" align="center" /> <el-table-column label="单位" prop="unit" align="center"/>
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" /> <el-table-column label="需返厂数量" prop="needReturnCount" align="center"/>
<el-table-column label="厂家" prop="manufacturerName" align="center" /> <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center"/>
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" /> <el-table-column label="差异说明" prop="remarks" align="center"/>
<el-table-column label="单位" prop="unit" 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> </el-table>
</el-form> </el-form>
</div> </div>
</div> </div>
@ -65,145 +57,137 @@
</template> </template>
<script> <script>
import req from '@/api/storage/oldPartsFactory' import req from '@/api/storage/oldPartsFactory'
export default {
name: 'WorkSLRSettlementEdit',
data() {
return {
viewTitle: '',
viewState: 1,
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": [
] export default {
}, name: 'WorkSLRSettlementEdit',
rules: {} data() {
return {
viewTitle: '',
viewState: 1,
submitdisabled: false,
tableKey: 0,
index: 0,
formobj: {
sid: '',
remarks: '',
createBySid: '',
createByName: '',
deptSid: '',
deptName: '',
createTime: '',
billNo: '',
filePaths: [],
useOrgSid: '',
useOrgName: '',
orgSidPath: '',
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
asOldpartreturnList: []
},
rules: {}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
} }
}, }, '*')
created() { },
console.log('url:' + window.location.href) computed: {},
var one = window.location.href.indexOf('&data') + 6 methods: {
const data = window.location.href.substr(one) // urlunescape()web,使 showInfo(sid) {
const obj = JSON.parse(decodeURIComponent(data)) this.viewTitle = '【编辑】旧件返厂申请'
this.showInfo(obj.businessSid) this.$nextTick(() => {
}, this.$refs['form_obj'].clearValidate()
mounted() { })
window.parent.postMessage({ req.fetchBySid(sid).then((res) => {
cmd: 'returnHeight', if (res.success) {
params: { this.formobj = res.data
//
code: 2,
data: 500 + 'px'
} }
}, '*') })
},
computed: {
}, },
methods: { saveOrUpdate() {
showInfo(sid) { this.$refs['form_obj'].validate((valid) => {
this.viewTitle = '【编辑】旧件返厂申请' if (valid) {
this.$nextTick(() => { this.submitdisabled = true
this.$refs['form_obj'].clearValidate() req.saveOrUpdate(this.formobj).then((res) => {
}) if (res.success) {
req.fetchBySid(sid).then((res) => { this.$message({
if (res.success) { showClose: true,
this.formobj = res.data type: 'success',
} message: '保存成功'
}) })
}, // ()
saveOrUpdate() { window.parent.postMessage({
this.$refs['form_obj'].validate((valid) => { cmd: 'returnHeight',
if (valid) { params: {
this.submitdisabled = true //
req.saveOrUpdate(this.formobj).then((res) => { code: 1
if (res.success) { }
this.$message({ }, '*')
showClose: true, } else {
type: 'success',
message: '保存成功'
})
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false this.submitdisabled = false
}) }
} }).catch(() => {
}) this.submitdisabled = false
}, })
submit() { }
this.$refs['form_obj'].validate((valid) => { })
if (valid) { },
this.submitdisabled = true submit() {
req.submit(this.formobj).then((res) => { this.$refs['form_obj'].validate((valid) => {
if (res.success) { if (valid) {
this.$message({ this.submitdisabled = true
showClose: true, req.submit(this.formobj).then((res) => {
type: 'success', if (res.success) {
message: '提交成功' this.$message({
}) showClose: true,
// () type: 'success',
window.parent.postMessage({ message: '提交成功'
cmd: 'returnHeight', })
params: { // ()
// window.parent.postMessage({
code: 1 cmd: 'returnHeight',
} params: {
}, '*') //
} else { code: 1
this.submitdisabled = false }
} }, '*')
}).catch(() => { } else {
this.submitdisabled = false this.submitdisabled = false
}) }
} }).catch(() => {
}) this.submitdisabled = false
} })
}
})
} }
} }
}
</script> </script>
<style scoped> <style scoped>
.span-sty { .span-sty {
width: 130px !important; width: 130px !important;
} }
.addinputInfo { .addinputInfo {
margin-left: 120px !important; margin-left: 120px !important;
} }
</style> </style>

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

@ -28,35 +28,28 @@
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">附件</div> <div class="span-sty">附件</div>
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" <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]">
v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
</el-image> </el-image>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title" <div class="title">>商品列表</div>
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;"> <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;" :row-style="{height: '40px'}">
<div>商品列表</div> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
</div> <el-table-column label="商品名称" prop="goodsSkuName" align="center"/>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;" <el-table-column label="商品编码" prop="goodsSkuCode" align="center"/>
:row-style="{height: '40px'}"> <el-table-column label="厂家" prop="manufacturerName" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center"/>
<el-table-column label="商品名称" prop="goodsSkuName" align="center" /> <el-table-column label="单位" prop="unit" align="center"/>
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" /> <el-table-column label="需返厂数量" prop="needReturnCount" align="center"/>
<el-table-column label="厂家" prop="manufacturerName" align="center" /> <el-table-column label="实际返厂数量" prop="actualReturnCount" align="center"/>
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" /> <el-table-column label="差异说明" prop="remarks" align="center"/>
<el-table-column label="单位" prop="unit" 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> </el-table>
</el-form> </el-form>
</div> </div>
</div> </div>
@ -64,151 +57,143 @@
</template> </template>
<script> <script>
import req from '@/api/storage/oldPartsFactory' import req from '@/api/storage/oldPartsFactory'
export default { export default {
name: 'WorkSLRSettlementYiBan', name: 'WorkSLRSettlementYiBan',
data() { data() {
return { return {
viewTitle: '', viewTitle: '',
viewState: 1, viewState: 1,
submitdisabled: false, submitdisabled: false,
tableKey: 0, tableKey: 0,
index: 0, index: 0,
// service formobj: {
serviceKey: 1, sid: '',
// subjoin remarks: '',
subjoinKey: 2, createBySid: '',
formobj: { createByName: '',
"sid": "", deptSid: '',
"remarks": "", deptName: '',
"createBySid": '', createTime: '',
"createByName": '', billNo: '',
"deptSid": '', filePaths: [],
"deptName": '', useOrgSid: '',
"createTime": "", useOrgName: '',
"billNo": "", orgSidPath: '',
"filePaths": [], procDefId: '',
"useOrgSid": '', nodeId: '',
"useOrgName": '', procInstId: '',
"orgSidPath": '', nodeState: '',
"procDefId": "", taskId: '',
"nodeId": "", finishTime: '',
"procInstId": "", asOldpartreturnList: []
"nodeState": "", },
"taskId": "", rules: {},
"finishTime": "", //
"asOldpartreturnList": [ linkByParameter: {
businessSid: '',
] comment: '',
}, instanceId: '',
rules: {}, taskId: '',
// orgSidPath: '',
linkByParameter: { taskDefKey: '',
businessSid: '', userSid: ''
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
}
} }
}, }
created() { },
console.log('url:' + window.location.href) created() {
var one = window.location.href.indexOf('&data') + 6 console.log('url:' + window.location.href)
const data = window.location.href.substr(one) // urlunescape()web,使 var one = window.location.href.indexOf('&data') + 6
const obj = JSON.parse(decodeURIComponent(data)) const data = window.location.href.substr(one) // urlunescape()web,使
console.log('iframe页面获取的obj:', obj) const obj = JSON.parse(decodeURIComponent(data))
// console.log('iframe页面获取的obj:', obj)
this.linkByParameter.businessSid = obj.businessSid //
this.linkByParameter.instanceId = obj.instanceId this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.taskId = obj.taskId this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskDefKey = obj.taskDefKey this.linkByParameter.taskId = obj.taskId
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid') this.linkByParameter.taskDefKey = obj.taskDefKey
// this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.showInfo(obj.businessSid) //
}, this.showInfo(obj.businessSid)
mounted() { },
window.parent.postMessage({ mounted() {
cmd: 'returnHeight', window.parent.postMessage({
params: { cmd: 'returnHeight',
// params: {
code: 2, //
data: 500 + 'px' code: 2,
data: 500 + 'px'
}
}, '*')
},
computed: {},
methods: {
showInfo(sid) {
this.viewTitle = '旧件返厂申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
if (e.staffNameList.length > 0) {
e.repairerName = e.staffNameList.join(',')
}
})
}
} }
}, '*') })
}, },
computed: { /** 确认撤回任务 */
openRevoke() {
}, this.$confirm('是否确认执行撤回操作', '提示', {
methods: { confirmButtonText: '确定',
showInfo(sid) { cancelButtonText: '取消',
this.viewTitle = '旧件返厂申请详情' type: 'warning'
this.$nextTick(() => { }).then(() => {
this.$refs['form_obj'].clearValidate() this.handleRevoke()
}) }).catch(() => {
req.fetchBySid(sid).then((res) => { this.$message({
if (res.success) { type: 'info',
this.formobj = res.data message: '已取消撤回'
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
if (e.staffNameList.length > 0) {
e.repairerName = e.staffNameList.join(',')
}
})
}
}
}) })
}, })
/** 确认撤回任务 */ },
openRevoke() { /** 撤回任务 */
this.$confirm('是否确认执行撤回操作', '提示', { handleRevoke() {
confirmButtonText: '确定', req.revokeProcess(this.linkByParameter).then((response) => {
cancelButtonText: '取消', if (response.success) {
type: 'warning' this.$notify({
}).then(() => { title: '提示',
this.handleRevoke() message: '执行成功',
}).catch(() => { type: 'success',
this.$message({ duration: 2000
type: 'info',
message: '已取消撤回'
}) })
}) this.nodeDialogVisible = false
}, //
/** 撤回任务 */ window.parent.postMessage({
handleRevoke() { cmd: 'returnHeight',
req.revokeProcess(this.linkByParameter).then((response) => { params: {
if (response.success) { //
this.$notify({ code: 1
title: '提示', }
message: '执行成功', }, '*')
type: 'success', }
duration: 2000 })
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
} }
} }
}
</script> </script>
<style scoped> <style scoped>
.span-sty { .span-sty {
width: 130px !important; width: 130px !important;
} }
.addinputInfo { .addinputInfo {
margin-left: 120px !important; margin-left: 120px !important;
} }
</style> </style>

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

@ -33,30 +33,17 @@ import lombok.Data;
import java.math.BigDecimal; 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 @Data
@ApiModel(value = "处理旧件列表", description = "处理旧件列表") @ApiModel(value = "处理旧件列表", description = "处理旧件列表")
@TableName("as_oldparthandle") @TableName("as_oldparthandle")
public class AsOldparthandle extends BaseEntity { public class AsOldparthandle extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("主表sid") @ApiModelProperty("主表sid")
private String mainSid; // 主表sid private String mainSid; // 主表sid
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String vinNo; // 车架号 private String vinNo; // 车架号
@ApiModelProperty("商品ID") @ApiModelProperty("商品ID")
private String goodsID; // 商品ID private String goodsID; // 商品ID
@ApiModelProperty("商品spuSid") @ApiModelProperty("商品spuSid")
private String goodsSpuSid; private String goodsSpuSid;
@ -74,21 +61,25 @@ public class AsOldparthandle extends BaseEntity {
private String manufacturerSid; private String manufacturerSid;
@ApiModelProperty("厂家名称") @ApiModelProperty("厂家名称")
private String manufacturerName; private String manufacturerName;
@ApiModelProperty("单位") @ApiModelProperty("单位")
private String unit; // 单位 private String unit; // 单位
@ApiModelProperty("供应商sid") @ApiModelProperty("供应商sid")
private String supplierSid; private String supplierSid;
@ApiModelProperty("供应商名称") @ApiModelProperty("供应商名称")
private String supplierName; private String supplierName;
@ApiModelProperty("仓库sid") @ApiModelProperty("仓库sid")
private String warehouseSid; // 仓库sid private String warehouseSid; // 仓库sid
@ApiModelProperty("仓库名称") @ApiModelProperty("仓库名称")
private String warehouseName; // 仓库名称 private String warehouseName; // 仓库名称
@ApiModelProperty("库位sid") @ApiModelProperty("库区sid")
private String warehouseAreaSid;
@ApiModelProperty("库区名称")
private String warehouseAreaName;
@ApiModelProperty("库位sid")
private String warehouseRackSid; // 库位sid private String warehouseRackSid; // 库位sid
@ApiModelProperty("库位编码") @ApiModelProperty("库位编码")
private String warehouseRackCode; // 库位编码 private String warehouseRackCode; // 库位编码
@ApiModelProperty("数量") @ApiModelProperty("数量")
private BigDecimal count; // 数量 private BigDecimal count; // 数量
@ApiModelProperty("收益金额") @ApiModelProperty("收益金额")
private BigDecimal profit; private BigDecimal profit;

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

@ -25,7 +25,6 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.as.api.asoldparthandle; package com.yxt.anrui.as.api.asoldparthandle;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -34,28 +33,15 @@ import lombok.Data;
import java.math.BigDecimal; 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 @Data
@ApiModel(value = "处理旧件列表 视图数据详情", description = "处理旧件列表 视图数据详情") @ApiModel(value = "处理旧件列表 视图数据详情", description = "处理旧件列表 视图数据详情")
public class AsOldparthandleDetailsVo implements Vo { public class AsOldparthandleDetailsVo implements Vo {
private String sid; // sid private String sid; // sid
@ApiModelProperty("主表sid") @ApiModelProperty("主表sid")
private String mainSid; // 主表sid private String mainSid; // 主表sid
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String vinNo; // 车架号 private String vinNo; // 车架号
@ApiModelProperty("商品ID") @ApiModelProperty("商品ID")
private String goodsID; // 商品ID private String goodsID; // 商品ID
@ -81,15 +67,19 @@ public class AsOldparthandleDetailsVo implements Vo {
private String supplierSid; private String supplierSid;
@ApiModelProperty("供应商名称") @ApiModelProperty("供应商名称")
private String supplierName; private String supplierName;
@ApiModelProperty("仓库sid") @ApiModelProperty("仓库sid")
private String warehouseSid; // 仓库sid private String warehouseSid; // 仓库sid
@ApiModelProperty("仓库名称") @ApiModelProperty("仓库名称")
private String warehouseName; // 仓库名称 private String warehouseName; // 仓库名称
@ApiModelProperty("库位sid") @ApiModelProperty("库区sid")
private String warehouseAreaSid;
@ApiModelProperty("库区名称")
private String warehouseAreaName;
@ApiModelProperty("库位sid")
private String warehouseRackSid; // 库位sid private String warehouseRackSid; // 库位sid
@ApiModelProperty("库位编码") @ApiModelProperty("库位编码")
private String warehouseRackCode; // 库位编码 private String warehouseRackCode; // 库位编码
@ApiModelProperty("数量") @ApiModelProperty("数量")
private BigDecimal count; // 数量 private BigDecimal count; // 数量
@ApiModelProperty("收益金额") @ApiModelProperty("收益金额")
private BigDecimal profit; private BigDecimal profit;

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

@ -25,7 +25,6 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.as.api.asoldparthandle; package com.yxt.anrui.as.api.asoldparthandle;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -34,28 +33,15 @@ import lombok.Data;
import java.math.BigDecimal; 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 @Data
@ApiModel(value = "处理旧件列表 数据传输对象", description = "处理旧件列表 数据传输对象") @ApiModel(value = "处理旧件列表 数据传输对象", description = "处理旧件列表 数据传输对象")
public class AsOldparthandleDto implements Dto { public class AsOldparthandleDto implements Dto {
private String sid; // sid private String sid; // sid
@ApiModelProperty("主表sid") @ApiModelProperty("主表sid")
private String mainSid; // 主表sid private String mainSid; // 主表sid
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String vinNo; // 车架号 private String vinNo; // 车架号
@ApiModelProperty("商品ID") @ApiModelProperty("商品ID")
private String goodsID; // 商品ID private String goodsID; // 商品ID
@ -81,15 +67,19 @@ public class AsOldparthandleDto implements Dto {
private String supplierSid; private String supplierSid;
@ApiModelProperty("供应商名称") @ApiModelProperty("供应商名称")
private String supplierName; private String supplierName;
@ApiModelProperty("仓库sid") @ApiModelProperty("仓库sid")
private String warehouseSid; // 仓库sid private String warehouseSid; // 仓库sid
@ApiModelProperty("仓库名称") @ApiModelProperty("仓库名称")
private String warehouseName; // 仓库名称 private String warehouseName; // 仓库名称
@ApiModelProperty("库位sid") @ApiModelProperty("库区sid")
private String warehouseAreaSid;
@ApiModelProperty("库区名称")
private String warehouseAreaName;
@ApiModelProperty("库位sid")
private String warehouseRackSid; // 库位sid private String warehouseRackSid; // 库位sid
@ApiModelProperty("库位编码") @ApiModelProperty("库位编码")
private String warehouseRackCode; // 库位编码 private String warehouseRackCode; // 库位编码
@ApiModelProperty("数量") @ApiModelProperty("数量")
private BigDecimal count; // 数量 private BigDecimal count; // 数量
@ApiModelProperty("收益金额") @ApiModelProperty("收益金额")
private BigDecimal profit; private BigDecimal profit;

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

@ -28,64 +28,53 @@ package com.yxt.anrui.as.api.asoldparthandleapply;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity; import com.yxt.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; 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 @Data
@ApiModel(value = "旧件处理申请", description = "旧件处理申请") @ApiModel(value = "旧件处理申请", description = "旧件处理申请")
@TableName("as_oldparthandle_apply") @TableName("as_oldparthandle_apply")
public class AsOldparthandleApply extends BaseEntity { public class AsOldparthandleApply extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("制单人姓名") @ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名 private String createByName; // 制单人姓名
@ApiModelProperty("发起部门sid") @ApiModelProperty("发起部门sid")
private String deptSid; // 发起部门sid private String deptSid; // 发起部门sid
@ApiModelProperty("发起部门名称") @ApiModelProperty("发起部门名称")
private String deptName; // 发起部门名称 private String deptName; // 发起部门名称
@ApiModelProperty("单据编号") @ApiModelProperty("单据编号")
private String billNo; // 单据编号 private String billNo; // 单据编号
@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)") @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
private String filePath; // 附件路径(多个附件之间英文逗号隔开) private String filePath; // 附件路径(多个附件之间英文逗号隔开)
@ApiModelProperty("处理原因key") @ApiModelProperty("处理原因key")
private String handleReasonKey; // 处理原因key private String handleReasonKey; // 处理原因key
@ApiModelProperty("处理原因value") @ApiModelProperty("处理原因value")
private String handleReasonValue; // 处理原因value private String handleReasonValue; // 处理原因value
@ApiModelProperty("处理方式key") @ApiModelProperty("处理方式key")
private String handleModeKey; // 处理方式key private String handleModeKey; // 处理方式key
@ApiModelProperty("处理方式value") @ApiModelProperty("处理方式value")
private String handleModeValue; // 处理方式value private String handleModeValue; // 处理方式value
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称 private String useOrgName; // 分公司名称
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("任务id") @ApiModelProperty("任务id")
private String taskId; // 任务id private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("办结时间") @ApiModelProperty("办结时间")
private Date finishTime; // 办结时间 private Date finishTime; // 办结时间
} }

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

@ -25,7 +25,6 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.as.api.asoldparthandleapply; package com.yxt.anrui.as.api.asoldparthandleapply;
import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDetailsVo;
import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
@ -40,19 +39,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; 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 @Data
@ApiModel(value = "旧件处理申请 视图数据详情", description = "旧件处理申请 视图数据详情") @ApiModel(value = "旧件处理申请 视图数据详情", description = "旧件处理申请 视图数据详情")
public class AsOldparthandleApplyDetailsVo implements Vo { public class AsOldparthandleApplyDetailsVo implements Vo {
@ -63,7 +49,7 @@ public class AsOldparthandleApplyDetailsVo implements Vo {
private String remarks; private String remarks;
@ApiModelProperty("制单人sid") @ApiModelProperty("制单人sid")
private String createBySid; private String createBySid;
@ApiModelProperty("制单人姓名") @ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名 private String createByName; // 制单人姓名
@ApiModelProperty("发起部门sid") @ApiModelProperty("发起部门sid")
private String deptSid; // 发起部门sid private String deptSid; // 发起部门sid
@ -72,34 +58,34 @@ public class AsOldparthandleApplyDetailsVo implements Vo {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("申请日期") @ApiModelProperty("申请日期")
private Date createTime; private Date createTime;
@ApiModelProperty("单据编号") @ApiModelProperty("单据编号")
private String billNo; // 单据编号 private String billNo; // 单据编号
@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)") @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
private List<String> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开) private List<String> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开)
@ApiModelProperty("处理原因key") @ApiModelProperty("处理原因key")
private String handleReasonKey; // 处理原因key private String handleReasonKey; // 处理原因key
@ApiModelProperty("处理原因value") @ApiModelProperty("处理原因value")
private String handleReasonValue; // 处理原因value private String handleReasonValue; // 处理原因value
@ApiModelProperty("处理方式key") @ApiModelProperty("处理方式key")
private String handleModeKey; // 处理方式key private String handleModeKey; // 处理方式key
@ApiModelProperty("处理方式value") @ApiModelProperty("处理方式value")
private String handleModeValue; // 处理方式value private String handleModeValue; // 处理方式value
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称 private String useOrgName; // 分公司名称
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("任务id") @ApiModelProperty("任务id")
private String taskId; // 任务id private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("办结时间") @ApiModelProperty("办结时间")
private Date finishTime; // 办结时间 private Date finishTime; // 办结时间
@ApiModelProperty("待处理旧件列表") @ApiModelProperty("待处理旧件列表")
private List<AsOldparthandleDetailsVo> asOldparthandleList; private List<AsOldparthandleDetailsVo> asOldparthandleList;

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

@ -25,7 +25,6 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.as.api.asoldparthandleapply; package com.yxt.anrui.as.api.asoldparthandleapply;
import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
@ -39,19 +38,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; 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 @Data
@ApiModel(value = "旧件处理申请 数据传输对象", description = "旧件处理申请 数据传输对象") @ApiModel(value = "旧件处理申请 数据传输对象", description = "旧件处理申请 数据传输对象")
public class AsOldparthandleApplyDto implements Dto { public class AsOldparthandleApplyDto implements Dto {
@ -62,7 +48,7 @@ public class AsOldparthandleApplyDto implements Dto {
private String remarks; private String remarks;
@ApiModelProperty("制单人sid") @ApiModelProperty("制单人sid")
private String createBySid; private String createBySid;
@ApiModelProperty("制单人姓名") @ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名 private String createByName; // 制单人姓名
@ApiModelProperty("发起部门sid") @ApiModelProperty("发起部门sid")
private String deptSid; // 发起部门sid private String deptSid; // 发起部门sid
@ -71,34 +57,34 @@ public class AsOldparthandleApplyDto implements Dto {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("申请日期") @ApiModelProperty("申请日期")
private Date createTime; private Date createTime;
@ApiModelProperty("单据编号") @ApiModelProperty("单据编号")
private String billNo; // 单据编号 private String billNo; // 单据编号
@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)") @ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
private List<String> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开) private List<String> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开)
@ApiModelProperty("处理原因key") @ApiModelProperty("处理原因key")
private String handleReasonKey; // 处理原因key private String handleReasonKey; // 处理原因key
@ApiModelProperty("处理原因value") @ApiModelProperty("处理原因value")
private String handleReasonValue; // 处理原因value private String handleReasonValue; // 处理原因value
@ApiModelProperty("处理方式key") @ApiModelProperty("处理方式key")
private String handleModeKey; // 处理方式key private String handleModeKey; // 处理方式key
@ApiModelProperty("处理方式value") @ApiModelProperty("处理方式value")
private String handleModeValue; // 处理方式value private String handleModeValue; // 处理方式value
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称 private String useOrgName; // 分公司名称
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("任务id") @ApiModelProperty("任务id")
private String taskId; // 任务id private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("办结时间") @ApiModelProperty("办结时间")
private Date finishTime; // 办结时间 private Date finishTime; // 办结时间
@ApiModelProperty("待处理旧件列表") @ApiModelProperty("待处理旧件列表")
private List<AsOldparthandleDto> asOldparthandleList = new ArrayList<>(); private List<AsOldparthandleDto> asOldparthandleList = new ArrayList<>();

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; package com.yxt.anrui.as.api.asoldparthandleapply;
import com.yxt.common.core.query.Query; import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@ -34,19 +33,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; 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 @Data
@ApiModel(value = "旧件处理申请 查询条件", description = "旧件处理申请 查询条件") @ApiModel(value = "旧件处理申请 查询条件", description = "旧件处理申请 查询条件")
public class AsOldparthandleApplyQuery implements Query { public class AsOldparthandleApplyQuery implements Query {

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

@ -25,28 +25,16 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.as.api.asoldparthandleapply; package com.yxt.anrui.as.api.asoldparthandleapply;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; 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 @Data
@ApiModel(value = "旧件处理申请 视图数据对象", description = "旧件处理申请 视图数据对象") @ApiModel(value = "旧件处理申请 视图数据对象", description = "旧件处理申请 视图数据对象")
public class AsOldparthandleApplyVo implements Vo { public class AsOldparthandleApplyVo implements Vo {
@ -75,8 +63,8 @@ public class AsOldparthandleApplyVo implements Vo {
private String handleModeValue; private String handleModeValue;
@ApiModelProperty("收益总额") @ApiModelProperty("收益总额")
private String profitTotal; private String profitTotal;
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; private String procDefId;
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstId; private String procInstId;
} }

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

@ -25,28 +25,16 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.as.api.asoldpartreturnapply; package com.yxt.anrui.as.api.asoldpartreturnapply;
import com.yxt.common.core.query.Query; import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; 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 @Data
@ApiModel(value = "旧件返厂申请 查询条件", description = "旧件返厂申请 查询条件") @ApiModel(value = "旧件返厂申请 查询条件", description = "旧件返厂申请 查询条件")
public class AsOldpartreturnApplyQuery implements Query { public class AsOldpartreturnApplyQuery implements Query {
@ -57,7 +45,7 @@ public class AsOldpartreturnApplyQuery implements Query {
private String deptName; private String deptName;
@ApiModelProperty("申请人") @ApiModelProperty("申请人")
private String createByName; private String createByName;
@ApiModelProperty("单据编号") @ApiModelProperty("单据编号")
private String billNo; private String billNo;
@ApiModelProperty("申请开始日期") @ApiModelProperty("申请开始日期")
private String createStartTime; private String createStartTime;

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; package com.yxt.anrui.as.api.asoldpartreturnconfirm;
import com.yxt.common.core.query.Query; import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; 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 @Data
@ApiModel(value = "旧件返厂厂家确认 查询条件", description = "旧件返厂厂家确认 查询条件") @ApiModel(value = "旧件返厂厂家确认 查询条件", description = "旧件返厂厂家确认 查询条件")
public class AsOldpartreturnConfirmQuery implements Query { 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; package com.yxt.anrui.as.api.asoldpartreturnconfirm;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
@ -37,19 +36,6 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; 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 @Data
@ApiModel(value = "旧件返厂厂家确认 视图数据对象", description = "旧件返厂厂家确认 视图数据对象") @ApiModel(value = "旧件返厂厂家确认 视图数据对象", description = "旧件返厂厂家确认 视图数据对象")
public class AsOldpartreturnConfirmVo implements Vo { public class AsOldpartreturnConfirmVo implements Vo {

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

@ -38,35 +38,19 @@ import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo;
import java.util.List; import java.util.List;
import java.util.Map; 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 @Mapper
public interface AsOldparthandleApplyMapper extends BaseMapper<AsOldparthandleApply> { public interface AsOldparthandleApplyMapper extends BaseMapper<AsOldparthandleApply> {
//@Update("update as_oldparthandle_apply set name=#{msg} where id=#{id}") IPage<AsOldparthandleApplyVo> selectPageVo(IPage<AsOldparthandleApply> page, @Param(Constants.WRAPPER) Wrapper<AsOldparthandleApply> qw);
//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);
List<AsOldparthandleApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsOldparthandleApply> qw); @Select("select * from as_oldparthandle_apply")
List<AsOldparthandleApplyVo> selectListVo();
@Select("select * from as_oldparthandle_apply") int selectBySid(String join);
List<AsOldparthandleApplyVo> selectListVo();
int selectBySid(String join); int updateFlowFiled(Map<String, Object> map);
int updateFlowFiled(Map<String, Object> map);
String selectNum(String billNo); String selectNum(String billNo);
} }

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

@ -47,105 +47,92 @@ import com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyDto;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.List; 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 = "旧件处理申请") @Api(tags = "旧件处理申请")
@RestController @RestController
@RequestMapping("v1/asoldparthandleapply") @RequestMapping("v1/asoldparthandleapply")
public class AsOldparthandleApplyRest { public class AsOldparthandleApplyRest {
@Autowired @Autowired
private AsOldparthandleApplyService asOldparthandleApplyService; private AsOldparthandleApplyService asOldparthandleApplyService;
@ApiOperation("根据条件分页查询数据的列表") @ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage") @PostMapping("/listPage")
public ResultBean<PagerVo<AsOldparthandleApplyVo>> listPage(@RequestBody PagerQuery<AsOldparthandleApplyQuery> pq){ public ResultBean<PagerVo<AsOldparthandleApplyVo>> listPage(@RequestBody PagerQuery<AsOldparthandleApplyQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
PagerVo<AsOldparthandleApplyVo> pv = asOldparthandleApplyService.listPageVo(pq); PagerVo<AsOldparthandleApplyVo> pv = asOldparthandleApplyService.listPageVo(pq);
return rb.success().setData(pv); return rb.success().setData(pv);
} }
@ApiOperation("新增或修改") @ApiOperation("新增或修改")
@PostMapping("/save") @PostMapping("/save")
public ResultBean save(@RequestBody AsOldparthandleApplyDto dto){ public ResultBean save(@RequestBody AsOldparthandleApplyDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
asOldparthandleApplyService.saveOrUpdateDto(dto); asOldparthandleApplyService.saveOrUpdateDto(dto);
return rb.success(); return rb.success();
} }
@ApiOperation("根据sid批量删除") @ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids") @DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){ public ResultBean delBySids(@RequestBody String[] sids) {
return asOldparthandleApplyService.delAll(sids); return asOldparthandleApplyService.delAll(sids);
} }
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}") @GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<AsOldparthandleApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){ public ResultBean<AsOldparthandleApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
AsOldparthandleApplyDetailsVo vo = asOldparthandleApplyService.fetchDetailsVoBySid(sid); AsOldparthandleApplyDetailsVo vo = asOldparthandleApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@ApiOperation("提交审批流程") @ApiOperation("提交审批流程")
@PostMapping("/submit") @PostMapping("/submit")
public ResultBean submit(@RequestBody @Valid SubmitAsOldparthandleApplyDto dto) { public ResultBean submit(@RequestBody @Valid SubmitAsOldparthandleApplyDto dto) {
return asOldparthandleApplyService.submit(dto); return asOldparthandleApplyService.submit(dto);
} }
@ApiOperation(value = "办理(同意)") @ApiOperation(value = "办理(同意)")
@PostMapping("/complete") @PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody AsOldparthandleApplyCompleteDto query) { public ResultBean complete(@Valid @RequestBody AsOldparthandleApplyCompleteDto query) {
BusinessVariables bv = new BusinessVariables(); BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv); BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId());
return asOldparthandleApplyService.complete(bv); return asOldparthandleApplyService.complete(bv);
} }
@ApiOperation(value = "获取上一个环节") @ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject") @GetMapping(value = "/getPreviousNodesForReject")
public ResultBean<List<AsOldparthandleApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query) { public ResultBean<List<AsOldparthandleApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query) {
return asOldparthandleApplyService.getPreviousNodesForReject(query); return asOldparthandleApplyService.getPreviousNodesForReject(query);
} }
@ApiOperation(value = "获取下一个环节") @ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit") @GetMapping(value = "/getNextNodesForSubmit")
public ResultBean<List<AsOldparthandleApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query) { public ResultBean<List<AsOldparthandleApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query) {
return asOldparthandleApplyService.getNextNodesForSubmit(query); return asOldparthandleApplyService.getNextNodesForSubmit(query);
} }
@ApiOperation(value = "驳回任务") @ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject") @PostMapping(value = "/reject")
public ResultBean reject(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) { public ResultBean reject(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) {
return asOldparthandleApplyService.reject(query); return asOldparthandleApplyService.reject(query);
} }
@ApiOperation(value = "撤回流程") @ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess") @PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) { public ResultBean revokeProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) {
return asOldparthandleApplyService.revokeProcess(query); return asOldparthandleApplyService.revokeProcess(query);
} }
@ApiOperation(value = "终止任务") @ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess") @PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) { public ResultBean breakProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query) {
return asOldparthandleApplyService.breakProcess(query); return asOldparthandleApplyService.breakProcess(query);
} }
@ApiOperation(value = "加签") @ApiOperation(value = "加签")
@PostMapping(value = "/delegate") @PostMapping(value = "/delegate")
public ResultBean delegate(@RequestBody AsOldparthandleApplyDelegateQuery query) { public ResultBean delegate(@RequestBody AsOldparthandleApplyDelegateQuery query) {
return asOldparthandleApplyService.delegate(query); return asOldparthandleApplyService.delegate(query);
} }
} }

941
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.AsOldparthandleDetailsVo;
import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto; import com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto;
import com.yxt.anrui.as.api.asoldparthandleapply.flowable.*; 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.biz.asoldparthandle.AsOldparthandleService;
import com.yxt.anrui.as.feign.base.billno.Rule; import com.yxt.anrui.as.feign.base.billno.Rule;
import com.yxt.anrui.as.feign.flowable.flow.*; import com.yxt.anrui.as.feign.flowable.flow.*;
@ -74,505 +68,492 @@ import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; 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 @Service
public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthandleApplyMapper, AsOldparthandleApply> { public class AsOldparthandleApplyService extends MybatisBaseService<AsOldparthandleApplyMapper, AsOldparthandleApply> {
@Autowired @Autowired
private FileUploadComponent fileUploadComponent; private FileUploadComponent fileUploadComponent;
@Autowired @Autowired
private SysOrganizationFeign sysOrganizationFeign; private SysOrganizationFeign sysOrganizationFeign;
@Autowired @Autowired
private SysStaffOrgFeign sysStaffOrgFeign; private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired @Autowired
private SysUserFeign sysUserFeign; private SysUserFeign sysUserFeign;
@Autowired @Autowired
private FlowableFeign flowableFeign; private FlowableFeign flowableFeign;
@Autowired @Autowired
private FlowTaskFeign flowTaskFeign; private FlowTaskFeign flowTaskFeign;
@Autowired @Autowired
private FlowFeign flowFeign; private FlowFeign flowFeign;
@Autowired @Autowired
private MessageFeign messageFeign; private MessageFeign messageFeign;
@Autowired @Autowired
private AsOldparthandleService asOldparthandleService; private AsOldparthandleService asOldparthandleService;
public PagerVo<AsOldparthandleApplyVo> listPageVo(PagerQuery<AsOldparthandleApplyQuery> pq) { public PagerVo<AsOldparthandleApplyVo> listPageVo(PagerQuery<AsOldparthandleApplyQuery> pq) {
AsOldparthandleApplyQuery query = pq.getParams(); AsOldparthandleApplyQuery query = pq.getParams();
QueryWrapper<AsOldparthandleApply> qw = new QueryWrapper<>(); QueryWrapper<AsOldparthandleApply> qw = new QueryWrapper<>();
//========================================数据授权开始 //========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) { if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery(); PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath()); privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl()); privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid()); privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid()); privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人) //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath(); String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/"; orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/"); int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1); int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1); int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1); int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData(); String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) { if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1); orgSidPath = orgSidPath.substring(0, i1);
qw.like("s.orgSidPath", orgSidPath); qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) { } else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2); orgSidPath = orgSidPath.substring(0, i2);
qw.like("s.orgSidPath", orgSidPath); qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) { } else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3); orgSidPath = orgSidPath.substring(0, i3);
qw.like("s.orgSidPath", orgSidPath); qw.like("s.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) { } else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4); orgSidPath = orgSidPath.substring(0, i4);
qw.like("s.orgSidPath", orgSidPath); qw.like("s.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) { } else if ("5".equals(orgLevelKey)) {
qw.eq("aoa.createBySid", query.getUserSid()); qw.eq("aoa.createBySid", query.getUserSid());
} else { } else {
PagerVo<AsOldparthandleApplyVo> p = new PagerVo<>(); PagerVo<AsOldparthandleApplyVo> p = new PagerVo<>();
return p; return p;
} }
} else { } else {
PagerVo<AsOldparthandleApplyVo> p = new PagerVo<>(); PagerVo<AsOldparthandleApplyVo> p = new PagerVo<>();
return p; return p;
} }
} }
if (StringUtils.isNotBlank(query.getUseOrgName())){ if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("aoa.useOrgName",query.getUseOrgName()); qw.like("aoa.useOrgName", query.getUseOrgName());
} }
if (StringUtils.isNotBlank(query.getCreateDeptName())){ if (StringUtils.isNotBlank(query.getCreateDeptName())) {
qw.like("aoa.deptName",query.getCreateDeptName()); qw.like("aoa.deptName", query.getCreateDeptName());
} }
if (StringUtils.isNotBlank(query.getCreateByName())){ if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("aoa.createByName",query.getCreateByName()); qw.like("aoa.createByName", query.getCreateByName());
} }
if (StringUtils.isNotBlank(query.getBillNo())){ if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("aoa.billNo",query.getBillNo()); qw.like("aoa.billNo", query.getBillNo());
} }
if (StringUtils.isNotBlank(query.getHandleReasonKey())){ if (StringUtils.isNotBlank(query.getHandleReasonKey())) {
qw.like("aoa.handleReasonKey",query.getHandleReasonKey()); qw.like("aoa.handleReasonKey", query.getHandleReasonKey());
} }
if (StringUtils.isNotBlank(query.getHandleModeKey())){ if (StringUtils.isNotBlank(query.getHandleModeKey())) {
qw.like("aoa.handleModeKey",query.getHandleModeKey()); qw.like("aoa.handleModeKey", query.getHandleModeKey());
} }
String createStartTime = query.getCreateStartTime(); String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime(); String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (aoa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (aoa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (aoa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" apply(StringUtils.isNotEmpty(createEndTime), "date_format (aoa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
); );
String finishStartTime = query.getFinishStartTime(); String finishStartTime = query.getFinishStartTime();
String finishEndTime = query.getFinishEndTime(); String finishEndTime = query.getFinishEndTime();
qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (aoa.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')"). qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (aoa.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(finishEndTime), "date_format (aoa.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" apply(StringUtils.isNotEmpty(finishEndTime), "date_format (aoa.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
); );
qw.groupBy("aoa.sid"); qw.groupBy("aoa.sid");
qw.orderByDesc("aoa.createTime"); qw.orderByDesc("aoa.createTime");
IPage<AsOldparthandleApply> page = PagerUtil.queryToPage(pq); IPage<AsOldparthandleApply> page = PagerUtil.queryToPage(pq);
IPage<AsOldparthandleApplyVo> pagging = baseMapper.selectPageVo(page, qw); IPage<AsOldparthandleApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<AsOldparthandleApplyVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<AsOldparthandleApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
} }
public String saveOrUpdateDto(AsOldparthandleApplyDto dto){ public String saveOrUpdateDto(AsOldparthandleApplyDto dto) {
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
List<AsOldparthandleDto> asOldparthandleList = dto.getAsOldparthandleList(); List<AsOldparthandleDto> asOldparthandleList = dto.getAsOldparthandleList();
String deptSid = dto.getDeptSid(); String deptSid = dto.getDeptSid();
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
dto.setUseOrgSid(useOrgSid); dto.setUseOrgSid(useOrgSid);
dto.setUseOrgName(organizationVo.getName()); dto.setUseOrgName(organizationVo.getName());
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
//生成单据编号 //生成单据编号
String billNo = ""; String billNo = "";
String date = DateUtil.format(DateUtil.date(), "yyyyMM"); String date = DateUtil.format(DateUtil.date(), "yyyyMM");
billNo = "JJCL" + organizationVo.getOrgCode() + date; billNo = "JJCL" + organizationVo.getOrgCode() + date;
String i = baseMapper.selectNum(billNo); String i = baseMapper.selectNum(billNo);
if (StringUtils.isNotBlank(i)) { if (StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
} else { } else {
billNo = Rule.getBillNo(billNo, 0); billNo = Rule.getBillNo(billNo, 0);
} }
dto.setBillNo(billNo); dto.setBillNo(billNo);
String sid = this.insertByDto(dto); String sid = this.insertByDto(dto);
for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) { for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) {
asOldparthandleDto.setMainSid(sid); asOldparthandleDto.setMainSid(sid);
asOldparthandleService.insertByDto(asOldparthandleDto); asOldparthandleService.insertByDto(asOldparthandleDto);
} }
return sid; return sid;
} }
this.updateByDto(dto); this.updateByDto(dto);
asOldparthandleService.delByMainSid(dtoSid); asOldparthandleService.delByMainSid(dtoSid);
for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) { for (AsOldparthandleDto asOldparthandleDto : asOldparthandleList) {
asOldparthandleDto.setMainSid(dtoSid); asOldparthandleDto.setMainSid(dtoSid);
asOldparthandleService.insertByDto(asOldparthandleDto); asOldparthandleService.insertByDto(asOldparthandleDto);
} }
return dtoSid; return dtoSid;
} }
public String insertByDto(AsOldparthandleApplyDto dto){ public String insertByDto(AsOldparthandleApplyDto dto) {
AsOldparthandleApply entity = new AsOldparthandleApply(); AsOldparthandleApply entity = new AsOldparthandleApply();
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
List<String> filePaths = dto.getFilePaths(); List<String> filePaths = dto.getFilePaths();
String url = ""; String url = "";
for (String filePath : filePaths) { for (String filePath : filePaths) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
url = url + filePath + ","; url = url + filePath + ",";
} }
entity.setFilePath(url); entity.setFilePath(url);
entity.setNodeState("待提交"); entity.setNodeState("待提交");
baseMapper.insert(entity); baseMapper.insert(entity);
return entity.getSid(); return entity.getSid();
} }
public void updateByDto(AsOldparthandleApplyDto dto){ public void updateByDto(AsOldparthandleApplyDto dto) {
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
return; return;
} }
AsOldparthandleApply entity = fetchBySid(dtoSid); AsOldparthandleApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity); baseMapper.updateById(entity);
} }
public AsOldparthandleApplyDetailsVo fetchDetailsVoBySid(String sid){ public AsOldparthandleApplyDetailsVo fetchDetailsVoBySid(String sid) {
AsOldparthandleApply entity = fetchBySid(sid); AsOldparthandleApply entity = fetchBySid(sid);
AsOldparthandleApplyDetailsVo vo = new AsOldparthandleApplyDetailsVo(); AsOldparthandleApplyDetailsVo vo = new AsOldparthandleApplyDetailsVo();
BeanUtil.copyProperties(entity, vo); BeanUtil.copyProperties(entity, vo);
String filePath = entity.getFilePath(); String filePath = entity.getFilePath();
String[] filePaths = filePath.split(","); String[] filePaths = filePath.split(",");
List<String> urlPahts = new ArrayList<>(); List<String> urlPahts = new ArrayList<>();
for (String path : filePaths) { for (String path : filePaths) {
String url = fileUploadComponent.getUrlPrefix() + path; String url = fileUploadComponent.getUrlPrefix() + path;
urlPahts.add(url); urlPahts.add(url);
} }
vo.setFilePaths(urlPahts); vo.setFilePaths(urlPahts);
List<AsOldparthandleDetailsVo> asOldpartreturnDetailsVos = asOldparthandleService.selByMainSid(sid); List<AsOldparthandleDetailsVo> asOldpartreturnDetailsVos = asOldparthandleService.selByMainSid(sid);
vo.setAsOldparthandleList(asOldpartreturnDetailsVos); vo.setAsOldparthandleList(asOldpartreturnDetailsVos);
return vo; return vo;
} }
public ResultBean delAll(String[] sids) { public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
//查询该sid中是否有流程不是待提交的 //查询该sid中是否有流程不是待提交的
int count = baseMapper.selectBySid(StringUtils.join(sids, ",")); int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
if (count > 0) { if (count > 0) {
return rb.setMsg("删除的数据中包含已提交或已办结审批的数据,删除失败"); return rb.setMsg("删除的数据中包含已提交或已办结审批的数据,删除失败");
} }
delBySids(sids); delBySids(sids);
for (String sid : sids) { for (String sid : sids) {
asOldparthandleService.delByMainSid(sid); asOldparthandleService.delByMainSid(sid);
} }
return rb.success(); return rb.success();
} }
public ResultBean submit(SubmitAsOldparthandleApplyDto dto) { public ResultBean submit(SubmitAsOldparthandleApplyDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
AsOldparthandleApply asOldparthandleApply = fetchBySid(dto.getSid()); AsOldparthandleApply asOldparthandleApply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, asOldparthandleApply); int r = submitBusinessData(dto, asOldparthandleApply);
if (r == 3) { if (r == 3) {
return rb.setMsg("该申请不存在"); return rb.setMsg("该申请不存在");
} }
if (r == 0) { if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致"); return rb.setMsg("操作失败!提交的数据不一致");
} }
//新增修改保存 //新增修改保存
String businessSid = saveOrUpdateDto(dto); String businessSid = saveOrUpdateDto(dto);
asOldparthandleApply = fetchBySid(businessSid); asOldparthandleApply = fetchBySid(businessSid);
//创建BusinessVariables实体对象 //创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables(); BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。 //流程中的参数赋值、若有网关,则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
//用户的部门全路径sid //用户的部门全路径sid
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData();
bv.setOrgSidPath(deptVo.getOrgSidPath()); bv.setOrgSidPath(deptVo.getOrgSidPath());
//业务sid //业务sid
bv.setBusinessSid(businessSid); bv.setBusinessSid(businessSid);
//用户sid //用户sid
bv.setUserSid(asOldparthandleApply.getCreateBySid()); bv.setUserSid(asOldparthandleApply.getCreateBySid());
//若app移动端有此功能,则传递appMap参数 //若app移动端有此功能,则传递appMap参数
Map<String, Object> appMap = new HashMap<>(); Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid); appMap.put("sid", businessSid);
//需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。
variables.put("app", appMap); variables.put("app", appMap);
//流程定义id //流程定义id
bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId());
bv.setFormVariables(variables); bv.setFormVariables(variables);
if (r == 1) { if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv); ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData(); UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo)); updateFlowFiled(BeanUtil.beanToMap(ufVo));
//极光推送 //极光推送
asOldparthandleApply = fetchBySid(businessSid); asOldparthandleApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo(); MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo); BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo); messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap); messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid); messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("旧件处理申请"); messageFlowableQuery.setModuleName("旧件处理申请");
messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("旧件处理申请"); messageFlowableQuery.setMsgTitle("旧件处理申请");
messageFeign.pushMessage(messageFlowableQuery); messageFeign.pushMessage(messageFlowableQuery);
return voResultBean; return voResultBean;
} }
if (r == 2) { if (r == 2) {
// ToDo:驳回到发起人后再次提交 // ToDo:驳回到发起人后再次提交
if (StringUtils.isBlank(dto.getInstanceId())) { if (StringUtils.isBlank(dto.getInstanceId())) {
return rb.setMsg("参数错误:instanceId"); return rb.setMsg("参数错误:instanceId");
} }
bv.setTaskId(asOldparthandleApply.getTaskId()); bv.setTaskId(asOldparthandleApply.getTaskId());
bv.setTaskDefKey(asOldparthandleApply.getNodeId()); bv.setTaskDefKey(asOldparthandleApply.getNodeId());
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
bv.setInstanceId(dto.getInstanceId()); bv.setInstanceId(dto.getInstanceId());
return complete(bv); return complete(bv);
} }
return rb; return rb;
} }
private synchronized int submitBusinessData(SubmitAsOldparthandleApplyDto dto, AsOldparthandleApply asOldparthandleApply) { private synchronized int submitBusinessData(SubmitAsOldparthandleApplyDto dto, AsOldparthandleApply asOldparthandleApply) {
int r = 0; int r = 0;
if (StringUtils.isBlank(dto.getSid())) { if (StringUtils.isBlank(dto.getSid())) {
r = 1; r = 1;
} else { } else {
if (asOldparthandleApply != null) { if (asOldparthandleApply != null) {
String businessTaskId = asOldparthandleApply.getTaskId(); String businessTaskId = asOldparthandleApply.getTaskId();
if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) { if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
//新提交 //新提交
r = 1; r = 1;
} else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) { } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
//二次提交//只有数据一致的时候才能进行下一步 //二次提交//只有数据一致的时候才能进行下一步
r = 2; r = 2;
} }
} else { } else {
r = 3; r = 3;
} }
} }
return r; return r;
} }
private int updateFlowFiled(Map<String, Object> map) { private int updateFlowFiled(Map<String, Object> map) {
return baseMapper.updateFlowFiled(map); return baseMapper.updateFlowFiled(map);
} }
public ResultBean complete(BusinessVariables bv) { public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
String businessSid = bv.getBusinessSid(); String businessSid = bv.getBusinessSid();
AsOldparthandleApply asOldparthandleApply = fetchBySid(businessSid); AsOldparthandleApply asOldparthandleApply = fetchBySid(businessSid);
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>(); Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid); appMap.put("sid", businessSid);
variables.put("app", appMap); variables.put("app", appMap);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
if (StringUtils.isBlank(asOldparthandleApply.getProcDefId())) { if (StringUtils.isBlank(asOldparthandleApply.getProcDefId())) {
flowProcessMapQuery.setProDefKey(bv.getModelId()); flowProcessMapQuery.setProDefKey(bv.getModelId());
} else { } else {
flowProcessMapQuery.setProDefKey(asOldparthandleApply.getProcDefId()); flowProcessMapQuery.setProDefKey(asOldparthandleApply.getProcDefId());
} }
flowProcessMapQuery.setVariables(variables); flowProcessMapQuery.setVariables(variables);
variables = flowableFeign.getMap(flowProcessMapQuery).getData(); variables = flowableFeign.getMap(flowProcessMapQuery).getData();
//======================================= //=======================================
bv.setFormVariables(variables); bv.setFormVariables(variables);
//用户的部门全路径sid //用户的部门全路径sid
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(asOldparthandleApply.getDeptSid()).getData();
bv.setOrgSidPath(deptVo.getOrgSidPath()); bv.setOrgSidPath(deptVo.getOrgSidPath());
if (bv.getTaskId().equals(asOldparthandleApply.getTaskId())) { if (bv.getTaskId().equals(asOldparthandleApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv); ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
UpdateFlowFieldVo ufVo = resultBean.getData(); UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
} else { } else {
//极光推送 //极光推送
asOldparthandleApply = fetchBySid(businessSid); asOldparthandleApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo(); MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo); BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(asOldparthandleApply.getProcDefId()); ufVo.setProcDefId(asOldparthandleApply.getProcDefId());
ufVo.setProcInsId(asOldparthandleApply.getProcInstId()); ufVo.setProcInsId(asOldparthandleApply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo); messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap); messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid); messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("旧件处理申请"); messageFlowableQuery.setModuleName("旧件处理申请");
messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("旧件处理申请"); messageFlowableQuery.setMsgTitle("旧件处理申请");
messageFeign.pushMessage(messageFlowableQuery); messageFeign.pushMessage(messageFlowableQuery);
} }
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
} else { } else {
return rb.setMsg("操作失败!提交的数据不一致"); return rb.setMsg("操作失败!提交的数据不一致");
} }
} }
public ResultBean<List<AsOldparthandleApplyNodeVo>> getPreviousNodesForReject(AsOldparthandleApplyNodeQuery query) { public ResultBean<List<AsOldparthandleApplyNodeVo>> getPreviousNodesForReject(AsOldparthandleApplyNodeQuery query) {
ResultBean<List<AsOldparthandleApplyNodeVo>> rb = ResultBean.fireFail(); ResultBean<List<AsOldparthandleApplyNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables(); BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv); BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo //判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<AsOldparthandleApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsOldparthandleApplyNodeVo.class)).collect(Collectors.toList()); List<AsOldparthandleApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsOldparthandleApplyNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList); return rb.success().setData(voList);
} }
public ResultBean<List<AsOldparthandleApplyNodeVo>> getNextNodesForSubmit(AsOldparthandleApplyNodeQuery query) { public ResultBean<List<AsOldparthandleApplyNodeVo>> getNextNodesForSubmit(AsOldparthandleApplyNodeQuery query) {
ResultBean<List<AsOldparthandleApplyNodeVo>> rb = ResultBean.fireFail(); ResultBean<List<AsOldparthandleApplyNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables(); BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv); BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId()); bv.setModelId(ProcDefEnum.ASOLDPARTHANDLEAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo //判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<AsOldparthandleApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsOldparthandleApplyNodeVo.class)).collect(Collectors.toList()); List<AsOldparthandleApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AsOldparthandleApplyNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList); return rb.success().setData(voList);
} }
public ResultBean reject(AsOldparthandleApplyTaskQuery query) { public ResultBean reject(AsOldparthandleApplyTaskQuery query) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
String businessSid = query.getBusinessSid(); String businessSid = query.getBusinessSid();
AsOldparthandleApply asOldparthandleApply = fetchBySid(businessSid); AsOldparthandleApply asOldparthandleApply = fetchBySid(businessSid);
if (asOldparthandleApply == null) { if (asOldparthandleApply == null) {
return rb.setMsg("该申请不存在"); return rb.setMsg("该申请不存在");
} }
String businessTaskId = asOldparthandleApply.getTaskId(); String businessTaskId = asOldparthandleApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) { if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) { if (businessTaskId.equals(query.getTaskId())) {
if (StringUtils.isBlank(query.getComment())) { if (StringUtils.isBlank(query.getComment())) {
return rb.setMsg("请填写意见"); return rb.setMsg("请填写意见");
} }
if (StringUtils.isBlank(query.getUserSid())) { if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid"); return rb.setMsg("参数错误:userSid");
} }
FlowTaskVo flowTaskVo = new FlowTaskVo(); FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo); BeanUtil.copyProperties(query, flowTaskVo);
Map<String, Object> variables = new HashMap<>(); Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>(); Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid); appMap.put("sid", businessSid);
variables.put("app", appMap); variables.put("app", appMap);
flowTaskVo.setValues(variables); flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo); ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
UpdateFlowFieldVo ufVo = resultBean.getData(); UpdateFlowFieldVo ufVo = resultBean.getData();
Map<String, Object> map = BeanUtil.beanToMap(ufVo); Map<String, Object> map = BeanUtil.beanToMap(ufVo);
//更新业务中的流程相关的参数 //更新业务中的流程相关的参数
updateFlowFiled(map); updateFlowFiled(map);
//极光推送 //极光推送
asOldparthandleApply = fetchBySid(businessSid); asOldparthandleApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo(); MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo); BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = asOldparthandleApply.getProcInstId(); String procId = asOldparthandleApply.getProcInstId();
ufVo.setProcInsId(procId); ufVo.setProcInsId(procId);
ufVo.setProcDefId(asOldparthandleApply.getProcDefId()); ufVo.setProcDefId(asOldparthandleApply.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo); messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap); messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid); messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("旧件处理申请"); messageFlowableQuery.setModuleName("旧件处理申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId); ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(asOldparthandleApply.getCreateBySid())) { if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(asOldparthandleApply.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else { } else {
messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); messageFlowableQuery.setMsgContent(asOldparthandleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
} }
messageFlowableQuery.setMsgTitle("旧件处理申请"); messageFlowableQuery.setMsgTitle("旧件处理申请");
messageFeign.pushMessage(messageFlowableQuery); messageFeign.pushMessage(messageFlowableQuery);
return rb.success(); return rb.success();
} }
} }
return rb.setMsg("操作失败!提交的数据不一致!"); return rb.setMsg("操作失败!提交的数据不一致!");
} }
public ResultBean revokeProcess(AsOldparthandleApplyTaskQuery query) { public ResultBean revokeProcess(AsOldparthandleApplyTaskQuery query) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getUserSid())) { if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid"); return rb.setMsg("参数错误:userSid");
} }
AsOldparthandleApply asOldparthandleApply = fetchBySid(query.getBusinessSid()); AsOldparthandleApply asOldparthandleApply = fetchBySid(query.getBusinessSid());
String businessTaskId = asOldparthandleApply.getTaskId(); String businessTaskId = asOldparthandleApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) { if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) { if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo(); FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo); BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo); ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
} }
} }
return rb.setMsg("操作失败,提交的数据不一致!"); return rb.setMsg("操作失败,提交的数据不一致!");
} }
public ResultBean breakProcess(AsOldparthandleApplyTaskQuery query) { public ResultBean breakProcess(AsOldparthandleApplyTaskQuery query) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getInstanceId())) { if (StringUtils.isBlank(query.getInstanceId())) {
return rb.setMsg("参数错误:instanceId"); return rb.setMsg("参数错误:instanceId");
} }
if (StringUtils.isBlank(query.getUserSid())) { if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid"); return rb.setMsg("参数错误:userSid");
} }
if (StringUtils.isBlank(query.getComment())) { if (StringUtils.isBlank(query.getComment())) {
return rb.setMsg("请填写意见"); return rb.setMsg("请填写意见");
} }
AsOldparthandleApply asOldparthandleApply = fetchBySid(query.getBusinessSid()); AsOldparthandleApply asOldparthandleApply = fetchBySid(query.getBusinessSid());
String businessTaskId = asOldparthandleApply.getTaskId(); String businessTaskId = asOldparthandleApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) { if (StringUtils.isNotBlank(businessTaskId)) {
if (query.getUserSid().equals(asOldparthandleApply.getCreateBySid())) { if (query.getUserSid().equals(asOldparthandleApply.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo(); FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo); BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo); ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData()); Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map); updateFlowFiled(map);
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
} else { } else {
if (businessTaskId.equals(query.getTaskId())) { if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo(); FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo); BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo); ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData()); Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map); updateFlowFiled(map);
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
} }
} }
} }
return rb.setMsg("操作失败!提交的数据不一致!"); return rb.setMsg("操作失败!提交的数据不一致!");
} }
public ResultBean delegate(AsOldparthandleApplyDelegateQuery query) { public ResultBean delegate(AsOldparthandleApplyDelegateQuery query) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
FlowDelegateQuery delegateQuery = new FlowDelegateQuery(); FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
BeanUtil.copyProperties(query, delegateQuery); BeanUtil.copyProperties(query, delegateQuery);
flowFeign.delegate(delegateQuery); flowFeign.delegate(delegateQuery);
return rb.success(); return rb.success();
} }
} }

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

@ -39,35 +39,22 @@ import org.apache.ibatis.annotations.Update;
import java.util.List; import java.util.List;
import java.util.Map; 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 @Mapper
public interface AsOldpartreturnApplyMapper extends BaseMapper<AsOldpartreturnApply> { public interface AsOldpartreturnApplyMapper extends BaseMapper<AsOldpartreturnApply> {
IPage<AsOldpartreturnApplyVo> selectPageVo(IPage<AsOldpartreturnApply> page, @Param(Constants.WRAPPER) Wrapper<AsOldpartreturnApply> qw); IPage<AsOldpartreturnApplyVo> selectPageVo(IPage<AsOldpartreturnApply> page, @Param(Constants.WRAPPER) Wrapper<AsOldpartreturnApply> qw);
int updateFlowFiled(Map<String, Object> map); int updateFlowFiled(Map<String, Object> map);
int selectBySid(String join); int selectBySid(String join);
String selectNum(String billNo); String selectNum(String billNo);
List<AsOldpartreturnDetailExcelVo> downloadTobeOutExcel(String sid); List<AsOldpartreturnDetailExcelVo> downloadTobeOutExcel(String sid);
@Update("update as_oldpartreturn_apply set state = #{state} where sid = #{sid}") @Update("update as_oldpartreturn_apply set state = #{state} where sid = #{sid}")
void updateState(@Param("sid") String sid,@Param("state") String state); void updateState(@Param("sid") String sid, @Param("state") String state);
@Update("update as_oldpartreturn_apply set state = #{state} where billNo = #{billNo}") @Update("update as_oldpartreturn_apply set state = #{state} where billNo = #{billNo}")
void updateStateByBillNo(@Param("billNo") String billNo,@Param("state") String state); void updateStateByBillNo(@Param("billNo") String billNo, @Param("state") String state);
} }

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

@ -12,7 +12,7 @@
FROM FROM
as_oldpartreturn_apply aoa as_oldpartreturn_apply aoa
LEFT JOIN as_oldpartreturn AS ao LEFT JOIN as_oldpartreturn AS ao
ON aoa.`sid` = ao.`mainSid` ON aoa.sid = ao.mainSid
LEFT JOIN as_oldpartreturn_confirm ac LEFT JOIN as_oldpartreturn_confirm ac
ON aoa.billNo = ac.billNo ON aoa.billNo = ac.billNo
LEFT JOIN anrui_portal.sys_organization AS s ON aoa.deptSid = s.sid 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())){ if (StringUtils.isNotBlank(query.getBillNo())){
qw.like("aoa.billNo",query.getBillNo()); qw.like("aoa.billNo",query.getBillNo());
} }
if (StringUtils.isNotBlank(query.getConfirmResult())){
qw.like("ac.state",query.getConfirmResult());
}
qw.groupBy("aoa.sid"); qw.groupBy("aoa.sid");
String createStartTime = query.getCreateStartTime(); String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime(); String createEndTime = query.getCreateEndTime();
@ -688,6 +691,10 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
for (AsOldpartreturnExcelInfo asOldpartreturnExcelInfo : resultList) { for (AsOldpartreturnExcelInfo asOldpartreturnExcelInfo : resultList) {
AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(asOldpartreturnExcelInfo.getClaimBillNo()); AsBusclaimBill asBusclaimBill = asBusclaimBillService.selectByBillNo(asOldpartreturnExcelInfo.getClaimBillNo());
AsOldpartreturnDetailsVo asOldpartreturnDetailsVo = asBusrepairInventorybillDetailService.selByGdSidAndOldCode(asBusclaimBill.getRepairBillSid(),asOldpartreturnExcelInfo.getGoodsSkuCode()); AsOldpartreturnDetailsVo asOldpartreturnDetailsVo = asBusrepairInventorybillDetailService.selByGdSidAndOldCode(asBusclaimBill.getRepairBillSid(),asOldpartreturnExcelInfo.getGoodsSkuCode());
if (asOldpartreturnDetailsVo == null){
importReturn.setCheckInfo(asOldpartreturnExcelInfo.getVinNo() + "维修出/退库信息不存在");
break;
}
asOldpartreturnDetailsVo.setVinNo(asOldpartreturnExcelInfo.getVinNo()); asOldpartreturnDetailsVo.setVinNo(asOldpartreturnExcelInfo.getVinNo());
asOldpartreturnDetailsVo.setSourceBillNo(asBusclaimBill.getRepairBillNo()); asOldpartreturnDetailsVo.setSourceBillNo(asBusclaimBill.getRepairBillNo());
asOldpartreturnDetailsVo.setClaimBillNo(asOldpartreturnExcelInfo.getClaimBillNo()); 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; 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 @Mapper
public interface AsOldpartreturnConfirmMapper extends BaseMapper<AsOldpartreturnConfirm> { 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 FROM
as_oldpartreturn_confirm aoc as_oldpartreturn_confirm aoc
LEFT JOIN as_oldpartreturn_confirm_detail AS aod 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 LEFT JOIN anrui_portal.sys_organization AS s ON aoc.deptSid = s.sid
<where> ${ew.sqlSegment} </where> <where> ${ew.sqlSegment} </where>
</select> </select>

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

@ -38,48 +38,35 @@ import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo;
import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDetailsVo; import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDetailsVo;
import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDto; 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 = "旧件返厂厂家确认") @Api(tags = "旧件返厂厂家确认")
@RestController @RestController
@RequestMapping("v1/asoldpartreturnconfirm") @RequestMapping("v1/asoldpartreturnconfirm")
public class AsOldpartreturnConfirmRest { public class AsOldpartreturnConfirmRest {
@Autowired @Autowired
private AsOldpartreturnConfirmService asOldpartreturnConfirmService; private AsOldpartreturnConfirmService asOldpartreturnConfirmService;
@ApiOperation("根据条件分页查询数据的列表") @ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage") @PostMapping("/listPage")
public ResultBean<PagerVo<AsOldpartreturnConfirmVo>> listPage(@RequestBody PagerQuery<AsOldpartreturnConfirmQuery> pq){ public ResultBean<PagerVo<AsOldpartreturnConfirmVo>> listPage(@RequestBody PagerQuery<AsOldpartreturnConfirmQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
PagerVo<AsOldpartreturnConfirmVo> pv = asOldpartreturnConfirmService.listPageVo(pq); PagerVo<AsOldpartreturnConfirmVo> pv = asOldpartreturnConfirmService.listPageVo(pq);
return rb.success().setData(pv); return rb.success().setData(pv);
} }
@ApiOperation("确认") @ApiOperation("确认")
@PostMapping("/confirm") @PostMapping("/confirm")
public ResultBean confirm(@RequestBody AsOldpartreturnConfirmDto dto){ public ResultBean confirm(@RequestBody AsOldpartreturnConfirmDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
asOldpartreturnConfirmService.saveOrUpdateDto(dto); asOldpartreturnConfirmService.saveOrUpdateDto(dto);
return rb.success(); return rb.success();
} }
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}") @GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<AsOldpartreturnConfirmDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){ public ResultBean<AsOldpartreturnConfirmDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
AsOldpartreturnConfirmDetailsVo vo = asOldpartreturnConfirmService.fetchDetailsVoBySid(sid); AsOldpartreturnConfirmDetailsVo vo = asOldpartreturnConfirmService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
} }

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.ArrayList;
import java.util.List; 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 @Service
public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartreturnConfirmMapper, AsOldpartreturnConfirm> { public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartreturnConfirmMapper, AsOldpartreturnConfirm> {
@ -138,6 +125,9 @@ public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartr
if (StringUtils.isNotBlank(query.getBillNo())) { if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("aoc.billNo", query.getBillNo()); qw.like("aoc.billNo", query.getBillNo());
} }
if (StringUtils.isNotBlank(query.getConfirmResult())) {
qw.like("aoc.state", query.getConfirmResult());
}
qw.groupBy("aoc.sid"); qw.groupBy("aoc.sid");
String createStartTime = query.getCreateStartTime(); String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime(); String createEndTime = query.getCreateEndTime();
@ -208,6 +198,7 @@ public class AsOldpartreturnConfirmService extends MybatisBaseService<AsOldpartr
} }
AsOldpartreturnConfirm entity = fetchBySid(dtoSid); AsOldpartreturnConfirm entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setState(2);
baseMapper.updateById(entity); 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 warehouseSid;
//仓库名称 //仓库名称
private String warehouseName; private String warehouseName;
//库区sid
private String warehouseAreaSid;
//库区名称
private String warehouseAreaName;
//库位sid //库位sid
private String warehouseRackSid; 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.goodsSkuOwnSpec,
wi.manufacturerSid, wi.manufacturerSid,
wi.manufacturerName, wi.manufacturerName,
wi.billObjSid AS supplierSid, wi.supplierSid,
wi.billObjName AS supplierName, wi.supplierName,
wi.unit, wi.unit,
wi.warehouseSid, wi.warehouseSid,
wi.warehouseName, wi.warehouseName,
wa.sid AS warehouseAreaSid,
wa.areaName AS warehouseAreaName,
wi.warehouseRackSid, wi.warehouseRackSid,
wi.warehouseRackCode, wi.warehouseRackCode,
wi.count, wi.count,
@ -341,6 +343,10 @@
av.vinNo av.vinNo
FROM FROM
wms_inventory wi 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 LEFT JOIN yxt_4sas.as_busrepair_inventorybill_detail ad
ON wi.sid = ad.oldInventorySid ON wi.sid = ad.oldInventorySid
LEFT JOIN yxt_4sas.as_busrepair_inventorybill ai LEFT JOIN yxt_4sas.as_busrepair_inventorybill ai

Loading…
Cancel
Save