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

fix: 标准入库-审批意见

Browse Source
This commit is contained in:
zyn
2023-11-29 17:40:43 +08:00
parent 9021245305
commit 90c50a4d01
5 changed files with 115 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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,