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:
zqx0221
2021-07-27 17:04:40 +08:00
parent 734d45821c eb907967f0
commit 22825dacec
5 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+21 -6
View File
@@ -554,11 +554,9 @@
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input
v-model="form.gkdw"
placeholder="请输入归口管理部门"
clearable
></el-input>
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
@@ -963,7 +961,13 @@
:visible.sync="modalShowFlag"
:wrapperClosable="false"
size="800px">
<el-input
style="width:70%;padding: 10px"
placeholder="请输入姓名"
v-model="filterText">
</el-input>
<el-tree
:filter-node-method="filterNode"
v-if="modalShowFlag"
node-key="id"
style="height: 100%; overflow: auto;"
@@ -1158,6 +1162,7 @@
},
data () {
return {
filterText:'',
textStatusMap: {}, // 文本状态id与name对应
standardDrawer: false,
loadSarStandard: false,
@@ -1391,6 +1396,7 @@
modelOptions: [], // 模块体系架构
modelChildOptions: [], // 模块体系架构子集合
applyArcticOptions: [], // 适用车型
gkglbmOptions: [], // 归口管理部门
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
@@ -1405,6 +1411,9 @@
}
},
watch:{
filterText(val) {
this.$refs.tree.filter(val);
},
'form.standInData': {
handler: function() {
this.verifySarStandard = false
@@ -1458,6 +1467,11 @@
},
},
methods: {
// z责任人会签姓名搜索
filterNode(value, data) {
if (!value) return true;
return data.name.indexOf(value) !== -1;
},
getTaskId () {
queryTaskFirst({
bpnId: this.$route.query.bpnId
@@ -2175,7 +2189,8 @@
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.qcdwOption = res.data.QCDW // 体系类别
this.setMap(this.standStateOptions)
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.setMap(this.standStateOptions)
})
this.busVsFunc()
this.modelFunc()
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+7 -8
View File
@@ -328,14 +328,11 @@
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxh" disabled></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.gkdw"
placeholder="请输入归口管理部门"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="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-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
<el-option
@@ -821,6 +818,7 @@
standStateOptions: [], // 文本状态
standSystemOptions: [], // 标准体系
applyArcticOptions: [], // 适用车型
gkglbmOptions: [], // 归口管理部门
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
@@ -1070,6 +1068,7 @@
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.key++
})
this.busVsFunc()
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+5 -6
View File
@@ -322,12 +322,9 @@
<el-input v-model="form.dybxh" disabled></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.gkdw"
placeholder="请输入归口管理部门"
clearable
></el-input>
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
@@ -795,6 +792,7 @@ export default {
standStateOptions: [], // 文本状态
standSystemOptions: [], // 标准体系
applyArcticOptions: [], // 适用车型
gkglbmOptions: [], // 归口管理部门
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
@@ -1054,6 +1052,7 @@ export default {
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.key++
})
this.busVsFunc()
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+5 -5
View File
@@ -534,11 +534,9 @@
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input
v-model="form.gkdw"
placeholder="请输入归口管理部门"
clearable
></el-input>
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
@@ -1225,6 +1223,7 @@ export default {
modelOptions: [], // 模块体系架构
applyArcticOptions: [], // 适用车型
categoryOptions: [], // 能源类型
gkglbmOptions: [], // 归口管理部门
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
wssmrOptions: [], // 我司署名人
@@ -1750,6 +1749,7 @@ export default {
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.treeStatus = true
this.key++
})
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+7 -8
View File
@@ -344,14 +344,11 @@
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.gkdw"
placeholder="请输入归口管理部门"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="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-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
<el-option
@@ -784,6 +781,7 @@
standSystemOptions: [], // 标准体系
applyArcticOptions: [], // 适用车型
categoryOptions: [], // 能源类型
gkglbmOptions: [], // 归口管理部门
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
sycpxOptions: [], // 适用产品线
@@ -978,6 +976,7 @@
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.qcdwOption = res.data.QCDW // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
})
}
}