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

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

Browse Source
This commit is contained in:
zhoulingpo
2023-11-30 17:02:05 +08:00
parent 19290ce11f fd2f5651eb
commit 1f233eda7a
25 changed files with 331 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/hzwlComponents/ReceiptDescription.vue
+3
View File
@@ -48,4 +48,7 @@ export default {
height: 48px; height: 48px;
line-height: 48px; line-height: 48px;
} }
/deep/ .el-form-item__content .el-textarea .el-textarea__inner {
width: 100% !important;
}
</style> </style>
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+19 -13
View File
@@ -111,21 +111,25 @@
</el-collapse-transition> </el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button> <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button> <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<ReceiptDescription
title="回执说明"
v-model="commentText1"
></ReceiptDescription>
</el-form> </el-form>
</div> </div>
<el-collapse accordion> <!--<el-collapse accordion>-->
<el-collapse-item title="回执说明"> <!-- <el-collapse-item title="回执说明">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText1"> <!-- v-model="commentText1">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!--</el-collapse>-->
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;"> <div class="block" style="padding-top: 20px;">
@@ -268,6 +272,7 @@
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import { saveTaskFirst, queryTaskFirst,taskDel } from 'api/process' import { saveTaskFirst, queryTaskFirst,taskDel } from 'api/process'
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzdyStep1-1", name: "bzdyStep1-1",
@@ -352,6 +357,7 @@
} }
}, },
components: { components: {
ReceiptDescription,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+20 -13
View File
@@ -111,21 +111,26 @@
</el-collapse-transition> </el-collapse-transition>
<el-button :disabled="disabledXX" v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button> <el-button :disabled="disabledXX" v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button :disabled="disabledXX" v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button> <el-button :disabled="disabledXX" v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<ReceiptDescription
title="回执说明"
v-model="commentText1"
:disabled="disabledXX"
></ReceiptDescription>
</el-form> </el-form>
</div> </div>
<el-collapse accordion> <!--<el-collapse accordion>-->
<el-collapse-item title="回执说明"> <!-- <el-collapse-item title="回执说明">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<el-input :disabled="disabledXX" <!-- <el-input :disabled="disabledXX"-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText1"> <!-- v-model="commentText1">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!--</el-collapse>-->
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;"> <div class="block" style="padding-top: 20px;">
@@ -271,6 +276,7 @@ import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import { queryTaskFirst, saveTaskFirst } from "api/process"; import { queryTaskFirst, saveTaskFirst } from "api/process";
import { taskDel } from 'api/process' import { taskDel } from 'api/process'
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzdyStep1", name: "bzdyStep1",
data() { data() {
@@ -357,6 +363,7 @@ export default {
} }
}, },
components: { components: {
ReceiptDescription,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+19 -13
View File
@@ -95,21 +95,25 @@
</el-collapse-transition> </el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button> <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button> <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<ReceiptDescription
title="回执说明"
v-model="commentText2"
></ReceiptDescription>
</el-form> </el-form>
</div> </div>
<el-collapse accordion> <!--<el-collapse accordion>-->
<el-collapse-item title="回执说明"> <!-- <el-collapse-item title="回执说明">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText2"> <!-- v-model="commentText2">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!--</el-collapse>-->
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <el-table
@@ -205,6 +209,7 @@
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew,getBusStandFileByAttId} from 'api/process' import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew,getBusStandFileByAttId} from 'api/process'
import axios from "axios"; import axios from "axios";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzdyStep2", name: "bzdyStep2",
@@ -244,6 +249,7 @@
} }
}, },
components: { components: {
ReceiptDescription,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+19 -13
View File
@@ -133,21 +133,25 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<ReceiptDescription
title="回执说明"
v-model="commentText3"
></ReceiptDescription>
</el-form> </el-form>
</div> </div>
<el-collapse accordion> <!--<el-collapse accordion>-->
<el-collapse-item title="回执说明"> <!-- <el-collapse-item title="回执说明">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText3"> <!-- v-model="commentText3">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!--</el-collapse>-->
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <el-table
@@ -258,6 +262,7 @@
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew,execTask} from 'api/process' import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew,execTask} from 'api/process'
import axios from "axios"; import axios from "axios";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzdyStep3", name: "bzdyStep3",
@@ -304,6 +309,7 @@
} }
}, },
components: { components: {
ReceiptDescription,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+19 -13
View File
@@ -134,21 +134,25 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<ReceiptDescription
title="审批意见"
v-model="commentText4"
></ReceiptDescription>
</el-form> </el-form>
</div> </div>
<el-collapse accordion> <!--<el-collapse accordion>-->
<el-collapse-item title="审批意见"> <!-- <el-collapse-item title="审批意见">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText4"> <!-- v-model="commentText4">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!--</el-collapse>-->
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <el-table
@@ -241,6 +245,7 @@
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process' import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
import axios from "axios"; import axios from "axios";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzdyStep4", name: "bzdyStep4",
@@ -281,6 +286,7 @@
} }
}, },
components: { components: {
ReceiptDescription,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue
+21 -14
View File
@@ -132,21 +132,26 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
</div> <ReceiptDescription
<el-collapse accordion v-model="activeNames"> title="回执说明"
<el-collapse-item title="回执说明" name="1"> v-model="commentText5"
<div style="margin: 10px 0;">
<el-input
:disabled="disabledXX" :disabled="disabledXX"
type="textarea" ></ReceiptDescription>
:rows="3" </div>
resize="none" <!--<el-collapse accordion v-model="activeNames">-->
placeholder="请输入意见" <!-- <el-collapse-item title="回执说明" name="1">-->
v-model="commentText5"> <!-- <div style="margin: 10px 0;">-->
</el-input> <!-- <el-input-->
</div> <!-- :disabled="disabledXX"-->
</el-collapse-item> <!-- type="textarea"-->
</el-collapse> <!-- :rows="3"-->
<!-- resize="none"-->
<!-- placeholder="请输入意见"-->
<!-- v-model="commentText5">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-collapse-item>-->
<!--</el-collapse>-->
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <el-table
@@ -257,6 +262,7 @@
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,saveTaskForPub,changeAssigneeNew} from 'api/process' import {inboundLiaisonDetail,saveTaskForPub,changeAssigneeNew} from 'api/process'
import axios from "axios"; import axios from "axios";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzdyStep5-1", name: "bzdyStep5-1",
@@ -295,6 +301,7 @@
} }
}, },
components: { components: {
ReceiptDescription,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+19 -13
View File
@@ -129,20 +129,24 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<ReceiptDescription
title="回执说明"
v-model="commentText5"
></ReceiptDescription>
</div> </div>
<el-collapse accordion> <!--<el-collapse accordion>-->
<el-collapse-item title="回执说明"> <!-- <el-collapse-item title="回执说明">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText5"> <!-- v-model="commentText5">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!--</el-collapse>-->
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <el-table
@@ -251,6 +255,7 @@
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,saveTaskForPub,changeAssigneeNew} from 'api/process' import {inboundLiaisonDetail,saveTaskForPub,changeAssigneeNew} from 'api/process'
import axios from "axios"; import axios from "axios";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzdyStep5", name: "bzdyStep5",
@@ -287,6 +292,7 @@
} }
}, },
components: { components: {
ReceiptDescription,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+19 -13
View File
@@ -124,20 +124,24 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<ReceiptDescription
title="审批意见"
v-model="commentText6"
></ReceiptDescription>
</div> </div>
<el-collapse accordion> <!--<el-collapse accordion>-->
<el-collapse-item title="审批意见"> <!-- <el-collapse-item title="审批意见">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText6"> <!-- v-model="commentText6">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!--</el-collapse>-->
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <el-table
@@ -248,6 +252,7 @@
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process' import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process'
import axios from "axios"; import axios from "axios";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzdyStep6", name: "bzdyStep6",
@@ -283,6 +288,7 @@
} }
}, },
components: { components: {
ReceiptDescription,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+19 -13
View File
@@ -124,20 +124,24 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<ReceiptDescription
title="审批意见"
v-model="commentText7"
></ReceiptDescription>
</div> </div>
<el-collapse accordion> <!--<el-collapse accordion>-->
<el-collapse-item title="审批意见"> <!-- <el-collapse-item title="审批意见">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText7"> <!-- v-model="commentText7">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!--</el-collapse>-->
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <el-table
@@ -248,6 +252,7 @@
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process' import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process'
import axios from "axios"; import axios from "axios";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzdyStep7", name: "bzdyStep7",
@@ -283,6 +288,7 @@
} }
}, },
components: { components: {
ReceiptDescription,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+19 -13
View File
@@ -124,20 +124,24 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<ReceiptDescription
title="审批意见"
v-model="commentText8"
></ReceiptDescription>
</div> </div>
<el-collapse accordion> <!--<el-collapse accordion>-->
<el-collapse-item title="审批意见"> <!-- <el-collapse-item title="审批意见">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText8"> <!-- v-model="commentText8">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!--</el-collapse>-->
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <el-table
@@ -248,6 +252,7 @@
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process' import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process'
import axios from "axios"; import axios from "axios";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzdyStep8", name: "bzdyStep8",
@@ -283,6 +288,7 @@
} }
}, },
components: { components: {
ReceiptDescription,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+19 -13
View File
@@ -156,20 +156,24 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<ReceiptDescription
title="审批意见"
v-model="commentText9"
></ReceiptDescription>
</div> </div>
<el-collapse accordion> <!--<el-collapse accordion>-->
<el-collapse-item title="审批意见"> <!-- <el-collapse-item title="审批意见">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText9"> <!-- v-model="commentText9">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!--</el-collapse>-->
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <el-table
@@ -280,6 +284,7 @@
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process' import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process'
import axios from "axios"; import axios from "axios";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzdyStep9", name: "bzdyStep9",
@@ -317,6 +322,7 @@
} }
}, },
components: { components: {
ReceiptDescription,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue
+22 -13
View File
@@ -1057,19 +1057,25 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<el-collapse v-show="verifySarStandard" v-model="activeName" accordion> <ReceiptDescription
<el-collapse-item title="回执说明" name="1"> v-show="verifySarStandard"
<div style="margin: 10px 0;"> title="回执说明"
<el-input :disabled="disabledXX" v-model="commentText"
type="textarea" :disabled="disabledXX"
:rows="3" ></ReceiptDescription>
resize="none" <!--<el-collapse v-show="verifySarStandard" v-model="activeName" accordion>-->
placeholder="请输入意见" <!-- <el-collapse-item title="回执说明" name="1">-->
v-model="commentText"> <!-- <div style="margin: 10px 0;">-->
</el-input> <!-- <el-input :disabled="disabledXX"-->
</div> <!-- type="textarea"-->
</el-collapse-item> <!-- :rows="3"-->
</el-collapse> <!-- resize="none"-->
<!-- placeholder="请输入意见"-->
<!-- v-model="commentText">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-collapse-item>-->
<!--</el-collapse>-->
</div> </div>
<div class="block" style="padding-top: 20px;" v-show="active === '2'"> <div class="block" style="padding-top: 20px;" v-show="active === '2'">
<el-timeline> <el-timeline>
@@ -1544,6 +1550,8 @@
import CusTomDataPickerGroup import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup"; from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
import TreeSelectStand from "@/components/treeSelect/treeSelectStand"; import TreeSelectStand from "@/components/treeSelect/treeSelectStand";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzrkStep1-1", name: "bzrkStep1-1",
@@ -1558,6 +1566,7 @@
ProcessTitle, ProcessTitle,
TreeSelect, TreeSelect,
TreeSelectNew, TreeSelectNew,
ReceiptDescription,
}, },
data() { data() {
const validateQcdw = (rule, value, callback) => { const validateQcdw = (rule, value, callback) => {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+21 -13
View File
@@ -1057,19 +1057,25 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<el-collapse v-show="verifySarStandard" v-model="activeName" accordion> <ReceiptDescription
<el-collapse-item title="回执说明" name="1"> v-show="verifySarStandard"
<div style="margin: 10px 0;"> title="回执说明"
<el-input :disabled="disabledXX" v-model="commentText"
type="textarea" :disabled="disabledXX"
:rows="3" ></ReceiptDescription>
resize="none" <!--<el-collapse v-show="verifySarStandard" v-model="activeName" accordion>-->
placeholder="请输入意见" <!-- <el-collapse-item title="回执说明" name="1">-->
v-model="commentText"> <!-- <div style="margin: 10px 0;">-->
</el-input> <!-- <el-input :disabled="disabledXX"-->
</div> <!-- type="textarea"-->
</el-collapse-item> <!-- :rows="3"-->
</el-collapse> <!-- resize="none"-->
<!-- placeholder="请输入意见"-->
<!-- v-model="commentText">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-collapse-item>-->
<!--</el-collapse>-->
</div> </div>
<div class="block" style="padding-top: 20px;" v-show="active === '2'"> <div class="block" style="padding-top: 20px;" v-show="active === '2'">
<el-timeline> <el-timeline>
@@ -1544,6 +1550,7 @@
import CusTomDataPickerGroup import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup"; from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
import TreeSelectStand from "@/components/treeSelect/treeSelectStand"; import TreeSelectStand from "@/components/treeSelect/treeSelectStand";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzrkStep1", name: "bzrkStep1",
@@ -1558,6 +1565,7 @@
ProcessTitle, ProcessTitle,
TreeSelect, TreeSelect,
TreeSelectNew, TreeSelectNew,
ReceiptDescription,
}, },
data() { data() {
const validateQcdw = (rule, value, callback) => { const validateQcdw = (rule, value, callback) => {
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+21 -15
View File
@@ -676,23 +676,27 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<ReceiptDescription
title="审批意见"
v-model="commentText"
></ReceiptDescription>
</el-form> </el-form>
</div> </div>
<div> <!--<div>-->
<el-collapse accordion> <!-- <el-collapse accordion>-->
<el-collapse-item title="审批意见"> <!-- <el-collapse-item title="审批意见">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText"> <!-- v-model="commentText">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!-- </el-collapse>-->
</div> <!--</div>-->
</div> </div>
<div class="content" v-if="active === '2'"> <div class="content" v-if="active === '2'">
<div class="block" style="padding-top: 20px;"> <div class="block" style="padding-top: 20px;">
@@ -841,6 +845,7 @@ import { changeAssigneeNew, inboundLiaisonDetail, processCreateStand } from "api
import TreeSelect from "@/components/treeSelect/treeSelect.vue"; import TreeSelect from "@/components/treeSelect/treeSelect.vue";
import CusTomDataPickerGroup import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup"; from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzrkStep2", name: "bzrkStep2",
@@ -1036,6 +1041,7 @@ export default {
} }
}, },
components: { components: {
ReceiptDescription,
CusTomDataPickerGroup, CusTomDataPickerGroup,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+25 -19
View File
@@ -661,27 +661,31 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<ReceiptDescription
title="回执说明"
v-model="commentText"
></ReceiptDescription>
</el-form> </el-form>
</div> </div>
<div> <!-- <div>-->
<el-collapse accordion v-model="activeName"> <!-- <el-collapse accordion v-model="activeName">-->
<el-collapse-item title="回执说明" name="1"> <!-- <el-collapse-item title="回执说明" name="1">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<!-- <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">--> <!--&lt;!&ndash; <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">&ndash;&gt;-->
<!-- <el-option label="驳回" value="1"></el-option>--> <!--&lt;!&ndash; <el-option label="驳回" value="1"></el-option>&ndash;&gt;-->
<!-- <el-option label="通过" value="0"></el-option>--> <!--&lt;!&ndash; <el-option label="通过" value="0"></el-option>&ndash;&gt;-->
<!-- </el-select>--> <!--&lt;!&ndash; </el-select>&ndash;&gt;-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText"> <!-- v-model="commentText">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!-- </el-collapse>-->
</div> <!-- </div>-->
</div> </div>
<div class="content" v-if="active === '2'"> <div class="content" v-if="active === '2'">
<div class="block" style="padding-top: 20px;"> <div class="block" style="padding-top: 20px;">
@@ -826,6 +830,7 @@ import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process' import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup' import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
@@ -1008,6 +1013,7 @@ export default {
} }
}, },
components: { components: {
ReceiptDescription,
CustomDatePickGroup, CustomDatePickGroup,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+26 -19
View File
@@ -1269,27 +1269,31 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<ReceiptDescription
title="回执说明"
v-model="commentText"
></ReceiptDescription>
</el-form> </el-form>
</div> </div>
<div> <!--<div>-->
<el-collapse accordion v-model="activeName"> <!-- <el-collapse accordion v-model="activeName">-->
<el-collapse-item title="回执说明" name="1"> <!-- <el-collapse-item title="回执说明" name="1">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<!-- <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">--> <!-- &lt;!&ndash; <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">&ndash;&gt;-->
<!-- <el-option label="驳回" value="1"></el-option>--> <!-- &lt;!&ndash; <el-option label="驳回" value="1"></el-option>&ndash;&gt;-->
<!-- <el-option label="通过" value="0"></el-option>--> <!-- &lt;!&ndash; <el-option label="通过" value="0"></el-option>&ndash;&gt;-->
<!-- </el-select>--> <!-- &lt;!&ndash; </el-select>&ndash;&gt;-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText"> <!-- v-model="commentText">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!-- </el-collapse>-->
</div> <!--</div>-->
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;"> <div class="block" style="padding-top: 20px;">
@@ -1592,9 +1596,12 @@ import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import CusTomDataPickerGroup import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup"; from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
import TreeSelectStand from "@/components/treeSelect/treeSelectStand"; import TreeSelectStand from "@/components/treeSelect/treeSelectStand";
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default { export default {
name: "bzrkStep4", name: "bzrkStep4",
components: { components: {
ReceiptDescription,
TreeSelectStand, TreeSelectStand,
CusTomDataPickerGroup, CusTomDataPickerGroup,
TreeSelectModule, TreeSelectModule,
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
-13
View File
@@ -27,12 +27,6 @@
border border
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
style="width: 10%;float: left;margin-right: 20px;"> style="width: 10%;float: left;margin-right: 20px;">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="userName" prop="userName"
align="center" align="center"
@@ -57,13 +51,6 @@
show-summary show-summary
:span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))" :span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))"
style="width: 88%"> style="width: 88%">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1"> <el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
<el-table-column <el-table-column
label="标准类别" label="标准类别"
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
-6
View File
@@ -26,12 +26,6 @@
show-summary show-summary
:span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))" :span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))"
style="width: 100%"> style="width: 100%">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1"> <el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
<el-table-column <el-table-column
label="标准类别" label="标准类别"
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
-6
View File
@@ -26,12 +26,6 @@
show-summary show-summary
:span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))" :span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))"
style="width: 100%"> style="width: 100%">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1"> <el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
<el-table-column <el-table-column
label="标准类别" label="标准类别"
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
-6
View File
@@ -27,12 +27,6 @@
show-summary show-summary
:span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))" :span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))"
style="width: 100%"> style="width: 100%">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1"> <el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
<el-table-column <el-table-column
label="标准类别" label="标准类别"
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
-6
View File
@@ -32,12 +32,6 @@
show-summary show-summary
:span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))" :span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))"
style="width: 100%"> style="width: 100%">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1"> <el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
<el-table-column <el-table-column
label="标准类别" label="标准类别"
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
-12
View File
@@ -26,12 +26,6 @@
border border
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
style="width: 10%;float: left;margin-right: 20px;"> style="width: 10%;float: left;margin-right: 20px;">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="userName" prop="userName"
align="center" align="center"
@@ -56,12 +50,6 @@
show-summary show-summary
:span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))" :span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))"
style="width: 88%"> style="width: 88%">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1"> <el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
<el-table-column <el-table-column
label="标准类别" label="标准类别"
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
-6
View File
@@ -26,12 +26,6 @@
show-summary show-summary
:span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))" :span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))"
style="width: 100%"> style="width: 100%">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1"> <el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
<el-table-column <el-table-column
label="标准类别" label="标准类别"
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+1
View File
@@ -969,6 +969,7 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
window.open(routeUrl.href, "_blank");
} else if (row.taskInfo === '会签') { } else if (row.taskInfo === '会签') {
routeUrl =this.$router.resolve({ routeUrl =this.$router.resolve({
name: 'bzzqyjStep6', name: 'bzzqyjStep6',