@@ -542,16 +542,17 @@
+ 搜索
@@ -594,11 +595,11 @@
{{ scope.row.lawsName }}
-
-
-
-
-
+
@@ -931,7 +932,7 @@ export default {
_this: this
}, res => {
this.addSpiltStandList = res.data.list
- this.addFileStandtotal = res.data.count
+ this.addFileStandtotal = res.data.list.length
this.loadData = false
}, e => {
this.loadData = false
@@ -1359,10 +1360,7 @@ export default {
name: 'ItemSplitInfo',
query: {
infoId: row.id,
- // standNumSplit: row.standNumSplit === null ? row.showNumber : row.standNumSplit,
- // standNameSplit: row.standNameSplit === null ? row.standName : row.standNameSplit,
result: row.result,
- // fileType: row.fileType
}
})
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index a3b48f73e..10019cd87 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -577,6 +577,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 清空
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 标准/政策法规工程师
-
-
- 责任人
-
-
-
-
-
- 标准/政策法规工程师
-
-
- 业务经理
-
-
- {{ 11 || '暂无数据' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
+ this.selectList.map(item => {
+ let index;
+ index = this.dataList.findIndex(items => {
+ return items.productLine = item
+ })
+ if (index > -1) {
+ this.dataList.splice(index, 1);
+ }
+ });
+ this.selectList = [];
+ }).catch(() => {
+ })
+ }
+ },
//取消添加事件
cancelStand() {
this.standModel = false;
@@ -590,6 +660,7 @@ export default {
}, {
_this: this
}, res => {
+ console.log(res.data);
this.listForm.breakdownList = res.data;
this.ListModel = false;
}, e => {
@@ -609,7 +680,7 @@ export default {
selectStandChange(data) {
this.selectList = [];
for (let i = 0; i < data.length; i++) {
- this.selectList.push(data[i].id);
+ this.selectList.push(data[i].productLine);
}
},
//添加产品线select的改变
@@ -655,7 +726,7 @@ export default {
}, {
_this: this
}, res => {
- this.productData = res.data;
+ this.productData = res.data.records;
this.totalNo = res.data.total;
}, e => {
@@ -663,20 +734,24 @@ export default {
},
//获取标准数据
getStandData() {
- console.log(this.page);
- console.log(this.pageSize);
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
page: this.page,
pageSize: this.pageSize,
}, {
_this: this
}, res => {
- console.log(res.data);
this.sarAccessListDatas = res.data.list;
this.total = res.data.count;
}, e => {
});
- }
+ },
+ clearSearch() {
+ this.sarSarAccessEOSearch = {
+ standName: "",
+ standNumber: ""
+ };
+ this.getStandData();
+ },
},
computed: {},
mounted() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index d9e41a3e0..5d6473957 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -132,14 +132,12 @@
prop="name"
label="任务步骤"
align="center"
- sortable="custom"
>
-
+
{
if (valid) {
let rowlist = []
diff --git a/src/router/index.js b/src/router/index.js
index 4ab6e1b9d..8d295b2a8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -702,7 +702,7 @@ const routes = [
meta: {
requireAuth: false,
// parentPath: '/standAutoSplit',
- title: '标准分解单'
+ title: '拆分结果'
}
},
// 标准编号申领
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 192b22819..2f49323fa 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,7 +7,7 @@
// const devIp = '39.98.140.126'
// const devInterfacePORT = '10005'
// const devIp = '192.168.10.248'
-const devIp = '192.168.10.254'
+const devIp = '192.168.1.108'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'