suzhou-jichuang-lanhai
/
TcAssetVerificationPc
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into ltf

Browse Source 
# Conflicts:
#	src/views/unitPages/myTask/audit.vue
ltf
吴顺杰 5 months ago
parent 027df7a5e7 43b69992a9
commit 686339838c
4 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File

8
src/views/auditPages/assetsManagement/assetsAuth.vue
Unescape View File

@ -2756,6 +2756,14 @@
</myUpload> </myUpload>
</el-form-item> </el-form-item>
</el-row> </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>
</div> </div>
<el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="$route.query.pageType !== 'look'"> <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="$route.query.pageType !== 'look'">
<el-button type="danger" @click="sendBack">取消</el-button> <el-button type="danger" @click="sendBack">取消</el-button>

8
src/views/unitPages/myAssets/assetsAuth.vue
Unescape View File

@ -2756,6 +2756,14 @@
</myUpload> </myUpload>
</el-form-item> </el-form-item>
</el-row> </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>
</div> </div>
</el-form> </el-form>
</div> </div>

2
src/views/unitPages/myAssets/index.vue
Unescape View File

@ -238,7 +238,7 @@ export default {
const elementHeight = element.offsetHeight; const elementHeight = element.offsetHeight;
const headerHeight = header.offsetHeight; const headerHeight = header.offsetHeight;
const paginationtHeight = pagination.offsetHeight; const paginationtHeight = pagination.offsetHeight;
this.tabHeader = elementHeight - headerHeight - paginationtHeight - 80; this.tabHeader = elementHeight - headerHeight - paginationtHeight - 120;
} }
}, },
} }

44
src/views/unitPages/myTask/audit.vue
Unescape View File

