diff --git a/src/components/CustomFormComponents/DatePickerGroup.vue b/src/components/CustomFormComponents/DatePickerGroup.vue
index 3cb38c8ea..311db7d4f 100644
--- a/src/components/CustomFormComponents/DatePickerGroup.vue
+++ b/src/components/CustomFormComponents/DatePickerGroup.vue
@@ -87,7 +87,7 @@ export default {
},
labelWidth: {
type: String,
- default: '150px'
+ default: '210px'
}
},
components: {},
diff --git a/src/components/treeSelect/treeSelectStand.vue b/src/components/treeSelect/treeSelectStand.vue
new file mode 100644
index 000000000..0e5e9db88
--- /dev/null
+++ b/src/components/treeSelect/treeSelectStand.vue
@@ -0,0 +1,308 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 445310332..4748b0395 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -160,19 +160,31 @@
clearable
>
-
+
+
+
+
+
+
@@ -566,33 +578,6 @@
v-model="form['nylx']"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ '手动查找' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1179,38 +1164,6 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
>
-
1) {
@@ -2307,6 +2266,34 @@ export default {
}, e => {
})
},
+
+ /** 归档位置树结构查询 */
+ getListTree(bringData) {
+ this.$http.get('sarResource/ts-resource/getListStand', {
+ sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND',
+ userId: this.$store.getters.userInfo.userId
+ }, {}, res => {
+ if (res.ok) {
+ this.treeListOptions = res.data
+ this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', {
+ standId: bringData.id,
+ }, {}, reson => {
+ if (reson.ok) {
+ let treeList = ''
+ reson.data.forEach(item=>{
+ this.treeCheckedKeys.push(item.menuId)
+ if (item.menuId.length > 0) {
+ treeList += ','
+ }
+ treeList = item.menuName
+ this.treeListName = treeList
+ })
+ }
+ })
+ this.form.treeListId = this.treeCheckedKeys.join(',')
+ }
+ })
+ },
handleStandardPageChange(page) {
this.standardSearchForm.page = page
this.handleSearchStandard()
@@ -2464,6 +2451,13 @@ export default {
this.urlChild = "sarModelTree/childByList"
this.key3++
},
+
+ choiceTree(type, title, id) {
+ this.drawerTitle = title
+ this.getListTree(this.form)
+ this.modalShowTree = true
+ this.key++
+ },
getTree() {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res => {
@@ -2925,6 +2919,23 @@ export default {
popoverHideCancel() {
this.modalShowFlag1 = false
},
+
+ treeHide(checkedIds, checkedData) {
+ if (checkedData) {
+ if (checkedData.length > 0 && checkedData.length != 0) {
+ this.form.treeListName = checkedData.map(item => item.menuName).join(",")
+ this.form.treeListId = checkedData.map(item => item.id).join(",")
+ } else {
+ this.form.treeListName = checkedData.menuName
+ this.form.treeListId = checkedData.id
+ }
+ this.modalShowTree = false
+ }
+
+ },
+ treeHideCancel() {
+ this.modalShowTree = false
+ },
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0 && checkedData.length != 0) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 86a37b849..7f1d4843d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -143,6 +143,20 @@
clearable
>
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 9c77d2db4..e1da8dbe3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -142,6 +142,20 @@
clearable
>
+
+
+
+
+
+
+
@@ -158,7 +172,6 @@
:disabled="true"
>
+
+
+
+
+
+
+
+
@@ -1452,10 +1477,11 @@ import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
-
+import TreeSelectStand from "@/components/treeSelect/treeSelectStand";
export default {
name: "bzrkStep4",
components: {
+ TreeSelectStand,
CusTomDataPickerGroup,
TreeSelectModule,
ProcessHeader,
@@ -1520,10 +1546,13 @@ export default {
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
+ treeCheckedKeys: [],
+ treeListOptions: [],
modalShowFlag1: false, // drawer开关
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
+ modalShowTree: false, // 归档位置drawer开关
url: '',
urlChild: '',
drawerTitle: '', //drawer标题
@@ -1610,6 +1639,8 @@ export default {
standSystem: '',// 标准体系
standSystemName: '',// 标准体系
gxhbq: '', // 标签
+ treeListName: '',
+ treeListId: '',
// 实施日期
ssrq: '', // 实施日期(标准文本)
xcxssrq: '', // 新车型实施日期(标准文本)
@@ -1884,6 +1915,12 @@ export default {
this.key3++
},
+ choiceTree(type, title, id) {
+ this.drawerTitle = title
+ this.getListTree(this.form)
+ this.modalShowTree = true
+ this.key++
+ },
busVsFunc() {
this.$http.get('sarVppsTree/list', '', {
_this: this
@@ -2370,6 +2407,22 @@ export default {
popoverHideCancel() {
this.modalShowFlag1 = false
},
+ treeHide(checkedIds, checkedData) {
+ if (checkedData) {
+ if (checkedData.length > 0 && checkedData.length != 0) {
+ this.form.treeListName = checkedData.map(item => item.menuName).join(",")
+ this.form.treeListId = checkedData.map(item => item.id).join(",")
+ } else {
+ this.form.treeListName = checkedData.menuName
+ this.form.treeListId = checkedData.id
+ }
+ this.modalShowTree = false
+ }
+
+ },
+ treeHideCancel() {
+ this.modalShowTree = false
+ },
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0 && checkedData.length != 0) {
@@ -2462,6 +2515,7 @@ export default {
this.defaultCheckedKeys1 = [this.form.cycvppsbm];
this.defaultCheckedKeys2 = [this.form.kccvppsbm];
this.defaultCheckedKeys3 = [this.form.dybxh];
+ this.treeCheckedKeys = this.form.treeListId.split(',')
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
this.form.prcNum = this.prcNum
@@ -2538,6 +2592,17 @@ export default {
}, e => {
})
},
+ /** 归档位置树结构查询 */
+ getListTree(bringData) {
+ this.$http.get('sarResource/ts-resource/getListStand', {
+ sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND',
+ userId: this.$store.getters.userInfo.userId
+ }, {}, res => {
+ if (res.ok) {
+ this.treeListOptions = res.data
+ }
+ })
+ },
closeDrawer() {
this.ListModel = false
},