bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
liang.chao 2024-03-19 17:05:19 +08:00
parent e6342021eb a4faf1a1ed
commit bb5d0d295e
7 changed files with 80 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sgzb-ui/src/views/index.vue
View File

@ -300,13 +300,13 @@ export default {
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); // this.reset();
const dictId = row.dictId || this.ids // const dictId = row.dictId || this.ids
getType(dictId).then(response => { // getType(dictId).then(response => {
this.form = response.data; // this.form = response.data;
this.open = true; // this.open = true;
this.title = "修改字典类型"; // this.title = "修改字典类型";
}); // });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function() {

49
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
View File

@ -131,7 +131,7 @@
<el-form-item label="验收图片" prop="checkUrl"> <el-form-item label="验收图片" prop="checkUrl">
<el-upload <el-upload
:http-request="(obj) => imgUpLoad(obj,'fileUrl')" :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
action="#" action="#" :limit="5"
:file-list="fileList" :file-list="fileList"
:show-file-list="true" :show-file-list="true"
list-type="picture-card" list-type="picture-card"
@ -160,7 +160,7 @@
<el-form-item label="验收图片" prop="checkUrl"> <el-form-item label="验收图片" prop="checkUrl">
<el-upload <el-upload
:http-request="(obj) => imgUpLoad(obj,'fileUrl')" :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
action="#" action="#" :limit="5"
:file-list="fileList1" :file-list="fileList1"
:show-file-list="true" :show-file-list="true"
list-type="picture-card" list-type="picture-card"
@ -443,7 +443,8 @@ export default {
//通知按钮 //通知按钮
handleNotice(){ handleNotice(){
this.noticeOpen = true; this.noticeOpen = true;
this.nform.notice = '各位同事您好，请于'+this.getNowTime()+'进行机具验收。验收单号：'+this.taskInfo.code; this.resetForm("nform");
this.$set(this.nform,'notice','各位同事您好，请于'+this.getNowTime()+'进行机具验收。验收单号：'+this.taskInfo.code)
}, },
//查询短信通知人员 //查询短信通知人员
getNoticeUserList() { getNoticeUserList() {
@ -494,6 +495,8 @@ export default {
}, },
//确认消息通知 //确认消息通知
configNotice(){ configNotice(){
this.$refs["nform"].validate(valid => {
if (valid) {
this.configUserList.forEach((item,index)=>{ this.configUserList.forEach((item,index)=>{
item.noticeUser = item.userId; item.noticeUser = item.userId;
item.phone = item.telphone; item.phone = item.telphone;
@ -522,7 +525,8 @@ export default {
type: 'error' type: 'error'
}) })
} }
}
})
}, },
// 多选框选中数据 // 多选框选中数据
@ -533,22 +537,37 @@ export default {
}, },
/** 验收按钮操作 */ /** 验收按钮操作 */
handleCheck(row) { handleCheck(row) {
let rowData = row // console.log(row)
rowData.checkNum = rowData.purchaseNum; this.$set(this.form,'code',row.code)
rowData.checkResult = rowData.checkResult || "通过"; this.$set(this.form,'companyId',row.companyId)
// this.fileList = [] this.$set(this.form,'createBy',row.createBy)
// this.checkUrlList = [] this.$set(this.form,'createTime',row.createTime)
// this.checkUrlNameList = [] this.$set(this.form,'id',row.id)
this.form = rowData; this.$set(this.form,'machineTypeName',row.machineTypeName)
this.$set(this.form,'manageType',row.manageType)
this.$set(this.form,'specificationType',row.specificationType)
this.$set(this.form,'typeName',row.typeName)
this.$set(this.form,'machineTypeName',row.machineTypeName)
this.$set(this.form,'taskId',row.taskId)
this.$set(this.form,'typeId',row.typeId)
this.$set(this.form,'checkResult',row.checkResult|| "通过")
// this.$set(this.form,'machineTypeName',row.machineTypeName)
this.$set(this.form,'purchaseNum',row.purchaseNum)
this.$set(this.form,'checkNum',row.purchaseNum)
this.$set(this.form,'checkUrl','')
this.$set(this.form,'checkUrlName','')
this.fileList = []
this.checkUrlList = []
this.checkUrlNameList = []
this.open = true; this.open = true;
this.title = "验收"; this.title = "验收";
}, },
/** 批量验收按钮操作 */ /** 批量验收按钮操作 */
handleListCheck() { handleListCheck() {
// console.log(this.ids) // console.log(this.ids)
// this.fileList1 = []; this.fileList1 = [];
// this.checkUrlList1 = [] this.checkUrlList1 = []
// this.checkUrlNameList1 = [] this.checkUrlNameList1 = []
this.aform = { this.aform = {
checkResult:'通过', checkResult:'通过',
checkUrl:'', checkUrl:'',
@ -593,7 +612,7 @@ export default {
item.checkUrl = this.aform.checkUrl item.checkUrl = this.aform.checkUrl
item.checkUrlName = this.aform.checkUrlName item.checkUrlName = this.aform.checkUrlName
}) })
console.log(this.ids) // console.log(this.ids)
let equipments = this.ids let equipments = this.ids
console.log(equipments) console.log(equipments)
this.$refs["aform"].validate(valid => { this.$refs["aform"].validate(valid => {

9
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
View File

@ -496,20 +496,19 @@ export default {
if(this.equipmentList.length>0){ if(this.equipmentList.length>0){
this.$refs["maForm"].validate(valid => { this.$refs["maForm"].validate(valid => {
if (valid) { if (valid) {
// console.log(this.maForm,'maForm')
console.log(this.maForm,'maForm') // console.log(this.equipmentList,'equipmentList')
console.log(this.equipmentList,'equipmentList')
let isEmpty = true let isEmpty = true
this.equipmentList.forEach(item=>{ this.equipmentList.forEach(item=>{
if(item.purchaseNum=='' || !item.purchaseNum){ if(item.purchaseNum=='' || !item.purchaseNum){
isEmpty = false isEmpty = false
} }
}) })
console.log(this.taskId) // console.log(this.taskId)
this.maForm.taskId = this.taskId this.maForm.taskId = this.taskId
this.maForm.checkDetailsList = this.equipmentList; this.maForm.checkDetailsList = this.equipmentList;
console.log(this.maForm) // console.log(this.maForm)
if(isEmpty){ if(isEmpty){
if(this.equipmentList.length>0){ if(this.equipmentList.length>0){
this.$modal.confirm('是否确认保存当前页面').then(function() { }).then(() => { this.$modal.confirm('是否确认保存当前页面').then(function() { }).then(() => {

2
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
View File

@ -431,7 +431,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep.el-table .fixed-width .el-button--mini { ::v-deep.el-table .fixed-width .el-button--mini {
width: 60px !important; width: 70px !important;
margin-bottom: 10px; margin-bottom: 10px;
} }
</style> </style>

9
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
View File

@ -42,7 +42,7 @@
<el-table-column label="入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100"/> <el-table-column label="入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="入库时间" align="center" prop="updateTime" :show-overflow-tooltip="true"/> <el-table-column label="入库时间" align="center" prop="updateTime" :show-overflow-tooltip="true"/>
<el-table-column label="发布时间" align="center" prop="createTime" :show-overflow-tooltip="true"/> <el-table-column label="发布时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
<el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" /> <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="taskStatus"> <el-table-column label="状态" align="center" prop="taskStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.taskStatus=='26'">已验收合格</span> <span v-if="scope.row.taskStatus=='26'">已验收合格</span>
@ -170,13 +170,6 @@
v-if="scope.row.status=='0'" v-if="scope.row.status=='0'"
@click="refused(scope.row)" @click="refused(scope.row)"
>不通过</el-button> >不通过</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['system:dict:remove']"-->
<!-- >删除</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

7
sgzb-ui/src/views/system/notice/index.vue
View File

@ -78,6 +78,11 @@
prop="noticeTitle" prop="noticeTitle"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="公告内容" align="center" prop="noticeContent" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeContent"/>
</template>
</el-table-column>
<el-table-column label="公告类型" align="center" prop="noticeType" width="100"> <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/> <dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/>
@ -94,7 +99,7 @@
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"

2
sgzb-ui/vue.config.js
View File

@ -43,7 +43,7 @@ module.exports = {
// target: `https://z.csgmall.com.cn`, // target: `https://z.csgmall.com.cn`,
target: `http://10.40.92.12:8080`,//超 target: `http://10.40.92.12:8080`,//超
// target: `http://10.40.92.2:8080`,//韩 // target: `http://10.40.92.4:8080`,//韩
// target: `http://10.40.92.209:8080`,//川/ // target: `http://10.40.92.209:8080`,//川/
//******** 注意事项 ********* */ //******** 注意事项 ********* */