Browse Source

Merge remote-tracking branch 'origin/master'

master
God 10 months ago
parent
commit
d9f756388e
  1. 115
      yxt-as-ui/src/api/basicinformation/maintenanceProjectRecord.js
  2. 16
      yxt-as-ui/src/api/basicinformation/maintenanceitem.js
  3. 49
      yxt-as-ui/src/api/maintenance/maintenanceReturnBound.js
  4. 42
      yxt-as-ui/src/api/maintenanceReceive/maintenanceReceive.js
  5. 12
      yxt-as-ui/src/api/storage/deliveryNotice.js
  6. 10
      yxt-as-ui/src/api/storage/receivingGoods.js
  7. 65
      yxt-as-ui/src/router/index.js
  8. 326
      yxt-as-ui/src/views/basicinformation/maintenanceProjectRecord/maintenanceProjectRecord.vue
  9. 223
      yxt-as-ui/src/views/basicinformation/maintenanceProjectRecord/maintenanceProjectRecordAdd.vue
  10. 146
      yxt-as-ui/src/views/basicinformation/maintenanceProjectRecord/maintenanceProjectRecordInfo.vue
  11. 196
      yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue
  12. 205
      yxt-as-ui/src/views/maintenance/maintenanceReturnBound/relation/chooseproducts.vue
  13. 392
      yxt-as-ui/src/views/maintenanceReceive/index.vue
  14. 323
      yxt-as-ui/src/views/maintenanceReceive/maintenanceConfirm.vue
  15. 118
      yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue
  16. 89
      yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue
  17. 0
      yxt-as-ui/src/views/maintenanceReceive/relation/chooseproducts.vue
  18. 638
      yxt-as-ui/src/views/maintenanceReceive/repairbillInfo.vue
  19. 112
      yxt-as-ui/src/views/storage/deliveryNotice/index.vue
  20. 389
      yxt-as-ui/src/views/storage/deliveryNotice/procurementInfo.vue
  21. 66
      yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
  22. 24
      yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue
  23. 10
      yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceOutboundInfo.vue
  24. 52
      yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceReturnBoundInfo.vue
  25. 128
      yxt-as-ui/src/views/storage/receivingGoods/index.vue
  26. 98
      yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
  27. 248
      yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue
  28. 413
      yxt-as-ui/src/views/workFlow/weixiubeianFlow/maintenanceProjectRecordDaiBan.vue
  29. 196
      yxt-as-ui/src/views/workFlow/weixiubeianFlow/maintenanceProjectRecordEdit.vue
  30. 199
      yxt-as-ui/src/views/workFlow/weixiubeianFlow/maintenanceProjectRecordYiBan.vue

115
yxt-as-ui/src/api/basicinformation/maintenanceProjectRecord.js

