UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

7/1 仓库管理 设备管理 查询统计

Browse Source
演示数据2.0
wangwei 9 months ago
parent d54de7a4a2
commit 48fe52f69f
29 changed files with 450 additions and 324 deletions
Show Stats Download Patch File Download Diff File

7
src/views/dev/deptDeviceUpkeep.vue
Unescape Escape View File

@ -268,7 +268,7 @@
</div> </div>
<div class="fr"> <div class="fr">
<el-button @click="repairRow = null">取消</el-button> <el-button @click="repairRow = null">取消</el-button>
<el-button type="primary" @click="commitRepair">提交</el-button> <el-button type="primary" @click="commitRepair" :loading="commitRepairLoading">提交</el-button>
</div> </div>
</div> </div>
<el-form :model="repairRow" :rules="repairRules" ref="repairForm" label-width="auto"> <el-form :model="repairRow" :rules="repairRules" ref="repairForm" label-width="auto">
@ -546,6 +546,7 @@ export default {
maxFiles: 3, maxFiles: 3,
fileSizeLimit: 5, fileSizeLimit: 5,
uploadedFileNames: '', uploadedFileNames: '',
commitRepairLoading: false,
} }
}, },
created() { created() {
@ -598,7 +599,9 @@ watch: {
}) })
pData.applyUserPhone = this.repairRow.repairUserPhone pData.applyUserPhone = this.repairRow.repairUserPhone
pData.taskId = this.repairRow.taskId pData.taskId = this.repairRow.taskId
this.commitRepairLoading = true
deviceRepairApplyAdd(pData).then(res => { deviceRepairApplyAdd(pData).then(res => {
this.commitRepairLoading = false
load.close() load.close()
if (res.code != 20000) { if (res.code != 20000) {
this.$message.error(res.message) this.$message.error(res.message)
@ -609,12 +612,12 @@ watch: {
this.getList() this.getList()
this.repairRow = null this.repairRow = null
}).catch(() => { }).catch(() => {
this.commitRepairLoading = false
load.close() load.close()
}) })
}) })
}, },
createRepair(row) { createRepair(row) {
console.log("hhhhhhhhhh")
let data = copyProperties(row, {...repairData}); let data = copyProperties(row, {...repairData});
this.uploadedFileNames = "" this.uploadedFileNames = ""
this.repairRow = _.extend({}, row, data) this.repairRow = _.extend({}, row, data)

4
src/views/dev/deviceChangeOrder.vue
Unescape Escape View File

@ -191,8 +191,8 @@
<!-- <el-button v-if="createActive==0" @click="changeActive(true)" type="primary">下一步</el-button>--> <!-- <el-button v-if="createActive==0" @click="changeActive(true)" type="primary">下一步</el-button>-->
<!-- <el-button v-else @click="changeActive(false)" type="primary">上一步</el-button>--> <!-- <el-button v-else @click="changeActive(false)" type="primary">上一步</el-button>-->
<el-button-group> <el-button-group>
<el-button :disabled="itemList.length===0" type="primary" @click="saveCache">草稿保存</el-button> <el-button :disabled="itemList.length===0" type="primary" @click="saveCache" :loading="draftLoading">草稿保存</el-button>
<el-button :disabled="itemList.length===0" type="primary" @click="saveForm">立即提交</el-button> <el-button :disabled="itemList.length===0" type="primary" @click="saveForm" :loading="submitLoading">立即提交</el-button>
</el-button-group> </el-button-group>
</div> </div>
</div> </div>

2
src/views/dev/deviceCheckItemDict.vue
Unescape Escape View File

@ -78,7 +78,7 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<div class="fr"> <div class="fr">
<el-button @click="createFlag = false">取消</el-button> <el-button @click="createFlag = false">取消</el-button>
<el-button type="primary" @click="saveFunc">保存</el-button> <el-button type="primary" @click="saveFunc" :loading="saveLoading">保存</el-button>
</div> </div>
</div> </div>
<el-form :model="saveData" ref="saveForm" :rules="formRule" label-width="auto"> <el-form :model="saveData" ref="saveForm" :rules="formRule" label-width="auto">

183
src/views/dev/devicePlan.vue
Unescape Escape View File

@ -35,7 +35,8 @@
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table :data="list" @row-click="rowClick" v-loading="loading" click-row-light <el-table :data="list" @row-click="rowClick" v-loading="loading" click-row-light
highlight-current-row> highlight-current-row
>
<el-table-column label="序号" width="50" type="index"/> <el-table-column label="序号" width="50" type="index"/>
<el-table-column label="计划单号" width="150" prop="planBillNo"/> <el-table-column label="计划单号" width="150" prop="planBillNo"/>
<el-table-column label="计划名称" width="150" prop="name"/> <el-table-column label="计划名称" width="150" prop="name"/>
@ -95,7 +96,8 @@
</div> </div>
<el-table :data="detailList" <el-table :data="detailList"
v-loading="detailLoading" click-row-light v-loading="detailLoading" click-row-light
highlight-current-row> highlight-current-row
>
<el-table-column label="序号" width="50" type="index"/> <el-table-column label="序号" width="50" type="index"/>
<el-table-column label="科室名称" prop="deptName"/> <el-table-column label="科室名称" prop="deptName"/>
<el-table-column label="设备编号" prop="deviceCode"/> <el-table-column label="设备编号" prop="deviceCode"/>
@ -135,7 +137,8 @@
> >
<devicePlanEdit :originData="planData" <devicePlanEdit :originData="planData"
:closePlanEdit="closePlanEdit" :closePlanEdit="closePlanEdit"
:createFlag="createFlag"/> :createFlag="createFlag"
/>
</el-dialog> </el-dialog>
@ -150,7 +153,8 @@
:planId="detailQuery.planId" :planId="detailQuery.planId"
:projectItem="projectItem" :projectItem="projectItem"
:pullData="planData" :pullData="planData"
:closeAddDevice="closeAddDevice"/> :closeAddDevice="closeAddDevice"
/>
</el-dialog> </el-dialog>
@ -160,50 +164,49 @@
<script> <script>
import {devicePlanDel, devicePlanInfo, devicePlanPage, devicePlanSave} from "@/api/dev/devicePlanApi"; import { devicePlanDel, devicePlanInfo, devicePlanPage, devicePlanSave } from '@/api/dev/devicePlanApi'
import { import {
devicePlanDetailDel, devicePlanDetailDel,
devicePlanDetailPage, devicePlanDetailDelByDeviceCode devicePlanDetailPage, devicePlanDetailDelByDeviceCode
} from "@/api/dev/devicePlanDetailApi"; } from '@/api/dev/devicePlanDetailApi'
import {getLoading} from "@/utils"; import { getLoading } from '@/utils'
import product from "@/views/basic/product/product.vue"; import product from '@/views/basic/product/product.vue'
import { import {
devicePlanDetailItemAdd, devicePlanDetailItemByDeviceCodeDel, devicePlanDetailItemAdd, devicePlanDetailItemByDeviceCodeDel,
devicePlanDetailItemDel, devicePlanDetailItemDel,
devicePlanDetailItemPage devicePlanDetailItemPage
} from "@/api/dev/devicePlanDetailItemApi"; } from '@/api/dev/devicePlanDetailItemApi'
import DeviceCheckItemDict from "@/views/dev/deviceCheckItemDict"; import DeviceCheckItemDict from '@/views/dev/deviceCheckItemDict'
import {deviceCheckGenByPlanId} from "@/api/dev/deviceCheckApi"; import { deviceCheckGenByPlanId } from '@/api/dev/deviceCheckApi'
import DevicePlanProject from "@/views/dev/devicePlanProject";
import devicePlanEdit from "@/views/dev/devicePlanEdit";
import DevicePlanProject from '@/views/dev/devicePlanProject'
import devicePlanEdit from '@/views/dev/devicePlanEdit'
let query = { let query = {
page: 1, page: 1,
limit: 10, limit: 10,
name: null, name: null,
chargeDeptCode: null, chargeDeptCode: null,
type:1, type: 1
} }
let detailQuery = { let detailQuery = {
page: 1, page: 1,
limit: 10, limit: 10,
planId: null, planId: null
} }
let rowDeltailQuery = { let rowDeltailQuery = {
page: 1, page: 1,
limit: 10, limit: 10,
planId: null, planId: null,
productId: null, productId: null
} }
let itemQuery = { let itemQuery = {
page: 1, page: 1,
limit: 10, limit: 10,
planId: null, planId: null,
productId: null, productId: null
} }
let planData = { let planData = {
@ -215,12 +218,12 @@ let planData = {
frequency: 1, frequency: 1,
dateInterval: null, dateInterval: null,
remark: null, remark: null,
type:1, type: 1
} }
export default { export default {
name: "devicePlan", name: 'devicePlan',
components: {DeviceCheckItemDict, product, devicePlanEdit, DevicePlanProject}, components: { DeviceCheckItemDict, product, devicePlanEdit, DevicePlanProject },
computed: {}, computed: {},
data() { data() {
return { return {
@ -229,14 +232,14 @@ export default {
loading: false, loading: false,
total: .0, total: .0,
list: [], list: [],
query: {...query}, query: { ...query },
//计划设备明细============================================= //计划设备明细=============================================
detailLoading: false, detailLoading: false,
detailQuery: {...detailQuery}, detailQuery: { ...detailQuery },
detailList: [], detailList: [],
detailTotal: 0, detailTotal: 0,
//巡检项目============================================= //巡检项目=============================================
itemQuery: {...itemQuery}, itemQuery: { ...itemQuery },
itemList: [], itemList: [],
itemTotal: 0, itemTotal: 0,
itemLoading: false, itemLoading: false,
@ -244,86 +247,86 @@ export default {
chooseDeviceList: [], chooseDeviceList: [],
chooseItemList: [], chooseItemList: [],
//新增/编辑计划=================================================== //新增/编辑计划===================================================
planEditTitle: "新增计划", planEditTitle: '新增计划',
createActive: 0, createActive: 0,
createFlag: false, createFlag: false,
chooseDeviceFlag: false, chooseDeviceFlag: false,
expandRowKeys: [], expandRowKeys: [],
dialogExpandRowKeys: [], dialogExpandRowKeys: [],
planData: {...planData}, planData: { ...planData },
formRule: { formRule: {
name: [{required: true, message: "计划名称不能为空", trigger: ["change", "blur"]}], name: [{ required: true, message: '计划名称不能为空', trigger: ['change', 'blur'] }],
chargeDeptCode: [{required: true, message: "负责部门不能为空", trigger: ["change", "blur"]}], chargeDeptCode: [{ required: true, message: '负责部门不能为空', trigger: ['change', 'blur'] }],
dateInterval: [{required: true, message: "计划执行区间不能为空", trigger: ["change", "blur"]}], dateInterval: [{ required: true, message: '计划执行区间不能为空', trigger: ['change', 'blur'] }],
frequency: [{ frequency: [{
required: true, required: true,
message: "计划执行频率不能为空", message: '计划执行频率不能为空',
trigger: ["change", "blur"] trigger: ['change', 'blur']
}], }]
}, },
dateInterval: null, dateInterval: null,
pickerOptions: { pickerOptions: {
disabledDate: time => { disabledDate: time => {
let nowDate = new Date().getTime(); let nowDate = new Date().getTime()
let pickDate = new Date(time).getTime(); let pickDate = new Date(time).getTime()
return (nowDate >= pickDate); return (nowDate >= pickDate)
}, },
shortcuts: [{ shortcuts: [{
text: '一个月(30天)', text: '一个月(30天)',
onClick(picker) { onClick(picker) {
const end = new Date(); const end = new Date()
const start = new Date(); const start = new Date()
start.setTime(start.getTime() + 3600 * 1000 * 24); start.setTime(start.getTime() + 3600 * 1000 * 24)
end.setTime(start.getTime() + 3600 * 1000 * 24 * 30); end.setTime(start.getTime() + 3600 * 1000 * 24 * 30)
picker.$emit('pick', [start, end]); picker.$emit('pick', [start, end])
} }
}, { }, {
text: '三个月(90天)', text: '三个月(90天)',
onClick(picker) { onClick(picker) {
const end = new Date(); const end = new Date()
const start = new Date(); const start = new Date()
start.setTime(start.getTime() + 3600 * 1000 * 24); start.setTime(start.getTime() + 3600 * 1000 * 24)
end.setTime(start.getTime() + 3600 * 1000 * 24 * 30 * 3); end.setTime(start.getTime() + 3600 * 1000 * 24 * 30 * 3)
picker.$emit('pick', [start, end]); picker.$emit('pick', [start, end])
} }
}, { }, {
text: '半年(180天)', text: '半年(180天)',
onClick(picker) { onClick(picker) {
const end = new Date(); const end = new Date()
const start = new Date(); const start = new Date()
start.setTime(start.getTime() + 3600 * 1000 * 24); start.setTime(start.getTime() + 3600 * 1000 * 24)
end.setTime(start.getTime() + 3600 * 1000 * 24 * 30 * 6); end.setTime(start.getTime() + 3600 * 1000 * 24 * 30 * 6)
picker.$emit('pick', [start, end]); picker.$emit('pick', [start, end])
} }
}, { }, {
text: '一年(365天)', text: '一年(365天)',
onClick(picker) { onClick(picker) {
const end = new Date(); const end = new Date()
const start = new Date(); const start = new Date()
start.setTime(start.getTime() + 3600 * 1000 * 24); start.setTime(start.getTime() + 3600 * 1000 * 24)
end.setTime(start.getTime() + 3600 * 1000 * 24 * 365); end.setTime(start.getTime() + 3600 * 1000 * 24 * 365)
picker.$emit('pick', [start, end]); picker.$emit('pick', [start, end])
} }
}] }]
}, },
projectVisible: false, projectVisible: false,
projectItem: null, projectItem: null
} }
}, },
watch: { watch: {
planData(v) { planData(v) {
if (v.planId != null) { if (v.planId != null) {
this.$set(v, "dateInterval", [v.startDate, v.endDate]) this.$set(v, 'dateInterval', [v.startDate, v.endDate])
} }
}, },
"planData.dateInterval"(v) { 'planData.dateInterval'(v) {
if (v != null && v.length > 0) { if (v != null && v.length > 0) {
this.planData.startDate = v[0] this.planData.startDate = v[0]
this.planData.endDate = v[1] this.planData.endDate = v[1]
} }
}, },
"$refs.dialogTable"(v) { '$refs.dialogTable'(v) {
this.$refs.dialogTable?.doLayout() this.$refs.dialogTable?.doLayout()
} }
@ -336,12 +339,12 @@ export default {
if (expandedRows.length == 0) { if (expandedRows.length == 0) {
return return
} }
this.$set(row, "detailData", { this.$set(row, 'detailData', {
loading: false, loading: false,
showSearch: true, showSearch: true,
list: [], list: [],
total: 0, total: 0,
query: {...rowDeltailQuery, planId: row.planId, productId: row.productId} query: { ...rowDeltailQuery, planId: row.planId, productId: row.productId }
}) })
this.getRowDetailList(row.detailData) this.getRowDetailList(row.detailData)
}, },
@ -363,9 +366,9 @@ export default {
}) })
}, },
deviceCheckGenFunc(row) { deviceCheckGenFunc(row) {
this.$confirm("此操作将会创建一个任务单，是否继续", "提示", { this.$confirm('此操作将会创建一个任务单，是否继续', '提示', {
confirmButtonText: "继续", confirmButtonText: '继续',
cancelButtonText: "取消" cancelButtonText: '取消'
}).then(() => { }).then(() => {
let load = getLoading(this) let load = getLoading(this)
deviceCheckGenByPlanId(row.planId).then(res => { deviceCheckGenByPlanId(row.planId).then(res => {
@ -383,9 +386,9 @@ export default {
}) })
}, },
delplan(row) { delplan(row) {
this.$confirm("此操作将会永久删除该计划，现有任务不受影响，是否继续", "提示", { this.$confirm('此操作将会永久删除该计划，现有任务不受影响，是否继续', '提示', {
confirmButtonText: "继续", confirmButtonText: '继续',
cancelButtonText: "取消" cancelButtonText: '取消'
}).then(() => { }).then(() => {
let load = getLoading(this) let load = getLoading(this)
devicePlanDel(row.planId).then(res => { devicePlanDel(row.planId).then(res => {
@ -434,9 +437,9 @@ export default {
}) })
}, },
delDetailItem(row) { delDetailItem(row) {
this.$confirm("此操作将会永久删除该条明细，且将在下一次任务生效，现有任务不受影响，是否继续", "提示", { this.$confirm('此操作将会永久删除该条明细，且将在下一次任务生效，现有任务不受影响，是否继续', '提示', {
confirmButtonText: "继续", confirmButtonText: '继续',
cancelButtonText: "取消" cancelButtonText: '取消'
}).then(() => { }).then(() => {
let load = getLoading(this) let load = getLoading(this)
if (!row.deviceCode) { if (!row.deviceCode) {
@ -469,9 +472,9 @@ export default {
}) })
}, },
delDetail(row) { delDetail(row) {
this.$confirm("此操作将会永久删除该条明细，且将在下一次任务生效，现有任务不受影响，是否继续", "提示", { this.$confirm('此操作将会永久删除该条明细，且将在下一次任务生效，现有任务不受影响，是否继续', '提示', {
confirmButtonText: "继续", confirmButtonText: '继续',
cancelButtonText: "取消" cancelButtonText: '取消'
}).then(() => { }).then(() => {
let load = getLoading(this) let load = getLoading(this)
if (row.deviceCode) { if (row.deviceCode) {
@ -506,7 +509,7 @@ export default {
}, },
rowClick(row) { rowClick(row) {
this.clickRow = row this.clickRow = row
this.detailQuery = {...detailQuery, planId: row.planId} this.detailQuery = { ...detailQuery, planId: row.planId }
this.getDetailList() this.getDetailList()
}, },
getDetailList() { getDetailList() {
@ -543,7 +546,7 @@ export default {
return return
} }
this.planData.planId = res.data this.planData.planId = res.data
this.detailQuery = {...detailQuery, planId: this.planData.planId} this.detailQuery = { ...detailQuery, planId: this.planData.planId }
this.getDetailList() this.getDetailList()
this.createActive += 1 this.createActive += 1
}).catch(e => { }).catch(e => {
@ -558,8 +561,8 @@ export default {
} else { } else {
if (this.createActive == 2) { if (this.createActive == 2) {
this.planData = {...this.planData} this.planData = { ...this.planData }
this.detailQuery = {...detailQuery, planId: this.itemQuery.planId} this.detailQuery = { ...detailQuery, planId: this.itemQuery.planId }
this.getDetailList() this.getDetailList()
load.close() load.close()
this.createActive -= 1 this.createActive -= 1
@ -570,7 +573,7 @@ export default {
this.$message.error(res.message) this.$message.error(res.message)
return return
} }
this.planData = {...res.data} this.planData = { ...res.data }
this.createActive -= 1 this.createActive -= 1
}).catch(e => { }).catch(e => {
load.close() load.close()
@ -608,11 +611,10 @@ export default {
}, },
closePlanEdit() { closePlanEdit() {
this.createFlag = false; this.createFlag = false
this.getList() this.getList()
}, },
deviceSelectChangFunc(list) { deviceSelectChangFunc(list) {
this.chooseDeviceList = list.map(i => i.deviceCode) this.chooseDeviceList = list.map(i => i.deviceCode)
}, },
@ -620,16 +622,15 @@ export default {
//新增编辑计划 //新增编辑计划
openCreate(planId, row) { openCreate(planId, row) {
if (planId != null) { if (planId != null) {
this.planEditTitle = `编辑巡检计划信息${row.planId ? '--(' + row.name + ')' : ''}`; this.planEditTitle = `编辑巡检计划信息${row.planId ? '--(' + row.name + ')' : ''}`
this.planData = row; this.planData = row
} else { } else {
this.planEditTitle = "新增计划"; this.planEditTitle = '新增计划'
this.planData = { this.planData = {
type:1 type: 1
};
} }
this.createFlag = true; }
this.createFlag = true
// this.createActive = 0 // this.createActive = 0
// if (createActive != null) { // if (createActive != null) {
@ -667,7 +668,7 @@ export default {
this.getList() this.getList()
}, },
onReset() { onReset() {
this.query = {...query} this.query = { ...query }
this.getList() this.getList()
}, },
getList() { getList() {
@ -688,11 +689,11 @@ export default {
}, },
setProject(row) { setProject(row) {
this.planData = { this.planData = {
type:1 type: 1
}; }
this.projectVisible = true this.projectVisible = true
this.projectItem = row this.projectItem = row
}, }
} }
} }

24
src/views/dev/devicePlanEdit.vue
Unescape Escape View File

@ -3,10 +3,10 @@
<el-card> <el-card>
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<div class="fr"> <div class="fr">
<el-button size="mini" type="primary" @click.native="saveOrder(1)" <el-button size="mini" type="primary" @click.native="saveOrder(1)" :loading="draftLoading"
>草稿保存 >草稿保存
</el-button> </el-button>
<el-button size="mini" type="primary" @click.native="saveOrder(2)" <el-button size="mini" type="primary" @click.native="saveOrder(2)" :loading="submitLoading"
>立即提交 >立即提交
</el-button> </el-button>
</div> </div>
@ -265,6 +265,8 @@ export default {
projectVisible: false, projectVisible: false,
projectItem: null, projectItem: null,
chooseDetailItemFlag: false, chooseDetailItemFlag: false,
draftLoading: false,
submitLoading: false,
} }
}, },
@ -362,8 +364,20 @@ export default {
saveOrder(status) { saveOrder(status) {
this.planData.status = status; this.planData.status = status;
this.planData.type = this.originData.type; this.planData.type = this.originData.type;
if (status == 1){
//草稿保存
this.draftLoading = true
}else {
this.submitLoading = true
}
if (this.$parent.$options.propsData.title == '新增保养计划'){ if (this.$parent.$options.propsData.title == '新增保养计划'){
deviceUpkeepPlanSave(this.planData).then(res => { deviceUpkeepPlanSave(this.planData).then(res => {
if (status == 1){
//草稿保存
this.draftLoading = false
}else {
this.submitLoading = false
}
if (res.code != 20000) { if (res.code != 20000) {
this.$message.error(res.message) this.$message.error(res.message)
return return
@ -374,6 +388,12 @@ export default {
}) })
}else { }else {
devicePlanSave(this.planData).then(res => { devicePlanSave(this.planData).then(res => {
if (status == 1){
//草稿保存
this.draftLoading = false
}else {
this.submitLoading = false
}
if (res.code != 20000) { if (res.code != 20000) {
this.$message.error(res.message) this.$message.error(res.message)
return return

2
src/views/dev/deviceRepair.vue
Unescape Escape View File

@ -102,7 +102,7 @@
{{ `设备号：${currentRow.deviceCode}` }} {{ `设备号：${currentRow.deviceCode}` }}
</div> </div>
<div class="fr"> <div class="fr">
<el-button type="primary" @click="finishFunc" v-if="!currentRow.finishFlag" >完成维修</el-button> <el-button type="primary" @click="finishFunc" v-if="!currentRow.finishFlag" :loading="finishLoading">完成维修</el-button>
</div> </div>
</div> </div>
<el-descriptions border label-style="width:90px" :column="4"> <el-descriptions border label-style="width:90px" :column="4">

2
src/views/dev/deviceRepairApply.vue
Unescape Escape View File

@ -147,7 +147,7 @@
</div> </div>
<div class="fr"> <div class="fr">
<el-button @click="createFlag = false">取消</el-button> <el-button @click="createFlag = false">取消</el-button>
<el-button type="primary" @click="saveFunc">保存</el-button> <el-button type="primary" @click="saveFunc" :loading="submitLoading">保存</el-button>
</div> </div>
</div> </div>
<el-form :model="saveData" ref="saveForm" :rules="formRule" label-width="auto"> <el-form :model="saveData" ref="saveForm" :rules="formRule" label-width="auto">

2
src/views/dev/deviceRepairApplyHall.vue
Unescape Escape View File

@ -168,7 +168,7 @@
</div> </div>
<div class="fr"> <div class="fr">
<el-button @click="detailFlag = false">取消</el-button> <el-button @click="detailFlag = false">取消</el-button>
<el-button type="primary" @click="commitFunc">提交</el-button> <el-button type="primary" @click="commitFunc" :loading="submitLoading">提交</el-button>
</div> </div>
</div> </div>
<el-form :model="diagnosisData" ref="saveForm" :rules="detailRules" label-width="auto"> <el-form :model="diagnosisData" ref="saveForm" :rules="detailRules" label-width="auto">

2
src/views/dev/deviceRepairApplyMy.vue
Unescape Escape View File

@ -156,7 +156,7 @@
</div> </div>
<div class="fr"> <div class="fr">
<el-button @click="detailFlag = false">取消</el-button> <el-button @click="detailFlag = false">取消</el-button>
<el-button type="primary" @click="commitFunc">提交</el-button> <el-button type="primary" @click="commitFunc" :loading="commitLoading">提交</el-button>
</div> </div>
</div> </div>
<el-form :model="diagnosisData" ref="saveForm" :rules="detailRules" label-width="auto"> <el-form :model="diagnosisData" ref="saveForm" :rules="detailRules" label-width="auto">

2
src/views/dev/deviceUpkeepItemDict.vue
Unescape Escape View File

@ -90,7 +90,7 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<div class="fr"> <div class="fr">
<el-button @click="createFlag = false">取消</el-button> <el-button @click="createFlag = false">取消</el-button>
<el-button type="primary" @click="saveFunc">保存</el-button> <el-button type="primary" @click="saveFunc" :loading="saveLoading">保存</el-button>
</div> </div>
</div> </div>
<el-form :model="saveData" ref="saveForm" :rules="formRule" label-width="auto"> <el-form :model="saveData" ref="saveForm" :rules="formRule" label-width="auto">

14
src/views/dev/deviceUpkeepPlan.vue
Unescape Escape View File

@ -36,7 +36,8 @@
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table :data="list" @row-click="rowClick" v-loading="loading" click-row-light <el-table :data="list" @row-click="rowClick" v-loading="loading" click-row-light
highlight-current-row> highlight-current-row
>
<el-table-column label="序号" width="50" type="index"/> <el-table-column label="序号" width="50" type="index"/>
<el-table-column label="计划单号" width="150" prop="planBillNo"/> <el-table-column label="计划单号" width="150" prop="planBillNo"/>
<el-table-column label="计划名称" width="150" prop="name"/> <el-table-column label="计划名称" width="150" prop="name"/>
@ -96,7 +97,8 @@
</div> </div>
<el-table :data="detailList" <el-table :data="detailList"
v-loading="detailLoading" click-row-light v-loading="detailLoading" click-row-light
highlight-current-row> highlight-current-row
>
<el-table-column label="序号" width="50" type="index"/> <el-table-column label="序号" width="50" type="index"/>
<el-table-column label="科室名称" prop="deptName"/> <el-table-column label="科室名称" prop="deptName"/>
<el-table-column label="设备编号" prop="deviceCode"/> <el-table-column label="设备编号" prop="deviceCode"/>
@ -138,7 +140,8 @@
:planId="detailQuery.planId" :planId="detailQuery.planId"
:projectItem="projectItem" :projectItem="projectItem"
:pullData="planData" :pullData="planData"
:closeAddDevice="closeAddDevice"/> :closeAddDevice="closeAddDevice"
/>
</el-dialog> </el-dialog>
<!--新增保养计划--> <!--新增保养计划-->
@ -151,12 +154,11 @@
> >
<devicePlanEdit :originData="planData" <devicePlanEdit :originData="planData"
:closePlanEdit="closePlanEdit" :closePlanEdit="closePlanEdit"
:createFlag="createFlag"/> :createFlag="createFlag"
/>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>

8
src/views/dev/js/deviceChangeOrder.js
Unescape Escape View File

@ -145,6 +145,8 @@ export default {
invCode: null, invCode: null,
}, },
thisData: {}, thisData: {},
draftLoading: false,
submitLoading: false,
//================================================== //==================================================
} }
@ -229,7 +231,9 @@ export default {
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}); });
this.draftLoading = true
saveDraftOrder(this.createData).then(res => { saveDraftOrder(this.createData).then(res => {
this.draftLoading = false
loading.close() loading.close()
if (res.code != 20000) { if (res.code != 20000) {
this.$message.error(res.message) this.$message.error(res.message)
@ -240,6 +244,7 @@ export default {
this.query = {...query} this.query = {...query}
this.getList() this.getList()
}).catch(() => { }).catch(() => {
this.draftLoading = false
loading.close() loading.close()
}) })
@ -291,7 +296,9 @@ export default {
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}); });
this.submitLoading = true
saveChangeOrder(this.createData).then(res => { saveChangeOrder(this.createData).then(res => {
this.submitLoading = false
loading.close() loading.close()
if (res.code != 20000) { if (res.code != 20000) {
this.$message.error(res.message) this.$message.error(res.message)
@ -302,6 +309,7 @@ export default {
this.query = {...query} this.query = {...query}
this.getList() this.getList()
}).catch(() => { }).catch(() => {
this.submitLoading = false
loading.close() loading.close()
}) })
}, },

4
src/views/dev/js/deviceCheckItemDict.js
Unescape Escape View File

@ -38,6 +38,7 @@ export default {
name: [{required: true, message: "项目名称不能为空", trigger: "change"}], name: [{required: true, message: "项目名称不能为空", trigger: "change"}],
content: [{required: true, message: "项目内容不能为空", trigger: "change"}] content: [{required: true, message: "项目内容不能为空", trigger: "change"}]
}, },
saveLoading: false,
} }
}, },
created() { created() {
@ -79,7 +80,9 @@ export default {
return false return false
} }
let loading = getLoading(this); let loading = getLoading(this);
this.saveLoading = true
saveDeviceCheckItemDict(this.saveData).then(res => { saveDeviceCheckItemDict(this.saveData).then(res => {
this.saveLoading = false
loading.close() loading.close()
if (res.code != 20000) { if (res.code != 20000) {
this.$message.error(res.message) this.$message.error(res.message)
@ -90,6 +93,7 @@ export default {
this.query.page = 1 this.query.page = 1
this.getList() this.getList()
}).catch(() => { }).catch(() => {
this.saveLoading = false
loading.close loading.close
}) })
}) })

4
src/views/dev/js/deviceRepair.js
Unescape Escape View File

@ -28,6 +28,7 @@ export default {
list: [], list: [],
query: {...query}, query: {...query},
user: null, user: null,
finishLoading: false,
} }
}, },
created() { created() {
@ -57,7 +58,9 @@ export default {
// cancelButtonText: "取消" // cancelButtonText: "取消"
// }).then((r) => { // }).then((r) => {
let loading = getLoading(this); let loading = getLoading(this);
this.finishLoading = true
finishRepairByUser(row).then(res => { finishRepairByUser(row).then(res => {
this.finishLoading = false
loading.close() loading.close()
if (res.code != 20000) { if (res.code != 20000) {
this.$message.error(res.message) this.$message.error(res.message)
@ -66,6 +69,7 @@ export default {
this.getList() this.getList()
this.finishFuncFlagClose() this.finishFuncFlagClose()
}).catch(e=>{ }).catch(e=>{
this.finishLoading = false
loading.close() loading.close()
}) })
// }) // })

4
src/views/dev/js/deviceRepairApply.js
Unescape Escape View File

@ -70,6 +70,7 @@ export default {
detailList: [], detailList: [],
detailTotal: 0, detailTotal: 0,
repairId: null, repairId: null,
submitLoading: false,
//========detail--end=============================== //========detail--end===============================
} }
}, },
@ -136,7 +137,9 @@ export default {
return false return false
} }
let loading = getLoading(that); let loading = getLoading(that);
this.submitLoading = true
deviceRepairApplyAdd(this.saveData).then(res => { deviceRepairApplyAdd(this.saveData).then(res => {
this.submitLoading = false
loading.close() loading.close()
if (res.code != 20000) { if (res.code != 20000) {
this.$message.error(res.message) this.$message.error(res.message)
@ -147,6 +150,7 @@ export default {
this.query.page = 1 this.query.page = 1
this.getList() this.getList()
}).catch(() => { }).catch(() => {
this.submitLoading = false
loading.close loading.close
}) })
}) })

3
src/views/dev/js/deviceRepairApplyHall.js
Unescape Escape View File

@ -102,6 +102,7 @@ export default {
}], }],
diagnosisInfo: [{required: true, message: "诊断信息不能为空", trigger: ["change", "blur"]}], diagnosisInfo: [{required: true, message: "诊断信息不能为空", trigger: ["change", "blur"]}],
}, },
submitLoading: false
//========detailDialog--end=============================== //========detailDialog--end===============================
} }
} }
@ -139,7 +140,9 @@ export default {
return return
} }
this.diagnosisData.diagnosisLivePath = this.uploadedFileNames this.diagnosisData.diagnosisLivePath = this.uploadedFileNames
this.submitLoading = true
deviceRepairApplyDetailDiagnosis(this.diagnosisData).then(res => { deviceRepairApplyDetailDiagnosis(this.diagnosisData).then(res => {
this.submitLoading = false
if (res.code != 20000) { if (res.code != 20000) {
this.$message.error(res.message) this.$message.error(res.message)
return return

3
src/views/dev/js/deviceRepairApplyMy.js
Unescape Escape View File

@ -95,6 +95,7 @@ export default {
}], }],
diagnosisInfo: [{required: true, message: "诊断信息不能为空", trigger: ["change", "blur"]}], diagnosisInfo: [{required: true, message: "诊断信息不能为空", trigger: ["change", "blur"]}],
}, },
commitLoading: false,
//========detailDialog--end=============================== //========detailDialog--end===============================
} }
} }
@ -121,7 +122,9 @@ export default {
if (!b) { if (!b) {
return return
} }
this.commitLoading = true
deviceRepairApplyDetailDiagnosis(this.diagnosisData).then(res => { deviceRepairApplyDetailDiagnosis(this.diagnosisData).then(res => {
this.commitLoading = false
if (res.code != 20000) { if (res.code != 20000) {
this.$message.error(res.message) this.$message.error(res.message)
return return

47
src/views/dev/js/deviceUpkeepItemDict.js
Unescape Escape View File

@ -3,45 +3,49 @@ import {
deviceCheckItemDictPage, deviceCheckItemDictPage,
genCheckItemCode, genCheckItemCode,
saveDeviceCheckItemDict saveDeviceCheckItemDict
} from "@/api/dev/deviceCheckItemDictApi"; } from '@/api/dev/deviceCheckItemDictApi'
import {getLoading, getLoadingObj} from "@/utils"; import { getLoading, getLoadingObj } from '@/utils'
let query = { let query = {
page: 1, page: 1,
limit: 10, limit: 10,
name: null, name: null,
code: null, code: null,
type:2, type: 2
} }
let saveData = { let saveData = {
code: null, code: null,
name: null, name: null,
content: null, content: null,
type:2, type: 2
} }
export default { export default {
name: "deviceCheckItemDict", name: 'deviceCheckItemDict',
props: {isChoose: {required: false, default: false, type: Boolean}, selectChangFunc: {required: false, type: Function}}, props: {
isChoose: { required: false, default: false, type: Boolean },
selectChangFunc: { required: false, type: Function }
},
data() { data() {
return { return {
showSearch: true, showSearch: true,
loading: false, loading: false,
total: .0, total: .0,
list: [], list: [],
query: {...query}, query: { ...query },
createFlag: false, createFlag: false,
saveData: {...saveData}, saveData: { ...saveData },
formRule: { formRule: {
code: [{required: true, message: "项目编码不能为空", trigger: "change"}], code: [{ required: true, message: '项目编码不能为空', trigger: 'change' }],
name: [{required: true, message: "项目名称不能为空", trigger: "change"}], name: [{ required: true, message: '项目名称不能为空', trigger: 'change' }],
content: [{required: true, message: "项目内容不能为空", trigger: "change"}] content: [{ required: true, message: '项目内容不能为空', trigger: 'change' }]
}, },
options: [ options: [
{ label: '巡检项目', value: '1' }, { label: '巡检项目', value: '1' },
{ label: '保养项目', value: '2' } { label: '保养项目', value: '2' }
] ],
saveLoading: false,
} }
}, },
@ -50,9 +54,9 @@ export default {
}, },
methods: { methods: {
delFunc(row) { delFunc(row) {
this.$confirm("此操作将会永久删除该数据，是否继续？", "提示", { this.$confirm('此操作将会永久删除该数据，是否继续？', '提示', {
confirmButtonText: "继续", confirmButtonText: '继续',
cancelButtonText: "取消" cancelButtonText: '取消'
}).then(() => { }).then(() => {
let load = getLoading(this) let load = getLoading(this)
delDeviceCheckItemDict(row.code).then(res => { delDeviceCheckItemDict(row.code).then(res => {
@ -62,7 +66,7 @@ export default {
return return
} }
this.$message.success(res.message) this.$message.success(res.message)
this.query = {...query} this.query = { ...query }
this.getList() this.getList()
}).catch(() => { }).catch(() => {
load.close() load.close()
@ -78,13 +82,15 @@ export default {
this.saveData.code = res.data this.saveData.code = res.data
}) })
}, },
saveFunc: function () { saveFunc: function() {
this.$refs.saveForm.validate(b => { this.$refs.saveForm.validate(b => {
if (!b) { if (!b) {
return false return false
} }
let loading = getLoading(this); let loading = getLoading(this)
this.saveLoading = true
saveDeviceCheckItemDict(this.saveData).then(res => { saveDeviceCheckItemDict(this.saveData).then(res => {
this.saveLoading = false
loading.close() loading.close()
if (res.code != 20000) { if (res.code != 20000) {
this.$message.error(res.message) this.$message.error(res.message)
@ -95,6 +101,7 @@ export default {
this.query.page = 1 this.query.page = 1
this.getList() this.getList()
}).catch(() => { }).catch(() => {
this.saveLoading = false
loading.close loading.close
}) })
}) })
@ -105,7 +112,7 @@ export default {
this.$message.error(res.message) this.$message.error(res.message)
return return
} }
this.saveData = {...saveData, code: res.data} this.saveData = { ...saveData, code: res.data }
this.createFlag = true this.createFlag = true
}) })
}, },
@ -114,7 +121,7 @@ export default {
this.getList() this.getList()
}, },
onReset() { onReset() {
this.query = {...query} this.query = { ...query }
this.getList() this.getList()
}, },
getList() { getList() {

10
src/views/inventory/InvOrderPlaceModify.vue
Unescape Escape View File

@ -5,7 +5,7 @@
style="display: flex; margin: 0px 0 10px 80%; height: 35px" style="display: flex; margin: 0px 0 10px 80%; height: 35px"
> >
<!-- <el-button size="mini" type="primary" @click.native="selectOrder()">选入单据</el-button>--> <!-- <el-button size="mini" type="primary" @click.native="selectOrder()">选入单据</el-button>-->
<el-button size="mini" type="primary" @click.native="saveData()" <el-button size="mini" type="primary" @click.native="saveData()" :loading="saveLoading"
>提交</el-button >提交</el-button
> >
<el-button <el-button
@ -207,6 +207,7 @@ export default {
}, },
spaceSearchResult: [], spaceSearchResult: [],
currentOrderId: null, currentOrderId: null,
saveLoading: false,
}; };
}, },
methods: { methods: {
@ -239,8 +240,10 @@ export default {
type: 2, type: 2,
oid: this.formData.orderId, oid: this.formData.orderId,
}; };
this.saveLoading = true
bindInvOrderSpace(params) bindInvOrderSpace(params)
.then((res) => { .then((res) => {
this.saveLoading = false
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("上架成功"); this.$message.success("上架成功");
this.clearFormData(); this.clearFormData();
@ -252,10 +255,13 @@ export default {
} }
}) })
.catch((error) => { .catch((error) => {
this.saveLoading = false
this.$message.error(error.message); this.$message.error(error.message);
}); });
}) })
.catch(() => {}); .catch(() => {
this.saveLoading = false
});
}, },
clearFormData() { clearFormData() {
//清空表单数据 //清空表单数据

10
src/views/inventory/InvPlaceChangeModify.vue
Unescape Escape View File

@ -3,7 +3,7 @@
<el-button-group <el-button-group
style="display: flex; margin: 0px 0 10px 80%; height: 35px" style="display: flex; margin: 0px 0 10px 80%; height: 35px"
> >
<el-button size="mini" type="primary" @click.native="saveData()" <el-button size="mini" type="primary" @click.native="saveData()" :loading="saveLoading"
>提交</el-button >提交</el-button
> >
<el-button size="mini" type="primary" @click.native="closePlaceDialog(1)" <el-button size="mini" type="primary" @click.native="closePlaceDialog(1)"
@ -197,6 +197,7 @@ export default {
loading: false, loading: false,
spaceSearchResult: [], spaceSearchResult: [],
spaceChangeSearchResult: [], spaceChangeSearchResult: [],
saveLoading: false,
}; };
}, },
methods: { methods: {
@ -226,8 +227,10 @@ export default {
type: 3, //按物资上架 type: 3, //按物资上架
orderId: this.orderId, orderId: this.orderId,
}; };
this.saveLoading = true
bindInvSpace(params) bindInvSpace(params)
.then((res) => { .then((res) => {
this.saveLoading = false
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("变更成功"); this.$message.success("变更成功");
this.clearFormData(); this.clearFormData();
@ -239,10 +242,13 @@ export default {
} }
}) })
.catch((error) => { .catch((error) => {
this.saveLoading = false
this.$message.error(error.message); this.$message.error(error.message);
}); });
}) })
.catch(() => {}); .catch(() => {
this.saveLoading = false
});
}, },
clearFormData() { clearFormData() {
//清空表单数据 //清空表单数据

8
src/views/inventory/InvProductPlaceModify.vue
Unescape Escape View File

@ -3,7 +3,7 @@
<el-button-group <el-button-group
style="display: flex; margin: 0px 0 10px 80%; height: 35px" style="display: flex; margin: 0px 0 10px 80%; height: 35px"
> >
<el-button size="mini" type="primary" @click.native="saveData()" <el-button size="mini" type="primary" @click.native="saveData()" :loading="saveLoading"
>提交 >提交
</el-button </el-button
> >
@ -207,6 +207,7 @@ export default {
loading: false, loading: false,
spaceSearchResult: [], spaceSearchResult: [],
sitcomScan: false, sitcomScan: false,
saveLoading: false,
}; };
}, },
methods: { methods: {
@ -237,8 +238,10 @@ export default {
type: 1, //按物资上架 type: 1, //按物资上架
orderId: this.orderId, orderId: this.orderId,
}; };
this.saveLoading = true
bindInvSpace(params) bindInvSpace(params)
.then((res) => { .then((res) => {
this.saveLoading = false
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("上架成功"); this.$message.success("上架成功");
this.clearFormData(); this.clearFormData();
@ -246,14 +249,17 @@ export default {
this.$refs.spaceInputRef.focus(); this.$refs.spaceInputRef.focus();
}); });
} else { } else {
this.saveLoading = false
this.$message.error(res.message); this.$message.error(res.message);
} }
}) })
.catch((error) => { .catch((error) => {
this.saveLoading = false
this.$message.error(error.message); this.$message.error(error.message);
}); });
}) })
.catch(() => { .catch(() => {
this.saveLoading = false
}); });
}, },
updateInvSpaceCode() { updateInvSpaceCode() {

7
src/views/inventory/InvProductPlaceOutModify.vue
Unescape Escape View File

@ -3,7 +3,7 @@
<el-button-group <el-button-group
style="display: flex; margin: 0px 0 10px 80%; height: 35px" style="display: flex; margin: 0px 0 10px 80%; height: 35px"
> >
<el-button size="mini" type="primary" @click.native="saveData()" <el-button size="mini" type="primary" @click.native="saveData()" :loading="saveLoading"
>提交 >提交
</el-button </el-button
> >
@ -120,6 +120,7 @@ export default {
spaceList: [], spaceList: [],
loading: false, loading: false,
spaceSearchResult: [], spaceSearchResult: [],
saveLoading: false,
}; };
}, },
methods: { methods: {
@ -149,8 +150,10 @@ export default {
orderId: this.orderId, orderId: this.orderId,
outCount: this.list.length outCount: this.list.length
}; };
this.saveLoading = true
unbindInvOrderSpace(params) unbindInvOrderSpace(params)
.then((res) => { .then((res) => {
this.saveLoading = false
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("下架成功"); this.$message.success("下架成功");
this.clearFormData(); this.clearFormData();
@ -162,10 +165,12 @@ export default {
} }
}) })
.catch((error) => { .catch((error) => {
this.saveLoading = false
this.$message.error(error.message); this.$message.error(error.message);
}); });
}) })
.catch(() => { .catch(() => {
this.saveLoading = false
}); });
}, },
clearFormData() { clearFormData() {

3
src/views/inventory/addInvRemindSetDialog.vue
Unescape Escape View File

@ -193,13 +193,16 @@ export default {
this.$message.warning("至少开启一项预警！"); this.$message.warning("至少开启一项预警！");
return; return;
} }
this.formLoading = true
saveInvRemindSet(this.formData, "add").then((res) => { saveInvRemindSet(this.formData, "add").then((res) => {
this.formLoading = false
if (res.code === 20000) { if (res.code === 20000) {
this.closeDialog(); this.closeDialog();
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
} }
}).catch((error) => { }).catch((error) => {
this.formLoading = false
this.$message.error(error.message); this.$message.error(error.message);
this.closeDialog(); this.closeDialog();
}) })

10
src/views/inventory/count/InvCountOrderModify.vue
Unescape Escape View File

@ -6,11 +6,13 @@
<el-button <el-button
type="primary" type="primary"
@click.native="saveOrder()" @click.native="saveOrder()"
:loading="saveLoading"
>草稿保存 >草稿保存
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
@click.native="submitAudit()" @click.native="submitAudit()"
:loading="submitLoading"
>提交审核 >提交审核
</el-button> </el-button>
</el-button-group> </el-button-group>
@ -416,6 +418,8 @@ export default {
multiProduct: [], multiProduct: [],
selectedIndex: null, selectedIndex: null,
isCodeAlive: true, isCodeAlive: true,
saveLoading: false,
submitLoading: false,
} }
}, },
methods: { methods: {
@ -468,7 +472,9 @@ export default {
countType: this.countOrder.countType, countType: this.countOrder.countType,
codeCount: this.formData.codeCount, codeCount: this.formData.codeCount,
}; };
this.saveLoading = true
saveCountOrder(orderData).then((res) => { saveCountOrder(orderData).then((res) => {
this.saveLoading = false
if (res.code === 20000) { if (res.code === 20000) {
this.formData.orderId = res.data.orderId; this.formData.orderId = res.data.orderId;
this.formData.createTime = res.data.createTime; this.formData.createTime = res.data.createTime;
@ -480,6 +486,7 @@ export default {
this.closeDialog(); this.closeDialog();
} }
} else { } else {
this.saveLoading = false
this.$message.error(res.message); this.$message.error(res.message);
} }
}); });
@ -500,7 +507,9 @@ export default {
}, },
submitAudit() { submitAudit() {
this.submitLoading = true
submitAudit(this.formData).then((res) => { submitAudit(this.formData).then((res) => {
this.submitLoading = false
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("提交成功！"); this.$message.success("提交成功！");
this.getList(); this.getList();
@ -509,6 +518,7 @@ export default {
this.$message.error(res.message); this.$message.error(res.message);
} }
}).catch((error) => { }).catch((error) => {
this.submitLoading = false
this.$message.error(error.message); this.$message.error(error.message);
}); });
}, },

