更新代码

main
李劲龙 2 months ago
parent d4e8fab0be
commit 23f3ce77b0

@ -5,7 +5,8 @@ VUE_APP_TITLE = 太仓资产管理系统
ENV = 'development'
# 若依管理系统/开发环境
VUE_APP_BASE_API = 'http://192.168.0.108:9015'
VUE_APP_BASE_API = ' http://192.168.0.108:9115'
# VUE_APP_BASE_API = 'http://39.101.188.84:9115'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

@ -2757,7 +2757,7 @@
</el-form-item>
</el-row>
<el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
<span class="top-title-box">报废原因</span>
<span class="top-title-box">关停原因</span>
</el-row>
<el-row style="margin: 20px 0;">
<el-form-item>

@ -127,7 +127,7 @@
维护中
</span>
<span v-if="scope.row.xtzt == 5" style="color: #F50C0C;">
报废
关停
</span>
</template>
</el-table-column>

@ -2711,7 +2711,7 @@
</el-form-item>
</el-row>
 <el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
              <span class="top-title-box">报废原因</span>
              <span class="top-title-box">关停原因</span>
            </el-row>
            <el-row style="margin: 20px 0;">
              <el-form-item>
@ -2726,6 +2726,22 @@
<el-button type="primary" @click="newAssets(1)" >通过</el-button>
</el-row>
</div>
<my-dialog title="提示" ref="liebiaoDialog" @close="importClose" class="taskDialogBox" width="40%">
<el-row>
<el-col :span="21">
<el-form :model="dialogruleForm" :rules="dialogruleFormrules" ref="dialogruleForm" label-width="100px">
<el-form-item label="不通过原因:" prop="btgyy">
<el-input v-model="dialogruleForm.btgyy" placeholder="请输入不通过原因"></el-input>
</el-form-item>
<el-form-item class="newTask-form-item">
<el-button @click="resetForm('dialogruleForm')"></el-button>
<el-button type="primary" @click="submitForm('dialogruleForm')"></el-button>
</el-form-item>
</el-form>
</el-col>
<el-col :span="6"></el-col>
</el-row>
</my-dialog>
</div>
</div>
</template>
@ -2734,6 +2750,7 @@ import pcas from "@/utils/pca-code.json"
import myUpload from "@/views/components/myUpload/index.vue";
import { assetUnitData, assetInfo } from "@/api/auditPagesApi/index";
import { assetTasktaskSh, geassetTaskcHc, assetTasksh } from "@/api/renwuApi/index.js"
import myDialog from "@/views/components/myDialog/index.vue"
export default {
name: "AssetsAuth",
@ -2745,10 +2762,19 @@ export default {
'xtfhqk_fcg','xtfhqk_fxl','xtfhqk_fzd','xtfhqk_fls'
],
components:{
myUpload
myUpload,
myDialog
},
data() {
return {
dialogruleForm:{
btgyy:""
},
dialogruleFormrules:{
btgyy: [
{ required: true, message: '请输入', trigger: 'blur' },
],
},
shaojunbuyao:false,
accept:['xls','xlsx','doc','docx','pdf','rar','zip','pcap','txt'],
acceptTwo:['jpg','jpeg','png'],
@ -2924,6 +2950,7 @@ export default {
}
},
mounted(){
let obj = {
taskId: this.$route.query.taskId,
assetId: this.$route.query.assetId
@ -2951,6 +2978,15 @@ export default {
}
},
methods:{
importClose(){},
//
resetForm() {
this.dialogruleForm = {
btgyy:""
}
this.$refs.liebiaoDialog.close()
},
//
getInfo(obj){
this.loading = true;
@ -3137,24 +3173,56 @@ export default {
this.ruleForm.dbxxCpdf = "";
}
},
//
newAssets(type) {
this.loading = true;
let tijioaobj = {
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
let tijioaobj = {
taskId: this.$route.query.taskId,
assetId: this.$route.query.assetId,
xtmc:this.ruleForm.xtmc,
btgyy:this.dialogruleForm.btgyy,
status: 4
}
assetTasksh(tijioaobj).then(res=>{
if(res.code == 200){
this.$modal.msgSuccess("审核成功");
this.loading = false
this.$router.go(-1);
}
})
} else {
console.log('error submit!!');
return false;
}
});
},
//
newAssets(type) {
//
if (type == 0) {
tijioaobj.status = 4
this.$refs.liebiaoDialog.open()
}
if (type == 1) {
this.loading = true;
let tijioaobj = {
taskId: this.$route.query.taskId,
assetId: this.$route.query.assetId,
xtmc:this.ruleForm.xtmc,
status: 3
}
tijioaobj.status = 3
assetTasksh(tijioaobj).then(res=>{
if(res.code == 200){
this.$modal.msgSuccess("审核成功");
this.loading = false
this.$router.go(-1);
}
})
// this.ruleForm.xttz = this.xttz.join(',');
// this.ruleForm.xtfhqkFcg = this.xtfhqkFcg.join(',');
@ -3185,13 +3253,7 @@ export default {
// })
// }
}
assetTasksh(tijioaobj).then(res=>{
if(res.code == 200){
this.$modal.msgSuccess("审核成功");
this.loading = false
this.$router.go(-1);
}
})
},
},
beforeRouteEnter(to,from,next){

@ -97,13 +97,13 @@
<el-table-column label="核查单位" key="unit" prop="unit" align="center" />
<el-table-column label="审核状态" key="status" width="200px" prop="status" class-name="table-status" align="center">
<template slot-scope="scope">
<span v-if="scope.row.status === 0" style="color: #a4c86c;">
<span v-if="scope.row.status === 0" style="color: #67C23A;">
审核通过
</span>
<span v-if="scope.row.status === 1" style="color: #F43147;">
<span v-if="scope.row.status === 1" style="color: #F56C6C;">
审核不通过
</span>
<span v-if="scope.row.status === 2" style="color: #F59A23;">
<span v-if="scope.row.status === 2" style="color: #E6A23C;">
待审核
</span>
</template>

@ -79,19 +79,19 @@
<el-table-column label="任务状态" key="taskStatus" width="200px" prop="taskStatus" class-name="table-status"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.taskStatus == 1" style="color: #F58A0C;">
<span v-if="scope.row.taskStatus == 1" style="color: #E6A23C;">
进行中
</span>
<span v-if="scope.row.taskStatus == 2" style="color: #76EE00;">
<span v-if="scope.row.taskStatus == 2" style="color: #67C23A;">
正常完成
</span>
<span v-if="scope.row.taskStatus == 3" style="color: #16B771;">
<span v-if="scope.row.taskStatus == 3" style="color:#67C23A;">
超期完成
</span>
<span v-if="scope.row.taskStatus == 4" style="color: #1485EF;">
<span v-if="scope.row.taskStatus == 4" style="color: #F56C6C;">
审核不通过
</span>
<span v-if="scope.row.taskStatus == 5" style="color: #1485EF;">
<span v-if="scope.row.taskStatus == 5" style="color: #F56C6C;">
审核驳回
</span>
</template>

@ -59,7 +59,7 @@
</el-option>
<el-option label="审核不通过" value="4">
</el-option>
<!-- <el-option label="已报废" value="5">
<!-- <el-option label="已关停" value="5">
</el-option> -->
</el-select>
</el-form-item>
@ -113,27 +113,27 @@
<el-table-column label="审核状态" key="status" width="200px" prop="status" class-name="table-status"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.status == 0" style="color: #F59A23;">
<span v-if="scope.row.status == 0" style="color: #303133;">
待核查
</span>
<span v-if="scope.row.status == 1" style="color: #F43147;">
<span v-if="scope.row.status == 1" style="color: #E6A23C;">
待审核
</span>
<span v-if="scope.row.status == 3" style="color: #00FF00;">
<span v-if="scope.row.status == 3" style="color: #67C23A;">
审核通过
</span>
<span v-if="scope.row.status == 4" style="color: #C51717;">
<span v-if="scope.row.status == 4" style="color: #F56C6C;">
审核不通过
</span>
<span v-if="scope.row.status == 5" style="color: #C51717;">
报废
<span v-if="scope.row.status == 5" style="color: #F56C6C;">
关停
</span>
</template>
</el-table-column>
<el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
<template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;">
<div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(1,scope.row)">
<div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(1,scope.row)" v-if="scope.row.status != 1 || ($route.query.pageType == 'look' || $route.meta.pageType == 'look')">
<img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
<span class="look-info"
style="color: #1485EF;">查看</span>
@ -143,6 +143,11 @@
<span class="look-info"
style="color: #1485EF;">审核</span>
</div>
<div style="display: flex;align-items: center;cursor: pointer;margin-left: 5px;" @click="goInfo(3,scope.row)" v-show='scope.row.status == 4'>
<img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
<span class="look-info"
style="color: #1485EF;">查看原因</span>
</div>
</div>
</template>
</el-table-column>
@ -189,16 +194,26 @@
</div>
</div>
</div>
</div>
<my-dialog title="查看原因" ref="liebiaoDialog" @close="importClose" class="taskDialogBox" width="40%">
<el-descriptions >
<el-descriptions-item label="不通过原因">
{{chakanyuanyin}}
</el-descriptions-item>
</el-descriptions>
</my-dialog>
</div>
</template>
<script>
import myPagination from "@/views/components/Pagination/index.vue"
import { getassetTaskid, geassetTaskcHc,assetTaskdwHc,assetLcpage,assetLcpageList } from "@/api/renwuApi/index.js"
import myDialog from "@/views/components/myDialog/index.vue"
export default {
dicts: ['zc_xtlx'],
components: { myPagination },
components: { myPagination,myDialog },
data() {
return {
index: 1,
@ -222,7 +237,8 @@ export default {
loading: false,
tabHeader: undefined,
timeLineData: [],
titleInfoObj: {}
titleInfoObj: {},
chakanyuanyin:""
}
},
mounted() {
@ -281,6 +297,8 @@ export default {
this.timeLineData = res.data
})
},
importClose(){},
goInfo(type, row) {
//
if (type == 1) {
@ -304,6 +322,12 @@ export default {
}
})
}
//
if (type == 3) {
this.chakanyuanyin = row.btgyy
this.$refs.liebiaoDialog.open()
}
// getassetTaskid(row.id)
},
@ -445,4 +469,7 @@ export default {
.look-info {
}
::v-deep .el-dialog{
margin-top: 20vh !important;
}
</style>

@ -17,7 +17,7 @@
:background="background"
:current-page.sync="currentPage"
:page-size.sync="pageSize"
:page-sizes="[10, 20, 30]"
:page-sizes="[10,20,40,80,100]"
:layout="layout"
:pager-count="pagerCount"
:total="total"

@ -2757,7 +2757,7 @@
</el-form-item>
</el-row>
<el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
<span class="top-title-box">报废原因</span>
<span class="top-title-box">关停原因</span>
</el-row>
<el-row style="margin: 20px 0;">
<el-form-item>

@ -88,7 +88,7 @@
维护中
</span>
<span v-if="scope.row.xtzt == 5" style="color: #F50C0C;">
报废
关停
</span>
</template>
</el-table-column>

@ -2663,35 +2663,35 @@
<span class="top-title-box">业务系统拓扑图</span>
</el-row>
<el-row style="margin: 20px 0;">
<el-form-item>
<el-form-item prop="ywxttpwj" label="附件上传">
<myUpload :fileSize="30" :limit="1" :fileType="accept" v-model="ruleForm.ywxttpwj">
<div class="upload-file">
<i class="el-icon-paperclip"></i>
<span>附件上传支持xlsxlsxdocdocxpdfrarzippcaptxt最多上传1个文件每个不超过30M</span>
<span>支持xlsxlsxdocdocxpdfrarzippcaptxt最多上传1个文件每个不超过30M</span>
</div>
</myUpload>
</el-form-item>
</el-row>
<el-row style="margin: 20px 0;">
<el-form-item>
<el-form-item prop="ywxttpt" label="图片上传">
<myUpload :fileSize="30" :limit="1" :fileType="acceptTwo" v-model="ruleForm.ywxttpt">
<div class="upload-file">
<i class="el-icon-paperclip"></i>
<span>图片上传支持jpgjpegpng最多上传1张图片每个不超过30M</span>
<span>支持jpgjpegpng最多上传1张图片每个不超过30M</span>
</div>
</myUpload>
</el-form-item>
</el-row>
 <el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
              <span class="top-title-box">报废原因</span>
            </el-row>
            <el-row style="margin: 20px 0;">
              <el-form-item>
                <div>{{ruleForm.bfyy}}</div>
              </el-form-item>
            </el-row>
<el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
<span class="top-title-box">关停原因</span>
</el-row>
<el-row style="margin: 20px 0;">
<el-form-item>
<div>{{ruleForm.bfyy}}</div>
</el-form-item>
</el-row>
<el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="$route.query.pageType == 'change'">
<el-button type="danger" @click="newAssets(0)"></el-button>
<el-button type="danger" @click="newAssets(0)"></el-button>
<el-button @click="newAssets(1)"></el-button>
<el-button type="warning" @click="newAssets(2)"></el-button>
<el-button type="primary" @click="newAssets(3)" :loading="loading">提交</el-button>
@ -2703,8 +2703,8 @@
<el-row>
<el-col :span="21">
<el-form :model="dialogruleForm" :rules="dialogruleFormrules" ref="dialogruleForm" label-width="100px">
<el-form-item label="报废原因:" prop="bfyy">
<el-input v-model="dialogruleForm.bfyy" placeholder="请输入报废原因"></el-input>
<el-form-item label="关停原因:" prop="bfyy">
<el-input v-model="dialogruleForm.bfyy" placeholder="请输入关停原因"></el-input>
</el-form-item>
<el-form-item class="newTask-form-item">
<el-button @click="resetForm('dialogruleForm')"></el-button>
@ -2728,8 +2728,8 @@ import { assetUnitData, assetInfo } from "@/api/auditPagesApi/index";
import { assetTasktaskSh, geassetTaskcHc, assetTasksh } from "@/api/renwuApi/index.js"
import { assetTaskzc, assetTaskjyTj } from "@/api/renwuApi/index.js"
export default {
name: "AssetsAuth",
dicts: [
'is_no', 'zc_xtlx', 'zc_xtzyx', 'zc_xtzt', 'zc_zxzt', 'zc_c_i_a',
@ -2742,6 +2742,22 @@ export default {
myUpload,myDialog
},
data() {
//
var validateName = (rule, value, callback) => {
if (!this.ruleForm.ywxttpwj && !this.ruleForm.ywxttpt) {
callback(new Error("附件,图片请任意上传一项"))
} else {
//
if (!this.ruleForm.ywxttpwj || !this.ruleForm.ywxttpt) {
this.$nextTick(() => {
this.$refs.ruleForm.clearValidate("ywxttpwj")
this.$refs.ruleForm.clearValidate("ywxttpt")
})
}
callback()
}
}
return {
accept: ['xls', 'xlsx', 'doc', 'docx', 'pdf', 'rar', 'zip', 'pcap', 'txt'],
acceptTwo: ['jpg', 'jpeg', 'png'],
@ -2922,7 +2938,22 @@ export default {
{ required: true, message: '请输入', trigger: 'blur' },
],
},
rules: {},
rules: {
ywxttpt: [
{
required: true,
validator: validateName,
trigger: "change",
},
],
ywxttpwj: [
{
required: true,
validator: validateName,
trigger: "change",
},
],
},
disabled: false,
loading: false,
}
@ -2972,7 +3003,7 @@ export default {
console.log(res, "res");
this.$message({
type: 'info',
message: '已报废'
message: '已关停'
});
this.loading = false

@ -82,7 +82,7 @@
已核查
</span>
<span v-if="scope.row.status === 1" style="color: #F43147;">
报废
关停
</span>
<span v-if="scope.row.status === 2" style="color: #F59A23;">
未核查

@ -54,19 +54,19 @@
<el-table-column label="任务状态" key="taskStatus" width="200px" prop="taskStatus" class-name="table-status"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.taskStatus == 1" style="color: #F58A0C;">
<span v-if="scope.row.taskStatus == 1" style="color: #E6A23C;">
进行中
</span>
<span v-if="scope.row.taskStatus == 2" style="color: #76EE00;">
<span v-if="scope.row.taskStatus == 2" style="color: #67C23A;">
正常完成
</span>
<span v-if="scope.row.taskStatus == 3" style="color: #16B771;">
<span v-if="scope.row.taskStatus == 3" style="color: #67C23A;">
超期完成
</span>
<span v-if="scope.row.taskStatus == 4" style="color: #1485EF;">
<span v-if="scope.row.taskStatus == 4" style="color: #F56C6C;">
审核不通过
</span>
<span v-if="scope.row.taskStatus == 5" style="color: #1485EF;">
<span v-if="scope.row.taskStatus == 5" style="color: #F56C6C;">
审核驳回
</span>
</template>

@ -59,7 +59,7 @@
</el-option>
<el-option label="审核不通过" value="4">
</el-option>
<el-option label="已报废" value="5">
<el-option label="已关停" value="5">
</el-option>
</el-select>
</el-form-item>
@ -110,27 +110,27 @@
<el-table-column label="审核状态" key="status" width="200px" prop="status" class-name="table-status"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.status == 0" style="color: #F59A23;">
<span v-if="scope.row.status == 0" style="color: #E6A23C;">
未核查
</span>
<span v-if="scope.row.status == 1" style="color: #00FF00;">
<span v-if="scope.row.status == 1" style="color: #67C23A;">
已核查
</span>
<span v-if="scope.row.status == 3" style="color: #00FF00;">
<span v-if="scope.row.status == 3" style="color: #67C23A;">
审核通过
</span>
<span v-if="scope.row.status == 4" style="color: #C51717;">
<span v-if="scope.row.status == 4" style="color: #F56C6C;">
审核不通过
</span>
<span v-if="scope.row.status == 5" style="color: #C51717;">
报废
<span v-if="scope.row.status == 5" style="color: #F56C6C;">
关停
</span>
</template>
</el-table-column>
<el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
<template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;">
<div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(1,scope.row)">
<div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(1,scope.row)" v-if="(scope.row.status !=4 &&scope.row.status !=0) || ($route.query.pageType == 'look' || $route.meta.pageType == 'look')">
<img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
<span class="look-info"
style="color: #1485EF;">查看</span>
@ -141,6 +141,11 @@
<span class="del-info"
style="color: #1485EF;">核查</span>
</div>
<div style="display: flex;align-items: center;cursor: pointer;margin-left: 5px;" @click="goInfo(3,scope.row)" v-show='scope.row.status == 4'>
<img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
<span class="look-info"
style="color: #1485EF;">查看原因</span>
</div>
</div>
</template>
</el-table-column>
@ -170,16 +175,25 @@
</div>
</div>
</div>
<my-dialog title="查看原因" ref="liebiaoDialog" @close="importClose" class="taskDialogBox" width="40%">
<el-descriptions >
<el-descriptions-item label="不通过原因">
{{chakanyuanyin}}
</el-descriptions-item>
</el-descriptions>
</my-dialog>
</div>
</template>
<script>
import myPagination from "@/views/components/Pagination/index.vue"
import { getassetTaskid, geassetTaskcHc } from "@/api/renwuApi/index.js"
import { assetLcpage } from "@/api/renwuApi/index.js"
import myDialog from "@/views/components/myDialog/index.vue"
export default {
dicts: ['zc_xtlx'],
components: { myPagination },
components: { myPagination,myDialog },
data() {
return {
index: 1,
@ -203,7 +217,8 @@ export default {
loading: false,
tabHeader: undefined,
timeLineData: [],
titleInfoObj: {}
titleInfoObj: {},
chakanyuanyin:""
}
},
mounted() {
@ -263,6 +278,8 @@ export default {
this.timeLineData = res.data
})
},
importClose(){},
goInfo(type, row) {
//
if (type == 1) {
@ -285,6 +302,12 @@ export default {
}
})
}
//
if (type == 3) {
this.chakanyuanyin = row.btgyy
this.$refs.liebiaoDialog.open()
}
// getassetTaskid(row.id)
},
@ -426,4 +449,7 @@ export default {
.look-info {
}
::v-deep .el-dialog{
margin-top: 20vh !important;
}
</style>

Loading…
Cancel
Save