@ -0,0 +1,115 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/as/v1/asserviceitemapply/listPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 初始化
init: function(data) {
return request({
url: '/as/v1/asserviceitemapply/applyInit',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 回显
fetchDetailsBySid: function(data) {
return request({
url: '/as/v1/asserviceitemapply/fetchDetailsBySid/' + data,
method: 'get'
})
},
saveOrUpdate: function(data) {
return request({
url: '/as/v1/asserviceitemapply/save',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
deleteBySids: function(data) {
return request({
url: '/as/v1/asserviceitemapply/delBySids',
method: 'DELETE',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 提交流程
submit: function(params) {
return request({
url: '/as/v1/asserviceitemapply/submitApply',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(同意)
complete: function(params) {
return request({
url: '/as/v1/asserviceitemapply/complete',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(加签)
delegate: function(params) {
return request({
url: '/as/v1/asserviceitemapply/delegate',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(驳回)
reject: function(params) {
return request({
url: '/as/v1/asserviceitemapply/reject',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(终止)
breakProcess: function(params) {
return request({
url: '/as/v1/asserviceitemapply/breakProcess',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(撤回)
revokeProcess: function(params) {
return request({
url: '/as/v1/asserviceitemapply/revokeProcess',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 审批流程(同意)获取下一环节
getNextNodesForSubmit: function(data) {
return request({
url: '/as/v1/asserviceitemapply/getNextNodesForSubmit',
method: 'get',
params: data
})
},
// 审批流程(驳回)获取上一环节
getPreviousNodesForReject: function(data) {
return request({
url: '/as/v1/asserviceitemapply/getPreviousNodesForReject',
method: 'get',
params: data
})
}
}

16
yxt-as-ui/src/api/basicinformation/maintenanceitem.js

@ -24,6 +24,22 @@ export default {
method: 'get'
})
},
disableState: function(data) {
return request({
url: '/as/v1/AsServiceItem/disableState',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
enable: function(data) {
return request({
url: '/as/v1/AsServiceItem/enable',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
deleteBySids: function(data) {
return request({
url: '/as/v1/AsServiceItem/delBySids',

49
yxt-as-ui/src/api/maintenance/maintenanceReturnBound.js

@ -1,49 +0,0 @@
import request from '@/utils/request'
export default {
// 选择工单初始化数据
initBill: function(data) {
return request({
url: '/as/v1/AsBusrepairInventorybill/init',
method: 'get',
params: data
});
},
// 查询分页列表
getGoodsListPage: function(params) {
return request({
url: '/wms/apiadmin/WmsOutBill/getInventoryList',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 新增、保存
saveBill: function(data) {
return request({
url: '/as/v1/AsBusrepairInventorybill/quitBill',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// 详情
detailsBill: function(data) {
return request({
url: '/as/v1/AsBusrepairInventorybill/details',
method: 'get',
params: data
});
},
}

42
yxt-as-ui/src/api/maintenance/maintenanceOutbound.js → yxt-as-ui/src/api/maintenanceReceive/maintenanceReceive.js

@ -2,6 +2,18 @@ import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/as/v1/AsBusrepairInventorybill/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 选择工单初始化数据
initBill: function(data) {
return request({
@ -11,8 +23,7 @@ export default {
});
},
// 查询分页列表
// 模糊查询 商品列表
getGoodsListPage: function(params) {
return request({
url: '/wms/apiadmin/WmsOutBill/getInventoryList',
@ -24,8 +35,8 @@ export default {
})
},
// 新增、保存
saveBill: function(data) {
// 新增、保存领料出库
saveOutBill: function(data) {
return request({
url: '/as/v1/AsBusrepairInventorybill/outBill',
method: 'post',
@ -36,6 +47,29 @@ export default {
});
},
// 新增、保存 领料退库
saveQuitBill: function(data) {
return request({
url: '/as/v1/AsBusrepairInventorybill/quitBill',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
saveConfirm: function(data) {
return request({
url: '/as/v1/AsBusrepairInventorybill/saveConfirm',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// 详情
detailsBill: function(data) {

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

@ -14,6 +14,18 @@ export default {
})
},
// 终止逾期到货通知单
billToEnd: function(data) {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/billToEndBySids',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
},
// 详情初始化
init: function(data) {
return request({

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

@ -14,6 +14,15 @@ export default {
})
},
// 根据收货单sid 获取上架单列表
getUpShlefList: function(data) {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/getUpShlefListBySid/' + data,
method: 'get'
});
},
// 初始化
init: function(data) {
return request({
@ -22,7 +31,6 @@ export default {
});
},
// 新增、保存
save: function(data) {
return request({

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

@ -169,30 +169,46 @@ export const constantRoutes = [{
component: () => import('@/views/operation/merchandisereturn/merchandisereturn.vue'),
name: 'MerchandiseReturn',
meta: { title: '商品退货管理', noCache: true }
},
}
]
},
{
path: '/maintenance',
path: '/maintenanceReceive',
component: Layout,
redirect: '/maintenance',
redirect: '/maintenanceReceive',
meta: {
title: '维修领料'
},
children: [
{
path: '/maintenanceReceive/index',
component: () => import('@/views/maintenanceReceive/index.vue'),
name: 'MaintenanceReceive',
meta: {
title: '维修领料',
noCache: true
}
},
{
path: '/maintenanceOutbound/index',
component: () => import('@/views/maintenance/maintenanceOutbound/index.vue'),
path: '/maintenanceReceive/maintenanceOutbound',
component: () => import('@/views/maintenanceReceive/maintenanceOutbound.vue'),
name: 'MaintenanceOutbound',
meta: { title: '维修出库', noCache: true }
meta: {
title: '维修出库',
noCache: true
}
},
{
path: '/maintenanceReturnBound/index',
component: () => import('@/views/maintenance/maintenanceReturnBound/index.vue'),
path: '/maintenanceReceive/maintenanceReturnBound',
component: () => import('@/views/maintenanceReceive/maintenanceReturnBound.vue'),
name: 'MaintenanceReturnBound',
meta: { title: '维修退库', noCache: true }
},
meta: {
title: '维修退库',
noCache: true
}
}
]
},
@ -511,6 +527,12 @@ export const constantRoutes = [{
name: 'MaintenanceItem',
meta: { title: '维修项目管理', noCache: true }
},
{
path: '/maintenanceProjectRecord/maintenanceProjectRecord',
component: () => import('@/views/basicinformation/maintenanceProjectRecord/maintenanceProjectRecord.vue'),
name: 'MaintenanceProjectRecord',
meta: { title: '维修项目备案', noCache: true }
},
{
path: '/additionitem/additionitem',
component: () => import('@/views/basicinformation/additionitem/additionitem.vue'),
@ -558,7 +580,7 @@ export const constantRoutes = [{
component: () => import('@/views/basicinformation/claimantManufacturer/claimantManufacturer.vue'),
name: 'ClaimantManufacturer',
meta: { title: '索赔厂家管理', noCache: true }
},
}
]
},
@ -794,6 +816,27 @@ export const constantRoutes = [{
import('@/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue'),
name: 'OldPartsFactoryYiBan'
},
// 维修项目备案 -- 编辑
{
path: '/weixiubeianFlow/maintenanceProjectRecordEdit',
component: () =>
import('@/views/workFlow/weixiubeianFlow/maintenanceProjectRecordEdit.vue'),
name: 'MaintenanceProjectRecordEdit'
},
// 维修项目备案 -- 待办
{
path: '/weixiubeianFlow/maintenanceProjectRecordDaiBan',
component: () =>
import('@/views/workFlow/weixiubeianFlow/maintenanceProjectRecordDaiBan.vue'),
name: 'MaintenanceProjectRecordDaiBan'
},
// 维修项目备案 -- 已办
{
path: '/weixiubeianFlow/maintenanceProjectRecordYiBan',
component: () =>
import('@/views/workFlow/weixiubeianFlow/maintenanceProjectRecordYiBan.vue'),
name: 'MaintenanceProjectRecordYiBan'
},
// 404 page must be placed at the end !!!
// { path: '*', redirect: '/404', hidden: true }
]

326
yxt-as-ui/src/views/basicinformation/maintenanceProjectRecord/maintenanceProjectRecord.vue

@ -0,0 +1,326 @@
<template>
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="维修项目备案管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请部门">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请人">
<el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="单据编号">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请日期">
<el-date-picker v-model="listQuery.params.createDateStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createDateEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="办结日期">
<el-date-picker v-model="listQuery.params.closingDateEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.closingDateStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
</div>
</div>
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">维修项目备案申请列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50" />
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="操作" width="180" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="流程状态" width="180" header-align="center">
<template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column prop="billNo" label="单据编号" align="center" width="180" />
<el-table-column prop="useOrgName" label="分公司" align="center" min-width="120" />
<el-table-column prop="deptName" label="申请部门" align="center" min-width="120" />
<el-table-column prop="createByName" label="申请人" align="center" width="120" />
<el-table-column prop="createTime" label="申请日期" align="center" width="120" />
<el-table-column prop="closingDate" label="办结日期" align="center" width="120" />
</el-table>
</div>
<!--End 主页面主要部分-->
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--End查询列表部分-->
</div>
</div>
<!--新增及修改 -->
<maintenanceProjectRecordAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList" />
<!-- 详情 -->
<maintenanceProjectRecordInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
<!-- 流程审批记录 -->
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/basicinformation/maintenanceProjectRecord'
import { getStorage } from '@/utils/auth'
import maintenanceProjectRecordAdd from './maintenanceProjectRecordAdd'
import maintenanceProjectRecordInfo from './maintenanceProjectRecordInfo'
export default {
name: 'MaintenanceProjectRecord',
components: {
Pagination,
pageye,
ButtonBar,
maintenanceProjectRecordAdd,
maintenanceProjectRecordInfo
},
data() {
return {
url: '',
dialogHeight: '80%',
centerDialogVisible: false,
btndisabled: false,
btnList: [
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1 2 3 4
tableKey: 0,
list: [],
sids: [], // SIDs
FormLoading: false,
listLoading: false,
//
listQuery: {
current: 1,
size: 5,
total: 0,
params: {
billNo: '',
closingDateEnd: '',
closingDateStart: '',
createByName: '',
createDateEnd: '',
createDateStart: '',
deptName: '',
menuUrl: '',
orgPath: '',
useOrgName: '',
userSid: ''
}
}
}
},
created() {
//
this.getList()
},
mounted() {
// vuewindowpostMessagehandleMessage
window.addEventListener('message', this.handleMessage)
this.$refs['btnbar'].setButtonList(this.btnList)
},
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
} else if (code === 2) {
this.dialogHeight = event.data.params.data
this.setIframeHeight(document.getElementById('iframe'))
}
},
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)))
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
// sid
handleSelectionChange(row) {
const aa = []
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery = {
current: 1,
size: 5,
total: 0,
params: {
billNo: '',
closingDateEnd: '',
closingDateStart: '',
createByName: '',
createDateEnd: '',
createDateStart: '',
deptName: '',
menuUrl: '',
orgPath: '',
useOrgName: '',
userSid: ''
}
}
this.getList()
},
toEdit(row) {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
},
toInfo(row) {
this.viewState = 4
this.$refs['divInfo'].showInfo(row)
},
doDel() {
if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
}
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 => {
if (resp.success) {
this.$message({ type: 'success', message: resp.msg, showClose: true })
}
this.getList()
loading.close()
}).catch(e => {
loading.close()
})
}).catch(() => {
})
},
//
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

223
yxt-as-ui/src/views/basicinformation/maintenanceProjectRecord/maintenanceProjectRecordAdd.vue

@ -0,0 +1,223 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</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.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item>
<uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.file" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.sitemsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sitemName" label="项目名称" align="center" width="170" />
<el-table-column prop="serviceType" label="工种" align="center" width="170" />
<el-table-column prop="subjectName" label="科目" align="center" width="100" />
<el-table-column prop="hourPrice" label="工时单价" align="center" width="100" />
<el-table-column prop="hours" label="工时数" align="center" width="100" />
<el-table-column prop="cost" label="外协成本" align="center" width="120" />
<el-table-column prop="price" label="销售价" align="center" width="120" />
<el-table-column prop="examineHourPrice" label="工时提成" align="center" width="120" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
<el-table-column label="预约项目" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.isReserve == '1' ? '是' : scope.row.isReserve == '0' ? '否' : '' }}</span>
</template>
</el-table-column>
<el-table-column label="洗车项目" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.isClean == '1' ? '是' : scope.row.isClean == '0' ? '否' : '' }}</span>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/basicinformation/maintenanceProjectRecord'
import uploadImg from '@/components/uploadFile/uploadImg'
import { getOrgSidByPath, fetchBySid } from '@/api/Common/dictcommons'
export default {
name: 'MaintenanceProjectRecordAdd',
components: {
uploadImg
},
data() {
return {
viewTitle: '',
viewState: 1,
submitdisabled: false,
tableKey: 1,
index: 0,
formobj: {
createByName: '',
createBySid: '',
createOrgName: '',
createOrgSid: '',
createTime: '',
deptName: '',
deptSid: '',
file: [],
instanceId: '',
sid: '',
sitemsVos: [],
taskId: '',
useOrgName: '',
useOrgSid: ''
},
rules: {}
}
},
methods: {
showAdd(val) {
this.viewTitle = '【新增】维修项目备案申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.init(val).then((res) => {
if (res.success) {
this.formobj = res.data
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
this.formobj.createOrgSid = this.formobj.deptSid
this.formobj.createOrgName = this.formobj.deptName
var nowDate = new Date()
var date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
day: nowDate.getDate()
}
this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.formobj.useOrgSid = resp.data
fetchBySid(resp.data).then((respsone) => {
if (respsone.success) {
this.formobj.useOrgName = respsone.data.name
}
})
}
})
}
})
},
showEdit(row) {
this.viewTitle = '【编辑】维修项目备案申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(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
})
}
})
},
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '提交成功' })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
createByName: '',
createBySid: '',
createOrgName: '',
createOrgSid: '',
createTime: '',
deptName: '',
deptSid: '',
file: [],
instanceId: '',
sid: '',
sitemsVos: [],
taskId: '',
useOrgName: '',
useOrgSid: ''
}
this.submitdisabled = false
this.$emit('doback')
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
</style>

146
yxt-as-ui/src/views/basicinformation/maintenanceProjectRecord/maintenanceProjectRecordInfo.vue

@ -0,0 +1,146 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</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.createTime }}</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><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.file" :key="index" :src="item" :preview-src-list="formobj.file" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.sitemsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sitemName" label="项目名称" align="center" width="170" />
<el-table-column prop="serviceType" label="工种" align="center" width="170" />
<el-table-column prop="subjectName" label="科目" align="center" width="100" />
<el-table-column prop="hourPrice" label="工时单价" align="center" width="100" />
<el-table-column prop="hours" label="工时数" align="center" width="100" />
<el-table-column prop="cost" label="外协成本" align="center" width="120" />
<el-table-column prop="price" label="销售价" align="center" width="120" />
<el-table-column prop="examineHourPrice" label="工时提成" align="center" width="120" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
<el-table-column label="预约项目" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.isReserve == '1' ? '是' : scope.row.isReserve == '0' ? '否' : '' }}</span>
</template>
</el-table-column>
<el-table-column label="洗车项目" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.isClean == '1' ? '是' : scope.row.isClean == '0' ? '否' : '' }}</span>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/basicinformation/maintenanceProjectRecord'
export default {
name: 'MaintenanceProjectRecordInfo',
data() {
return {
viewTitle: '',
viewState: 1,
tableKey: 1,
index: 0,
formobj: {
createByName: '',
createBySid: '',
createOrgName: '',
createOrgSid: '',
createTime: '',
deptName: '',
deptSid: '',
file: [],
instanceId: '',
sid: '',
sitemsVos: [],
taskId: '',
useOrgName: '',
useOrgSid: ''
},
rules: {}
}
},
methods: {
showInfo(row) {
this.viewTitle = '维修项目备案申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.file.length > 0) {
const aa = []
this.formobj.file.forEach((e) => {
aa.push(e.url)
})
this.formobj.file = aa
}
}
})
},
handleReturn() {
this.formobj = {
createByName: '',
createBySid: '',
createOrgName: '',
createOrgSid: '',
createTime: '',
deptName: '',
deptSid: '',
file: [],
instanceId: '',
sid: '',
sitemsVos: [],
taskId: '',
useOrgName: '',
useOrgSid: ''
}
this.$emit('doback')
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

196
yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue

@ -18,6 +18,16 @@
<el-form-item label="项目名称">
<el-input v-model="listQuery.params.sitemName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="备案状态">
<el-select v-model="listQuery.params.state" placeholder="请选择" clearable filterable>
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select>
</el-form-item>
<el-form-item label="使用状态">
<el-select v-model="listQuery.params.isEnable" placeholder="请选择" clearable filterable>
<el-option v-for="item in Enable_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@ -41,6 +51,17 @@
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="备案状态" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.state == '0' ? '备案中' : scope.row.state == '1' ? '未备案' : scope.row.state == '2' ? '已备案' : '' }}</span>
</template>
</el-table-column>
<el-table-column label="使用状态" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.isEnable == '0' ? '禁用' : scope.row.isEnable == '1' ? '启用' : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="sitemCode" label="拼音缩写" align="center" width="100" />
<el-table-column prop="sitemName" label="项目名称" align="center" width="130" />
<el-table-column prop="sitemCode" label="拼音缩写" align="center" width="100" />
<el-table-column prop="serviceType" label="分类" align="center" width="100" />
@ -73,6 +94,8 @@
<maintenanceitemAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
<!--详情-->
<maintenanceitemInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
<!-- 备案 -->
<maintenanceProjectRecordAdd v-show="viewState == 5" ref="divBeiAn" @doback="resetState" />
</div>
</template>
@ -83,6 +106,8 @@ import ButtonBar from '@/components/ButtonBar'
import req from '@/api/basicinformation/maintenanceitem'
import maintenanceitemAdd from './maintenanceitemAdd'
import maintenanceitemInfo from './maintenanceitemInfo'
import maintenanceProjectRecordAdd from '../maintenanceProjectRecord/maintenanceProjectRecordAdd'
import { getButtonPermissions } from '@/api/Common/dictcommons'
export default {
name: 'MaintenanceItem',
@ -91,7 +116,8 @@ export default {
pageye,
ButtonBar,
maintenanceitemAdd,
maintenanceitemInfo
maintenanceitemInfo,
maintenanceProjectRecordAdd
},
data() {
return {
@ -104,6 +130,27 @@ export default {
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toBeiAn',
btnLabel: '备案'
},
{
type: 'danger',
size: 'small',
icon: '',
btnKey: 'toForbidden',
btnLabel: '禁用'
},
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toEnable',
btnLabel: '启用'
},
{
type: 'danger',
size: 'small',
@ -125,12 +172,37 @@ export default {
tableKey: 0,
list: [],
sids: [], // SIDs
multipleSelection: [],
state_list: [
{
dictKey: '0',
dictValue: '备案中'
},
{
dictKey: '1',
dictValue: '未备案'
},
{
dictKey: '2',
dictValue: '已备案'
}
],
Enable_list: [
{
dictKey: '1',
dictValue: '启用'
},
{
dictKey: '0',
dictValue: '禁用'
}
],
FormLoading: false,
listLoading: false,
//
listQuery: {
current: 1,
size: 10,
size: 5,
total: 0,
params: {
serviceType: '',
@ -139,7 +211,9 @@ export default {
type: '1',
orgPath: '',
menuUrl: '',
userSid: ''
userSid: '',
state: '',
isEnable: ''
}
}
}
@ -149,7 +223,18 @@ export default {
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
if (res.success) {
for (var i = 0; i < res.data.length; i++) {
for (var k = 0; k < this.btnList.length; k++) {
if (res.data[i].buttonId === this.btnList[k].btnKey) {
this.btnList.splice(k, 1)
}
}
}
this.$refs['btnbar'].setButtonList(this.btnList)
}
})
},
methods: {
//
@ -167,6 +252,15 @@ export default {
case 'toAdd':
this.toAdd()
break
case 'toBeiAn':
this.toBeiAn()
break
case 'toForbidden':
this.toForbidden()
break
case 'toEnable':
this.toEnable()
break
case 'doDel':
this.doDel()
break
@ -180,6 +274,7 @@ export default {
// sid
handleSelectionChange(row) {
const aa = []
this.multipleSelection = row
row.forEach(element => {
aa.push(element.sid)
})
@ -217,7 +312,7 @@ export default {
handleReset() {
this.listQuery = {
current: 1,
size: 10,
size: 5,
total: 0,
params: {
serviceType: '',
@ -226,7 +321,9 @@ export default {
type: '1',
orgPath: '',
menuUrl: '',
userSid: ''
userSid: '',
state: '',
isEnable: ''
}
}
this.getList()
@ -236,18 +333,101 @@ export default {
this.$refs['divAdd'].showAdd()
},
toEdit(row) {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
if (row.state !== '0') {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
} else {
this.$message({ showClose: true, type: 'error', message: '因该条记录备案状态为备案中,操作失败' })
}
},
toInfo(row) {
this.viewState = 4
this.$refs['divInfo'].showInfo(row)
},
toBeiAn() {
if (this.sids.length > 0) {
for (var i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].state === '0' || this.multipleSelection[i].state === '2') {
this.$message({ showClose: true, type: 'error', message: '请选择备案状态为未备案的记录进行操作' })
return
}
}
this.viewState = 5
this.$refs['divBeiAn'].showAdd(this.sids)
} else {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行操作' })
}
},
toForbidden() {
if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行操作' })
return
}
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.disableState(this.sids).then(resp => {
if (resp.success) {
this.$message({ type: 'success', message: resp.msg, showClose: true })
}
this.getList()
loading.close()
}).catch(e => {
loading.close()
})
}).catch(() => {
})
},
toEnable() {
if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行操作' })
return
}
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.enable(this.sids).then(resp => {
if (resp.success) {
this.$message({ type: 'success', message: resp.msg, showClose: true })
}
this.getList()
loading.close()
}).catch(e => {
loading.close()
})
}).catch(() => {
})
},
//
doDel() {
if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
} else {
for (var i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].state === '0' || this.multipleSelection[i].state === '2') {
this.$message({ showClose: true, type: 'error', message: '请选择备案状态为未备案的记录进行操作' })
return
}
}
}
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {

205
yxt-as-ui/src/views/maintenance/maintenanceReturnBound/relation/chooseproducts.vue

@ -1,205 +0,0 @@
<template>
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>选择维修工单</div>
<div>
<!-- <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button> -->
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
<el-form-item label="工单编号" class="searchlist">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="客户名称" class="searchlist">
<el-input v-model="listQuery.params.customerName" placeholder="" clearable />
</el-form-item>
<el-form-item label="车牌号" class="searchlist">
<el-input v-model="listQuery.params.vehMark" placeholder="" clearable />
</el-form-item>
<el-form-item label="进厂日期">
<el-date-picker v-model="listQuery.params.entryStartTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="listQuery.params.entryEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">维修工单列表</div>
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%">
<!-- @selection-change="handleSelectionChange"> -->
<!-- <el-table-column width="50px" type="selection" align="center"/> -->
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" width="100" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toInfo(scope.row)">确认</el-button>
</template>
</el-table-column>
<el-table-column prop="billNo" label="工单编号" align="center" />
<el-table-column prop="billType" label="工单类型" align="center" />
<el-table-column prop="customerName" label="客户名称" align="center" />
<el-table-column prop="mobile" label="联系电话" align="center" />
<el-table-column prop="vinNo" label="车架号" align="center" />
<el-table-column prop="vehMark" label="车牌号" align="center" />
<el-table-column prop="entryTime" label="进厂日期" align="center" />
</el-table>
</div>
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
</div>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import {
getAsBusrepairBill
} from '@/api/Common/dictcommons'
export default {
name: 'SelectVehicle',
components: {
Pagination
},
data() {
return {
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
tableKey: 0,
sids: [],
list: [],
number: '',
listLoading: false,
listQuery: {
current: 1,
size: 10,
params: {
nodeCode: 3,
billNo: '',
customerName: '',
vehMark: '',
entryStartTime: '',
entryEndTime: ''
},
total: 0
}
}
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
// this.listQuery.params.menuUrl = this.$route.path
this.listQuery.params.menuUrl = ""
getAsBusrepairBill(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.listQuery.total = response.data.total
this.list = response.data.records
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery = {
current: 1,
size: 10,
params: {
nodeCode: 3,
billNo: '',
customerName: '',
vehMark: '',
entryStartTime: '',
entryEndTime: ''
},
total: 0
}
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, createOrgSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.createOrgSid = createOrgSid
this.listQuery.current = 1
this.listQuery.size = 10
this.listQuery.total = 0
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
})
}
},
toInfo(row){
this.$emit('backData', row.sid)
},
//
handleReturn() {
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

392
yxt-as-ui/src/views/maintenanceReceive/index.vue

@ -0,0 +1,392 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="维修领料" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">
{{ searchxianshitit }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="维修状态">
<el-select v-model="queryParams.params.repairState" filterable clearable placeholder="请选择"
style="width:100%">
<el-option v-for="item in repairTypeList" :key="item.sid" :label="item.name" :value="item.name">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="工单编号">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="工单类型">
<el-select v-model="queryParams.params.billType" filterable clearable placeholder="请选择"
style="width:100%">
<el-option v-for="item in billTypeList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="科目">
<el-select v-model="queryParams.params.subject" filterable clearable placeholder="请选择"
style="width:100%">
<el-option v-for="item in subjectList" :key="item.subjectSid" :label="item.subject"
:value="item.subject">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="客户名称">
<el-input v-model="queryParams.params.customerName" placeholder="" clearable />
</el-form-item>
<el-form-item label="车牌号">
<el-input v-model="queryParams.params.vehMark" placeholder="" clearable />
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="queryParams.params.vinNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="进厂日期">
<el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
<!-- Start 项目列表头部 -->
<div class="listtop">
<div class="tit">维修领料列表</div>
</div>
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center" />
<el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="repairState" label="维修状态" 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.billNo }}
</div>
</template>
</el-table-column>
<el-table-column prop="billTypeValue" label="工单类型" align="center" />
<el-table-column prop="subjectValue" label="科目" align="center" />
<el-table-column prop="isGoOut" label="是否外出" align="center" />
<el-table-column prop="customerName" label="客户名称" align="center" />
<el-table-column prop="mobile" label="联系电话" align="center" />
<el-table-column prop="vehMark" label="车架号" align="center" />
<el-table-column prop="vinNo" label="车牌号" align="center" />
<el-table-column prop="entryTime" label="进厂日期" align="center" />
</el-table>
</div>
<!-- End 项目列表 -->
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div>
</div>
</div>
<!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 -->
<divOutInfo v-show="viewState == 2 " ref="divOutInfo" @doback="resetState" @reloadlist="loadList" />
<divReturnInfo v-show="viewState == 3" ref="divReturnInfo" @doback="resetState" @reloadlist="loadList" />
<divConfirmInfo v-show="viewState ==4" ref="divConfirmInfo" @doback="resetState" @reloadlist="loadList" />
<divInfo v-show="viewState == 5" ref="divInfo" @doback="resetState" @reloadlist="loadList" />
</div>
</template>
<script>
import req from '@/api/maintenanceReceive/maintenanceReceive.js'
import {
selSubjectInfo,
typeValues
} from '@/api/Common/dictcommons'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divOutInfo from './maintenanceOutbound.vue'
import divReturnInfo from './maintenanceReturnBound.vue'
import divConfirmInfo from './maintenanceConfirm.vue'
import divInfo from './repairbillInfo.vue'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divOutInfo,
divReturnInfo,
divConfirmInfo,
divInfo,
},
data() {
return {
dialogVisible: false,
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toOut',
btnLabel: '领料出库'
},
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toReturn',
btnLabel: '领料退库'
},
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toConfirm',
btnLabel: '商品出库确认'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
"repairState": "",
"billNo": "",
"billType": "",
"subject": "",
"customerName": "",
"vehMark": "",
"vinNo": "",
"createTimeStart": "",
"createTimeEnd": "",
}
},
sids: [],
selectionList: [],
repairTypeList: [{
name: "维修中",
sid: "1"
},
{
name: "维修完成",
sid: "2"
}
],
billTypeList: [],
subjectList: []
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.loadList()
this.init()
},
methods: {
init() {
typeValues({
type: 'billType'
}).then((res) => {
if (res.success) {
this.billTypeList = res.data
}
})
selSubjectInfo({
useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
'defaultOrgPath').lastIndexOf('/') + 1)
}).then((resp) => {
if (resp.success) {
this.subjectList = resp.data
}
})
},
selectionLineChangeHandle(val) {
console.log("val", 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 'toOut':
this.toOut()
break
case 'toReturn':
this.toReturn()
break
case 'toConfirm':
this.toConfirm()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
toOut() {
// this.$refs['divOutInfo'].showAdd('236195bd-2c76-4e39-aacb-e6ed89b4ca3d')
// this.viewState = 2
if (this.sids.length === 1) {
this.viewState = 2
this.$refs['divOutInfo'].showAdd(this.sids[0])
} else {
this.$message({
showClose: true,
type: 'warning',
message: '请选择一条记录进行操作'
})
}
},
toReturn() {
// this.$refs['divReturnInfo'].showAdd('4e2b2a7d-d86c-415f-aa69-65e311a73c50')
// this.viewState = 3
if (this.sids.length === 1) {
this.viewState = 3
this.$refs['divReturnInfo'].showAdd(this.sids[0])
} else {
this.$message({
showClose: true,
type: 'warning',
message: '请选择一条记录进行操作'
})
}
},
toConfirm() {
// this.viewState = 4
// this.$refs['divConfirmInfo'].showAdd('4e2b2a7d-d86c-415f-aa69-65e311a73c50')
if (this.sids.length === 1) {
if (this.selectionList[0].repairState == '2') {
this.viewState = 4
this.$refs['divConfirmInfo'].showAdd(this.sids[0])
} else {
this.$message({
showClose: true,
type: 'warning',
message: '只能选择维修完成的工单'
})
}
} else {
this.$message({
showClose: true,
type: 'warning',
message: '请选择一条记录进行操作'
})
}
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
loadList() {
this.tableLoading = true
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 {
// 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: {
"repairState": "",
"billNo": "",
"billType": "",
"subject": "",
"customerName": "",
"vehMark": "",
"vinNo": "",
"createTimeStart": "",
"createTimeEnd": "",
}
}
this.loadList()
},
resetState() {
this.viewState = 1
},
showResult(row) {
this.viewState = 5
this.$refs['divAdd'].showAdd(row.sid)
},
}
}
</script>
<style scoped>
</style>

323
yxt-as-ui/src/views/maintenanceReceive/maintenanceConfirm.vue

@ -0,0 +1,323 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<!-- 标题 -->
<div>商品出库确认</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">确认</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item>
<el-input v-model="confirmInfo.remarks" placeholder="备注" class="addinputw addinputInfo" clearable />
</el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>维修工单</div>
</div>
<el-row>
<el-col :span="8">
<div class="span-sty">维修工单编号</div>
<el-form-item>
<span class="addinputw addinputInfo">{{formobj.sourceBillNo}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单据日期</div>
<el-form-item>
<span class="addinputw addinputInfo">{{formobj.billDate}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">服务顾问</div>
<el-form-item>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">工单类型</div>
<el-form-item>
<span class="addinputw addinputInfo">{{formobj.billType}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">科目</div>
<el-form-item>
<span class="addinputw addinputInfo">{{formobj.subject}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否外出</div>
<el-form-item>
<el-radio-group class="addinputw addinputInfo" :disabled="true" v-model="formobj.isGoOut">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">客户名称</div>
<el-form-item>
<span class="addinputw addinputInfo">{{formobj.customerName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">车牌号/车架号</div>
<el-form-item>
<span class="addinputw addinputInfo">{{formobj.vehMark}}/{{formobj.vinNo}}</span>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<div class="span-sty">客户单位</div>
<el-form-item>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
</el-form-item>
</el-col> -->
</el-row>
<div class="title titleOne">
<div>服务项目</div>
</div>
<el-table v-loading="listLoading" :data="formobj.sitemVoList" border>
<!-- <el-table-column type="selection" align="center" width="50"/> -->
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="服务项目" prop="serviceItem" align="center" />
<el-table-column label="工种" prop="serviceType" align="center" />
<el-table-column label="科目" prop="subject" align="center" />
<el-table-column label="维修人" prop="repairerName" align="center" />
<el-table-column label="工时提成" prop="examineHourPrice" align="center" />
<el-table-column label="工时单价" prop="hourPrice" align="center" />
<el-table-column label="工时数" prop="hours" align="center" />
<el-table-column label="销售价" prop="price" align="center" />
<el-table-column label="折扣" prop="discount" align="center" />
<el-table-column label="优惠" prop="discountAmount" align="center" />
<el-table-column label="金额" prop="amount" align="center" />
<el-table-column label="备注" prop="remarks" align="center" />
</el-table>
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-row>
<el-col :span="24">
<div class="span-sty span-sty-one" style="width: 300px;!important;">前台登记时对商品要求备注</div>
<el-form-item><el-input class="addinputInfo-one" style="width: 70%" v-model="formobj.registerRemarks"
clearable placeholder="" :disabled="true" /></el-form-item>
</el-col>
</el-row>
<el-table v-loading="listLoading" :data="formobj.detailList" border>
<!-- <el-table-column type="selection" align="center" width="50"/> -->
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="项目名称" prop="serviceItem" align="center" />
<el-table-column label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="仓库" prop="warehouseName" align="center" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" />
<!-- <el-table-column label="仓库" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
@change="selectWarehouseName(scope.row,$event)">
<el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="库位" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseRackCode" :disabled="scope.row.warehouseName==''" clearable
@focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
@change="selectWarehouseAreaCode(scope.row,$event)">
<el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column> -->
<el-table-column label="销售单价" prop="price" align="center" />
<el-table-column label="库存数量" prop="inventoryNum" align="center" />
<el-table-column label="出库数量" prop="outboundCount" align="center" />
<el-table-column label="备注" prop="remarks" align="center" />
<!-- <el-table-column label="出库数量" align="center" width="120">
<template slot-scope="scope">
<el-input v-model="scope.row.count" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="220">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" clearable placeholder="" />
</template>
</el-table-column> -->
</el-table>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/maintenanceReceive/maintenanceReceive.js'
export default {
components: {},
data() {
return {
viewState: 1,
listLoading: false,
submitdisabled: false,
formobj: {},
confirmInfo: {
sid: "",
remarks: ""
}
}
},
created() {},
methods: {
showAdd(sid) {
this.confirmInfo.sid = sid
var params = {
sid: sid
}
req.initBill(params)
.then(resp => {
if (resp.success) {
console.log('>>>>>>>>>initBill', resp)
this.formobj = resp.data
} else {
// resp.code
}
})
.catch(() => {})
},
resetState() {
this.viewState = 1
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.confirmInfo)
req.saveConfirm(this.confirmInfo)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.handleReturn('true')
} else {
// resp.code
}
})
.catch(() => {})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {}
this.submitdisabled = false
this.$emit('doback')
},
indexMethod(index) {
return index + 1
},
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.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;
}
.el-radio /deep/ .el-radio__label {
font-size: 14px !important;
}
.addinputInfo-one {
margin-left: 170px !important;
}
.span-sty-one {
width: 180px !important;
}
</style>

118
yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue → yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue

@ -7,7 +7,7 @@
<div>新增维修出库</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" @click="seleMaintenance">选择维修工单</el-button>
<!-- <el-button type="primary" size="small" @click="seleMaintenance">选择维修工单</el-button> -->
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">出库</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
@ -115,7 +115,10 @@
<el-col :span="8">
<div class="span-sty">是否外出</div>
<el-form-item>
<el-form-item><span class="addinputw addinputInfo">{{formobj.subject}}</span></el-form-item>
<el-radio-group class="addinputw addinputInfo" :disabled="true" v-model="formobj.isGoOut">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
@ -136,12 +139,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<div class="span-sty">客户单位</div>
<el-form-item>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<div class="title titleOne">
@ -159,7 +162,7 @@
<el-table-column label="工种" prop="serviceType" align="center" />
<el-table-column label="科目" prop="subject" align="center" />
<el-table-column label="维修人" prop="repairerName" align="center" />
<el-table-column label="考核工时" prop="examineHourPrice" align="center" />
<el-table-column label="工时提成" prop="examineHourPrice" align="center" />
<el-table-column label="工时单价" prop="hourPrice" align="center" />
<el-table-column label="工时数" prop="hours" align="center" />
<el-table-column label="销售价" prop="price" align="center" />
@ -172,6 +175,13 @@
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-row>
<el-col :span="24">
<div class="span-sty span-sty-one" style="width: 300px;!important;">前台登记时对商品要求备注</div>
<el-form-item><el-input class="addinputInfo-one" style="width: 70%" v-model="formobj.registerRemarks"
clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-table v-loading="listLoading" :data="formobj.detailList" border>
<!-- <el-table-column type="selection" align="center" width="50"/> -->
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
@ -180,25 +190,25 @@
<el-button type="primary" size="mini" @click="deleteGoods(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="项目名称" prop="serviceItem"width="120" align="center" />
<el-table-column label="项目名称" prop="serviceItem" width="120" align="center" />
<!-- <el-table-column label="商品名称" prop="goodsSpuName" align="center" /> -->
<el-table-column label="商品名称" align="center" min-width="120">
<el-table-column label="商品名称" align="center" min-width="180">
<template slot-scope="scope">
<el-popover placement="right" width="1000" trigger="click">
<el-popover placement="right" width="800" trigger="click">
<div>
<el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row
@current-change="commodityCurrentChange($event, scope.row)">
<el-table-column fixed prop="goodsID" label="商品ID" width="150" align="center" />
<el-table-column fixed prop="goodsSpuName" label="商品名称" width="180" align="center" />
<el-table-column fixed prop="goodsSkuCode" label="商品图号" width="100" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
<el-table-column prop="count" label="库存数量" width="100" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="money" label="入库单价" width="100" align="center" />
<el-table-column prop="count" label="库存数量" width="100" align="center" />
<el-table-column prop="supplierName" label="供应商" width="200" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="goodsID" label="商品ID" width="150" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
</el-table>
<pagination v-show="commodityData.length > 0" :total="commodityQuery.total"
@ -213,15 +223,14 @@
</el-popover>
</template>
</el-table-column>
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" width="100" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" width="120" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="仓库" prop="warehouseName"width="150" align="center" />
<el-table-column label="仓库" prop="warehouseName" width="150" align="center" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" />
<el-table-column label="销售单价" prop="price" align="center" />
<el-table-column label="已出数量" prop="outboundCount" align="center" />
<el-table-column label="销售单价" prop="price" width="120" align="center" />
<el-table-column label="已出数量" prop="outboundCount" width="120" align="center" />
<el-table-column label="库存数量" prop="inventoryNum" width="120" align="center" />
<el-table-column label="出库数量" align="center" width="120">
<template slot-scope="scope">
<el-input @input="commodityComputeYHAndXSJE(scope.row,$event)" v-model="scope.row.count" clearable
@ -248,7 +257,7 @@
</template>
<script>
import req from '@/api/maintenance/maintenanceOutbound.js'
import req from '@/api/maintenanceReceive/maintenanceReceive.js'
import chooseproducts from './relation/chooseproducts'
import {
getOrgSidByPath,
@ -338,10 +347,6 @@
}
},
created() {
this.initData()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
},
methods: {
@ -358,6 +363,50 @@
}
})
},
showAdd(sid) {
this.initData()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
var params = {
sid: sid
}
req.initBill(params)
.then(resp => {
if (resp.success) {
console.log('>>>>>>>>>initBill', resp)
this.formobj = resp.data
this.formobj.detailList = []
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1)
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createTime = getCurrentDate()
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
// this.commodityQuery.params.useOrgSid = res.data
}
})
} else {
// resp.code
}
})
.catch(() => {})
},
backData(value) {
this.viewState = 1
@ -463,9 +512,7 @@
})
},
handleReturn(isreload) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
"sid": "",
"createBySid": window.sessionStorage.getItem('userSid'),
@ -497,6 +544,8 @@
]
}
this.submitdisabled = false
this.$emit('doback')
},
indexMethod(index) {
return index + 1
@ -545,8 +594,9 @@
row.warehouseName = value.warehouseName
row.warehouseRackSid = value.warehouseRackSid
row.warehouseRackCode = value.warehouseRackCode
row.outboundCount = value.outboundCount
row.count = 0
row.outboundCount = value.outboundCount //
row.inventoryNum = value.count //
row.count = 0 //
row.amount = 0.00
row.price = value.price
row.remarks = ''
@ -641,4 +691,12 @@
font-size: 14px !important;
}
.addinputInfo-one {
margin-left: 170px !important;
}
.span-sty-one {
width: 180px !important;
}
</style>

