FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhutianqi
2022-03-03 10:29:28 +08:00
parent 4d143302bc 2f589a82c8
commit 2250ef8234
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+1 -1
View File
@@ -461,7 +461,7 @@
</p> </p>
</template> </template>
<template <template
v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'" v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZH' || child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
> >
<p class="modular-content-p-val" v-if="child.value"> <p class="modular-content-p-val" v-if="child.value">
<span v-for="(item, index) in child.value.split(',')" :key="index"> <span v-for="(item, index) in child.value.split(',')" :key="index">
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+1 -1
View File
@@ -471,7 +471,7 @@ export default {
this.$refs["roleForm"].validate((valid) => { this.$refs["roleForm"].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
this.listForm.commentText = this.commentText; qbzxdFrom.commentText = this.commentText;
let json = Object.assign(qbzxdFrom, this.roleForm); let json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/startProcessRollBack", { this.$http.post("lawss/activiti/startProcessRollBack", {
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+3 -3
View File
@@ -781,9 +781,9 @@ export default {
standSerialNumber: [ standSerialNumber: [
{ required: true, message: "请输入标准号", trigger: "change" } { required: true, message: "请输入标准号", trigger: "change" }
], ],
standName: [ // standName: [
{ required: true, message: "请输入标准名称", trigger: "change" } // { required: true, message: "请输入标准名称", trigger: "change" }
], // ],
itemsNum: [ itemsNum: [
{ required: true, message: "请输入条款号", trigger: "change" } { required: true, message: "请输入条款号", trigger: "change" }
], ],