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:
yanyizhou
2021-12-12 14:48:05 +08:00
parent 34b31ba824 fa116671f9
commit 8f65fd863d
3 changed files with 23 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+20 -28
View File
@@ -391,20 +391,16 @@
maxlength="500" maxlength="500"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="新车型实施日期" prop="newData" class="add-form-item" > <custom-date-pick-group
<custom-date-pick-group class="myDataPick"
class="myDataPick" :config="{attrName: '新车型实施日期'}"
:config="plForm" v-model="plForm.newData"
v-model="plForm.newData" ></custom-date-pick-group>
></custom-date-pick-group> <custom-date-pick-group
</el-form-item> class="myDataPick"
<el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" > :config="{attrName: '在产车实施日期'}"
<custom-date-pick-group v-model="plForm.onlineData"
class="myDataPick" ></custom-date-pick-group>
:config="plForm"
v-model="plForm.onlineData"
></custom-date-pick-group>
</el-form-item>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" > <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
<el-select multiple v-model="plForm.applyArctic"> <el-select multiple v-model="plForm.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option> <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
@@ -460,20 +456,16 @@
maxlength="500" maxlength="500"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="新车型实施日期" prop="newData" class="add-form-item" > <custom-date-pick-group
<custom-date-pick-group class="myDataPick"
class="myDataPick" :config="{attrName: '新车型实施日期'}"
:config="editForm" v-model="editForm.newData"
v-model="editForm.newData" ></custom-date-pick-group>
></custom-date-pick-group> <custom-date-pick-group
</el-form-item> class="myDataPick"
<el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" > :config="{attrName: '在产车实施日期'}"
<custom-date-pick-group v-model="editForm.onlineData"
class="myDataPick" ></custom-date-pick-group>
:config="editForm"
v-model="editForm.onlineData"
></custom-date-pick-group>
</el-form-item>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" > <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
<el-select multiple v-model="editForm.applyArctic"> <el-select multiple v-model="editForm.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option> <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
-26
View File
@@ -341,7 +341,6 @@
<div v-else> <div v-else>
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
<el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'" <el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"
v-if="scope.row.collectBtn" v-if="scope.row.collectBtn"
@click="handleCommand([scope.row, '收藏'])" @click="handleCommand([scope.row, '收藏'])"
@@ -352,31 +351,6 @@
@click="handleCommand([scope.row, '取消收藏'])" @click="handleCommand([scope.row, '取消收藏'])"
> >
</el-button> </el-button>
<!-- <i class="iconfont">&#xe61e;</i>-->
<!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item-->
<!-- v-if="scope.row.collectBtn"-->
<!-- :command="[scope.row, '收藏']"-->
<!-- v-btn-permission="'f9745194958bc9ed3ee5127459795dbc'"-->
<!-- >-->
<!-- 收藏-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item-->
<!-- v-else-->
<!-- :command="[scope.row, '取消收藏']"-->
<!-- v-btn-permission="'47e155667f521467ed941c89d118e770'"-->
<!-- >-->
<!-- 取消收藏-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">-->
<!-- 编辑-->
<!-- </el-dropdown-item>-->
<!-- &lt;!&ndash; <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>&ndash;&gt;-->
<!-- <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'b299fa5edb3f3f35badb2adb6bda9f2e'">-->
<!-- 删除-->
<!-- </el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
</el-dropdown>
</div> </div>
</div> </div>
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+3 -1
View File
@@ -78,7 +78,7 @@
label="章节编号" label="章节编号"
sortable sortable
align="center" align="center"
width="180"> width="120">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="content" prop="content"
@@ -108,11 +108,13 @@
prop="deptName" prop="deptName"
align="center" align="center"
label="提出部门" label="提出部门"
width="170"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userName" prop="userName"
align="center" align="center"
width="10 0"
label="提出人" label="提出人"
> >
</el-table-column> </el-table-column>