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

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