diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 6b191d902..1ae32f44e 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -621,16 +621,22 @@
数据加载中...
+
-
-
+
+
+
+
+
+
+
+
+
+
@@ -1243,6 +1249,8 @@ export default {
knowType: '',
KnowTitle: '',
knowIdList: '',
+ total7: 0,
+ page7: 1,
addForm: {
title: '',
content: '',
@@ -1759,6 +1767,15 @@ export default {
this.knowId = ''
this.AddKnowledgDialog = false
},
+ //查看分解单分页
+ pageChange7(page) {
+ this.page7 = page
+ this.selectSarStandItems()
+ },
+ pageSizeChange7(pageSize){
+ this.pageSize7 = pageSize
+ this.selectSarStandItems()
+ },
// 知识点分页
pageChange1(page) {
this.pageNo = page
@@ -2317,12 +2334,9 @@ export default {
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => {
this.selectedItemList = []
if (res.ok) {
- this.standItemList = res.data.list;
- console.log("standItemList");
- console.log(this.standItemList);
- console.log("res.data");
+ this.standItemList = res.data;
console.log(res.data);
- this.standitemTotal = res.data.count // 分页需要
+ this.total7 = res.data.length // 分页需要
}
}, e => {
})
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index dce75e757..e095c2f12 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -31,7 +31,7 @@
- {{ scope.row.standId }}
+ {{ scope.row.standSerialNumber }}
@@ -148,7 +148,7 @@
@@ -210,9 +210,9 @@
@selection-change="selectedChange"
>
-
+
- {{ scope.row.standId }}
+ {{ scope.row.standSerialNumber }}
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index b52339f31..7337160b7 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -97,9 +97,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
-
+
- {{ scope.row.standId }}
+ {{ scope.row.standSerialNumber }}
@@ -248,6 +248,7 @@ export default {
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
nonSearch: {
+ standSerialNumber: '',
standId: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
@@ -457,7 +458,7 @@ export default {
this.modalshowflag = false
},
//查询按钮
- getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+ /*getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
this.realList = this.dataList.filter(item => {
let matchId = true; // 标准号 筛选
let matchName = true; // 项目名称 筛选
@@ -479,7 +480,7 @@ export default {
return matchId && matchName && matchUnit;
})
this.dataList = this.realList
- },
+ },*/
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
@@ -496,6 +497,7 @@ export default {
clearAllSearch () {
this.nonSearch = {
standId: '',
+ standSerialNumber: '',
productName: '',
responsibleUnit: ''
}
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index 039a1e43d..0ee390f14 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -99,9 +99,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
-
+
- {{ scope.row.standId }}
+ {{ scope.row.standSerialNumber }}
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index ffb4d7f5c..9dacab355 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -87,9 +87,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
-
+
- {{ scope.row.standId }}
+ {{ scope.row.standSerialNumber }}
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index b952313b3..6ac35d94c 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -87,9 +87,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
-
+
- {{ scope.row.standId }}
+ {{ scope.row.standSerialNumber }}
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index ff73ee5f0..3be6e759d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -95,21 +95,21 @@
label="条款名称">
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
- {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
- {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
- {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
{
@@ -373,7 +376,6 @@ export default {
this.listForm = item.form;
this.dataList = item.form.dataList;
}
-
});
},
//保存事件
@@ -400,6 +402,7 @@ export default {
this.isSubmit = true;
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
+ console.log(json);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 90ede1ec5..f5de1e3ca 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -96,12 +96,12 @@
label="条款名称">
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
- {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
- {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
- {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
- {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}