@ -93,7 +93,7 @@
<el-row> <el-row>
<el-col :span="23"> <el-col :span="23">
<el-input v-model="domain.key" placeholder="请输入关联域名"></el-input> <el-input v-model="domain.key" placeholder="请输入关联域名"></el-input>
</el-col> </el-col>
<el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'"> <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
<i @click="addForm('glymList')" v-if="index == 0" class="el-icon-circle-plus-outline" <i @click="addForm('glymList')" v-if="index == 0" class="el-icon-circle-plus-outline"
style="margin-left: 5px;font-size: 16px;cursor: pointer;"></i> style="margin-left: 5px;font-size: 16px;cursor: pointer;"></i>
@ -606,7 +606,7 @@
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: '请输入正确的手机号码', message: '请输入正确的手机号码',
trigger: 'blur' trigger: 'blur'
} }
]"> ]">
<el-input v-model="ruleForm.fgfzrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input> <el-input v-model="ruleForm.fgfzrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
</el-form-item> </el-form-item>
@ -639,7 +639,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" style="margin-left: 10px;"> <el-col :span="8" style="margin-left: 10px;">
<el-form-item prop="bmfzrlxfs" <el-form-item prop="bmfzrlxfs"
:rules="[ :rules="[
{ {
required: true, message: '请输入', trigger: 'blur' required: true, message: '请输入', trigger: 'blur'
@ -648,7 +648,7 @@
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: '请输入正确的手机号码', message: '请输入正确的手机号码',
trigger: 'blur' trigger: 'blur'
} }
]"> ]">
<el-input v-model="ruleForm.bmfzrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input> <el-input v-model="ruleForm.bmfzrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
</el-form-item> </el-form-item>
@ -680,7 +680,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" style="margin-left: 10px;"> <el-col :span="8" style="margin-left: 10px;">
<el-form-item prop="dylxrlxfs" <el-form-item prop="dylxrlxfs"
:rules="[ :rules="[
{ {
required: true, message: '请输入', trigger: 'blur' required: true, message: '请输入', trigger: 'blur'
@ -689,7 +689,7 @@
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: '请输入正确的手机号码', message: '请输入正确的手机号码',
trigger: 'blur' trigger: 'blur'
} }
]" ]"
> >
<el-input v-model="ruleForm.dylxrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input> <el-input v-model="ruleForm.dylxrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
@ -731,7 +731,7 @@
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: '请输入正确的手机号码', message: '请输入正确的手机号码',
trigger: 'blur' trigger: 'blur'
} }
]" ]"
> >
<el-input v-model="domain.qtlxrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input> <el-input v-model="domain.qtlxrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
@ -1487,7 +1487,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" style="margin-left: 10px;"> <el-col :span="12" style="margin-left: 10px;">
<el-form-item class="daoqitixingren" required :prop="`xtyyUnit[${index}].tyshxydm`" <el-form-item class="daoqitixingren" required :prop="`xtyyUnit[${index}].tyshxydm`"
:rules="[ :rules="[
{required: true, message: '请输入', trigger: 'blur'}, {required: true, message: '请输入', trigger: 'blur'},
{ {
@ -1495,7 +1495,7 @@
message: '请输入正确格式的18位统一社会信用代码', message: '请输入正确格式的18位统一社会信用代码',
trigger: 'blur' trigger: 'blur'
} }
]" ]"
:label="'统一社会信用代码' + (index == 0 ? '' : index)"> :label="'统一社会信用代码' + (index == 0 ? '' : index)">
<el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input> <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
</el-form-item> </el-form-item>
@ -2671,7 +2671,7 @@
</div> </div>
</myUpload> </myUpload>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row style="margin: 20px 0;"> <el-row style="margin: 20px 0;">
<el-form-item> <el-form-item>
<myUpload :fileSize="30" :limit="1" :fileType="acceptTwo" v-model="ruleForm.ywxttpt"> <myUpload :fileSize="30" :limit="1" :fileType="acceptTwo" v-model="ruleForm.ywxttpt">
@ -2866,7 +2866,7 @@ export default {
], ],
// 网络设备 // 网络设备
wlsb: [ wlsb: [
{ {
sblx: "", sblx: "",
@ -2883,7 +2883,7 @@ export default {
type: 2, type: 2,
} }
], ],
// 安全设备 // 安全设备
aqsb: [ aqsb: [
{ {
@ -2961,7 +2961,7 @@ export default {
bfyy:"" bfyy:""
} }
this.$refs.liebiaoDialog.close() this.$refs.liebiaoDialog.close()
}, },
submitForm(formName) { submitForm(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
@ -2975,11 +2975,11 @@ export default {
message: '已报废' message: '已报废'
}); });
this.loading = false this.loading = false
this.$router.go(-1); this.$router.go(-1);
this.ruleForm.bfyy = "" this.ruleForm.bfyy = ""
}) })
} else { } else {
console.log('error submit!!'); console.log('error submit!!');
return false; return false;
@ -3002,7 +3002,7 @@ export default {
this.ruleForm.fwwz = arr[1] this.ruleForm.fwwz = arr[1]
} }
this.ruleForm.xttz ? this.xttz = this.ruleForm.xttz.split(',') : []; this.ruleForm.xttz ? this.xttz = this.ruleForm.xttz.split(',') : [];
let chepingUnit = this.ruleForm.gylxxList.filter((item) => item.type == 1) let chepingUnit = this.ruleForm.gylxxList.filter((item) => item.type == 1)
let yjgysUnit = this.ruleForm.gylxxList.filter((item) => item.type == 2) let yjgysUnit = this.ruleForm.gylxxList.filter((item) => item.type == 2)
let jfywUnit = this.ruleForm.gylxxList.filter((item) => item.type == 3) let jfywUnit = this.ruleForm.gylxxList.filter((item) => item.type == 3)
@ -3033,7 +3033,7 @@ export default {
this.$set(this.ruleForm, 'aqsb', aqsb.length > 0 ? aqsb : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 3 }]) this.$set(this.ruleForm, 'aqsb', aqsb.length > 0 ? aqsb : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 3 }])
// this.ruleForm.wlsb = (this.ruleForm.jcwlList.filter((item) => item.type == 2) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 2) : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 2 }]) // this.ruleForm.wlsb = (this.ruleForm.jcwlList.filter((item) => item.type == 2) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 2) : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 2 }])
// this.ruleForm.aqsb = (this.ruleForm.jcwlList.filter((item) => item.type == 3) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 3) : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 3 }]) // this.ruleForm.aqsb = (this.ruleForm.jcwlList.filter((item) => item.type == 3) == [] ? this.ruleForm.jcwlList.filter((item) => item.type == 3) : [{ sblx: "", pp: "", ipType: "", sbIP: "", czxx: "", czxxbb: "", yjxh: "", yjxlh: "", yjbbxx: "", yjyt: "", yjbswz: "", type: 3 }])
this.ruleForm.xtfhqkFcg ? this.xtfhqkFcg = this.ruleForm.xtfhqkFcg.split(',') : []; this.ruleForm.xtfhqkFcg ? this.xtfhqkFcg = this.ruleForm.xtfhqkFcg.split(',') : [];
@ -3072,7 +3072,7 @@ export default {
// 服务器Form新增 // 服务器Form新增
addServer(type, id) { addServer(type, id) {
console.log(this.ruleForm); console.log(this.ruleForm);
this.ruleForm[type].push({ this.ruleForm[type].push({
sblx: "", sblx: "",
pp: "", pp: "",
@ -3186,11 +3186,11 @@ export default {
this.loading = false this.loading = false
return return
} }
this.ruleForm.taskId= this.$route.query.taskId this.ruleForm.taskId= this.$route.query.taskId
this.ruleForm.assetId= this.$route.query.assetId this.ruleForm.assetId= this.$route.query.assetId
this.ruleForm.xttz = this.xttz.join(','); this.ruleForm.xttz = this.xttz.join(',');
this.ruleForm.xtfhqkFcg = this.xtfhqkFcg.join(','); this.ruleForm.xtfhqkFcg = this.xtfhqkFcg.join(',');
this.ruleForm.xtfhqkFxl = this.xtfhqkFxl.join(','); this.ruleForm.xtfhqkFxl = this.xtfhqkFxl.join(',');
@ -3246,7 +3246,7 @@ export default {
return false; return false;
} }
}); });
} }

Write Preview
Loading…
Cancel
Save