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 
Develop

See merge request LAWS/laws-system-front-FOTON!299
This commit is contained in:
王夏晖
2022-01-19 15:26:57 +08:00
parent 07dded1314 1545e16795
commit d24d66c58d
2 changed files with 1295 additions and 1196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+69 -44
View File
@@ -644,7 +644,7 @@
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module> :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>
</el-form-item> </el-form-item>
<el-form-item v-show="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled"> <el-form-item v-show="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门"> <el-select :popper-append-to-body="false" filterable v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option> <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@@ -680,17 +680,17 @@
v-model="form['sycpx']" v-model="form['sycpx']"
></custom-select-array> ></custom-select-array>
</template> </template>
<!-- <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
<!-- <el-select :popper-append-to-body="false" v-model="form.sycpx" placeholder="请选择适用产品线" multiple>--> <el-select :popper-append-to-body="false" v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
<!-- <el-option--> <el-option
<!-- v-for="item in sycpxOptions"--> v-for="item in sycpxOptions"
<!-- placeholder="请选择"--> placeholder="请选择"
<!-- :key="item.value"--> :key="item.value"
<!-- :value="item.value"--> :value="item.value"
<!-- :label="item.label"--> :label="item.label"
<!-- ></el-option>--> ></el-option>
<!-- </el-select>--> </el-select>
<!-- </el-form-item>--> </el-form-item>-->
<!--适用认证--> <!--适用认证-->
<template> <template>
<custom-select-array <custom-select-array
@@ -699,38 +699,45 @@
v-model="form['syrz']" v-model="form['syrz']"
></custom-select-array> ></custom-select-array>
</template> </template>
<!-- <el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
<!-- <el-select :popper-append-to-body="false" v-model="form.syrz" placeholder="请选择适用认证" multiple>--> <el-select :popper-append-to-body="false" v-model="form.syrz" placeholder="请选择适用认证" multiple>
<!-- <el-option--> <el-option
<!-- v-for="item in applyAuthOptions"--> v-for="item in applyAuthOptions"
<!-- placeholder="请选择"--> placeholder="请选择"
<!-- :key="item.value"--> :key="item.value"
<!-- :value="item.value"--> :value="item.value"
<!-- :label="item.label"--> :label="item.label"
<!-- ></el-option>--> ></el-option>
<!-- </el-select>--> </el-select>
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">--> <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<!-- <el-select :popper-append-to-body="false" v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>--> <el-select :popper-append-to-body="false" v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
<!-- <el-option--> <el-option
<!-- v-for="item in zrgcsOptions"--> v-for="item in zrgcsOptions"
<!-- placeholder="请选择"--> placeholder="请选择"
<!-- :key="item.value"--> :key="item.value"
<!-- :value="item.value"--> :value="item.value"
<!-- :label="item.label"--> :label="item.label"
<!-- ></el-option>--> ></el-option>
<!-- </el-select>--> </el-select>
<!-- </el-form-item>--> </el-form-item>
<!--责任工程师--> 责任工程师
<!-- <template>--> <template>
<!-- <custom-select-array--> <custom-select-array
<!-- :key="zrgcsOptions.options"--> :key="zrgcsOptions.options"
<!-- :config="zrgcsOptions"--> :config="zrgcsOptions"
<!-- v-model="form['zrgcs']"--> v-model="form['zrgcs']"
<!-- ></custom-select-array>--> ></custom-select-array>
<!-- </template>--> </template>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input <el-input
v-if="form.cycvppsbm === ''"
v-model="form.cycvppscn = ''"
disabled
clearable
></el-input>
<el-input
v-else
v-model="form.cycvppscn" v-model="form.cycvppscn"
disabled disabled
clearable clearable
@@ -738,6 +745,13 @@
</el-form-item> </el-form-item>
<el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" class="add-form-item form-item-disabled">
<el-input <el-input
v-if="form.kccvppscn === ''"
v-model="form.kccvppscn = ''"
disabled
clearable
></el-input>
<el-input
v-else
v-model="form.kccvppscn" v-model="form.kccvppscn"
disabled disabled
clearable clearable
@@ -745,6 +759,13 @@
</el-form-item> </el-form-item>
<el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled"> <el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
<el-input <el-input
v-if="form.dybxh === ''"
v-model="form.dymc = ''"
disabled
clearable
></el-input>
<el-input
v-else
v-model="form.dymc" v-model="form.dymc"
disabled disabled
clearable clearable
@@ -1213,7 +1234,7 @@
</el-select> </el-select>
</el-formItem> </el-formItem>
<el-form-item label="标准类别" prop="standSort" class="search-item"> <el-form-item label="标准类别" prop="standSort" class="search-item">
<el-select :popper-append-to-body="false" v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable> <el-select :popper-append-to-body="false" filterable v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable>
<el-option <el-option
v-for="item in standSortOptions" v-for="item in standSortOptions"
:key="item.value" :key="item.value"
@@ -2600,7 +2621,11 @@ export default {
this.quoteIdList1 = [] this.quoteIdList1 = []
this.replaceLawsNumForm.quoteIdList = '' this.replaceLawsNumForm.quoteIdList = ''
} }
this.replaceLawsNumForm.standType = 'FOREIGN' // this.form.standInData === '1' ? 'FOREIGN' : 'INLAND' if(this.replaceLawType === 'cbbh') {
this.replaceLawsNumForm.standType = 'FOREIGN'
} else {
this.replaceLawsNumForm.standType = '' // this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
}
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, { this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
_this: this, _this: this,
loading: 'replaceLoading' loading: 'replaceLoading'
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+1226 -1152
View File
File diff suppressed because it is too large Load Diff