89
yxt-as-ui/src/views/maintenance/maintenanceReturnBound/index.vue → yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue

@ -7,8 +7,8 @@
<div>新增维修退库</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" @click="seleMaintenance">选择维修工单</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">退</el-button>
<!-- <el-button type="primary" size="small" @click="seleMaintenance">选择维修工单</el-button> -->
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate"></el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
@ -24,21 +24,21 @@
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 操作</div>
<div class="span-sty"><span class="must">*</span> 申请</div>
<el-form-item prop="createByName">
<span class="addinputw addinputInfo">{{formobj.createByName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 操作部门</div>
<div class="span-sty"><span class="must">*</span> 申请部门</div>
<el-form-item prop="deptName">
<span class="addinputw addinputInfo">{{formobj.deptName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">操作日期</div>
<div class="span-sty">申请日期</div>
<el-form-item prop="createByName">
<el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-form-item>
@ -49,7 +49,7 @@
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 料人</div>
<div class="span-sty"><span class="must">*</span> 退料人</div>
<el-form-item prop="warehouseManager">
<el-select v-model="formobj.warehouseManager" filterable clearable placeholder="请选择"
class="addinputw addinputInfo" @change="receivePerSelect">
@ -115,7 +115,11 @@
<el-col :span="8">
<div class="span-sty">是否外出</div>
<el-form-item>
<el-form-item><span class="addinputw addinputInfo">{{formobj.subject}}</span></el-form-item>
<el-radio-group class="addinputw addinputInfo" :disabled="true" v-model="formobj.isGoOut">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
@ -136,12 +140,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<div class="span-sty">客户单位</div>
<el-form-item>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<div class="title titleOne">
@ -154,7 +158,7 @@
<el-table-column label="工种" prop="serviceType" align="center" />
<el-table-column label="科目" prop="subject" align="center" />
<el-table-column label="维修人" prop="repairerName" align="center" />
<el-table-column label="考核工时" prop="examineHourPrice" align="center" />
<el-table-column label="工时提成" prop="examineHourPrice" align="center" />
<el-table-column label="工时单价" prop="hourPrice" align="center" />
<el-table-column label="工时数" prop="hours" align="center" />
<el-table-column label="销售价" prop="price" align="center" />
@ -171,7 +175,7 @@
<el-table v-loading="listLoading" :data="formobj.detailList" border>
<!-- <el-table-column type="selection" align="center" width="50"/> -->
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="项目名称" prop="serviceItem" align="center" />
<!-- <el-table-column label="项目名称" prop="serviceItem" align="center" /> -->
<el-table-column label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
@ -226,7 +230,7 @@
</template>
<script>
import req from '@/api/maintenance/maintenanceReturnBound.js'
import req from '@/api/maintenanceReceive/maintenanceReceive.js'
import req2 from '@/api/storage/allocation.js'
import chooseproducts from './relation/chooseproducts'
import {
@ -305,13 +309,7 @@
}
}
},
created() {
this.initData()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
},
created() {},
methods: {
initData() {
selAllByOrgSidPath({
@ -321,11 +319,54 @@
this.receivePerList = res.data
console.log("aaaaaa", this.receivePerList);
}
})
},
showAdd(sid) {
this.getWarehouseList()
this.initData()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
var params = {
sid: sid
}
req.initBill(params)
.then(resp => {
if (resp.success) {
console.log('>>>>>>>>>initBill', resp)
this.formobj = resp.data
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1)
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createTime = getCurrentDate()
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
}
})
} else {
// resp.code
}
})
.catch(() => {})
},
backData(value) {
@ -401,9 +442,7 @@
})
},
handleReturn(isreload) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
"sid": "",
"createBySid": window.sessionStorage.getItem('userSid'),
@ -435,6 +474,8 @@
]
}
this.submitdisabled = false
this.$emit('doback')
},
indexMethod(index) {
return index + 1
@ -447,10 +488,12 @@
},
getWarehouseList() {
console.log("getWarehouseList>>>>>>>>>>>>>");
var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}
console.log("getWarehouseList", parpams);
req2.getWarehouses(parpams).then((res) => {
if (res.success) {
this.warehouseList = res.data

0
yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue → yxt-as-ui/src/views/maintenanceReceive/relation/chooseproducts.vue

638
yxt-as-ui/src/views/maintenanceReceive/repairbillInfo.vue

@ -0,0 +1,638 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" @click="negativeSettlement()">反结算</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">制单人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">制单部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">制单日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">工单类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">科目</div>
<el-form-item><span class="addinputInfo">{{ formobj.subject }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">索赔厂家</div>
<el-form-item><span class="addinputInfo">{{ formobj.claimManufacturer }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">是否外出</div>
<el-form-item><span class="addinputInfo">{{ formobj.isGoOut == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">进厂时间</div>
<el-form-item><span class="addinputInfo">{{ formobj.entryTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">预计完工</div>
<el-form-item><span class="addinputInfo">{{ formobj.estimatedFinishTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">服务顾问</div>
<el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">班组</div>
<el-form-item><span class="addinputInfo">{{ formobj.groupName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">主修人</div>
<el-form-item><span class="addinputInfo">{{ formobj.mainRepairers }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">备注(打印)</div>
<el-form-item><span class="addinputInfo">{{ formobj.printRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">特殊标注</div>
<el-form-item><span
class="addinputInfo">{{ formobj.isSpecialSign == '1' ? '有' : '否' }}</span></el-form-item>
</el-col>
</el-row>
<el-collapse v-model="activeNames">
<el-collapse-item title="客户信息" name="1">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">客户</div>
<el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">联系电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.mobile }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">客户来源</div>
<el-form-item><span class="addinputInfo">{{ formobj.customerSource }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">车牌号</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">车架号</div>
<el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">车型</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehModel }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">行驶里程(Km)</div>
<el-form-item><span class="addinputInfo">{{ formobj.mileage }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">油量(L)</div>
<el-form-item><span class="addinputInfo">{{ formobj.oil }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">当前里程(Km)</div>
<el-form-item><span class="addinputInfo">{{ formobj.currentMileage }}</span></el-form-item>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="对接人信息" name="2">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">对接人姓名</div>
<el-form-item><span class="addinputInfo">{{ formobj.dockingPeople }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">对接人电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.dockingPhone }}</span></el-form-item>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="保险信息" name="3">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">责任划分</div>
<el-form-item><span
class="addinputInfo">{{ formobj.insuranceVo.responsibility }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">责任比例</div>
<el-form-item><span
class="addinputInfo">{{ formobj.insuranceVo.responsibilityRatio }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否存在人伤</div>
<el-form-item><span
class="addinputInfo">{{ formobj.insuranceVo.isPersonInjuries == '1' ? '是' : formobj.insuranceVo.isPersonInjuries == '0' ? '否' : '' }}</span></el-form-item>
</el-col>
</el-row>
<el-table :key="insuranceKey" :data="formobj.insuranceVo.insuranceList" :index="index" border
style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="useInsurer" label="使用保险方" align="center" min-width="150" />
<el-table-column prop="insuranceType" label="使用险种" align="center" min-width="150" />
<el-table-column prop="insuranceCompany" label="保险公司" align="center" min-width="150" />
<el-table-column prop="claimBillNo" label="报案号" align="center" min-width="180" />
<el-table-column prop="investigator" label="勘察员及电话" align="center" min-width="220" />
<el-table-column prop="lossAdjuster" label="定损员及电话" align="center" min-width="220" />
</el-table>
</el-collapse-item>
<el-collapse-item title="发票信息" name="4">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">是否开发票</div>
<el-form-item><span
class="addinputInfo">{{ formobj.invoiceVo.isInvoicing == '1' ? '是' : formobj.invoiceVo.isInvoicing == '0' ? '否' : '' }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">发票类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.invoiceType }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.invoiceCompany }}</span></el-form-item>
</el-col>
</el-row>
</el-collapse-item>
</el-collapse>
<div class="title">服务项目</div>
<el-table :key="serviceKey" :data="formobj.sitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="serviceItem" label="服务项目" align="center" width="200" />
<el-table-column prop="serviceType" label="工种" align="center" width="150" />
<el-table-column prop="repairerName" label="维修人" width="200" align="center" />
<el-table-column prop="examineHourPrice" label="工时提成" align="center" width="100" />
<el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
<el-table-column prop="hours" label="工时数" align="center" width="100" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
<el-table-column prop="amount" label="金额" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">商品</div>
<el-row>
<el-col :span="24">
<div class="span-sty span-sty-one" style="width: 300px;!important;">前台登记时对商品要求备注</div>
<el-form-item><span class="addinputInfo-one">{{ formobj.registerRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
<el-table-column prop="unit" label="单位" width="100" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="count" label="数量" width="100" align="center" />
<el-table-column prop="discount" label="折扣" align="center" width="100" />
<el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
<el-table-column prop="amount" label="金额" width="100" align="center" />
<el-table-column prop="remarks" label="备注" align="center" min-width="300" />
</el-table>
<div class="title">附加项目</div>
<el-row>
<el-col :span="8">
<div class="span-sty">外出费()</div>
<el-form-item><span class="addinputInfo">{{ formobj.outAmount }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">厂家补助()</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyAmount }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">施救费()</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueAmount }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<span></span>
</el-col>
</el-row>
<el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="aitemName" label="其它附加项目" align="center" width="200" />
<el-table-column prop="price" label="销售价" align="center" width="150" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty" style="border-right: 0px">应收合计</div>
<el-form-item><span class="addinputInfo">{{ ysTotal }} = 工时费{{ gsfTotal }} + 材料费{{ clfTotal }} +
附加费{{ fjfTotal }} + 税额0</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="border-right: 0px">实收合计</div>
<el-form-item><span class="addinputInfo">{{ ssTotal }} = 应收合计{{ ysTotal }} -
优惠{{ yhTotal }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<!-- <workslrsettlementAdd v-show="viewState == 2" ref="divFJS" @doback="resetState" /> -->
</div>
</template>
<script>
import req from '@/api/operation/repairbill'
// import workslrsettlementAdd from '../workslrsettlement/workslrsettlementAdd'
export default {
name: 'RepairBillInfo',
components: {
// workslrsettlementAdd
},
data() {
return {
viewTitle: '',
viewState: 1,
activeNames: '1',
tableKey: 0,
index: 0,
// service
serviceKey: 1,
// subjoin
subjoinKey: 2,
// insuranceKey
insuranceKey: 3,
formobj: {
sid: '',
registerRemarks: '',
billNo: '',
createByName: '',
deptName: '',
createDate: '',
billTypeKey: '',
billType: '',
subjectSid: '',
subject: '',
claimManufacturerSid: '',
claimManufacturer: '',
isGoOut: '',
estimatedFinishTime: '',
entryTime: '',
nodeName: '',
waitorName: '',
waitorSid: '',
groupSid: '',
groupName: '',
mainRepairers: '',
printRemarks: '',
remarks: '',
isSpecialSign: '',
discountAmount: '',
coupon: '',
scoreDeduct: '',
nodeTime: '',
outDoorState: '',
outDoorTime: '',
customerSid: '',
customerName: '',
mobile: '',
customerOrg: '',
customerSource: '',
memberCardSid: '',
memberCarNumber: '',
vehMark: '',
vinNo: '',
vehModel: '',
mileage: '',
oil: '',
currentMileage: '',
dockingPeopleSid: '',
dockingPeople: '',
dockingPhone: '',
invoiceVo: {
isInvoicing: '',
invoiceType: '',
invoiceTypeKey: '',
invoiceCompanySid: '',
invoiceCompany: ''
},
insuranceVo: {
responsibility: '',
responsibilityKey: '',
isPersonInjuries: '',
responsibilityRatioKey: '',
responsibilityRatio: '',
insuranceList: []
},
sitemVos: [],
aitemVos: [],
goodsDetailsVos: [],
createBySid: '',
operatorSid: '',
nodeCode: '',
settleVo: {
payerNo: '',
payerName: '',
receivableAmount: '',
depositdeductAmount: '',
settleKey: '',
settleValue: '',
settleAmount: '',
otherSettleKey: '',
otherSettleValue: '',
debts: '',
settleTime: '',
otherSettleAmount: ''
},
showReSettleBtn: true,
hourAmount: '',
otherAmount: '',
goodsAmount: '',
addAmount: '',
taxAmount: '',
outAmount: '',
subsidyAmount: '',
rescueAmount: '',
actualAmount: '',
receivableAmount: '',
subsidyRemarks: '',
rescueRemarks: '',
outRemarks: '',
fileName: '',
operator: '',
useOrgSid: '',
createOrgSid: ''
},
rules: {}
}
},
computed: {
// =
gsfTotal() {
let gsf = '0'
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
if (e.serviceItem !== '') {
gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return gsf
},
// = *
clfTotal() {
let clf = '0'
if (this.formobj.goodsDetailsVos.length > 0) {
this.formobj.goodsDetailsVos.forEach((e) => {
if (e.goodsSpuName !== '') {
clf = Math.round((parseFloat(clf) + (parseFloat(e.price !== '' ? e.price : '0') * parseFloat(e
.count !== '' ? e.count : '0'))) * 100) / 100
}
})
}
return clf
},
// == + + +
fjfTotal() {
let fjf = '0'
fjf = parseFloat(this.formobj.outAmount !== '' ? this.formobj.outAmount : '0') + parseFloat(this.formobj
.subsidyAmount !== '' ? this.formobj.subsidyAmount : '0') + parseFloat(this.formobj.rescueAmount !== '' ?
this.formobj.rescueAmount : '0')
if (this.formobj.aitemVos.length > 0) {
this.formobj.aitemVos.forEach((e) => {
if (e.aitemName !== '') {
fjf = Math.round((parseFloat(fjf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
}
})
}
return fjf
},
// = + + +
ysTotal() {
let ys = '0'
ys = Math.round((parseFloat(ys) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this
.fjfTotal)) * 100) / 100
return ys
},
// = +
yhTotal() {
let yh = '0'
if (this.formobj.sitemVos.length > 0) {
this.formobj.sitemVos.forEach((e) => {
if (e.serviceItem !== '') {
yh = Math.round((parseFloat(yh) + parseFloat(e.discountAmount !== '' ? e.discountAmount : '0')) *
100) / 100
}
})
}
if (this.formobj.goodsDetailsVos.length > 0) {
this.formobj.goodsDetailsVos.forEach((e) => {
if (e.goodsSpuName !== '') {
yh = Math.round((parseFloat(yh) + parseFloat(e.discountAmount !== '' ? e.discountAmount : '0')) *
100) / 100
}
})
}
return yh
},
// = -
ssTotal() {
let ysje = '0'
ysje = Math.round((parseFloat(ysje) + parseFloat(this.ysTotal) - parseFloat(this.yhTotal)) * 100) / 100
return ysje
}
},
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(',')
}
})
}
}
})
},
resetState() {
this.viewState = 1
},
negativeSettlement() {
this.viewState = 2
this.$refs['divFJS'].showAdd(this.formobj.sid)
},
handleReturn() {
this.formobj = {
sid: '',
registerRemarks: '',
billNo: '',
createByName: '',
deptName: '',
createDate: '',
billTypeKey: '',
billType: '',
subjectSid: '',
subject: '',
claimManufacturerSid: '',
claimManufacturer: '',
isGoOut: '',
estimatedFinishTime: '',
entryTime: '',
nodeName: '',
waitorName: '',
waitorSid: '',
groupSid: '',
groupName: '',
mainRepairers: '',
printRemarks: '',
remarks: '',
isSpecialSign: '',
discountAmount: '',
coupon: '',
scoreDeduct: '',
nodeTime: '',
outDoorState: '',
outDoorTime: '',
customerSid: '',
customerName: '',
mobile: '',
customerOrg: '',
customerSource: '',
memberCardSid: '',
memberCarNumber: '',
vehMark: '',
vinNo: '',
vehModel: '',
mileage: '',
oil: '',
currentMileage: '',
dockingPeopleSid: '',
dockingPeople: '',
dockingPhone: '',
invoiceVo: {
isInvoicing: '',
invoiceType: '',
invoiceTypeKey: '',
invoiceCompanySid: '',
invoiceCompany: ''
},
insuranceVo: {
responsibility: '',
responsibilityKey: '',
isPersonInjuries: '',
responsibilityRatioKey: '',
responsibilityRatio: '',
insuranceList: []
},
sitemVos: [],
aitemVos: [],
goodsDetailsVos: [],
createBySid: '',
operatorSid: '',
nodeCode: '',
settleVo: {
payerNo: '',
payerName: '',
receivableAmount: '',
depositdeductAmount: '',
settleKey: '',
settleValue: '',
settleAmount: '',
otherSettleKey: '',
otherSettleValue: '',
debts: '',
settleTime: '',
otherSettleAmount: ''
},
showReSettleBtn: true,
hourAmount: '',
otherAmount: '',
goodsAmount: '',
addAmount: '',
taxAmount: '',
outAmount: '',
subsidyAmount: '',
rescueAmount: '',
actualAmount: '',
receivableAmount: '',
subsidyRemarks: '',
rescueRemarks: '',
outRemarks: '',
fileName: '',
operator: '',
useOrgSid: '',
createOrgSid: ''
}
this.$emit('doback')
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.span-sty-one {
width: 180px !important;
}
.addinputInfo-one {
margin-left: 170px !important;
}
</style>

112
yxt-as-ui/src/views/storage/deliveryNotice/index.vue

@ -79,15 +79,24 @@
<el-table-column prop="billNo" label="单据编号" align="center" width="220" />
<el-table-column prop="createTime" label="单据日期" align="center" width="150" />
<el-table-column prop="createByName" label="制单人" align="center" width="150" />
<el-table-column prop="sourceBillNo" label="采购单号" align="center" width="180" />
<!-- <el-table-column prop="sourceBillNo" label="采购单号" align="center" width="180" /> -->
<el-table-column label="采购单号" align="center" width="180">
<template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;" @click="showSourceBillDetail(scope.row)">
{{ scope.row.sourceBillNo }}
</div>
</template>
</el-table-column>
<el-table-column prop="busTypeValue" label="业务类型" align="center" width="150" />
<el-table-column prop="manufactorBillNo" label="厂家订单号" align="center" width="180" />
<el-table-column prop="manufactorBillTypeValue" label="厂家订单类型" align="center" width="150" />
<el-table-column prop="supplierName" label="供应商" align="center" width="150" />
<el-table-column prop="contact" label="联系人" align="center" width="150" />
<el-table-column prop="mobile" label="联系人电话" align="center" width="150" />
<el-table-column prop="deliveryDate" label="预计到货日期" align="center" width="150" />
<el-table-column prop="billState" label="单据状态" align="center" width="150" />
<el-table-column prop="reviewStatus" label="审核状态" align="center" width="150" />
<el-table-column prop="refuseReason" label="拒绝原因" align="center" width="150" />
<!-- <el-table-column prop="reviewStatus" label="审核状态" align="center" width="150" /> -->
<!-- <el-table-column prop="refuseReason" label="拒绝原因" align="center" width="150" /> -->
</el-table>
@ -105,6 +114,7 @@
<!-- 新增修改部分组件 -->
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
<sourceBillInfo v-show="viewState == 5" ref="sourceinfo" @doback="resetState" @reloadlist="loadList" />
<el-dialog title="审核单据" :visible.sync="dialogVisible" :before-close="handleClose">
<el-form ref="dataForm" class="formadd" style="margin-top: -40px;" :model="formobj">
@ -155,13 +165,15 @@
import pageye from '@/components/pagination/pageye'
import divAdd from './receiptAdd.vue'
import divInfo from './receiptInfo.vue'
import sourceBillInfo from './procurementInfo.vue'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divAdd,
divInfo
divInfo,
sourceBillInfo
},
data() {
return {
@ -177,18 +189,27 @@
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [{
btnList: [
// {
// type: 'primary',
// size: 'small',
// icon: 'plus',
// btnKey: 'toAudit',
// btnLabel: ''
// },
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAudit',
btnLabel: '审核'
}, {
type: 'primary',
btnKey: 'toAdd',
btnLabel: '新增收货单'
},
{
type: 'danger',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '收货'
btnKey: 'toEnd',
btnLabel: '终止'
},
{
type: 'info',
@ -260,6 +281,14 @@
this.loadList()
},
methods: {
showSourceBillDetail(row) {
console.log("showSourceBillDetail》》》》", row)
this.viewState = 5
this.$refs['sourceinfo'].showInfo(row.sourceBillSid)
// this.$refs['sourceinfo'].showInfo('1b20ee30-d7d5-4cd0-8ee3-3802ddd12ff2')
},
saveExamine() {
},
@ -291,6 +320,11 @@
console.log("val", val);
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
@ -310,6 +344,9 @@
case 'toAdd':
this.toAdd()
break
case 'toEnd':
this.toEnd()
break
case 'doClose':
this.doClose()
break
@ -359,6 +396,57 @@
}
this.loadList()
},
toEnd() {
for (var i = 0; i < this.selectionList.length; i++) {
if (this.selectionList[i].billState == '已收货' || this.selectionList[i].billState == '已收货(部分终止)') {
this.$message({
type: 'warning',
message: "不可选择已收货或已终止的记录。",
showClose: true
})
return
}
}
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.billToEnd(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() {
if (this.selectionList.length != 1) {
@ -370,7 +458,7 @@
return
}
if(this.selectionList[0].billState=='已收货'){
if (this.selectionList[0].billState == '已收货') {
this.$message({
type: 'warning',
message: "此记录已完成,不可重复操作。",

389
yxt-as-ui/src/views/storage/deliveryNotice/procurementInfo.vue

@ -0,0 +1,389 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</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.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">采购方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseTypeValue }}<span
v-show="formobj.purchaseTypeValue == '代理库'"
style="margin-left: 20px">{{ formobj.operateBrandValue }}</span></span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseReasonValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">付款方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.payTypeValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}<span
v-show="formobj.purchaseTypeValue == '代理库'"
style="margin-left: 20px">{{ formobj.warehouseTypeValue }}</span></span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否开发票</div>
<el-form-item><span
class="addinputInfo">{{ formobj.purchaseBillInvoice.isInvoicing == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div v-show="formobj.purchaseBillInvoice.isInvoicing == '1'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span
class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}{{ formobj.purchaseBillInvoice.taxRate == '' ? '' : '(' + formobj.purchaseBillInvoice.taxRate + '%)' }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '预付款'">
<el-col :span="24">
<div class="span-sty">预付款情况</div>
<el-form-item><span class="addinputInfo">当前预付款项金额(){{ formobj.prepaymentAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '月结'">
<el-col :span="24">
<div class="span-sty">月结欠款情况</div>
<el-form-item><span class="addinputInfo">累计欠款金额(){{ formobj.owedAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">预计到货日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.payTypeValue == '单笔付款'">
<div class="title">订金及付款申请</div>
<el-row>
<el-col :span="8">
<div class="span-sty">是否先付货款</div>
<el-form-item><span
class="addinputInfo">{{ formobj.purchasePay.isFirstPay == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">审批通过后付订金</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.deposit }}</span></el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">验货后付货款</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.goodsMoney }}</span></el-form-item>
</el-col>
<el-col :span="16" v-else>
<div class="span-sty">审批通过后付货款</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.goodsMoney }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">收款账户名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.accountName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开户行</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.bankName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">银行账号</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.bankAccount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">其他费用名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.otherAmountName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其他费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.otherAmount }}</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.purchasePay.payRemark }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px"
v-for="(item, index) in formobj.purchasePay.filePaths" :key="index" :src="item"
:preview-src-list="formobj.purchasePay.filePaths" /></el-form-item>
</el-col>
</el-row>
</div>
<div class="title ">商品列表</div>
<el-table :key="tableKey" :data="formobj.pmsPurchaseBillDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="200" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="200" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="count" label="采购数量" align="center" width="150" />
<el-table-column prop="taxPrice" v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价(元)"
align="center" min-width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价(元)" align="center" min-width="150" />
<el-table-column prop="amount" label="采购金额(元)" align="center" width="200" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty" style="border-right: 0px">数量</div>
<el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="border-right: 0px">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额{{ cgTotal }} + 运费{{ formobj.freight }} -
优惠{{ formobj.discountAmount }} + 误差调整{{ formobj.errorAmount }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/purchase/procurement'
export default {
name: 'ProcurementInfo',
data() {
return {
viewTitle: '',
viewState: 1,
tableKey: 1,
index: 0,
formobj: {
sid: '',
remarks: '',
createBySid: '',
createByName: '',
createTime: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
purchaseTypeKey: '',
purchaseTypeValue: '',
purchaseReasonKey: '',
purchaseReasonValue: '',
payTypeKey: '',
payTypeValue: '',
errorAmount: '',
supplierSid: '',
supplierName: '',
supplierPhone: '',
purchaserSid: '',
purchaserName: '',
deliveryDate: '',
freight: '',
discountAmount: '',
payableAmount: '',
prepaymentAmount: '',
owedAmount: '',
deptSid: '',
deptName: '',
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
useOrgSid: '',
useOrgName: '',
createOrgSid: '',
createOrgName: '',
operateBrandKey: '',
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
purchasePay: {
sid: '',
billSid: '',
isFirstPay: '',
deposit: '',
goodsMoney: '',
accountName: '',
bankName: '',
bankAccount: '',
otherAmountName: '',
otherAmount: '',
payRemark: '',
filePaths: []
},
purchaseBillInvoice: {
billSid: '',
isInvoicing: '',
billTypeKey: '',
billType: '',
taxRate: ''
},
pmsPurchaseBillDetailList: []
},
rules: {}
}
},
computed: {
//
slTotal() {
let sl = '0'
if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
sl = Math.round((parseFloat(sl) + parseFloat(e.count !== '' ? e.count : '0')) * 100) / 100
}
})
}
return sl
},
//
cgTotal() {
let cg = '0'
if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
cg = Math.round((parseFloat(cg) + parseFloat(e.amount !== '' ? e.amount : '0')) * 100) / 100
}
})
}
return cg
},
yfTotal() {
let yf = '0'
yf = Math.round((parseFloat(yf) + parseFloat(this.cgTotal) + parseFloat(this.formobj.freight !== '' ? this
.formobj.freight : '0') - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount :
'0') + parseFloat(this.formobj.errorAmount !== '' ? this.formobj.errorAmount : '0')) * 100) / 100
return yf
}
},
methods: {
showInfo(sid) {
this.viewTitle = '采购单详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.purchasePay.filePaths.length > 0) {
const aa = []
this.formobj.purchasePay.filePaths.forEach((e) => {
aa.push(e.url)
})
this.formobj.purchasePay.filePaths = aa
}
}
})
},
handleReturn() {
this.formobj = {
sid: '',
remarks: '',
createBySid: '',
createByName: '',
createTime: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
purchaseTypeKey: '',
purchaseTypeValue: '',
purchaseReasonKey: '',
purchaseReasonValue: '',
payTypeKey: '',
payTypeValue: '',
errorAmount: '',
supplierSid: '',
supplierName: '',
supplierPhone: '',
purchaserSid: '',
purchaserName: '',
deliveryDate: '',
freight: '',
discountAmount: '',
payableAmount: '',
prepaymentAmount: '',
owedAmount: '',
deptSid: '',
deptName: '',
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
useOrgSid: '',
useOrgName: '',
createOrgSid: '',
createOrgName: '',
operateBrandKey: '',
operateBrandValue: '',
warehouseTypeKey: '',
warehouseTypeValue: '',
purchasePay: {
sid: '',
billSid: '',
isFirstPay: '',
deposit: '',
goodsMoney: '',
accountName: '',
bankName: '',
bankAccount: '',
otherAmountName: '',
otherAmount: '',
payRemark: '',
filePaths: []
},
purchaseBillInvoice: {
billSid: '',
isInvoicing: '',
billTypeKey: '',
billType: '',
taxRate: ''
},
pmsPurchaseBillDetailList: []
}
this.$emit('doback')
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

66
yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue

@ -48,7 +48,7 @@
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-select v-model="formobj.supplierName" placeholder="请选择" clearable @change="selectSupplierName"
class="addinputInfo">
class="addinputInfo addinputw">
<el-option v-for="(item,i) in supplierNameList" :key="item.sid" :label="item.supplierName"
:value="item.sid">
</el-option>
@ -67,10 +67,20 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="16">
<el-col :span="8">
<div class="span-sty">单据状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 收货人是否与上架人一致</div>
<!-- <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item> -->
<el-form-item prop="isUpShelf">
<el-radio-group v-model="formobj.isUpShelf" size="small" class="addinputInfo" @change="changeTheme">
<el-radio :label="1"></el-radio>
<el-radio :label="2"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -117,7 +127,7 @@
</el-select>
</template>
</el-table-column> -->
<!-- <el-table-column label="预数量" prop="orderCount" align="center" width="120" /> -->
<el-table-column label="预期到货数量" prop="orderCount" align="center" width="120" />
<el-table-column label="实收数量" align="center" width="120">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE(scope.row,$event)"
@ -257,6 +267,11 @@
message: '到货日期不能为空',
trigger: 'change'
}],
isUpShelf: [{
required: true,
message: '请选择是或否',
trigger: 'change'
}],
}
}
},
@ -546,23 +561,26 @@
// return
// }
for (var i = 0; i < this.formobj.list.length; i++) {
if (Number(this.formobj.list[i].actualInCount) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品实收数量不能为空'
})
return
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
}
for (var i = 0; i < this.formobj.list.length; i++) {
if (Number(this.formobj.list[i].actualInCount) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品实收数量不能为空'
})
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
@ -703,16 +721,16 @@
}
.span-sty {
width: 130px !important;
width: 190px !important;
}
.addinputInfo {
margin-left: 120px !important;
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
margin-left: 180px !important;
width: calc(100% - 175px);
}
.first_row {
@ -726,4 +744,14 @@
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style>

24
yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue

@ -15,10 +15,10 @@
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">单据编号</div>
@ -61,39 +61,39 @@
<div class="span-sty">单据状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<div class="span-sty">审核状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.reviewStatus }}</span></el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
<!-- <el-row>
<el-col :span="24">
<div class="span-sty">拒绝原因</div>
<el-form-item><span class="addinputInfo">{{ formobj.refuseReason }}</span></el-form-item>
</el-col>
</el-row>
</el-row> -->
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
<el-table-column fixed label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column fixed label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<!-- <el-table-column label="仓库" prop="warehouseName" align="center" width="120" />
<!-- <el-table-column label="仓库" prop="warehouseName" align="center" width="120" />
<el-table-column label="库位" prop="warehouseRack" align="center" width="120" /> -->
<el-table-column label="预数量" prop="orderCount" align="center" width="120" />
<el-table-column label="预期到货数量" prop="orderCount" align="center" width="120" />
<el-table-column label="待收货数量" prop="waitInCount" align="center" />
<el-table-column label="已收货数量" prop="actualInCount" align="center" />
<el-table-column label="入库单价" prop="cost" align="center" width="100" />
<el-table-column label="税率" prop="taxAmount" align="center" width="100" />
<!-- <el-table-column label="含税单价" prop="taxPrice" align="center" width="100" /> -->
<el-table-column label="采购金额" prop="amount" align="center" />
<el-table-column label="采购金额" prop="amount" align="center" />
</el-table>
</el-form>
@ -161,6 +161,10 @@
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;

10
yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceOutboundInfo.vue

@ -15,7 +15,7 @@
<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> -->
@ -184,7 +184,7 @@
</template>
<script>
import req from '@/api/maintenance/maintenanceOutbound.js'
import req from '@/api/maintenanceReceive/maintenanceReceive.js'
export default {
components: {},
data() {
@ -197,9 +197,9 @@
},
}
},
created() {
}
},
created() {
},
methods: {

52
yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceReturnBoundInfo.vue

@ -139,38 +139,38 @@
<div class="title titleOne">
<div>服务项目</div>
</div>
<el-table v-loading="listLoading" :data="formobj.sitemVoList" border>
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="服务项目" prop="serviceItem" align="center" />
<el-table-column label="工种" prop="serviceType" align="center" />
<el-table-column label="科目" prop="subject" align="center" />
<el-table-column label="维修人" prop="repairerName" align="center" />
<el-table-column label="考核工时" prop="examineHourPrice" align="center" />
<el-table-column label="工时单价" prop="hourPrice" align="center" />
<el-table-column label="工时数" prop="hours" align="center" />
<el-table-column label="销售价" prop="price" align="center" />
<el-table-column label="折扣" prop="discount" align="center" />
<el-table-column label="优惠" prop="discountAmount" align="center" />
<el-table-column label="金额" prop="amount" align="center" />
<el-table-column label="备注" prop="remarks" align="center" />
</el-table>
<el-table v-loading="listLoading" :data="formobj.sitemVoList" border>
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="服务项目" prop="serviceItem" align="center" />
<el-table-column label="工种" prop="serviceType" align="center" />
<el-table-column label="科目" prop="subject" align="center" />
<el-table-column label="维修人" prop="repairerName" align="center" />
<el-table-column label="考核工时" prop="examineHourPrice" align="center" />
<el-table-column label="工时单价" prop="hourPrice" align="center" />
<el-table-column label="工时数" prop="hours" align="center" />
<el-table-column label="销售价" prop="price" align="center" />
<el-table-column label="折扣" prop="discount" align="center" />
<el-table-column label="优惠" prop="discountAmount" align="center" />
<el-table-column label="金额" prop="amount" align="center" />
<el-table-column label="备注" prop="remarks" align="center" />
</el-table>
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.detailList" border>
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="项目名称" prop="serviceItem" align="center" />
<el-table-column label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="仓库" prop="warehouseName" align="center" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" />
<el-table-column label="已出数量" prop="outboundCount" align="center" />
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="项目名称" prop="serviceItem" align="center" />
<el-table-column label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="仓库" prop="warehouseName" align="center" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" />
<el-table-column label="已出数量" prop="outboundCount" align="center" />
<el-table-column label="退库数量" prop="count" align="center" />
<el-table-column label="销售单价" prop="price" align="center" />
<el-table-column label="备注" prop="remarks" align="center" />
<el-table-column label="备注" prop="remarks" align="center" />
</el-table>
@ -182,7 +182,7 @@
</template>
<script>
import req from '@/api/maintenance/maintenanceReturnBound.js'
import req from '@/api/maintenanceReceive/maintenanceReceive.js'
export default {
components: {},

128
yxt-as-ui/src/views/storage/receivingGoods/index.vue

@ -25,7 +25,8 @@
</el-form-item>
<el-form-item label="业务类型">
<el-select v-model="queryParams.params.busTypeKey" placeholder="请选择">
<el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
<el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
@ -65,21 +66,29 @@
@selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center" />
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="180">
<el-table-column fixed label="操作" align="center" width="150">
<template slot-scope="scope">
<el-button type="primary" size="mini" :disabled="scope.row.billState=='已完成'"
@click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="billNo" width="220" label="单据编号" align="center" />
<el-table-column prop="createTime" label="单据日期" align="center" />
<el-table-column prop="createByName" label="制单人" align="center" />
<el-table-column prop="sourceBillNo" label="预期到货通知单号" width="220"align="center" />
<el-table-column prop="busTypeValue" label="业务类型" align="center" />
<el-table-column prop="supplierName" label="供应商" align="center" />
<el-table-column prop="deliveryDate" label="到货日期" align="center" />
<el-table-column prop="billState" label="单据状态" align="center" />
<el-table-column prop="billNo" width="180" label="单据编号" align="center" />
<el-table-column prop="createTime" label="单据日期" width="120" align="center" />
<el-table-column prop="createByName" label="制单人" width="120" align="center" />
<el-table-column prop="sourceBillNo" label="预期到货通知单号" width="200" align="center" />
<el-table-column prop="distributeType" label="分配状态" width="120" align="center" />
<el-table-column prop="busTypeValue" label="业务类型" width="120" align="center" />
<el-table-column prop="supplierName" label="供应商" width="220" align="center" />
<el-table-column prop="deliveryDate" label="到货日期" width="120" align="center" />
<el-table-column prop="billState" label="单据状态" width="100" align="center" />
<el-table-column label="上架单" align="center" width="100">
<template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;" @click="showUpShelfList(scope.row)">
{{ scope.row.upShlefNum }}
</div>
</template>
</el-table-column>
</el-table>
</div>
@ -99,6 +108,17 @@
<divAddupShelfRecord v-show="viewState == 5" ref="divAddupShelfRecord" @doback="resetState"
@reloadlist="loadList" />
<el-dialog title="上架单列表" :visible.sync="dialogVisible" :before-close="handleClose">
<el-table :data="upShelfList" border style="width: 100%;margin-top: -30px;">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod2" align="center" />
<el-table-column prop="billNo" label="单据编号" align="center" />
<el-table-column prop="createTime" label="单据日期" align="center" />
<el-table-column prop="createByName" label="制单人" align="center" />
<el-table-column prop="sourceBillNo" label="来源单号" align="center" />
<el-table-column prop="billState" label="单据状态" align="center" />
</el-table>
</el-dialog>
</div>
</template>
@ -136,26 +156,34 @@
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [{
btnList: [
// {
// type: 'primary',
// size: 'small',
// icon: 'plus',
// btnKey: 'toAudit',
// btnLabel: ''
// },
// {
// type: 'danger',
// size: 'small',
// icon: 'del',
// btnKey: 'doDel',
// btnLabel: ''
// },
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAudit',
btnLabel: '新增'
},
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
btnKey: 'toPrint',
btnLabel: '打印入库单'
},
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '上架'
btnLabel: '新增上架单'
},
{
type: 'info',
@ -175,8 +203,7 @@
},
sids: [],
selectionList: [],
busTypeList: [
],
busTypeList: [],
billStateList: [{
name: "新建",
sid: "0"
@ -187,6 +214,16 @@
},
],
upShelfList: [
// {
// billSid: 'sid',
// billNo: '',
// createTime: '',
// createByName: '',
// sourceBillNo: '',
// billState: ''
// },
]
}
},
mounted() {
@ -195,7 +232,10 @@
created() {
this.loadList()
getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
getTypeValueList({
type: 'wms_busType',
groupNum: 'wms_rk'
}).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
@ -203,6 +243,20 @@
},
methods: {
showUpShelfList(row) {
console.log("val", row);
req.getUpShlefList(row.sid).then((resp) => {
this.upShelfList = resp.data
this.dialogVisible = true
}).catch(() => {})
},
handleClose() {
this.dialogVisible = false
},
saveExamine() {
},
@ -249,6 +303,9 @@
case 'doDel':
this.doDel()
break
case 'toPrint':
this.toPrint()
break
case 'toAdd':
this.toAdd()
break
@ -286,6 +343,9 @@
var pageindex = index + 1 + pagestart
return pageindex
},
indexMethod2(index) {
return index + 1
},
dosearch() {
this.queryParams.current = 1
this.loadList()
@ -339,6 +399,26 @@
})
}
},
toPrint() {
for (var i = 0; i < this.selectionList.length; i++) {
if (this.selectionList[i].billState != '已完成') {
this.$message({
type: 'warning',
message: "只能选择已完成的记录。",
showClose: true
})
return
}
}
this.$message({
type: 'warning',
message: "打印功能正在完善中。",
showClose: true
})
},
toAdd() {
if (this.selectionList.length != 1) {
this.$message({

98
yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue

@ -50,7 +50,8 @@
<div class="span-sty"><span class="must">*</span> 业务类型</div>
<el-form-item prop="busTypeValue"><el-select v-model="formobj.busTypeValue" filterable clearable
placeholder="请选择" class="addinputInfo" @change="busTypeSelect">
<el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
<el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey">
</el-option>
</el-select></el-form-item>
</el-col>
@ -73,11 +74,20 @@
class="addinputInfo" value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker></el-form-item>
</el-col>
<el-col :span="16">
<el-col :span="8">
<div class="span-sty">单据状态</div>
<el-form-item> <span class="addinputInfo">{{formobj.billState}}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 收货人是否与上架人一致</div>
<!-- <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item> -->
<el-form-item prop="isUpShelf">
<el-radio-group v-model="formobj.isUpShelf" size="small" class="addinputInfo">
<el-radio :label="1"></el-radio>
<el-radio :label="2"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -161,7 +171,7 @@
</el-select>
</template>
</el-table-column> -->
<!-- <el-table-column label="预数量" prop="orderCount" align="center" width="120" v-if="isUpdata" /> -->
<el-table-column label="预期到货数量" prop="orderCount" align="center" width="120" />
<el-table-column label="实收数量" align="center" width="120">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE(scope.row,$event)"
@ -367,6 +377,11 @@
message: '到货日期不能为空',
trigger: 'change'
}],
isUpShelf: [{
required: true,
message: '请选择是或否',
trigger: 'change'
}],
}
}
},
@ -375,7 +390,7 @@
},
methods: {
init(){
init() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
@ -586,42 +601,45 @@
},
submit() {
if (this.formobj.list.length == 0) {
this.$message({
showClose: true,
type: 'error',
message: '请添加商品'
})
return
}
for (var i = 0; i < this.formobj.list.length; i++) {
var item = this.formobj.list[i]
if (item.goodsSkuSid == '') {
this.$message({
showClose: true,
type: 'error',
message: '请添加商品'
})
this.$refs['form_obj'].validate((valid) => {
if (valid) {
return
}
if (this.formobj.list.length == 0) {
this.$message({
showClose: true,
type: 'error',
message: '请添加商品'
})
if (item.actualInCount == 0) {
this.$message({
showClose: true,
type: 'error',
message: '实收数量不能为空'
})
return
}
return
}
for (var i = 0; i < this.formobj.list.length; i++) {
var item = this.formobj.list[i]
if (item.goodsSkuSid == '') {
this.$message({
showClose: true,
type: 'error',
message: '请添加商品'
})
}
return
}
if (item.actualInCount == 0) {
this.$message({
showClose: true,
type: 'error',
message: '实收数量不能为空'
})
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
@ -685,7 +703,10 @@
this.$refs['form_obj'].clearValidate()
})
getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
getTypeValueList({
type: 'wms_busType',
groupNum: 'wms_rk'
}).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
@ -696,7 +717,7 @@
showEdit(row) {
this.title = "【修改】"
this.isUpdata = true
this.init()
this.init()
this.getsupplierLust()
this.getWarehouseList()
console.log("showEdit", this.isUpdata);
@ -705,7 +726,10 @@
this.$refs['form_obj'].clearValidate()
})
getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
getTypeValueList({
type: 'wms_busType',
groupNum: 'wms_rk'
}).then((res) => {
if (res.success) {
this.busTypeList = res.data
}

248
yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue

@ -1,119 +1,121 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>收货单</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<!-- 标题 -->
<div>收货单</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" v-show="formobj.billState=='已完成'" :disabled="submitdisabled"
@click="addUpShelf">新增上架单</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<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="8">
<div class="span-sty">来源单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">到货日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">单据状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.billState }}</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>
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="商品名称" prop="goodsSpuName" align="center" width="200" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<!-- <el-table-column label="仓库" prop="warehouseName" align="center" width="180" />
<el-table-column label="库位" prop="warehouseRackName" align="center" width="180" />
<el-table-column label="预数量" prop="orderCount" align="center" width="120" /> -->
<el-table-column label="实收数量" prop="actualInCount" align="center" width="120" />
<el-table-column label="拒收数量" prop="rejectCount" align="center" width="120" />
<el-table-column label="拒收原因" prop="rejectReason" align="center" width="180" />
<el-table-column label="是否质检" align="center" width="180">
<template slot-scope="scope">
<el-radio-group v-model="scope.row.isQuality" :disabled="true" size="small">
<el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio>
</el-radio-group>
</template>
</el-table-column>
<el-table-column label="质检状态" align="center" width="180">
<template slot-scope="scope">
<el-radio-group v-model="scope.row.qualityState" :disabled="true" size="small">
<el-radio :label="0">合格</el-radio>
<el-radio :label="1">不合格</el-radio>
</el-radio-group>
</template>
</el-table-column>
<el-table-column label="载具说明" prop="packageRemark" align="center" width="180" />
<el-table-column label="入库单价" prop="cost" align="center" width="100" />
<el-table-column label="税率" prop="taxAmount" align="center" width="100" />
<!-- <el-table-column label="含税单价" prop="taxPrice" align="center" width="100" /> -->
<el-table-column label="入库金额" prop="amount" align="center" width="100" />
</el-table>
<!-- <div class="title titleOne">
<el-row class="first_row">
<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="8">
<div class="span-sty">来源单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">到货日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">单据状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.billState }}</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>
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="商品名称" prop="goodsSpuName" align="center" width="200" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<!-- <el-table-column label="仓库" prop="warehouseName" align="center" width="180" />
<el-table-column label="库位" prop="warehouseRackName" align="center" width="180" />-->
<el-table-column label="预期到货数量" prop="orderCount" align="center" width="120" />
<el-table-column label="实收数量" prop="actualInCount" align="center" width="120" />
<el-table-column label="拒收数量" prop="rejectCount" align="center" width="120" />
<el-table-column label="拒收原因" prop="rejectReason" align="center" width="180" />
<el-table-column label="是否质检" align="center" width="180">
<template slot-scope="scope">
<el-radio-group v-model="scope.row.isQuality" :disabled="true" size="small">
<el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio>
</el-radio-group>
</template>
</el-table-column>
<el-table-column label="质检状态" align="center" width="180">
<template slot-scope="scope">
<el-radio-group v-model="scope.row.qualityState" :disabled="true" size="small">
<el-radio :label="0">合格</el-radio>
<el-radio :label="1">不合格</el-radio>
</el-radio-group>
</template>
</el-table-column>
<el-table-column label="载具说明" prop="packageRemark" align="center" width="180" />
<el-table-column label="入库单价" prop="cost" align="center" width="100" />
<el-table-column label="税率" prop="taxAmount" align="center" width="100" />
<!-- <el-table-column label="含税单价" prop="taxPrice" align="center" width="100" /> -->
<el-table-column label="入库金额" prop="amount" align="center" width="100" />
</el-table>
<!-- <div class="title titleOne">
<div>商品-批次</div>
</div>
<el-table v-loading="listLoading" :data="formobj.pcList" border style="width: 100%;">
@ -131,9 +133,12 @@
<el-table-column label="数量" prop="batchCount" align="center" width="120" />
</el-table> -->
</el-form>
</el-form>
</div>
</div>
<!-- 新增上架单 -->
<upShelf v-show="viewState == 2" ref="divSp" @doback="resetState" />
</div>
@ -141,11 +146,14 @@
<script>
import req from '@/api/storage/receivingGoods.js'
import upShelf from './upShelfAddRecord'
export default {
components: {},
components: {
upShelf
},
data() {
return {
viewState: 1,
listLoading: false,
submitdisabled: false,
formobj: {},
@ -178,7 +186,14 @@
.catch(e => {
this.formobj = {}
})
}
},
resetState() {
this.viewState = 1
},
addUpShelf() {
this.viewState = 2
this.$refs['divSp'].showEdit(this.formobj)
},
}
}
</script>
@ -196,6 +211,11 @@
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;

413
yxt-as-ui/src/views/workFlow/weixiubeianFlow/maintenanceProjectRecordDaiBan.vue

@ -0,0 +1,413 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" @click="openCountersign('加签')"> </el-button>
<el-button type="primary" size="small" @click="openAgree('同意')"> </el-button>
<el-button type="danger" size="small" @click="openReject('驳回')"> </el-button>
<el-button type="danger" size="small" @click="openStop('终止')"> </el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</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.createTime }}</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><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.file" :key="index" :src="item" :preview-src-list="formobj.file" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.sitemsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sitemName" label="项目名称" align="center" width="170" />
<el-table-column prop="serviceType" label="工种" align="center" width="170" />
<el-table-column prop="subjectName" label="科目" align="center" width="100" />
<el-table-column prop="hourPrice" label="工时单价" align="center" width="100" />
<el-table-column prop="hours" label="工时数" align="center" width="100" />
<el-table-column prop="cost" label="外协成本" align="center" width="120" />
<el-table-column prop="price" label="销售价" align="center" width="120" />
<el-table-column prop="examineHourPrice" label="工时提成" align="center" width="120" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
<el-table-column label="预约项目" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.isReserve == '1' ? '是' : scope.row.isReserve == '0' ? '否' : '' }}</span>
</template>
</el-table-column>
<el-table-column label="洗车项目" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.isClean == '1' ? '是' : scope.row.isClean == '0' ? '否' : '' }}</span>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formadd" >
<el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span class="icon">*</span>加签人员:
</el-col>
<el-col :span="20">
<el-form-item>
<el-select v-model="countersign.assignee" placeholder="请选择" filterable>
<el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span>当前环节:</span>
</el-col>
<el-col :span="20">
<el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
</el-col>
</el-row>
<el-row :class="{rowClass:!currentLink}">
<el-col :span="4" class="tleftb">
<span>意见:</span>
</el-col>
<el-col :span="20">
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="reject"> </el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false"> </el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/basicinformation/maintenanceProjectRecord'
import { selectStaffListss } from '@/api/Common/dictcommons'
export default {
name: 'MaintenanceProjectRecordDaiBan',
data() {
return {
viewTitle: '',
viewState: 1,
tableKey: 1,
index: 0,
formobj: {
createByName: '',
createBySid: '',
createOrgName: '',
createOrgSid: '',
createTime: '',
deptName: '',
deptSid: '',
file: [],
instanceId: '',
sid: '',
sitemsVos: [],
taskId: '',
useOrgName: '',
useOrgSid: ''
},
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: 400 + 'px'
}
}, '*')
},
methods: {
showInfo(sid) {
this.viewTitle = '维修项目备案申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.file.length > 0) {
const aa = []
this.formobj.file.forEach((e) => {
aa.push(e.url)
})
this.formobj.file = aa
}
}
})
selectStaffListss().then((res) => {
if (res.success) {
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()
}
},
/** 加签 */
handleCountersign() {
if (this.countersign.assignee === '') {
this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
return
}
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
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>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.rowClass{
border-top: 1px solid #E0E3EB;
}
</style>

196
yxt-as-ui/src/views/workFlow/weixiubeianFlow/maintenanceProjectRecordEdit.vue

@ -0,0 +1,196 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</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.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item>
<uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.file" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.sitemsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sitemName" label="项目名称" align="center" width="170" />
<el-table-column prop="serviceType" label="工种" align="center" width="170" />
<el-table-column prop="subjectName" label="科目" align="center" width="100" />
<el-table-column prop="hourPrice" label="工时单价" align="center" width="100" />
<el-table-column prop="hours" label="工时数" align="center" width="100" />
<el-table-column prop="cost" label="外协成本" align="center" width="120" />
<el-table-column prop="price" label="销售价" align="center" width="120" />
<el-table-column prop="examineHourPrice" label="工时提成" align="center" width="120" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
<el-table-column label="预约项目" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.isReserve == '1' ? '是' : scope.row.isReserve == '0' ? '否' : '' }}</span>
</template>
</el-table-column>
<el-table-column label="洗车项目" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.isClean == '1' ? '是' : scope.row.isClean == '0' ? '否' : '' }}</span>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/basicinformation/maintenanceProjectRecord'
import uploadImg from '@/components/uploadFile/uploadImg'
export default {
name: 'MaintenanceProjectRecordEdit',
components: {
uploadImg
},
data() {
return {
viewTitle: '',
viewState: 1,
submitdisabled: false,
tableKey: 1,
index: 0,
formobj: {
createByName: '',
createBySid: '',
createOrgName: '',
createOrgSid: '',
createTime: '',
deptName: '',
deptSid: '',
file: [],
instanceId: '',
sid: '',
sitemsVos: [],
taskId: '',
useOrgName: '',
useOrgSid: ''
},
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: 400 + 'px'
}
}, '*')
},
methods: {
showInfo(sid) {
this.viewTitle = '【编辑】维修项目备案申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '提交成功' })
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
</style>

199
yxt-as-ui/src/views/workFlow/weixiubeianFlow/maintenanceProjectRecordYiBan.vue

@ -0,0 +1,199 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</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.createTime }}</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><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.file" :key="index" :src="item" :preview-src-list="formobj.file" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.sitemsVos" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="sitemName" label="项目名称" align="center" width="170" />
<el-table-column prop="serviceType" label="工种" align="center" width="170" />
<el-table-column prop="subjectName" label="科目" align="center" width="100" />
<el-table-column prop="hourPrice" label="工时单价" align="center" width="100" />
<el-table-column prop="hours" label="工时数" align="center" width="100" />
<el-table-column prop="cost" label="外协成本" align="center" width="120" />
<el-table-column prop="price" label="销售价" align="center" width="120" />
<el-table-column prop="examineHourPrice" label="工时提成" align="center" width="120" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
<el-table-column label="预约项目" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.isReserve == '1' ? '是' : scope.row.isReserve == '0' ? '否' : '' }}</span>
</template>
</el-table-column>
<el-table-column label="洗车项目" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.isClean == '1' ? '是' : scope.row.isClean == '0' ? '否' : '' }}</span>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/basicinformation/maintenanceProjectRecord'
export default {
name: 'MaintenanceProjectRecordYiBan',
data() {
return {
viewTitle: '',
viewState: 1,
tableKey: 1,
index: 0,
formobj: {
createByName: '',
createBySid: '',
createOrgName: '',
createOrgSid: '',
createTime: '',
deptName: '',
deptSid: '',
file: [],
instanceId: '',
sid: '',
sitemsVos: [],
taskId: '',
useOrgName: '',
useOrgSid: ''
},
rules: {},
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
}
}
},
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.userSid = window.sessionStorage.getItem('userSid')
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 400 + 'px'
}
}, '*')
},
methods: {
showInfo(sid) {
this.viewTitle = '维修项目备案申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.file.length > 0) {
const aa = []
this.formobj.file.forEach((e) => {
aa.push(e.url)
})
this.formobj.file = aa
}
}
})
},
/** 确认撤回任务 */
openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.handleRevoke()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消撤回'
})
})
},
/** 撤回任务 */
handleRevoke() {
req.revokeProcess(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>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>
Loading…
Cancel
Save