- 比对
- 批量删除
+ 比对
+ 批量删除
@@ -120,8 +120,8 @@
- 查看
- 删除
+ 查看
+ 删除
- 上传
- 删除
@@ -106,13 +106,13 @@
- 获取文件
- 编辑
- 删除
+
+
+
+
+
+ placeholder="请选择"
+ filterable
+ >
+
+
+
标准/政策法规工程师
-
+
@@ -627,21 +641,21 @@ export default {
},
formRules: {
listType: [
- { required: true, message: "请选择清单类型", trigger: "blur" }
+ { required: true, message: "请选择清单类型", trigger: "change" }
],
listName: [
{ required: true, message: "请填写清单名称", trigger: "change" }
]
},
roleFormRules: {
- // dockUserName: [
- // { required: true, message: "请选择会签责任人", trigger: "blur" }
- // ],
+ dockUserName: [
+ { required: true, message: "请选择会签责任人", trigger: "change" }
+ ],
ministerUserName: [
- { required: true, message: "请选择修订责任人", trigger: "blur" }
+ { required: true, message: "请选择修订责任人", trigger: "change" }
],
directorUserName: [
- { required: true, message: "请选择审批责任人", trigger: "blur" }
+ { required: true, message: "请选择审批责任人", trigger: "change" }
]
},
dataList: [],//清单里的标准数据
@@ -842,7 +856,8 @@ export default {
},
//提交事件
handleSubmit() {
- let json = this.listForm;
+ // let json = this.listForm;
+ let json = Object.assign(this.listForm, this.roleForm)
json.zrUserId = this.$store.getters.userInfo.userId;
json.jlUserId = this.$store.getters.userInfo.userId;
// (如果是业务经理应该这样写 后续需要更改 例:json.jlUserId = this.roleForm.directorUser;)
@@ -958,7 +973,6 @@ export default {
res.data=[]
}
this.dataList = res.data;
- console.log(res.data);
this.listForm.dataList = res.data;
let formId = []
this.dataList.map(item => {
@@ -979,7 +993,6 @@ export default {
for (let i = 0; i < data.length; i++) {
this.selectedList.push(data[i].id);
}
- console.log(this.selectedList);
},
//标准表格选择框改变
selectStandChange(data) {
@@ -1024,18 +1037,18 @@ export default {
},
computed: {},
mounted() {
+ //从数据库中查询下拉框数据
+ this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+ _this: this
+ }, res => {
+ this.countryOptions = res.data.COUNTRY;
+ });
this.selectionList();
this.selectSign();
this.getTree();
for (let i = 0; i < this.dataList.length; i++) {
this.standMap.set(this.dataList[i].id, this.dataList[i]);
}
- //从数据查询下拉框数据
- this.$http.get("sys/dictype/getDicTypeListCode", "", {
- _this: this
- }, res => {
- this.countryOptions = res.data.COUNTRY;
- });
}
};
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index aa6cb8d76..852fb8bf4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -24,27 +24,16 @@
-
+
国内标准入库
海外标准入库
-
-
-
-
-
-
+
@@ -55,28 +44,51 @@
clearable
>
-
-
-
是
否
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
-
-
+
+
+ 根据类别、编号、中英文名称查询
+
-
+
是
否
-
+
-
+
-
+
实施日期
-
+
@@ -189,10 +197,10 @@
-
+
文本信息
-
+
@@ -223,7 +231,7 @@
-
+
-
+
适用范围
-
+
@@ -492,22 +500,25 @@
-
-
-
-
+
-
-
-
-
+
-
-
-
-
+
@@ -610,10 +621,10 @@
-
+
关联信息
-
+
@@ -762,7 +773,7 @@
-
+
取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
数据获取中
+
+
+
+
@@ -941,8 +1101,32 @@
name: "bzrkStep1",
data () {
return {
+ standardDrawer: false,
+ loadSarStandard: false,
+ verifySarStandard: false,
+ standardSearchForm: {
+ page: 1,
+ pageSize: this.$store.getters.userInfo.configContent,
+ total: 0,
+ standType: 'INLAND',
+ standSort: '',
+ standName: '',
+ standEnName: '',
+ standNumber: ''
+ },
+ tableData: {
+ // 标准表格数据
+ standardData: [],
+ // 任务分解单数据
+ taskTableData: []
+ },
+ tableHeight: {
+ standardTableHeight: null
+ },
+ selectedList: [],
+ standardCheckedList: [],
activeName:'1',
- roleRow: {},
+ roleRow: {},
commentText: '', // 意见
title: '', // 新增编辑抽屉标题
config: {
@@ -979,6 +1163,14 @@
children: 'children',
label: 'menuName'
},
+ defaultCodeProps: {
+ children: 'children',
+ label: 'code'
+ },
+ defaultModelProps: {
+ children: 'children',
+ label: 'model'
+ },
nodeList: [],
type: '',
defaultUserProps: {
@@ -1018,7 +1210,7 @@
zccssrqgj: '', // 在产车实施日期(国际)
// 文本信息
ca: '', // 草案
- fbgbjbd: '', // 发布稿
+ FBGBJBD: '', // 发布稿
xgd: '', // 修改单
bpg: '', // 报批稿
ssg: '', // 送审稿
@@ -1120,6 +1312,8 @@
standNatureOptions: [], // 标准性质
standStateOptions: [], // 文本状态
standSystemOptions: [], // 标准体系
+ busVppsOptions: [], // 车系体系架构
+ modelOptions: [], // 模块体系架构
applyArcticOptions: [], // 适用车型
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
@@ -1132,6 +1326,59 @@
ListForm: {}, // 新增数据
}
},
+ watch:{
+ 'form.standInData': {
+ handler: function() {
+ this.verifySarStandard = false
+ this.standardSearchForm.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+ },
+ },
+ 'standardSearchForm.standType': {
+ handler: function() {
+ this.form.standInData = this.standardSearchForm.standType === 'INLAND' ? '0' : '1'
+ },
+ },
+ 'form.standNumber': {
+ handler: function() {
+ this.standardSearchForm.standNumber = this.form.standNumber
+ },
+ },
+ 'standardSearchForm.standNumber': {
+ handler: function() {
+ this.form.standNumber = this.standardSearchForm.standNumber
+ },
+ },
+ 'form.standSort': {
+ handler: function() {
+ this.standardSearchForm.standSort = this.form.standSort
+ },
+ },
+ 'standardSearchForm.standSort': {
+ handler: function() {
+ this.form.standSort = this.standardSearchForm.standSort
+ },
+ },
+ 'form.standName': {
+ handler: function() {
+ this.standardSearchForm.standName = this.form.standName
+ },
+ },
+ 'standardSearchForm.standName': {
+ handler: function() {
+ this.form.standName = this.standardSearchForm.standName
+ },
+ },
+ 'form.standEnName': {
+ handler: function() {
+ this.standardSearchForm.standEnName = this.form.standEnName
+ },
+ },
+ 'standardSearchForm.standEnName': {
+ handler: function() {
+ this.form.standEnName = this.standardSearchForm.standEnName
+ },
+ },
+ },
components: {
ProcessHeader,
ProcessFooter,
@@ -1139,6 +1386,179 @@
TreeSelect
},
methods: {
+ clearFormData(data){
+ this.form = {
+ // 基础信息
+ textStatus: '', // 文本状态
+ standYear: '', // 标准年份
+ standInData: data.standInData ? data.standInData : '0', // 标准类型
+ standSort: data.standSort ? data.standSort : '', // 标准类别
+ standNumber: data.standNumber ? data.standNumber : '', // 标准编号
+ standNature: data.standNature ? data.standNature : '', // 标准性质
+ standEnName: data.standEnName ? data.standEnName : '', // 英文名称
+ standName: data.standName ? data.standName : '', // 中文名称
+ signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签
+ issueTime: '', // 发布时间
+ isRelateAccess: '', // 是否纳入认证清单
+ standSystem: '',// 标准体系
+ standSystemName: '',// 标准体系名称
+ gxhbq: '', // 标签
+ // 实施日期
+ ssrq: '', // 实施日期(标准文本)
+ xcxssrq: '', // 新车型实施日期(标准文本)
+ zccssrq: '', // 在产车实施日期(标准文本)
+ ssrqgj: '', // 实施日期(国际)
+ xcxssrqgj: '', // 新车型实施日期(国际)
+ zccssrqgj: '', // 在产车实施日期(国际)
+ // 文本信息
+ ca: '', // 草案
+ fbgbjbd: '', // 发布稿
+ xgd: '', // 修改单
+ bpg: '', // 报批稿
+ ssg: '', // 送审稿
+ zqyjg: '', // 征求意见稿
+ jdwj: '', // 解读文件
+ zbjbd: '', // 增补件
+ kwj: '', // 勘误件
+ caName: '', // 草案
+ fbgbjbdName: '', // 发布稿
+ xgdName: '', // 修改单
+ bpgName: '', // 报批稿
+ ssgName: '', // 送审稿
+ zqyjgName: '', // 征求意见稿
+ jdwjName: '', // 解读文件
+ zbjbdName: '', // 增补件
+ kwjName: '', // 勘误件
+ glwjName: '', // 关联文件
+ // 适用范围
+ txlb: '', // 体系类别
+ gkdw: '', // 归口管理部门
+ qcdw: '', // 起草单位
+ wssmr: '', // 我司署名人
+ cysd: '', // 我司参与深度
+ cllx: '', // 适用车型
+ nylx: '',// 能源类型
+ sycpx: '',// 适用产品线
+ syrz: '', // 适用认证
+ zrbm: '', // 责任部门
+ zrgcs: '', // 责任工程师
+ cycvppsbm: '', // 关联模块--乘用车VPPS编码
+ cycvppscn: '', // 关联模块--乘用车vpps中文名称
+ kccvppsbm: '', // 关联模块--卡车VPPS编码
+ kccvppscn: '', // 关联模块--卡车vpps中文名称
+ dybxh: '', // 模块结构单元变型号
+ dymc: '', // 模块结构单元名称
+ // 关联信息
+ dtbjh: '', // 代替标准号
+ cbbh: '', // 采标编号
+ cbcd: '', // 采标程度
+ yybj: '', // 引用标准
+ byybj: '', // 被引用标准
+ glwj: '', // 关联文件
+ xglc: '', // 相关流程
+ chjl: '', // 参会记录
+ } // 标准信息
+ },
+ handleProcessStandardNext(status) {
+ switch (status) {
+ // 新增
+ case 1:
+ this.selectedList = []
+ this.standardCheckedList = []
+ this.standardDrawer = false
+ this.verifySarStandard = true
+ this.clearFormData(this.form)
+ break
+ // 带入
+ case 2:
+ if (this.standardCheckedList.length === 1) {
+ const bringData = this.standardCheckedList[0]
+ bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
+ bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
+ console.log(bringData)
+ const json = Object.assign(bringData, bringData.attrInfoCaseMap);
+ this.form = JSON.parse(JSON.stringify(json))
+ this.defaultCheckedKeys = [this.form.standSystem];
+ this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+ this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
+ this.form.prcNum = this.prcNum
+ this.form.prcName = this.prcName
+ this.form['id'] = bringData.id
+ this.standardDrawer = false
+ this.verifySarStandard = true
+ } else if (this.standardCheckedList.length > 1) {
+ this.$message.warning('最多可以带入一条标准信息')
+ } else {
+ this.$message.warning('请选择要带入的标准信息')
+ }
+ break
+ // 取消
+ case 3:
+ this.selectedList = []
+ this.standardCheckedList = []
+ this.standardDrawer = false
+ break
+ }
+ },
+ handleStandardPageChange (page) {
+ this.standardSearchForm.page = page
+ this.handleSearchStandard()
+ },
+ handleStandardPageSizeChange (pageSize) {
+ this.standardSearchForm.pageSize = pageSize
+ this.handleSearchStandard()
+ },
+ standSelectChange (data) {
+ this.selectedList = []
+ for (let i = 0; i < data.length; i++) {
+ this.selectedList.push(data[i].id)
+ }
+ this.standardCheckedList = data
+ },
+ handleResetSearch() {
+ this.standardSearchForm.standType = 'INLAND'
+ this.standardSearchForm.standNumber = ''
+ this.standardSearchForm.standSort = ''
+ this.standardSearchForm.standName = ''
+ this.standardSearchForm.standEnName = ''
+ setTimeout(() => {
+ this.handleSearchStandard()
+ }, 100)
+ },
+ /**
+ * 关闭修订 Drawer 的监听
+ * @param done
+ */
+ handleReviseDrawerClose (done) {
+ done()
+ },
+ getDomesticStandardTable () {
+ this.loadSarStandard = true
+ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.standardSearchForm, {}, res => {
+ this.loadSarStandard = false
+ if (res.ok) {
+ this.tableData.standardData = res.data.list
+ this.standardSearchForm.total = res.data.count
+ }
+ }, e => {
+ this.loadSarStandard = false
+ })
+ },
+ handleSearchStandard () {
+ if (this.form.standType === '') {
+ this.$message.warning('请选择标准来源')
+ } else {
+ this.standardDrawer = true
+ this.$nextTick(() => {
+ // 动态设置表格高度
+ this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
+ window.onresize = () => {
+ this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
+ }
+ })
+ this.getDomesticStandardTable()
+ }
+ },
saveUserInfo () {
if (this.userType === 'zrUserId') {
this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
@@ -1436,6 +1856,27 @@
this.form.standSystemName = checkedData.menuName
console.log(this.sarStandardsInfoEO.standSystem);
},
+ popoverHideBusVs (checkedIds, checkedData) {
+ console.log(checkedIds);
+ console.log(checkedData);
+ this.form.cycvppsbm = checkedData.code
+ this.form.cycvppscn = checkedData.chineseName
+ console.log(this.sarStandardsInfoEO.standSystem);
+ },
+ popoverHideCarVs (checkedIds, checkedData) {
+ console.log(checkedIds);
+ console.log(checkedData);
+ this.form.kccvppsbm = checkedData.code
+ this.form.kccvppscn = checkedData.chineseName
+ console.log(this.sarStandardsInfoEO.standSystem);
+ },
+ popoverHideModel (checkedIds, checkedData) {
+ console.log(checkedIds);
+ console.log(checkedData);
+ this.form.dybxh = checkedData.model
+ this.form.dymc = checkedData.name
+ console.log(this.sarStandardsInfoEO.standSystem);
+ },
closeDrawer() {
this.ListModel = false
},
@@ -1515,7 +1956,21 @@
this.$message.warning('请检查基础信息表单是否填写完整')
}
})
- }
+ },
+ busVsFunc(){
+ this.$http.get('sarVppsTree/list', '', {
+ _this: this
+ }, res => {
+ this.busVppsOptions = res.data
+ })
+ },
+ modelFunc(){
+ this.$http.get('sarModelTree/list', '', {
+ _this: this
+ }, res => {
+ this.modelOptions = res.data
+ })
+ },
},
mounted () {
this.getTree()
@@ -1535,6 +1990,8 @@
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
})
+ this.busVsFunc()
+ this.modelFunc()
}
}
@@ -1591,4 +2048,24 @@
}
}
}
+ .standard-content {
+ height: 100%;
+ padding: 10px 0 0;
+ .content {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ padding: 0 10px;
+ .standard-table-wrap {
+ flex: auto;
+ overflow-y: auto;
+ }
+ .pagination {
+ position: static;
+ /deep/ .pagination-slot {
+ padding: 0;
+ }
+ }
+ }
+ }
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index f1a9cb9f2..a2db959df 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -24,7 +24,7 @@
-
+
国内标准入库
海外标准入库
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 99355c242..5641ccae3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -24,7 +24,7 @@
-
+
国内标准入库
海外标准入库
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 4c459acc8..daf0be040 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -25,7 +25,7 @@
-
+
国内标准入库
海外标准入库
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index 174ddb4bb..8e443909d 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -8,7 +8,7 @@
-
+
-
+
{
let matchId = true; // 标准号 筛选
let matchName = true; // 项目名称 筛选
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index 51d0aa452..a925e4f10 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -12,11 +12,11 @@
基础信息
-
+
@@ -24,13 +24,13 @@
-
+
+ @click="getTableByPage(nonSearch)">
查询
@@ -120,7 +120,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
- v-model="textarea">
+ v-model="commentText">
@@ -129,8 +129,10 @@
@@ -174,10 +176,10 @@ export default {
name: "wfhxzgStep3",
data() {
return {
- textarea: '', // 意见
+ commentText: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
- nonConformitySearch: {
+ nonSearch: {
standId: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
@@ -243,6 +245,25 @@ export default {
this.active = name
},
+ handleSubmitNo() {
+ if (this.commentText) {
+ var json = this.json
+ json.actionFlag = 1
+ json.commentText = this.commentText
+ this.$http.post('lawss/activiti/completeTask', {
+ json: JSON.stringify(json),
+ taskId: this.taskIds,
+ userId: this.$store.getters.userInfo.userId
+ }, {}, res => {
+ if (res.success) {
+ this.$message.success('驳回成功')
+ this.$router.push('/processCenter')
+ }
+ })
+ } else {
+ this.$message.warning('请输入反馈意见')
+ }
+ },
// 保存按钮
handleSave() {},
// 提交按钮
@@ -317,11 +338,32 @@ export default {
this.modalshowflag = false
},
//查询按钮
- getTableByPage() {
+ getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+ this.realList = this.dataList.filter(item => {
+ let matchId = true; // 标准号 筛选
+ let matchName = true; // 项目名称 筛选
+ let matchUnit = true; // 部门 筛选
+
+ if (standId) {
+ const keysId = standId
+ .toUpperCase() // 转大写
+ .replace(' ', '') // 删掉空格
+ .split('') // 切割成 单个字
+ matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
+ }
+ if (productName) {
+ matchName = item.productName === productName;
+ }
+ if (responsibleUnit) {
+ matchUnit = item.responsibleUnit === responsibleUnit;
+ }
+ return matchId && matchName && matchUnit;
+ })
+ this.dataList = this.realList
},
// 清空 查询条件
clearAllSearch (search = true) {
- this.nonConformitySearch = {
+ this.nonSearch = {
standId: '',
productName: '',
responsibleUnit: ''
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index 480176623..1054cb987 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -12,11 +12,11 @@
基础信息
-
+
@@ -24,13 +24,13 @@
-
+
+ @click="getTableByPage(nonSearch)">
查询
@@ -177,7 +177,7 @@ export default {
textarea: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
- nonConformitySearch: {
+ nonSearch: {
standId: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
@@ -323,16 +323,37 @@ export default {
},
//未整改项抽屉中的查询按钮
- getTableByPage() {
+ getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+ this.realList = this.dataList.filter(item => {
+ let matchId = true; // 标准号 筛选
+ let matchName = true; // 项目名称 筛选
+ let matchUnit = true; // 部门 筛选
+
+ if (standId) {
+ const keysId = standId
+ .toUpperCase() // 转大写
+ .replace(' ', '') // 删掉空格
+ .split('') // 切割成 单个字
+ matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
+ }
+ if (productName) {
+ matchName = item.productName === productName;
+ }
+ if (responsibleUnit) {
+ matchUnit = item.responsibleUnit === responsibleUnit;
+ }
+ return matchId && matchName && matchUnit;
+ })
+ this.dataList = this.realList
},
// 清空 查询条件
- clearAllSearch (search = true) {
- this.nonConformitySearch = {
+ clearAllSearch () {
+ this.nonSearch = {
standId: '',
productName: '',
responsibleUnit: ''
}
- this.getTableByPage()
+ this.getData()
},
// 分页事件
pageChange (page) {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index a8b85cad1..9407ee22c 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -12,11 +12,11 @@
基础信息
-
+
@@ -24,13 +24,13 @@
-
+
+ @click="getTableByPage(nonSearch)">
查询
@@ -141,7 +141,7 @@ export default {
title: '', // 新增编辑抽屉标题
saveLoading: false,
ListModel: false, // 新增编辑抽屉开关
- nonConformitySearch: {
+ nonSearch: {
standId: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
@@ -231,16 +231,37 @@ export default {
}
},
//未整改项抽屉中的查询按钮
- getTableByPage() {
+ getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+ this.realList = this.dataList.filter(item => {
+ let matchId = true; // 标准号 筛选
+ let matchName = true; // 项目名称 筛选
+ let matchUnit = true; // 部门 筛选
+
+ if (standId) {
+ const keysId = standId
+ .toUpperCase() // 转大写
+ .replace(' ', '') // 删掉空格
+ .split('') // 切割成 单个字
+ matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
+ }
+ if (productName) {
+ matchName = item.productName === productName;
+ }
+ if (responsibleUnit) {
+ matchUnit = item.responsibleUnit === responsibleUnit;
+ }
+ return matchId && matchName && matchUnit;
+ })
+ this.dataList = this.realList
},
// 清空 查询条件
clearAllSearch (search = true) {
- this.nonConformitySearch = {
+ this.nonSearch = {
standId: '',
productName: '',
responsibleUnit: ''
}
- this.getTableByPage()
+ this.getData()
},
// 分页事件
pageChange (page) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index b89020428..4060b6cbf 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -113,13 +113,13 @@
:model="roleForm"
:rules="roleFormRules"
class="label-input-form">
-
+
标准法规工程师
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 6b19abc68..1062dcb4d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -328,7 +328,6 @@ export default {
implementer: ""
},
choiceForm: {}, //选择标准清单列表
- countryOptions: [], //适用区域下拉框数据
user1: "",
user2: "",
user3: "",
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index 8d126d1f9..b7ef99fb3 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -428,17 +428,19 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList (item) {
- console.log(item.dataList);
+ console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
- this.dataList = item.dataList
+ this.dataList = item.step3DTOS
+ this.listForm.standName = item.step3DTOS[0].standName
+ this.listForm.standNumber = item.step3DTOS[0].standNumber
+ this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
+ this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
})
},
-
-
//驳回事件
beforeBack () {
this.listForm.fenFlag = '2'
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 72f598fcc..635db2de4 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -518,17 +518,17 @@ export default {
prcType: row.prcType
}
})
- // }else if(row.taskInfo === '标准法规部领导审核'){
- // this.$router.push({
- // name: 'xmpgStep6',
- // query: {
- // taskIds: row.taskIds,
- // prcId: row.prcId,
- // prcNum: row.prcNum,
- // prcName: row.prcName,
- // prcType: row.prcType
- // }
- // })
+ }else if(row.taskInfo === '汇总审核'){
+ this.$router.push({
+ name: 'xmpgStep6',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
}else if(row.taskInfo === '标准法规部领导审核'){
this.$router.push({
name: 'xmpgStep7',
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 939b755e1..db8cb5e14 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -208,6 +208,7 @@
@@ -218,22 +219,26 @@
@@ -241,6 +246,7 @@
show-overflow-tooltip
prop="textStatus"
width="120px"
+ align="center"
label="文本状态">
@@ -323,6 +329,7 @@
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
@@ -331,31 +338,86 @@
+ align="center"
+ width="180px"
+ label="英文名称">
+
+
+
+
+ align="center"
+ width="210px"
+ label="标准实施日期">
+
+
+
+
+ width="180px"
+ align="center"
+ label="适用产品线">
+
+
+
+
+
+
@@ -1174,6 +1236,7 @@ export default {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
_this: this
}, res =>{
+ console.log(res.data.list);
this.sarAccessInfoSearchList = res.data.list
}, e => {
@@ -1634,6 +1697,7 @@ export default {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
_this: this
}, res => {
+ console.log(res.data);
this.sarAccessInfoList = res.data
}, e => {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index b7a1cda74..644a3cbf6 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -71,21 +71,21 @@
- 查询
+ 查询
- 清空
+ 清空
导出
- 高级查询
@@ -111,42 +111,98 @@
align="center">
- {{ scope.row.code }}
- {{ scope.row.code }}
+ {{ scope.row.standNumber }}
+ {{ scope.row.standNumber }}
+ prop="issueTime"
+ align="center"
+ width="180px"
+ label="英文名称">
+
+
+
+
+
+
+
+
+ prop="zccssrq"
+ width="210px"
+ align="center"
+ label="责任部门">
+ prop="textStatus"
+ width="180px"
+ align="center"
+ label="适用产品线">
+
+
+
+
+
+