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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-01-17 10:47:49 +08:00
parent 3c6f09846e f9d586b51e
commit 04d0587d27
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+1 -1
View File
@@ -659,7 +659,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-show="form.standInData === '1'" label="体系类别" class="add-form-item form-item-disabled"> <el-form-item v-show="form.standInData === '0'" label="体系类别" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.txlb" placeholder="请选择体系类别" multiple> <el-select :popper-append-to-body="false" v-model="form.txlb" placeholder="请选择体系类别" multiple>
<el-option <el-option
v-for="item in txlbOptions" v-for="item in txlbOptions"
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+1 -1
View File
@@ -848,7 +848,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple> <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
<el-option <el-option
v-for="item in txlbOptions" v-for="item in txlbOptions"
src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
+1 -1
View File
@@ -344,7 +344,7 @@
<div class="prc-content-border" v-show="verifySarStandard"> <div class="prc-content-border" v-show="verifySarStandard">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled"> <el-form-item label="代替企标编号" v-show="fbNode" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.DTQBBHBUSS" v-model="form.DTQBBHBUSS"
placeholder="请输入代替标准号" placeholder="请输入代替标准号"
src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue
+6 -6
View File
@@ -231,12 +231,12 @@
<div class="prc-content-border" v-show="verifySarStandard"> <div class="prc-content-border" v-show="verifySarStandard">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled"> <!-- <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">-->
<el-input <!-- <el-input-->
v-model="form.DTQBBHBUSS" :disabled="disabledState" <!-- v-model="form.DTQBBHBUSS" :disabled="disabledState"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled"> <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.CYBZ" :disabled="disabledState" v-model="form.CYBZ" :disabled="disabledState"
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+14 -14
View File
@@ -331,20 +331,20 @@
<div class="prc-content-border" v-show="verifySarStandard"> <div class="prc-content-border" v-show="verifySarStandard">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled"> <!-- <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">-->
<el-input <!-- <el-input-->
v-model="form.DTQBBHBUSS" <!-- v-model="form.DTQBBHBUSS"-->
placeholder="请输入代替标准号" <!-- placeholder="请输入代替标准号"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
class="common-button-primary" <!-- class="common-button-primary"-->
size="mini" <!-- size="mini"-->
style="position:absolute;top: 10px;right: 0;" <!-- style="position:absolute;top: 10px;right: 0;"-->
@click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'" <!-- @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"-->
>{{'手动查找'}}</el-button> <!-- >{{'手动查找'}}</el-button>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled