Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 10 months ago
parent
commit
9fbb8042c5
  1. 9
      yxt-as-ui/src/api/maintenanceReceive/maintenanceReceive.js
  2. 22
      yxt-as-ui/src/api/operation/webmasterConfirmation.js
  3. 6
      yxt-as-ui/src/router/index.js
  4. 73
      yxt-as-ui/src/views/maintenanceReceive/index.vue
  5. 391
      yxt-as-ui/src/views/operation/webmasterConfirmation/webmasterConfirmation.vue

9
yxt-as-ui/src/api/maintenanceReceive/maintenanceReceive.js

@ -15,19 +15,20 @@ export default {
},
// 打印领料单
downloadExcel: function(data) {
printSettlement: function(data) {
return request({
url: '/as/v1/AsBusrepairInventorybill/exportExcel',
url: '/as/v1/AsBusrepairBill/printInventoryBill',
method: 'post',
responseType: 'blob', // 表明返回服务器返回的数据类型
data: data,
headers: {
'Content-Type': 'application/json'
}
});
})
},
// 选择工单初始化数据
initBill: function(data) {
return request({

22
yxt-as-ui/src/api/operation/webmasterConfirmation.js

@ -0,0 +1,22 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPageConfirm: function(params) {
return request({
url: '/as/v1/AsBusrepairBill/listPageConfirm',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 出厂确认
statConfirmOut: function(data) {
return request({
url: '/as/v1/AsBusrepairBill/statConfirmOut',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
}

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

@ -121,6 +121,12 @@ export const constantRoutes = [{
noCache: true
}
},
{
path: '/webmasterConfirmation/webmasterConfirmation',
component: () => import('@/views/operation/webmasterConfirmation/webmasterConfirmation.vue'),
name: 'WebmasterConfirmation',
meta: { title: '站长出厂确认', noCache: true }
},
{
path: '/workorderinvoicing/workorderinvoicing',
component: () => import('@/views/operation/workorderinvoicing/workorderinvoicing.vue'),

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

@ -115,7 +115,8 @@
import req from '@/api/maintenanceReceive/maintenanceReceive.js'
import {
selSubjectInfo,
typeValues
typeValues,
getOrgSidByPath
} from '@/api/Common/dictcommons'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
@ -124,6 +125,9 @@
import divReturnInfo from './maintenanceReturnBound.vue'
import divConfirmInfo from './maintenanceConfirm.vue'
import divInfo from './repairbillInfo.vue'
import {
getStorage
} from '@/utils/auth'
export default {
components: {
ButtonBar,
@ -219,7 +223,9 @@
}
],
billTypeList: [],
subjectList: []
subjectList: [],
createOrgSid: "",
useOrgSid: ""
}
},
mounted() {
@ -247,6 +253,14 @@
this.subjectList = resp.data
}
})
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.createOrgSid = res.data
this.useOrgSid = res.data
}
})
},
selectionLineChangeHandle(val) {
@ -321,29 +335,38 @@
doPrint() {
if (this.sids.length == 1) {
// const loading = this.$loading({
// lock: true,
// text: 'Loading',
// spinner: 'el-icon-loading',
// background: 'rgba(0, 0, 0, 0.7)'
// })
// req.downloadExcel(this.sids).then((resp) => {
// loading.close()
// const blob = new Blob([resp], {
// type: 'application/vnd.ms-excel'
// })
// const fileName = '' + '.docx'
// const elink = document.createElement('a')
// elink.download = fileName
// elink.style.display = 'nonde'
// elink.href = URL.createObjectURL(blob)
// document.body.appendChild(elink)
// elink.click()
// URL.revokeObjectURL(elink.href)
// document.body.removeChild(elink)
// }).catch(() => {
// loading.close()
// })
var info = {
sid: this.sids[0], // sid
createOrgSid: this.createOrgSid,
useOrgSid: this.useOrgSid,
userSid: window.sessionStorage.getItem('userSid'),
}
req.printSettlement(info).then((res) => {
if (res.success) {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data +
'&outFileName=' + '领料单', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '领料单.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
}
})
} else {
this.$message({

391
yxt-as-ui/src/views/operation/webmasterConfirmation/webmasterConfirmation.vue

@ -0,0 +1,391 @@
<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="110px" 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.createDept" 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.startTime" 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.endTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="维修单类型">
<el-select v-model="listQuery.params.billType" clearable placeholder="请选择" filterable>
<el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="科目">
<el-input v-model="listQuery.params.subject" placeholder="" clearable/>
</el-form-item>
<el-form-item label="进厂时间">
<el-date-picker v-model="listQuery.params.entryStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.entryEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="预约完工时间">
<el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="客户名称">
<el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="listQuery.params.mobile" placeholder="" clearable/>
</el-form-item>
<el-form-item label="客户单位">
<el-input v-model="listQuery.params.customerOrg" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车牌号">
<el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="服务顾问">
<el-input v-model="listQuery.params.waitorName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="班组">
<el-input v-model="listQuery.params.groupName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="主修人">
<el-input v-model="listQuery.params.mainRepairers" placeholder="" clearable/>
</el-form-item>
<el-form-item label="是否开票">
<el-select v-model="listQuery.params.isInvoicing" clearable placeholder="请选择" 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>
<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 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="单据编号" align="center" width="180">
<template slot-scope="scope">
<span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.billNo }}</span>
</template>
</el-table-column>
<el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
<el-table-column prop="dept" label="制单部门" align="center" 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="billType" label="维修单类型" align="center" width="120" />
<el-table-column prop="subject" label="科目" align="center" width="100" />
<el-table-column prop="entryTime" label="进厂时间" align="center" width="160" />
<el-table-column prop="estimatedFinishTime" label="预计完工时间" align="center" width="160" />
<el-table-column prop="customerName" label="客户名称" align="center" width="160" />
<el-table-column prop="mobile" label="联系电话" align="center" width="100" />
<el-table-column prop="customerOrg" label="客户单位" align="center" width="100" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
<el-table-column prop="vinNo" label="车架号" align="center" width="100" />
<el-table-column prop="vehModel" label="车型" align="center" width="200" />
<el-table-column prop="waitorName" label="服务顾问" align="center" width="100" />
<el-table-column prop="groupName" label="班组" align="center" width="100" />
<el-table-column prop="mainRepairers" label="主修人" align="center" width="100" />
<el-table-column prop="nodeTime" label="是否开票" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.isInvoicing == '1' ? '是' : '否' }}</span>
</template>
</el-table-column>
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</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>
<!-- 详情 -->
<repairbillInfo v-show="viewState == 2" ref="divInfo" @doback="resetState" />
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/operation/webmasterConfirmation'
import { typeValues } from '@/api/Common/dictcommons'
import repairbillInfo from '../../operation/repairbill/repairbillInfo'
export default {
name: 'WebmasterConfirmation',
components: {
Pagination,
pageye,
ButtonBar,
repairbillInfo
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toAffirm',
btnLabel: '出厂确认'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1 2 3 4
tableKey: 0,
list: [],
sids: [], // SIDs
multipleSelection: [],
billType_list: [],
state_list: [
{
dictKey: '1',
dictValue: '是'
},
{
dictKey: '0',
dictValue: '否'
}
],
FormLoading: false,
listLoading: false,
//
listQuery: {
current: 1,
size: 5,
total: 0,
params: {
startTime: '',
endTime: '',
useOrgName: '',
dept: '',
createByName: '',
billNo: '',
billType: '',
entryStartTime: '',
entryEndTime: '',
finishStartTime: '',
finishEndTime: '',
customerName: '',
mobile: '',
customerOrg: '',
vehMark: '',
vinNo: '',
waitorName: '',
groupName: '',
mainRepairers: '',
isInvoicing: '',
nodeCode: '',
userSid: '',
menuUrl: '',
orgPath: '',
subject: ''
}
}
}
},
created() {
//
this.init()
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
init() {
typeValues({ type: 'billType' }).then((res) => {
if (res.success) {
this.billType_list = res.data
}
})
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toAffirm':
this.toAffirm()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
// sid
handleSelectionChange(row) {
const aa = []
this.multipleSelection = row
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.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.menuUrl = this.$route.path
req.listPageConfirm(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: {
startTime: '',
endTime: '',
useOrgName: '',
dept: '',
createByName: '',
billNo: '',
billType: '',
entryStartTime: '',
entryEndTime: '',
finishStartTime: '',
finishEndTime: '',
customerName: '',
mobile: '',
customerOrg: '',
vehMark: '',
vinNo: '',
waitorName: '',
groupName: '',
mainRepairers: '',
isInvoicing: '',
nodeCode: '',
userSid: '',
menuUrl: '',
orgPath: '',
subject: ''
}
}
this.getList()
},
toAffirm() {
if (this.sids.length > 0) {
for (var i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].isOutFactory === '否') {
this.$message({ showClose: true, type: 'error', message: '请选择是否可出厂为是的记录进行操作' })
return
}
}
} else {
this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行操作' })
}
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.statConfirmOut(this.sids).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '操作成功' })
this.getList()
}
loading.close()
}).catch(e => {
loading.close()
})
}).catch(() => {
})
},
toInfo(row) {
this.viewState = 2
this.$refs['divInfo'].showInfo(row)
},
//
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>
Loading…
Cancel
Save