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

问题修改:验收图片上传，接入大屏

This commit is contained in:
zhouzy062 2024-03-07 09:19:47 +08:00
parent 482457bb09
commit f8bf0ba857
15 changed files with 174 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sgzb-ui/src/router/index.js
View File

@ -74,6 +74,19 @@ export const constantRoutes = [
} }
] ]
}, },
{
path: '/dashboard',
component: Layout,
redirect: 'dashboard',
children: [
{
path: 'dashboard',
component: () => import('@/views/dashboard'),
name: 'Dashboard',
meta: { title: '数据大屏', icon: 'dashboard', breadcrumb: false}
}
]
},
{ {
path: '/user', path: '/user',
component: Layout, component: Layout,

3
sgzb-ui/src/store/modules/user.js
View File

@ -47,6 +47,7 @@ const user = {
let data = res.data let data = res.data
setToken(data.access_token) setToken(data.access_token)
commit('SET_TOKEN', data.access_token) commit('SET_TOKEN', data.access_token)
localStorage.setItem('token', data.access_token)
setExpiresIn(data.expires_in) setExpiresIn(data.expires_in)
commit('SET_EXPIRES_IN', data.expires_in) commit('SET_EXPIRES_IN', data.expires_in)
resolve() resolve()
@ -69,6 +70,7 @@ const user = {
let data = res.data let data = res.data
setToken(data.access_token) setToken(data.access_token)
commit('SET_TOKEN', data.access_token) commit('SET_TOKEN', data.access_token)
localStorage.setItem('token', data.access_token)
setExpiresIn(data.expires_in) setExpiresIn(data.expires_in)
commit('SET_EXPIRES_IN', data.expires_in) commit('SET_EXPIRES_IN', data.expires_in)
resolve() resolve()
@ -88,6 +90,7 @@ const user = {
// console.log('登录成功1111111') // console.log('登录成功1111111')
setToken(data.access_token) setToken(data.access_token)
commit('SET_TOKEN', data.access_token) commit('SET_TOKEN', data.access_token)
localStorage.setItem('token', data.access_token)
setExpiresIn(data.expires_in) setExpiresIn(data.expires_in)
commit('SET_EXPIRES_IN', data.expires_in) commit('SET_EXPIRES_IN', data.expires_in)
}else{ }else{

12
sgzb-ui/src/utils/chapter.js
View File

@ -11,23 +11,23 @@ let chapter = (text, companyName) => {
context.lineWidth = 3; context.lineWidth = 3;
context.strokeStyle = "#f00"; context.strokeStyle = "#f00";
context.beginPath(); context.beginPath();
context.arc(width, height, 90, 0, Math.PI * 2); //宽、高、半径 context.arc(width, height, 80, 0, Math.PI * 2); //宽、高、半径
context.stroke(); context.stroke();
//画五角星 //画五角星
create5star(context, width, height, 25, "#f00", 0); create5star(context, width, height, 20, "#f00", 0);
// 绘制印章名称 // 绘制印章名称
context.font = "18px 宋体"; context.font = "14px 宋体";
context.textBaseline = "middle"; //设置文本的垂直对齐方式 context.textBaseline = "middle"; //设置文本的垂直对齐方式
context.textAlign = "center"; //设置文本的水平对对齐方式 context.textAlign = "center"; //设置文本的水平对对齐方式
context.lineWidth = 1; context.lineWidth = 1;
context.strokeStyle = "#f00"; context.strokeStyle = "#f00";
context.strokeText(text, width, height + 60); context.strokeText(text, width, height + 50);
// 绘制印章单位 // 绘制印章单位
context.translate(width, height); // 平移到此位置, context.translate(width, height); // 平移到此位置,
context.font = "21px 宋体"; context.font = "14px 宋体";
let count = companyName.length; // 字数 let count = companyName.length; // 字数
let angle = (4 * Math.PI) / (3 * (count - 1)); // 字间角度 let angle = (4 * Math.PI) / (3 * (count - 1)); // 字间角度
let chars = companyName.split(""); let chars = companyName.split("");
@ -41,7 +41,7 @@ let chapter = (text, companyName) => {
} }
context.save(); context.save();
context.translate(70, 0); // 平移到此位置,此时字和x轴垂直，公司名称和最外圈的距离 context.translate(65, 0); // 平移到此位置,此时字和x轴垂直，公司名称和最外圈的距离
context.rotate(Math.PI / 2); // 旋转90度,让字平行于x轴 context.rotate(Math.PI / 2); // 旋转90度,让字平行于x轴
context.strokeText(c, 0, 0); // 此点为字的中心点 context.strokeText(c, 0, 0); // 此点为字的中心点
context.restore(); context.restore();

17
sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
View File

@ -129,7 +129,7 @@
size="mini" size="mini"
type="info" type="info"
v-if="scope.row.taskStatus==98 || scope.row.taskStatus==99 || scope.row.taskStatus==100" v-if="scope.row.taskStatus==98 || scope.row.taskStatus==99 || scope.row.taskStatus==100"
@click="handleUpdate(scope.row)" @click="handleUpdate2(scope.row)"
>驳回提交</el-button> >驳回提交</el-button>
<el-button <el-button
size="mini" size="mini"
@ -303,11 +303,22 @@ export default {
path:'/claimAndRefund/receive/receiveApplyAdd', path:'/claimAndRefund/receive/receiveApplyAdd',
query:{ query:{
taskId:row.taskId, taskId:row.taskId,
isEdit:true isEdit:true,
isBack:false,
}
})
},
/** 驳回按钮操作 */
handleUpdate2(row) {
this.$tab.closeOpenPage({
path:'/claimAndRefund/receive/receiveApplyAdd',
query:{
taskId:row.taskId,
isEdit:true,
isBack:true,
} }
}) })
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
async handleDelete(row) { async handleDelete(row) {

35
sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
View File

@ -165,6 +165,7 @@ import {
submitLeaseApply, submitLeaseApply,
getTaskDetail, getTaskDetail,
editLeaseApply, editLeaseApply,
getLeaseApplyListAll,
getLeaseApplyAuditListAll getLeaseApplyAuditListAll
} from '@/api/claimAndRefund/receive' } from '@/api/claimAndRefund/receive'
import { getInfo } from '@/api/login' import { getInfo } from '@/api/login'
@ -343,10 +344,13 @@ export default {
this.GetDeviceTypeTree() this.GetDeviceTypeTree()
// this.getList(); // this.getList();
if(this.$route.query.taskId){ if(this.$route.query.taskId&&!this.$route.query.isBack){
this.GetTaskDetail(this.$route.query.taskId) this.GetTaskDetail(this.$route.query.taskId)
this.taskId = this.$route.query.taskId
} }
if(this.$route.query.taskId&&this.$route.query.isBack){
this.GetTaskDetail2(this.$route.query.taskId)
}
this.taskId = this.$route.query.taskId
this.isEdit = this.$route.query.isEdit; this.isEdit = this.$route.query.isEdit;
// console.log(typeof(this.isEdit)) // console.log(typeof(this.isEdit))
// this.$set('isEdit',this.$route.query.isEdit) // this.$set('isEdit',this.$route.query.isEdit)
@ -413,6 +417,33 @@ export default {
// 获取 任务详情数据 // 获取 任务详情数据
async GetTaskDetail(taskId){ async GetTaskDetail(taskId){
const res = await getLeaseApplyListAll({taskId})
const data = res.rows[0]
// unitId:null,
// proId:null,
// agreementId:null, //协议id
// agreementCode: null,
if(data.taskStatus==100){
this.queryParams.taskStatus = 32
this.queryParams.examineStatusId = '32'
}
this.queryParams.unitId = data.unitId
this.queryParams.proId = data.proId
this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
this.queryParams.agreementCode = data.agreementCode
this.queryParams.agreementId = data.agreementId
this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
this.leaseApplyInfoList = data.leaseApplyInfoList
this.leaseApplyDetails = data.leaseApplyDetails.map(item => {
return this.handelEchoData(item)
})
},
// 驳回提交 任务详情数据
async GetTaskDetail2(taskId){
const res = await getLeaseApplyAuditListAll({taskId}) const res = await getLeaseApplyAuditListAll({taskId})
const data = res.rows[0] const data = res.rows[0]

16
sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
View File

@ -127,10 +127,10 @@
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="examineVisible=false">取 消</el-button> <el-button @click="examineVisible=false">取 消</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany()" v-if="queryParams.taskStatus==30" v-hasPermi="['receive:examine:fgs']">确 定</el-button> <el-button type="primary" @click="subAuditLeaseByCompany()" v-if="queryParams.taskStatus==30" v-hasPermi="['receive:examine:fgs']">确 定</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(5)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:sgb']">确 定5</el-button> <el-button type="primary" @click="subAuditLeaseByCompany(5)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:sgb']">确 定</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(7)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:ajb']">确 定7</el-button> <el-button type="primary" @click="subAuditLeaseByCompany(7)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:ajb']">确 定</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(1)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-jjfgs']">确 定1</el-button> <el-button type="primary" @click="subAuditLeaseByCompany(1)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-jjfgs']">确 定</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(3)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-sbfgs']">确 定3</el-button> <el-button type="primary" @click="subAuditLeaseByCompany(3)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-sbfgs']">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -140,10 +140,10 @@
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="refuseVisible=false">取 消</el-button> <el-button @click="refuseVisible=false">取 消</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany()" v-if="queryParams.taskStatus==30" v-hasPermi="['receive:examine:fgs']">确 定</el-button> <el-button type="primary" @click="refuseAuditLeaseByCompany()" v-if="queryParams.taskStatus==30" v-hasPermi="['receive:examine:fgs']">确 定</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(6)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:sgb']">确 定6</el-button> <el-button type="primary" @click="refuseAuditLeaseByCompany(6)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:sgb']">确 定</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(8)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:ajb']">确 定8</el-button> <el-button type="primary" @click="refuseAuditLeaseByCompany(8)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:ajb']">确 定</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-jjfgs']">确 定2</el-button> <el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-jjfgs']">确 定</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(4)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-sbfgs']">确 定4</el-button> <el-button type="primary" @click="refuseAuditLeaseByCompany(4)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-sbfgs']">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>

8
sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
View File

@ -113,28 +113,28 @@
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:sgb']" v-hasPermi="['receive:examine:sgb']"
v-if="Number(scope.row.examineStatusId)==31 && (scope.row.leaseApplyInfoList[0].status=='0'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='8'||scope.row.leaseApplyInfoList[0].status=='6')" v-if="Number(scope.row.examineStatusId)==31 && (scope.row.leaseApplyInfoList[0].status=='0'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='8'||scope.row.leaseApplyInfoList[0].status=='6')"
>施管审批</el-button> >审批</el-button>
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:ajb']" v-hasPermi="['receive:examine:ajb']"
v-if="Number(scope.row.examineStatusId)==31 && (scope.row.leaseApplyInfoList[0].status=='0'||scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='6'||scope.row.leaseApplyInfoList[0].status=='8')" v-if="Number(scope.row.examineStatusId)==31 && (scope.row.leaseApplyInfoList[0].status=='0'||scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='6'||scope.row.leaseApplyInfoList[0].status=='8')"
>安监审批</el-button> >审批</el-button>
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@click="handleExamine(scope.row,'jjfgs')" @click="handleExamine(scope.row,'jjfgs')"
v-hasPermi="['receive:examine:nbry-jjfgs']" v-hasPermi="['receive:examine:nbry-jjfgs']"
v-if="Number(scope.row.examineStatusId)==32 && (scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='4'||scope.row.leaseApplyInfoList[0].status=='2')" v-if="Number(scope.row.examineStatusId)==32 && (scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='4'||scope.row.leaseApplyInfoList[0].status=='2')"
>机具审批</el-button> >审批</el-button>
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@click="handleExamine(scope.row,'sbfgs')" @click="handleExamine(scope.row,'sbfgs')"
v-hasPermi="['receive:examine:nbry-sbfgs']" v-hasPermi="['receive:examine:nbry-sbfgs']"
v-if="Number(scope.row.examineStatusId)==32 && (scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='4'||scope.row.leaseApplyInfoList[0].status=='2')" v-if="Number(scope.row.examineStatusId)==32 && (scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='4'||scope.row.leaseApplyInfoList[0].status=='2')"
>调试审批</el-button> >审批</el-button>
<el-button <el-button
size="mini" size="mini"
type="info" type="info"

2
sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue
View File

@ -90,7 +90,7 @@
</vue-easy-print> </vue-easy-print>
</div> </div>
<div style="margin-top: 10px"> <div style="margin-top: 10px">
<el-button type="primary" @click="remarksPrint">打印1</el-button> <el-button type="primary" @click="remarksPrint">打印</el-button>
</div> </div>
</el-dialog> </el-dialog>
</el-dialog> </el-dialog>

4
sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
View File

@ -282,7 +282,7 @@
v-if="scope.row.applyStatus == '0'" v-if="scope.row.applyStatus == '0'"
v-hasPermi="['receive:examine:nbry-jjfgs']" v-hasPermi="['receive:examine:nbry-jjfgs']"
@click="handleUpdate(scope.row, 'update')" @click="handleUpdate(scope.row, 'update')"
>机具审批</el-button >审批</el-button
> >
<el-button <el-button
size="mini" size="mini"
@ -291,7 +291,7 @@
v-if="scope.row.applyStatus == '0'" v-if="scope.row.applyStatus == '0'"
v-hasPermi="['receive:examine:nbry-sbfgs']" v-hasPermi="['receive:examine:nbry-sbfgs']"
@click="handleUpdate(scope.row, 'update')" @click="handleUpdate(scope.row, 'update')"
>调试审批</el-button >审批</el-button
> >
<el-button <el-button
size="mini" size="mini"

22
sgzb-ui/src/views/dashboard.vue Normal file
View File

@ -0,0 +1,22 @@
<template>
<div></div>
<!-- <router-link :to="url" target="_blank"></router-link> -->
</template>
<script>
export default {
data() {
return {
// url: '/new-page' // 目标页面的路径
};
},
created () {
this.openNewWindow()
},
methods: {
openNewWindow() {
window.open('http://112.29.103.165:21624/index01.html?token='+localStorage.getItem('token'), '_blank');
}
}
};
</script>

6
sgzb-ui/src/views/login.vue
View File

@ -249,7 +249,7 @@ export default {
} }
console.log(this.loginForm) console.log(this.loginForm)
this.$store.dispatch("textLogin", this.loginForm).then(() => { this.$store.dispatch("textLogin", this.loginForm).then(() => {
this.$router.push({path: this.redirect || "/"}).catch(() => { this.$router.push({path:"/"}).catch(() => {
}); });
}).catch(() => { }).catch(() => {
this.loading = false; this.loading = false;
@ -268,7 +268,7 @@ export default {
// console.log(param) // console.log(param)
this.$store.dispatch("ssoLogin", param).then(() => { this.$store.dispatch("ssoLogin", param).then(() => {
//成功后会跳转页面入首页 //成功后会跳转页面入首页
this.$router.push({path: this.redirect || "/"}).catch(() => { this.$router.push({path:"/"}).catch(() => {
}); });
}).catch(() => { }).catch(() => {
this.loading = false; this.loading = false;
@ -300,7 +300,7 @@ export default {
Cookies.remove('rememberMe'); Cookies.remove('rememberMe');
} }
this.$store.dispatch("Login", this.loginForm).then(() => { this.$store.dispatch("Login", this.loginForm).then(() => {
this.$router.push({path: this.redirect || "/"}).catch(() => { this.$router.push({path:"/"}).catch(() => {
}); });
}).catch(() => { }).catch(() => {
this.loading = false; this.loading = false;

16
sgzb-ui/src/views/qrCode/qrCode.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div style="width: 100%"> <div style="width: 100%">
<div style="width: 100%;padding: 10px;font-weight: 500;"> <div style="width: 100%;padding: 10px;">
<div class="item-box"> <div class="item-box">
<div>设备类型:</div> <div>设备类型:</div>
<div style="margin-left: 10px;color: blue;">{{queryParams.deviceType}}</div> <div style="margin-left: 10px;color: blue;">{{queryParams.deviceType}}</div>
@ -22,10 +22,10 @@
<div >设备状态:</div> <div >设备状态:</div>
<div style="margin-left: 10px;">{{queryParams.maStatusName}}</div> <div style="margin-left: 10px;">{{queryParams.maStatusName}}</div>
</div> </div>
<div class="item-box"> <!-- <div class="item-box">
<div >本次检修人员:</div> <div >本次检修人员:</div>
<div style="margin-left: 10px;">{{queryParams.checkMan}}</div> <div style="margin-left: 10px;">{{queryParams.checkMan}}</div>
</div> </div> -->
<div class="item-box"> <div class="item-box">
<div >本次检修时间:</div> <div >本次检修时间:</div>
<div style="margin-left: 10px;color: blue;">{{queryParams.thisCheckTime}}</div> <div style="margin-left: 10px;color: blue;">{{queryParams.thisCheckTime}}</div>
@ -36,11 +36,11 @@
</div> </div>
<div class="item-box"> <div class="item-box">
<div >检验人员:</div> <div >检验人员:</div>
<div style="margin-left: 10px;">{{queryParams.inspectMan}}</div> <div style="margin-left: 10px;">{{queryParams.checkMan }}</div>
</div> </div>
<div class="item-box"> <div class="item-box">
<div >检验结论:</div> <div >检验结论:</div>
<div style="margin-left: 10px;color: blue;">{{queryParams.inspectStatus}}</div> <div style="margin-left: 10px;color: blue;">{{queryParams.inspectStatus || '合格'}}</div>
</div> </div>
<div class="item-box"> <div class="item-box">
<div >联系电话:</div> <div >联系电话:</div>
@ -84,12 +84,12 @@
</div> </div>
</div> </div>
<div class="bottom-box"> <div class="bottom-box">
<div style="width: 100%;text-align: center;margin-bottom: 20px;color:green;"> 检 验 合 格 证 </div> <div style="width: 100%;text-align: center;margin-bottom: 20px;color:green;margin-top: 10px;"> 检 验 合 格 证 </div>
<div style="width: 50%;display: flex;margin-bottom: 10px;"> <div style="width: 50%;display: flex;margin-bottom: 10px;">
<div style="color:green;" >名 称：</div> <div style="border-bottom: 1px solid green;">{{queryParams.deviceType}}</div> <div style="color:green;" >名 称：</div> <div style="border-bottom: 1px solid green;">{{queryParams.deviceType}}</div>
</div> </div>
<div style="width: 50%;display: flex;margin-bottom: 10px;"> <div style="width: 50%;display: flex;margin-bottom: 10px;">
<div style="color:green;" >检验结论：</div> <div style="color:red;font-size: 18px;font-weight: 600;">{{queryParams.inspectStatus}}</div> <div style="color:green;" >检验结论：</div> <div style="color:red;font-size: 18px;font-weight: 600;">{{queryParams.inspectStatus || '合格'}}</div>
</div> </div>
<div style="width:100%;display: flex;margin-bottom: 10px;"> <div style="width:100%;display: flex;margin-bottom: 10px;">
<div style="color:green;" >型 号：</div> <div style="border-bottom: 1px solid green;">{{queryParams.specificationType}}</div> <div style="color:green;" >型 号：</div> <div style="border-bottom: 1px solid green;">{{queryParams.specificationType}}</div>
@ -104,7 +104,7 @@
<div style="color:green;" >下次检验日期：：</div> <div style="border-bottom: 1px solid green;">{{queryParams.nextCheckTime}}</div> <div style="color:green;" >下次检验日期：：</div> <div style="border-bottom: 1px solid green;">{{queryParams.nextCheckTime}}</div>
</div> </div>
<div style="position:absolute; top: 0%;left: 25%;"> <div style="position:absolute; top: 0%;left: 25%;">
<canvas id="canvas" width="220" height="220"></canvas> <canvas id="canvas" width="180" height="180"></canvas>
</div> </div>

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

@ -73,9 +73,9 @@
<el-table-column label="机具厂家" align="center" prop="supplier" :show-overflow-tooltip="true" /> <el-table-column label="机具厂家" align="center" prop="supplier" :show-overflow-tooltip="true" />
<el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true" /> <el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true" />
<el-table-column label="验收数量" align="center" prop="checkNum" :show-overflow-tooltip="true" /> <el-table-column label="验收数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
<el-table-column label="验收图片" align="center" prop="checkUrlName" :show-overflow-tooltip="true"> <el-table-column label="验收图片" align="center" prop="checkUrlName">
<template slot-scope="scope"> <template slot-scope="scope">
<span @click="openImg(scope.row.checkUrl)" style="color: #02A7F0;"> {{ scope.row.checkUrlName }} </span> <div v-for="(item,index) in scope.row.imgUrlList" :key="index" @click="openImg(item)" style="color: #02A7F0;cursor: pointer;">{{scope.row.imgNameList[index]}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="配套资料" align="center" prop="fileName" :show-overflow-tooltip="true" /> <el-table-column label="配套资料" align="center" prop="fileName" :show-overflow-tooltip="true" />
@ -133,14 +133,13 @@
:http-request="(obj) => imgUpLoad(obj,'fileUrl')" :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
action="#" action="#"
:file-list="fileList" :file-list="fileList"
:show-file-list="false" :show-file-list="true"
list-type="picture-card" list-type="picture-card"
accept=".png,.jpg,.jpeg" accept=".png,.jpg,.jpeg"
:on-success="handleAvatarSuccess"
:on-preview="handlePictureCardPreview" :on-preview="handlePictureCardPreview"
:on-remove="handleRemove"> :on-remove="handleRemove">
<img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar"> <!-- <img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar"> -->
<i v-else class="el-icon-plus avatar-uploader-icon"></i> <i class="el-icon-plus avatar-uploader-icon"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -162,15 +161,14 @@
<el-upload <el-upload
:http-request="(obj) => imgUpLoad(obj,'fileUrl')" :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
action="#" action="#"
:file-list="fileList" :file-list="fileList1"
:show-file-list="false" :show-file-list="true"
list-type="picture-card" list-type="picture-card"
accept=".png,.jpg,.jpeg" accept=".png,.jpg,.jpeg"
:on-success="handleAvatarSuccess"
:on-preview="handlePictureCardPreview" :on-preview="handlePictureCardPreview"
:on-remove="handleRemove"> :on-remove="handleRemove">
<img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar"> <!-- <img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar"> -->
<i v-else class="el-icon-plus avatar-uploader-icon"></i> <i class="el-icon-plus avatar-uploader-icon"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -310,7 +308,11 @@ export default {
imageUrl:'', imageUrl:'',
imageName:'', imageName:'',
fileList:[], fileList:[],
field101fileList:[], checkUrlList:[],
checkUrlNameList:[],
fileList1:[],
checkUrlList1:[],
checkUrlNameList1:[],
//上传地址 //上传地址
// uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
// uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
@ -378,6 +380,15 @@ export default {
getPurchaseCheckInfo({taskId:this.taskId,keyWord:this.queryParams.keyWord}).then(response => { getPurchaseCheckInfo({taskId:this.taskId,keyWord:this.queryParams.keyWord}).then(response => {
this.taskInfo = response.data this.taskInfo = response.data
this.equipmentList = response.data.checkDetailsList; this.equipmentList = response.data.checkDetailsList;
this.equipmentList.forEach(item=>{
if(item.checkUrl){
item.imgUrlList = item.checkUrl.split(',')
item.imgNameList = item.checkUrlName.split(',')
}
// console.log(item.checkUrl)
})
this.loading = false; this.loading = false;
}) })
}, },
@ -391,7 +402,7 @@ export default {
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
// this.reset(); this.reset();
}, },
// 表单重置 // 表单重置
reset() { reset() {
@ -454,13 +465,12 @@ export default {
}, },
// 多选框选中-添加人员 // 多选框选中-添加人员
handleSelectionUser(selection) { handleSelectionUser(selection) {
console.log(selection) // console.log(selection)
this.chosenUserList = selection; this.chosenUserList = selection;
}, },
//添加人员 //添加人员
addUser(){ addUser(){
console.log(this.chosenUserList,"chosenUserList") // console.log(this.chosenUserList,"chosenUserList")
addNoticeUser(this.chosenUserList).then(response => { addNoticeUser(this.chosenUserList).then(response => {
if(response.code==200){ if(response.code==200){
this.getNoticeUserList() this.getNoticeUserList()
@ -484,7 +494,6 @@ export default {
}, },
//确认消息通知 //确认消息通知
configNotice(){ configNotice(){
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;
@ -524,19 +533,18 @@ export default {
}, },
/** 验收按钮操作 */ /** 验收按钮操作 */
handleCheck(row) { handleCheck(row) {
console.log(row)
let rowData = row let rowData = row
rowData.checkNum = rowData.purchaseNum; rowData.checkNum = rowData.purchaseNum;
rowData.checkResult = rowData.checkResult || "通过"; rowData.checkResult = rowData.checkResult || "通过";
this.fileList = []
this.form = rowData; this.form = rowData;
this.open = true; this.open = true;
this.imageUrl = rowData.checkUrl
this.title = "验收"; this.title = "验收";
}, },
/** 批量验收按钮操作 */ /** 批量验收按钮操作 */
handleListCheck() { handleListCheck() {
console.log(this.ids) console.log(this.ids)
this.fileList1 = []
this.aform = { this.aform = {
checkResult:'通过', checkResult:'通过',
checkUrl:'', checkUrl:'',
@ -548,7 +556,9 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function() {
console.log(this.form) // console.log(this.form)
this.form.checkUrl = this.checkUrlList.join(',');
this.form.checkUrlName = this.checkUrlNameList.join(',');
let equipments = [this.form] let equipments = [this.form]
console.log(equipments) console.log(equipments)
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
@ -567,7 +577,9 @@ export default {
}); });
}, },
submitListForm: function() { submitListForm: function() {
console.log(this.aform) // console.log(this.aform)
this.aform.checkUrl = this.checkUrlList1.join(',');
this.aform.checkUrlName = this.checkUrlNameList1.join(',');
this.ids.forEach(item=>{ this.ids.forEach(item=>{
item.checkNum = item.purchaseNum item.checkNum = item.purchaseNum
item.checkResult = this.aform.checkResult item.checkResult = this.aform.checkResult
@ -595,18 +607,19 @@ export default {
}, },
// 图片上传 // 图片上传
imgUpLoad(param,name,index) { imgUpLoad(param,name,index) {
console.log(param,'image')
param.type = 'ma' param.type = 'ma'
imgUpLoad(param).then(res => { imgUpLoad(param).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.imageUrl = res.data.fileUrl; // console.log(res.data)
if(this.open){ if(this.open){
this.form.checkUrl = res.data.fileUrl; this.checkUrlList.push(res.data.fileUrl)
this.form.checkUrlName = res.data.fileName; this.checkUrlNameList.push(res.data.fileName)
} }
if(this.openAll){ if(this.openAll){
this.aform.checkUrl = res.data.fileUrl; this.checkUrlList1.push(res.data.fileUrl)
this.aform.checkUrlName = res.data.fileName; this.checkUrlNameList1.push(res.data.fileName)
// this.aform.checkUrl = res.data.fileUrl;
// this.aform.checkUrlName = res.data.fileName;
} }
}else{ }else{
// this.$msgError(res.msg) // this.$msgError(res.msg)
@ -618,22 +631,25 @@ export default {
}) })
}, },
handleAvatarSuccess(res,file) { handleAvatarSuccess(res,file) {
console.log("success") // console.log("success")
}, },
handleRemove(file, fileList) { handleRemove(file, fileList) {
console.log(file, fileList);
if(this.open){ if(this.open){
this.form.checkUrl = ''; let sum = 0;
this.form.checkUrlName = ''; this.checkUrlNameList.forEach((item,index) => { if(item == file.name){ sum = index } });
this.checkUrlNameList.splice(sum, 1);
this.checkUrlList.splice(sum, 1);
} }
if(this.openAll){ if(this.openAll){
this.aform.checkUrl = ''; let sum1 = 0;
this.aform.checkUrlName = ''; this.checkUrlNameList1.forEach((item,index) => { if(item == file.name){ sum1 = index } });
this.checkUrlNameList1.splice(sum1, 1);
this.checkUrlList1.splice(sum1, 1);
} }
}, },
//图片点击查看 //图片点击查看
handlePictureCardPreview(file) { handlePictureCardPreview(file) {
console.log(file) // console.log(file)
this.dialogImageUrl = file.url; this.dialogImageUrl = file.url;
this.dialogVisible = true; this.dialogVisible = true;
}, },

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

@ -449,6 +449,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
console.log(row)
const dictIds = row.dictId || this.ids; const dictIds = row.dictId || this.ids;
this.$modal.confirm('是否确认删除该数据项？').then(function() { this.$modal.confirm('是否确认删除该数据项？').then(function() {
return delType(dictIds); return delType(dictIds);

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

@ -35,19 +35,15 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://112.29.103.165:21626`,//线上环境-重庆 // target: `http://112.29.103.165:21626`,//线上环境-重庆
target: `http://112.29.103.165:21624`,//线上环境-宁夏 // target: `http://112.29.103.165:21624`,//线上环境-宁夏
// target: `http://192.168.0.14:21624`,//线上环境 // target: `http://192.168.0.14:21624`,//线上环境
// target: `http://1.12.248.179:23028`,//线上环境-南网 // target: `http://1.12.248.179:23028`,//线上环境-南网
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
target: `https://z.csgmall.com.cn`, // target: `https://z.csgmall.com.cn`,
// target: `http://10.40.92.14:8080`,//超 target: `http://10.40.92.14:8080`,//超
<<<<<<< HEAD
// target: `http://10.40.92.12:8080`,//韩 // target: `http://10.40.92.12:8080`,//韩
=======
// target: `http://10.40.92.4:8080`,//韩
>>>>>>> 60e10fcdb5fa5b1f3f423613cecb9f517dd746d5
// target: `http://10.40.92.209:8080`,//川 // target: `http://10.40.92.209:8080`,//川
changeOrigin: true, changeOrigin: true,