diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 55f15899b..b936728b9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -3,7 +3,7 @@
标准入库流程
- 申请人发起流程
+ 经理人审批
@@ -167,7 +167,7 @@ export default {
methods: {
handleCommand (command) {
switch (command[1]) {
- case '办理':
+ case '查看':
this.dealWith(command[0])
break
}
@@ -179,6 +179,23 @@ export default {
this.queryProcess()
},
queryProcess () { // 查询待办流程
+ this.$http.postData('lawss/activiti/allProcess',
+ {
+ current: this.pageNo,
+ size: this.$store.getters.userInfo.configContent,
+ userId: this.$store.getters.userInfo.userId,
+ prcName: this.searchForm.prcName,
+ prcType: parseInt(this.searchForm.prcType) || '',
+ prcNum: this.searchForm.prcNum
+ },
+ {
+ loading: 'loading',
+ _this: this
+ }, res => {
+ this.processList = res.list || []
+ this.total = res.count
+ }, e => {
+ })
},
selectProcessBtn () { // 搜索按钮
this.pageNo = 1
@@ -195,6 +212,13 @@ export default {
this.queryProcess()
},
dealWith (row) { // 办理
+ this.$router.push({
+ name: 'ProcessDetail',
+ query: {
+ prcNum: row.prcNum,
+ tabsName: 'MonitorProcess'
+ }
+ })
},
...mapMutations(['setProcess', 'setHandleInfo']),
...mapActions(['setMenu'])
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index e9a545f17..f55bc97d9 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -199,7 +199,6 @@ export default {
}, e => {
})
},
-
selectProcessBtn () { // 搜索按钮
this.pageNo = 1
this.queryProcess()
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 42fbdb731..a666b610f 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -179,6 +179,20 @@ export default {
this.queryProcess()
},
queryProcess () { // 查询待办流程
+ this.$http.postData('lawss/activiti/queryTaskDraft', {
+ current: this.pageNo,
+ size: parseInt(this.$store.getters.userInfo.configContent),
+ userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
+ prcName: this.searchForm.prcName,
+ prcType: parseInt(this.searchForm.prcType) || ''
+ },
+ {
+ loading: 'loading',
+ _this: this
+ }, res => {
+ this.processList = res.list
+ this.total = res.count
+ })
},
selectProcessBtn () { // 搜索按钮
this.pageNo = 1
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 7120ae3a5..bcf09c84c 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -71,7 +71,18 @@
+
+
+
+
+
+
+
+
+
+
+
-
- {{ scope.row.productName }}
-
+
+
+
- {{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}
+
- {{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}
+
- {{(scope.row.leftRight === '1' ? '左驾': '右驾')}}
+
@@ -234,6 +245,9 @@ export default {
},
data () {
return {
+ //默认返回已维护
+ ifMaintaince:"Maintenance",
+
deptUser: [],
// 查询条件
localProTableSearch: {
@@ -710,7 +724,7 @@ export default {
},
// 切换tabs
handleClick (tab, event) {
- this.localProEO.prodectCode = this.activeName
+ this.localProEO.prodectCode = this.ifMaintaince
this.insideHandleClick()
},
insideHandleClick (tab, event) {
@@ -1077,13 +1091,15 @@ export default {
},
// 查询本地产品
getLocalProductTable () {
- this.localProTableSearch.prodectCode = this.activeName
+ this.localProTableSearch.prodectCode = this.ifMaintaince
+ console.log(this.localProTableSearch.prodectCode)
this.localProTableSearch.dataType = this.insideTabsActiveName
this.SarExportSearchEo = this.localProTableSearch
- this.$http.get('lawss/sarProductInfo/getProductInfoPage', this.localProTableSearch, {
+ this.$http.get('sarStandProjectLibrary/queryProject', this.localProTableSearch, {
_this: this, loading: 'loading'
}, res => {
- this.localProTableList = res.data.list
+ console.log(res.data)
+ this.localProTableList = res.data.Maintenance.records
this.total = res.data.count
// this.localProTableList.map((item) => {
// this.xmztOptions.map((opr) => {