7
src/views/inventory/stockCompare.js
Unescape Escape View File

@ -122,6 +122,8 @@ export default {
}, },
currentRow: null, currentRow: null,
uploadCompareLoading: false,
compareFuncLoading: false,
} }
}, },
created() { created() {
@ -161,7 +163,9 @@ export default {
let query = { let query = {
compareId: this.compareId compareId: this.compareId
} }
this.compareFuncLoading = true
dlThrCpProduct(query).then(res => { dlThrCpProduct(query).then(res => {
this.compareFuncLoading = false
loading.close(); loading.close();
if (res.code != 20000) { if (res.code != 20000) {
this.$message.error(res.message) this.$message.error(res.message)
@ -169,12 +173,15 @@ export default {
} }
this.getResultList(query) this.getResultList(query)
}).catch(e => { }).catch(e => {
this.compareFuncLoading = false
loading.close(); loading.close();
}) })
}, },
uploadCompare() { uploadCompare() {
this.uploadCompareLoading = true
uploadCompare(this.compareId).then(res => { uploadCompare(this.compareId).then(res => {
this.uploadCompareLoading = false
if (res.code != 20000) { if (res.code != 20000) {
this.$message.error(res.message) this.$message.error(res.message)
return return

4
src/views/inventory/stockCompare.vue
Unescape Escape View File

@ -247,9 +247,9 @@
<el-col align="right"> <el-col align="right">
<el-button-group> <el-button-group>
<el-button type="primary" icon="el-icon-plus" @click="showAddProduct">添加本地产品</el-button> <el-button type="primary" icon="el-icon-plus" @click="showAddProduct">添加本地产品</el-button>
<el-button type="primary" icon="el-icon-download" @click="compareFunc">下载第三产品</el-button> <el-button type="primary" icon="el-icon-download" @click="compareFunc" :loading="compareFuncLoading">下载第三产品</el-button>
<el-button type="primary" icon="el-icon-upload2" <el-button type="primary" icon="el-icon-upload2"
@click="uploadCompare">提交比对 @click="uploadCompare" :loading="uploadCompareLoading">提交比对
</el-button> </el-button>
</el-button-group> </el-button-group>

25
src/views/inventory/supInoutSearchOrder.vue
Unescape Escape View File

@ -237,10 +237,10 @@
>查询 >查询
</el-button </el-button
> >
<el-button type="primary" icon="el-icon-document" @click="selectExport">选中导出Excel</el-button> <el-button type="primary" icon="el-icon-document" @click="selectExport" :loading="selectExportLoading">选中导出Excel</el-button>
<el-button type="primary" icon="el-icon-document" @click="searchExport">结果导出Excel</el-button> <el-button type="primary" icon="el-icon-document" @click="searchExport" :loading="searchExportLoading">结果导出Excel</el-button>
<el-button type="primary" icon="el-icon-printer" @click="optinPrint">选中打印</el-button> <el-button type="primary" icon="el-icon-printer" @click="optinPrint" :loading="optinPrintLoading">选中打印</el-button>
<el-button type="primary" icon="el-icon-printer" @click="selectPrint">查询结果打印</el-button> <el-button type="primary" icon="el-icon-printer" @click="selectPrint" :loading="selectPrinttLoading">查询结果打印</el-button>
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
@ -469,6 +469,10 @@ export default {
fromOptions: [], fromOptions: [],
loading: false, loading: false,
selectExportLoading: false,
searchExportLoading: false,
optinPrintLoading: false,
selectPrinttLoading: false,
total: 0, total: 0,
tableHeader:[], tableHeader:[],
queryList:[], queryList:[],
@ -647,7 +651,9 @@ export default {
return this.$message.error("请选择打印的明细！"); return this.$message.error("请选择打印的明细！");
} }
let query = {id: 4}; let query = {id: 4};
this.optinPrintLoading = true
verifyTemplateFile(query).then((res) => { verifyTemplateFile(query).then((res) => {
this.optinPrintLoading = false
if (res.code === 20000) { if (res.code === 20000) {
let printParams = { let printParams = {
startAduditTime :this.filterQuery.startAduditTime, startAduditTime :this.filterQuery.startAduditTime,
@ -672,9 +678,11 @@ export default {
window.open(url);//打开新标签页，预览pdf。 window.open(url);//打开新标签页，预览pdf。
}) })
} else { } else {
this.optinPrintLoading = false
return this.$message.error(res.message); return this.$message.error(res.message);
} }
}).catch((error) => { }).catch((error) => {
this.optinPrintLoading = false
this.loading = false; this.loading = false;
this.$message.error(error.message); this.$message.error(error.message);
}) })
@ -693,7 +701,9 @@ export default {
.then(() => { .then(() => {
let query = {id: 4}; let query = {id: 4};
this.selectPrinttLoading = true
verifyTemplateFile(query).then((res) => { verifyTemplateFile(query).then((res) => {
this.selectPrinttLoading = false
if (res.code === 20000) { if (res.code === 20000) {
let printParams = { let printParams = {
templateId: res.data, templateId: res.data,
@ -741,6 +751,7 @@ export default {
return return
} }
}).catch((error) => { }).catch((error) => {
this.selectPrinttLoading = false
this.loading = false; this.loading = false;
this.$message.error(error.message); this.$message.error(error.message);
}) })
@ -766,13 +777,17 @@ export default {
let printParams = { let printParams = {
list: this.orderSelection list: this.orderSelection
}; };
this.selectExportLoading = true
postExcelInoutImport(printParams).then((response) => { postExcelInoutImport(printParams).then((response) => {
this.selectExportLoading = false
let blob = new Blob([response], {type: "application/vnd.ms-excel"}); let blob = new Blob([response], {type: "application/vnd.ms-excel"});
let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象 let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
let a = document.createElement("a"); let a = document.createElement("a");
a.href = url; a.href = url;
a.click(); a.click();
this.$message("成功") this.$message("成功")
}).catch(() => {
this.selectExportLoading = false
}) })
}); });
@ -820,7 +835,9 @@ export default {
printParams.confirmStarTime = null; printParams.confirmStarTime = null;
printParams.confirmEndTime = null; printParams.confirmEndTime = null;
} }
this.searchExportLoading = true
excelInoutImport(printParams).then((response) => { excelInoutImport(printParams).then((response) => {
this.searchExportLoading = false
let blob = new Blob([response], {type: "application/vnd.ms-excel"}); let blob = new Blob([response], {type: "application/vnd.ms-excel"});
let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象 let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
let a = document.createElement("a"); let a = document.createElement("a");

6
src/views/remind/invRemindMsg.vue
Unescape Escape View File

@ -404,7 +404,7 @@
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click.native="closeConfirmDialog">取消</el-button> <el-button @click.native="closeConfirmDialog">取消</el-button>
<el-button type="primary" @click.native="updateHandleMsg()" <el-button type="primary" @click.native="updateHandleMsg()" :loading="updateLoading"
>提交 >提交
</el-button> </el-button>
</div> </div>
@ -499,6 +499,7 @@ export default {
confirmMsgVisible: false, confirmMsgVisible: false,
handleMsg: null, handleMsg: null,
rowData: null, rowData: null,
updateLoading: false,
}; };
}, },
@ -664,7 +665,9 @@ export default {
id: this.rowData.id, id: this.rowData.id,
handleMsg: this.handleMsg handleMsg: this.handleMsg
}; };
this.updateLoading = true
confirmMsg(params).then((res) => { confirmMsg(params).then((res) => {
this.updateLoading = false
if (res.code === 20000) { if (res.code === 20000) {
this.rowData = {}; this.rowData = {};
this.handleMsg = null; this.handleMsg = null;
@ -675,6 +678,7 @@ export default {
this.$message.error(res.message); this.$message.error(res.message);
} }
}).catch((error) => { }).catch((error) => {
this.updateLoading = false
this.rowData = {}; this.rowData = {};
this.handleMsg = null; this.handleMsg = null;
this.confirmMsgVisible = false; this.confirmMsgVisible = false;

5
src/views/remind/supCertRemindMsg.vue
Unescape Escape View File

@ -339,7 +339,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click.native="closeDialog">取消</el-button> <el-button @click.native="closeDialog">取消</el-button>
<el-button type="primary" @click.native="postConfirm()" <el-button type="primary" @click.native="postConfirm()" :loading="confirmLoading"
>提交 >提交
</el-button> </el-button>
</div> </div>
@ -396,6 +396,7 @@ export default {
}, },
confirmVisible: false, confirmVisible: false,
confirmQuery: {}, confirmQuery: {},
confirmLoading: false,
}; };
}, },
methods: { methods: {
@ -447,7 +448,9 @@ export default {
_this.confirmQuery = row; _this.confirmQuery = row;
}, },
postConfirm() { postConfirm() {
this.confirmLoading = true
confirmMsg(this.confirmQuery).then((res) => { confirmMsg(this.confirmQuery).then((res) => {
this.confirmLoading = false
if (res.code === 20000) { if (res.code === 20000) {
this.confirmVisible = false; this.confirmVisible = false;
this.$message.success("已确认"); this.$message.success("已确认");

Write Preview
Loading…
Cancel
Save