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:
super_liu
2022-02-24 10:20:21 +08:00
parent 85e3ae1244 9c588ad7ea
commit 735695b24c
6 changed files with 270 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/treeSelect/treeSelectNew.vue
+1
View File
@@ -10,6 +10,7 @@
> >
<el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps" <el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
:load="loadNode" :load="loadNode"
v-if="modalShowFlag"
:lazy="lazy" :lazy="lazy"
:show-checkbox="multiple" :show-checkbox="multiple"
:node-key="nodeKey" :node-key="nodeKey"
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+41 -1
View File
@@ -48,7 +48,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled"> <el-form-item v-if="verifySarStandard" label="标准年份" prop="" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.standYear" v-model="form.standYear"
placeholder="请输入标准标准年份" placeholder="请输入标准标准年份"
@@ -56,11 +56,19 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input <el-input
v-model="form.standName" v-model="form.standName"
placeholder="请输入标准中文名称" placeholder="请输入标准中文名称"
clearable clearable
></el-input> ></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled"> <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input <el-input
@@ -833,11 +841,19 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled"> <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
<el-input <el-input
v-model="form.dtbjh" v-model="form.dtbjh"
placeholder="请输入代替标准号" placeholder="请输入代替标准号"
clearable clearable
></el-input> ></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.dtbjh"
placeholder="请输入代替标准号"
clearable
></el-input>
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@@ -893,11 +909,19 @@
v-model="form.bfdtbzh" v-model="form.bfdtbzh"
placeholder="请输入部分代替标准号" placeholder="请输入部分代替标准号"
></el-input> ></el-input>
<el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
<el-input <el-input
v-model="form.bfbdtbzh" v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号" placeholder="请输入部分代替标准号"
clearable clearable
></el-input> ></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@@ -908,11 +932,19 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item v-show="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled"> <el-form-item v-show="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
<el-input <el-input
v-model="form.cbbh" v-model="form.cbbh"
placeholder="请输入采标编号" placeholder="请输入采标编号"
clearable clearable
></el-input> ></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.cbbh"
placeholder="请输入采标编号"
clearable
></el-input>
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@@ -923,11 +955,19 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled"> <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
<el-input <el-input
v-model="form.yybj" v-model="form.yybj"
placeholder="请输入引用标准" placeholder="请输入引用标准"
clearable clearable
></el-input> ></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.yybj"
placeholder="请输入引用标准"
clearable
></el-input>
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+40 -4
View File
@@ -64,7 +64,15 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input <el-input
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled disabled
v-model="form.standName" v-model="form.standName"
placeholder="请输入标准中文名称" placeholder="请输入标准中文名称"
@@ -547,8 +555,15 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled"> <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
<el-input <el-input
disabled v-model="form.dtbjh"
placeholder="请输入代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.dtbjh" v-model="form.dtbjh"
placeholder="请输入代替标准号" placeholder="请输入代替标准号"
clearable clearable
@@ -570,24 +585,45 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled"> <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
<el-input <el-input
disabled v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.bfbdtbzh" v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号" placeholder="请输入部分代替标准号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
<el-input <el-input
disabled v-model="form.cbbh"
placeholder="请输入采标编号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.cbbh" v-model="form.cbbh"
placeholder="请输入采标编号" placeholder="请输入采标编号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled"> <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
<el-input <el-input
disabled v-model="form.yybj"
placeholder="请输入引用标准"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.yybj" v-model="form.yybj"
placeholder="请输入引用标准" placeholder="请输入引用标准"
clearable clearable
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+40 -4
View File
@@ -64,7 +64,15 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input <el-input
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled disabled
v-model="form.standName" v-model="form.standName"
placeholder="请输入标准中文名称" placeholder="请输入标准中文名称"
@@ -499,8 +507,15 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled"> <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
<el-input <el-input
disabled v-model="form.dtbjh"
placeholder="请输入代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.dtbjh" v-model="form.dtbjh"
placeholder="请输入代替标准号" placeholder="请输入代替标准号"
clearable clearable
@@ -530,24 +545,45 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled"> <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
<el-input <el-input
disabled v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.bfbdtbzh" v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号" placeholder="请输入部分代替标准号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
<el-input <el-input
disabled v-model="form.cbbh"
placeholder="请输入采标编号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.cbbh" v-model="form.cbbh"
placeholder="请输入采标编号" placeholder="请输入采标编号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled"> <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
<el-input <el-input
disabled v-model="form.yybj"
placeholder="请输入引用标准"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.yybj" v-model="form.yybj"
placeholder="请输入引用标准" placeholder="请输入引用标准"
clearable clearable
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+46 -2
View File
@@ -42,8 +42,6 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled"> <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" filterable placeholder="请选择标准类别"> <el-select v-model="form.standSort" filterable placeholder="请选择标准类别">
<el-option <el-option
@@ -63,11 +61,20 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input <el-input
v-model="form.standName" v-model="form.standName"
placeholder="请输入标准中文名称" placeholder="请输入标准中文名称"
clearable clearable
></el-input> ></el-input>
</el-tooltip>
<el-input
v-else
disabled
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled"> <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input <el-input
@@ -1070,11 +1077,19 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled"> <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
<el-input <el-input
v-model="form.dtbjh" v-model="form.dtbjh"
placeholder="请输入代替标准号" placeholder="请输入代替标准号"
clearable clearable
></el-input> ></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.dtbjh"
placeholder="请输入代替标准号"
clearable
></el-input>
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@@ -1125,6 +1140,19 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled"> <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-input <el-input
style="display:none;"
v-model="form.bfdtbzh"
placeholder="请输入部分代替标准号"
></el-input>
<el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
<el-input
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.bfbdtbzh" v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号" placeholder="请输入部分代替标准号"
clearable clearable
@@ -1139,11 +1167,19 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
<el-input <el-input
v-model="form.cbbh" v-model="form.cbbh"
placeholder="请输入采标编号" placeholder="请输入采标编号"
clearable clearable
></el-input> ></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.cbbh"
placeholder="请输入采标编号"
clearable
></el-input>
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@@ -1154,11 +1190,19 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled"> <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
<el-input <el-input
v-model="form.yybj" v-model="form.yybj"
placeholder="请输入引用标准" placeholder="请输入引用标准"
clearable clearable
></el-input> ></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.yybj"
placeholder="请输入引用标准"
clearable
></el-input>
<el-button <el-button
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+40 -6
View File
@@ -49,7 +49,15 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input <el-input
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled disabled
v-model="form.standName" v-model="form.standName"
placeholder="请输入标准中文名称" placeholder="请输入标准中文名称"
@@ -457,8 +465,15 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled"> <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
<el-input <el-input
disabled v-model="form.dtbjh"
placeholder="请输入代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.dtbjh" v-model="form.dtbjh"
placeholder="请输入代替标准号" placeholder="请输入代替标准号"
clearable clearable
@@ -489,31 +504,50 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled"> <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
<el-input <el-input
disabled v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.bfbdtbzh" v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号" placeholder="请输入部分代替标准号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
<el-input <el-input
disabled v-model="form.cbbh"
placeholder="请输入采标编号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.cbbh" v-model="form.cbbh"
placeholder="请输入采标编号" placeholder="请输入采标编号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled"> <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
<el-input <el-input
disabled v-model="form.yybj"
placeholder="请输入引用标准"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.yybj" v-model="form.yybj"
placeholder="请输入引用标准" placeholder="请输入引用标准"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<!-- <el-input--> <!-- <el-input-->
<!-- disabled--> <!-- disabled-->