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-11-21 14:34:44 +08:00
parent 86c450ba6c 1c0d4ff567
commit 4c771bd044
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+20 -18
View File
@@ -61,17 +61,14 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled"> <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态"> <el-input
<el-option v-model="form.standEnName"
v-for="item in standStateOptions" placeholder="请输入标准英文名称"
placeholder="请选择" clearable
:key="item.value" ></el-input>
:value="item.value" </el-form-item>
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="verifySarStandard" label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled"> <el-form-item v-if="verifySarStandard" label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="form.issueTime" v-model="form.issueTime"
@@ -114,13 +111,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName"
placeholder="请输入标准英文名称"
clearable
></el-input>
</el-form-item>
<el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px"> <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
<el-button <el-button
@@ -149,6 +140,17 @@
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new> :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
</el-form-item> </el-form-item>
<el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
<el-option
v-for="item in standStateOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="verifySarStandard && form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled"> <el-form-item v-if="verifySarStandard && form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.gxhbq" v-model="form.gxhbq"