From af2a58433d00d146fd459293005a49b1e979d8fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 4 Jun 2021 15:26:18 +0800 Subject: [PATCH 001/528] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=92=8C=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/axios/index.js | 6 ++++-- src/components/navMenu/index.vue | 20 +++++++++---------- .../domesticStandardsAndRegulations/index.vue | 6 +++--- src/sysConfig/index.js | 2 +- vue.config.js | 2 +- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/common/axios/index.js b/src/common/axios/index.js index 8c683defb..7f9ac89d1 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -9,7 +9,9 @@ import store from '@/store' import {Message} from 'element-ui' export const CancelToken = axios.CancelToken // import 'element-ui/lib/theme-chalk/index.css' -const _axios = axios.create() +const _axios = axios.create({ + baseURL: '/' +}) /** * @description: FormData @@ -63,7 +65,7 @@ _axios.interceptors.response.use( } }) function api () { - return store.getters.getTypeFlag === 'CloudRepository' ? '/busApi/' : '' + return store.getters.getTypeFlag === 'CloudRepository' ? '/busApi/' : '/api/' } export default { _axios, diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index cd7f837d3..b35116d0b 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -93,11 +93,11 @@ export default { path: '/standardForComments', menuId: '' }, - // { - // title: '海外标准法规', - // path: '/foreignStandardsAndRegulations', - // menuId: '6K8A2RZYRE' - // }, + { + title: '海外标准法规', + path: '/foreignStandardsAndRegulations', + menuId: '6K8A2RZYRE' + }, // { // title: '国内外政策', // path: '/foreignRegulationsDatabase', @@ -143,11 +143,11 @@ export default { path: '/localProductsOrProjectLibrary', menuId: 'PCZKM8TQJAH5UP5EAXTJ' }, - // { - // title: '未符合项跟踪', - // path: '/nonConfomity', - // menuId: 'HQSK8WWPDJG7R5F53LTK' - // }, + { + title: '未符合项跟踪', + path: '/nonConfomity', + menuId: 'HQSK8WWPDJG7R5F53LTK' + }, // { // title: '标准法规工作组', // path: '/workGroup', diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index cb12ad4c3..618604e72 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2250,7 +2250,7 @@ export default { type: 'warning', roundButton: false }).then(() => { - this.$http.post('lawss/sarStandardsInfo/deleteSarStandards', {ids: itemid}, { + this.$http.post('sarStandardsInfo/sar-standards-info/deleteSarStandards', {ids: itemid}, { _this: this, loading: 'delLoading' }, res => { @@ -2350,7 +2350,7 @@ export default { validateStandNumber (standinfo) { return new Promise((resolve, reject) => { let obj = JSON.parse(JSON.stringify(standinfo)) - this.$http.post('lawss/sarStandardsInfo/validateStandNumber', obj, { + this.$http.post('sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', obj, { _this: this }, res => { if (res.ok) { @@ -3314,7 +3314,7 @@ export default { */ queryDisplayLocation () { return new Promise((resolve, reject) => { - this.$http.get('lawssBase/utArea/getAreaList', { + this.$http.get('sarStandardsInfo/sar-standards-info/addarStandardsInfo', { sarType: this.sarType }, { _this: this diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index f4040b04f..59640481c 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -42,7 +42,7 @@ const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLO module.exports = { serverUrl: 'http://' + serverIP, // 服务器IP地址 - interfaceUrl: 'http://' + serverIP + ':' + interfacePORT, // 服务器端接口访问地址, + interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址, simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址 multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址 diff --git a/vue.config.js b/vue.config.js index 84f1e541f..40b40d896 100644 --- a/vue.config.js +++ b/vue.config.js @@ -82,7 +82,7 @@ module.exports = { target: interfaceUrl, changeOrigin: true, pathRewrite: { - '^/api': '/' + '^/api': '' } }, '/onlyOffice': { From 7cc03000991bf5e75771f88e6253850c4279dca5 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 4 Jun 2021 18:01:50 +0800 Subject: [PATCH 002/528] commit --- src/components/pagination/index.vue | 32 +- .../localProductsOrProjectLibrary/index.vue | 49 +- .../pages/details.vue | 3822 +---------------- .../standardForComments/index.vue | 494 +-- .../pags/consultationDetails.vue | 108 +- src/sysConfig/index.js | 4 +- 6 files changed, 371 insertions(+), 4138 deletions(-) diff --git a/src/components/pagination/index.vue b/src/components/pagination/index.vue index ce849e288..c3020523e 100644 --- a/src/components/pagination/index.vue +++ b/src/components/pagination/index.vue @@ -28,20 +28,24 @@ export default { this.$emit('pageChange', page) }, pageSizeChange (pageSize) { - if (this.getTypeFlag === 'CloudRepository') { - this.userInfo.configContent = pageSize - this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo)))) - this.$emit('pageSizeChange', pageSize) - } else { - this.pageConfig(pageSize).then((res) => { - if (res.ok) { - this.userInfo.configContent = pageSize - this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo)))) - this.$emit('pageSizeChange', pageSize) - } - }, e => { - }) - } + this.userInfo.configContent = pageSize + this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo)))) + this.$emit('pageSizeChange', pageSize) + + // if (this.getTypeFlag === 'CloudRepository') { + // this.userInfo.configContent = pageSize + // this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo)))) + // this.$emit('pageSizeChange', pageSize) + // } else { + // this.pageConfig(pageSize).then((res) => { + // if (res.ok) { + // this.userInfo.configContent = pageSize + // this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo)))) + // this.$emit('pageSizeChange', pageSize) + // } + // }, e => { + // }) + // } }, /** * @description: 每页条数配置 diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index f2f82ff0f..a259242f2 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -4,6 +4,14 @@
+ + + - + + label="产品平台"> @@ -112,9 +120,25 @@ sortable > + + + + + @@ -123,31 +147,18 @@ + label="当前节点"> + label="项目级别"> - - - - - @@ -3772,6 +350,7 @@ export default { } } .contaiiner{ + height: calc(~'100% - 55px'); background: #fff; padding: 5px 10px; .el-card__body{ @@ -3900,6 +479,7 @@ export default { diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index b3dd00854..1ceed10c7 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -11,18 +11,18 @@

- {{ opinionList.standardNumber }} + {{ this.$route.query.item.categorg }}

- {{ opinionList.standardName || '-' }} + {{ this.$route.query.item.cname || '-' }}

- {{ opinionList.uploadTime || '-' }} + {{ this.$route.query.item.starttime || '-' }}

- {{ opinionList.opinionCycle || '-' }} + {{ this.$route.query.item.endtime || '-' }}

@@ -39,23 +39,33 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> + + + + @@ -106,59 +116,45 @@ export default { name: 'consultationDetails', data () { return { + spinShow: false, + total: 0, opiniontitle: '新增意见', isDialog: false, //新增抽屉状态 heightShow: true, isSubmit: false, - opinionList: { - standardNumber: 'GB 121-12', - standardName: '机动车安全运行条件', - uploadTime: '2002-11-23', - opinionCycle: '2001-02-21到 2012-02-02' - }, opinionContent: { number:'', content: '', }, - standinfoList: [{ - date: '1.1.2', - name: '文章内容不清晰', - }, { - date: '1.2.3.1', - name: '标准有错误', - }, { - date: '1.21.1', - name: '标准延时', - }, { - date: '1.21.1', - name: '实用性不高', - }, { - date: '1.2.31', - name: '不贴合国家标准', - }, ], - newModelPageConfig: { + standinfoList: [], + form: { + cid: this.$route.query.item.cid, page: 1, - total: 0 + size: this.$store.getters.userInfo.configContent } } }, methods: { - //分页数据改变 - handlePageChange(field, page) { - switch (field) { - case "newModel": - break; - case "": - break; - } + getList() { + this.spinShow = true + this.$http.get('sys/sar-public-idea-all/getallStand', this.form, { + _this: this + }, res => { + this.standinfoList = res.data.records + this.total = res.data.total + this.spinShow = false + }, e => { + }) }, - handlePageSizeChange(field, pageSize) { - switch (field) { - case "newModel": - break; - case "": - break; - } + //分页数据改变 + handlePageChange(page) { + this.form.page = page + this.getList() + }, + handlePageSizeChange(pageSize) { + this.$store.getters.userInfo.configContent = pageSize + this.form.size = pageSize + this.getList() }, back (){ this.$router.push({ @@ -214,7 +210,9 @@ export default { }, }, - mounted () {} + mounted () { + this.getList() + } } diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index aa1e74cb8..d38a94ea4 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,8 +6,8 @@ // 服务器地址 // const devIp = '192.168.10.211' // const devInterfacePORT = '8888' -const devIp = '39.98.140.126' -const devInterfacePORT = '10005' +const devIp = '192.168.10.145' +const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload' From 4cbf301ebf4b0c8046a5d44f9574d7e50fbc5123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 4 Jun 2021 18:02:40 +0800 Subject: [PATCH 003/528] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 16 +- .../foreignStandardsAndRegulations/index.vue | 3576 +---------------- 2 files changed, 136 insertions(+), 3456 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 618604e72..0f2d7fe71 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -98,10 +98,6 @@ size="mini" v-btn-permission="'MP3Y2BAK5V'" title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项">导出 - - - - @@ -184,8 +178,6 @@ width="150px" label="在产车实施日期"> @@ -201,11 +193,6 @@ - - - - - - +
+ +
@@ -279,5 +280,8 @@ export default { justify-content: space-between; align-items: center; } + .footer { + margin-bottom: 430px; + } } From 98f888c2515c511da1f57cf951d64de7c7852b12 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 9 Jun 2021 17:57:44 +0800 Subject: [PATCH 011/528] commit --- public/static/pdf/web/js/jquery-3.3.1.min.js | 2 +- .../highcharts/adapters/mootools-adapter.js | 2 +- .../adapters/mootools-adapter.src.js | 14 +- .../highcharts/adapters/prototype-adapter.js | 2 +- .../adapters/prototype-adapter.src.js | 18 +- .../adapters/standalone-framework.js | 2 +- .../adapters/standalone-framework.src.js | 48 +- .../third-party/highcharts/highcharts.js | 10 +- .../third-party/highcharts/highcharts.src.js | 1556 ++++++++--------- .../ueditor/third-party/jquery-1.10.2.js | 8 +- .../ueditor/third-party/jquery-1.10.2.min.js | 2 +- .../pages/components/ProcessTitle.vue | 32 + .../pages/creatProcess/bzff/step1.vue | 363 ++++ .../pages/creatProcess/bzfy/step1.vue | 16 +- .../processCenter/pages/newProcess/index.vue | 3 + src/router/index.js | 9 + 16 files changed, 1248 insertions(+), 839 deletions(-) create mode 100644 src/pages/processCenter/pages/components/ProcessTitle.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzff/step1.vue diff --git a/public/static/pdf/web/js/jquery-3.3.1.min.js b/public/static/pdf/web/js/jquery-3.3.1.min.js index 4d9b3a258..b3401b971 100644 --- a/public/static/pdf/web/js/jquery-3.3.1.min.js +++ b/public/static/pdf/web/js/jquery-3.3.1.min.js @@ -1,2 +1,2 @@ /*! jQuery v3.3.1 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){"use strict";var n=[],r=e.document,i=Object.getPrototypeOf,o=n.slice,a=n.concat,s=n.push,u=n.indexOf,l={},c=l.toString,f=l.hasOwnProperty,p=f.toString,d=p.call(Object),h={},g=function e(t){return"function"==typeof t&&"number"!=typeof t.nodeType},y=function e(t){return null!=t&&t===t.window},v={type:!0,src:!0,noModule:!0};function m(e,t,n){var i,o=(t=t||r).createElement("script");if(o.text=e,n)for(i in v)n[i]&&(o[i]=n[i]);t.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[c.call(e)]||"object":typeof e}var b="3.3.1",w=function(e,t){return new w.fn.init(e,t)},T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;w.fn=w.prototype={jquery:"3.3.1",constructor:w,length:0,toArray:function(){return o.call(this)},get:function(e){return null==e?o.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=w.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return w.each(this,e)},map:function(e){return this.pushStack(w.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(o.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n0&&t-1 in e)}var E=function(e){var t,n,r,i,o,a,s,u,l,c,f,p,d,h,g,y,v,m,x,b="sizzle"+1*new Date,w=e.document,T=0,C=0,E=ae(),k=ae(),S=ae(),D=function(e,t){return e===t&&(f=!0),0},N={}.hasOwnProperty,A=[],j=A.pop,q=A.push,L=A.push,H=A.slice,O=function(e,t){for(var n=0,r=e.length;n+~]|"+M+")"+M+"*"),z=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),X=new RegExp(W),U=new RegExp("^"+R+"$"),V={ID:new RegExp("^#("+R+")"),CLASS:new RegExp("^\\.("+R+")"),TAG:new RegExp("^("+R+"|[*])"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+P+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},G=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Q=/^[^{]+\{\s*\[native \w/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,K=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ee=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},te=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ne=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},re=function(){p()},ie=me(function(e){return!0===e.disabled&&("form"in e||"label"in e)},{dir:"parentNode",next:"legend"});try{L.apply(A=H.call(w.childNodes),w.childNodes),A[w.childNodes.length].nodeType}catch(e){L={apply:A.length?function(e,t){q.apply(e,H.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function oe(e,t,r,i){var o,s,l,c,f,h,v,m=t&&t.ownerDocument,T=t?t.nodeType:9;if(r=r||[],"string"!=typeof e||!e||1!==T&&9!==T&&11!==T)return r;if(!i&&((t?t.ownerDocument||t:w)!==d&&p(t),t=t||d,g)){if(11!==T&&(f=J.exec(e)))if(o=f[1]){if(9===T){if(!(l=t.getElementById(o)))return r;if(l.id===o)return r.push(l),r}else if(m&&(l=m.getElementById(o))&&x(t,l)&&l.id===o)return r.push(l),r}else{if(f[2])return L.apply(r,t.getElementsByTagName(e)),r;if((o=f[3])&&n.getElementsByClassName&&t.getElementsByClassName)return L.apply(r,t.getElementsByClassName(o)),r}if(n.qsa&&!S[e+" "]&&(!y||!y.test(e))){if(1!==T)m=t,v=e;else if("object"!==t.nodeName.toLowerCase()){(c=t.getAttribute("id"))?c=c.replace(te,ne):t.setAttribute("id",c=b),s=(h=a(e)).length;while(s--)h[s]="#"+c+" "+ve(h[s]);v=h.join(","),m=K.test(e)&&ge(t.parentNode)||t}if(v)try{return L.apply(r,m.querySelectorAll(v)),r}catch(e){}finally{c===b&&t.removeAttribute("id")}}}return u(e.replace(B,"$1"),t,r,i)}function ae(){var e=[];function t(n,i){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=i}return t}function se(e){return e[b]=!0,e}function ue(e){var t=d.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function le(e,t){var n=e.split("|"),i=n.length;while(i--)r.attrHandle[n[i]]=t}function ce(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function fe(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function pe(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function de(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&ie(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function he(e){return se(function(t){return t=+t,se(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function ge(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}n=oe.support={},o=oe.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},p=oe.setDocument=function(e){var t,i,a=e?e.ownerDocument||e:w;return a!==d&&9===a.nodeType&&a.documentElement?(d=a,h=d.documentElement,g=!o(d),w!==d&&(i=d.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",re,!1):i.attachEvent&&i.attachEvent("onunload",re)),n.attributes=ue(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ue(function(e){return e.appendChild(d.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=Q.test(d.getElementsByClassName),n.getById=ue(function(e){return h.appendChild(e).id=b,!d.getElementsByName||!d.getElementsByName(b).length}),n.getById?(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){return e.getAttribute("id")===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n=t.getElementById(e);return n?[n]:[]}}):(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&g)return t.getElementsByClassName(e)},v=[],y=[],(n.qsa=Q.test(d.querySelectorAll))&&(ue(function(e){h.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+P+")"),e.querySelectorAll("[id~="+b+"-]").length||y.push("~="),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+b+"+*").length||y.push(".#.+[+~]")}),ue(function(e){e.innerHTML="";var t=d.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),h.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(n.matchesSelector=Q.test(m=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ue(function(e){n.disconnectedMatch=m.call(e,"*"),m.call(e,"[s!='']:x"),v.push("!=",W)}),y=y.length&&new RegExp(y.join("|")),v=v.length&&new RegExp(v.join("|")),t=Q.test(h.compareDocumentPosition),x=t||Q.test(h.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return f=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r||(1&(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===d||e.ownerDocument===w&&x(w,e)?-1:t===d||t.ownerDocument===w&&x(w,t)?1:c?O(c,e)-O(c,t):0:4&r?-1:1)}:function(e,t){if(e===t)return f=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===d?-1:t===d?1:i?-1:o?1:c?O(c,e)-O(c,t):0;if(i===o)return ce(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?ce(a[r],s[r]):a[r]===w?-1:s[r]===w?1:0},d):d},oe.matches=function(e,t){return oe(e,null,null,t)},oe.matchesSelector=function(e,t){if((e.ownerDocument||e)!==d&&p(e),t=t.replace(z,"='$1']"),n.matchesSelector&&g&&!S[t+" "]&&(!v||!v.test(t))&&(!y||!y.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){}return oe(t,d,null,[e]).length>0},oe.contains=function(e,t){return(e.ownerDocument||e)!==d&&p(e),x(e,t)},oe.attr=function(e,t){(e.ownerDocument||e)!==d&&p(e);var i=r.attrHandle[t.toLowerCase()],o=i&&N.call(r.attrHandle,t.toLowerCase())?i(e,t,!g):void 0;return void 0!==o?o:n.attributes||!g?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null},oe.escape=function(e){return(e+"").replace(te,ne)},oe.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},oe.uniqueSort=function(e){var t,r=[],i=0,o=0;if(f=!n.detectDuplicates,c=!n.sortStable&&e.slice(0),e.sort(D),f){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return c=null,e},i=oe.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(3===o||4===o)return e.nodeValue}else while(t=e[r++])n+=i(t);return n},(r=oe.selectors={cacheLength:50,createPseudo:se,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Z,ee),e[3]=(e[3]||e[4]||e[5]||"").replace(Z,ee),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||oe.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&oe.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return V.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=a(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Z,ee).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=E[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&E(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=oe.attr(r,e);return null==i?"!="===t:!t||(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i.replace($," ")+" ").indexOf(n)>-1:"|="===t&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",y=t.parentNode,v=s&&t.nodeName.toLowerCase(),m=!u&&!s,x=!1;if(y){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===v:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?y.firstChild:y.lastChild],a&&m){x=(d=(l=(c=(f=(p=y)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1])&&l[2],p=d&&y.childNodes[d];while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if(1===p.nodeType&&++x&&p===t){c[e]=[T,d,x];break}}else if(m&&(x=d=(l=(c=(f=(p=t)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1]),!1===x)while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===v:1===p.nodeType)&&++x&&(m&&((c=(f=p[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]=[T,x]),p===t))break;return(x-=i)===r||x%r==0&&x/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||oe.error("unsupported pseudo: "+e);return i[b]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?se(function(e,n){var r,o=i(e,t),a=o.length;while(a--)e[r=O(e,o[a])]=!(n[r]=o[a])}):function(e){return i(e,0,n)}):i}},pseudos:{not:se(function(e){var t=[],n=[],r=s(e.replace(B,"$1"));return r[b]?se(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),t[0]=null,!n.pop()}}),has:se(function(e){return function(t){return oe(e,t).length>0}}),contains:se(function(e){return e=e.replace(Z,ee),function(t){return(t.textContent||t.innerText||i(t)).indexOf(e)>-1}}),lang:se(function(e){return U.test(e||"")||oe.error("unsupported lang: "+e),e=e.replace(Z,ee).toLowerCase(),function(t){var n;do{if(n=g?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===h},focus:function(e){return e===d.activeElement&&(!d.hasFocus||d.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:de(!1),disabled:de(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return Y.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:he(function(){return[0]}),last:he(function(e,t){return[t-1]}),eq:he(function(e,t,n){return[n<0?n+t:n]}),even:he(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:he(function(e,t,n){for(var r=n<0?n+t:n;++r1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function be(e,t,n){for(var r=0,i=t.length;r-1&&(o[l]=!(a[l]=f))}}else v=we(v===a?v.splice(h,v.length):v),i?i(null,a,v,u):L.apply(a,v)})}function Ce(e){for(var t,n,i,o=e.length,a=r.relative[e[0].type],s=a||r.relative[" "],u=a?1:0,c=me(function(e){return e===t},s,!0),f=me(function(e){return O(t,e)>-1},s,!0),p=[function(e,n,r){var i=!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):f(e,n,r));return t=null,i}];u1&&xe(p),u>1&&ve(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(B,"$1"),n,u0,i=e.length>0,o=function(o,a,s,u,c){var f,h,y,v=0,m="0",x=o&&[],b=[],w=l,C=o||i&&r.find.TAG("*",c),E=T+=null==w?1:Math.random()||.1,k=C.length;for(c&&(l=a===d||a||c);m!==k&&null!=(f=C[m]);m++){if(i&&f){h=0,a||f.ownerDocument===d||(p(f),s=!g);while(y=e[h++])if(y(f,a||d,s)){u.push(f);break}c&&(T=E)}n&&((f=!y&&f)&&v--,o&&x.push(f))}if(v+=m,n&&m!==v){h=0;while(y=t[h++])y(x,b,a,s);if(o){if(v>0)while(m--)x[m]||b[m]||(b[m]=j.call(u));b=we(b)}L.apply(u,b),c&&!o&&b.length>0&&v+t.length>1&&oe.uniqueSort(u)}return c&&(T=E,l=w),x};return n?se(o):o}return s=oe.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=a(e)),n=t.length;while(n--)(o=Ce(t[n]))[b]?r.push(o):i.push(o);(o=S(e,Ee(i,r))).selector=e}return o},u=oe.select=function(e,t,n,i){var o,u,l,c,f,p="function"==typeof e&&e,d=!i&&a(e=p.selector||e);if(n=n||[],1===d.length){if((u=d[0]=d[0].slice(0)).length>2&&"ID"===(l=u[0]).type&&9===t.nodeType&&g&&r.relative[u[1].type]){if(!(t=(r.find.ID(l.matches[0].replace(Z,ee),t)||[])[0]))return n;p&&(t=t.parentNode),e=e.slice(u.shift().value.length)}o=V.needsContext.test(e)?0:u.length;while(o--){if(l=u[o],r.relative[c=l.type])break;if((f=r.find[c])&&(i=f(l.matches[0].replace(Z,ee),K.test(u[0].type)&&ge(t.parentNode)||t))){if(u.splice(o,1),!(e=i.length&&ve(u)))return L.apply(n,i),n;break}}}return(p||s(e,d))(i,t,!g,n,!t||K.test(e)&&ge(t.parentNode)||t),n},n.sortStable=b.split("").sort(D).join("")===b,n.detectDuplicates=!!f,p(),n.sortDetached=ue(function(e){return 1&e.compareDocumentPosition(d.createElement("fieldset"))}),ue(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||le("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ue(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||le("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ue(function(e){return null==e.getAttribute("disabled")})||le(P,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),oe}(e);w.find=E,w.expr=E.selectors,w.expr[":"]=w.expr.pseudos,w.uniqueSort=w.unique=E.uniqueSort,w.text=E.getText,w.isXMLDoc=E.isXML,w.contains=E.contains,w.escapeSelector=E.escape;var k=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&w(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},D=w.expr.match.needsContext;function N(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var A=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,t,n){return g(t)?w.grep(e,function(e,r){return!!t.call(e,r,e)!==n}):t.nodeType?w.grep(e,function(e){return e===t!==n}):"string"!=typeof t?w.grep(e,function(e){return u.call(t,e)>-1!==n}):w.filter(t,e,n)}w.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return 1===e.nodeType}))},w.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(w(e).filter(function(){for(t=0;t1?w.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&D.test(e)?w(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(w.fn.init=function(e,t,n){var i,o;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(i="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:L.exec(e))||!i[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(i[1]){if(t=t instanceof w?t[0]:t,w.merge(this,w.parseHTML(i[1],t&&t.nodeType?t.ownerDocument||t:r,!0)),A.test(i[1])&&w.isPlainObject(t))for(i in t)g(this[i])?this[i](t[i]):this.attr(i,t[i]);return this}return(o=r.getElementById(i[2]))&&(this[0]=o,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):g(e)?void 0!==n.ready?n.ready(e):e(w):w.makeArray(e,this)}).prototype=w.fn,q=w(r);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};w.fn.extend({has:function(e){var t=w(e,this),n=t.length;return this.filter(function(){for(var e=0;e-1:1===n.nodeType&&w.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?w.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?u.call(w(e),this[0]):u.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(w.uniqueSort(w.merge(this.get(),w(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}w.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return k(e,"parentNode")},parentsUntil:function(e,t,n){return k(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return k(e,"nextSibling")},prevAll:function(e){return k(e,"previousSibling")},nextUntil:function(e,t,n){return k(e,"nextSibling",n)},prevUntil:function(e,t,n){return k(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return N(e,"iframe")?e.contentDocument:(N(e,"template")&&(e=e.content||e),w.merge([],e.childNodes))}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=w.filter(r,i)),this.length>1&&(O[e]||w.uniqueSort(i),H.test(e)&&i.reverse()),this.pushStack(i)}});var M=/[^\x20\t\r\n\f]+/g;function R(e){var t={};return w.each(e.match(M)||[],function(e,n){t[n]=!0}),t}w.Callbacks=function(e){e="string"==typeof e?R(e):w.extend({},e);var t,n,r,i,o=[],a=[],s=-1,u=function(){for(i=i||e.once,r=t=!0;a.length;s=-1){n=a.shift();while(++s-1)o.splice(n,1),n<=s&&s--}),this},has:function(e){return e?w.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||t||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],a.push(n),t||u()),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l};function I(e){return e}function W(e){throw e}function $(e,t,n,r){var i;try{e&&g(i=e.promise)?i.call(e).done(t).fail(n):e&&g(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}w.extend({Deferred:function(t){var n=[["notify","progress",w.Callbacks("memory"),w.Callbacks("memory"),2],["resolve","done",w.Callbacks("once memory"),w.Callbacks("once memory"),0,"resolved"],["reject","fail",w.Callbacks("once memory"),w.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},"catch":function(e){return i.then(null,e)},pipe:function(){var e=arguments;return w.Deferred(function(t){w.each(n,function(n,r){var i=g(e[r[4]])&&e[r[4]];o[r[1]](function(){var e=i&&i.apply(this,arguments);e&&g(e.promise)?e.promise().progress(t.notify).done(t.resolve).fail(t.reject):t[r[0]+"With"](this,i?[e]:arguments)})}),e=null}).promise()},then:function(t,r,i){var o=0;function a(t,n,r,i){return function(){var s=this,u=arguments,l=function(){var e,l;if(!(t=o&&(r!==W&&(s=void 0,u=[e]),n.rejectWith(s,u))}};t?c():(w.Deferred.getStackHook&&(c.stackTrace=w.Deferred.getStackHook()),e.setTimeout(c))}}return w.Deferred(function(e){n[0][3].add(a(0,e,g(i)?i:I,e.notifyWith)),n[1][3].add(a(0,e,g(t)?t:I)),n[2][3].add(a(0,e,g(r)?r:W))}).promise()},promise:function(e){return null!=e?w.extend(e,i):i}},o={};return w.each(n,function(e,t){var a=t[2],s=t[5];i[t[1]]=a.add,s&&a.add(function(){r=s},n[3-e][2].disable,n[3-e][3].disable,n[0][2].lock,n[0][3].lock),a.add(t[3].fire),o[t[0]]=function(){return o[t[0]+"With"](this===o?void 0:this,arguments),this},o[t[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(e){var t=arguments.length,n=t,r=Array(n),i=o.call(arguments),a=w.Deferred(),s=function(e){return function(n){r[e]=this,i[e]=arguments.length>1?o.call(arguments):n,--t||a.resolveWith(r,i)}};if(t<=1&&($(e,a.done(s(n)).resolve,a.reject,!t),"pending"===a.state()||g(i[n]&&i[n].then)))return a.then();while(n--)$(i[n],s(n),a.reject);return a.promise()}});var B=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;w.Deferred.exceptionHook=function(t,n){e.console&&e.console.warn&&t&&B.test(t.name)&&e.console.warn("jQuery.Deferred exception: "+t.message,t.stack,n)},w.readyException=function(t){e.setTimeout(function(){throw t})};var F=w.Deferred();w.fn.ready=function(e){return F.then(e)["catch"](function(e){w.readyException(e)}),this},w.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--w.readyWait:w.isReady)||(w.isReady=!0,!0!==e&&--w.readyWait>0||F.resolveWith(r,[w]))}}),w.ready.then=F.then;function _(){r.removeEventListener("DOMContentLoaded",_),e.removeEventListener("load",_),w.ready()}"complete"===r.readyState||"loading"!==r.readyState&&!r.documentElement.doScroll?e.setTimeout(w.ready):(r.addEventListener("DOMContentLoaded",_),e.addEventListener("load",_));var z=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n)){i=!0;for(s in n)z(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,g(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(w(e),n)})),t))for(;s1,null,!0)},removeData:function(e){return this.each(function(){K.remove(this,e)})}}),w.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=J.get(e,t),n&&(!r||Array.isArray(n)?r=J.access(e,t,w.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),o=w._queueHooks(e,t),a=function(){w.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return J.get(e,n)||J.access(e,n,{empty:w.Callbacks("once memory").add(function(){J.remove(e,[t+"queue",n])})})}}),w.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length\x20\t\r\n\f]+)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&N(e,t)?w.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n-1)i&&i.push(o);else if(l=w.contains(o.ownerDocument,o),a=ye(f.appendChild(o),"script"),l&&ve(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}!function(){var e=r.createDocumentFragment().appendChild(r.createElement("div")),t=r.createElement("input");t.setAttribute("type","radio"),t.setAttribute("checked","checked"),t.setAttribute("name","t"),e.appendChild(t),h.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,e.innerHTML="",h.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue}();var be=r.documentElement,we=/^key/,Te=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ce=/^([^.]*)(?:\.(.+)|)/;function Ee(){return!0}function ke(){return!1}function Se(){try{return r.activeElement}catch(e){}}function De(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)De(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=ke;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return w().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=w.guid++)),e.each(function(){w.event.add(this,t,i,r,n)})}w.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.get(e);if(y){n.handler&&(n=(o=n).handler,i=o.selector),i&&w.find.matchesSelector(be,i),n.guid||(n.guid=w.guid++),(u=y.events)||(u=y.events={}),(a=y.handle)||(a=y.handle=function(t){return"undefined"!=typeof w&&w.event.triggered!==t.type?w.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(M)||[""]).length;while(l--)d=g=(s=Ce.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=w.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=w.event.special[d]||{},c=w.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&w.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(e,r,h,a)||e.addEventListener&&e.addEventListener(d,a)),f.add&&(f.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),w.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.hasData(e)&&J.get(e);if(y&&(u=y.events)){l=(t=(t||"").match(M)||[""]).length;while(l--)if(s=Ce.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){f=w.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,y.handle)||w.removeEvent(e,d,y.handle),delete u[d])}else for(d in u)w.event.remove(e,d+t[l],n,r,!0);w.isEmptyObject(u)&&J.remove(e,"handle events")}},dispatch:function(e){var t=w.event.fix(e),n,r,i,o,a,s,u=new Array(arguments.length),l=(J.get(this,"events")||{})[t.type]||[],c=w.event.special[t.type]||{};for(u[0]=t,n=1;n=1))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n-1:w.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u\x20\t\r\n\f]*)[^>]*)\/>/gi,Ae=/\s*$/g;function Le(e,t){return N(e,"table")&&N(11!==t.nodeType?t:t.firstChild,"tr")?w(e).children("tbody")[0]||e:e}function He(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Oe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Pe(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(J.hasData(e)&&(o=J.access(e),a=J.set(t,o),l=o.events)){delete a.handle,a.events={};for(i in l)for(n=0,r=l[i].length;n1&&"string"==typeof y&&!h.checkClone&&je.test(y))return e.each(function(i){var o=e.eq(i);v&&(t[0]=y.call(this,i,o.html())),Re(o,t,n,r)});if(p&&(i=xe(t,e[0].ownerDocument,!1,e,r),o=i.firstChild,1===i.childNodes.length&&(i=o),o||r)){for(u=(s=w.map(ye(i,"script"),He)).length;f")},clone:function(e,t,n){var r,i,o,a,s=e.cloneNode(!0),u=w.contains(e.ownerDocument,e);if(!(h.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||w.isXMLDoc(e)))for(a=ye(s),r=0,i=(o=ye(e)).length;r0&&ve(a,!u&&ye(e,"script")),s},cleanData:function(e){for(var t,n,r,i=w.event.special,o=0;void 0!==(n=e[o]);o++)if(Y(n)){if(t=n[J.expando]){if(t.events)for(r in t.events)i[r]?w.event.remove(n,r):w.removeEvent(n,r,t.handle);n[J.expando]=void 0}n[K.expando]&&(n[K.expando]=void 0)}}}),w.fn.extend({detach:function(e){return Ie(this,e,!0)},remove:function(e){return Ie(this,e)},text:function(e){return z(this,function(e){return void 0===e?w.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Re(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Le(this,e).appendChild(e)})},prepend:function(){return Re(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Le(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(w.cleanData(ye(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return w.clone(this,e,t)})},html:function(e){return z(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ae.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=w.htmlPrefilter(e);try{for(;n=0&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))),u}function et(e,t,n){var r=$e(e),i=Fe(e,t,r),o="border-box"===w.css(e,"boxSizing",!1,r),a=o;if(We.test(i)){if(!n)return i;i="auto"}return a=a&&(h.boxSizingReliable()||i===e.style[t]),("auto"===i||!parseFloat(i)&&"inline"===w.css(e,"display",!1,r))&&(i=e["offset"+t[0].toUpperCase()+t.slice(1)],a=!0),(i=parseFloat(i)||0)+Ze(e,t,n||(o?"border":"content"),a,r,i)+"px"}w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Fe(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=G(t),u=Xe.test(t),l=e.style;if(u||(t=Je(s)),a=w.cssHooks[t]||w.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"==(o=typeof n)&&(i=ie.exec(n))&&i[1]&&(n=ue(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(w.cssNumber[s]?"":"px")),h.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=G(t);return Xe.test(t)||(t=Je(s)),(a=w.cssHooks[t]||w.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Fe(e,t,r)),"normal"===i&&t in Ve&&(i=Ve[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n)return!ze.test(w.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?et(e,t,r):se(e,Ue,function(){return et(e,t,r)})},set:function(e,n,r){var i,o=$e(e),a="border-box"===w.css(e,"boxSizing",!1,o),s=r&&Ze(e,t,r,a,o);return a&&h.scrollboxSize()===o.position&&(s-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-Ze(e,t,"border",!1,o)-.5)),s&&(i=ie.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=w.css(e,t)),Ke(e,n,s)}}}),w.cssHooks.marginLeft=_e(h.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Fe(e,"marginLeft"))||e.getBoundingClientRect().left-se(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+oe[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(w.cssHooks[e+t].set=Ke)}),w.fn.extend({css:function(e,t){return z(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=$e(e),i=t.length;a1)}});function tt(e,t,n,r,i){return new tt.prototype.init(e,t,n,r,i)}w.Tween=tt,tt.prototype={constructor:tt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||w.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(w.cssNumber[n]?"":"px")},cur:function(){var e=tt.propHooks[this.prop];return e&&e.get?e.get(this):tt.propHooks._default.get(this)},run:function(e){var t,n=tt.propHooks[this.prop];return this.options.duration?this.pos=t=w.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):tt.propHooks._default.set(this),this}},tt.prototype.init.prototype=tt.prototype,tt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=w.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){w.fx.step[e.prop]?w.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[w.cssProps[e.prop]]&&!w.cssHooks[e.prop]?e.elem[e.prop]=e.now:w.style(e.elem,e.prop,e.now+e.unit)}}},tt.propHooks.scrollTop=tt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},w.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},w.fx=tt.prototype.init,w.fx.step={};var nt,rt,it=/^(?:toggle|show|hide)$/,ot=/queueHooks$/;function at(){rt&&(!1===r.hidden&&e.requestAnimationFrame?e.requestAnimationFrame(at):e.setTimeout(at,w.fx.interval),w.fx.tick())}function st(){return e.setTimeout(function(){nt=void 0}),nt=Date.now()}function ut(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=oe[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function lt(e,t,n){for(var r,i=(pt.tweeners[t]||[]).concat(pt.tweeners["*"]),o=0,a=i.length;o1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})}}),w.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?w.prop(e,t,n):(1===o&&w.isXMLDoc(e)||(i=w.attrHooks[t.toLowerCase()]||(w.expr.match.bool.test(t)?dt:void 0)),void 0!==n?null===n?void w.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=w.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!h.radioValue&&"radio"===t&&N(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(M);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),dt={set:function(e,t,n){return!1===t?w.removeAttr(e,n):e.setAttribute(n,n),n}},w.each(w.expr.match.bool.source.match(/\w+/g),function(e,t){var n=ht[t]||w.find.attr;ht[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=ht[a],ht[a]=i,i=null!=n(e,t,r)?a:null,ht[a]=o),i}});var gt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;w.fn.extend({prop:function(e,t){return z(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[w.propFix[e]||e]})}}),w.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&w.isXMLDoc(e)||(t=w.propFix[t]||t,i=w.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):gt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),h.optSelected||(w.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});function vt(e){return(e.match(M)||[]).join(" ")}function mt(e){return e.getAttribute&&e.getAttribute("class")||""}function xt(e){return Array.isArray(e)?e:"string"==typeof e?e.match(M)||[]:[]}w.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).addClass(e.call(this,t,mt(this)))});if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).removeClass(e.call(this,t,mt(this)))});if(!arguments.length)return this.attr("class","");if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])while(r.indexOf(" "+o+" ")>-1)r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):g(e)?this.each(function(n){w(this).toggleClass(e.call(this,n,mt(this),t),t)}):this.each(function(){var t,i,o,a;if(r){i=0,o=w(this),a=xt(e);while(t=a[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else void 0!==e&&"boolean"!==n||((t=mt(this))&&J.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":J.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&(" "+vt(mt(n))+" ").indexOf(t)>-1)return!0;return!1}});var bt=/\r/g;w.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=g(e),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,w(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=w.map(i,function(e){return null==e?"":e+""})),(t=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return(t=w.valHooks[i.type]||w.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(bt,""):null==n?"":n}}}),w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return null!=t?t:vt(w.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=w.inArray(w(e).val(),t)>-1}},h.checkOn||(w.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),h.focusin="onfocusin"in e;var wt=/^(?:focusinfocus|focusoutblur)$/,Tt=function(e){e.stopPropagation()};w.extend(w.event,{trigger:function(t,n,i,o){var a,s,u,l,c,p,d,h,v=[i||r],m=f.call(t,"type")?t.type:t,x=f.call(t,"namespace")?t.namespace.split("."):[];if(s=h=u=i=i||r,3!==i.nodeType&&8!==i.nodeType&&!wt.test(m+w.event.triggered)&&(m.indexOf(".")>-1&&(m=(x=m.split(".")).shift(),x.sort()),c=m.indexOf(":")<0&&"on"+m,t=t[w.expando]?t:new w.Event(m,"object"==typeof t&&t),t.isTrigger=o?2:3,t.namespace=x.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+x.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=i),n=null==n?[t]:w.makeArray(n,[t]),d=w.event.special[m]||{},o||!d.trigger||!1!==d.trigger.apply(i,n))){if(!o&&!d.noBubble&&!y(i)){for(l=d.delegateType||m,wt.test(l+m)||(s=s.parentNode);s;s=s.parentNode)v.push(s),u=s;u===(i.ownerDocument||r)&&v.push(u.defaultView||u.parentWindow||e)}a=0;while((s=v[a++])&&!t.isPropagationStopped())h=s,t.type=a>1?l:d.bindType||m,(p=(J.get(s,"events")||{})[t.type]&&J.get(s,"handle"))&&p.apply(s,n),(p=c&&s[c])&&p.apply&&Y(s)&&(t.result=p.apply(s,n),!1===t.result&&t.preventDefault());return t.type=m,o||t.isDefaultPrevented()||d._default&&!1!==d._default.apply(v.pop(),n)||!Y(i)||c&&g(i[m])&&!y(i)&&((u=i[c])&&(i[c]=null),w.event.triggered=m,t.isPropagationStopped()&&h.addEventListener(m,Tt),i[m](),t.isPropagationStopped()&&h.removeEventListener(m,Tt),w.event.triggered=void 0,u&&(i[c]=u)),t.result}},simulate:function(e,t,n){var r=w.extend(new w.Event,n,{type:e,isSimulated:!0});w.event.trigger(r,null,t)}}),w.fn.extend({trigger:function(e,t){return this.each(function(){w.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return w.event.trigger(e,t,n,!0)}}),h.focusin||w.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){w.event.simulate(t,e.target,w.event.fix(e))};w.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=J.access(r,t);i||r.addEventListener(e,n,!0),J.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=J.access(r,t)-1;i?J.access(r,t,i):(r.removeEventListener(e,n,!0),J.remove(r,t))}}});var Ct=e.location,Et=Date.now(),kt=/\?/;w.parseXML=function(t){var n;if(!t||"string"!=typeof t)return null;try{n=(new e.DOMParser).parseFromString(t,"text/xml")}catch(e){n=void 0}return n&&!n.getElementsByTagName("parsererror").length||w.error("Invalid XML: "+t),n};var St=/\[\]$/,Dt=/\r?\n/g,Nt=/^(?:submit|button|image|reset|file)$/i,At=/^(?:input|select|textarea|keygen)/i;function jt(e,t,n,r){var i;if(Array.isArray(t))w.each(t,function(t,i){n||St.test(e)?r(e,i):jt(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==x(t))r(e,t);else for(i in t)jt(e+"["+i+"]",t[i],n,r)}w.param=function(e,t){var n,r=[],i=function(e,t){var n=g(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(e)||e.jquery&&!w.isPlainObject(e))w.each(e,function(){i(this.name,this.value)});else for(n in e)jt(n,e[n],t,i);return r.join("&")},w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&At.test(this.nodeName)&&!Nt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=w(this).val();return null==n?null:Array.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(Dt,"\r\n")}}):{name:t.name,value:n.replace(Dt,"\r\n")}}).get()}});var qt=/%20/g,Lt=/#.*$/,Ht=/([?&])_=[^&]*/,Ot=/^(.*?):[ \t]*([^\r\n]*)$/gm,Pt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Mt=/^(?:GET|HEAD)$/,Rt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Bt=r.createElement("a");Bt.href=Ct.href;function Ft(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(M)||[];if(g(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function _t(e,t,n,r){var i={},o=e===Wt;function a(s){var u;return i[s]=!0,w.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):void 0:(t.dataTypes.unshift(l),a(l),!1)}),u}return a(t.dataTypes[0])||!i["*"]&&a("*")}function zt(e,t){var n,r,i=w.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&w.extend(!0,e,r),e}function Xt(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}function Ut(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ct.href,type:"GET",isLocal:Pt.test(Ct.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":w.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,w.ajaxSettings),t):zt(w.ajaxSettings,e)},ajaxPrefilter:Ft(It),ajaxTransport:Ft(Wt),ajax:function(t,n){"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,p,d,h=w.ajaxSetup({},n),g=h.context||h,y=h.context&&(g.nodeType||g.jquery)?w(g):w.event,v=w.Deferred(),m=w.Callbacks("once memory"),x=h.statusCode||{},b={},T={},C="canceled",E={readyState:0,getResponseHeader:function(e){var t;if(c){if(!s){s={};while(t=Ot.exec(a))s[t[1].toLowerCase()]=t[2]}t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return c?a:null},setRequestHeader:function(e,t){return null==c&&(e=T[e.toLowerCase()]=T[e.toLowerCase()]||e,b[e]=t),this},overrideMimeType:function(e){return null==c&&(h.mimeType=e),this},statusCode:function(e){var t;if(e)if(c)E.always(e[E.status]);else for(t in e)x[t]=[x[t],e[t]];return this},abort:function(e){var t=e||C;return i&&i.abort(t),k(0,t),this}};if(v.promise(E),h.url=((t||h.url||Ct.href)+"").replace(Rt,Ct.protocol+"//"),h.type=n.method||n.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(M)||[""],null==h.crossDomain){l=r.createElement("a");try{l.href=h.url,l.href=l.href,h.crossDomain=Bt.protocol+"//"+Bt.host!=l.protocol+"//"+l.host}catch(e){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=w.param(h.data,h.traditional)),_t(It,h,n,E),c)return E;(f=w.event&&h.global)&&0==w.active++&&w.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!Mt.test(h.type),o=h.url.replace(Lt,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(qt,"+")):(d=h.url.slice(o.length),h.data&&(h.processData||"string"==typeof h.data)&&(o+=(kt.test(o)?"&":"?")+h.data,delete h.data),!1===h.cache&&(o=o.replace(Ht,"$1"),d=(kt.test(o)?"&":"?")+"_="+Et+++d),h.url=o+d),h.ifModified&&(w.lastModified[o]&&E.setRequestHeader("If-Modified-Since",w.lastModified[o]),w.etag[o]&&E.setRequestHeader("If-None-Match",w.etag[o])),(h.data&&h.hasContent&&!1!==h.contentType||n.contentType)&&E.setRequestHeader("Content-Type",h.contentType),E.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+$t+"; q=0.01":""):h.accepts["*"]);for(p in h.headers)E.setRequestHeader(p,h.headers[p]);if(h.beforeSend&&(!1===h.beforeSend.call(g,E,h)||c))return E.abort();if(C="abort",m.add(h.complete),E.done(h.success),E.fail(h.error),i=_t(Wt,h,n,E)){if(E.readyState=1,f&&y.trigger("ajaxSend",[E,h]),c)return E;h.async&&h.timeout>0&&(u=e.setTimeout(function(){E.abort("timeout")},h.timeout));try{c=!1,i.send(b,k)}catch(e){if(c)throw e;k(-1,e)}}else k(-1,"No Transport");function k(t,n,r,s){var l,p,d,b,T,C=n;c||(c=!0,u&&e.clearTimeout(u),i=void 0,a=s||"",E.readyState=t>0?4:0,l=t>=200&&t<300||304===t,r&&(b=Xt(h,E,r)),b=Ut(h,b,E,l),l?(h.ifModified&&((T=E.getResponseHeader("Last-Modified"))&&(w.lastModified[o]=T),(T=E.getResponseHeader("etag"))&&(w.etag[o]=T)),204===t||"HEAD"===h.type?C="nocontent":304===t?C="notmodified":(C=b.state,p=b.data,l=!(d=b.error))):(d=C,!t&&C||(C="error",t<0&&(t=0))),E.status=t,E.statusText=(n||C)+"",l?v.resolveWith(g,[p,C,E]):v.rejectWith(g,[E,C,d]),E.statusCode(x),x=void 0,f&&y.trigger(l?"ajaxSuccess":"ajaxError",[E,h,l?p:d]),m.fireWith(g,[E,C]),f&&(y.trigger("ajaxComplete",[E,h]),--w.active||w.event.trigger("ajaxStop")))}return E},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,t){return w.get(e,void 0,t,"script")}}),w.each(["get","post"],function(e,t){w[t]=function(e,n,r,i){return g(n)&&(i=i||r,r=n,n=void 0),w.ajax(w.extend({url:e,type:t,dataType:i,data:n,success:r},w.isPlainObject(e)&&e))}}),w._evalUrl=function(e){return w.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},w.fn.extend({wrapAll:function(e){var t;return this[0]&&(g(e)&&(e=e.call(this[0])),t=w(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return g(e)?this.each(function(t){w(this).wrapInner(e.call(this,t))}):this.each(function(){var t=w(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=g(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){w(this).replaceWith(this.childNodes)}),this}}),w.expr.pseudos.hidden=function(e){return!w.expr.pseudos.visible(e)},w.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},w.ajaxSettings.xhr=function(){try{return new e.XMLHttpRequest}catch(e){}};var Vt={0:200,1223:204},Gt=w.ajaxSettings.xhr();h.cors=!!Gt&&"withCredentials"in Gt,h.ajax=Gt=!!Gt,w.ajaxTransport(function(t){var n,r;if(h.cors||Gt&&!t.crossDomain)return{send:function(i,o){var a,s=t.xhr();if(s.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(a in t.xhrFields)s[a]=t.xhrFields[a];t.mimeType&&s.overrideMimeType&&s.overrideMimeType(t.mimeType),t.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");for(a in i)s.setRequestHeader(a,i[a]);n=function(e){return function(){n&&(n=r=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Vt[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=n(),r=s.onerror=s.ontimeout=n("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&e.setTimeout(function(){n&&r()})},n=n("abort");try{s.send(t.hasContent&&t.data||null)}catch(e){if(n)throw e}},abort:function(){n&&n()}}}),w.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return w.globalEval(e),e}}}),w.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),w.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(i,o){t=w(" + + diff --git a/src/pages/processCenter/pages/creatProcess/bzff/step1.vue b/src/pages/processCenter/pages/creatProcess/bzff/step1.vue new file mode 100644 index 000000000..f4897e00b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzff/step1.vue @@ -0,0 +1,363 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzfy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzfy/step1.vue index bddf09f1e..aa54cb1a1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzfy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzfy/step1.vue @@ -10,9 +10,9 @@
审批历史
-
-
基础信息
-
+ + + -
-
填写信息
-
+ + +
标准需求列表
@@ -304,6 +304,7 @@ - - + From 16f2fd367d63f3666d218f691a359df311184bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 10 Jun 2021 11:24:19 +0800 Subject: [PATCH 014/528] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B3=95=E8=A7=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 11 +- .../domesticStandardsAndRegulations/index.vue | 7 - .../foreignStandardsAndRegulations/index.vue | 183 ++++-------------- 3 files changed, 44 insertions(+), 157 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 6d7118a59..59880e236 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -88,16 +88,17 @@ export default { path: '/domesticStandardsAndRegulations', menuId: 'A59EFAQ7AC' }, - { - title: '标准征求意见', - path: '/standardForComments', - menuId: '' - }, { title: '海外标准法规', path: '/foreignStandardsAndRegulations', menuId: '6K8A2RZYRE' }, + { + title: '标准征求意见', + path: '/standardForComments', + menuId: '' + }, + // { // title: '国内外政策', // path: '/foreignRegulationsDatabase', diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index d10b5e7c4..039fe35a5 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -840,13 +840,6 @@ 确认
- - - - - - -
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 3a28fcc5b..c05fe805c 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -64,60 +64,56 @@ icon="el-icon-search" type="primary" class="common-button-primary" - round + size="mini" @click="searchBtnClick(standCommonlySearch)"> - 高级查询 + 高级查询
- +
新增 导入 导出 - - - - 批量删除 移除标准 模板下载 配置标准
@@ -171,8 +167,6 @@ width="150px" label="新车型实施日期"> @@ -182,8 +176,6 @@ width="150px" label="在产车实施日期"> @@ -198,11 +190,6 @@ - - - - - @@ -183,13 +183,13 @@ + label="文本状态"> @@ -304,9 +304,9 @@ - - 文本状态 + @@ -758,8 +758,8 @@ @@ -840,7 +840,8 @@ 确认
- +
@@ -862,39 +863,35 @@ :options="standSortOptions" clearable/> - + - {{ opt.label}} - - + + {{ opt.label}} + - + + {{ opt.label}} + - {{ opt.label}} @@ -1012,7 +1009,7 @@ export default { standSortOptions: [], // 标准类别下拉框 standSortConfigOptions: [], // 标准类别下拉框 applyArcticOptions: [], // 适用车型下拉框 - standStateOptions: [], // 标准状态下拉框 + standStateOptions: [], // 文本状态下拉框 standNatureOptions: [], // 标准性质下拉框 adoptExtentOptions: [], // 采标程度下拉框 emergyKindOptions: [], // 能源种类下拉框 @@ -1517,7 +1514,7 @@ export default { this.threeOptions = this.countryOptions } else if (val === 'stand_sort') { this.threeOptions = this.standSortOptions - } else if (val === 'stand_state') { + } else if (val === 'stand_state_show') { this.threeOptions = this.standStateOptions } else if (val === 'stand_nature') { this.threeOptions = this.standNatureOptions @@ -1633,7 +1630,6 @@ export default { this.modalshowtitle = '编辑国内标准' this.modalshowflag = true this.resolveFormFieldList(item.isRelateAccess) - this.$nextTick(() => { Promise.all([this.queryDisplayLocation()]).then((values) => { const [displayLocation] = values @@ -1799,13 +1795,19 @@ export default { this.getDomesticStandardTable(item) }, // 搜索 - getDomesticStandardTableBtn (advancedSearch) { - let item = {} - item.page = 1 - item.advanceSearchStr = '' - item.advanceSearchVOStr = JSON.stringify(advancedSearch) || '' - this.getDomesticStandardTable(item) + getDomesticStandardTableBtn (item) { + this.tableFlag = item + item.page = 1 + item.sarStandardsSearch = '' + this.getDomesticStandardTable(item) }, + // getDomesticStandardTableBtn (advancedSearch) { + // let item = {} + // item.page = 1 + // item.advanceSearchStr = '' + // item.advanceSearchVOStr = JSON.stringify(advancedSearch) || '' + // this.getDomesticStandardTable(item) + // }, // 清空搜索框 clearAllSearch (flag) { if (flag === 'sarStandardsSearch') { @@ -1849,9 +1851,8 @@ export default { }, // 高级检索 selectMoreBtn () { - console.log('检索窗口') this.isAdvancedSearch = true - this.threeOptions = [] + this.sarStandardsSearch = [] }, treeCollapse () { this.sideClose = !this.sideClose @@ -2389,7 +2390,7 @@ export default { sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField] }) nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") - this.$http.postData(this.addOrUPdateFlag === 1 ? 'lawss/sarStandardsInfo/addarStandardsInfo' : 'lawss/sarStandardsInfo/updateSarStandardsInfo', nowstandinfo, { + this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'lawss/sarStandardsInfo/updateSarStandardsInfo', nowstandinfo, { _this: this }, res => { this.isSubmit = false @@ -2508,7 +2509,7 @@ export default { this.sarConfigStandSearch.page = this.configPage // this.sarConfigStandSearch.pageSize = this.configRows this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.sarConfigStandSearch, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, { _this: this, loading: 'loading' }, res => { @@ -2675,7 +2676,7 @@ export default { // this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString() // (this.replaceStandNumForm.quoteIdList) // } - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceStandNumForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceStandNumForm, { _this: this // loading: 'lawsExplainQuoteFormLoading' }, res => { @@ -2907,7 +2908,7 @@ export default { if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') { this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString() } - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.lawsExplainQuoteForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, { _this: this, loading: 'lawsExplainQuoteFormLoading' }, res => { @@ -3208,8 +3209,8 @@ export default { disabled: false }, { - label: '标准状态', - value: 'stand_state', + label: '文本状态', + value: 'stand_state_show', type: 'SEL_OPTION', disabled: false }, @@ -3283,7 +3284,7 @@ export default { */ queryDisplayLocation () { return new Promise((resolve, reject) => { - this.$http.get('sarStandardsInfo/sar-standards-info/addarStandardsInfo', { + this.$http.get('lawssBase/utArea/getAreaList', { sarType: this.sarType }, { _this: this @@ -3342,7 +3343,7 @@ export default { } // isEdit 为0 标准状态不是必填 if (isEdit === '0') { - rules.standState = [{required: false, message: '标准状态不能为空', trigger: 'change'}] + rules.standState = [{required: false, message: '文本状态不能为空', trigger: 'change'}] rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}] } if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') { From 1811bd75124fe8d1974b6761965b2e8b73a41869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 16 Jun 2021 17:59:15 +0800 Subject: [PATCH 027/528] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home1/components/conferenceMaterials/index.vue | 1 + src/pages/home1/components/realtimeinfo/index.vue | 1 + src/pages/home1/components/release/index.vue | 1 + src/pages/home1/components/solicitopinions/index.vue | 1 + 4 files changed, 4 insertions(+) diff --git a/src/pages/home1/components/conferenceMaterials/index.vue b/src/pages/home1/components/conferenceMaterials/index.vue index 6b19ee5b2..d00a6394c 100644 --- a/src/pages/home1/components/conferenceMaterials/index.vue +++ b/src/pages/home1/components/conferenceMaterials/index.vue @@ -72,6 +72,7 @@ export default { color: #FFFFFF; &:hover { color: #e9c851; + cursor:pointer; text-decoration: underline; } } diff --git a/src/pages/home1/components/realtimeinfo/index.vue b/src/pages/home1/components/realtimeinfo/index.vue index 94f315cdc..ccfcc8ccf 100644 --- a/src/pages/home1/components/realtimeinfo/index.vue +++ b/src/pages/home1/components/realtimeinfo/index.vue @@ -60,6 +60,7 @@ export default { color: #ffffff; &:hover { color: #e9c851; + cursor:pointer; text-decoration: underline; } } diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue index 11e76a840..ec4dd0162 100644 --- a/src/pages/home1/components/release/index.vue +++ b/src/pages/home1/components/release/index.vue @@ -61,6 +61,7 @@ export default { color: #ffffff; &:hover { color: #e9c851; + cursor:pointer; text-decoration: underline; } } diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue index 347efcbb6..65245e048 100644 --- a/src/pages/home1/components/solicitopinions/index.vue +++ b/src/pages/home1/components/solicitopinions/index.vue @@ -67,6 +67,7 @@ export default { color: #ffffff; &:hover { color: #e9c851; + cursor:pointer; text-decoration: underline; } } From bbd3506c4ec8aa9e68dfdd98250aa7e0e772c6e7 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 16 Jun 2021 18:02:54 +0800 Subject: [PATCH 028/528] commit --- .../pages/standInvolveProject.vue | 347 +----------------- .../pages/standInvolveProjectDetail.vue | 1 - .../pages/technologyInvolveProject.vue | 27 +- 3 files changed, 11 insertions(+), 364 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue index cb3e65a42..e41e44075 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue @@ -31,353 +31,8 @@ export default { tabValue: 'standInvolveProjectDetail' } }, - methods: { - /** - * 查看项目符合性弹框里面的 - * 符合性状态列点击事件 - */ - handleSarStateClick(row) { - if (row.sarState === 8) { - return - } - // console.log(row) - this.showSarProStateModal2 = true - this.saveClickProductId = row.productId - this.queryItemsBySar() - }, - /** - * 查看项目 条款 弹框里面的 - * 符合性状态列点击事件 - */ - handleItemClick(row) { - const processList = row.process ? row.process.split(',') : [] - console.log(processList) - this.processList = processList.map(item => { - return { - processNumber: item - } - }) - this.processListVisible = true - }, - /** - * 查看项目 条款 流程编号弹框里面的 - * 流程编号点击事件 - */ - handleProcessClick(row) { - const processNumber = row.processNumber - this.$store.commit('setDetailMap', this.$route.path) - this.$router.push({ - name: 'ProcessDetail', - query: { - prcNum: processNumber - } - }) - }, - // 返回 - back () { - this.$router.push(this.$store.state.detailMap) - this.$store.commit('setDetailMap', '') - }, - // 列表操作栏 ... - handleCommand (command) { - switch (command[1]) { - case '查看项目符合性': - this.handleProjectCompliance(command[0]) - break - } - }, - // 符合性项目列表操作 - handleCommandInside (command) { - switch (command[1]) { - case '编辑': - this.handleEdit(command[0]) - break - // case '查看': - // this.handleProjectCompliance(command[0]) - // break - } - }, - searchStandAndLaws () { - this.page = 1 - this.queryStandAndLaws() - }, - // 分页查询 - queryStandAndLaws () { - this.sarProject.page = this.page - this.sarProject.pageSize = this.pageSize - this.SarExportSearchEo = this.sarProject - this.$http.get('lawss/sarProductStand/queryStandAndLawsByPage', this.sarProject, { - _this: this, - loading: 'loading', - }, res => { - console.log(res.data.list) - console.log(res.data.count) - this.sarProjectListDatas = res.data.list - this.total = res.data.count - }, e => { - }) - }, - // 分页查询条目符合性 - queryItemsBySar () { - this.sarItem2.page = this.itemsPage - this.sarItem2.pageSize = this.itemsPageSize - this.sarItem2.standId = this.saveSarId - this.sarItem2.standType = this.saveSarType - this.sarItem2.productId = this.saveClickProductId - this.$http.get('lawss/sarProductSarState/page', this.sarItem2, { - _this: this, - loading: 'loading3' - }, res => { - // this.sarItemListDatas = res.data.list - // this.sarItemTotal = res.data.count - this.sarProStateListDatas2 = res.data.list - this.sarProStateTotal2 = res.data.count - }, e => { - }) - }, - // 外层清空条件查询 - resetSelect () { - this.sarProject.country = '' - this.sarProject.standCode='' - this.sarProject.standName = '' - this.queryStandAndLaws() - }, - // 查看项目符合性 - handleProjectCompliance (row) { - this.saveSarId = row.standId - this.saveSarType = row.standType - this.exportShowName = row.standName - this.sarItem.productCode = '' - this.sarItem.productName = '' - // this.queryItemsBySar() - this.row = row - - // 原方案 - // if (this.row.isExistItems === 1) { - // this.isExistItems = 1 - // this.standNum = this.row.standCode - // // this.querySarProStateFirst() - // this.saveSarId = this.row.standId - // this.queryItemsBySar() - // this.showSarProStateModal = true - // } else { - // this.isExistItems = 0 - // this.querySarProStateZero() - // this.showSarProStateModal = true - // } - - // 现阶段方案 - this.isExistItems = 0 - this.querySarProStateZero() - this.showSarProStateModal = true - - }, - handleProjectPreview (row) { - this.saveClickProductId = row.productId - this.saveSarProductId = row.id - this.queryItemsBySar() - this.showSarItemModal = true - }, - // 如果isExistItems === 0查看标准在项目中符合性列表 - querySarProStateZero () { - // let queryUrl = '' - this.sarProStateEO.page = this.sarProStatePage - this.sarProStateEO.pageSize = this.sarProStatePageSize - this.sarProStateEO.standId = this.saveSarId - this.sarProStateEO.standType = this.saveSarType - this.$http.get('lawss/sarProductStand/queryInvolveProByPage', this.sarProStateEO, { - _this: this, - loading: 'loading2' - }, res => { - this.sarProStateListDatas = res.data.list - this.sarProStateTotal = res.data.count - }, e => { - }) - }, - // 如果isExistItems === 1 查看标准在项目中符合性列表 - querySarProStateFirst () { - // let queryUrl = '' - this.sarProStateEO2.page = this.sarProStatePage2 - this.sarProStateEO2.pageSize = this.sarProStatePageSize2 - // this.sarProStateEO.standId = this.saveSarId - // this.sarProStateEO.standType = this.saveSarType - this.sarProStateEO2.standNum = this.standNum - this.$http.get('lawss/sarInconformItem/queryInvolveItems', this.sarProStateEO2, { - _this: this, - loading: 'loading' - }, res => { - this.sarProStateListDatas2 = res.data.list - this.sarProStateTotal2 = res.data.count - }, e => { - }) - }, - // 列表多选 - sarProductStateSelect (val) { - console.log(val) - }, - // 列表多选 - sarProductStateSelect2 (val) { - console.log(val) - }, - // 清空条件查询 - clearSearchProState () { - this.sarProStateEO.productCode = '' - this.sarProStateEO.productName = '' - if (this.isExistItems === 0) { - this.querySarProStateZero() - } else { - this.querySarProStateFirst() - } - }, - // 清空条件查询 - clearSearchProState2 () { - this.sarProStateEO2.productCode = '' - this.sarProStateEO2.productName = '' - this.querySarProStateFirst() - - }, - // 清空查询 - clearSearchPro () { - this.sarProStateEO.productCode = '' - this.sarProStateEO.productName = '' - this.showSarProStateModal = false - }, - // 清空查询 - clearSearchPro2 () { - this.sarProStateEO2.productCode = '' - this.sarProStateEO2.productName = '' - this.showSarProStateModal2 = false - }, - // 项目符合性分页 - pageProStateChange (page) { - this.sarProStatePage = page - this.querySarProStateZero() - }, - pageProStateSizeChange (pageSize) { - this.sarProStatePageSize = pageSize - this.querySarProStateZero() - }, - // 项目符合性分页 - pageProStateChange2 (page) { - this.sarProStatePage2 = page - this.querySarProStateFirst() - }, - pageProStateSizeChange2 (pageSize) { - this.sarProStatePageSize2 = pageSize - this.querySarProStateFirst() - }, - // 编辑符合性弹窗打开 - handleEdit (row) { - this.saveSarProductId = row.id - this.editSarComEO.sarState = row.sarState - this.editSarComModal = true - }, - // 编辑符合性弹窗关闭 - handleClose () { - if (this.isExistItems === 0) { - this.editSarComEO = {...this.editSarComEODefault} - } else { - this.editSarComEO2 = {...this.editSarComEODefault2} - } - this.$refs['editSarComEO'].clearValidate() - this.editSarComModal = false - }, - // 符合性弹窗修改保存 - updateSarState () { - if (this.isExistItems === 0) { - const data = {} - data.sarType = this.saveSarType - data.id = this.saveSarProductId - data.sarItemState = this.editSarComEO.sarState - this.$http.putData('lawss/sarProductSarState/updateSarState', data, { - _this: this - }, res => { - this.editSarComModal = false - this.querySarProStateZero() - }, e => {}) - } else { - const data = {} - data.sarType = this.saveSarType - data.id = this.saveSarProductId - data.sarItemState = this.editSarComEO.itemState - this.$http.putData('lawss/sarProductSarState/updateState', data, { - _this: this - }, res => { - this.editSarComModal = false - this.queryItemsBySar() - // const data = {} - // data.sarType = this.saveSarType - // data.itemState = this.editSarComEO.itemState - // data.id = this.saveSarProductId - // this.$http.putData('lawss/sarInconformItem/updateItem', data, { - // _this: this - // }, res => { - // this.editSarComModal = false - // this.querySarProStateFirst() - }, e => {}) - } - }, - // 导出多选， table列表多选 - getSelectedDatas (selection) { - this.saveSelectedDatas = selection - }, - // 点击导出按钮 - showExportModal (type) { - // 区别是选择导出还是全部导出 - this.saveExportType = type - if (type === 'apart') { - if (this.saveSelectedDatas != null && this.saveSelectedDatas.length > 0) { - this.exportName = '' - this.exportModelFlag = true - } else { - this.$message.error('请选择要导出的数据') - } - } else { - this.exportName = '' - this.exportModelFlag = true - } - }, - // 确认导出 - exportSarProduct () { - if (this.exportName === '' || this.exportName === null || this.exportName === 'null') { - this.exportName = '标准涉及项目' - } - let jsonData = '' - if (this.saveExportType === 'apart') { - jsonData = JSON.stringify(this.saveSelectedDatas) - } else if (this.saveExportType === 'all') { - let exportEOStr = JSON.stringify(this.SarExportSearchEo) - jsonData = exportEOStr.replace(/""/g, null) - } - window.location.href = '/api/lawss/sarProductLaws/exportSarProduct?jsonData=' + jsonData + '&exportType=' + this.saveExportType + '&exportName=' + this.exportName - this.saveSelectedDatas = [] - this.exportModelFlag = false - this.queryStandAndLaws() - }, - // 外层分页方法 - pageChange (page) { - this.page = page - this.queryStandAndLaws() - }, - pageSizeChange (pageSize) { - this.pageSize = pageSize - this.queryStandAndLaws() - } - }, + methods: {}, mounted () { - // 分页查询方法 - this.queryStandAndLaws() - //从数据库中查询下拉框数据 - this.$http.get('sys/dictype/getDicTypeListCode', '',{ - _this:this - },res =>{ - this.countryOptions = res.data.COUNTRY //国家 - }, e => { - }) - this.tableHeight = $('.regulatory-repository').height() - 53 - 50 - 56 - window.onresize = () => { - this.tableHeight = $('.regulatory-repository').height() - 53 - 50 - 56 - } } } diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index e988f9a5b..afb2a0fc9 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -22,7 +22,6 @@ -
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 02fede51f..08b4a50b8 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -5,7 +5,7 @@
- @@ -381,12 +381,9 @@ name: "technologyInvolveProject", SarProStateType: '', // 条件查询 sarProject: { - // 国家地区 - country: '', - // 标准/政策号 - standCode: '', - // 标准政策名称 - standName: '' + standName: '', // 标准政策名称 + standNumber: '', // 标准/政策号 + standApplicationType: 2 }, // table数据 sarProjectListDatas: [], @@ -593,19 +590,15 @@ name: "technologyInvolveProject", }, // 分页查询 queryStandAndLaws () { - this.sarProject.page = this.page - this.sarProject.pageSize = this.pageSize - this.SarExportSearchEo = this.sarProject - this.$http.get('lawss/sarCompResAssess/page', this.sarProject, { + this.sarProject.current = this.page + this.sarProject.size = this.pageSize + this.$http.get('sarStandardComplianceAssessResult/standard', this.sarProject, { _this: this, loading: 'loading', }, res => { - console.log(res.data.list) - console.log(res.data.count) - this.sarProjectListDatas = res.data.list - this.total = res.data.count - }, e => { - }) + this.sarProjectListDatas = res.data.records + this.total = res.data.total + }, e=> {}) }, // 分页查询条目符合性 queryItemsBySar () { From c9bacd743635fbca7a64f1d27a5237ebcb352810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Jun 2021 09:11:07 +0800 Subject: [PATCH 029/528] commit --- src/pages/home1/components/solicitopinions/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue index 65245e048..2da7e6647 100644 --- a/src/pages/home1/components/solicitopinions/index.vue +++ b/src/pages/home1/components/solicitopinions/index.vue @@ -3,7 +3,7 @@
@@ -37,7 +37,6 @@ export default { this.$http.get('slrs/sar-public-idea/SelectAllPage', {}, { _this: this }, res => { - console.log('41',res) this.domesticDynamics = res.data.records }, e => { From 8978911b41d73468c7428cf7ec1fb91ac106bedc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Jun 2021 14:22:04 +0800 Subject: [PATCH 030/528] commit --- .../domesticStandardsAndRegulations/index.vue | 4 ++-- .../foreignStandardsAndRegulations/index.vue | 12 ++++++------ src/sysConfig/index.js | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 4a3275424..67801d0cf 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2042,7 +2042,7 @@ export default { menuId: treeNode.id, idlist: this.selectedList.length ? this.selectedList : dragId } - this.$http.postData('lawss/sarStandardsInfo/saveStandardsMenu', search, { + this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, { _this: this }, res => { if (res.ok) { @@ -3172,7 +3172,7 @@ export default { }) } else { search.idlist = this.selectConfigStand - this.$http.postData('lawss/sarStandardsInfo/saveStandardsMenu', search, { + this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, { _this: this, loading: 'isSubmit' }, res => { diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index c40f1b57e..443894147 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -1979,7 +1979,7 @@ export default { menuId: treeNode.id, idlist: this.selectedList.length ? this.selectedList : dragId } - this.$http.postData('lawss/sarStandardsInfo/saveStandardsMenu', search, { + this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, { _this: this }, res => { if (res.ok) { @@ -2226,7 +2226,7 @@ export default { } else { this.importModalshowflag = true this.showUploadlist = true - this.importExcelUrl = '/api/lawss/sarStandardsInfo/importZipStandardsInfo?standType=FOREIGN&menuId=' + menuId + this.importExcelUrl = '/api/sarStandardsInfo/sar-standards-info/importZipStandardsInfo?standType=FOREIGN&menuId=' + menuId } } else { this.importModalshowflag = true @@ -2475,7 +2475,7 @@ export default { this.sarConfigStandSearch.page = this.configPage // this.sarConfigStandSearch.pageSize = this.configRows this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.sarConfigStandSearch, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, { _this: this, loading: 'loading' }, res => { @@ -2654,7 +2654,7 @@ export default { // this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString() // (this.replaceStandNumForm.quoteIdList) // } - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceStandNumForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceStandNumForm, { _this: this // loading: 'lawsExplainQuoteFormLoading' }, res => { @@ -2843,7 +2843,7 @@ export default { if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') { this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString() } - this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.lawsExplainQuoteForm, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, { _this: this, loading: 'lawsExplainQuoteFormLoading' }, res => { @@ -3090,7 +3090,7 @@ export default { }) } else { search.idlist = this.selectConfigStand - this.$http.postData('lawss/sarStandardsInfo/saveStandardsMenu', search, { + this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, { _this: this, loading: 'isSubmit' }, res => { diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index f43adce8e..efa7258d3 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -30,8 +30,8 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 -const prodIp = '39.98.140.126' -const prodInterfacePORT = '10005' +const prodIp = '101.36.227.25' +const prodInterfacePORT = '8033' // 判断环境 From a623ea65e9b205421d94a241faec0b5259498a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 17 Jun 2021 15:37:45 +0800 Subject: [PATCH 031/528] commit --- .../foreignStandardsAndRegulations/index.vue | 54 +++++++------------ 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 443894147..0c0fd9c14 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -236,7 +236,8 @@ 提交 - +
@@ -258,39 +259,35 @@ :options="standSortOptions" clearable/> - + - {{ opt.label}} - - + + {{ opt.label}} + - + + {{ opt.label}} + - {{ opt.label}} @@ -1004,7 +1001,7 @@ export default { standSort: '', standNumber: '', menuId: '', - advanceSearchVOStr: '' + sarStandardsSearch: '' }, searching: false, stahndinfoList: [], @@ -1748,9 +1745,9 @@ export default { this.getDomesticStandardTable() }, // 搜索 - getDomesticStandardTableBtn (advancedSearch) { + getDomesticStandardTableBtn (sarStandardsSearch) { this.standCommonlySearch.page = 1 - this.standCommonlySearch.advanceSearchVOStr = JSON.stringify(advancedSearch) || '' + this.standCommonlySearch.sarStandardsSearch = JSON.stringify(sarStandardsSearch) || '' this.getDomesticStandardTable(2) }, // 清空搜索框 @@ -2045,7 +2042,6 @@ export default { // this.$refs['sarStandardsInfoForm'].resetFields() }) this.getOrgTreeSource() - // this.changeInlandSubclassVal() this.resolveFormFieldList() Promise.all([this.queryDisplayLocation()]).then((values) => { const [displayLocation] = values @@ -2417,7 +2413,7 @@ export default { data.standSort = '' data.standNumber = '' } else { - data.advanceSearchVOStr = '' + data.sarStandardsSearch = '' } const formData = {...data} formData.menuId = this.selectSarMenu.id @@ -2441,6 +2437,7 @@ export default { this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { _this: this, loading: 'loading' }, res => { + console.log('2441',formData); this.isAdvancedSearch = false if (res.ok) { for (let i = 0; i < res.data.list.length; i++) { @@ -2490,18 +2487,6 @@ export default { }, e => { }) }, - changeInlandSubclassVal () { - this.sarStandardsInfoEO.standSort = '' - this.$http.get('sys/dictype/pageStandClassify', { - dicTypeCode: 'CN' - }, { - _this: this - }, res => { - this.standSortOptions = res.data - this.standSortConfigOptions = res.data - }, e => { - }) - }, // 获取组织机构数据 getOrgTreeSource () { this.$http.get('sys/org/getTree', {}, { @@ -3565,7 +3550,6 @@ export default { this.getGzzOption() }, e => { }) - // this.changeInlandSubclassVal() this.getDomesticStandardTable() // 加载所有的部门 this.getOrgTreeSource() From b7d3dc84d38c44ad362af368e42ecb9569a1354a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 17 Jun 2021 17:56:17 +0800 Subject: [PATCH 032/528] commit --- .../pages/creatProcess/bzrk/step1.vue | 574 +++++++------ .../pages/standInvolveProjectDetail.vue | 758 ++---------------- .../pages/technologyInvolveProject.vue | 703 ++-------------- 3 files changed, 506 insertions(+), 1529 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 28005569e..aced02f51 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -23,90 +23,109 @@
- - - 国内标准入库 - 海外标准入库 + + + 国内标准入库 + 海外标准入库 - - - - + + + - + - + - + - - + + 是 否 - + - - - - - + + + - - - - - - - - - - + + + - + - - + + 是 否 - + + + + + + @@ -119,46 +138,46 @@
- + - + - + - + - + - + @@ -172,9 +191,9 @@
- -
- {{ form.file1 }} + +
+ {{ form.xgd }}
- -
- {{ form.file2 }} + +
+ {{ form.fbgbjbd }}
- -
- {{ form.file3 }} + +
+ {{ form.zbjbd }}
- -
- {{ form.file4 }} + +
+ {{ form.bpg }} +
+
+ + 点击上传 + +
+ + +
+ {{ form.ssg }}
- -
- {{ form.file5 }} + +
+ {{ form.kwj }}
- -
- {{ form.file6 }} + +
+ {{ form.zqyjg }}
- -
- {{ form.file7 }} + +
+ {{ form.ca }} +
+
+ + 点击上传 + +
+ + +
+ {{ form.jdwj }}
- - - - - - - - - - + + + - - - 主持 - 参与 - N/A - - - - - - + + + - - + + + + + + + - - + + - - + + + + + + + + + + + + + - - - - + + + - - - - + + + - - - - + + + - - - - - - - - - - - - - + - + - + + + + + + + + + + + +
@@ -387,59 +477,29 @@
- + - - + + - + - - - - - - - - - - - - - - - -
- {{ form.file8 }} + +
+ {{ form.glwj }}
+ + + + + + + + + + + + + +
@@ -546,60 +636,76 @@ saveLoading: false, form: { // 基础信息 - TextTypes: '', // 文本状态 - year: '', // 标准年份 - type: '', // 标准类型 - types: '', // 标准类别 - number: '', // 标准编号 - nature: '', // 标准性质 - ENname: '', // 英文名称 - CNname: '', // 中文名称 - jointlySign: '', // 是否需要会签 - time: '', // 发布时间 - detailedList: '', // 是否纳入认证清单 - system: '',// 标准体系 + textStatus: '', // 文本状态 + standYear: '', // 标准年份 + standInData: '0', // 标准类型 + standSort: '', // 标准类别 + standNumber: '', // 标准编号 + standNature: '', // 标准性质 + standEnName: '', // 英文名称 + standName: '', // 中文名称 + signFlag: '', // 是否需要会签 + issueTime: '', // 发布时间 + isRelateAccess: '', // 是否纳入认证清单 + standSystem: '',// 标准体系 + gxhbq: '', // 标签 // 实施日期 - time1: '', // 实施日期(标准文本) - time2: '', // 新车型实施日期(标准文本) - time3: '', // 在产车实施日期(标准文本) - time4: '', // 实施日期(国际) - time5: '', // 新车型实施日期(国际) - time6: '', // 在产车实施日期(国际) + ssrq: '', // 实施日期(标准文本) + xcxssrq: '', // 新车型实施日期(标准文本) + zccssrq: '', // 在产车实施日期(标准文本) + ssrqgj: '', // 实施日期(国际) + xcxssrqgj: '', // 新车型实施日期(国际) + zccssrqgj: '', // 在产车实施日期(国际) // 文本信息 - file1: '', // 修改单 - file2: '', // 发布稿 - file3: '', // 报批稿 - file4: '', // 送审稿 - file5: '', // 征求意见稿 - file6: '', // 草案 - file7: '', // 解读文件 + ca: '', // 草案 + fbgbjbd: '', // 发布稿 + xgd: '', // 修改单 + bpg: '', // 报批稿 + ssg: '', // 送审稿 + zqyjg: '', // 征求意见稿 + jdwj: '', // 解读文件 + zbjbd: '', // 增补件 + kwj: '', // 勘误件 // 适用范围 - AsDepartment: '', // 归口管理部门 - DraftingUnit: '', // 起草单位 - Subscribers: '', // 我司署名人 - depth: '', // 我司参与深度 - models: '', // 适用车型 - energy: '',// 能源类型 - ProductLine: '',// 适用产品线 - authentication: '', // 适用认证 - Rdepartment: '', // 责任部门 - Rengineer: '', // 责任工程师 - PassengerCarCode: '', // 关联模块--乘用车VPPS编码 - PassengerCarName: '', // 关联模块--乘用车vpps中文名称 - TruckCode: '', // 关联模块--卡车VPPS编码 - TruckName: '', // 关联模块--卡车vpps中文名称 - UnitModel: '', // 模块结构单元变型号 - UnitName: '', // 模块结构单元名称 + txlb: '', // 体系类别 + gkdw: '', // 归口管理部门 + fbjg: '', // 起草单位 + wssmr: '', // 我司署名人 + cysd: '', // 我司参与深度 + cllx: '', // 适用车型 + nylx: '',// 能源类型 + sycpx: '',// 适用产品线 + syrz: '', // 适用认证 + zrbm: '', // 责任部门 + zrgcs: '', // 责任工程师 + cycvppsbm: '', // 关联模块--乘用车VPPS编码 + cycvppscn: '', // 关联模块--乘用车vpps中文名称 + kccvppsbm: '', // 关联模块--卡车VPPS编码 + kccvppscn: '', // 关联模块--卡车vpps中文名称 + dybxh: '', // 模块结构单元变型号 + dymc: '', // 模块结构单元名称 // 关联信息 - Dnumber: '', // 代替标准号 - Cnumber: '', // 采标编号 - degree: '', // 采标程度 - Rstandard: '', // 引用标准 - BRstandard: '', // 被引用标准 - file8: '', // 关联文件 - Rprocesses: '', // 相关流程 - AttendanceRecord: '', // 参会记录 + dtbjh: '', // 代替标准号 + cbbh: '', // 采标编号 + cbcd: '', // 采标程度 + yybj: '', // 引用标准 + byybj: '', // 被引用标准 + glwj: '', // 关联文件 + xglc: '', // 相关流程 + chjl: '', // 参会记录 }, // 标准信息 + standSortOptions: [], // 标准类别 + standNatureOptions: [], // 标准性质 + standStateOptions: [], // 文本状态 + standSystemOptions: [], // 标准体系 + applyArcticOptions: [], // 适用车型 + categoryOptions: [], // 能源类型 + applyAuthOptions: [], // 适用认证 + cysdOptions: [], // 我司参与深度 + sycpxOptions: [], // 适用产品线 + zrbmOptions: [], // 责任部门 + zrgcsOptions: [], // 责任工程师 + txlbOptions: [], // 体系类别 data: [], // 标准列表数据 ListForm: {}, // 新增数据 user1: '', @@ -637,6 +743,22 @@ } }, mounted () { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + this.standStateOptions = res.data.WBZTCLASS // 文本状态 + this.standSystemOptions = res.data.BZTXCLASS // 标准体系 + this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 + this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.txlbOptions = res.data.TXLBCLASS // 体系类别 + }) } } diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index afb2a0fc9..31c69b2b7 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -3,17 +3,15 @@
- + - @@ -37,8 +35,7 @@ :data="sarProjectListDatas" class="table" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" - @selection-change="getSelectedDatas"> + fontWeight: 'bold', height: '48px'}"> - - - - - + @@ -137,7 +123,6 @@
+ fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
- - - - - - - - - - - - -
- 确 定 - - 取 消 -
- - 数据处理中 - - - - - -
-
-
-
- - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- 数据处理中 - - - - - -
-
- - - - - -
-
@@ -424,487 +233,90 @@ export default { name: 'standInvolveProjectDetail', data () { return { - // 条件查询 - sarProject: { - // 国家地区 - country: '', - // 标准/政策号 - standCode: '', - // 标准政策名称 - standName: '' - }, - // table数据 - sarProjectListDatas: [], - countryOptions: [], //国家选择下拉框数据 - drawerCountryOptions: [], // 准入信息 国家下拉框 - // table高度 - tableHeight: null, - // 列表页loading - loading: false, - loading2: false, - loading3: false, - // 外层列表页数据条数 - total: 0, - page: 1, - pageSize: this.$store.getters.userInfo.configContent, - // 导出时候用 - SarExportSearchEo: {}, - // 项目符合性数据 - saveSarId: '', - saveSarType: '', - exportShowName: '', - sarItem: { - standId: '', - standType: '', - productCode: '', - productName: '' - }, - sarItem2: { - standId: '', - standType: '', - productCode: '', - productName: '' - }, - // 新增、编辑 准入信息字段 - sarAccessEO: { - country: '', - }, - // 模态框内容 - sarItemTotal: 0, - itemsPage: 1, - itemsPageSize: this.$store.getters.userInfo.configContent, - sarItemListDatas: [], - conformStateOptions: [ - {label: '待验证', value: 1}, - {label: '符合', value: 2}, - {label: '不符合', value: 3}, - // {label: '部分符合', value: 4}, - {label: '不涉及', value: 5} - // {label: '评估中', value: 6}, - // {label: '整改中', value: 7}, - // {label: '未评估', value: 8} - ], - conformStateOptions1: [ - {label: '待验证', value: 1}, - {label: '符合', value: 2}, - {label: '不符合', value: 3}, - // {label: '部分符合', value: 4}, - {label: '不涉及', value: 5} - // {label: '评估中', value: 6}, - // {label: '整改中', value: 7}, - // {label: '未评估', value: 8} - ], - // 查看标准在项目中符合性数据 - showSarProStateModal: false, - showSarProStateModal2: false, - sarProStateEO: { - standId: '', - standType: '', - productCode: '', - productName: '' - }, - sarProStateEO2: { - standId: '', - standType: '', - productCode: '', - productName: '' - }, - sarProStateTotal: 0, - sarProStateTotalPage: 1, - sarProStatePageSize: this.$store.getters.userInfo.configContent, - sarProStateTotal2: 0, - sarProStateTotalPage2: 1, - sarProStatePageSize2: this.$store.getters.userInfo.configContent, - saveClickProductId: '', - saveSarProductId: '', - // 符合性查看弹窗的打开 - showSarItemModal: false, - // 符合性项目列表数据 - sarProStateListDatas: [], - // 符合性项目列表数据2 - sarProStateListDatas2: [], - // 符合性项目列表高度 - sarProStateTableHeight: null, - editSarComEO: { - id: '', - sarState: '' - }, - editSarComEODefault: { - id: '', - sarState: '' - }, - editSarComEO2: { - id: '', - itemState: '' - }, - editSarComEODefault2: { - id: '', - itemState: '' - }, - // 编辑弹窗打开 - editSarComModal: false, - // 选中一行查看符合性弹窗的标准号， - standNum: '', - // 用于切换分页，0，1 - isExistItems: '', - processList: [], - processListVisible: false + sarProject: { + standName: '', // 标准政策名称 + standNumber: '', // 标准/政策号 + standApplicationType: 1 + }, // 条件查询 + showSarProStateModal: false, // 查看drawer开关 + // table数据 + sarProjectListDatas: [], + // table高度 + tableHeight: null, + // 列表页loading + loading: false, + total: 0, + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + sarProStateEO: { + productName: '' + }, + sarProStateTotal: 0, + sarProStateTotalPage: 1, + sarProStatePageSize: this.$store.getters.userInfo.configContent, + sarProStateListDatas: [], // 符合性项目列表数据 + sarProStateTableHeight: null, // 符合性项目列表高度 } }, methods: { - changeState (row) { - console.log(row); - let routeUrl = this.$router.resolve({ - name: 'ComplianceDetails', - query: { - sarId: this.saveSarId, - productId: row.productId, - sarType: row.standType, - fromPage: 'product' - } - }) - window.open(routeUrl.href, '_blank') - }, - /** - * 查看项目符合性弹框里面的 - * 符合性状态列点击事件 - */ - handleSarStateClick(row) { - if (row.sarState === 8) { - return - } - // console.log(row) - this.showSarProStateModal2 = true - this.saveClickProductId = row.productId - this.queryItemsBySar() - }, - /** - * 查看项目 条款 弹框里面的 - * 符合性状态列点击事件2222 - */ - handleItemClick(row) { - const processList = row.process ? row.process.split(',') : [] - console.log(processList) - this.processList = processList.map(item => { - return { - processNumber: item - } - }) - this.processListVisible = true - }, - /** - * 查看项目 条款 流程编号弹框里面的 - * 流程编号点击事件 - */ - handleProcessClick(row) { - const processNumber = row.processNumber - this.$store.commit('setDetailMap', this.$route.path) - this.$router.push({ - name: 'ProcessDetail', - query: { - prcNum: processNumber - } - }) - }, - // 返回 - back () { - this.$router.push(this.$store.state.detailMap) - this.$store.commit('setDetailMap', '') - }, - // 列表操作栏 ... - handleCommand (command) { - switch (command[1]) { - case '查看项目符合性': - this.handleProjectCompliance(command[0]) - break - } - }, - // 符合性项目列表操作 - handleCommandInside (command) { - switch (command[1]) { - case '编辑': - this.handleEdit(command[0]) - break - // case '查看': - // this.handleProjectCompliance(command[0]) - // break - } - }, - searchStandAndLaws () { - this.page = 1 - this.queryStandAndLaws() - }, - // 分页查询 - queryStandAndLaws () { - this.sarProject.page = this.page - this.sarProject.pageSize = this.pageSize - this.SarExportSearchEo = this.sarProject - this.$http.get('lawss/sarProductStand/queryStandAndLawsByPage', this.sarProject, { - _this: this, - loading: 'loading', - }, res => { - console.log(res.data.list) - console.log(res.data.count) - this.sarProjectListDatas = res.data.list - this.total = res.data.count - }, e => { - }) - }, - // 分页查询条目符合性 - queryItemsBySar () { - this.sarItem2.page = this.itemsPage - this.sarItem2.pageSize = this.itemsPageSize - this.sarItem2.standId = this.saveSarId - this.sarItem2.standType = this.saveSarType - this.sarItem2.productId = this.saveClickProductId - this.$http.get('lawss/sarProductSarState/page', this.sarItem2, { - _this: this, - loading: 'loading3' - }, res => { - // this.sarItemListDatas = res.data.list - // this.sarItemTotal = res.data.count - this.sarProStateListDatas2 = res.data.list - this.sarProStateTotal2 = res.data.count - }, e => { - }) - }, - // 外层清空条件查询 - resetSelect () { - this.sarProject.country = '' - this.sarProject.standCode='' - this.sarProject.standName = '' - this.queryStandAndLaws() - }, - // 查看项目符合性 - handleProjectCompliance (row) { - this.saveSarId = row.standId - this.saveSarType = row.standType - this.exportShowName = row.standName - this.sarItem.productCode = '' - this.sarItem.productName = '' - this.row = row - this.$http.get('lawss/sarProductStand/isPermission', {standId: this.saveSarId}, { - _this: this, - loading: 'loading3' - }, res => { - if (res.ok){ - // 现阶段方案 - this.isExistItems = 0 + searchStandAndLaws () { + this.page = 1 + this.queryStandAndLaws() + }, // 查询 + pageChange (page) { + this.page = page + this.queryStandAndLaws() + }, + pageSizeChange (pageSize) { + this.pageSize = pageSize + this.$store.getters.userInfo.configContent = pageSize + this.queryStandAndLaws() + }, + queryStandAndLaws () { + this.sarProject.current = this.page + this.sarProject.size = this.pageSize + this.$http.get('sarStandardComplianceAssessResult/standard', this.sarProject, { + _this: this, + loading: 'loading', + }, res => { + this.sarProjectListDatas = res.data.records + this.total = res.data.total + }, e=> {}) + }, // 分页查询 + resetSelect () { + this.sarProject.country = '' + this.sarProject.standCode='' + this.sarProject.standName = '' + this.queryStandAndLaws() + }, // 外层清空条件查询 + handleProjectCompliance (row) { this.showSarProStateModal = true this.querySarProStateZero() - } else{ - this.$message.warning('当前标准已不存在') - } - }, e => { - }) - - - }, - handleProjectPreview (row) { - this.saveClickProductId = row.productId - this.saveSarProductId = row.id - this.queryItemsBySar() - this.showSarItemModal = true - }, - // 如果isExistItems === 0查看标准在项目中符合性列表 - querySarProStateZero () { - // let queryUrl = '' - this.sarProStateEO.page = this.sarProStatePage - this.sarProStateEO.pageSize = this.sarProStatePageSize - this.sarProStateEO.standId = this.saveSarId - this.sarProStateEO.standType = this.saveSarType - this.$http.get('lawss/sarProductStand/queryInvolveProByPage', this.sarProStateEO, { - _this: this, - loading: 'loading2' - }, res => { - this.sarProStateListDatas = res.data.list - this.sarProStateTotal = res.data.count - }, e => { - }) - }, - // 如果isExistItems === 1 查看标准在项目中符合性列表 - querySarProStateFirst () { - // let queryUrl = '' - this.sarProStateEO2.page = this.sarProStatePage2 - this.sarProStateEO2.pageSize = this.sarProStatePageSize2 - // this.sarProStateEO.standId = this.saveSarId - // this.sarProStateEO.standType = this.saveSarType - this.sarProStateEO2.standNum = this.standNum - this.$http.get('lawss/sarInconformItem/queryInvolveItems', this.sarProStateEO2, { - _this: this, - loading: 'loading' - }, res => { - this.sarProStateListDatas2 = res.data.list - this.sarProStateTotal2 = res.data.count - }, e => { - }) - }, - // 列表多选 - sarProductStateSelect (val) { - console.log(val) - }, - // 列表多选 - sarProductStateSelect2 (val) { - console.log(val) - }, - // 清空条件查询 - clearSearchProState () { - this.sarProStateEO.productCode = '' - this.sarProStateEO.productName = '' - if (this.isExistItems === 0) { - this.querySarProStateZero() - } else { - this.querySarProStateFirst() - } - }, - // 清空条件查询 - clearSearchProState2 () { - this.sarProStateEO2.productCode = '' - this.sarProStateEO2.productName = '' - this.querySarProStateFirst() - - }, - // 清空查询 - clearSearchPro () { - this.sarProStateEO.productCode = '' - this.sarProStateEO.productName = '' - this.showSarProStateModal = false - }, - // 清空查询 - clearSearchPro2 () { - this.sarProStateEO2.productCode = '' - this.sarProStateEO2.productName = '' - this.showSarProStateModal2 = false - }, - // 项目符合性分页 - pageProStateChange (page) { - this.sarProStatePage = page - this.querySarProStateZero() - }, - pageProStateSizeChange (pageSize) { - this.sarProStatePageSize = pageSize - this.querySarProStateZero() - }, - // 项目符合性分页 - pageProStateChange2 (page) { - this.sarProStatePage2 = page - this.querySarProStateFirst() - }, - pageProStateSizeChange2 (pageSize) { - this.sarProStatePageSize2 = pageSize - this.querySarProStateFirst() - }, - // 编辑符合性弹窗打开 - handleEdit (row) { - this.saveSarProductId = row.id - this.editSarComEO.sarState = row.sarState - this.editSarComModal = true - }, - // 编辑符合性弹窗关闭 - handleClose () { - if (this.isExistItems === 0) { - this.editSarComEO = {...this.editSarComEODefault} - } else { - this.editSarComEO2 = {...this.editSarComEODefault2} - } - this.$refs['editSarComEO'].clearValidate() - this.editSarComModal = false - }, - // 符合性弹窗修改保存 - updateSarState () { - if (this.isExistItems === 0) { - const data = {} - data.sarType = this.saveSarType - data.id = this.saveSarProductId - data.sarItemState = this.editSarComEO.sarState - this.$http.putData('lawss/sarProductSarState/updateSarState', data, { - _this: this - }, res => { - this.editSarComModal = false + }, // 查看项目符合性 + querySarProStateZero () {}, // 查询项目数据 + clearSearchProState () { + this.sarProStateEO.productName = '' this.querySarProStateZero() - }, e => {}) - } else { - const data = {} - data.sarType = this.saveSarType - data.id = this.saveSarProductId - data.sarItemState = this.editSarComEO.itemState - this.$http.putData('lawss/sarProductSarState/updateState', data, { - _this: this - }, res => { - this.editSarComModal = false - this.queryItemsBySar() - // const data = {} - // data.sarType = this.saveSarType - // data.itemState = this.editSarComEO.itemState - // data.id = this.saveSarProductId - // this.$http.putData('lawss/sarInconformItem/updateItem', data, { - // _this: this - // }, res => { - // this.editSarComModal = false - // this.querySarProStateFirst() - }, e => {}) - } - }, - // 导出多选， table列表多选 - getSelectedDatas (selection) { - this.saveSelectedDatas = selection - }, - // 点击导出按钮 - showExportModal (type) { - // 区别是选择导出还是全部导出 - this.saveExportType = type - if (type === 'apart') { - if (this.saveSelectedDatas != null && this.saveSelectedDatas.length > 0) { - this.exportName = '' - this.exportModelFlag = true - } else { - this.$message.error('请选择要导出的数据') - } - } else { - this.exportName = '' - this.exportModelFlag = true - } - }, - // 确认导出 - exportSarProduct () { - if (this.exportName === '' || this.exportName === null || this.exportName === 'null') { - this.exportName = '标准涉及项目' - } - let jsonData = '' - if (this.saveExportType === 'apart') { - jsonData = JSON.stringify(this.saveSelectedDatas) - } else if (this.saveExportType === 'all') { - let exportEOStr = JSON.stringify(this.SarExportSearchEo) - jsonData = exportEOStr.replace(/""/g, null) - } - window.location.href = '/api/lawss/sarProductLaws/exportSarProduct?jsonData=' + jsonData + '&exportType=' + this.saveExportType + '&exportName=' + this.exportName - this.saveSelectedDatas = [] - this.exportModelFlag = false - this.queryStandAndLaws() - }, - // 外层分页方法 - pageChange (page) { - this.page = page - this.queryStandAndLaws() - }, - pageSizeChange (pageSize) { - this.pageSize = pageSize - this.queryStandAndLaws() - } + }, // 清空条件查询 + clearSearchPro () { + this.sarProStateEO.productName = '' + this.showSarProStateModal = false + }, // 关闭查看事件 + pageProStateChange (page) { + this.sarProStateTotalPage = page + this.querySarProStateZero() + }, + pageProStateSizeChange (pageSize) { + this.sarProStatePageSize = pageSize + this.$store.getters.userInfo.configContent = pageSize + this.querySarProStateZero() + }, }, mounted () { - // 分页查询方法 this.queryStandAndLaws() - //从数据库中查询下拉框数据 - this.$http.get('sys/dictype/getDicTypeListCode', '',{ - _this:this - },res =>{ - this.countryOptions = res.data.COUNTRY //国家 - }, e => { - }) - this.tableHeight = $('.regulatory-repository').height() - 53 - 50 - 56 + this.tableHeight = $('.regulatory-repository').height() - 159 window.onresize = () => { - this.tableHeight = $('.regulatory-repository').height() - 53 - 50 - 56 + this.tableHeight = $('.regulatory-repository').height() - 159 } } } diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 08b4a50b8..446877c09 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -3,17 +3,15 @@
- + @@ -37,8 +35,7 @@ :data="sarProjectListDatas" class="table" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" - @selection-change="getSelectedDatas"> + fontWeight: 'bold', height: '48px'}"> @@ -186,6 +193,17 @@
+ + + + + + + + 取消 + 提交 + +
@@ -196,6 +214,8 @@ export default { return { loading: false, nonList:[], //未符合项表格数据 + exportModelFlag: false, //导出模态窗 + exportName: '', // 总数 total: 0, // 当前页数 @@ -214,7 +234,13 @@ export default { methods: { // 查询未符合项table列表 getTableByPage () { - console.log('查询符合项') + this.$http.get('sarStandUnqualified/sar-stand-unqualified', {}, { + _this: this + }, res => { + this.nonList = res.data.records + console.log(this.nonList); + }, e => { + }) }, // 点击历史记录按钮事件 historyClick () { @@ -222,6 +248,28 @@ export default { name: 'HistoricalData' }) }, + //导出 + exportStandard () { + this.exportModelFlag = true + }, + //取消导出 + cancal () { + this.exportModelFlag = false + }, + //确认导出 + exportTestItem () { + + }, + //批量关闭 + batchClose () { + this.$confirm('确认关闭这些数据?', '提示', { + confirmButtonText: '确定', + confirmButtonClass: 'common-button-primary', + cancelButtonTxe: '取消', + type: 'warning', + roundButton: false, + }) + }, // 清空 查询条件 clearAllSearch (search = true) { this.nonConformitySearch = { @@ -266,7 +314,9 @@ export default { this.getTableByPage() }, }, - mounted () {}, + mounted () { + this.getTableByPage() + }, }; @@ -283,7 +333,7 @@ export default { height: 100%; } .footer { - margin-bottom: 430px; + margin-bottom: 0; } } diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index efa7258d3..0756004e4 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,7 +6,7 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -const devIp = '192.168.10.47' +const devIp = '192.168.10.51' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' From dfc3b1297298e320da1c3ef6aec144751b2f486d Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 18 Jun 2021 11:11:44 +0800 Subject: [PATCH 034/528] commit --- .../pages/creatProcess/bzrk/step1.vue | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index aced02f51..db3a54aa2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -574,10 +574,9 @@ -

责任对接人

+

责任人

-
@@ -644,7 +643,7 @@ standNature: '', // 标准性质 standEnName: '', // 英文名称 standName: '', // 中文名称 - signFlag: '', // 是否需要会签 + signFlag: '1', // 是否需要会签 issueTime: '', // 发布时间 isRelateAccess: '', // 是否纳入认证清单 standSystem: '',// 标准体系 @@ -740,6 +739,24 @@ }, handleSave() {}, handleSubmit() { + var json = this.form + this.$http.get('lawss/activiti/startProcess', {type: '1'}, { + _this: this + }, res => { + if (res.ok) { + this.$http.post('lawss/activiti/completeTask', { + taskIds: res.data, + userId : this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + console.log(res); + if (res.ok) { + } + }) + } + }) } }, mounted () { From 41ef8fddfc68a3899318e75ebb118fa056b8f89c Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 18 Jun 2021 14:45:43 +0800 Subject: [PATCH 035/528] commit --- .../pages/creatProcess/bzrk/step1.vue | 3 + .../pages/standInvolveProjectDetail.vue | 76 ++++++++++++------- .../pages/technologyInvolveProject.vue | 60 +++++++++------ 3 files changed, 88 insertions(+), 51 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index db3a54aa2..e423ff5f4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -740,6 +740,9 @@ handleSave() {}, handleSubmit() { var json = this.form + json.zrUserId = this.$store.getters.userInfo.userId + json.jlUserId = this.$store.getters.userInfo.userId + json.applyUpdUserId = this.$store.getters.userInfo.userId this.$http.get('lawss/activiti/startProcess', {type: '1'}, { _this: this }, res => { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 31c69b2b7..f9679d2da 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -68,6 +68,11 @@ label="标准/政策名称" > + + { + if (res.ok) { + this.sarProStateListDatas = res.data.records + this.sarProStateTotal = res.data.total + } + }) + this.showSarProStateModal = true + }, // 查询项目数据 clearSearchProState () { - this.sarProStateEO.productName = '' - this.querySarProStateZero() + this.sarProStateEO.productName = '' + this.sarProStateTotalPage = 1 + this.querySarProStateZero() }, // 清空条件查询 clearSearchPro () { this.sarProStateEO.productName = '' diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 446877c09..6a9d684ba 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -14,6 +14,12 @@ placeholder="标准/政策名称查找" clearable> + + + + + + @@ -68,6 +74,11 @@ label="标准/政策名称" > + + Date: Fri, 18 Jun 2021 14:49:52 +0800 Subject: [PATCH 036/528] commit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 ++ .../pages/standInvolveProjectDetail.vue | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index e423ff5f4..dbe623393 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -743,6 +743,8 @@ json.zrUserId = this.$store.getters.userInfo.userId json.jlUserId = this.$store.getters.userInfo.userId json.applyUpdUserId = this.$store.getters.userInfo.userId + json.prcCreateUser = this.$store.getters.userInfo.userId + json.prcCreateUserName = this.$store.getters.userInfo.account this.$http.get('lawss/activiti/startProcess', {type: '1'}, { _this: this }, res => { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index f9679d2da..5606b96b1 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -321,8 +321,9 @@ export default { this.querySarProStateZero() }, // 清空条件查询 clearSearchPro () { - this.sarProStateEO.productName = '' - this.showSarProStateModal = false + this.sarProStateEO.productName = '' + this.showSarProStateModal = false + this.standId = '' }, // 关闭查看事件 pageProStateChange (page) { this.sarProStateTotalPage = page From 98a3ebea39468ec84b6fcecd5b3b5f7d282111a7 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 18 Jun 2021 15:47:43 +0800 Subject: [PATCH 037/528] commit --- .../pages/components/ProcessMixin.vue | 101 +++--------------- .../processCenter/pages/newProcess/index.vue | 8 +- .../tabComponents/processCenter/index.vue | 20 ++++ .../pages/standInvolveProjectDetail.vue | 38 +++---- .../pages/technologyInvolveProject.vue | 98 ++++++++++------- 5 files changed, 115 insertions(+), 150 deletions(-) diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index eeac9195b..dfe31b56b 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -6,93 +6,22 @@ export default { mixins: [], components: {}, data () { - return { - processTypeList: [ - { - label: '法规入库及评估流程', - value: '1' - }, { - label: '标准法规技术储备评估流程', - value: '2' - }, - { - label: '项目评估流程', - value: '3' - }, - { - label: '企标制修订流程', - value: '4' - }, - { - label: '未符合项跟踪流程', - value: '5' - }, - { - label: '企标制修订申请流程', - value: '6' - }, - { - label: '企标废止流程', - value: '7' - }, - { - label: '企标延期制修订申请流程', - value: '8' - }, - { - label: '标准采购流程', - value: '9' - }, - { - label: '工作组会前申请流程', - value: '10' - }, - { - label: '企标制修订评估流程', - value: '11' - }, - { - label: '企标勘误流程', - value: '12' - }, - { - label: '行政管理要求评估流程', - value: '13' - }, - { - label: '政策入库及评估流程', - value: '14' - }, - { - label: '标准翻译申请流程', - value: '15' - }, - { - label: '工作组会后管理流程', - value: '16' - }, - { - label: '企标备案流程', - value: '17' - }, - { - label: '标准法规清单发布/更新流程', - value: '18' - }, - { - label: '企标复审流程', - value: '19' - } - ], - formDisableFlag: false, - pickerOptions: { - disabledDate(time) { - const start = new Date(new Date().toLocaleDateString()); - start.setTime(start.getTime()); - return time.getTime() < start - } + return { + processTypeList: [ + { + label: '标准入库流程', + value: '1' + }, + ], + formDisableFlag: false, + pickerOptions: { + disabledDate(time) { + const start = new Date(new Date().toLocaleDateString()); + start.setTime(start.getTime()); + return time.getTime() < start + } + } } - } }, methods: { /** diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index a4291c72b..efed470a0 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -4,8 +4,8 @@

标准法规管理流程
-
标准调研流程
-
标准入库流程
+
标准调研流程
+
标准入库流程
标准征求意见流程
标准需求(翻译)申请流程
标准发放申请流程
@@ -46,13 +46,13 @@ export default { this.$store.commit('setDetailMap', this.$route.path) this.$store.commit('setHandleInfo') switch (prcType) { - case '1': + case '2': // 标准调研流程 this.$router.push({ name: 'bzdyStep1' }) break - case '2': + case '1': // 标准入库流程 this.$router.push({ name: 'bzrkStep1' diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index b40e0992f..3769ea0de 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -82,6 +82,9 @@ align="center" width="180" > + { + this.processList = res.list + this.total = res.count + }, e => { + }) }, + selectProcessBtn () { // 搜索按钮 this.pageNo = 1 this.queryProcess() diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 5606b96b1..30f4beac0 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -142,57 +142,57 @@ align="center"> + prop="standardItem" + label="标准章条"> @@ -201,22 +201,22 @@ align="center" label="在产产品"> diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 6a9d684ba..486dcaa66 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -148,26 +148,25 @@ align="center"> - { + if (res.ok) { + this.sarProStateListDatas = res.data.records + this.sarProStateTotal = res.data.total + } + }) + this.showSarProStateModal = true + }, // 查询项目数据 clearSearchProState () { this.sarProStateEO.productName = '' this.querySarProStateZero() From e51c79f98c8a84f25c36159a03bda91f10ae060a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 18 Jun 2021 17:56:06 +0800 Subject: [PATCH 038/528] commit --- .../pages/creatProcess/bzrk/step2.vue | 831 ++++++++++++++++++ .../tabComponents/processCenter/index.vue | 12 + src/router/index.js | 9 + 3 files changed, 852 insertions(+) create mode 100644 src/pages/processCenter/pages/creatProcess/bzrk/step2.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue new file mode 100644 index 000000000..55f15899b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -0,0 +1,831 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 3769ea0de..e9a545f17 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -215,6 +215,18 @@ export default { this.queryProcess() }, dealWith (row) { // 办理 + switch(row.prcType) { + case '1': + if (row.taskInfo === '标准法规业务经理审批') { + this.$router.push({ + name: 'bzrkStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId + } + }) + } + } }, ...mapMutations(['setProcess', 'setHandleInfo']), ...mapActions(['setMenu']) diff --git a/src/router/index.js b/src/router/index.js index 36b509f87..9467a539c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -240,6 +240,15 @@ const routes = [ title: '标准入库流程' } }, + { + path: '/bzrkStep2', + name: 'bzrkStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzrk/step2.vue'), + meta: { + requireAuth: true, + title: '标准入库流程' + } + }, { path: '/bzdyStep1', name: 'bzdyStep1', From 86fdf56060713e3d2e2e14ce7d4a1fb3dce9abf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 18 Jun 2021 18:02:31 +0800 Subject: [PATCH 039/528] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/index.vue | 19 +- .../nonConfomity/pages/businessDetails.vue | 744 ++++++++++++++++++ .../nonConfomity/pages/businessDivision.vue | 224 +++--- .../nonConfomity/pages/historicalData.vue | 236 +++--- .../nonConfomity/pages/keyIssues.vue | 22 +- .../nonConfomity/pages/productDepartment.vue | 42 +- .../nonConfomity/pages/productDetails.vue | 724 +++++++++++++++++ .../pages/rectificationDatabase.vue | 557 +++++++++---- src/router/index.js | 24 + src/sysConfig/index.js | 2 +- 10 files changed, 2202 insertions(+), 392 deletions(-) create mode 100644 src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue create mode 100644 src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue index a91d0f497..ceb38c6f1 100644 --- a/src/pages/regulatoryRepository/nonConfomity/index.vue +++ b/src/pages/regulatoryRepository/nonConfomity/index.vue @@ -2,7 +2,7 @@ @@ -113,7 +88,7 @@ export default { loadDate: false, // 查询 search: { - collectionStandard: '' + name: '' }, // 分页 total: 0, @@ -121,108 +96,25 @@ export default { rows: 10, // 数据内容 standardList: [], - // 对话框状态 - standardModal: false, - // 对话框标题 - standardTitle: '', - // 对话框内容 - standardForm: { - textarea: '', - collectId: '', - id: '' - }, - modalType: '', - // 是否读写 - noteType: false, - // 计算 - // 笔记规则 - standardFormRules: { - textarea: [ - {required: true, message: '笔记不能为空', trigger: 'blur'}, - {type: 'string', max: 20000, message: '最多输入20000字符'} - ] - }, checkAll: false, // 是否全选 indeterminate: false, // 是否半选 - isSubmit: false, selectedList: [], selectedAllInfoList: [] } }, methods: { - // 对话框关闭清除表单 - noteChange (type) { - if (!type) { - this.$refs['standardForm'].resetFields() - } - }, // 重置 resetSelect () { - this.search.collectionStandard = '' + this.search.name = '' this.pageChange(1) }, - // 笔记数字提示 - descInput () { - if (this.standardForm.textarea.length > 20000) { - this.error('最多输入20000字') - } - }, - error (msg) { - this.$Message.error(msg) - }, - // 跳转 - detailsStandard (item) { - console.log(item); - this.$http.get('lawss/sarMenu/judgeSarMenuByRole', { - sarId: item.collectResId, - sarType: item.collectType - }, { - _this: this - }, res => { - if (res.ok) { - if (item.collectType === 'BUSINESS_STAND') { - // if (this.$hasPermission('YJUHC32R7G')) { - let routeUrl = this.$router.resolve({ - name: 'OtherBussStandardDetails', - params: { - id: item.collectResId, - pageType: item.collectType - } - }) - window.open(routeUrl.href, '_blank') - // } else { - // this.$message.warning('无权访问') - // } - } else { - // if (this.$hasPermission('SSA6WR4HV8')) { - let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', - params: { - id: item.collectResId, - pageType: item.collectType - } - }) - window.open(routeUrl.href, '_blank') - // } else { - // this.$message.warning('无权访问') - // } - } - } else { - this.$message.error(res.message) - } - }, e => { - this.$message.error('无权访问') - }) - }, // 分页 pageChange (page) { this.page = page - this.saveNote = '' this.selectStandard() }, pageSizeChange (pageSize) { this.rows = pageSize - this.saveNote = '' this.selectStandard() }, // 搜索 @@ -232,36 +124,19 @@ export default { }, // 查询、加载数据 selectStandard () { - this.$http.get('person/personCollect/page', { - pageNo: this.page, - pageSize: this.$store.getters.userInfo.configContent, - modeType: 'STAND', - collectTitle: this.search.collectionStandard, - userId: this.$store.getters.userInfo.userId + this.$http.get('sarPersonalCenter/sar-user-star/getList', { + current: this.page, + size: this.$store.getters.userInfo.configContent, + userId: this.$store.getters.userInfo.userId, + name: this.search.name }, { _this: this, loading: 'loading' }, res => { - // for (let i = 0; i < res.data.list.length; i++) { - // res.data.list[i].checked = false - // res.data.list[i].check = false - // res.data.list[i].seeBtn = '查看笔记' - // } - res.data.list.map((item, index) => { - item.checked = false - }) this.standardList = [] - this.standardList = res.data.list - this.total = res.data.count + this.standardList = res.data.records + this.total = res.data.total this.contentOpen = true - // if (this.saveNote !== '') { - // this.standardList[this.saveNote].check = true - // if (this.standardList[this.saveNote].check === true) { - // this.standardList[this.saveNote].seeBtn = '关闭笔记' - // } else { - // this.standardList[this.saveNote].seeBtn = '查看笔记' - // } - // } }, e => {}) }, // 取消收藏 @@ -273,130 +148,28 @@ export default { confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { - this.$http.put('person/personCollect/updateByUserId ', { - modeType: 'STAND', - id: id - }, { - _this: this - }, res => { - this.contentOpen = false - this.pageChange(1) - }, e => { - }) - }).catch(() => { - }) - }, - // 查看笔记 - writeStandardNotes (item, index) { - item.check = !item.check - if (item.check === true) { - item.seeBtn = '关闭笔记' - } else { - item.seeBtn = '查看笔记' - } - for (let i = 0; i < this.standardList.length; i++) { - if (i !== index) { - this.standardList[i].check = false - this.standardList[i].seeBtn = '查看笔记' - } - } - }, - // 添加笔记 - createStandardNote (item, index) { - this.standardModal = true - this.noteType = false - this.modalType = 1 - this.standardTitle = '添加笔记' - this.standardForm.textarea = '' - this.standardForm = item - this.saveNote = index - }, - // 查看此条笔记 - viewStandardData (note) { - this.standardModal = true - this.standardTitle = '查看笔记' - this.standardForm.textarea = note.noteContentValue - this.noteType = true - this.modalType = 3 - }, - // 修改笔记 - noteStandardEdit (note, index) { - this.standardModal = true - this.noteType = false - this.standardTitle = '修改笔记' - this.modalType = 2 - this.standardForm.id = note.id - this.standardForm.textarea = note.noteContentValue - this.saveNote = index - }, - // 删除笔记 - noteStandardDel (note, index) { - this.saveNote = index - this.$confirm('确认删除该条数据?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - confirmButtonClass: 'common-button-primary', - roundButton: true - }).then(() => { - this.$http.post('lawss/utNoteInfo/deleteNote', { - ids: note.id - }, - { + var json = {} + json.userId = this.$store.getters.userInfo.userId + json.id = id + this.$http.postData('/sarPersonalCenter/sar-user-star/delete',json, { _this: this }, res => { if (res.ok) { - this.selectStandard() - } else { + this.$message.success('已取消收藏') + this.contentOpen = false + this.pageChange(1) } - }).catch(() => { + }, e => { }) - }) - }, - closeModal () { - this.standardModal = false - this.$refs['standardForm'].resetFields() - }, - // 保存笔记 （新增、编辑） - saveClass () { - this.$refs['standardForm'].validate((valid) => { - if (valid) { - this.standardModal = false - if (this.modalType === 1) { - let noteForm = {} - noteForm.noteContentValue = this.standardForm.textarea - noteForm.sourceType = 'COSTAND' - noteForm.noteName = this.standardForm.collectTitle - noteForm.sarId = this.standardForm.id - noteForm.forwardId = this.standardForm.collectResId - this.$http.post('lawss/utNoteInfo/saveNote', noteForm, { - _this: this, - loading: 'isSubmit' - }, res => { - this.selectStandard() - }, e => { - }) - } else if (this.modalType === 2) { - let noteForm = { - id: this.standardForm.id, - noteContentValue: this.standardForm.textarea - } - this.$http.post('lawss/utNoteInfo/updateNote', noteForm, { - _this: this - }, res => { - this.selectStandard() - }, e => { - }) - } - } else { - this.$message.error('请正确输入') - } + }).catch(() => { }) }, getDate (date) { return date != null ? date.substring(0, date.indexOf(' ')) : '' }, cancleCollectBatch () { + console.log(this.selectedList); + return if (this.selectedList.length === 0) { this.$confirm('请先选择数据进行取消收藏', '提示', { showCancelButton: false, diff --git a/src/pages/personal/pages/my-collection/index.vue b/src/pages/personal/pages/my-collection/index.vue index 94e0f944e..2f383b30e 100644 --- a/src/pages/personal/pages/my-collection/index.vue +++ b/src/pages/personal/pages/my-collection/index.vue @@ -17,19 +17,22 @@ export default { data () { return { active: 'CollectionStandard', - tabsList: [ { - title: '已收藏的标准法规', - name: 'CollectionStandard' - }, { - title: '已收藏的动态&资料 ', - name: 'CollectionDynamics' - }, { - title: '已收藏的政策', - name: 'CollectionLaws' - }, { - title: '已收藏的标准拆分', - name: 'CollectionBreak' - }] + tabsList: [ + { + title: '已收藏的标准法规', + name: 'CollectionStandard' + }, + // { + // title: '已收藏的动态&资料 ', + // name: 'CollectionDynamics' + // }, { + // title: '已收藏的政策', + // name: 'CollectionLaws' + // }, { + // title: '已收藏的标准拆分', + // name: 'CollectionBreak' + // } + ] } }, methods: { From 6de07faf1319e8c1e2624841a87ab9cd7c05bdbb Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 22 Jun 2021 18:07:56 +0800 Subject: [PATCH 059/528] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E8=8A=82=E7=82=B9=E5=AE=A1=E6=A0=B8=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index ada10c0d7..3163e963e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -843,9 +843,9 @@ }, handleSave() {}, handleSubmit() { + this.form.commentText = this.commentText + this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); - json.commentText = this.commentText - json.approvalOpinion = this.approvalOpinion console.log(json) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, From 59e66310bfadaba46bf180d14f52035e9685a7d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 22 Jun 2021 18:15:29 +0800 Subject: [PATCH 060/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/axios/index.js | 13 + .../accessStandardsAndRegulations/index.vue | 131 +- .../page/listOfCountries.vue | 290 +-- .../page/listOther.vue | 76 +- .../page/listProject.vue | 267 ++- .../pages/addEdit.vue | 7 +- .../pages/details.vue | 1870 +++-------------- 7 files changed, 790 insertions(+), 1864 deletions(-) diff --git a/src/common/axios/index.js b/src/common/axios/index.js index bd1faa601..e7ad9e22d 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -447,5 +447,18 @@ export default { } exeFun.call(this, err) }) + }, + + /** + * @description: delete方法 + * @author: chenxiaoxi + * @date: 2018-09-14 09:55:30 + */ + postDelete (url, param, thenFun, exeFun) { + _axios.post(api() + url, {}).then(res => { + thenFun.call(this, res.data) + }).catch(err => { + exeFun.call(this, err) + }) } } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index d683c5072..9327a4c2c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -1,49 +1,50 @@ diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index f32fddf4e..eef3ef4b4 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -3,7 +3,7 @@
- + + @click="searchSarAccess"> 查询 @@ -39,7 +39,8 @@ 清空 + @click="clearSearch">清空 +
@@ -51,14 +52,16 @@ size="mini" @click="openModal(null,'addOpt')" v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'" - >新增 + >新增 + 批量删除 + >批量删除 +
- 查看 - 编辑 - 删除 + 查看 + + 编辑 + + 删除 +
@@ -147,7 +157,8 @@ 数据获取中 - +
@@ -155,7 +166,7 @@ diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 60d5e7e98..f9a21868b 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -100,8 +100,7 @@ label="审批意见" align="center"> import('@/pages/processCenter/pages/creatProcess/bzrk/step5.vue'), + meta: { + requireAuth: true, + title: '标准入库流程' + } + }, { path: '/bzrkStep2', name: 'bzrkStep2', From f9ff9eaee6ba60ce15b016e9c87221bd077d94c3 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 23 Jun 2021 16:44:24 +0800 Subject: [PATCH 066/528] =?UTF-8?q?feat:=20=E5=85=A5=E5=BA=93=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 663aee630..efdff8dea 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -766,7 +766,7 @@ }, handleSubmit() { var json = this.form - json.zrUserId = this.$store.getters.userInfo.userId + json.zrUserId = this.$store.getters.userInfo.userId+',5UM3769REUPLPRTRJ54R' json.jlUserId = this.$store.getters.userInfo.userId json.commentText = this.commentText json.applyUpdUserId = this.$store.getters.userInfo.userId diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 21b579ecc..4107bd216 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -855,9 +855,9 @@ export default { _this: this }, res => { if (res.success) { - this.$message.success(res.data) + this.$message.success(res.message) }else { - this.$message.warning(res.data) + this.$message.success(res.message) } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 1643f0845..e970a22cc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -832,9 +832,9 @@ export default { _this: this }, res => { if (res.success) { - this.$message.success(res.data) + this.$message.success(res.message) }else { - this.$message.warning(res.data) + this.$message.success(res.message) } }) }, From ed17051456bedcb959314035df2d23a8639396ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 23 Jun 2021 18:02:37 +0800 Subject: [PATCH 067/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/index.vue | 10 +- .../page/listOfCountries.vue | 2 +- .../page/listOther.vue | 257 +- .../page/listProject.vue | 2 +- .../pages/addEdit.vue | 1778 +------------ .../pages/details.vue | 117 +- .../pages/otherAddEit.vue | 2284 +++++++++++++++++ .../pages/projectAddEit.vue | 2284 +++++++++++++++++ .../searchCenter/pages/standardSearch.vue | 1 + src/router/index.js | 28 +- 10 files changed, 4886 insertions(+), 1877 deletions(-) create mode 100644 src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue create mode 100644 src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 9327a4c2c..8f3fbecb8 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -12,11 +12,11 @@
- -
- -
- + + + + +
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index eef3ef4b4..134daab78 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -258,7 +258,7 @@ export default { searchSarAccess() { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { sortKey: 1, - ...this.sarSarAccessEOSearch + ...this.sarSarAccessEOSearch, }, { _this: this }, res => { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index deba43315..6c95fe1ee 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -3,7 +3,7 @@
- + 清空 + @click="clearSearch">清空 +
@@ -42,14 +43,16 @@ size="mini" @click="openModal(null,'addOpt')" v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'" - >新增 + >新增 + 批量删除 + >批量删除 +
- 查看 - 编辑 - 删除 + 查看 + + 编辑 + + 删除 +
@@ -138,7 +148,8 @@ 数据获取中 - +
@@ -146,7 +157,7 @@ diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue new file mode 100644 index 000000000..7edf017a4 --- /dev/null +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -0,0 +1,2284 @@ + + + + diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index dafa34498..317df4050 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -2491,6 +2491,7 @@ export default { height: auto !important; min-height: 100%; font-size: 14px; + background: #0c91e5; /deep/.el-button--mini { height: 29px; } diff --git a/src/router/index.js b/src/router/index.js index 0872bd5bc..9d30d4059 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -725,7 +725,7 @@ const routes = [ // menuId: 'A594R75XEQ' } }, - // 标准法规库 - 标准法规清单 - 新增、编辑 + // 标准法规库 - 标准法规国家地区清单 - 新增、编辑 { path: '/listOfStandardsAndRegulationsDetails', name: 'ListOfStandardsAndRegulationsDetails', @@ -738,6 +738,32 @@ const routes = [ menuId: 'A594R75XEQ' } }, + // 标准法规库 - 标准法规项目清单 - 新增、编辑 + { + path: '/projectAddEit', + name: 'ProjectAddEit', + component: () => + import('@/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit'), + meta: { + requireAuth: true, + title: '标准法规清单管理', + parentPath: '/accessStandardsAndRegulations', + menuId: 'A594R75XEQ' + } + }, + // 标准法规库 - 标准法规其他清单 - 新增、编辑 + { + path: '/otherAddEit', + name: 'OtherAddEit', + component: () => + import('@/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit'), + meta: { + requireAuth: true, + title: '标准法规清单管理', + parentPath: '/accessStandardsAndRegulations', + menuId: 'A594R75XEQ' + } + }, // 未符合项跟踪 { path: '/nonConfomity', From c16e99b6df424cd58d68d7bd9b7b103700353864 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 23 Jun 2021 18:12:42 +0800 Subject: [PATCH 068/528] =?UTF-8?q?feat:=20=E5=85=A5=E5=BA=93=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 21 ++++++++++++------ .../pages/creatProcess/bzrk/step2.vue | 22 ++++++++++++------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index efdff8dea..4e6def083 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -103,7 +103,8 @@ + placeholder="请选择标准发布日期" + value-format="yyyy-MM-dd"> @@ -143,21 +144,24 @@ + placeholder="请选择标准实施日期(标准文本)" + value-format="yyyy-MM-dd"> + placeholder="请选择新车型实施日期(标准文本" + value-format="yyyy-MM-dd"> + placeholder="请选择在产车实施日期(标准文本)" + value-format="yyyy-MM-dd"> @@ -166,21 +170,24 @@ + placeholder="请选择实施日期(国际)" + value-format="yyyy-MM-dd"> + placeholder="请选择新车型实施日期(国家)" + value-format="yyyy-MM-dd"> + placeholder="请选择在产车实施日期(国家)" + value-format="yyyy-MM-dd"> diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 3163e963e..bc2bcae57 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -109,7 +109,8 @@ disabled v-model="form.issueTime" type="date" - placeholder="请选择标准发布日期"> + placeholder="请选择标准发布日期" + value-format="yyyy-MM-dd"> @@ -151,7 +152,8 @@ disabled v-model="form.ssrq" type="date" - placeholder="请选择标准实施日期(标准文本)"> + placeholder="请选择标准实施日期(标准文本)" + value-format="yyyy-MM-dd"> @@ -159,7 +161,8 @@ disabled v-model="form.xcxssrq" type="date" - placeholder="请选择新车型实施日期(标准文本"> + placeholder="请选择新车型实施日期(标准文本" + value-format="yyyy-MM-dd"> @@ -167,7 +170,8 @@ disabled v-model="form.zccssrq" type="date" - placeholder="请选择在产车实施日期(标准文本)"> + placeholder="请选择在产车实施日期(标准文本)" + value-format="yyyy-MM-dd"> @@ -177,7 +181,8 @@ disabled v-model="form.ssrqgj" type="date" - placeholder="请选择实施日期(国际)"> + placeholder="请选择实施日期(国际)" + value-format="yyyy-MM-dd"> @@ -185,7 +190,8 @@ disabled v-model="form.xcxssrqgj" type="date" - placeholder="请选择新车型实施日期(国家)"> + placeholder="请选择新车型实施日期(国家)" + value-format="yyyy-MM-dd"> @@ -193,7 +199,8 @@ disabled v-model="form.zccssrqgj" type="date" - placeholder="请选择在产车实施日期(国家)"> + placeholder="请选择在产车实施日期(国家)" + value-format="yyyy-MM-dd"> @@ -846,7 +853,6 @@ this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); - console.log(json) this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, From 619c1c094dda94d3da5f0b79073c1fa55d0d0aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 24 Jun 2021 09:14:36 +0800 Subject: [PATCH 069/528] commit --- .../accessStandardsAndRegulations/pages/otherAddEit.vue | 1 + .../accessStandardsAndRegulations/pages/projectAddEit.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 953d040be..fbbbee259 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -481,6 +481,7 @@ export default { // 新增、编辑 基础信息字段 sarAccessEO: { id: '', + sortKey: 3, detailedList: '', detailedListName: '', energyKind: '', diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 7edf017a4..438cd6866 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -481,6 +481,7 @@ export default { // 新增、编辑 基础信息字段 sarAccessEO: { id: '', + sortKey: 2, projectName: '', detailedListName: '', energyKind: '', From 2e19c04a9f6654fca0ec3f5fa17d2f774c1b749d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 24 Jun 2021 18:00:23 +0800 Subject: [PATCH 070/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=20=E6=A3=80=E7=B4=A2=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 + src/assets/styles/common.less | 2 +- src/components/personalCenter/index.vue | 2 +- src/pages/home1/components/navMenu/index.vue | 4 +- .../page/listOther.vue | 2 +- .../page/listProject.vue | 2 +- .../pages/addEdit.vue | 10 +- .../pages/details.vue | 74 +- .../pages/otherAddEit.vue | 11 +- .../pages/projectAddEit.vue | 11 +- .../pages/rectificationDatabase.vue | 52 +- .../searchCenter/pages/advancedSearch.vue | 3870 +++++++++-------- .../searchCenter/pages/standardSearch.vue | 1249 +++--- src/sysConfig/index.js | 2 +- 14 files changed, 2870 insertions(+), 2423 deletions(-) diff --git a/src/App.vue b/src/App.vue index f40d1fc3d..5429787eb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -214,6 +214,8 @@ export default { width: 100%; height: 100%; overflow-y: auto; + background: url('~@/assets/images/shangqi/home/BG.png') no-repeat; + background-size: 100%; & > div{ position: absolute; top: 0; diff --git a/src/assets/styles/common.less b/src/assets/styles/common.less index 74d7a5d70..d9ddaa1f4 100644 --- a/src/assets/styles/common.less +++ b/src/assets/styles/common.less @@ -50,7 +50,7 @@ #app{ &.theme-one { //background: url('~@/assets/images/shangqi/home/home-bg.png') no-repeat; - background: url('~@/assets/images/shangqi/home/BG.png') no-repeat; + //background: url('~@/assets/images/shangqi/home/BG.png') no-repeat; background-size: cover; } input:focus{ diff --git a/src/components/personalCenter/index.vue b/src/components/personalCenter/index.vue index b108ee49d..7dbe3eecf 100644 --- a/src/components/personalCenter/index.vue +++ b/src/components/personalCenter/index.vue @@ -101,7 +101,7 @@ export default { display: inline-block; width: 160px; height: 61px; - background: url("~@/assets/images/shangqi/home/logo-bg.png") no-repeat; + background: url("~@/assets/images/shangqi/home/logo2.png") no-repeat; background-size: cover; cursor: pointer; } diff --git a/src/pages/home1/components/navMenu/index.vue b/src/pages/home1/components/navMenu/index.vue index 8baa1966d..f7aa3702f 100644 --- a/src/pages/home1/components/navMenu/index.vue +++ b/src/pages/home1/components/navMenu/index.vue @@ -3,8 +3,8 @@
- - + +
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index 6c95fe1ee..70d2e47be 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -346,7 +346,7 @@ export default { editTable(item) { sessionStorage.setItem("accessRow", JSON.stringify(item)); this.$router.push({ - name: "ListOfStandardsAndRegulationsDetails", + name: "OtherAddEit", query: { id: item.id } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index 0c2f1613d..009bc086b 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -349,7 +349,7 @@ export default { editTable(item) { sessionStorage.setItem("accessRow", JSON.stringify(item)); this.$router.push({ - name: "ListOfStandardsAndRegulationsDetails", + name: "ProjectAddEit", query: { id: item.id } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 94d27ffb6..40ddc581a 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -544,6 +544,7 @@ export default { // region: '', // 区域 countryArea: '', // 国家 keywords: '', // 关键字 + detailedListName: '', //清单名称 applyArctic: '', // 能源种类 // category: '', // 所属专业领域 // applyArctic: '', // 适用车型 @@ -917,12 +918,7 @@ export default { // 点击清空查询条件 按钮事件 clearSearchLaws () { this.sarAccessInfoSearch.advanceSearchVOStr = '' - // this.sarAccessInfoSearch.applyArctic = '' // 适用车型 this.sarAccessInfoSearch.applyArctic = '' // 能源种类 - // this.sarAccessInfoSearch.category = '' // 所属专业领域 - // this.sarAccessInfoSearch.applyAuth = '' // 认证类型 - // this.sarAccessInfoSearch.country = '' // 国家 - // this.sarAccessInfoSearch.region = '' // 区域 this.sarAccessInfoSearch.keywords = '' // 关键字 this.sarAccessInfoSearch.accessSarType = 'SKILL' // 清单类型 this.sarAccessInfoSearch.askType = '' // 监管类型 @@ -935,7 +931,6 @@ export default { dataSourceChange (val) { this.isListType = val === 'TEMP' this.sarAccessInfoSearch.advanceSearchVOStr = '' - this.$refs.advancedQuery.clearAllSearch() // 国内标准法规可查字段 if (val === 'INLAND_STAND'){ this.twoOptions=[ @@ -1459,6 +1454,7 @@ export default { sarAccessEO.inforlist = JSON.stringify(rowlist) sarAccessEO.adminInfoList = JSON.stringify(rowList2) sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') + sarAccessEO.detailedListName = sarAccessEO.detailedListName.join(',') // 判断是否有附件 if (this.fileInfoList.length > 0) { let relateFile = [] @@ -2215,7 +2211,7 @@ export default { this.$nextTick(() => { this.sarAccessEO.type = accessRow.type this.sarAccessEO.countryArea = accessRow.countryArea.split(',') - this.sarAccessEO.accessContent = accessRow.accessContent + this.sarAccessEO.detailedListName = accessRow.detailedListName this.sarAccessEO.id = accessRow.id this.sarAccessEO.remark = accessRow.remark || '' this.sarAccessEO.relateFile = accessRow.relateFile diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 32f25d142..23db0dbe8 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -115,7 +115,7 @@ fixed="left" label="标准号"> 取消 - 提交 @@ -222,6 +222,8 @@ - - diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 317df4050..4279432d5 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -35,14 +35,14 @@
{{ condition.title }}
  • - {{ conditionOpt.label }} - ({{ conditionOpt.number}}) - + {{ conditionOpt.label }} + ({{ conditionOpt.number}}) +
{{ condition.isClose ? '展开' : '收缩' }}
- +
@@ -115,9 +115,8 @@ :label="selectIndex === 'stand'||'bussstand' ? $t('m.standStateShow') : (selectIndex === 'laws' ? $t('m.fileStatus') : $t('m.enterpriseStandardStatus'))" width="200">
提交 - 取消 + 取消
@@ -366,6 +365,7 @@ export default { resultLoading: false, saveAllSortOptions: [], saveAllFineOptions: [], + lawssStateOptions: [], page: 1, pageAll: 1, total: 0, @@ -404,7 +404,7 @@ export default { }) } break - // 企标 + // 企标 case 'bussstand': if (this.$hasPermission('YJUHC32R7G')) { let routeUrl2 = this.$router.resolve({ @@ -422,7 +422,7 @@ export default { }) } break - // 政策 + // 政策 case 'laws': if (this.$hasPermission('A2HDHMEA6W')) { let routeUrl3 = this.$router.resolve({ @@ -457,7 +457,7 @@ export default { }) } break - // 动态资料------3个值（INLAND_MSG FOREIGN_MSG RESOURCE_MSG） + // 动态资料------3个值（INLAND_MSG FOREIGN_MSG RESOURCE_MSG） case 'FOREIGN': let routeUrl5 = this.$router.resolve({ name:'OtherStandardDetails', @@ -478,7 +478,7 @@ export default { }) window.open(routeUrl4.href, '_blank') break - // 数据化条目 + // 数据化条目 case 'items': this.itemsToPage(item) break @@ -496,7 +496,7 @@ export default { }) window.open(routeUrl.href, '_blank') break - // 企标 + // 企标 case 'BUS': let routeUrl2 = this.$router.resolve({ name: 'OtherBussStandardDetails', @@ -507,7 +507,7 @@ export default { }) window.open(routeUrl2.href, '_blank') break - // 政策 + // 政策 case 'LAWS': let routeUrl3 = this.$router.resolve({ name: 'OtherLawsDetails', @@ -637,10 +637,10 @@ export default { }) }, /** - * @description: 条件查询选项checkbox - * @author: chenxiaoxi - * @date: 2018/12/19 11:38:21 - */ + * @description: 条件查询选项checkbox + * @author: chenxiaoxi + * @date: 2018/12/19 11:38:21 + */ optChecked (key, value) { if (value === 'All') { this.AllCheck = true @@ -909,10 +909,10 @@ export default { this.searchSarByInputKey() }, /** - * @description: 查询选项 - * @author: chenxiaoxi - * @date: 2018/12/19 13:51:31 - */ + * @description: 查询选项 + * @author: chenxiaoxi + * @date: 2018/12/19 13:51:31 + */ queryOptions () { this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this, @@ -1005,16 +1005,17 @@ export default { this.searchOriginOptions = this.searchOptions this.saveAllSortOptions = res.data.STANDCLASSIFY this.saveAllFineOptions = res.data.BUSSFINECLASSSHOW + this.lawssStateOptions = res.data.LAWSSTATE // 文本状态数组 this.filterOptions(this.selectIndex) } }, e => {}) }, /** - * @description: 选项过滤(根据资源类型过滤条件) - * @author: chenxiaoxi - * @date: 2018/12/20 11:34:36 - */ + * @description: 选项过滤(根据资源类型过滤条件) + * @author: chenxiaoxi + * @date: 2018/12/20 11:34:36 + */ filterOptions (resType) { return new Promise((resolve, reject) => { let filterOptions = {} @@ -1059,7 +1060,7 @@ export default { filterOptions.ZRLX.title = '准入类型' filterOptions.ZRLX.index = 3 // 我司参与状态 - filterOptions.CYSD = originOptions.CYSD + filterOptions.CYSD = originOptions.SHIFOU filterOptions.CYSD.title = '我司是否参与' filterOptions.CYSD.index = 4 break @@ -1074,9 +1075,9 @@ export default { filterOptions.standState.title = '标准状态' filterOptions.standState.index = 2 // 我司参与状态 - filterOptions.CYSD = originOptions.CYSD - filterOptions.CYSD.title = '我司参与深度' - filterOptions.CYSD.index = 3 + // filterOptions.CYSD = originOptions.CYSD + // filterOptions.CYSD.title = '我司参与深度' + // filterOptions.CYSD.index = 3 // 监管类型 filterOptions.ZRLX = originOptions.ZRLX filterOptions.ZRLX.title = '监管类型' @@ -1085,8 +1086,8 @@ export default { filterOptions.CLLX = originOptions.CLLX filterOptions.CLLX.index = 5 // 采标程度 - filterOptions.CBCD = originOptions.CBCD - filterOptions.CBCD.index = 6 + // filterOptions.CBCD = originOptions.CBCD + // filterOptions.CBCD.index = 6 break // 企业标准 case 'enterprise': @@ -1142,11 +1143,11 @@ export default { * @Description: 根据搜索条件搜索 * @author zmf * @date 2021/3/2 - */ + */ searchSarByInputKeyByCondition(){ - this.pageAll = 1 - this.page = 1 - this.searchSarByInputKey() + this.pageAll = 1 + this.page = 1 + this.searchSarByInputKey() }, /** @@ -1289,10 +1290,10 @@ export default { window.open('/api/search/searchCenter/exportSearchCenterDatas?exportDatas=' + searchInfoEO + '&searchType=' + this.selectIndex) }, /** - * @description: 获取key值 - * @author: chenxiaoxi - * @date: 2018/12/20 15:43:51 - */ + * @description: 获取key值 + * @author: chenxiaoxi + * @date: 2018/12/20 15:43:51 + */ getKey (key) { switch (key) { case 'SARPROPERTY': @@ -1329,10 +1330,10 @@ export default { }, /** - * @description: 获取表格标题 - * @author: chenxiaoxi - * @date: 2018/12/21 09:27:50 - */ + * @description: 获取表格标题 + * @author: chenxiaoxi + * @date: 2018/12/21 09:27:50 + */ getResultColumns () { const resultColumns = { index: { @@ -1525,21 +1526,21 @@ export default { } }, this.$t('m.More')), h('DropdownMenu', {// 创建一个和a标签同级的标签 - slot: 'list' // iview组件内部的属性定义在其标签的对象里 - }, - this.dropdownItemsCollect.map(function (type) { // 把map看作循环,type看作循环的每一项 - return h('DropdownItem', { - props: { - name: type.val - }, - directives: [ - { - name: 'btn-permission', - value: type.val === '分享' ? 'NG1592AYR5' : (type.val === '取消收藏' ? 'FB3R3TVALD' : '') - } - ] - }, type.val) - }) + slot: 'list' // iview组件内部的属性定义在其标签的对象里 + }, + this.dropdownItemsCollect.map(function (type) { // 把map看作循环,type看作循环的每一项 + return h('DropdownItem', { + props: { + name: type.val + }, + directives: [ + { + name: 'btn-permission', + value: type.val === '分享' ? 'NG1592AYR5' : (type.val === '取消收藏' ? 'FB3R3TVALD' : '') + } + ] + }, type.val) + }) ) ]) ]) @@ -1584,21 +1585,21 @@ export default { } }, this.$t('m.More')), h('DropdownMenu', {// 创建一个和a标签同级的标签 - slot: 'list' // iview组件内部的属性定义在其标签的对象里 - }, - this.dropdownItems.map(function (type) { // 把map看作循环,type看作循环的每一项 - return h('DropdownItem', { - props: { - name: type.val - }, - directives: [ - { - name: 'btn-permission', - value: type.val === '分享' ? 'NG1592AYR5' : (type.val === '收藏' ? 'FB3R3TVALD' : '') - } - ] - }, type.val) - }) + slot: 'list' // iview组件内部的属性定义在其标签的对象里 + }, + this.dropdownItems.map(function (type) { // 把map看作循环,type看作循环的每一项 + return h('DropdownItem', { + props: { + name: type.val + }, + directives: [ + { + name: 'btn-permission', + value: type.val === '分享' ? 'NG1592AYR5' : (type.val === '收藏' ? 'FB3R3TVALD' : '') + } + ] + }, type.val) + }) ) ]) ]) @@ -1708,27 +1709,27 @@ export default { }, /** - * @description: 页码切换 - * @author: chenxiaoxi - * @date: 2018/12/21 10:20:28 - */ + * @description: 页码切换 + * @author: chenxiaoxi + * @date: 2018/12/21 10:20:28 + */ pageChange (page) { this.page = page this.searchSarBykey() }, /** - * @description: 每页条数切换 - * @author: chenxiaoxi - * @date: 2018/12/21 10:20:56 - */ + * @description: 每页条数切换 + * @author: chenxiaoxi + * @date: 2018/12/21 10:20:56 + */ pageSizeChange (pageSize) { this.searchSarBykey() }, /** - *@desc:点击全部-分页 - *@author: zhangRui - *@time: 2020/10/18 16:13:14 - */ + *@desc:点击全部-分页 + *@author: zhangRui + *@time: 2020/10/18 16:13:14 + */ pageChangeAll (page) { this.pageAll = page this.searchSarByInputKey() @@ -1850,10 +1851,10 @@ export default { }, /** - * @description: 页面滚动 - * @author: chenxiaoxi - * @date: 2018/12/21 10:39:11 - */ + * @description: 页面滚动 + * @author: chenxiaoxi + * @date: 2018/12/21 10:39:11 + */ handleScrollHeader () { const top = document.documentElement.scrollTop if (top > 100) { @@ -2264,11 +2265,11 @@ export default { pagetype = 'FOREIGN_STAND' } }else { - this.$message({ - message: '无权访问', - type: 'warning' - }) - } + this.$message({ + message: '无权访问', + type: 'warning' + }) + } } else if (item.type === 'laws') { if (this.$hasPermission('A2HDHMEA6W') && this.$hasPermission('HK36LHK9444NPN8X634W')){ routername = 'OtherLawsDetails' @@ -2365,6 +2366,17 @@ export default { handleSearchReset() { this.resultKeyword = '' this.searchSarByInputKey() + }, + // 回显政策状态 + getLawsState (val) { + if (!val) { + val = '' + } + let lawsStateName = this.lawssStateOptions.filter(item => { + return val.indexOf(item.value) > -1 + }).map(item => item.label) + + return lawsStateName.join(',') } }, components: { @@ -2482,559 +2494,572 @@ export default { } - diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index efa7258d3..eb8f863a6 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,7 +6,7 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -const devIp = '192.168.10.47' +const devIp = '192.168.10.178' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' From a2acbe7ae6add4e6a2ab49ab1ed89f1326a719ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 25 Jun 2021 09:23:30 +0800 Subject: [PATCH 071/528] commit --- src/pages/searchCenter/pages/advancedSearch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 99bfda9a0..e3994f291 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -761,7 +761,7 @@ {{ $t("m.reset") }} +;margin-left: 10px">重置
From b13af16c0b06259f284d89978fb0bf053c802e86 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 25 Jun 2021 17:56:21 +0800 Subject: [PATCH 072/528] commit --- src/assets/styles/newStyle.less | 4 + src/components/navMenu/index.vue | 25 +- .../config/pages/mechanismManage/index.vue | 1142 ++--------------- src/pages/config/pages/postManage/index.vue | 210 +++ src/router/index.js | 11 + 5 files changed, 358 insertions(+), 1034 deletions(-) create mode 100644 src/pages/config/pages/postManage/index.vue diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less index d4cbb9ac8..ef8706955 100644 --- a/src/assets/styles/newStyle.less +++ b/src/assets/styles/newStyle.less @@ -902,3 +902,7 @@ tr.el-table__row{ width: 100% !important; } } +.filter-tree-input { + margin: 10px; + width: calc(~'100% - 20px'); +} diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index e05997f7f..bc43095be 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -269,16 +269,21 @@ export default { // path: '/dynamicInformationManage', // menuId: '6V2QZ9STRZ' // }, - // { - // title: '机构管理', - // path: '/MechanismManage', - // menuId: '7MWCQK6NNH' - // }, - // { - // title: '角色管理', - // path: '/roleManage', - // menuId: 'NVU76EMB7N' - // }, + { + title: '机构管理', + path: '/MechanismManage', + menuId: '7MWCQK6NNH' + }, + { + title: '角色管理', + path: '/roleManage', + menuId: 'NVU76EMB7N' + }, + { + title: '岗位管理', + path: '/postManage', + menuid: '' + }, // { // title: '用户管理', // path: '/userManage', diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index c433a7cad..a1964a6c8 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -3,23 +3,20 @@
- + + + +
@@ -28,1079 +25,176 @@
-
-
- - - - - - - - - - - - - - - - - - -
-
-
- - 批量删除 -
+ ref="multipleTable" + :data="data" + tooltip-effect="dark" + border + style="width: 100%; flex: auto;" + class="drag-table" + height="100%" + :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px', + fontWeight: 'bold', height: '48px'}"> + prop="uname" + label="姓名" + width="170px"> + prop="sex" + label="性别" + width="170px"> + prop="phone" + label="电话" + width="170px"> + prop="email" + label="邮箱" + width="170px"> + prop="institutionName" + label="所属部门"> - + prop="positionName" + label="所属岗位"> + prop="state" + label="状态" + width="170px"> - - - - - - - - - - - - - - - - + label="操作" + width="50px"> - {{$t('m.gettingList')}}
+ 加载中...
- -
- - - - - - - - -
-
- {{$t('m.cancel')}} - {{$t('m.confirm')}} -
- - - -
-
- - {{ userInfo.txets || '--' }} -
-
- - {{ userInfo.uname }} -
-
- - {{ userInfo.account }} -
-
- - {{ userInfo.workNum || '--'}} -
-
- - {{ userInfo.roleNameList || '暂无' }} -
-
- - {{ userInfo.orgName || '暂无' }} -
-
- - {{ userInfo.email || '--' }} -
-
- - {{ userInfo.officePhone || '--' }} -
-
- - {{ userInfo.mobilePhone || '--' }} -
-
- - {{ userInfo.faxAddress || '--' }} -
-
- - {{ userInfo.address || '--' }} -
-
- - {{ userInfo.disableFlag === 0 ? '正常' : '禁用' }} -
-
- - - -
- - - - - - - - - - - - - - - - - -
-
- {{$t('m.cancel')}} - {{$t('m.confirm')}} -
- + 导入中...
@@ -1148,7 +242,7 @@ export default { display: flex; flex-direction: column; .content{ - padding: 0 10px; + padding: 0px; display: flex; flex-direction: column; position: relative; diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue new file mode 100644 index 000000000..2fe21f20a --- /dev/null +++ b/src/pages/config/pages/postManage/index.vue @@ -0,0 +1,210 @@ + + + + + + diff --git a/src/router/index.js b/src/router/index.js index a26431095..71676e073 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -950,6 +950,17 @@ const routes = [ menuId: '7MWCQK6NNH' } }, + { + path: '/postManage', + name: 'postManage', + component: () => + import('@/pages/config/pages/postManage/index'), + meta: { + requireAuth: true, + title: '岗位管理', + menuId: '7MWCQK6NNH' + } + }, { path: '/roleManage', name: 'RoleManage', From b843b0d9757b75ee436e4b101d635eaee962d42f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 25 Jun 2021 17:57:33 +0800 Subject: [PATCH 073/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/axios/index.js | 1 - src/common/btnPermission/index.js | 2 - .../CustomFormComponents/Example.vue | 2 - src/components/CustomFormComponents/Input.vue | 1 - .../InputForAllStandards.vue | 2 - .../CustomFormComponents/InputForPolicy.vue | 1 - .../InputForStandAndForeign.vue | 1 - .../CustomFormComponents/SearchSelect.vue | 1 - .../CustomFormComponents/TreePopover.vue | 1 - .../TreePopoverForPersonal.vue | 1 - .../CustomFormComponents/department.vue | 8 - .../ProjectRelatedPersonnel/index.vue | 4 - .../ProjectRelatedPersonnel/view.vue | 1 - src/components/PutQuestionButton/index.vue | 1 - src/components/lawsTree/index.vue | 1 - src/components/lawsTree/index2.vue | 4 - .../dynamicInfomationDetails/index.vue | 5 - .../dynamicInfomationDetails/index2.vue | 4 - .../index.vue | 2 - .../managementTree.vue | 13 - .../config/pages/mechanismManage/index.vue | 1 - .../processManage/components/EditProcess.vue | 1 - .../components/EditProcessClassification.vue | 1 - .../config/pages/processManage/process.vue | 2 - .../processManage/processClassification.vue | 1 - .../pages/standLawsAttrManage/index.vue | 2 - src/pages/config/pages/userManage/index.vue | 1 - src/pages/details/process/ruku/index.vue | 1 - .../components/knowledgeGraph.vue | 2 - .../applicationStandardNumber/index.vue | 8 - src/pages/localTool/standAutoSplit/index.vue | 3 - src/pages/localTool/standContrast/index.vue | 1 - .../CollectionBussStandardDetail.vue | 1 - .../components/CollectionStandard.vue | 2 - .../components/AnswerItem.vue | 2 - .../components/AnswerItem.vue | 2 - .../tabComponents/processCenter/index.vue | 2 - .../accessStandardsAndRegulations/index.vue | 19 + .../page/listOfCountries.vue | 17 +- .../page/listOther.vue | 16 +- .../page/listProject.vue | 16 +- .../pages/addEdit.vue | 46 +- .../pages/details.vue | 1 - .../pages/otherAddEit.vue | 21 +- .../pages/projectAddEit.vue | 19 +- .../domesticStandardsAndRegulations/index.vue | 2 - .../components/EnterpriseStandardDatabase.vue | 5 - .../information/index.vue | 1 - .../information/index2.vue | 4 - .../nonConfomity/index.vue | 1 - .../searchCenter/pages/advancedSearch.vue | 952 ++++++++---------- .../searchCenter/pages/standardSearch.vue | 3 - src/pages/skillReq/SkillReqAdd/searchForm.vue | 4 - src/pages/skillReq/SkillReqSee/searchForm.vue | 13 - .../components/StandardSelect.vue | 1 - .../components/StandardView.vue | 1 - src/store/getters/index.js | 7 + src/store/mutations/index.js | 24 + src/store/state/index.js | 6 + src/sysConfig/index.js | 2 +- 60 files changed, 572 insertions(+), 698 deletions(-) diff --git a/src/common/axios/index.js b/src/common/axios/index.js index e7ad9e22d..9034bc7c2 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -211,7 +211,6 @@ export default { thenFun.call(this, res.data) } } else { - console.log(res.data) // 返回data数组 thenFun.call(this, res.data) } diff --git a/src/common/btnPermission/index.js b/src/common/btnPermission/index.js index 00ca11601..ff9ad7ad3 100644 --- a/src/common/btnPermission/index.js +++ b/src/common/btnPermission/index.js @@ -23,9 +23,7 @@ const tableBtnPermission = Vue.directive('tableBtnPermission', { bind (el, binding, vnode) { // 获取按钮权限 let btnPermission = binding.value - console.log(el, binding, vnode) function handler(event) { - console.log(event) event.stopImmediatePropagation() return false } diff --git a/src/components/CustomFormComponents/Example.vue b/src/components/CustomFormComponents/Example.vue index 2570aa838..e1ce944a9 100644 --- a/src/components/CustomFormComponents/Example.vue +++ b/src/components/CustomFormComponents/Example.vue @@ -117,7 +117,6 @@ export default { }, mounted () { this.resolveFormFieldListRules() - console.log(this.$dateFormat(1602518400000, 'yyyy-MM-dd hh:mm:ss')) }, methods: { /** @@ -155,7 +154,6 @@ export default { }, jiaoyan () { this.$refs['sarStandardsInfoForm'].validate((valid) => { - console.log(valid) }) } } diff --git a/src/components/CustomFormComponents/Input.vue b/src/components/CustomFormComponents/Input.vue index 9a4b12bab..38f2728e5 100644 --- a/src/components/CustomFormComponents/Input.vue +++ b/src/components/CustomFormComponents/Input.vue @@ -57,7 +57,6 @@ export default { handleChange (event) { // const value = event.target.value const value = event - console.log(value) this.$emit('input', value) } } diff --git a/src/components/CustomFormComponents/InputForAllStandards.vue b/src/components/CustomFormComponents/InputForAllStandards.vue index dbaac0224..9921e957f 100644 --- a/src/components/CustomFormComponents/InputForAllStandards.vue +++ b/src/components/CustomFormComponents/InputForAllStandards.vue @@ -204,7 +204,6 @@ export default { handleChange (event) { // const value = event.target.value const value = event - console.log(value) this.$emit('input', value) }, selectLaws () { @@ -303,7 +302,6 @@ export default { }, // 点击查看 handlePreview (item) { - console.log('看看看看看看看看item', item) let routeUrl = this.$router.resolve({ name: 'OtherBussStandardDetails', params: { diff --git a/src/components/CustomFormComponents/InputForPolicy.vue b/src/components/CustomFormComponents/InputForPolicy.vue index dfe48690c..47a274330 100644 --- a/src/components/CustomFormComponents/InputForPolicy.vue +++ b/src/components/CustomFormComponents/InputForPolicy.vue @@ -207,7 +207,6 @@ export default { handleChange (event) { // const value = event.target.value const value = event - console.log(value) this.$emit('input', value) if (value.length==1000){ return this.$message({ diff --git a/src/components/CustomFormComponents/InputForStandAndForeign.vue b/src/components/CustomFormComponents/InputForStandAndForeign.vue index 7df2bcefa..25cd1b5f2 100644 --- a/src/components/CustomFormComponents/InputForStandAndForeign.vue +++ b/src/components/CustomFormComponents/InputForStandAndForeign.vue @@ -211,7 +211,6 @@ export default { }, methods: { dataSourceChange (val) { - console.log(val) }, handleChange (event) { // const value = event.target.value diff --git a/src/components/CustomFormComponents/SearchSelect.vue b/src/components/CustomFormComponents/SearchSelect.vue index d2ea00ff2..fce2c16a1 100644 --- a/src/components/CustomFormComponents/SearchSelect.vue +++ b/src/components/CustomFormComponents/SearchSelect.vue @@ -93,7 +93,6 @@ export default { // 匹配项来源 if (this.searchKey === '') { this.filterOptions = this.options - console.log(this.options) } else { let result = [] // 用原始数据进行匹配 diff --git a/src/components/CustomFormComponents/TreePopover.vue b/src/components/CustomFormComponents/TreePopover.vue index cf3f0dba1..d61cb933d 100644 --- a/src/components/CustomFormComponents/TreePopover.vue +++ b/src/components/CustomFormComponents/TreePopover.vue @@ -89,7 +89,6 @@ export default { this.treeCheckNode = treeCheckNode }, handleTreeDblClick (event, treeId, treeNode) { - console.log('event, treeId, treeNode', event, treeId, treeNode) this.$emit('input', treeNode.id) } } diff --git a/src/components/CustomFormComponents/TreePopoverForPersonal.vue b/src/components/CustomFormComponents/TreePopoverForPersonal.vue index a06473ab5..6181feb10 100644 --- a/src/components/CustomFormComponents/TreePopoverForPersonal.vue +++ b/src/components/CustomFormComponents/TreePopoverForPersonal.vue @@ -91,7 +91,6 @@ export default { this.treeCheckNode = treeCheckNode }, handleTreeDblClick (treeId, treeNode) { - console.log('event, treeId, treeNode', event, treeId, treeNode) this.$emit('input', treeNode.id) } } diff --git a/src/components/CustomFormComponents/department.vue b/src/components/CustomFormComponents/department.vue index df3f1fffc..a352e2cc3 100644 --- a/src/components/CustomFormComponents/department.vue +++ b/src/components/CustomFormComponents/department.vue @@ -112,7 +112,6 @@ export default { }, methods: { handleTreeDblClick (treeId, treeNode) { - console.log(treeNode.id) this.checkedName = treeNode.name this.$emit('input', treeNode.id) this.visible = false @@ -130,8 +129,6 @@ export default { return name }, handleTreeDrawerConfirm () { - console.log(this.config.selVal) - console.log(this.treeCheckNode) if (this.config.selVal === 'USERLIST') { const checkedList = [] const checkedNameList = [] @@ -141,9 +138,7 @@ export default { checkedNameList.push(item.name) } }) - console.log(checkedNameList) this.checkedName = checkedNameList.join(',') - console.log(this.checkedName) this.$emit('input', checkedList.join(',')) } else { const checkedList = [] @@ -157,7 +152,6 @@ export default { } }) this.checkedName = checkedNameList.join(',') - console.log(this.checkedName) this.$emit('input', checkedList.join(',')) } this.visible = false @@ -179,11 +173,9 @@ export default { }, watch: { value (newVal) { - console.log(newVal) this.checkedName = newVal || '' }, checkedName (val) { - console.log(val) this.$emit('update:value', val) } }, diff --git a/src/components/ProjectRelatedPersonnel/index.vue b/src/components/ProjectRelatedPersonnel/index.vue index d355f5076..73bc43439 100644 --- a/src/components/ProjectRelatedPersonnel/index.vue +++ b/src/components/ProjectRelatedPersonnel/index.vue @@ -120,13 +120,11 @@ export default { }, watch:{ value(newValue, oldValue) { - console.log(newValue) this.resolveValueToResultNodes(newValue) } }, methods: { handleSelectTreeClick(treeId, treeNode) { - console.log(treeId, treeNode) this.selectNode = { ...treeNode } }, @@ -186,7 +184,6 @@ export default { handleResultTreeEdit(treeId, treeNode) { const wxId = treeNode.wxId const findNode = this.resultNodes.find(item => item.wxId === wxId) - console.log(findNode) if (findNode && findNode.type === 'user') { this.editNode = findNode this.editNodeForForm = { ...findNode } @@ -223,7 +220,6 @@ export default { userName: item.type === 'user' && item.nativeName || null } }) - console.log(result) this.$emit('input', result) }, diff --git a/src/components/ProjectRelatedPersonnel/view.vue b/src/components/ProjectRelatedPersonnel/view.vue index 39cad76ed..f54f4f829 100644 --- a/src/components/ProjectRelatedPersonnel/view.vue +++ b/src/components/ProjectRelatedPersonnel/view.vue @@ -63,7 +63,6 @@ export default { }, watch:{ value(newValue, oldValue) { - console.log(newValue) this.resolveValueToResultNodes(newValue) } }, diff --git a/src/components/PutQuestionButton/index.vue b/src/components/PutQuestionButton/index.vue index 3dc145f0d..040f76794 100644 --- a/src/components/PutQuestionButton/index.vue +++ b/src/components/PutQuestionButton/index.vue @@ -141,7 +141,6 @@ export default { submitLoading: 'loading' }, res => { if (res.ok) { - console.log('success', res) this.newDialogVisible = false this.submitLoading = false this.$message({ diff --git a/src/components/lawsTree/index.vue b/src/components/lawsTree/index.vue index 4d528bfab..570670560 100644 --- a/src/components/lawsTree/index.vue +++ b/src/components/lawsTree/index.vue @@ -1449,7 +1449,6 @@ export default { this.destroyZTree() $(this.dragBind).unbind('mousedown') $('#' + this.searchId).unbind('input propertychange') - // console.log('beforeDestroy') } } diff --git a/src/components/lawsTree/index2.vue b/src/components/lawsTree/index2.vue index 5d8b4983a..5b5b9168c 100644 --- a/src/components/lawsTree/index2.vue +++ b/src/components/lawsTree/index2.vue @@ -141,7 +141,6 @@ export default { * @date: 2018/10/23 10:19:24 */ rightRemove () { - console.log('rightRemove') $(`#${this.treeDivId}rMenu`).css({'visibility': 'hidden'}) this.setOpenNodes() this.$emit('treeRemove', this.treeId, this.treeNode) @@ -153,7 +152,6 @@ export default { * @date: 2020/2/6 10:19:24 */ rightCopy () { - console.log('rightCopy') $(`#${this.treeDivId}rMenu`).css({'visibility': 'hidden'}) this.setOpenNodes() this.$emit('treeCopy', this.treeId, this.treeNode) @@ -1284,7 +1282,6 @@ export default { } function showRMenu (type, x, y, treeId, treeNode) { - console.log('showRMenu') // 右键隐藏菜单的节点 if (treeNode.pId !== null && _this.showRMenu && !_this.disabled && _this.editable) { _this.isRoot = false @@ -1322,7 +1319,6 @@ export default { } /* eslint-disable */ function hideRMenu () { - console.log('hideRMenu') if (rMenu) rMenu.css({'visibility': 'hidden'}) $('body').unbind('mousedown', onBodyMouseDown) } diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue index cce7e6a1d..69a6e9f69 100644 --- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue +++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue @@ -228,7 +228,6 @@ export default { }, methods: { handlePreview (item) { - console.log('item1111111', item) // let routeUrl = this.$router.resolve({ // name: 'OtherStandardDetails', // params: { @@ -252,12 +251,10 @@ export default { } }) window.open(routeUrl.href, '_blank') - console.log('res.data', res) }, e => { }) }, handleLaws (item) { - console.log('item1111111', item) // let routeUrl = this.$router.resolve({ // name: 'OtherLawsDetails', // params: { @@ -283,7 +280,6 @@ export default { } }) window.open(routeUrl.href, '_blank') - console.log('res.data', res) }, e => { }) }, @@ -369,7 +365,6 @@ export default { }, res => { this.isSubmit = false this.msgDetails.collectId = res.data.id - console.log('msgDetails.collectId', this.msgDetails.collectId) }, e => { this.isSubmit = false }) diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue index 5575dfee2..1a97d9e98 100644 --- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue +++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue @@ -301,7 +301,6 @@ export default { }, res => { this.isSubmit = false this.msgDetails.collectId = res.data.id - console.log('msgDetails.collectId', this.msgDetails.collectId) }, e => { this.isSubmit = false }) @@ -329,7 +328,6 @@ export default { obj.content = this.relateList[i].content this.relateNowList.push(obj) } - console.log('relateNowList', this.relateNowList) }, e => { }) @@ -419,7 +417,6 @@ export default { this.$message.warning('暂无相关标准') } else { let row = item.releventStandIds.split('/') - console.log(row) let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { @@ -436,7 +433,6 @@ export default { this.$message.warning('暂无相关政策') } else { let row = item.releventLawsIds.split('/') - console.log(row) let routeUrl = this.$router.resolve({ name: 'OtherLawsDetails', params: { diff --git a/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue b/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue index fa7ac340b..a8d5af65c 100644 --- a/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue +++ b/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue @@ -264,7 +264,6 @@ }, // 批量删除 batchMSGDel (type, row) { - console.log(row); if (type === 2) { this.$confirm('是否删除此数据?', '提示', { confirmButtonText: '确定', @@ -355,7 +354,6 @@ // 查看 // 如果为自定义类型，可再当前结构树中手动维护，添加删除编辑等， // 如果为基础体系库则是查看基础库中的数据。不可编辑删除操作。 - console.log(row) this.$store.commit('setDetailMap', this.$route.path) this.$router.push({ name: 'managementTree', diff --git a/src/pages/config/pages/enterpriseStandardNumberManagement/managementTree.vue b/src/pages/config/pages/enterpriseStandardNumberManagement/managementTree.vue index d2bcb6b4d..409cb692e 100644 --- a/src/pages/config/pages/enterpriseStandardNumberManagement/managementTree.vue +++ b/src/pages/config/pages/enterpriseStandardNumberManagement/managementTree.vue @@ -302,22 +302,18 @@ }, treeClickThree (treeNode) { this.selectTree = treeNode // 记录当前选中的二级菜单 - console.log('选择的树', this.selectTree) }, treeRightClickThree (treeNode) { this.selectTree = treeNode // 记录当前选中的二级菜单 if (treeNode.selfFlag === '2'){ this.operationAuthority = true - console.log('ok'); } else { this.operationAuthority = false } - console.log('右击选择的树', this.selectTree) }, // 二级菜单新建，编辑，删除 clickDropMenu (name, treeNode) { this.selectSarMenu = JSON.parse(JSON.stringify(treeNode)) - console.log('点击',this.selectSarMenu); if (undefined !== this.selectSarMenu.id) { // 当前有选中节点 if (name === 'newMenu') { this.menuModalTitle = '新增目录' @@ -332,7 +328,6 @@ rootNum:this.baseDataId } } else if (name === 'editMenu') { - console.log('treeNode',treeNode); this.menuModalTitle = '编辑目录' this.menuModalFlag = true this.menuAddOrUpdateFlag = 2 @@ -421,7 +416,6 @@ // 体系基础数据库-新建，编辑，删除 clickDropMenuThree (name, treeNode) { this.selectSarMenu = JSON.parse(JSON.stringify(treeNode)) - console.log('点击',this.selectSarMenu); if (undefined !== this.selectSarMenu.id) { // 当前有选中节点 if (name === 'newMenu') { this.modalTitle = '新增目录' @@ -435,7 +429,6 @@ selfSort: '' } } else if (name === 'editMenu') { - console.log('treeNode',treeNode); this.modalTitle = '编辑目录' this.modalFlag = true this.threeFlag = 2 @@ -444,7 +437,6 @@ this.dataListThree.map((item, index) => { if (this.addMenu.id === item.id) { selectNode.push(item) - console.log('编辑的selectNode', selectNode) this.addMenu.pid = selectNode[0].pid this.addMenu.selfCode = selectNode[0].svppsCode this.addMenu.selfName = selectNode[0].svppsCnName @@ -582,7 +574,6 @@ if (valid) { if (this.menuAddOrUpdateFlag === 1) { this.sarMenu.pid = this.selectSarMenu.id - console.log(this.selectSarMenu.id) // if (this.selectSarMenu.parentIds != null) { // this.sarMenu.parentIds = this.selectSarMenu.parentIds + ',' + this.selectSarMenu.id // } else { @@ -650,11 +641,9 @@ }, watch: { operationAuthority(newValue) { - console.log('newValue',newValue) // this.operationAuthority = newValue this.$nextTick(() => { this.operationAuthority = newValue - console.log('this.operationAuthority',this.operationAuthority) this.$forceUpdate() }) } @@ -662,8 +651,6 @@ computed: { }, mounted () { - console.log('this.$route.params.qbDataType',this.$route.query.qbDataType) - console.log('this.$route.params.qbBaseId',this.$route.query.qbBaseId) this.baseDataId =this.$route.query.qbBaseId switch (this.$route.query.qbDataType) { case '1': diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index c433a7cad..bcb997b6d 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -623,7 +623,6 @@ export default { loading: 'treeModalLoading' }, res => { if (res.ok) { - console.log('dataaaaaa', res.data) let backData = res.data // 新增一个接口 this.$http.postData('lawss/sarSubMenu/insertSarSubMenuall', backData, { diff --git a/src/pages/config/pages/processManage/components/EditProcess.vue b/src/pages/config/pages/processManage/components/EditProcess.vue index d21877775..70e51b5b5 100644 --- a/src/pages/config/pages/processManage/components/EditProcess.vue +++ b/src/pages/config/pages/processManage/components/EditProcess.vue @@ -108,7 +108,6 @@ export default { _this: this }, res => { if (res.success) { - console.log('新增/编辑成功') this.$emit('success') this.$emit('close') } diff --git a/src/pages/config/pages/processManage/components/EditProcessClassification.vue b/src/pages/config/pages/processManage/components/EditProcessClassification.vue index 4bc819df0..f8dda5e1e 100644 --- a/src/pages/config/pages/processManage/components/EditProcessClassification.vue +++ b/src/pages/config/pages/processManage/components/EditProcessClassification.vue @@ -84,7 +84,6 @@ export default { _this: this }, res => { if (res.success) { - console.log('新增/编辑成功') this.$emit('success') this.$emit('close') } diff --git a/src/pages/config/pages/processManage/process.vue b/src/pages/config/pages/processManage/process.vue index 12fe2128f..bf0846b6a 100644 --- a/src/pages/config/pages/processManage/process.vue +++ b/src/pages/config/pages/processManage/process.vue @@ -178,7 +178,6 @@ export default { // 点击查看 handlePreview (item) { - console.log('item', item) let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { @@ -216,7 +215,6 @@ export default { }, { _this: this }, res => { - console.log('删除成功') this.$message.warning(res.message) this.queryTablePage() }, e => { diff --git a/src/pages/config/pages/processManage/processClassification.vue b/src/pages/config/pages/processManage/processClassification.vue index 7556573bf..610e9040f 100644 --- a/src/pages/config/pages/processManage/processClassification.vue +++ b/src/pages/config/pages/processManage/processClassification.vue @@ -170,7 +170,6 @@ export default { // 点击查看 handlePreview (item) { - console.log('item', item) let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { diff --git a/src/pages/config/pages/standLawsAttrManage/index.vue b/src/pages/config/pages/standLawsAttrManage/index.vue index 2c6ab49c7..373237277 100644 --- a/src/pages/config/pages/standLawsAttrManage/index.vue +++ b/src/pages/config/pages/standLawsAttrManage/index.vue @@ -380,7 +380,6 @@ export default { } }, goNuwPage (item) { - console.log('item', item) this.$store.commit('setDetailMap', this.$route.path) this.$router.push({ name: 'StandLawsAttrDetails', @@ -598,7 +597,6 @@ export default { let listId = this.selectedList[i] listIds.push(listId) } - console.log(listIds) let listIdsStr = listIds.join(',') this.$confirm('确定删除这些数据?', '提示', { confirmButtonText: '确定', diff --git a/src/pages/config/pages/userManage/index.vue b/src/pages/config/pages/userManage/index.vue index 358cf1557..4e9c8d756 100644 --- a/src/pages/config/pages/userManage/index.vue +++ b/src/pages/config/pages/userManage/index.vue @@ -690,7 +690,6 @@ export default { }, // 打开新增用户模态框 openAddUserModal () { - console.log('userVO',this.userVO) this.userTitle = '新增用户' this.userVO.roleIdList = '' this.showPWD = true diff --git a/src/pages/details/process/ruku/index.vue b/src/pages/details/process/ruku/index.vue index c4fb4875e..e85d0f6c5 100644 --- a/src/pages/details/process/ruku/index.vue +++ b/src/pages/details/process/ruku/index.vue @@ -2557,7 +2557,6 @@ export default { ...mapGetters(['rukuBaseInfo']) }, async mounted () { - console.log(this.rukuBaseInfo) // this.sarStandardsInfoEO.id = this.$route.params.id // // await this.selectStandMessage() // this.standItemEO.standId = this.$route.params.id diff --git a/src/pages/knowledgeGraph/components/knowledgeGraph.vue b/src/pages/knowledgeGraph/components/knowledgeGraph.vue index b6e6e2518..2607a5163 100644 --- a/src/pages/knowledgeGraph/components/knowledgeGraph.vue +++ b/src/pages/knowledgeGraph/components/knowledgeGraph.vue @@ -219,7 +219,6 @@ export default { }); let graphData = this.graphData G6.Util.traverseTree(graphData, function(item) { - // console.log(item) const data = item.data || {} item.id = item.nodeId; item.name = item.nodeName @@ -273,7 +272,6 @@ export default { graph.setItemState(ce, 'click', false); }); const edgeItem = e.item; // 获取被点击的边元素对象 - console.log('EdgeClick', edgeItem) graph.setItemState(edgeItem, 'click', true); // 设置当前边的 click 状态为 true this.$emit('edgeClick', edgeItem) }); diff --git a/src/pages/localTool/applicationStandardNumber/index.vue b/src/pages/localTool/applicationStandardNumber/index.vue index e3e00f8db..e6b1d745b 100644 --- a/src/pages/localTool/applicationStandardNumber/index.vue +++ b/src/pages/localTool/applicationStandardNumber/index.vue @@ -513,7 +513,6 @@ export default { month = month.toString().padStart(2, '0') date = date.toString().padStart(2, '0') var defaultDate = `${year}-${month}-${date}` - console.log('defaultDate', defaultDate) // this.$set(this.searchFormField, 'date', defaultDate) this.userVO.receiveTime = defaultDate }, @@ -607,7 +606,6 @@ export default { for (let key in item) { if (key === 'dicCodeName') { treeItem.name = item[key] - console.log('dicTypeName', item['dicTypeName']) } else { treeItem[key] = item[key] } @@ -645,7 +643,6 @@ export default { // alert(1) this.standNum.busStandClass = treeNode.name this.busStandClassCode = this.standNum.busStandClass - console.log('TTTTTTTTTTT', this.busStandClassCode) $('#deptBtn1').click() }, treeDblClick2 (treeId, treeNode) { @@ -733,7 +730,6 @@ export default { }, // 编辑 selectStandardPro (item, state) { - console.log('item11111111111', item) this.numTitle = '修改标准编号' this.showNumModal = true this.$nextTick(() => { @@ -766,7 +762,6 @@ export default { this.getOrgTreeSource() this.getOrgTreeSource2() this.numType = 2 - console.log(' item.busStandClassShow', item.busStandClassShow) // 赋值 this.sarBussionessStandEO.busStandClass = item.busStandClass this.sarBussionessStandEO.employerShow = item.employerShow @@ -912,7 +907,6 @@ export default { // let userEOStr = JSON.stringify(this.userVO) // let userEOStr = JSON.parse(JSON.stringify(this.userVO)) // 验证标准--新增、编辑都先验证 - console.log('JSON.stringify(this.userVO.busStandClass)', JSON.stringify(this.userVO.busStandClass)) this.$http.post('lawss/sarStandReceivr/validateStandNumber', { // userStr: userEOStr busStandClass: JSON.stringify(this.userVO.busStandClass), @@ -925,7 +919,6 @@ export default { res => { if (res.ok) { // 更新 - console.log('this.numType', this.numType) if (this.numType !== 1) { // alert('编辑') this.drawerLoading = true @@ -942,7 +935,6 @@ export default { // 新增 // alert('新增') // this.userVO.employerShow = this.userVO.employer - console.log('新增', this.userVO) this.loading = true this.$http.postData('lawss/sarStandReceivr/create', this.userVO, {_this: this}, diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 3a716a366..9dc7f2281 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -1254,7 +1254,6 @@ export default { var index2 = filename.length var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 - console.log(this.defaultFileList) if (this.defaultFileList.length > 0) { this.$message.warning('一次仅能拆分一个文件') return false @@ -1270,7 +1269,6 @@ export default { return true }, beforeSplitResultImport(file) { - console.log(file) var filename = file.name var index1 = filename.lastIndexOf('.') var index2 = filename.length @@ -1393,7 +1391,6 @@ export default { break case '收藏': let personCollect = {} - console.log(command[0]) personCollect.collectResId = command[0].id // id personCollect.collectType = 'STAND_SPLIT' // 类型 if (command[0].standId) { diff --git a/src/pages/localTool/standContrast/index.vue b/src/pages/localTool/standContrast/index.vue index 15d49d176..eed9456a1 100644 --- a/src/pages/localTool/standContrast/index.vue +++ b/src/pages/localTool/standContrast/index.vue @@ -427,7 +427,6 @@ export default { this.spinShow = false item.isSubmit = false item.collectBtn = !item.collectBtn - console.log(item.collectBtn, '点击收藏后') item.collectId = res.data.id this.cancelCollect = !this.cancelCollect }, e => { diff --git a/src/pages/personal/pages/my-collection/collectionDetail/CollectionBussStandardDetail.vue b/src/pages/personal/pages/my-collection/collectionDetail/CollectionBussStandardDetail.vue index d60353141..1f875e64b 100644 --- a/src/pages/personal/pages/my-collection/collectionDetail/CollectionBussStandardDetail.vue +++ b/src/pages/personal/pages/my-collection/collectionDetail/CollectionBussStandardDetail.vue @@ -844,7 +844,6 @@ export default { this.$http.get('activiti/busProcess/selectProcessByStandId', obj, { _this: this }, res => { - console.log(res) if (res.ok) { this.opinionsProcessList = res.data.opinionsProcessList this.notifiProcessList = res.data.notifiProcessList diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue index 57f18d034..6d4ef806f 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue @@ -168,8 +168,6 @@ export default { return date != null ? date.substring(0, date.indexOf(' ')) : '' }, cancleCollectBatch () { - console.log(this.selectedList); - return if (this.selectedList.length === 0) { this.$confirm('请先选择数据进行取消收藏', '提示', { showCancelButton: false, diff --git a/src/pages/personal/pages/questionsAndAnswers/components/AnswerItem.vue b/src/pages/personal/pages/questionsAndAnswers/components/AnswerItem.vue index bc31fc5b9..8594f54a0 100644 --- a/src/pages/personal/pages/questionsAndAnswers/components/AnswerItem.vue +++ b/src/pages/personal/pages/questionsAndAnswers/components/AnswerItem.vue @@ -156,7 +156,6 @@ export default { _this: this },res => { if (res.ok) { - console.log('success', res) // this.newDialogVisible = false this.$message({ message: res.data, @@ -173,7 +172,6 @@ export default { } else { - console.log('error submit!!'); return false; } }); diff --git a/src/pages/personal/pages/questionsAndAnswers_old2/components/AnswerItem.vue b/src/pages/personal/pages/questionsAndAnswers_old2/components/AnswerItem.vue index 79ab88a65..71cc8f5f1 100644 --- a/src/pages/personal/pages/questionsAndAnswers_old2/components/AnswerItem.vue +++ b/src/pages/personal/pages/questionsAndAnswers_old2/components/AnswerItem.vue @@ -113,7 +113,6 @@ export default { _this: this },res => { if (res.ok) { - console.log('success', res) // this.newDialogVisible = false this.$message({ message: res.data, @@ -130,7 +129,6 @@ export default { } else { - console.log('error submit!!'); return false; } }); diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 95a5dce6e..be0c0448a 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -216,8 +216,6 @@ export default { dealWith (row) { // 办理 this.setHandleInfo(JSON.stringify(row)) const prcType = row.prcType - console.log(prcType) - console.log(row.taskInfo) switch(prcType) { case '1': if (row.taskInfo === '标准法规业务经理审批') { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 8f3fbecb8..fed96b5c0 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -54,6 +54,25 @@ export default { watch: {}, mounted() { + }, + beforeRouteLeave(to, from, next) { + const toName = ['ListOfStandardsAndRegulationsDetails', 'Details', 'ProjectAddEit', 'OtherAddEit'] + // 离开此页面之前,记录tabName以便返回使用,如果将要访问的页面不是这两个,则清空tabName + if (toName.includes(to.name)) { + this.$store.commit('SET_ACCESS_STANDARD_REG_TABS', this.tabValue) + } else { + this.$store.commit('SET_ACCESS_STANDARD_REG_TABS') + } + setTimeout(() => { + next() + }, 100) + }, + beforeRouteEnter(to, from, next) { + next(vm => { + if (vm.$store.state.accessStandRegTabName !== '') { + vm.tabValue = vm.$store.state.accessStandRegTabName + } + }) } }; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index 134daab78..48e9227cb 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -105,12 +105,12 @@ @@ -130,7 +130,7 @@ sortable align="center"> { - console.log(res.data.records); this.sarAccessListDatas = res.data.records; this.sarAccessListTotal = res.data.total }, e => { @@ -338,7 +337,7 @@ export default { }, // 点击 table编辑按钮 事件 editTable(item) { - sessionStorage.setItem("accessRow", JSON.stringify(item)); + this.$store.commit('SET_ACCESS_STAND_REG_ROW', item) this.$router.push({ name: "ListOfStandardsAndRegulationsDetails", query: { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index 70d2e47be..11be7d7e0 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -96,12 +96,12 @@ @@ -121,7 +121,7 @@ sortable align="center"> @@ -121,7 +121,7 @@ sortable align="center"> - + @@ -268,7 +268,7 @@ align="center"> @@ -451,6 +451,7 @@ import CustomSVPPS from '@/components/CustomFormComponents/SVPPS' import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPolicy' import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import stand from "../../../config/pages/attributeCustom/components/stand"; +import { mapGetters } from 'vuex' export default { name: 'ListOfStandardsAndRegulationsDetails', components: { @@ -552,7 +553,6 @@ export default { askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 accessSarType: 'SKILL', // 清单类型 - accessContent: '', // 清单名称 page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, @@ -700,6 +700,7 @@ export default { } ], depNode: [], // 部门树 + isNext: false, depFONode: [], depRoleNode: [], standNatureOptions: [], // 新增 标准性质 @@ -922,7 +923,7 @@ export default { this.sarAccessInfoSearch.keywords = '' // 关键字 this.sarAccessInfoSearch.accessSarType = 'SKILL' // 清单类型 this.sarAccessInfoSearch.askType = '' // 监管类型 - this.sarAccessInfoSearch.accessContent = '' // 清单名称 + this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.isListType = false this.selectLawsStands() @@ -1454,7 +1455,6 @@ export default { sarAccessEO.inforlist = JSON.stringify(rowlist) sarAccessEO.adminInfoList = JSON.stringify(rowList2) sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') - sarAccessEO.detailedListName = sarAccessEO.detailedListName.join(',') // 判断是否有附件 if (this.fileInfoList.length > 0) { let relateFile = [] @@ -1472,7 +1472,7 @@ export default { loading: 'loadData' }, res => { if (res.ok) { - console.log('页面跳转 '); + this.isNext = true this.$router.push({ name: 'AccessStandardsAndRegulations' }) @@ -1481,11 +1481,12 @@ export default { }) } else { // 编辑 - this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { + this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { _this: this, loading: 'loadData' }, res => { if (res.ok) { + this.isNext = true this.$router.push({ name: 'AccessStandardsAndRegulations' }) @@ -1669,6 +1670,23 @@ export default { this.selectLawsStands() } }, + beforeRouteLeave(to, from, next) { + if (to.name === 'Login' || this.isNext) { + next() + } else { + this.$confirm('是否放弃编辑', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + confirmButtonClass: 'common-button-primary', + roundButton: true, + type: 'warning' + }).then(() => { + next() + }).catch(() => { + // alert("router") + }) + } + }, // 点击清单条目 新增按钮 事件 addEntry () { this.editAddType = 1 @@ -2183,6 +2201,9 @@ export default { this.accessSarTypeList = [] } }, + computed: { + ...mapGetters(['getAccessStandardRegRow']), + }, mounted () { this.getDept() // 从数据库中查询各下拉框数据 @@ -2207,7 +2228,7 @@ export default { this.getOrgTreeSource() // 判断是否是编辑 if (this.$route.query.id) { - let accessRow = JSON.parse(sessionStorage.getItem('accessRow')) + const accessRow = this.getAccessStandardRegRow this.$nextTick(() => { this.sarAccessEO.type = accessRow.type this.sarAccessEO.countryArea = accessRow.countryArea.split(',') @@ -2226,6 +2247,13 @@ export default { this.$refs['sarAccessForm'].resetFields() }) } + }, + beforeRouteLeave(to, from, next) { + next() + setTimeout(() => { + // 清空详情 + this.$store.commit('SET_ACCESS_STAND_REG_ROW') + }, 100) } } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 23db0dbe8..f684c471d 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -306,7 +306,6 @@ export default { }, // 根据准入id查询标准法规详情 selectInfobyAccid() { - console.log('309',this.pageId); this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { ...this.standardForm, id: this.pageId, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 1e84af4eb..1b2a3d7c1 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -116,9 +116,9 @@ - + @@ -253,7 +253,7 @@ align="center"> @@ -436,6 +436,7 @@ import CustomSVPPS from '@/components/CustomFormComponents/SVPPS' import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPolicy' import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import stand from "../../../config/pages/attributeCustom/components/stand"; +import { mapGetters } from "vuex"; export default { name: 'OtherAddEit', components: { @@ -536,7 +537,7 @@ export default { askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 accessSarType: 'SKILL', // 清单类型 - accessContent: '', // 清单名称 + detailedListName: '', // 清单名称 page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, @@ -911,7 +912,7 @@ export default { this.sarAccessInfoSearch.keywords = '' // 关键字 this.sarAccessInfoSearch.accessSarType = 'SKILL' // 清单类型 this.sarAccessInfoSearch.askType = '' // 监管类型 - this.sarAccessInfoSearch.accessContent = '' // 清单名称 + this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.isListType = false this.selectLawsStands() @@ -1457,7 +1458,6 @@ export default { loading: 'loadData' }, res => { if (res.ok) { - console.log('页面跳转 '); this.$router.push({ name: 'AccessStandardsAndRegulations' }) @@ -1466,7 +1466,7 @@ export default { }) } else { // 编辑 - this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { + this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { _this: this, loading: 'loadData' }, res => { @@ -1885,7 +1885,7 @@ export default { res.data.ADMIN.map((item, index) => { item.uuid = this.number item.GXHBQ = item.gxhbq - item.eopPutTime = item.eopPutTextTime + item.eopPutTime = item.eopPutTextTime //实施日期 item.newPutTime = item.newPutTextTime item.prodPutTime = item.prodPutTextTime this.number++ @@ -2169,6 +2169,9 @@ export default { this.accessSarTypeList = [] } }, + computed: { + ...mapGetters(['getAccessStandardRegRow']), + }, mounted () { this.getDept() // 从数据库中查询各下拉框数据 @@ -2193,7 +2196,7 @@ export default { this.getOrgTreeSource() // 判断是否是编辑 if (this.$route.query.id) { - let accessRow = JSON.parse(sessionStorage.getItem('accessRow')) + const accessRow = this.getAccessStandardRegRow this.$nextTick(() => { this.sarAccessEO.type = accessRow.type // this.sarAccessEO.countryArea = accessRow.countryArea.split(',') diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 388d47b85..2b1f5c2f5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -116,9 +116,9 @@ - + @@ -253,7 +253,7 @@ align="center"> @@ -436,6 +436,7 @@ import CustomSVPPS from '@/components/CustomFormComponents/SVPPS' import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPolicy' import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import stand from "../../../config/pages/attributeCustom/components/stand"; +import { mapGetters } from "vuex"; export default { name: 'ProjectAddEit', components: { @@ -536,7 +537,7 @@ export default { askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 accessSarType: 'SKILL', // 清单类型 - accessContent: '', // 清单名称 + detailedListName: '', // 清单名称 page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, @@ -911,7 +912,7 @@ export default { this.sarAccessInfoSearch.keywords = '' // 关键字 this.sarAccessInfoSearch.accessSarType = 'SKILL' // 清单类型 this.sarAccessInfoSearch.askType = '' // 监管类型 - this.sarAccessInfoSearch.accessContent = '' // 清单名称 + this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.isListType = false this.selectLawsStands() @@ -1459,7 +1460,6 @@ export default { loading: 'loadData' }, res => { if (res.ok) { - console.log('页面跳转 '); this.$router.push({ name: 'AccessStandardsAndRegulations' }) @@ -1468,7 +1468,7 @@ export default { }) } else { // 编辑 - this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { + this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { _this: this, loading: 'loadData' }, res => { @@ -2170,6 +2170,9 @@ export default { this.accessSarTypeList = [] } }, + computed: { + ...mapGetters(['getAccessStandardRegRow']), + }, mounted () { this.getDept() // 从数据库中查询各下拉框数据 @@ -2194,7 +2197,7 @@ export default { this.getOrgTreeSource() // 判断是否是编辑 if (this.$route.query.id) { - let accessRow = JSON.parse(sessionStorage.getItem('accessRow')) + const accessRow = this.getAccessStandardRegRow this.$nextTick(() => { this.sarAccessEO.type = accessRow.type // this.sarAccessEO.countryArea = accessRow.countryArea.split(',') diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 6273aa70e..a46b47eeb 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2091,9 +2091,7 @@ export default { this.$message.success('导出信息成功') } } else if (this.saveExportType === 'all') { - console.log('全部导出') let exportEOStr = JSON.stringify(this.SarExportSearchEo) - console.log(exportEOStr) exportEOStr = exportEOStr.replace(/""/g, null) window.open(interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' + 'exportType' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index da5ba1405..c5e4fd9f2 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1601,7 +1601,6 @@ export default { }, // 授权-查询权限 givePower (item) { - console.log('item',item) this.standId = item.id this.visibleOrgTable = true }, @@ -1613,8 +1612,6 @@ export default { idList.push(item.userId) nameList.push(item.userName) }) - console.log('idList', idList); - console.log('idListJoin', idList.join(',')); this.$http.post('lawss/sarBussionessStand/insertPerson', { qbid: this.standId, userIds: idList.join(',') @@ -1842,7 +1839,6 @@ export default { }, // 点击查看 handlePreview (item) { - console.log(item); const mj = item.attrInfoMap.QBMJ if (mj === 'GXNX7D6H59') { // C1所有人都可查看 @@ -1889,7 +1885,6 @@ export default { const userInfo = this.userInfo const currentId = userInfo.userId // 当前用户的id // 如果当前用户的部门和科室不在全部部门里 就不允许查看 - console.log(qcr.indexOf(currentId)) if (!(qcr.indexOf(currentId) > -1)) { // this.$message.warning('当前用户无权限查看此详情') this.$http.get('lawss/sarBussionessStand/selectPerson', { diff --git a/src/pages/regulatoryRepository/information/index.vue b/src/pages/regulatoryRepository/information/index.vue index ce0b9b041..7177775d0 100644 --- a/src/pages/regulatoryRepository/information/index.vue +++ b/src/pages/regulatoryRepository/information/index.vue @@ -184,7 +184,6 @@ export default { json.text = arr[a].name newArr.push(json) } - console.log(newArr); } }, computed: { diff --git a/src/pages/regulatoryRepository/information/index2.vue b/src/pages/regulatoryRepository/information/index2.vue index be98873dd..d160517a3 100644 --- a/src/pages/regulatoryRepository/information/index2.vue +++ b/src/pages/regulatoryRepository/information/index2.vue @@ -203,7 +203,6 @@ export default { }, methods: { contentClick (link) { - console.log(this.$route) this.$store.commit('setDetailMap', this.$route.fullPath) this.$router.push(link) }, @@ -324,7 +323,6 @@ export default { // this.msgDetails.collectId = res.data.id this.msgDetails.collectId = this.$route.params.id this.collection = 1 - // console.log('msgDetails.collectId', this.msgDetails.collectId) }, e => { this.isSubmit = false }) @@ -352,7 +350,6 @@ export default { obj.content = this.relateList[i].content this.relateNowList.push(obj) } - console.log('relateNowList', this.relateNowList) }, e => { }) @@ -387,7 +384,6 @@ export default { this.msgDetails = res.data this.collection = res.data.collection - console.log('this.msgDetails000000000', this.msgDetails) this.addPersonCookie() }, e => { }) diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue index ceb38c6f1..63cc3c8dd 100644 --- a/src/pages/regulatoryRepository/nonConfomity/index.vue +++ b/src/pages/regulatoryRepository/nonConfomity/index.vue @@ -29,7 +29,6 @@ export default { }, methods: { handleClick(tab, event) { - console.log(tab, event); } }, watch: {}, diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index e3994f291..8de49527b 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -54,30 +54,38 @@ - - + + + {{ opt.label }} + - - + + + @@ -85,14 +93,14 @@ - @@ -100,59 +108,176 @@ - - - + + + - - + + + + + + - - + + + - - + + + - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -164,279 +289,191 @@ - - + - - + - - - - - + + - - - {{ opt1.label }} - - - - - - - - - - {{ opt.label }} - - - - - - - + - - + - - - {{ item.label }} - - - - - - - - - - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ item.label }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - -
- - -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -449,303 +486,176 @@ - - + - + - - - {{ opt1.label }} - - - - - - - - {{ opt.label }} - - - - - - - - - + - - + - - - - - - - - - - - - - - - - - - -
- - -
- - - - - - - {{ item.label }} - - - - - - - - - - {{ item.label }} - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + - - - - - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 4279432d5..f846902eb 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -1894,7 +1894,6 @@ export default { let pagetype = '' pagetype = item.typeShow if (item.typeShow === 'INLAND_STAND') { - console.log('guonei权限') routername = 'OtherStandardDetails' // if (this.$hasPermission('CFEZ3VP7EA95CTRBH3JB')) { // routername = 'OtherStandardDetails' @@ -2137,7 +2136,6 @@ export default { type: 'warning' }) } else { - console.log(this.selectNowObjResult); let pagetype = '' if (this.selectNowObjResult.type === 'stand') { if (this.selectNowObjResult.standType === 'INLAND') { @@ -2258,7 +2256,6 @@ export default { if (item.type === 'stand') { if (this.$hasPermission('SSA6WR4HV8') && this.$hasPermission('HK36LHK9444NPN8X634W')){ routername = 'OtherStandardDetails' - console.log('guoneiQUANXIAN') if (item.standType === 'INLAND') { pagetype = 'INLAND_STAND' } else { diff --git a/src/pages/skillReq/SkillReqAdd/searchForm.vue b/src/pages/skillReq/SkillReqAdd/searchForm.vue index 406aa120b..3d0b8ee76 100644 --- a/src/pages/skillReq/SkillReqAdd/searchForm.vue +++ b/src/pages/skillReq/SkillReqAdd/searchForm.vue @@ -530,7 +530,6 @@ export default { }, methods: { searchAll () { - console.log('this.searchOption: ', this.searchOption) let searchData = {} Object.keys(this.searchOption).forEach(key => { if (!(this.searchOption[key] === '' || this.searchOption[key] === [])) { @@ -545,7 +544,6 @@ export default { searchData[key] = this.searchOption[key] } }) - console.log('searchData: ', searchData) searchData['effectiveDate1'] = this.searchOption.startDate[0] searchData['effectiveDate2'] = this.searchOption.startDate[1] @@ -570,7 +568,6 @@ export default { */ getOptionData () { this.$http.get('sys/org/getTree', {}, {_this: this}, res => { - console.log('res: ', res) this.departmentList = res.data.map(item => { return { label: item.orgName, @@ -579,7 +576,6 @@ export default { }) }) this.$http.get('sys/dictype/getDicTypeListCode', {}, {_this: this}, res => { - console.log('res: ', res) Object.keys(res.data).forEach(item => { switch (item) { case 'REGION' : diff --git a/src/pages/skillReq/SkillReqSee/searchForm.vue b/src/pages/skillReq/SkillReqSee/searchForm.vue index 3f204fb32..9a24e805d 100644 --- a/src/pages/skillReq/SkillReqSee/searchForm.vue +++ b/src/pages/skillReq/SkillReqSee/searchForm.vue @@ -150,13 +150,7 @@ export default { } }, created () { - console.log('Object.keys(searchOption): ', Object.keys(this.searchOption)) this.getOptionData() - // setTimeout(() => { - // this.searchOption[6].data = Array(45).fill('test') - // this.searchOption[6].data = Array(45).fill('test') - // this.ifHaveEnoughData() - // }, 5000) }, methods: { /* @@ -167,7 +161,6 @@ export default { */ getOptionData () { this.$http.get('sys/org/getTree', {}, {_this: this}, res => { - console.log('res: ', res) this.searchOption[7].data = res.data.map(item => { return { label: item.orgName, @@ -177,7 +170,6 @@ export default { this.searchOption[7].data.unshift(all) }) this.$http.get('sys/dictype/getDicTypeListCode', {}, {_this: this}, res => { - console.log('res: ', res) Object.keys(res.data).forEach(item => { switch (item) { case 'REGION' : @@ -253,7 +245,6 @@ export default { *@date: 2020-09-27 13:50:21 */ handleOptionClick (value, index) { - console.log('value: ', value) // 区域 if (index === 0 || index === 5 || index === 7 || index === 8) { this.loading = true @@ -271,7 +262,6 @@ export default { // 全部 if (value[0] === 'all') { this.$http.get('sys/dictype/getDicTypeListCode', {}, {_this: this}, res => { - console.log('res: ', res) this.searchOption[index + 1].data = index === 0 ? res.data['COUNTRY'] : res.data['SUBAREA'] this.searchOption[index + 1].data.unshift(all) this.ifHaveEnoughData() @@ -301,7 +291,6 @@ export default { */ reloadTable () { let searchdata = this.searchOption.map(item => item.selectValue) - console.log('searchdata: ', searchdata) let data = {} const keys = ['regionList', 'countryList', 'sourceTypeList', 'carTypeList', 'carCategoryList', 'areaList', 'subAreaList', 'departmentList'] keys.forEach((key, index) => { @@ -310,10 +299,8 @@ export default { } }) data['allSubjects'] = this.subject ? this.subject : null - console.log('this.startDate: ', this.startDate) data['effectiveDate1'] = this.startDate[0] ? this.startDate[0] : null data['effectiveDate2'] = this.startDate[1] ? this.startDate[1] : null - console.log('data: ', data) this.$emit('searchData', data) }, /* diff --git a/src/pages/standardComparisonLibrary/components/StandardSelect.vue b/src/pages/standardComparisonLibrary/components/StandardSelect.vue index 8a5615d42..6a75d1999 100644 --- a/src/pages/standardComparisonLibrary/components/StandardSelect.vue +++ b/src/pages/standardComparisonLibrary/components/StandardSelect.vue @@ -160,7 +160,6 @@ export default { // 点击查看 handlePreview (item) { - console.log('item', item) let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { diff --git a/src/pages/standardComparisonLibrary/components/StandardView.vue b/src/pages/standardComparisonLibrary/components/StandardView.vue index d379999f3..9bab9ecec 100644 --- a/src/pages/standardComparisonLibrary/components/StandardView.vue +++ b/src/pages/standardComparisonLibrary/components/StandardView.vue @@ -171,7 +171,6 @@ export default { list: list } return new Promise((resolve, reject) => { - console.log(179) this.$http.postData('lawss/SarStandCompareList/save', formData, { _this: this }, res => { diff --git a/src/store/getters/index.js b/src/store/getters/index.js index a48367ecf..1d90d8ad3 100644 --- a/src/store/getters/index.js +++ b/src/store/getters/index.js @@ -172,5 +172,12 @@ export default { } else { return JSON.parse(state.rukuBaseInfo) } + }, + getAccessStandardRegRow: state => { + if (state.accessStandRegRows === '') { + return null + } else { + return JSON.parse(state.accessStandRegRows) + } } } diff --git a/src/store/mutations/index.js b/src/store/mutations/index.js index 208df4ce5..e326e7cee 100644 --- a/src/store/mutations/index.js +++ b/src/store/mutations/index.js @@ -272,5 +272,29 @@ export default { sessionStorage.removeItem('rukuBaseInfo') } catch (e) {} } + }, + // 标准法规清单记录当前编辑条目 + SET_ACCESS_STAND_REG_ROW(state, row) { + if (row) { + state.accessStandRegRows = JSON.stringify(row) + try { + sessionStorage.setItem('accessStandRegRows', JSON.stringify(row)) + } catch (e) {} + } else { + state.accessStandRegRows = '' + sessionStorage.removeItem('accessStandRegRows') + } + }, + //标准法规清单记录当前tab + SET_ACCESS_STANDARD_REG_TABS(state, tabName) { + if (tabName) { + state.accessStandRegTabName = tabName + try { + sessionStorage.setItem('accessStandRegTabName', tabName) + } catch (e) {} + } else { + state.accessStandRegTabName = '' + sessionStorage.removeItem('accessStandRegTabName') + } } } diff --git a/src/store/state/index.js b/src/store/state/index.js index 671dae9b8..3b3f7571f 100644 --- a/src/store/state/index.js +++ b/src/store/state/index.js @@ -31,6 +31,8 @@ let handleInfo = '' // 流程办理传递数据 let myBussStandardPlan = '' let proLastDetail = '' // 流程结果详情 let rukuBaseInfo = '' // 入库流程基础表单信息(后几步展示用) +let accessStandRegRows = '' // 标准法规清单编辑 +let accessStandRegTabName = '' // 标准法规清单页面当前页签 try { if (localStorage.theme) { defaultTheme = localStorage.theme } if (localStorage.token) { defaultToken = localStorage.token } @@ -61,6 +63,8 @@ try { if (sessionStorage.myBussStandardPlan) { myBussStandardPlan = sessionStorage.myBussStandardPlan } if (sessionStorage.proLastDetail) { proLastDetail = sessionStorage.proLastDetail } if (sessionStorage.rukuBaseInfo) { rukuBaseInfo = sessionStorage.rukuBaseInfo } + if (sessionStorage.accessStandRegRows) { accessStandRegRows = sessionStorage.accessStandRegRows } + if (sessionStorage.accessStandRegTabName) { accessStandRegTabName = sessionStorage.accessStandRegTabName } } catch (e) {} export default { theme: defaultTheme, // 主题 @@ -94,4 +98,6 @@ export default { myBussStandardPlan, proLastDetail, rukuBaseInfo, + accessStandRegRows, + accessStandRegTabName } diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index eb8f863a6..6b01d87aa 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.178' -const devInterfacePORT = '9999' +const devInterfacePORT = '9998' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload' From 3ffc3520a1c7b96764cf3d758aa0f6308479ee56 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 25 Jun 2021 17:59:51 +0800 Subject: [PATCH 074/528] commit --- src/pages/config/pages/postManage/index.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue index 2fe21f20a..f18f716da 100644 --- a/src/pages/config/pages/postManage/index.vue +++ b/src/pages/config/pages/postManage/index.vue @@ -123,15 +123,13 @@ }, methods: { add () { - console.log(this.$refs.tree.getCheckedNodes()); - console.log(this.$refs.tree.getCheckedKeys()); + console.log(this.$refs.tree.getCheckedKeys().concat(this.$refs.tree.getHalfCheckedKeys())); }, handleCheckChange (checkedNodes, checkedKeys) { var list = [] for (var a = 0; a < checkedKeys.checkedNodes.length; a++) { list.push(checkedKeys.checkedNodes[a].id) } - console.log(list); }, getRole () { this.$http.get('sarRole/role', {}, {}, res=> { From 3e42e33914750122687a9d391990177bfc6e8139 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 28 Jun 2021 20:12:12 +0800 Subject: [PATCH 075/528] commit --- src/components/navMenu/index.vue | 8 +- .../config/pages/mechanismManage/index.vue | 1 - src/pages/config/pages/menuManage/index.vue | 533 ++---- src/pages/config/pages/postManage/index.vue | 54 +- src/pages/config/pages/roleManage/index.vue | 1611 +++-------------- 5 files changed, 368 insertions(+), 1839 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index bc43095be..f078cfe8f 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -299,10 +299,10 @@ export default { // path: '/convertDocView', // menuId: '3F52K25546' // }, - // // { - // // title: '菜单管理', - // // path: '/menuManage' - // // }, + { + title: '菜单管理', + path: '/menuManage' + }, // // { // // title: '保密管理', // // path: '/convertDocView' diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index ed2956fe3..b5e1f5053 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -188,7 +188,6 @@ export default { computed: {}, watch: { filterText(val) { - console.log(val); this.$refs.tree.filter(val); } }, diff --git a/src/pages/config/pages/menuManage/index.vue b/src/pages/config/pages/menuManage/index.vue index 50cb3a232..55b79fe33 100644 --- a/src/pages/config/pages/menuManage/index.vue +++ b/src/pages/config/pages/menuManage/index.vue @@ -2,89 +2,67 @@ @@ -96,212 +74,59 @@ export default { name: 'permission-menu-manage', data () { return { - formdisableflag: true, - zNodes: [], - sarMenuEO: { + modalshowflag: false, + showSarMenuInfoFlag: false, + treeData: [], + defaultProps: { + children: 'children', + label: 'menuName' + }, + form: { id: '', - name: '', - pId: '', - href: '', - isShow: '', - permission: '', + menuName: '', parentId: '' }, - sarMenuRules: { - name: [ - { required: true, message: '不能为空', trigger: 'blur' } - ] - // isShow: [ - // { type: 'string', required: true, message: '不能为空', trigger: 'blur' } - // ] - }, - isSubmit: false, - showSarMenuInfoFlag: false, - submitBtnFlag: false, - saveClickNodeInfo: '', - clickType: '' // 1为新增，2为修改 + NewForm: { + menuName: '', + } } }, methods: { - getTree () { - return new Promise((resolve, reject) => { - this.$http.get('sys/menu/listAllMenu', {}, { - _this: this - }, res => { - if (res.ok) { - let zNodes = [] - for (let i = 0; i < res.data.length; i++) { - let zObj = {} - zObj.id = res.data[i].id - zObj.pId = res.data[i].parentId - zObj.name = res.data[i].name - zObj.href = res.data[i].href - zObj.isShow = res.data[i].isShow - zObj.permission = res.data[i].permission - zObj.remarks = res.data[i].remarks - zNodes[i] = zObj - if (res.data[i].parentIds !== null) {} - } - this.zNodes = zNodes - } - resolve() - }, e => { - reject(e) - }) - }) - }, - /** - * @description: 树节点点击 - * @author: chenxiaoxi - * @date: 2018-09-25 16:13:25 - */ - handleClick (treeId, treeNode) { - this.submitBtnFlag = false - this.showSarMenuInfoFlag = true - this.sarMenuEO = treeNode - if (treeNode.href == null || treeNode.href === '' || treeNode.href === 'null') { - this.sarMenuEO.href = '' - } - if (treeNode.permission == null || treeNode.permission === '' || treeNode.permission === 'null') { - this.sarMenuEO.permission = '' - } - }, - /** - * @description: 树节点添加 - * @author: chenxiaoxi - * @date: 2018/12/26 15:39:22 - */ - handleAdd (treeId, treeNode) { - this.resetForm() - this.submitBtnFlag = true - this.clickType = '1' - this.showSarMenuInfoFlag = true - this.sarMenuEO.pId = treeNode.id - }, - - /** - * @description: 树节点删除 - * @author: chenxiaoxi - * @date: 2018-09-25 14:05:25 - */ - handleRemove (treeId, treeNode) { - if (treeNode.pId == null || treeNode.pId === '') { - this.$Message.error('不能删除根级节点') - } else { - this.$http.get('sys/menu/judgeContentChild', { - id: treeNode.id - }, { - _this: this - }, res => { - if (res.data != null && res.data.length > 0) { - this.$message.error('该节点包含子节点，不能删除') - } else { - this.sureDeleteMenu(treeNode) - } - }, e => {}) - } - }, - sureDeleteMenu (treeNode) { - this.$confirm('确认删除该条数据?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - confirmButtonClass: 'common-button-primary', - roundButton: true - }).then(() => { - if (treeNode.id != null && treeNode.id !== '') { - this.$http.put('sys/menu/deleteMenuById', { - id: treeNode.id - }, { - _this: this - }, res => { - if (res.data != null) { - this.getTree() - this.showSarMenuInfoFlag = false - this.resetForm() - } - }, e => { - }) - } else { - this.$message.warning('没有获取到所选节点id') + confirmDialog () { + var form = {} + form.parentId = this.form.id + form.menuName = this.NewForm.menuName + this.$http.postData('lawss/sarMenu/add', form, {}, res=> { + if (res.ok) { + this.getTree() + this.modalshowflag = false + this.$message.success('成功') } }) }, - /** - * @description: 节点编辑 - * @author: chenxiaoxi - * @date: 2018/12/26 15:29:46 - */ - handleEdit (treeId, treeNode) { - this.submitBtnFlag = true - this.clickType = '2' + Add () { + this.modalshowflag = true + }, + closeDialog () { + this.modalshowflag = false + this.NewForm.menuName = '' + }, + rightHandleNodeClick (e, data) {}, + handleNodeClick (data) { + this.form.id = data.id + this.form.menuName = data.menuName + this.form.parentId = data.parentId this.showSarMenuInfoFlag = true - this.saveClickNodeInfo = treeNode - this.sarMenuEO = treeNode - if (treeNode.href == null || treeNode.href === '' || treeNode.href === 'null') { - this.sarMenuEO.href = '' - } - if (treeNode.permission == null || treeNode.permission === '' || treeNode.permission === 'null') { - this.sarMenuEO.permission = '' - } }, - treeRightClick (treeId, treeNode) { - }, - resetForm () { - this.sarMenuEO.id = '' - this.sarMenuEO.pId = '' - this.sarMenuEO.name = '' - this.sarMenuEO.href = '' - this.sarMenuEO.isShow = '' - this.sarMenuEO.permission = '' - }, - saveMenuInfo () { - if (this.sarMenuEO.isShow != null && this.sarMenuEO.isShow !== '') { - this.isSubmit = true - this.$refs['sarMenuForm'].validate((valid) => { - if (valid) { - this.sarMenuEO.parentId = this.sarMenuEO.pId - let menuEO = JSON.parse(JSON.stringify(this.sarMenuEO)) - if (this.clickType === '1') { - this.$http.post('sys/menu/addMenu', menuEO, { - _this: this, - loading: 'isSubmit' - }, res => { - if (res.ok) { - this.isSubmit = false - this.submitBtnFlag = false - this.getTree() - } - }, e => { - this.isSubmit = false - }) - } else { - this.$http.put('sys/menu/updateMenu', this.sarMenuEO, { - _this: this, - loading: 'isSubmit' - }, res => { - this.isSubmit = false - this.submitBtnFlag = false - this.getTree() - }, e => { - this.isSubmit = false - }) - } - } else { - this.isSubmit = false - this.$message.error('请检查表单是否填写正确!') - } - }) - } else { - this.$message.warning('排序号不能为空!') - } - } - }, - props: { - sideClose: { - type: Boolean + getTree () { + this.$http.get('lawss/sarMenu', {}, {}, res=> { + if (res.ok) { + this.treeData = res.data + } + }) } }, + props: {}, computed: {}, watch: {}, mounted () { @@ -312,177 +137,29 @@ export default { diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index add59698b..d7fecfe7c 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -1,1322 +1,187 @@ @@ -1324,108 +189,72 @@ export default { From 708cdd904f1eca7244e13ebccb9ecf3ff50e258c Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 29 Jun 2021 15:19:46 +0800 Subject: [PATCH 076/528] commit --- src/pages/config/pages/menuManage/index.vue | 3 ++ src/pages/config/pages/postManage/index.vue | 19 +++++++- src/pages/config/pages/roleManage/index.vue | 51 ++++++++++++++++----- 3 files changed, 61 insertions(+), 12 deletions(-) diff --git a/src/pages/config/pages/menuManage/index.vue b/src/pages/config/pages/menuManage/index.vue index 55b79fe33..226cf8883 100644 --- a/src/pages/config/pages/menuManage/index.vue +++ b/src/pages/config/pages/menuManage/index.vue @@ -101,10 +101,13 @@ export default { this.getTree() this.modalshowflag = false this.$message.success('成功') + } else { + this.$message.warning(res.message) } }) }, Add () { + this.NewForm.menuName = '' this.modalshowflag = true }, closeDialog () { diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue index 064f1bcc6..fa0f14c26 100644 --- a/src/pages/config/pages/postManage/index.vue +++ b/src/pages/config/pages/postManage/index.vue @@ -34,7 +34,7 @@ width="170px"> @@ -122,6 +129,22 @@ export default { } }, methods: { + closeDialog () { + this.nodeList = [] + this.modalshowflag = false + }, + confirmDialog () { + this.$http.postData('sarRole/role/menu', { + menuIds: this.$refs.tree2.getCheckedKeys().concat(this.$refs.tree2.getHalfCheckedKeys()), + roleId: this.id + }, {}, res=> { + console.log(res); + if (res.ok) { + this.$message.success('设置权限成功') + this.modalshowflag = false + } + }) + }, getTree2 () { this.$http.get('lawss/sarMenu', {}, {}, res=> { if (res.ok) { @@ -243,6 +266,12 @@ export default { } } } + .myDialog { + /deep/.el-tree { + height: 300px; + overflow: auto; + } + } /deep/.el-select__tags { overflow-x: hidden; } From 2c657ac274800dc17e29a1844fbe2123dacf5f2c Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 29 Jun 2021 17:14:26 +0800 Subject: [PATCH 077/528] commit --- .../config/pages/mechanismManage/index.vue | 90 +++++++++++++++- src/pages/config/pages/postManage/index.vue | 101 ++++++++++++++---- 2 files changed, 171 insertions(+), 20 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index b5e1f5053..4c35ec569 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -9,7 +9,6 @@ v-model="filterText"> 启用 禁用 + 配置岗位
@@ -94,6 +94,36 @@
导入中... + + + + +
@@ -102,6 +132,14 @@ export default { name: 'MechanismManage', data () { return { + userId: '', + postList: [], + props: { + children: 'children', + label: 'name' + }, + nodeList: [], + modalPost: false, filterText: '', // 树结构检索条件 defaultProps: { children: 'children', @@ -119,6 +157,21 @@ export default { } }, methods: { + resetFormPost () { + this.modalPost= false + }, + PostSubmit () { + this.$http.postData('sarUser/user/position', { + positionIds: this.$refs.tree2.getCheckedKeys(), + userId: this.userId + }, {}, res => { + if (res.ok) { + this.$message.success('配置岗位成功') + this.modalPost = false + this.getData() + } + }) + }, handleCommand (command) { switch (command[1]) { case '启用': @@ -127,8 +180,27 @@ export default { case '禁用': this.disableFlagEdit(command[0], 1) break + case '配置岗位': + this.postsConfigure(command[0]) + break } }, + getTree2 () { + this.$http.get('sarPosition/position', {}, { + _this: this, + }, res=> { + this.postList = res.data + }) + }, + postsConfigure (row) { + var arr = [] + this.userId = row.userId + row.positions.forEach((item) => { + arr.push(item.id) + }) + this.nodeList = arr + this.modalPost= true + }, disableFlagEdit (row, type) { let json = {} json.userId = row.userId @@ -173,6 +245,16 @@ export default { _this: this, loading: 'Loading' }, res => { + res.data.forEach((item) => { + var NameList = '' + item.positions.forEach((items) => { + if (NameList.length > 0) { + NameList += ',' + } + NameList += items.name + }) + item.NameList = NameList + }) this.data = res.data }) }, @@ -194,6 +276,7 @@ export default { mounted () { // 获取组织结构树 this.getTree() + this.getTree2() } } @@ -263,6 +346,9 @@ export default { /deep/.width-all{ width: 100%; } +.filter-tree { + height: calc(~'100% - 50px') +} .laws-tree{ /deep/.clearable { top: 20px; diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue index fa0f14c26..ec98b27eb 100644 --- a/src/pages/config/pages/postManage/index.vue +++ b/src/pages/config/pages/postManage/index.vue @@ -47,11 +47,26 @@ label="操作时间" width="170px"> + + +
加载中... { + if (res.ok) { + this.$message.success('删除成功') + this.getData() + } + }) + }, + editData (row) { + this.type = 2 + this.editId = row.id + this.sarStandardsInfoEO.name = row.name + this.dialogTitle = '修改岗位信息' + this.modalshowflag = true + }, RoleSubmit () { // 配置角色提交 this.submitLoading = true this.$http.postData('sarPosition/position/role', { @@ -164,9 +209,9 @@ this.selectList = val }, addRole () { // 点击配置角色按钮 - this.nodeList = this.selectList[0].idList if (this.selectList.length === 1) { this.modalRole = true + this.nodeList = this.selectList[0].idList } else if (this.selectList.length === 0) { this.$message.warning('请选择要配置角色的岗位') } else { @@ -195,6 +240,8 @@ }) }, addModal () { // 点击新增按钮 + this.type = 1 + this.dialogTitle = '新增岗位' this.modalshowflag = true }, resetForm () { // 新增岗位关闭事件 @@ -204,22 +251,40 @@ submit () { // 新增角色确认 this.$refs['sarStandardsInfoForm'].validate((valid) => { if (valid) { - this.$http.post('sarPosition/position', { - createById: this.$store.getters.userInfo.userId, - operator: this.$store.getters.userInfo.account, - name: this.sarStandardsInfoEO.name - }, { - _this: this, - loading: 'Loading' - }, res=> { - if (res.ok) { - this.$message.success('新增成功') - this.modalshowflag = false - this.getData() - } else { - this.$message.warning(res.message) - } - }) + if (this.type === 1) { + this.$http.post('sarPosition/position', { + createById: this.$store.getters.userInfo.userId, + operator: this.$store.getters.userInfo.account, + name: this.sarStandardsInfoEO.name + }, { + _this: this, + loading: 'Loading' + }, res=> { + if (res.ok) { + this.$message.success('新增成功') + this.modalshowflag = false + this.getData() + } else { + this.$message.warning(res.message) + } + }) + } else { + this.$http.put('sarPosition/position', { + id: this.editId, + name: this.sarStandardsInfoEO.name + }, { + _this: this, + loading: 'Loading' + }, res=> { + if (res.ok) { + this.$message.success('修改成功') + this.modalshowflag = false + this.getData() + } else { + this.$message.warning(res.message) + } + }) + } } else { return false; } From ab32d680b6834038285174a4e13c62b97f009548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 29 Jun 2021 17:52:44 +0800 Subject: [PATCH 078/528] commit --- src/App.vue | 2 +- .../pages/addEdit.vue | 8 +- .../searchCenter/pages/standardSearch.vue | 2796 +++-------------- src/sysConfig/index.js | 4 +- 4 files changed, 396 insertions(+), 2414 deletions(-) diff --git a/src/App.vue b/src/App.vue index 5429787eb..0d30a4010 100644 --- a/src/App.vue +++ b/src/App.vue @@ -215,7 +215,7 @@ export default { height: 100%; overflow-y: auto; background: url('~@/assets/images/shangqi/home/BG.png') no-repeat; - background-size: 100%; + background-size: 100% 100%; & > div{ position: absolute; top: 0; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 00bca6f7c..c2fb62cd7 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -542,14 +542,10 @@ export default { // 新增、编辑 数据搜索字段 sarAccessInfoSearch: { id: '', - // region: '', // 区域 countryArea: '', // 国家 keywords: '', // 关键字 detailedListName: '', //清单名称 applyArctic: '', // 能源种类 - // category: '', // 所属专业领域 - // applyArctic: '', // 适用车型 - // applyAuth: '', // 认证类型 askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 accessSarType: 'SKILL', // 清单类型 @@ -1502,6 +1498,7 @@ export default { // 查询数据搜索 table 数据 selectLawsStands () { if (this.isListType) { + console.log('1505'); this.$http.get('lawss/sarSarAccess/page', this.sarAccessInfoSearch, { _this: this, loading: 'dataLoading' @@ -1511,10 +1508,11 @@ export default { }, e => { }) } else { - this.$http.get('lawss/sarSarAccess/page', this.sarAccessInfoSearch, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, { _this: this, loading: 'dataLoading' }, res => { + console.log(res.data.list); res.data.list[0].list.map(item => { item.newPutTextTime = null item.prodPutTextTime = null diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index f846902eb..f9eb6f226 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -22,49 +22,41 @@
高级检索
 - +
首页
+
-
-
{{ toggleConditionTips }}
+
+ {{ toggleConditionTips }} +
-
-
{{ condition.title }}
-
    -
  • - {{ conditionOpt.label }} - ({{ conditionOpt.number}}) +
    +
    {{ condition.dictionaryName }}
    +
      +
    • + {{ conditionOpt.dicTypeName }}
    -
    {{ condition.isClose ? '展开' : '收缩' }}
    -
-
-
+
暂无查询结果！
- - - - - - - - - - -
- + label="标准号" + > - + label="标准名称" + > - + label="发布日期" + > - + label="标准状态" + > - + - - - - - - @@ -210,19 +138,21 @@
-
- - - - -
- - -
-
- 提交 - 取消 -
- - -
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue new file mode 100644 index 000000000..88296df3c --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index efed470a0..430f05577 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -9,6 +9,7 @@
标准征求意见流程
标准需求(翻译)申请流程
标准发放申请流程
+
标准清单发布/更新流程
@@ -77,6 +78,10 @@ export default { // 标准发放申请流程 break case '6': + //标准清单发布流程 + this.$router.push({ + name:'bzqdfbStep1' + }) break case '7': break diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index c2fb62cd7..5d1c33c45 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1512,7 +1512,6 @@ export default { _this: this, loading: 'dataLoading' }, res => { - console.log(res.data.list); res.data.list[0].list.map(item => { item.newPutTextTime = null item.prodPutTextTime = null diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index f9eb6f226..875e7bc49 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -192,7 +192,7 @@ export default { resultLoading: false, total: 0, page: 1, - zqazqazqa:[], + searchData: [], pageAll: 1, totalAll: 0, Allitems: [], // 选中全部返回数据 @@ -242,12 +242,11 @@ export default { ] } ]; - res.data.forEach((info) => { - _this.searchOptions.push(info); - let resdata = JSON.parse(JSON.stringify(_this.searchOptions)); - let data = resdata.slice(0, 6); - _this.searchOptions =data; - }); + _this.searchData = res.data; + for (let i = 0; i < res.data.length; i++) { + if (_this.searchOptions.length >= 6) break; + _this.searchOptions.push(res.data[i]); + } }, e => { }); }, @@ -268,13 +267,17 @@ export default { this.AllCheck = true; //点击全部显示分页 this.AllPage = true; - this.searchOptions = [condition]; + this.searchOptions = [condition] this.searchCondition.selectIndex = ["All"]; this.searchSarByInputKey(); } else { this.AllPage = false; this.Allitems = []; this.AllCheck = false; + for (let i = 0; i < this.searchData.length; i++) { + if (this.searchOptions.length >= 6) break; + this.searchOptions.push(this.searchData[i]); + } } } else { this.AllPage = false; @@ -574,17 +577,10 @@ export default { .search-condition { width: 100%; - /*min-height: 200px;*/ - min-height: 200px; position: relative; - //border: 1px solid @borderColor; border-bottom: 1px solid @borderColor; - margin-top: 15px; - //background-color: hsla(0,0%,100%,.9); - //border-radius: 20px; padding: 10px; - //overflow: auto; max-height: 300px; .condition-btn { diff --git a/src/router/index.js b/src/router/index.js index 71676e073..95bc69384 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -240,6 +240,24 @@ const routes = [ title: '标准发放申请流程' } }, + { + path: '/bzqdfbStep1', + name: 'bzqdfbStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue'), + meta: { + requireAuth: true, + title: '标准清单发布/更新流程' + } + }, + { + path: '/bzqdfbStep2', + name: 'bzqdfbStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue'), + meta: { + requireAuth: true, + title: '标准清单发布/更新流程' + } + }, { path: '/bzrkStep1', name: 'bzrkStep1', From ff89154ad9e732ce850d592ee0fee5fb50ca84f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 30 Jun 2021 18:54:09 +0800 Subject: [PATCH 081/528] commit --- src/pages/localTool/standAutoSplit/index.vue | 23 +++++++++--------- .../page/listOfCountries.vue | 10 ++++---- .../page/listOther.vue | 10 ++++---- .../page/listProject.vue | 10 ++++---- .../pages/addEdit.vue | 2 ++ .../pages/details.vue | 1 + .../pages/otherAddEit.vue | 2 ++ .../pages/projectAddEit.vue | 2 ++ .../domesticStandardsAndRegulations/index.vue | 24 +++++++++---------- .../pages/rectificationDatabase.vue | 6 +++-- src/sysConfig/index.js | 2 +- 11 files changed, 51 insertions(+), 41 deletions(-) diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 9dc7f2281..daadb9bce 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -14,10 +14,12 @@ size="mini" type="primary" class="common-button-primary" - @click="searchStandList">搜索 + v-btn-permission="'bcf0d05723689ced8f49fae7794ff0db'" + @click="searchStandList">查询 清空 @@ -26,10 +28,10 @@
- 拆分 - 上传 - 导入拆分结果 - 删除 + 拆分 + 上传 + 导入拆分结果 + 删除
@@ -107,25 +109,24 @@ - 查看 - + 查看 收藏 取消收藏 - 分享 + 分享 - 删除 + 删除 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index 48e9227cb..4dc533b3d 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -51,7 +51,7 @@ class="common-button-primary add-button" size="mini" @click="openModal(null,'addOpt')" - v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'" + v-btn-permission="'db44de86c8a30b037335bb35ded9f40e'" >新增 批量删除
@@ -144,11 +144,11 @@ - 查看 + 查看 - 编辑 + 编辑 - 删除 + 删除 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index 11be7d7e0..647b63905 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -42,7 +42,7 @@ class="common-button-primary add-button" size="mini" @click="openModal(null,'addOpt')" - v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'" + v-btn-permission="'ae7419baca1564175bf96d94e827ef8b'" >新增 批量删除
@@ -135,11 +135,11 @@ - 查看 + 查看 - 编辑 + 编辑 - 删除 + 删除 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index ef41f7f6d..e6af17365 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -42,7 +42,7 @@ class="common-button-primary add-button" size="mini" @click="openModal(null,'addOpt')" - v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'" + v-btn-permission="'00139623434e23209d184eb8f753c980'" >新增 批量删除
@@ -135,11 +135,11 @@ - 查看 + 查看 - 编辑 + 编辑 - 删除 + 删除 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 5d1c33c45..0439a827d 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -307,11 +307,13 @@ 导出 删除
导出 删除 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 2b1f5c2f5..483dbe70e 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -292,9 +292,11 @@ 导出 删除 diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index a46b47eeb..1e14d387e 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -86,36 +86,36 @@ class="common-button-primary add-button" @click="addModal" size="mini" - v-btn-permission="'B6KGCGZWKM'" + v-btn-permission="'57f40856850c95912be0760a082db0e0'" :disabled="addBtnDisabled">新增 导入 + v-btn-permission="'417c6562dd08f1c98c681a40fbf94e31'">导入 导出 批量删除 + v-btn-permission="'c09dc12531085e30e39bbdc6cb6116ba'">批量删除 移除标准 + v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'">移除标准 模板下载 + v-btn-permission="'86a8f92390bb4dcd7f1c2176c183c943'">模板下载 配置标准 + v-btn-permission="'8158aefd62cda676a6baf179532328c6'">配置标准
@@ -199,21 +199,21 @@ - 收藏 - 取消收藏 - 编辑 - 分享 - 删除 + 编辑 + 分享 + 删除
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 1fca1e5d1..52b5d0c9c 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -71,13 +71,15 @@ size="mini" @click="exportStandard()" title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项" + v-btn-permission="'496090d129d51cf2f3730eaf030c2728'" >导出 批量关闭 + v-btn-permission="'740b5b1fb6131517ebc273bfe18b7272'" + >批量关闭 - 查看 + 查看
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 0e6b7fc85..167e13033 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,7 +6,7 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -const devIp = '192.168.10.29' +const devIp = '192.168.10.53' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' From e8167776eafa145a8e91cd3e033855f09c3c15fb Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 30 Jun 2021 18:56:20 +0800 Subject: [PATCH 082/528] commit --- src/components/navMenu/index.vue | 11 +- .../config/pages/mechanismManage/index.vue | 6 +- src/pages/config/pages/menuManage/index.vue | 14 ++ src/pages/config/pages/postManage/index.vue | 12 +- src/pages/config/pages/roleManage/index.vue | 6 +- .../components/CollectionStandard.vue | 2 +- .../processCenter/pages/newProcess/index.vue | 3 +- .../accessStandardsAndRegulations/index.vue | 185 ++++++++++-------- 8 files changed, 138 insertions(+), 101 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 17a2f6107..6e8bffd28 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -189,7 +189,6 @@ export default { } ] }, - { title: '本地工具', path: '/localTool', @@ -383,11 +382,11 @@ export default { // path: '/questionsAndAnswers', // menuId: '8VKLZATQQG4NQHXV9UDS' // }, - // { - // title: '我的板块', - // path: '/plate', - // menuId: 'TUYHX8JBWV' - // } + { + title: '我的板块', + path: '/plate', + menuId: '971d576ef9bce3bddd6f0d6bcc55d184' + } // { // title: '个人信息', // path: '/info', diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index 4c35ec569..62f774fbc 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -80,9 +80,9 @@ - 启用 - 禁用 - 配置岗位 + 启用 + 禁用 + 配置岗位
diff --git a/src/pages/config/pages/menuManage/index.vue b/src/pages/config/pages/menuManage/index.vue index 226cf8883..481f2b7a5 100644 --- a/src/pages/config/pages/menuManage/index.vue +++ b/src/pages/config/pages/menuManage/index.vue @@ -19,6 +19,10 @@ class="common-button-primary add-button" @click="Add" size="mini">新增 + 删除 @@ -92,6 +96,16 @@ export default { } }, methods: { + deleteList () { + this.$http.delete('lawss/sarMenu', { + menuId: this.form.id + }, {}, res=> { + if (res.ok) { + this.getTree() + this.$message.success('删除成功') + } + }) + }, confirmDialog () { var form = {} form.parentId = this.form.id diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue index ec98b27eb..d902583ca 100644 --- a/src/pages/config/pages/postManage/index.vue +++ b/src/pages/config/pages/postManage/index.vue @@ -5,10 +5,12 @@ 新增 配置角色
@@ -55,8 +57,8 @@ - 删除 - 编辑 + 删除 + 编辑
@@ -296,6 +298,12 @@ mounted () { this.getData() this.getRole() + const menuList = this.$store.getters.getMenuList + menuList.forEach(item => { + if (item.id === '980cb239683de9e29ee5335cec98e5b4') { + console.log('有') + } + }) } } diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 4c2e44639..53ad9a8de 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -29,6 +29,7 @@ 配置角色资源
@@ -92,6 +93,7 @@ :default-checked-keys="nodeList" default-expand-all show-checkbox + check-strictly ref="tree2">
@@ -130,7 +132,6 @@ export default { }, methods: { closeDialog () { - this.nodeList = [] this.modalshowflag = false }, confirmDialog () { @@ -138,7 +139,6 @@ export default { menuIds: this.$refs.tree2.getCheckedKeys().concat(this.$refs.tree2.getHalfCheckedKeys()), roleId: this.id }, {}, res=> { - console.log(res); if (res.ok) { this.$message.success('设置权限成功') this.modalshowflag = false @@ -157,8 +157,8 @@ export default { roleId: this.id }, {}, res=> { if (res.ok) { - this.nodeList = res.data this.modalshowflag = true + this.nodeList = res.data } }) }, diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue index 6d4ef806f..0ff5123cc 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue @@ -62,7 +62,7 @@ 创建时间：{{getDate(item.createTime)}}
- 取消收藏 + 取消收藏
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index efed470a0..880fd4e01 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -105,8 +105,7 @@ export default { * @returns {boolean} */ bzfggllc() { - const idArray = ['HXHHBXSBQ9P48K6X6DCJ', '4UUKE8XMZ65BFMSYWWCD', '97MZM7HL57HUJTRBLKLE', '927P4TCCMQ4MT8ZYR8A2'] - return this.checkPermission(idArray) + return true }, /** * 政策管理流程 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index fed96b5c0..5ac76fe7c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -2,24 +2,18 @@ From 6c01ff4a971f2cc4653c7547c3377e01e3d13efd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 30 Jun 2021 19:32:26 +0800 Subject: [PATCH 083/528] commit --- .../pages/standInvolveProjectDetail.vue | 12 ++++++------ .../pages/technologyInvolveProject.vue | 12 ++++++------ .../nonConfomity/pages/rectificationDatabase.vue | 9 ++++++--- .../standardForComments/index.vue | 3 ++- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 30f4beac0..887a57d07 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -15,10 +15,10 @@ clearable> - + 查询 - + 清空
@@ -109,18 +109,18 @@ + v-btn-permission="'f0ea68cb2c01cd0063ea639ee9bd4cec'" + @click="querySarProStateZero">查询 + v-btn-permission="'aa4d6d0cc28d016f8241159c9e7d4c80'" + @click="clearSearchProState">清空
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 486dcaa66..daf87f17a 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -21,10 +21,10 @@ - + 查询 - + 清空 @@ -115,18 +115,18 @@ + v-btn-permission="'0bdf3aecef5161bb66256ebcbbd4bdaa'" + @click="querySarProStateZero">查询 + v-btn-permission="'5e5ea3cc23f1b27ba1c6b6bee44214f0'" + @click="clearSearchProState">清空 diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 52b5d0c9c..2f0b17269 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -49,6 +49,7 @@ type="primary" class="common-button-primary" size="mini" + v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'" @click="getTableByPage('')"> 查询 @@ -57,6 +58,7 @@ 清空 @@ -71,14 +73,14 @@ size="mini" @click="exportStandard()" title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项" - v-btn-permission="'496090d129d51cf2f3730eaf030c2728'" + v-btn-permission="'620e6da5808bf104e576c763546a33b6'" >导出 批量关闭 历史数据
@@ -191,7 +194,7 @@ - 查看 + 查看
diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue index 960c6040d..98f515675 100644 --- a/src/pages/regulatoryRepository/standardForComments/index.vue +++ b/src/pages/regulatoryRepository/standardForComments/index.vue @@ -27,7 +27,8 @@ type="primary" size="mini" class="common-button-primary" - @click="sarStandCompareHisInfo">搜索 + + @click="sarStandCompareHisInfo">查询 Date: Wed, 30 Jun 2021 20:44:12 +0800 Subject: [PATCH 084/528] commit --- src/pages/config/pages/roleManage/index.vue | 68 +++++++++++ src/pages/home1/components/navMenu/index.vue | 115 ++++++++++--------- 2 files changed, 126 insertions(+), 57 deletions(-) diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 53ad9a8de..8e82adae1 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -31,6 +31,10 @@ @click="roleAdd" v-btn-permission="'93e75b6ec0b2b6b0b40d2b11adeba88a'" size="mini">配置角色资源 + 配置数据权限
确定
+ +
+ + +
+
+ 取消 + 确定 +
+ @@ -110,6 +139,13 @@ export default { name: 'role-manage', data () { return { + treeData3: [], + defaultProps3: { + children: 'children', + label: 'name' + }, + nodeList2: [], + modalflag: false, sideClose: false, // 边栏收展状态 filterText: '', treeData: [], @@ -131,6 +167,37 @@ export default { } }, methods: { + getTree3 () { + this.$http.get('sarResource/ts-resource', {}, {}, res=> { + if (res.ok) { + this.treeData3 = res.data + } + }) + }, + confirmDialogData () { + this.$http.postData('sarRole/role/resource', { + resourceIds: this.$refs.tree3.getCheckedKeys().concat(this.$refs.tree3.getHalfCheckedKeys()), + roleId: this.id + }, {}, res=> { + if (res.ok) { + this.$message.success('设置权限成功') + this.modalflag = false + } + }) + }, + closeDialogData () { + this.modalflag = false + }, + roleAddData () { + this.$http.get('sarRole/role/resource', { + roleId: this.id + }, {}, res=> { + if (res.ok) { + this.nodeList2 = res.data + this.modalflag = true + } + }) + }, closeDialog () { this.modalshowflag = false }, @@ -205,6 +272,7 @@ export default { mounted () { this.getTree() this.getTree2() + this.getTree3() } } diff --git a/src/pages/home1/components/navMenu/index.vue b/src/pages/home1/components/navMenu/index.vue index f7aa3702f..71aa3396f 100644 --- a/src/pages/home1/components/navMenu/index.vue +++ b/src/pages/home1/components/navMenu/index.vue @@ -1,71 +1,72 @@ From 9d73280dd60b70014d926d8c23d989e9fd2a5f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 1 Jul 2021 10:51:13 +0800 Subject: [PATCH 085/528] =?UTF-8?q?=E6=9D=83=E9=99=90=EF=BC=8C=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 21 +++++++------- .../accessStandardsAndRegulations/index.vue | 8 ++--- .../page/listOfCountries.vue | 10 ++++--- .../page/listProject.vue | 12 ++++---- .../domesticStandardsAndRegulations/index.vue | 9 ++++-- .../localProductsOrProjectLibrary/index.vue | 13 +++++---- .../nonConfomity/pages/businessDivision.vue | 9 ++++-- .../nonConfomity/pages/productDepartment.vue | 9 ++++-- .../searchCenter/pages/standardSearch.vue | 29 ++++++++++--------- 9 files changed, 68 insertions(+), 52 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 6f9b6ffd5..4fce8a626 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -125,15 +125,6 @@ - -
@@ -485,6 +476,15 @@ + +
@@ -588,7 +588,6 @@ export default { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 88296df3c..e531094c0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -1,13 +1,469 @@ - + - + diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue new file mode 100644 index 000000000..75fc4240b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -0,0 +1,565 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue new file mode 100644 index 000000000..4ef8b6459 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -0,0 +1,476 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index 52aa76563..a139dea98 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -190,7 +190,6 @@ export default { loading: 'loading', _this: this }, res => { - console.log(res) this.processList = res.list || [] this.total = res.count }, e => { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index be0c0448a..1bde8c8bd 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -214,6 +214,7 @@ export default { this.queryProcess() }, dealWith (row) { // 办理 + console.log(row); this.setHandleInfo(JSON.stringify(row)) const prcType = row.prcType switch(prcType) { @@ -252,6 +253,44 @@ export default { } }) } + break; + case'3' : { + if (row.taskInfo === '进行会签，填写意见') { + this.$router.push({ + name: 'bzqdfbStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '根据会签意见修订') { + this.$router.push({ + name: 'bzqdfbStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '业务经理审批') { + this.$router.push({ + name: 'bzqdfbStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + } + break; } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index c75645bee..84d696c8e 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -21,113 +21,128 @@ diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index 647b63905..c494f9ea8 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -42,7 +42,7 @@ class="common-button-primary add-button" size="mini" @click="openModal(null,'addOpt')" - v-btn-permission="'ae7419baca1564175bf96d94e827ef8b'" + v-btn-permission="''" >新增 + + + + + + +

@@ -505,7 +515,8 @@ export default { energyKind: '', type: '', relateFile: '', - remark: '' // 清单说明 + remark: '', // 清单说明 + applicationScope: '' //适用领域 }, fileInfoList: [], // 上传的附件 uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 @@ -525,6 +536,7 @@ export default { disabledFlag: false, regionOptions: [], // 基础信息 区域list drawerCountryOptions: [], // 基础信息 国家list + applyOptions: [], //基础信息适用领域list applyArcticOptions: [], // 基础车型 适用车型list energyKindOptions: [], // 能源种类list accessSarTypeOptions: [], // 要求类型list @@ -545,6 +557,7 @@ export default { sarAccessInfoSearch: { id: '', countryArea: '', // 国家 + applicationScope: '', //适用区域 keywords: '', // 关键字 detailedListName: '', //清单名称 applyArctic: '', // 能源种类 @@ -1453,6 +1466,7 @@ export default { sarAccessEO.inforlist = JSON.stringify(rowlist) sarAccessEO.adminInfoList = JSON.stringify(rowList2) sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') + sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') // 判断是否有附件 if (this.fileInfoList.length > 0) { let relateFile = [] @@ -1500,7 +1514,6 @@ export default { // 查询数据搜索 table 数据 selectLawsStands () { if (this.isListType) { - console.log('1505'); this.$http.get('lawss/sarSarAccess/page', this.sarAccessInfoSearch, { _this: this, loading: 'dataLoading' @@ -1514,6 +1527,7 @@ export default { _this: this, loading: 'dataLoading' }, res => { + console.log(res.data); res.data.list[0].list.map(item => { item.newPutTextTime = null item.prodPutTextTime = null @@ -2214,6 +2228,7 @@ export default { this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list + this.applyOptions = res.data.COUNTRY this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质 this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 @@ -2228,9 +2243,11 @@ export default { // 判断是否是编辑 if (this.$route.query.id) { const accessRow = this.getAccessStandardRegRow + console.log('是否是编辑', accessRow); this.$nextTick(() => { this.sarAccessEO.type = accessRow.type this.sarAccessEO.countryArea = accessRow.countryArea.split(',') + this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',') this.sarAccessEO.detailedListName = accessRow.detailedListName this.sarAccessEO.id = accessRow.id this.sarAccessEO.remark = accessRow.remark || '' diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 3305b5ed3..a0d23f9bd 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -13,6 +13,24 @@ + + + + + +

导出 删除 @@ -490,8 +508,10 @@ export default { energyKind: '', type: '', relateFile: '', - remark: '' // 清单说明 + remark: '' ,// 清单说明 + applicationScope: '' , //适用领域 }, + applyOptions: [], //适用领域list fileInfoList: [], // 上传的附件 uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 // 新增、编辑 基础信息验证条件 @@ -2185,6 +2205,7 @@ export default { this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list + this.applyOptions = res.data.COUNTRY //适用领域 list this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质 this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 483dbe70e..100426e1e 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -13,6 +13,24 @@ + + + + + +

import('@/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue'), + meta: { + requireAuth: true, + title: '标准清单发布/更新流程' + } + }, + { + path: '/bzqdfbStep4', + name: 'bzqdfbStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue'), + meta: { + requireAuth: true, + title: '标准清单发布/更新流程' + } + }, { path: '/bzrkStep1', name: 'bzrkStep1', diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 167e13033..55a7c6a30 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,7 +6,7 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -const devIp = '192.168.10.53' +const devIp = '192.168.10.247' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' From 99d49f3ccd8d4ec43af37238bc3fb7b8772f63e2 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 5 Jul 2021 17:59:07 +0800 Subject: [PATCH 091/528] commit --- .../pages/creatProcess/bzdy/step1.vue | 48 +- .../pages/creatProcess/bzdy/step2.vue | 425 ++++++++++++++++++ .../tabComponents/processCenter/index.vue | 13 + src/router/index.js | 9 + 4 files changed, 483 insertions(+), 12 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzdy/step2.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 4cab4e89a..b7e672553 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -7,9 +7,9 @@
基础信息
-
流程信息
+
人员信息
-
+
-->
-
+
{ + this.$refs['qbkwForm'].validate((valid) => { if (valid) { - alert('submit!'); + this.$refs['Form'].validate((valid) => { + if (valid) { + this.$http.get('lawss/activiti/startProcess', { + type: '2' + }, {}, res => { + if (res.ok) { + var json = Object.assign(this.form, this.roleForm) + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: res.data, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('流程发起成功') + this.$router.push('/processCenter') + } + }) + } else { + this.$message.warning('流程启动失败') + } + }) + } else { + return this.$message.warning('请完善人员信息') + } + }) } else { - return false; + return this.$message.warning('请完善基础信息') } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue new file mode 100644 index 000000000..180bdbf29 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -0,0 +1,425 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index be0c0448a..5abc3d700 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -252,6 +252,19 @@ export default { } }) } + case '2': + if (row.taskInfo === '责任对接人选择责任人') { + this.$router.push({ + name: 'bzdyStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index 95bc69384..263a31742 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -312,6 +312,15 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/bzdyStep2', + name: 'bzdyStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step2.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/zqyjStep1', name: 'zqyjStep1', From c1d16d1bfdbd748a429565ddb4f8d19951ee969d Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 6 Jul 2021 21:02:00 +0800 Subject: [PATCH 092/528] commit --- .../pages/creatProcess/bzdy/step1.vue | 33 +- .../pages/creatProcess/bzdy/step2.vue | 244 +++------------ .../pages/creatProcess/bzdy/step3.vue | 295 ++++++++++++++++++ .../tabComponents/processCenter/index.vue | 11 + src/router/index.js | 9 + 5 files changed, 367 insertions(+), 225 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzdy/step3.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index b7e672553..99dc9fd75 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -56,21 +56,6 @@
-
- - - - - - - - - - - - - -
@@ -156,8 +141,8 @@ size="800px"> -
+
- +
基础信息
-
人员信息
@@ -26,6 +25,7 @@ @@ -51,94 +52,19 @@
+ + + +
-
- - - - - - - - - - - - - -
-
-
-
- - - - - -

流程发起人

-
- - -
- - - - - - -

责任部门对接人

-
- - - -
- - - - - - -

标准法规部部长

-
- - -
- - - - - - -

技术管理中心主任

-
- - -
- - - - - - -

工程研究总院院长

-
- - -
- - - - - -
{ + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + this.form.responUserList = idList + this.form.responUserListName = nameList this.modalshowflag = false }, cancleUserInfo () { this.modalshowflag = false }, - drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes()[0] - } - }, - choiceZRR (type, title, id) { + choiceZRR () { this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title + if (this.form.responUserList.length > 0) { + this.nodeList = this.form.responUserList.split(',') + } this.modalshowflag = true }, getTree () { @@ -297,20 +181,6 @@ this.treeData = res.data }) }, - closeDrawer() { - this.ListModel = false - }, - OkDrawer() { - this.ListModel = false - var item = { - remarks: '123' - } - this.data.push(item) - }, - addList() { - this.title = '新增标准' - this.ListModel = true - }, handleTabs(name) { this.active = name }, @@ -318,29 +188,17 @@ handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { - this.$refs['Form'].validate((valid) => { - if (valid) { - this.$http.get('lawss/activiti/startProcess', { - type: '2' - }, {}, res => { - if (res.ok) { - var json = Object.assign(this.form, this.roleForm) - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: res.data, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('流程发起成功') - this.$router.push('/processCenter') - } - }) - } else { - this.$message.warning('流程启动失败') - } - }) - } else { - return this.$message.warning('请完善人员信息') + var json = this.json + json.responUserList = this.form.responUserList + json.responUserListName = this.form.responUserListName + 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 { @@ -354,10 +212,10 @@ taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res); - if (res) { - console.log(res); - } + let data = JSON.parse(res.mesg) + this.form.title = data.title + this.form.date = data.date + this.json = data }).catch(e => { }) }) @@ -372,7 +230,7 @@ diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 15557acd0..e29bc1cb6 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -264,6 +264,17 @@ export default { prcType: row.prcType } }) + } else if (row.taskInfo === '责任人上传调研结果') { + this.$router.push({ + name: 'bzdyStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break; case'3' : { diff --git a/src/router/index.js b/src/router/index.js index 133af8188..945686dfd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -339,6 +339,15 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/bzdyStep3', + name: 'bzdyStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step3.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/zqyjStep1', name: 'zqyjStep1', From e553ef68b27502c45708a420afd3bbae0a83d551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 7 Jul 2021 11:02:14 +0800 Subject: [PATCH 093/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 373 ++++---- .../pages/creatProcess/bzqdfb/step2.vue | 216 +++-- .../pages/creatProcess/bzqdfb/step3.vue | 288 +++--- .../pages/creatProcess/bzqdfb/step4.vue | 253 +++--- .../tabComponents/processCenter/index.vue | 19 +- .../accessStandardsAndRegulations/index.vue | 2 +- .../page/listOfCountries.vue | 7 +- .../page/listOther.vue | 5 +- .../page/listProject.vue | 5 +- .../pages/addEdit.vue | 821 +++--------------- .../pages/details.vue | 57 +- .../pages/otherAddEit.vue | 72 +- .../pages/projectAddEit.vue | 118 +-- .../domesticStandardsAndRegulations/index.vue | 7 +- .../localProductsOrProjectLibrary/index.vue | 14 +- src/sysConfig/index.js | 2 +- 16 files changed, 859 insertions(+), 1400 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 9d24c6e3c..29e7bb6c0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -105,85 +105,100 @@ align="center"> + + + + prop="issueTime" + sortable + label="发布日期"> + prop="xcxssrq" + sortable + label="新车型实施日期"> + show-overflow-tooltip + prop="zccssrq" + sortable + label="在产车实施日期"> - - - - - - + show-overflow-tooltip + prop="textStatus" + width="120px" + label="文本状态">
-
+
- - -

标准/政策法规工程师

-
- -
- - - - -

责任人

-
- - - -
- - - - -

标准/政策法规工程师

-
- -
- - - - -

业务经理

-
- -
- - + + + + +

标准/政策法规工程师

+
+ + +
+ + + + + + +

填写会签意见

+
+ + + +
+ + + + + + +

标准/政策法规工程师

+
+ + +
+ + + + + + +

业务经理

+
+ + +
+ + + +
@@ -521,6 +536,33 @@ @submit="handleSubmit" > + + + + + +
@@ -529,6 +571,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; import { saveTaskFirst } from "api/process"; +import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis"; export default { name: "bzqdfbStep1", @@ -539,63 +582,39 @@ export default { }, data() { return { - dataList: [ - { - standNumber: 123, - cnName: "中国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl119a61sgmzk47d918pw5", - applyRegion: null, - textState: "已发布" - }, - { - standNumber: 123, - cnName: "日本", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk417d98pw15", - applyRegion: null, - textState: "已发布" - }, { - standNumber: 123, - cnName: "韩国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk47d1918pw5", - applyRegion: null, - textState: "已发布" - }, { - standNumber: 123, - cnName: "没过", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk47d2331918pw5", - applyRegion: null, - textState: "已发布" - }, - { - standNumber: 123, - cnName: "德国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk472344dt1918pw5", - applyRegion: null, - textState: "已发布" - } - - - ], //清单里的标准数据 + modalshowflag: false, // drawer开关 + drawerTitle: '', //drawer标题 + nodeList: [], + defaultProps: { + children: 'children', + label: 'name' + }, + roleForm: { + startUserName: this.$store.getters.userInfo.account, + startUser: this.$store.getters.userInfo.id, + dockUser: '', + responUserList: '', + ministerUser: '', + directorUser: '', + presidentUser: '', + dockUserName: '', + responUserListName: '', + ministerUserName: '', + directorUserName: '', + presidentUserName: '' + }, + roleFormRules: { + dockUserName: [ + { required: true, message: '请选择会签责任人', trigger: 'blur' }, + ], + ministerUserName: [ + { required: true, message: '请选择修订责任人', trigger: 'blur' }, + ], + directorUserName: [ + { required: true, message: '请选择审批责任人', trigger: 'blur' }, + ], + }, + dataList: [],//清单里的标准数据 sarAccessListDatas: [], //国家地区清单表格 uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 fileInfoList: [], // 上传的附件 @@ -621,16 +640,15 @@ export default { descriptionList: "", //清单说明 enclosure: "", //附件 standId: "", //选择的清单的id - signFlag: "1", //是否会签 1为会签 2为不会签W + signFlag: "1", //是否会签 1为会签 2为不会签 + inforlist:"" , //用来存放标准列表的标准id dataList: [{ - standNumber: "", //标准号 - cnName: "", //中文名称 - enName: "", //英文名称 - isSubTime: "", //发布日期 - newCarTime: "", //新车型实施日期 - oldCarTime: "", //在产车实施日期 - applyCar: "", //适用车型 - textState: "", //文本状态 + code: "", //标准号 + standName: "", //标准名称 + issueTime: "", //发布日期 + xcxssrq: "", //新车型实施日期 + zccssrq: "", //在产车实施日期 + textStatus: "", //文本状态 id: "" }] }, @@ -645,6 +663,25 @@ export default { }; }, methods: { + saveUserInfo () { + if (this.type === 'dockUser') { + this.roleForm.dockUser = this.roleRow.id + this.roleForm.dockUserName = this.roleRow.name + } else if (this.type === 'ministerUser') { + this.roleForm.ministerUser = this.roleRow.id + this.roleForm.ministerUserName = this.roleRow.name + } else if (this.type === 'directorUser') { + this.roleForm.directorUser = this.roleRow.id + this.roleForm.directorUserName = this.roleRow.name + } else if (this.type === 'presidentUser') { + this.roleForm.presidentUser = this.roleRow.id + this.roleForm.presidentUserName = this.roleRow.name + } + this.modalshowflag = false + }, + cancleUserInfo () { + this.modalshowflag = false + }, //tab发生变化 handleTabs(name) { this.active = name; @@ -652,6 +689,15 @@ export default { choiceShow() { this.ListModel = true; }, + drawerCheck (data) { + // var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); + // if(getlist.length == 1) { + // this.roleRow = getlist[0] + // }else { + // this.$refs.tree.setCheckedKeys([data.id]); + // this.roleRow = this.$refs.tree.getCheckedNodes()[0] + // } + }, //判断当前是否会签 selectSign (type) { if(type ==='1'){ @@ -660,21 +706,9 @@ export default { this.listForm.signFlag = 2 } }, - //判断当前选中的是哪个清单 + // //判断当前选中的是哪个清单 selectionList(type) { - if (type === "country") { - this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { - page: this.page, - pageSize: this.pageSize, - sortKey: 1 - }, { - _this: this - }, res => { - this.sarAccessListDatas = res.data.records; - this.total = res.data.total; - }, e => { - }); - } else if (type === "project") { + if (type === "project") { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { page: this.page, pageSize: this.pageSize, @@ -686,7 +720,7 @@ export default { this.total = res.data.total; }, e => { }); - } else { + } else if (type === "other") { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { page: this.page, pageSize: this.pageSize, @@ -698,6 +732,18 @@ export default { this.total = res.data.total; }, e => { }); + } else { + this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { + page: this.page, + pageSize: this.pageSize, + sortKey: 1 + }, { + _this: this + }, res => { + this.sarAccessListDatas = res.data.records; + this.total = res.data.total; + }, e => { + }); } }, //点击新增事件 @@ -705,6 +751,7 @@ export default { this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", { _this: this }, res => { + console.log(res); this.standardData = res.data.list; }, e => { }); @@ -770,11 +817,11 @@ export default { json.prcCreateUserName = this.$store.getters.userInfo.account json.standName = this.listForm.listName json.standId = this.listForm.standId - this.$http.get('lawss/activiti/startProcess' , {type: '3'}, { + this.$http.get('lawss/activiti/startProcess' , {type: '4'}, { _this: this }, res => { if(res.ok){ - this.$http.postData('lawss/activiti/completeTask',{ + this.$http.post('lawss/activiti/completeTask',{ taskIds: res.data, userId : this.$store.getters.userInfo.userId, json: JSON.stringify(json) @@ -829,6 +876,21 @@ export default { this.listForm.descriptionList = bringData[0].remark; this.listForm.enclosure = bringData[0].detailedListName; this.ListModel = false; + this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: bringData[0].id}, { + _this: this + }, res => { + this.dataList = res.data + this.listForm.dataList = res.data + let formId = "" + this.dataList.forEach(item => { + if(this.dataList.length !== 0){ + formId += ',' + formId += item.id + } + }) + this.listForm.inforlist = formId + }, e => { + }) } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); } else { @@ -850,7 +912,18 @@ export default { } }, selectThree() { - + }, + choiceZRR (type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.drawerTitle = title + this.modalshowflag = true + }, + getTree () { + // this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { + // this.treeData = res.data + // }) }, pageChange(page) { this.page = page; @@ -863,12 +936,12 @@ export default { }, computed: {}, mounted() { - this.selectionList(); + 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 diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index e531094c0..1ed5b4e83 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -7,7 +7,7 @@
基础信息
-
审批历史
+
审批历史
@@ -75,44 +75,42 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> + + + + prop="issueTime" + sortable + label="发布日期"> + prop="xcxssrq" + sortable + label="新车型实施日期"> + show-overflow-tooltip + prop="zccssrq" + sortable + label="在产车实施日期"> - - - - - - + show-overflow-tooltip + prop="textStatus" + width="120px" + label="文本状态">
@@ -172,6 +170,75 @@
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
{ + this.detailData = res + }, e => {}) + }, //tab发生变化 handleTabs(name) { this.active = name; @@ -324,10 +352,13 @@ export default { */ getFormFieldList (item) { this.$nextTick(() => { + console.log(item); this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm['id'] = item.id + this.listForm.dataList = item.dataList + this.dataList = item.dataList }) }, @@ -347,7 +378,7 @@ export default { this.listForm.standId = this.listForm.standId; this.listForm.signFlag = ""; const json = JSON.stringify(this.listForm); - this.$http.postData('lawss/activiti/completeTask', { + this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, json: json, @@ -358,6 +389,8 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + }, e => { + }); }, //选择标准取消事件 @@ -383,8 +416,13 @@ export default { this.searchData(); } }, - computed: {}, + computed: { + listNoDataText () { + return this.processType === 1 ? '暂无待办流程' : '暂无已办流程' + }, + }, mounted() { + this.processTable() this.getData() // console.log(this.$store.getters.getHandleInfo); } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 75fc4240b..819a98232 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -7,7 +7,7 @@
基础信息
-
审批历史
+
审批历史
@@ -52,10 +52,25 @@ > + + + 点击上传 + + @@ -84,86 +99,113 @@ align="center"> + + + + prop="issueTime" + sortable + label="发布日期"> + prop="xcxssrq" + sortable + label="新车型实施日期"> + show-overflow-tooltip + prop="zccssrq" + sortable + label="在产车实施日期"> - - - - - - + show-overflow-tooltip + prop="textStatus" + width="120px" + label="文本状态">
-
-
- - - -

标准/政策法规工程师

-
- -
- - - - -

责任人

-
- - - -
- - - - -

标准/政策法规工程师

-
- -
- - - - -

业务经理

-
- -
- - - +
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中
@@ -258,66 +300,16 @@ export default { }, data() { return { + detailData: [], + // 当前流程类型(1待办/2已办) + processType: 1, + loading: false, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, - dataList: [ - { - standNumber: 123, - cnName: "中国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl119a61sgmzk47d918pw5", - applyRegion: null, - textState: "已发布" - }, - { - standNumber: 123, - cnName: "日本", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk417d98pw15", - applyRegion: null, - textState: "已发布" - }, { - standNumber: 123, - cnName: "韩国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk47d1918pw5", - applyRegion: null, - textState: "已发布" - }, { - standNumber: 123, - cnName: "没过", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk47d2331918pw5", - applyRegion: null, - textState: "已发布" - }, - { - standNumber: 123, - cnName: "德国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk472344dt1918pw5", - applyRegion: null, - textState: "已发布" - } - - - ], //清单里的标准数据 + uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 + fileInfoList: [], // 上传的附件 + dataList: [],//清单里的标准数据 standardData: [], //添加标准数据 standModel: false, // 选择标准抽屉状态 active: "1", @@ -360,6 +352,18 @@ export default { }; }, methods: { + processTable () { + this.$http.get('lawss/activiti/get_list_by_instance', { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : '', + shunxu: this.shunxu + }, { + loading: 'loading', + _this: this + }, res => { + this.detailData = res + }, e => {}) + }, //tab发生变化 handleTabs(name) { this.active = name; @@ -400,6 +404,25 @@ export default { }).catch(() => { }); } + }, + // 删除上传的文件 + delFileInfo (file, fileList) { + // this.fileInfoList = fileList + }, + // 上传文件成功回调 + uploadBackSuccess (res, file, fileList) { + // if (res.ok) { + // this.fileInfoList = fileList + // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id + // this.$message.success('上传成功') + // } else { + // this.$message.error(res.message) + // fileList.pop() + // } + }, + //上传之前的钩子 + beforeUpload () { + }, getData() { return new Promise((resolve, reject) => { @@ -424,6 +447,8 @@ export default { this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm['id'] = item.id + this.listForm.dataList = item.dataList + this.dataList = item.dataList }) }, //保存事件 @@ -448,7 +473,7 @@ export default { this.listForm.approvalOpinion = ""; this.listForm.standId = this.listForm.standId; const json = JSON.stringify(this.listForm); - this.$http.postData('lawss/activiti/completeTask', { + this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, json: json, @@ -480,9 +505,14 @@ export default { this.searchData(); } }, - computed: {}, + computed: { + listNoDataText () { + return this.processType === 1 ? '暂无待办流程' : '暂无已办流程' + } + }, mounted() { this.getData() + this.processTable() }, }; diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 4ef8b6459..c8d40e32f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -7,7 +7,7 @@
基础信息
-
审批历史
+
审批历史
@@ -31,6 +31,7 @@ @@ -72,44 +75,42 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> + + + + prop="issueTime" + sortable + label="发布日期"> + prop="xcxssrq" + sortable + label="新车型实施日期"> + show-overflow-tooltip + prop="zccssrq" + sortable + label="在产车实施日期"> - - - - - - + show-overflow-tooltip + prop="textStatus" + width="120px" + label="文本状态">
@@ -129,44 +130,73 @@
-
-
- - - -

标准/政策法规工程师

-
- -
- - - - -

责任人

-
- - - -
- - - - -

标准/政策法规工程师

-
- -
- - - - -

业务经理

-
- -
- - - +
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中
@@ -198,63 +228,11 @@ export default { }, data() { return { - dataList: [ - { - standNumber: 123, - cnName: "中国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl119a61sgmzk47d918pw5", - applyRegion: null, - textState: "已发布" - }, - { - standNumber: 123, - cnName: "日本", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk417d98pw15", - applyRegion: null, - textState: "已发布" - }, { - standNumber: 123, - cnName: "韩国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk47d1918pw5", - applyRegion: null, - textState: "已发布" - }, { - standNumber: 123, - cnName: "没过", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk47d2331918pw5", - applyRegion: null, - textState: "已发布" - }, - { - standNumber: 123, - cnName: "德国", - enName: "CN", - isSubTime: "2021-06-25T00:00:00.000+00:00", - newCarTime: "2021-06-25T00:00:00.000+00:00", - oldCarTime: "2021-06-25T00:00:00.000+00:00", - id: "2hl9a61sgmzk472344dt1918pw5", - applyRegion: null, - textState: "已发布" - } - - - ], //清单里的标准数据 + detailData: [], + // 当前流程类型(1待办/2已办) + processType: 1, + loading: false, + dataList: [],//清单里的标准数据 approvalOpinion: '', // 通过0/驳回1 active: "1", listType: "country", //选择的清单类型 @@ -303,6 +281,18 @@ export default { }; }, methods: { + processTable () { + this.$http.get('lawss/activiti/get_list_by_instance', { + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : '', + shunxu: this.shunxu + }, { + loading: 'loading', + _this: this + }, res => { + this.detailData = res + }, e => {}) + }, //tab发生变化 handleTabs(name) { this.active = name; @@ -337,6 +327,8 @@ export default { this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm['id'] = item.id + this.listForm.dataList = item.dataList + this.dataList = item.dataList }) }, //驳回事件 @@ -355,7 +347,7 @@ export default { this.listForm.signflag = ""; this.listForm.standId = this.listForm.standId; const json = JSON.stringify(this.listForm); - this.$http.postData('lawss/activiti/completeTask', { + this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, json: json, @@ -391,9 +383,14 @@ export default { this.searchData(); } }, - computed: {}, + computed: { + listNoDataText () { + return this.processType === 1 ? '暂无待办流程' : '暂无已办流程' + } + }, mounted() { this.getData() + this.processTable() }, }; diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 1bde8c8bd..de565829f 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -254,7 +254,8 @@ export default { }) } break; - case'3' : { + //标准清单更新/发布流程 + case'4' : if (row.taskInfo === '进行会签，填写意见') { this.$router.push({ name: 'bzqdfbStep2', @@ -289,8 +290,22 @@ export default { } }) } + break; + //项目合规评估流程 + case '5' : + if(row.taskInfo === ''){ + this.$router.push({ + name: '', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } - break; + } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 84d696c8e..67eb09919 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -31,7 +31,7 @@ export default { data() { return { list: [], - tabValue: "", + tabValue: "listProject", menuName: ["国家/地区清单", "项目类清单", "重点标准跟踪清单", "其他清单"] }; }, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index c77d00327..962916e6d 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -102,8 +102,9 @@ label="清单状态" align="center"> - - - - - - - + + - - @@ -270,7 +253,7 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="accessSarTypeSelect" - ref="selection" + ref="searchTable" > 导出 删除
- - - - + label="发布日期"> + label="新车型实施日期"> - - + prop="zccssrq" + sortable + label="在产车实施日期"> @@ -487,25 +446,27 @@ export default { CustomRoleTree }, data () { - let validatePass = (rule, value, callback) => { - let list = [] - if (this.sarAccessInfoListADMIN.length > 0) { - for (let a = 0; a < this.sarAccessInfoListADMIN.length;a++) { - list.push(this.sarAccessInfoListADMIN[a].code) - } - } - if (this.sarAccessInfoList.length > 0) { - for (let b = 0; b < this.sarAccessInfoList.length;b++) { - list.push(this.sarAccessInfoList[b].code) - } - } - for (let c = 0; c < list.length; c++) { - if (value === list[c]) { - callback(new Error('此标准号已存在')) - } - } - } + // let validatePass = (rule, value, callback) => { + // let list = [] + // //sarAccessInfoListADMIN 可能不存在 + // if (this.sarAccessInfoListADMIN.length > 0) { + // for (let a = 0; a < this.sarAccessInfoListADMIN.length;a++) { + // list.push(this.sarAccessInfoListADMIN[a].code) + // } + // } + // if (this.sarAccessInfoList.length > 0) { + // for (let b = 0; b < this.sarAccessInfoList.length;b++) { + // list.push(this.sarAccessInfoList[b].code) + // } + // } + // for (let c = 0; c < list.length; c++) { + // if (value === list[c]) { + // callback(new Error('此标准号已存在')) + // } + // } + // } return { + selectSearch : [], // 新增、编辑 基础信息字段 sarAccessEO: { id: '', @@ -563,7 +524,6 @@ export default { applyArctic: '', // 能源种类 askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 - accessSarType: 'SKILL', // 清单类型 page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, @@ -575,9 +535,7 @@ export default { importmodalFlag: false, // 导入model 状态 searching: false, sarAccessInfoList: [], // 清单条目 技术要求table 数据 - sarAccessInfoListADMIN: [], // 清单条目 行政要求table数据 sarAccessInfoListArry: [], // 清单条目 table选中数据 - // sarAccessInfoListADMINArry: [], // 清单条目 行政要求table选中数据 moreSearchShow: false, // 多属性搜索 状态 loadData: false, // 提交按钮loading效果 drawerPage: 1, // 数据搜索table页码 @@ -640,56 +598,6 @@ export default { {required: true, type: 'string', message: '英文名称不能为空', trigger: 'blur'}, {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'} ], - // synopsis: [ - // {required: true, type: 'string', message: '法规说明不能为空', trigger: 'blur'}, - // {type: 'string', max: 1000, message: '法规说明不能超过1000个字符', trigger: 'change'} - // ], - // newPutTime: [ - // {required: true, message: '新车型实施日期不能为空', trigger: 'change'} - // ], - // prodPutTime: [ - // {required: true, message: '在产车实施日期不能为空', trigger: 'change'} - // ], - // eopPutTime: [ - // {required: true, message: 'eop实施日期不能为空', trigger: 'change'} - // ], - // newPutTextTime: [ - // {required: true, message: '新车型实施日期（项目）不能为空', trigger: 'change'} - // ], - // prodPutTextTime: [ - // {required: true, message: '在产车实施日期（项目）不能为空', trigger: 'change'} - // ], - // eopPutTextTime: [ - // {required: true, message: 'eop实施日期（项目）不能为空', trigger: 'change'} - // ], - performInfo: [ - // {required: true, type: 'string', message: '实施说明不能为空', trigger: 'blur'}, - {type: 'string', max: 1000, message: '实施说明不能超过1000个字符', trigger: 'change'} - ], - // ZRBM: [ - // {required: true, type: 'string', message: '责任部门不能为空', trigger: 'change'} - // ], - // XGBM: [ - // {required: true, message: '相关部门不能为空', trigger: 'change'} - // ], - // FO: [ - // {required: true, type: 'string', message: 'FO不能为空', trigger: 'change'} - // ], - // proEssessUserId: [ - // {required: true, type: 'string', message: '项目评估角色不能为空', trigger: 'change'} - // ], - askNature: [ - {required: true, message: '监管类型不能为空', trigger: 'change'} - ], - // applyArctic: [ - // {required: true, message: '适用车辆类型不能为空', trigger: 'change'} - // ], - accessType: [ - {required: true, type: 'string', message: '入库模块不能为空', trigger: 'change'} - ], - authObjId: [ - {required: true, type: 'string', message: '认证对象不能为空', trigger: 'change'} - ] }, // 认证对象下拉数据 authObjOptions: [ @@ -724,10 +632,6 @@ export default { addEditTitle: '新增', isDisabled: false, isListType: false, // 清单类型 - listTypeOptions: [ - {value: 'SKILL', label: '技术要求清单'}, - {value: 'ADMIN', label: '行政要求清单'} - ], reloadAddForm: false, formFieldList: [], orgData: [], @@ -932,7 +836,6 @@ export default { this.sarAccessInfoSearch.advanceSearchVOStr = '' this.sarAccessInfoSearch.applyArctic = '' // 能源种类 this.sarAccessInfoSearch.keywords = '' // 关键字 - this.sarAccessInfoSearch.accessSarType = 'SKILL' // 清单类型 this.sarAccessInfoSearch.askType = '' // 监管类型 this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 @@ -1098,168 +1001,36 @@ export default { * 判断是否添加重复数据 */ addSarAccess () { - if (this.isListType) { - if (this.accessSarTypeList.length > 0) { - let ids = [] - this.accessSarTypeList.map(item => { - ids.push(item.id) - }) - // 根据准入id查询标准法规详情 - this.$http.get('lawss/sarSarAccessInfo/selectSarAccessInfoByAccessId', { - accessId: ids.join(',') - }, { - _this: this - }, res => { - let SKLLLArr = [...this.sarAccessInfoList] - let ADMINArr = [...this.sarAccessInfoListADMIN] - // 循环追加数据 - res.data.SKILL.map(item => { - SKLLLArr.push(item) - }) - res.data.ADMIN.map(item => { - ADMINArr.push(item) - }) - if (this.sarAccessInfoSearch.accessSarType === 'SKILL') { - // 数组去重 - let hash = {} - SKLLLArr = SKLLLArr.reduce((preVal, curVal) => { - hash[curVal.resId] ? '' : hash[curVal.resId] = true && preVal.push(curVal) - return preVal - }, []) - this.sarAccessInfoList = SKLLLArr - } else { - // 数组去重 - let hash = {} - ADMINArr = ADMINArr.reduce((preVal, curVal) => { - hash[curVal.resId] ? '' : hash[curVal.resId] = true && preVal.push(curVal) - return preVal - }, []) - this.sarAccessInfoListADMIN = ADMINArr - } - this.$refs.selection.clearSelection() - }, e => { - }) - } else { - this.$message.error('请选中需要添加到 清单条目 的数据') - } - } else { + //判断是否是清单类型 if (this.selectedAccInfoSearchList.length > 0) { // 追加字段 this.selectedAccInfoSearchList.map(item => { - Object.keys(item.attrInfoMap || {}).forEach((key) => { - if (item.attrInfoMap[key]) { - // applyArctic - item[key] = item.attrInfoMap[key] - if (key === 'YQLX') { - item.askType = item.attrInfoMap[key] - } - if (key === 'CLLX') { - item.applyArctic = item.attrInfoMap[key] - } - if (key === 'ZRLX') { - item.askNature = item.attrInfoMap[key] - } - } + let addList; + addList = this.sarAccessInfoList.findIndex(items => { + return items.id == item.id }) - return item + if(addList > -1){ + this.$message.warning('请勿添加重复数据') + } else( + this.sarAccessInfoList.push(item) + ) }) - // 判断tab页 - if (this.activeName === 'SKILL') { - let repeatDataMsg = '不能添加重复数据:' - let repeatData = '' - if (this.sarAccessInfoList.length > 0) { - for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { - for (let t in this.sarAccessInfoList) { - if (this.sarAccessInfoList[t].resId === this.selectedAccInfoSearchList[i].resId) { - repeatData += this.selectedAccInfoSearchList[i].code - break - } - } - } - } - if (repeatData !== '') { - this.$message.error(repeatDataMsg + repeatData) - } else { - if (this.sarAccessInfoList.length > 0) { - for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { - this.sarAccessInfoList.push(this.selectedAccInfoSearchList[i]) - // this.pushFormItem(this.sarAccessInfoList, i) - this.sarAccessInfoList[this.sarAccessInfoList.length - 1].uuid = this.number - this.number++ - } - } else { - for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { - this.sarAccessInfoList.push(this.selectedAccInfoSearchList[i]) - // this.pushFormItem(this.sarAccessInfoList, i) - this.sarAccessInfoList[i].uuid = this.number - this.number++ - } - } - this.selectedAccInfoSearchList = [] - this.$refs.selection.clearSelection() - this.selectLawsStands() - } - } else { - let repeatDataMsg = '不能添加重复数据:' - let repeatData = '' - if (this.sarAccessInfoListADMIN.length > 0) { - for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { - for (let t in this.sarAccessInfoListADMIN) { - if (this.sarAccessInfoListADMIN[t].resId === this.selectedAccInfoSearchList[i].resId) { - repeatData += this.selectedAccInfoSearchList[i].code - break - } - } - } - } - if (repeatData !== '') { - this.$message.error(repeatDataMsg + repeatData) - } else { - if (this.sarAccessInfoListADMIN.length > 0) { - for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { - this.sarAccessInfoListADMIN.push(this.selectedAccInfoSearchList[i]) - // this.pushFormItem(this.sarAccessInfoListADMIN, i) - this.sarAccessInfoListADMIN[this.sarAccessInfoListADMIN.length - 1].uuid = this.number - this.number++ - } - } else { - for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { - this.sarAccessInfoListADMIN.push(this.selectedAccInfoSearchList[i]) - // this.pushFormItem(this.sarAccessInfoListADMIN, i) - this.sarAccessInfoListADMIN[i].uuid = this.number - this.number++ - } - } - this.selectedAccInfoSearchList = [] - this.$refs.selection.clearSelection() - this.selectLawsStands() - } - } + this.selectedAccInfoSearchList = [] + this.$refs.entryTable.clearSelection() + this.$refs.searchTable.clearSelection() } else { this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') } - } - }, - // 追加 添加的数据 - pushFormItem (form, i) { - form[i].authDelive = this.addForm.authDelive // 认证交付物 - form[i].authObj = this.addForm.authObj // 认证对象 - form[i].authObjId = this.addForm.authObjId // 认证对象ID - form[i].authDepart = this.addForm.authDepart // 认证责任部门 - form[i].authDepartId = this.addForm.authDepartId // 认证责任部门Id - form[i].prodPutTime = this.$dateFormat(this.addForm.prodPutTime, 'yyyy-MM-dd') // 在产车实施日期 - // form[i].putTime = this.$dateFormat(this.addForm.putTime, 'yyyy-MM-dd') // 标准实施日期 - form[i].eopPutTime = this.$dateFormat(this.addForm.eopPutTime, 'yyyy-MM-dd') // eop实施日期 - form[i].askNature = this.addForm.askNature // askNature }, // 上移 事件 moveUp () { // i 全部对象数组的下标 // s 选中对象数组的下标 - // 判断上移的table - if (this.activeName === 'SKILL') { let sarAccessInfoListArry = JSON.parse(JSON.stringify(this.sarAccessInfoListArry)) if (sarAccessInfoListArry.length === 1) { + //数组交换下标 + console.log('s', sarAccessInfoListArry); + console.log('i',this.sarAccessInfoList); for (var s in sarAccessInfoListArry) { for (var i in this.sarAccessInfoList) { if (sarAccessInfoListArry[s].resId === this.sarAccessInfoList[i].resId) { @@ -1280,37 +1051,11 @@ export default { } else { this.$message.error('请选择单一数据进行移动!') } - } else { - let sarAccessInfoListArry = JSON.parse(JSON.stringify(this.sarAccessInfoListArry)) - if (sarAccessInfoListArry.length === 1) { - for (var z in sarAccessInfoListArry) { - for (var x in this.sarAccessInfoListADMIN) { - if (sarAccessInfoListArry[z].resId === this.sarAccessInfoListADMIN[x].resId) { - if (Number(x) !== 0) { - let tempOption = this.sarAccessInfoListADMIN[x - 1] - this.$set(this.sarAccessInfoListADMIN, x - 1, this.sarAccessInfoListADMIN[x]) - this.$set(this.sarAccessInfoListADMIN, x, tempOption) - // this.sarAccessInfoListArry = [] - return - } else { - this.$message.error('数据已经是第一个,请选择其他数据上移!') - } - } - } - } - } else if (this.sarAccessInfoListArry.length === 0) { - this.$message.error('请选择需要移动的数据!') - } else { - this.$message.error('请选择单一数据进行移动!') - } - } }, // 下移事件 moveDown () { // y 全部对象数组的下标 // t 选中对象数组的下标 - // 判断上移的table - if (this.activeName === 'SKILL') { if (this.sarAccessInfoListArry.length === 1) { for (var t in this.sarAccessInfoListArry) { for (var y in this.sarAccessInfoList) { @@ -1333,30 +1078,6 @@ export default { } else { this.$message.error('请选择单一数据进行移动!') } - } else { - if (this.sarAccessInfoListArry.length === 1) { - for (var u in this.sarAccessInfoListArry) { - for (var p in this.sarAccessInfoListADMIN) { - if (this.sarAccessInfoListArry[u].resId === this.sarAccessInfoListADMIN[p].resId) { - var a = this.sarAccessInfoListADMIN.length - 1 - if (Number(p) !== Number(a)) { - var q = parseInt(p) + 1 - var tempOption2 = this.sarAccessInfoListADMIN[parseInt(q)] - this.$set(this.sarAccessInfoListADMIN, parseInt(q), this.sarAccessInfoListADMIN[parseInt(p)]) - this.$set(this.sarAccessInfoListADMIN, parseInt(p), tempOption2) - return - } else { - this.$message.error('数据已经是最后一个,请选择其他数据进行移动!') - } - } - } - } - } else if (this.sarAccessInfoListArry.length === 0) { - this.$message.error('请选择需要移动的数据!') - } else { - this.$message.error('请选择单一数据进行移动!') - } - } }, // 点击清单条目导入按钮事件 importmodalFlags () { @@ -1374,8 +1095,6 @@ export default { * 删除不想添加的AccessInfo信息 */ deleteSelectSarAccessInfo () { - // 判断当前在哪个tab页 - if (this.activeName === 'SKILL') { if (this.sarAccessInfoListArry.length > 0) { this.$confirm('确认删除选中数据？', '确认删除', { confirmButtonText: '确定', @@ -1394,34 +1113,11 @@ export default { } } this.sarAccessInfoListArry = [] - this.$refs.tableSKILL.clearSelection() + this.$refs.entryTable.clearSelection() }).catch(() => {}) } else { this.$message.error('请选择需要删除的清单条目!') } - } else { - if (this.sarAccessInfoListArry.length > 0) { - this.$confirm('确认删除选中数据？', '确认删除', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - // i 全部对象数组的下标 - // s 选中对象数组的下标 - for (var s in this.sarAccessInfoListArry) { - for (var i in this.sarAccessInfoListADMIN) { - if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoListADMIN[i].uuid) { - this.sarAccessInfoListADMIN.splice(i, 1) - } - } - } - this.sarAccessInfoListArry = [] - this.$refs.tableADMIN.clearSelection() - }).catch(() => {}) - } else { - this.$message.error('请选择需要删除的清单条目!') - } - } }, // 清单条目 table select事件 sarAccessInfoSelect (selectData) { @@ -1437,111 +1133,70 @@ export default { saveSarAccess () { this.$refs['sarAccessForm'].validate((valid) => { if (valid) { - // 验证认证对象和监控类型不能为空 - for (let i = 0; i < this.sarAccessInfoList.length;i++){ - if (this.sarAccessInfoList[i].authObjId==null){ - return this.$message.error('认证对象不能为空'); - } else if(this.sarAccessInfoList[i].askNature==null){ - return this.$message.error('监管类型不能为空'); - } - } - for (let i = 0; i < this.sarAccessInfoListADMIN.length;i++){ - if (this.sarAccessInfoListADMIN[i].authObjId==null){ - return this.$message.error('认证对象不能为空'); - } else if(this.sarAccessInfoListADMIN[i].askNature==null){ - return this.$message.error('监管类型不能为空'); + let rowlist = [] + for (let i = 0; i < this.sarAccessInfoList.length; i++) { + rowlist.push(this.sarAccessInfoList[i].id) } - } - - // if (!this.sarAccessEO.id) { - let rowlist = [] - let rowList2 = [] - for (let i = 0; i < this.sarAccessInfoList.length; i++) { - rowlist.push(this.sarAccessInfoList[i]) - } - for (let i = 0; i < this.sarAccessInfoListADMIN.length; i++) { - rowList2.push(this.sarAccessInfoListADMIN[i]) - } - let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) - sarAccessEO.inforlist = JSON.stringify(rowlist) - sarAccessEO.adminInfoList = JSON.stringify(rowList2) - sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') - sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') - // 判断是否有附件 - if (this.fileInfoList.length > 0) { - let relateFile = [] - this.fileInfoList.map(item => { - relateFile.push(item.id) - }) - sarAccessEO.relateFile = relateFile.join(',') - } - if (!sarAccessEO.id) { - // 新增 - sarAccessEO.state = '1' - sarAccessEO.version = 0 - this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, { - _this: this, - loading: 'loadData' - }, res => { - if (res.ok) { - this.isNext = true - this.$router.push({ - name: 'AccessStandardsAndRegulations' - }) - } - }, e => { - }) - } else { - // 编辑 - this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { - _this: this, - loading: 'loadData' - }, res => { - if (res.ok) { - this.isNext = true - this.$router.push({ - name: 'AccessStandardsAndRegulations' - }) - } - }, e => { - }) - } - } else { + rowlist = rowlist.join(',') + let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) + sarAccessEO.inforlist = JSON.stringify(rowlist) + sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') + sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') + // 判断是否有附件 + if (this.fileInfoList.length > 0) { + let relateFile = [] + this.fileInfoList.map(item => { + relateFile.push(item.id) + }) + sarAccessEO.relateFile = relateFile.join(',') + } + if (!sarAccessEO.id) { + // 新增 + sarAccessEO.state = '1' + sarAccessEO.version = 0 + this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, { + _this: this, + loading: 'loadData' + }, res => { + if (res.ok) { + this.isNext = true + this.$router.push({ + name: 'AccessStandardsAndRegulations' + }) + } + }, e => { + }) + } else { + // 编辑 + this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, { + _this: this, + loading: 'loadData' + }, res => { + if (res.ok) { + this.isNext = true + this.$router.push({ + name: 'AccessStandardsAndRegulations' + }) + } + }, e => { + }) + } + }else { this.$message.error('请检查表单是否填写正确') } }) }, // 查询数据搜索 table 数据 selectLawsStands () { - if (this.isListType) { - this.$http.get('lawss/sarSarAccess/page', this.sarAccessInfoSearch, { - _this: this, - loading: 'dataLoading' - }, res => { - this.sarAccessInfoSearchList = res.data.list - this.drawerTotal = res.data.count - }, e => { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, { + _this: this + }, res =>{ + this.sarAccessInfoSearchList = res.data.list + this.$nextTick(() => { }) - } else { - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, { - _this: this, - loading: 'dataLoading' - }, res => { - console.log(res.data); - res.data.list[0].list.map(item => { - item.newPutTextTime = null - item.prodPutTextTime = null - item.eopPutTextTime = null - item.ZRBMName = item.dutyDepart - item.ZRBM = item.dutyDepartId - item.FOName = item.foUser - item.FO = item.foUserId - }) - this.sarAccessInfoSearchList = res.data.list[0].list - this.drawerTotal = res.data.count - }, e => { - }) - } + }, e => { + + }) }, // 数据搜索table判断checked状态 selectable (row) { @@ -1550,6 +1205,10 @@ export default { // 数据搜索 table select事件 sarAccessInfoSearchSelect (selectData) { this.selectedAccInfoSearchList = selectData + this.selectSearch = [] + for(let i = 0; i 0) { exportList = this.sarAccessInfoListArry } else { - // 判断导出的是技术要求清单还是行政要求清单 - if (this.activeName === 'SKILL') { exportList = this.sarAccessInfoList - } else { - exportList = this.sarAccessInfoListADMIN - } } if (exportList != null && exportList.length > 0) { let accIdAndrestype = [] @@ -1639,15 +1279,6 @@ export default { var a var b = '' if (response.data) { - // for (var s in this.sarAccessInfoList) { - // for (var i in response.data) { - // if (this.sarAccessInfoList[s].resId === response.data[i].resId) { - // // ('在全部对象中的位置' + i) - // response.data.splice(i, 1) - // b = '数据重复添加,现已自动清除! 2' - // } - // } - // } for (var sADMIN in this.sarAccessInfoListADMIN) { for (var iADMIN in response.data) { if (this.sarAccessInfoListADMIN[sADMIN].code === response.data[iADMIN].code) { @@ -1659,17 +1290,8 @@ export default { } if (response.data.length > 0) { for (let i = 0; i < response.data.length; i++) { - if (response.data[i].accessSarType === 'ADMIN') { - this.sarAccessInfoListADMIN.push(response.data[i]) - } else if (response.data[i].accessSarType === 'SKILL') { this.sarAccessInfoList.push(response.data[i]) } - // if (this.activeName === 'SKILL') { - // this.sarAccessInfoList.push(response.data[i]) - // } else { - // this.sarAccessInfoListADMIN.push(response.data[i]) - // } - } } a = response.data.length } @@ -1678,7 +1300,6 @@ export default { this.importmodalFlag = false } else { this.$message.success(response.message + b + '导入' + a + '条数据！') - // this.$message.success(b + '共导入' + a + '条数据!') this.importmodalFlag = false this.selectLawsStands() } @@ -1719,73 +1340,6 @@ export default { this.$refs['addEntryForm'].resetFields() }) }, - // 点击清单条目 编辑按钮 事件 - editEntry () { - if (this.sarAccessInfoListArry.length === 0) { - this.$message.warning('请选择要编辑的数据') - } else if (this.sarAccessInfoListArry.length > 1) { - this.$message.warning('只能选择一条数据') - } else { - this.editAddType = 2 - this.addEditTitle = '编辑' - this.$nextTick(() => { - // this.addEntryForm = - const formData = JSON.parse(JSON.stringify(this.sarAccessInfoListArry[0])) - const gxhbq = formData.GXHBQ - delete formData.GXHBQ - this.addEntryForm = { - ...formData, - GXHBQ: gxhbq ? gxhbq.split(',') : [], - askNature: formData.askNature ? formData.askNature.split(',') : [] - } - if (!this.addEntryForm.resId && this.addEntryForm.sarType === 'TEMP') { - this.isDisabled = false - } else { - this.isDisabled = true - } - // 转换因后台无法返回大写字段，重新赋值 - this.addEntryForm.FOName = this.addEntryForm.FOName || this.addEntryForm.foname - this.addEntryForm.FO = this.addEntryForm.FO || this.addEntryForm.fo - this.addEntryForm.ZRBMName = this.addEntryForm.ZRBMName || this.addEntryForm.zrbmname - this.addEntryForm.ZRBM = this.addEntryForm.ZRBM || this.addEntryForm.zrbm - this.addEntryForm.XGBMName = this.addEntryForm.XGBMName || this.addEntryForm.xgbmname - this.addEntryForm.XGBM = this.addEntryForm.XGBM || this.addEntryForm.xgbm - // this.addEntryForm.GXHBQ = this.addEntryForm.GXHBQ || this.addEntryForm.gxhbq - this.addEntryForm.applyArctic = this.addEntryForm.applyArctic ? this.addEntryForm.applyArctic.split(',') : [] - // this.addEntryForm.GXHBQ = this.addEntryForm.gxhbq ? this.addEntryForm.gxhbq.split(',') : [] - // this.addEntryForm.GXHBQ = '' - // delete this.addEntryForm.gxhbq - // 在产车实施日期项目赋值 - if (!this.addEntryForm.prodPutTextTime || this.addEntryForm.prodPutTextTime === '') { - this.addEntryForm.prodPutTextTime = !['N/A', 'TBD', '已实施', ''].includes(this.addEntryForm.ZCCSSRQ) ? this.getEarliestDate(this.addEntryForm.ZCCSSRQ, 'datePicker') : '' - } else { - this.addEntryForm.prodPutTextTime = this.addEntryForm.prodPutTextTime !== '' && this.addEntryForm.prodPutTextTime !== null ? this.getEarliestDate(this.addEntryForm.prodPutTextTime, 'datePicker') : '' - } - - // 新车型实施日期赋值 - if (!this.addEntryForm.newPutTextTime || this.addEntryForm.newPutTextTime === '') { - this.addEntryForm.newPutTextTime = !['N/A', 'TBD', '已实施', ''].includes(this.addEntryForm.XCXSSRQ) ? this.getEarliestDate(this.addEntryForm.XCXSSRQ, 'datePicker') : '' - } else { - this.addEntryForm.newPutTextTime = this.addEntryForm.newPutTextTime !== '' && this.addEntryForm.newPutTextTime !== null ? this.getEarliestDate(this.addEntryForm.newPutTextTime, 'datePicker') : '' - } - - // EOP实施日期赋值 - if (!this.addEntryForm.eopPutTextTime || this.addEntryForm.eopPutTextTime === '') { - this.addEntryForm.eopPutTextTime = !['N/A', 'TBD', '已实施', ''].includes(this.addEntryForm.EOPSSRQ) ? this.getEarliestDate(this.addEntryForm.EOPSSRQ, 'datePicker') : '' - } else { - this.addEntryForm.eopPutTextTime = this.addEntryForm.eopPutTextTime !== '' && this.addEntryForm.eopPutTextTime !== null ? this.getEarliestDate(this.addEntryForm.eopPutTextTime, 'datePicker') : '' - } - this.sarAccessInfoListArry = [] - this.$refs.tableSKILL.clearSelection() - this.$refs.tableADMIN.clearSelection() - - setTimeout(() => { - this.$refs.addEntryForm.clearValidate() - }, 1) - // clearFiles - }) - } - }, // 请求部门结构树 getOrgTreeSource () { this.$http.get('sys/org/getTree', {}, {_this: this}, @@ -1845,33 +1399,18 @@ export default { nowstandinfo.askNature = nowstandinfo.askNature.join(',') // 判断新增还是编辑 if (this.editAddType === 1) { - if (this.activeName === 'SKILL') { this.sarAccessInfoList.push(nowstandinfo) this.sarAccessInfoList[this.sarAccessInfoList.length - 1].uuid = this.number this.number++ - } else { - this.sarAccessInfoListADMIN.push(nowstandinfo) - this.sarAccessInfoListADMIN[this.sarAccessInfoListADMIN.length - 1].uuid = this.number - this.number++ - } this.isSubmit = false this.$message.success('添加成功') } else { - if (this.activeName === 'SKILL') { this.sarAccessInfoList.map((item, index) => { if (item.uuid === nowstandinfo.uuid) { // this.sarAccessInfoList[index] = nowstandinfo this.$set(this.sarAccessInfoList, index, nowstandinfo) } }) - } else { - this.sarAccessInfoListADMIN.map((item, index) => { - if (item.uuid === nowstandinfo.uuid) { - // this.sarAccessInfoListADMIN[index] = nowstandinfo - this.$set(this.sarAccessInfoListADMIN, index, nowstandinfo) - } - }) - } this.isSubmit = false this.$message.success('编辑成功') } @@ -1911,40 +1450,6 @@ export default { this.isSubmit = false this.$refs['addEntryForm'].resetFields() }, - // 根据准入id查询标准法规详情 - selectInfobyAccid () { - this.$http.get('lawss/sarSarAccessInfo/selectSarAccessInfoByAccessId', { - accessId: this.$route.query.id, - validFlag: 0 - }, { - _this: this - }, res => { - res.data.SKILL.map((item, index) => { - item.uuid = this.number - item.GXHBQ = item.gxhbq - item.eopPutTime = item.eopPutTextTime - item.newPutTime = item.newPutTextTime - item.prodPutTime = item.prodPutTextTime - this.number++ - }) - res.data.ADMIN.map((item, index) => { - item.uuid = this.number - item.GXHBQ = item.gxhbq - item.eopPutTime = item.eopPutTextTime - item.newPutTime = item.newPutTextTime - item.prodPutTime = item.prodPutTextTime - this.number++ - }) - this.sarAccessInfoList = res.data.SKILL - this.sarAccessInfoListADMIN = res.data.ADMIN - this.$nextTick(() => { - this.$refs.tableSKILL.doLayout() - this.$refs.tableADMIN.doLayout() - }) - // this.sarAccessInfoList = res.data.list - }, e => { - }) - }, /** * 赋值内容到入库标准抽屉内 * item 清单行数据 @@ -2099,19 +1604,11 @@ export default { // 新增、编辑标准时验证标准编号是否重复 validCode (rule, value, callback) { let find = 0 - if (this.activeName === 'SKILL') { this.sarAccessInfoList.map(item => { if (item.code === value) { find++ } }) - } else { - this.sarAccessInfoListADMIN.map(item => { - if (item.code === value) { - find++ - } - }) - } if (find > 1 && this.editAddType === 2) { return callback(new Error('标准编号已存在')) } else if (find > 0 && this.editAddType === 1) { @@ -2137,21 +1634,6 @@ export default { }) return askTypeName }, - // 表格回显适用车辆类型 - getApplyArctic (val) { - if (val) { - val = val.split(',') - let applyArcticName = [] - this.energyKindOptions.map(item => { - val.map(items => { - if (item.value === items) { - applyArcticName.push(item.label) - } - }) - }) - return applyArcticName.join(',') - } - }, // 表格回显监管类型 getAskNature (val) { if (!val) { @@ -2163,39 +1645,6 @@ export default { return askTypeName.join(',') }, - // 标签回显适用车辆类型 - getGXHBQ (val) { - if (val) { - val = val.split(',') - let GXHBQName = [] - this.GXHBQOptions.map(item => { - val.map(items => { - if (item.value === items) { - GXHBQName.push(item.label) - } - }) - }) - return GXHBQName.join(',') - } - }, - - /** - * @description: 获取最早日期 - * @date: 2021-02-27 16:56:30 - * @auth: chenxiaoxi - */ - getEarliestDate(date, isDatePickerUse) { - if (!date) { return } - const dateList = date.split(',') - const dateTimeList = [] - dateList.map(date => { - dateTimeList.push(new Date(date).getTime()) - }) - const dateTimeSortList = dateTimeList.sort(function(a, b) { - return a - b - }) - return isDatePickerUse !== undefined ? new Date(dateTimeSortList[0]) : this.$moment(dateTimeSortList[0]).format('YYYY-MM-DD') - }, onChecked () { this.sarStandardsInfoEO.FO = '' this.sarStandardsInfoEO.XMPGJS = '' @@ -2203,6 +1652,15 @@ export default { formatText(str) { return formatText(str) }, + getData() { + this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, { + _this: this + }, res => { + this.sarAccessInfoList = res.data + }, e => { + + }) + } }, watch: { // 监听 清单类型 @@ -2218,6 +1676,8 @@ export default { ...mapGetters(['getAccessStandardRegRow']), }, mounted () { + this.zqaId =this.$route.query.id; + // this.getData() this.getDept() // 从数据库中查询各下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '', { @@ -2228,7 +1688,7 @@ export default { this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list - this.applyOptions = res.data.COUNTRY + this.applyOptions = res.data.COUNTRY //适用区域list this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质 this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 @@ -2243,7 +1703,6 @@ export default { // 判断是否是编辑 if (this.$route.query.id) { const accessRow = this.getAccessStandardRegRow - console.log('是否是编辑', accessRow); this.$nextTick(() => { this.sarAccessEO.type = accessRow.type this.sarAccessEO.countryArea = accessRow.countryArea.split(',') @@ -2254,7 +1713,7 @@ export default { this.sarAccessEO.relateFile = accessRow.relateFile this.sarAccessInfoSearch.validFlag = 0 this.getFileInfo() - this.selectInfobyAccid() + this.getData() this.selectLawsStands() }) } else { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index fd8d643cb..b7a1cda74 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -111,70 +111,41 @@ align="center"> - - - - + label="发布日期"> + label="新车型实施日期"> + label="在产车实施日期"> - - - - diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index a0d23f9bd..e0b693f37 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -211,37 +211,27 @@ + prop="isSubTime" + sortable + label="发布日期"> - - - - + prop="isSubTime" + sortable + label="发布日期"> - - + label="新车型实施日期"> + label="在产车实施日期"> - - @@ -731,7 +693,7 @@ export default { accessType: '', id: '', standType: 'INLAND', // 标准分类 - // country: 'CN', // 适用区域 + country: 'CN', // 适用区域 standSort: '', // 标准类别 standNumber: '', // 标准编号 standYear: '', // 标准年份 @@ -2204,7 +2166,7 @@ export default { this.regionOptions = res.data.REGION // 基础信息 区域list this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list - this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list + this.applicationScope = res.data.COUNTRY // 国家、地区list this.applyOptions = res.data.COUNTRY //适用领域 list this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质 this.accessSarTypeOptions = res.data.REQUESTTYPE // 数据搜索 要求类型 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 100426e1e..fa81df038 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -211,37 +211,27 @@ + prop="isSubTime" + sortable + label="发布日期"> - - - - + prop="isSubTime" + sortable + label="发布日期"> - - + label="新车型实施日期"> + label="在产车实施日期"> - - @@ -636,56 +598,6 @@ export default { {required: true, type: 'string', message: '英文名称不能为空', trigger: 'blur'}, {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'} ], - // synopsis: [ - // {required: true, type: 'string', message: '法规说明不能为空', trigger: 'blur'}, - // {type: 'string', max: 1000, message: '法规说明不能超过1000个字符', trigger: 'change'} - // ], - // newPutTime: [ - // {required: true, message: '新车型实施日期不能为空', trigger: 'change'} - // ], - // prodPutTime: [ - // {required: true, message: '在产车实施日期不能为空', trigger: 'change'} - // ], - // eopPutTime: [ - // {required: true, message: 'eop实施日期不能为空', trigger: 'change'} - // ], - // newPutTextTime: [ - // {required: true, message: '新车型实施日期（项目）不能为空', trigger: 'change'} - // ], - // prodPutTextTime: [ - // {required: true, message: '在产车实施日期（项目）不能为空', trigger: 'change'} - // ], - // eopPutTextTime: [ - // {required: true, message: 'eop实施日期（项目）不能为空', trigger: 'change'} - // ], - performInfo: [ - // {required: true, type: 'string', message: '实施说明不能为空', trigger: 'blur'}, - {type: 'string', max: 1000, message: '实施说明不能超过1000个字符', trigger: 'change'} - ], - // ZRBM: [ - // {required: true, type: 'string', message: '责任部门不能为空', trigger: 'change'} - // ], - // XGBM: [ - // {required: true, message: '相关部门不能为空', trigger: 'change'} - // ], - // FO: [ - // {required: true, type: 'string', message: 'FO不能为空', trigger: 'change'} - // ], - // proEssessUserId: [ - // {required: true, type: 'string', message: '项目评估角色不能为空', trigger: 'change'} - // ], - askNature: [ - {required: true, message: '监管类型不能为空', trigger: 'change'} - ], - // applyArctic: [ - // {required: true, message: '适用车辆类型不能为空', trigger: 'change'} - // ], - accessType: [ - {required: true, type: 'string', message: '入库模块不能为空', trigger: 'change'} - ], - authObjId: [ - {required: true, type: 'string', message: '认证对象不能为空', trigger: 'change'} - ] }, // 认证对象下拉数据 authObjOptions: [ diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 87ab93d05..5dca0201d 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -133,7 +133,7 @@ @@ -229,6 +300,7 @@ export default { name: "bzzqyjStep1", data() { return { + commentText: '', textarea: '', // 意见 title: '', // 新增抽屉标题 listModel: false, // 新增抽屉开关 @@ -241,6 +313,17 @@ export default { endTime: '', // 结束日期 cname: '', // 名称 }, + formRules: { + cid: [ + { required: true, message: '请输入标准编号', trigger: 'change' }, + ], + endTime: [ + { required: true, message: '请输入标准结束日期', trigger: 'change' }, + ], + cname: [ + { required: true, message: '请输入标准名称', trigger: 'change' }, + ], + }, // 标准征求意见数据可库 standCommonlySearch: { categorg: '', @@ -259,15 +342,41 @@ export default { roleForm: { startUserName: this.$store.getters.userInfo.userName, startUser: this.$store.getters.userInfo.userId, - dockUser: '', - dockUserName: '', - mainUser: '', - mainUserName: '', - engineerUser: '', - engineerUserName: '', - checkUser: '', - checkUserName: '', - } + dockUserList: '', + dockUserListName: '', + ministerUser: '', + ministerUserName: '', + directorUser: '', + directorUserName: '', + presidentUser: '', + presidentUserName: '', + }, + roleFormRules: { + dockUserList: [ + { required: true, message: '请选择责任部门对接人', trigger: 'change' }, + ], + ministerUser: [ + { required: true, message: '请选择标准法规部部长', trigger: 'change' }, + ], + directorUser: [ + { required: true, message: '请选择技术管理中心主任', trigger: 'change' }, + ], + presidentUser: [ + { required: true, message: '请选择工程研究院院长', trigger: 'change' }, + ] + }, + treeData: [], + nodeList: [], + nodeList2: [], + type: '', + drawerTitle: '', + modalshowflag: false, + modalshowflag2: false, + defaultProps: { + children: 'children', + label: 'name' + }, + roleRow: {}, } }, components: { @@ -276,6 +385,7 @@ export default { ProcessTitle }, mounted () { + this.getTree() this.sarStandCompareHis() this.tableHeight = $('.content').height() - 44 window.onresize = () => { @@ -287,7 +397,6 @@ export default { this.title = '标准征求意见库' this.listModel = true }, - /** 标准征求意见库方法* * **********************************************/ // 清空 @@ -348,7 +457,6 @@ export default { for (let i = 0; i < this.selectedList.length; i++) { bringData.push(deposit.get(this.selectedList[i])); } - console.log(bringData) this.form.cid = bringData[0].cid this.form.cname = bringData[0].cname; this.form.endTime = bringData[0].endTime; @@ -360,18 +468,107 @@ export default { } }, /*** **********************************************/ - /** 流程节点负责人的选择 *****************************/ - choiceZRR() { - // this.choice + choiceZRR (type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.drawerTitle = title + this.modalshowflag = true + }, + getTree () { + this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { + this.treeData = res.data + }) + }, + saveUserInfo () { + if (this.type === 'ministerUser') { + this.roleForm.ministerUser = this.roleRow.id + this.roleForm.ministerUserName = this.roleRow.name + } else if (this.type === 'directorUser') { + this.roleForm.directorUser = this.roleRow.id + this.roleForm.directorUserName = this.roleRow.name + } else if (this.type === 'presidentUser') { + this.roleForm.presidentUser = this.roleRow.id + this.roleForm.presidentUserName = this.roleRow.name + } + this.modalshowflag = false + }, + cancleUserInfo () { + this.modalshowflag = false + }, + drawerCheck (data) { + var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); + if(getlist.length == 1) { + this.roleRow = getlist[0] + }else { + this.$refs.tree.setCheckedKeys([data.id]); + this.roleRow = this.$refs.tree.getCheckedNodes()[0] + } + }, + choiceZRRS () { + this.nodeList2 = [] + if ( this.roleForm.dockUserList.length > 0) { + this.nodeList2 = this.roleForm.dockUserList.split(',') + } + this.modalshowflag2 = true + }, + saveUserInfo2 () { + var idList = '' + var nameList = '' + this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + this.roleForm.dockUserList = idList + this.roleForm.dockUserListName = nameList + this.modalshowflag2 = false + }, + cancleUserInfo2 () { + this.modalshowflag2 = false }, - handleTabs(name) { this.active = name }, - // 流程也的提交按钮和保存按钮操作 handleSave() {}, - handleSubmit() {} + handleSubmit() { + this.$refs['bzzqyjForm'].validate((valid) => { + if (valid) { + this.$refs['Form'].validate((valid) => { + if (valid) { + this.$http.get('lawss/activiti/startProcess', { + type: '3' + }, {}, res => { + if (res.ok) { + var json = Object.assign(this.form, this.roleForm) + json.commentText = this.commentText + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: res.data, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('流程发起成功') + this.$router.push('/processCenter') + } + }) + } else { + this.$message.warning('流程启动失败') + } + }) + } else { + return this.$message.warning('请完善人员信息') + } + }) + } else { + return this.$message.warning('请完善基础信息') + } + }) + } } } @@ -412,7 +609,7 @@ export default { display: flex; flex-direction: column; justify-content: space-between; - height: calc(~'100% - 103px'); + height: calc(~'100% - 107px'); overflow: auto; } .standardForComments { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 6258074e3..b3580f59a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -1,13 +1,300 @@ - diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index fe474ca29..5557de462 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -252,6 +252,7 @@ export default { } }) } + break case '2': if (row.taskInfo === '责任对接人选择责任人') { this.$router.push({ @@ -343,43 +344,59 @@ export default { }) } break; + break + case '3': + if (row.taskInfo === '责任对接人选择责任人') { + this.$router.push({ + name: 'bzzqyjStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break //标准清单更新/发布流程 - case'4' : - if (row.taskInfo === '进行会签，填写意见') { - this.$router.push({ - name: 'bzqdfbStep2', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } else if (row.taskInfo === '根据会签意见修订') { - this.$router.push({ - name: 'bzqdfbStep3', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - }else if (row.taskInfo === '业务经理审批') { - this.$router.push({ - name: 'bzqdfbStep4', - query: { - taskIds: row.taskIds, - prcId: row.prcId, - prcNum: row.prcNum, - prcName: row.prcName, - prcType: row.prcType - } - }) - } - break; + case'4' : + if (row.taskInfo === '进行会签，填写意见') { + this.$router.push({ + name: 'bzqdfbStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '根据会签意见修订') { + this.$router.push({ + name: 'bzqdfbStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '业务经理审批') { + this.$router.push({ + name: 'bzqdfbStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break; + break //项目合规评估流程 case '5' : if(row.taskInfo === ''){ @@ -394,6 +411,7 @@ export default { } }) } + break } }, From 7b9e8bc02b008daeceff7bb94ed98b05e9b8e339 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 8 Jul 2021 19:09:20 +0800 Subject: [PATCH 113/528] commit --- src/components/navMenu/index.vue | 10 ++--- src/pages/home1/components/navMenu/index.vue | 43 ++++++++++++++----- .../personal/pages/individual-plate/index.vue | 18 +++++--- 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index a11e76a7f..58601b3fd 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -300,11 +300,11 @@ export default { // path: '/convertDocView', // menuId: '3F52K25546' // }, - { - title: '菜单管理', - path: '/menuManage', - menuId: '82665e94d406c6fc0d1f627e5880230b' - }, + // { + // title: '菜单管理', + // path: '/menuManage', + // menuId: '82665e94d406c6fc0d1f627e5880230b' + // }, // // { // // title: '保密管理', // // path: '/convertDocView' diff --git a/src/pages/home1/components/navMenu/index.vue b/src/pages/home1/components/navMenu/index.vue index 71aa3396f..ef4c34384 100644 --- a/src/pages/home1/components/navMenu/index.vue +++ b/src/pages/home1/components/navMenu/index.vue @@ -3,15 +3,11 @@
- - - - - - - - - +
@@ -25,12 +21,32 @@ mixins: [], data() { return { + list: [] } }, computed: {}, watch: {}, - mounted() {}, + mounted() { + this.getData() + }, methods: { + getData (){ + this.$http.get('/sarPersonalCenter/sar-user-personal-menu/getList', + { + userId: this.$store.getters.userInfo.userId + }, {_this: this}, res => { + if (res.ok) { + res.data.records.forEach( item => { + if (item.state == 1) { + var json = {} + json.label = item.menuName + json.path = item.menuUrl + this.list.push(json) + } + }) + } + }) + }, toPage() { this.$router.push(this.path) } @@ -42,6 +58,7 @@ .nav-menu { .lattice { .menu-wrap { + height: 324px; display: flex; flex-wrap: wrap; justify-content:space-between; @@ -55,6 +72,12 @@ width: 32%; margin: 0 0 10px 0; } + .wx-card1 { + width: 100%; + } + .wx-card2 { + width: 49%; + } .menu-item { flex: 1; line-height: 88px; diff --git a/src/pages/personal/pages/individual-plate/index.vue b/src/pages/personal/pages/individual-plate/index.vue index 2852d1a19..5cfbe5636 100644 --- a/src/pages/personal/pages/individual-plate/index.vue +++ b/src/pages/personal/pages/individual-plate/index.vue @@ -50,11 +50,14 @@ export default { methods: { // 右侧列表元素变化时触发 handleChange (newTargetKeys, direction, moveKeys) { - if (direction === 'left') { + if (newTargetKeys.length > 9) { + this.$message.warning('个人展示模块最多仅能展示9个') + } + if (direction === 'left') { this.oldData.forEach( item => { moveKeys.forEach( items => { if (items === item.id) { - item.state = 1 + item.state = 0 } }) }) @@ -62,7 +65,7 @@ export default { this.oldData.forEach( item => { moveKeys.forEach( items => { if (items === item.id) { - item.state = 0 + item.state = 1 } }) }) @@ -71,8 +74,8 @@ export default { this.numData = [] }, selectedChange (sourceSelectedKeys, targetSelectedKeys) { - this.numData = sourceSelectedKeys - this.sourceSelectedKeys = targetSelectedKeys + this.numData = sourceSelectedKeys + this.sourceSelectedKeys = targetSelectedKeys }, savePersonal () { if (this.targetKeys.length === 0) { @@ -81,6 +84,9 @@ export default { type: 'warning' }) return + } else if (this.targetKeys.length > 9) { + this.$message.warning('个人展示模块最多仅能展示9个') + return } this.$http.postData('sarPersonalCenter/sar-user-personal-menu/update', { @@ -107,7 +113,7 @@ export default { res.data.records.map((item) => { if (item.menuName === '首页') { this.selected.push(item) - } else if (item.state == 0) { + } else if (item.state == 1) { this.selected.push(item) } }) From 8701bb53f92be9b8299d3843b07d32f3febdd2ec Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 8 Jul 2021 20:03:50 +0800 Subject: [PATCH 114/528] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 140 ++- .../pages/otherAddEit.vue | 114 +-- .../pages/projectAddEit.vue | 874 +++++------------- 3 files changed, 310 insertions(+), 818 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index e839c14a9..293b9748f 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -189,14 +189,14 @@
清单条目
- 上移 - 下移 删除
+ + +
@@ -1011,73 +1018,45 @@ export default { }) if(addList > -1){ this.$message.warning('请勿添加重复数据') - } else( + this.$refs.accessTypeSelect.clearSelection() + this.$refs.entryTable.clearSelection() + this.$refs.searchTable.clearSelection() + } else{ this.sarAccessInfoList.push(item) - ) + this.$refs.accessTypeSelect.clearSelection() + this.$refs.entryTable.clearSelection() + this.$refs.searchTable.clearSelection() + } }) - this.selectedAccInfoSearchList = [] - this.$refs.entryTable.clearSelection() - this.$refs.searchTable.clearSelection() } else { this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') } }, + // 上移 事件 - moveUp () { - // i 全部对象数组的下标 - // s 选中对象数组的下标 - let sarAccessInfoListArry = JSON.parse(JSON.stringify(this.sarAccessInfoListArry)) - if (sarAccessInfoListArry.length === 1) { - //数组交换下标 - console.log('s', sarAccessInfoListArry); - console.log('i',this.sarAccessInfoList); - for (var s in sarAccessInfoListArry) { - for (var i in this.sarAccessInfoList) { - if (sarAccessInfoListArry[s].resId === this.sarAccessInfoList[i].resId) { - if (Number(i) !== 0) { - let tempOption = this.sarAccessInfoList[i - 1] - this.$set(this.sarAccessInfoList, i - 1, this.sarAccessInfoList[i]) - this.$set(this.sarAccessInfoList, i, tempOption) - // this.sarAccessInfoListArry = [] - return - } else { - this.$message.error('数据已经是第一个,请选择其他数据上移!') - } - } - } - } - } else if (this.sarAccessInfoListArry.length === 0) { - this.$message.error('请选择需要移动的数据!') - } else { - this.$message.error('请选择单一数据进行移动!') - } + moveUp (index, row) { + if (index === 0) { + this.$message({ + message: '已经是列表中第一个素材！', + type: 'warning' + }) + } else { + let temp = this.sarAccessInfoList[index - 1] + this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index]) + this.$set(this.sarAccessInfoList, index, temp) + } }, - // 下移事件 - moveDown () { - // y 全部对象数组的下标 - // t 选中对象数组的下标 - if (this.sarAccessInfoListArry.length === 1) { - for (var t in this.sarAccessInfoListArry) { - for (var y in this.sarAccessInfoList) { - if (this.sarAccessInfoListArry[t].resId === this.sarAccessInfoList[y].resId) { - var ass = this.sarAccessInfoList.length - 1 - if (Number(y) !== Number(ass)) { - var s = parseInt(y) + 1 - var tempOption = this.sarAccessInfoList[parseInt(s)] - this.$set(this.sarAccessInfoList, parseInt(s), this.sarAccessInfoList[parseInt(y)]) - this.$set(this.sarAccessInfoList, parseInt(y), tempOption) - return - } else { - this.$message.error('数据已经是最后一个,请选择其他数据进行移动!') - } - } - } - } - } else if (this.sarAccessInfoListArry.length === 0) { - this.$message.error('请选择需要移动的数据!') - } else { - this.$message.error('请选择单一数据进行移动!') - } + moveDown (index) { + if (index === (this.sarAccessInfoList.length - 1)) { + this.$message({ + message: '已经是列表中最后一个素材！', + type: 'warning' + }) + } else { + let i = this.sarAccessInfoList[index + 1] + this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index]) + this.$set(this.sarAccessInfoList, index, i) + } }, // 点击清单条目导入按钮事件 importmodalFlags () { @@ -1120,12 +1099,8 @@ export default { } }, // 清单条目 table select事件 - sarAccessInfoSelect (data) { - let sarAccessInfoListArry = []; - for(let i = 0; i< data.length; i++){ - this.sarAccessInfoListArry.push(data[i].id) - } - console.log(this.sarAccessInfoListArry); + sarAccessInfoSelect (selectData) { + this.sarAccessInfoListArry = selectData }, // 点击取消按钮 返回事件 backCancal () { @@ -1207,12 +1182,9 @@ export default { return row.isRelateAccess === '1' }, // 数据搜索 table select事件 - sarAccessInfoSearchSelect (selectData) { - this.selectedAccInfoSearchList = selectData - this.selectSearch = [] - for(let i = 0; i 清单条目
- 上移 - 下移 + + +
@@ -996,9 +1003,15 @@ export default { }) if(addList > -1){ this.$message.warning('请勿添加重复数据') - } else( + this.$refs.accessTypeSelect.clearSelection() + this.$refs.entryTable.clearSelection() + this.$refs.searchTable.clearSelection() + } else{ this.sarAccessInfoList.push(item) - ) + this.$refs.accessTypeSelect.clearSelection() + this.$refs.entryTable.clearSelection() + this.$refs.searchTable.clearSelection() + } }) this.selectedAccInfoSearchList = [] this.$refs.entryTable.clearSelection() @@ -1008,60 +1021,28 @@ export default { } }, // 上移 事件 - moveUp () { - // i 全部对象数组的下标 - // s 选中对象数组的下标 - let sarAccessInfoListArry = JSON.parse(JSON.stringify(this.sarAccessInfoListArry)) - if (sarAccessInfoListArry.length === 1) { - //数组交换下标 - console.log('s', sarAccessInfoListArry); - console.log('i',this.sarAccessInfoList); - for (var s in sarAccessInfoListArry) { - for (var i in this.sarAccessInfoList) { - if (sarAccessInfoListArry[s].resId === this.sarAccessInfoList[i].resId) { - if (Number(i) !== 0) { - let tempOption = this.sarAccessInfoList[i - 1] - this.$set(this.sarAccessInfoList, i - 1, this.sarAccessInfoList[i]) - this.$set(this.sarAccessInfoList, i, tempOption) - // this.sarAccessInfoListArry = [] - return - } else { - this.$message.error('数据已经是第一个,请选择其他数据上移!') - } - } - } - } - } else if (this.sarAccessInfoListArry.length === 0) { - this.$message.error('请选择需要移动的数据!') + moveUp (index, row) { + if (index === 0) { + this.$message({ + message: '已经是列表中第一个素材！', + type: 'warning' + }) } else { - this.$message.error('请选择单一数据进行移动!') + let temp = this.sarAccessInfoList[index - 1] + this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index]) + this.$set(this.sarAccessInfoList, index, temp) } }, - // 下移事件 - moveDown () { - // y 全部对象数组的下标 - // t 选中对象数组的下标 - if (this.sarAccessInfoListArry.length === 1) { - for (var t in this.sarAccessInfoListArry) { - for (var y in this.sarAccessInfoList) { - if (this.sarAccessInfoListArry[t].resId === this.sarAccessInfoList[y].resId) { - var ass = this.sarAccessInfoList.length - 1 - if (Number(y) !== Number(ass)) { - var s = parseInt(y) + 1 - var tempOption = this.sarAccessInfoList[parseInt(s)] - this.$set(this.sarAccessInfoList, parseInt(s), this.sarAccessInfoList[parseInt(y)]) - this.$set(this.sarAccessInfoList, parseInt(y), tempOption) - return - } else { - this.$message.error('数据已经是最后一个,请选择其他数据进行移动!') - } - } - } - } - } else if (this.sarAccessInfoListArry.length === 0) { - this.$message.error('请选择需要移动的数据!') + moveDown (index) { + if (index === (this.sarAccessInfoList.length - 1)) { + this.$message({ + message: '已经是列表中最后一个素材！', + type: 'warning' + }) } else { - this.$message.error('请选择单一数据进行移动!') + let i = this.sarAccessInfoList[index + 1] + this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index]) + this.$set(this.sarAccessInfoList, index, i) } }, // 点击清单条目导入按钮事件 @@ -1188,12 +1169,9 @@ export default { return row.isRelateAccess === '1' }, // 数据搜索 table select事件 - sarAccessInfoSearchSelect (selectData) { - this.selectedAccInfoSearchList = selectData - this.selectSearch = [] - for(let i = 0; i + + + \ No newline at end of file diff --git a/src/pages/home1/components/empennage/index.vue b/src/pages/home1/components/empennage/index.vue index 61bc7037d..7779c5cf0 100644 --- a/src/pages/home1/components/empennage/index.vue +++ b/src/pages/home1/components/empennage/index.vue @@ -5,6 +5,9 @@
    • +
  • + 更多链接> +
    • @@ -41,16 +44,18 @@ export default { newWebSite: 'http://www.mee.gov.cn/', webName: '中华人民共和国生态环境部' }, - { - newWebSite: '', - webName: '更多链接>' - } + // { + // newWebSite: '', + // webName: '更多链接>' + // } ] } }, computed: {}, watch: {}, - mounted() {}, + mounted() { + this.getLink(); + }, methods: { // 跳转链接 openLinkUrl (linkUri) { @@ -62,7 +67,17 @@ export default { window.open('https://' + linkUri) } }, + getLink () { + this.$http.get('sarUrl/tsUrl', {}, { + _this: this, + loading: 'Loading' + }, res=> { + this.data = res.data + console.log(data); + }) + } }, + } diff --git a/src/pages/home1/index.vue b/src/pages/home1/index.vue index e7aa380ab..c7e545203 100644 --- a/src/pages/home1/index.vue +++ b/src/pages/home1/index.vue @@ -21,21 +21,21 @@ class="home-tabs" @tab-click="handleTabClick" > - - - - - - + + + + + + - - - - - - + + + + + +
    diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 5f6b2bc7a..deddfb0e7 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -101,11 +101,11 @@ size="mini" @click="deleteStandFromKind(2)" v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'">移除标准 - 模板下载 + + + + + + import('@/pages/config/pages/linkManage/index'), + meta: { + requireAuth: true, + title: '链接管理', + menuId: 'd3ff92078c53a4d9d1f1a94450fee91e' + } + }, { path: '/roleManage', name: 'RoleManage', diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 39134bcc1..b0d4f4fed 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,8 +6,8 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -const devIp = '192.168.10.121' -const devInterfacePORT = '9988' +const devIp = '192.168.10.30' +const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload' @@ -22,11 +22,11 @@ const theme = 'theme-one' // 主题(theme-one浅蓝色,theme-two深蓝色) const processPort = '17210' /***************************************************************** - <<<<<<<<< 主题修改 >>>>>>>>> +<<<<<<<<< 主题修改 >>>>>>>>> - 1. 主题分为theme-one,theme-two两种 - 2. 修改assets/styles/style.less文件,注释theme-one/theme-two - 3. 将上方theme改为theme-one/theme-two +1. 主题分为theme-one,theme-two两种 +2. 修改assets/styles/style.less文件,注释theme-one/theme-two +3. 将上方theme改为theme-one/theme-two *****************************************************************/ // 生产环境配置 From 7c7ef0c56cb5c49913434434626ec65bfa2dfc64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 8 Jul 2021 21:08:08 +0800 Subject: [PATCH 118/528] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1.vue | 141 +++++++----------- .../pages/addEdit.vue | 12 +- src/sysConfig/index.js | 4 +- 3 files changed, 62 insertions(+), 95 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 0bdf9b2ad..a69694b6d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -70,15 +70,17 @@ label="产品线"> @@ -173,64 +175,36 @@ align="center"> + prop="code" + fixed="left" + label="标准号"> + - - + prop="issueTime" + label="发布日期"> - + prop="xcxssrq" + label="新车型实施日期"> - + show-overflow-tooltip + prop="zccssrq" + label="在产车实施日期"> - - - + show-overflow-tooltip + prop="textStatus" + label="文本状态">
    @@ -355,6 +329,7 @@ export default { }, data() { return { + ffzrr:'', active: "1", standModel: false, sarAccessListDatas: [], @@ -416,13 +391,11 @@ export default { standNumber: "", //标准编号 standName: "",//标准名称 dataList: [{ - code: "", //标准号 - standName: "", //标准名称 - issueTime: "", //发布日期 - xcxssrq: "", //新车型实施日期 - zccssrq: "", //在产车实施日期 - textStatus: "", //文本状态 - id: "" + projectLine: '', //产品线 + projectManager:'',//产品线责任人 + ffzrr: '', //分发责任人 + id: "", + sarStandProjectLibraries: [], }] }, choiceForm: {}, //选择标准清单列表 @@ -479,15 +452,8 @@ export default { //确认添加事件 okStand() { if(this.standList.length >= 1){ - let deposit = new Map(); - this.sarAccessListDatas.forEach(item => { - deposit.set(item.id, item); - }); - let bringData = []; - for (let i = 0; i < this.standList.length; i++) { - bringData.push(deposit.get(this.standList[i])); - } - console.log(bringData); + this.dataList = this.standList + this.listForm.dataList = this.standList this.standModel = false }else{ this.$message.warning('请选择一条数据进行添加') @@ -526,11 +492,7 @@ export default { json.prcCreateUserName = this.$store.getters.userInfo.account; json.standName = this.listForm.listName; json.standId = this.listForm.standId; - this.$refs["qdfbForm"].validate((valid) => { - if (valid) { - this.$refs["Form"].validate((valid) => { - if (valid) { - this.$http.get("lawss/activiti/startProcess", { type: "4" }, { + this.$http.get("lawss/activiti/startProcess", { type: "5" }, { _this: this }, res => { if (res.ok) { @@ -548,14 +510,6 @@ export default { }); } }); - } else { - return this.$message.warning("请完善人员信息"); - } - }); - } else { - return this.$message.warning("请完善基础信息"); - } - }); }, //选择拆分标准取消事件 closeDrawer() { @@ -564,13 +518,19 @@ export default { //选择拆分标准确定事件 OkDrawer() { + if(this.selectedList.length == 1){ + this.listForm.standNumber = this.selectedList[0].standNumber + this.listForm.standName = this.selectedList[0].standName + this.ListModel = false + }else if(this.selectedList.length > 1){ + this.$message.warning('您只能选择一条数据进行带入') + }else{ + this.$message.warning('请选择一条数据带入') + } }, //选择拆分标准选择框改变 selectListChange(data) { - this.selectedList = []; - for (let i = 0; i < data.length; i++) { - this.selectedList.push(data[i].id); - } + this.selectedList = data; }, //标准表格选择框改变 selectStandChange(data) { @@ -581,10 +541,7 @@ export default { }, //添加产品线select的改变 selectThree(data) { - this.standList = []; - for(let i=0;i { this.productData = res.data + // this.totalNo = res.data }, e => { }) }, + //获取标准数据 + getStandData() { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage','',{ + _this: this + }, res => { + this. sarAccessListDatas = res.data.list + this.total = res.pageCount + }, e => { + }) + }, }, computed: {}, mounted() { this.getTree(); this.getProductData() + this.getStandData() } }; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index e839c14a9..5289fa24e 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1120,12 +1120,12 @@ export default { } }, // 清单条目 table select事件 - sarAccessInfoSelect (data) { - let sarAccessInfoListArry = []; - for(let i = 0; i< data.length; i++){ - this.sarAccessInfoListArry.push(data[i].id) + sarAccessInfoSelect (selectData) { + this.sarAccessInfoListArry = selectData + let sarAccessInfoListArryId = [] + for(let i=0; i{ this.sarAccessInfoSearchList = res.data.list - this.$nextTick(() => { - }) }, e => { }) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 39134bcc1..a15aed4fa 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,8 +6,8 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -const devIp = '192.168.10.121' -const devInterfacePORT = '9988' +const devIp = '192.168.10.248' +const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload' From 280f526c794ec2392583b4c09e461ca4aa68c0e9 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 8 Jul 2021 22:34:56 +0800 Subject: [PATCH 119/528] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/standLawsAttrTreeDetails.vue | 4 +- .../domesticStandardsAndRegulations/index.vue | 372 +++++++++++++++++- 2 files changed, 361 insertions(+), 15 deletions(-) diff --git a/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrTreeDetails.vue b/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrTreeDetails.vue index bd935548b..1fe595291 100644 --- a/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrTreeDetails.vue +++ b/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrTreeDetails.vue @@ -45,9 +45,8 @@ class="filter-tree" :props="props" :data="data" - show-checkbox default-expand-all - :expand-on-click-node="false"> + > {{ node.label}} @@ -1174,7 +1173,6 @@ } this.productModelAdd.parentId = res.data.id this.productModelAdd.parentIdsName = idsName - console.log(this.productModelAdd.parentIdsName) this.$forceUpdate() }else { this.productModelAdd = res.data diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 5f6b2bc7a..a1ce4fe6d 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -13,6 +13,32 @@ @node-click="treeClick" default-expand-all :expand-on-click-node="false"> + + {{ node.label}} + + + 新增 + + + 编辑 + + + 删除 + + +
    @@ -227,7 +253,8 @@ 取消 - 提交 + 提交 @@ -821,6 +848,64 @@ 取消
    + + +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + 提交 + 取消 +
    +

    @@ -905,7 +990,7 @@ }" @confirm="isTreeOk" > - 导入中... + 导入中... @@ -956,20 +1041,70 @@ export default { children: 'children' }, treeList: [], + exportLoading : false, visibleOrgTable: false, orgTableVal: '', orgTableValName: '', twoOptions: [], threeOptions: [], sarType: 'STAND', + productModal: false, // 模态框是否打开 + modalType: '', + productTitle: '', // 模态框标题 // 收藏标准 personCollect: { collectResId: '', collectTitle: '', collectType: '' }, + // 规范 + productRules: { + menuName: [ + {required: true, message: '一级菜单不能为空', trigger: 'blur'}, + {type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'} + ], + displaySeq: [ + {type: 'number', required: true, message: '排序号不能为空且为正整数', trigger: 'blur'}, + {type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'} + ], + remarks: [ + {type: 'string', max: 500, message: '最多输入500位', trigger: 'blur'} + ], + dicTypeName: [ + {required: true, message: '选项不能为空', trigger: 'blur'}, + {type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'} + ], + showIndex: [ + {type: 'number', required: true, message: '排序号不能为空且为正整数', trigger: 'blur'}, + {type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'} + ], + describes: [ + {type: 'string', max: 500, message: '最多输入500位', trigger: 'blur'} + ] + }, + productModelAdd: { + id : "", + sorDivide : null, + menuName : "", + parentId : null, + parentIds : null, + parentIdsName : "", + displaySeq : "", + validFlag : "", + creationTime : "", + modifyTime : "", + remarks : "", + children : [], + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: "" + }, loading: false, - exportLoading: false, + importLoading: false, isCollapse: true, sideClose: false, // 边栏收展状态 isAdvancedSearch: false, // 高级检索窗口是否打开 @@ -1463,6 +1598,71 @@ export default { } }, methods: { + closeModal () { + this.productModal = false + this.closeDrawer() + }, + // 提交新增/修改 + saveProduct (name) { + this.$refs[name].validate((valid) => { + if (valid) { + if (this.modalType === 1) { + this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, { + _this: this + }, res => { + if (res.ok) { + this.selectMenu() + this.productModal = false + this.productModelAdd = { + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: this.$route.params.id + } + } else { + this.productModal = true + } + }, e => {}) + } else if (this.modalType === 2) { + this.$http.putData('sarResource/ts-resource', this.productModelAdd, { + _this: this + }, res => { + this.selectMenu() + this.productModal = false + this.productModelAdd = { + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: this.$route.params.id + } + }, e => { + }) + } + } else { + } + }) + }, + closeDrawer () { + this.$nextTick(() => { + this.$refs['productModelAdd'].resetFields() + this.productModelAdd = { + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: this.$route.params.id + } + }) + this.productModal = false + }, // 树点击 isTreeOk (checkedList) { this.shareStandardSelect = [] @@ -1688,7 +1888,114 @@ export default { }) } }, + // 查询二级菜单 + selectChildMenu (row) { + this.$http.get('sarResource/ts-resource/getMenuById', { + menuId: row.id + }, {}, res => { + if (res.ok) { + if(this.modalType === 1){ + let idsName = "" + if(row.parentIds !== null){ + if(row.parentIds.indexOf(res.data.id) != -1){ + this.productModelAdd.parentIds = row.parentIds + }else { + this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id + idsName = row.parentIdsName + ',' + res.data.menuName + } + }else { + this.productModelAdd.parentIds = res.data.id + idsName = res.data.menuName; + } + this.productModelAdd.parentId = res.data.id + this.productModelAdd.parentIdsName = idsName + this.$forceUpdate() + }else { + this.productModelAdd = res.data + } + } + }) + }, + update(data) { + this.modalType = 2 + this.selectChildMenu(data) + this.productModal = true + // 取消所有的选中效果 + this.handleSelectAll(false) + this.productTitle = '编辑信息' + // const newChild = { id: this.id++, label: 'testtest', children: [] }; + // if (!data.children) { + // this.$set(data, 'children', []); + // } + // data.children.push(newChild); + }, + + append(data) { + this.modalType = 1 + this.selectChildMenu(data) + this.productModal = true + // 取消所有的选中效果 + this.handleSelectAll(false) + this.productTitle = '新增下级菜单信息' + this.productModelAdd.dicTypeCode = '' + // const newChild = { id: this.id++, label: 'testtest', children: [] }; + // if (!data.children) { + // this.$set(data, 'children', []); + // } + // data.children.push(newChild); + }, + + remove(node, data) { + this.$confirm('是否删除菜单?', '提示', { + confirmButtonText: '确定', + confirmButtonClass: 'common-button-primary', + cancelButtonText: '取消', + roundButton: true, + type: 'warning' + }).then(() => { + this.$http.delete("sarResource/ts-resource", { + menuId: data.id + }, res => { + }, e => { + if(e.ok){ + this.$message({ + type: 'success', + message: "删除成功" + }) + this.selectMenu() + }else { + this.$message({ + type: 'warning', + message: e.message + }) + } + }) + }).catch(() => { + this.$refs.selections.clearSelection() + this.$message({ + type: 'info', + message: '已取消删除' + }) + }) + // const parent = node.parent; + // const children = parent.data.children || parent.data; + // const index = children.findIndex(d => d.id === data.id); + // children.splice(index, 1); + }, + // 树节点鼠标移入移出 + mouseenter(data){ + console.log(data) + this.$set(data, 'show', true) + if(data.parentId !== null){ + this.$set(data, 'showDel', true) + } + }, + mouseleave(data){ + this.$set(data, 'show', false) + this.$set(data, 'showDel', false) + }, treeClick (treeNode) { + this.selectSarMenu = treeNode this.standCommonlySearch.menuId = treeNode.id this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询 this.sarStandardsSearch.page = 1 @@ -1958,20 +2265,61 @@ export default { }, // 导出确定功能 exportTestItem () { - if (this.saveExportType === 'apart') { + this.exportLoading = true + + if (this.saveExportType === 'apart') { + // const param = { + // exportType : this.saveExportType, + // exportContent : this.selectedList.join(','), + // exportName : this.exportName, + // standType : this.standType + // } if (this.selectedList != null && this.selectedList !== '') { - const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' + - 'exportType' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType - window.open(exportURL) - this.$message.success('导出信息成功') + // + // this.$http.post('sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel', param, { + // _this: this + // }, res => { + // }, e => { + // }) + // this.$message.success('导出信息成功') + + + const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' + + 'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType + window.open(exportURL) + this.$message.success('导出信息成功') + this.exportLoading = false } } else if (this.saveExportType === 'all') { let exportEOStr = JSON.stringify(this.SarExportSearchEo) - exportEOStr = exportEOStr.replace(/""/g, null) + + // const paramAll = { + // exportType : this.saveExportType, + // exportContent : exportEOStr, + // exportName : this.exportName, + // standType : this.standType + // } + // this.$http.post('sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel', paramAll, { + // _this: this,responseType: 'blob', + // }, res => { + // console.log(res) + // this.exportLoading = false + // let url = window.URL.createObjectURL(new Blob([res])) + // let link = document.createElement('a') + // link.style.display = 'none' + // link.href = url + // link.setAttribute('download', 'excel.xlsx') + // document.body.appendChild(link) + // link.click() + // }, e => { + // }) + // this.$message.success('导出信息成功') + // window.open(interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' + - 'exportType' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType) + 'exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType) this.$message.success('导出信息成功') - } + this.exportLoading = false + } this.exportModelFlag = false }, // 导出取消按钮关闭模态、置空 @@ -3524,7 +3872,7 @@ export default { position: relative; .tree-content { background: #fff; - width: 16%; + width: 20%; position: relative; .tree { width: calc(~'100% - 15px'); From 9db377e50fd356b5e698e9107e34ae4438cbbbe3 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 8 Jul 2021 22:57:22 +0800 Subject: [PATCH 120/528] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 1e9df0481..867093e59 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -15,8 +15,8 @@ 更新记录 - 标准问答 - 标准分解单 + +

    From 57a02d5333106a13644bd2d68ce92495f0624038 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 9 Jul 2021 10:06:14 +0800 Subject: [PATCH 121/528] commit --- src/pages/config/pages/mechanismManage/index.vue | 1 + src/pages/config/pages/postManage/index.vue | 1 + src/pages/config/pages/roleManage/index.vue | 1 + src/pages/login/index.vue | 1 + src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue | 2 +- src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue | 2 +- src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue | 2 +- src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step1.vue | 2 +- 9 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index 5b17d5bd9..b6d7808e3 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -107,6 +107,7 @@ ref="tree2" node-key="id" class="filter-tree" + style="height: 100%; overflow: auto;" v-if="modalPost" :props="props" :data="postList" diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue index 36915c846..0f19d2965 100644 --- a/src/pages/config/pages/postManage/index.vue +++ b/src/pages/config/pages/postManage/index.vue @@ -102,6 +102,7 @@ ref="tree" node-key="id" class="filter-tree" + style="height: 100%; overflow: auto;" v-if="modalRole" :props="props" :data="roleList" diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 19718aa73..fb7287909 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -206,6 +206,7 @@ class="filter-tree1" :data="treeData" :props="defaultProps" + style="height: 100%; overflow: auto;" default-expand-all check-strictly node-key="id" diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 0b4e6b7a6..214dd7983 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -90,6 +90,7 @@ export default { let userInfoStr = Base64.decode(res.data) let userInfo2 = decodeURIComponent(userInfoStr) let userInfoObj = JSON.parse(userInfo2) + userInfoObj.userId = userInfoObj.usid this.setToken(userInfoObj.usid) // vuex存储token this.getByUserInfoCode(userInfoObj.usid).then((userInfo) => { if (userInfo !== '' && userInfo !== null) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index aaf834d54..cd7a15d89 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -563,7 +563,7 @@ size="800px"> Date: Fri, 9 Jul 2021 10:07:15 +0800 Subject: [PATCH 122/528] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 1 + .../pages/creatProcess/xmpg/step1.vue | 54 ++++++++++++++++--- src/sysConfig/index.js | 2 +- 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index aaf834d54..ac4673fd0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -845,6 +845,7 @@ export default { let json = this.listForm; json.zrUserId = this.$store.getters.userInfo.userId; json.jlUserId = this.$store.getters.userInfo.userId; + // (如果是业务经理应该这样写 后续需要更改 例：json.jlUserId = this.roleForm.directorUser;) json.applyUpdUserId = this.$store.getters.userInfo.userId; json.approvalOpinion = ""; json.prcCreateUser = this.$store.getters.userInfo.userId; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index a69694b6d..6fe9f020e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -113,8 +113,8 @@

    标准法法规业务经理

    - +
    @@ -126,20 +126,56 @@

    分发责任人

    - +
    - + -

    业务经理

    +

    责任人

    - + +
    +     +     +     + + + +

    分发责任人

    +
    + + +
    +     +     +     + + + +

    产品线责任人

    +
    + + + +
    +     +     +     + + + +

    标准法规部领导

    +
    + +
    @@ -573,6 +609,8 @@ export default { _this: this }, res => { this.productData = res.data + //分发责任人 + // this.roleForm.directorUser = res.data. // this.totalNo = res.data }, e => { diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 0b7476a89..6bd16fca3 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,8 +6,8 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' +// const devIp = '192.168.10.248' const devIp = '192.168.10.248' -const devIp = '192.168.10.30' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' From 537bc1c7fe675b2490da844f6aeb96773fb0ecb1 Mon Sep 17 00:00:00 2001 From: Jaunty <15613469426@163.com> Date: Fri, 9 Jul 2021 11:33:17 +0800 Subject: [PATCH 123/528] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 318 ++++++++++-------- 1 file changed, 179 insertions(+), 139 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 66ef06951..f7c56627e 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -14,10 +14,10 @@ @@ -66,21 +66,128 @@ v-btn-permission="'e5ca15122f554414e6365eb09efac5c4'" @click="selectMoreBtn" >高级查询 - - - - - - - - - - - - - - - +
    + + + + + + + + + + + + + + + + + + + + {{ opt.label}} + + + + + + + + + + + + - + + + + + + - + + + + + + + + + + + + + + 查询 + 清空 + + + + + +
    @@ -88,9 +195,6 @@ - - -
    @@ -212,7 +316,6 @@ 查看 - 删除
    @@ -272,8 +375,11 @@ export default { deptUser: [], //查询3类 projectLibrarySearch: { + // 项目名称 projectName: '', + // 项目分类 projectClassification: '', + // 项目状态 projectStatus: '', }, //查询3类 @@ -287,22 +393,68 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, + // 项目编号 projectNumber:'', productSet: '', productName: '', productBrand: '', - advanceSearchVOStr: '' + advanceSearchVOStr: '', + // 产品平台 + projectPlatfor:'', + // 产品线 + productLine:'', + // 项目名称 + projectName: '', + // 项目分类 + projectClassification: '', + // 项目状态 + projectStatus: '', + // 项目群 + projectGroup: '', + // 项目开始日期 + projectStartDate: '', + // 项目完成日期 + projectEndDate: '', + // 当前节点 + currentNode: '', + // 项目级别 + projectLevel: '', + // 项目经理 + projectManager: '', }, // 查询条件 localProTableSearchDefault: { page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, + // 项目编号 projectNumber:'', productSet: '', productName: '', productBrand: '', - advanceSearchVOStr: '' + advanceSearchVOStr: '', + // 产品平台 + projectPlatfor:'', + // 产品线 + productLine:'', + // 项目名称 + projectName: '', + // 项目分类 + projectClassification: '', + // 项目状态 + projectStatus: '', + // 项目群 + projectGroup: '', + // 项目开始日期 + projectStartDate: '', + // 项目完成日期 + projectEndDate: '', + // 当前节点 + currentNode: '', + // 项目级别 + projectLevel: '', + // 项目经理 + projectManager: '', }, total: 0, // 列表数据 @@ -339,94 +491,6 @@ export default { value: '2' } ], - //9宫格列表 - localProLib:{ - // 产品平台 - projectPlatfor: '', - // 项目编号 - projectNumber: '', - // 项目名称 - projectName: '', - // 项目分类 - projectClassification: '', - // 项目状态 - projectStatus: '', - // 项目群 - projectGroup: '', - // 项目开始日期 - projectStartDate: '', - // 项目完成日期 - projectEndDate: '', - // 当前节点 - currentNode: '', - // 项目级别 - projectLevel: '', - // 项目经理 - projectManager: '', - }, - localProEO: { - // 项目相关人员 - userEOList: [], - // 产品代码 - produceCode: '', - // 项目阶段 - productStage: '', - // 整车项目编号 - zhengcarNo: '', - // 整车SOP时间 - zhengcarSopTime: '', - // 项目编号 - productNo: '', - // 项目类型 - productTypeCode: '', - // 生产基地 - producePlace: '', - // 基础车型 - baseCartype: '', - // 左驾右驾 - leftRight: '', - // 项目经理 - productManager: '', - productManagerShow: '', - // 是否纳入开发 - isDevelop: '', - energyKind: '', - // 平台 - flatform: '', - // 项目名称 - productName: '', - // 车型系列 - productSet: '', - // 项目类别 - productType: '', - // 项目状态 - productBrand: '', - // SOP时间 - sopTime: '', - // 阀点 - pointTime: [], - // 计划通过时间 - planPassTime: '', - // 实际通过时间 - actualPassTime: '', - // 目标市场 - targetMarket: '', - // 公告车型号 - carModel: '', - // 项目相关人员id - relatePerson: '', - // eop信息 - eopTime: '', - // 项目相关信息 - saleMarket: '', - // 判断是国内还是海外 - prodectCode: '', - // carModeFile: '' - // carModeFileList: '' - // 相关人员信息 - relatePersonShow: '' - // 相关人员姓名 - }, // 项目类型 protypeOptions: [], // 生产基地 @@ -716,31 +780,6 @@ export default { this.isAdvancedSearch = true this.threeOptions = [] }, - twoSelectChange (val, obj) { - console.log('twoSelectChange') - if (val === 'product_type') { - this.threeOptions = this.productTypeOptions - } else if (val === 'product_brand') { - this.threeOptions = this.xmztOptions - } else if (val === 'target_market') { - this.threeOptions = this.targetMarketOptions - } else if (val === 'left_right') { - this.threeOptions = [{ - label: '左驾', - value: '1' - },{ - label: '右驾', - value: '2' - }] - } - }, - // 编辑项目相关人员回显选中人员数据 - relatePersonTreeShow () { - let checkedArr = this.localProEO.relatePerson ? this.localProEO.relatePerson.split(',') : [] - if (checkedArr.length > 0) { - this.$refs.relatePersonRoleTree.checkedNode(this.localProEO.relatePerson.split(',')) - } - }, // 获取标准类别List数据 getAllInforList () { this.$http.get('sys/dictype/getDicTypeListCode', {}, {_this: this}, res => { @@ -954,6 +993,7 @@ export default { this.localProTableSearch = {...this.localProTableSearchDefault} this.projectLibrarySearch = {...this.projectLibrarySearchDefault} this.localProTableSearch.page = 1 + this.isAdvancedSearch=false this.getLocalProductTable() }, resolveTime (data) { @@ -1146,7 +1186,7 @@ export default { // 条件分页查询 getLocalProductTableBtn () { this.projectLibrarySearch.page = 1 - + this.isAdvancedSearch=false this.getLocalProductTable() }, // 查询本地产品 From ac9b608d16f84b77d7c88c75e77f48b18feb1104 Mon Sep 17 00:00:00 2001 From: Jaunty <15613469426@163.com> Date: Fri, 9 Jul 2021 15:23:31 +0800 Subject: [PATCH 124/528] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E6=A0=B7=E5=BC=8F=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 226 ++++++++---------- 1 file changed, 94 insertions(+), 132 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index f7c56627e..6cf1e22a7 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -66,133 +66,9 @@ v-btn-permission="'e5ca15122f554414e6365eb09efac5c4'" @click="selectMoreBtn" >高级查询 -
    - - - - - - - - - - - - - - - - - - - - {{ opt.label}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 查询 - 清空 - - - - - -
    -
    -
    @@ -328,6 +204,76 @@ @pageChange="pageChange" @pageSizeChange="pageSizeChange"> 数据获取中 + + +
    + + + + + + + + + + + + + + + + + {{ opt.label}} + + + + + + {{ opt.label}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    @@ -384,8 +330,11 @@ export default { }, //查询3类 projectLibrarySearchDefault: { + // 项目名称 projectName: '', + // 项目分类 projectClassification: '', + // 项目状态 projectStatus: '', }, // 查询条件 @@ -405,10 +354,6 @@ export default { productLine:'', // 项目名称 projectName: '', - // 项目分类 - projectClassification: '', - // 项目状态 - projectStatus: '', // 项目群 projectGroup: '', // 项目开始日期 @@ -439,10 +384,6 @@ export default { productLine:'', // 项目名称 projectName: '', - // 项目分类 - projectClassification: '', - // 项目状态 - projectStatus: '', // 项目群 projectGroup: '', // 项目开始日期 @@ -1591,6 +1532,8 @@ export default { From 14af9d5f5cfca81f08ade8e70ada485cfb8c0f8b Mon Sep 17 00:00:00 2001 From: Jaunty <15613469426@163.com> Date: Fri, 9 Jul 2021 15:39:35 +0800 Subject: [PATCH 125/528] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E6=A0=B7=E5=BC=8F=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 6cf1e22a7..4817d13dc 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -1572,13 +1572,14 @@ export default { border-right: none; line-height:30px; text-align: center; - margin-top: 6px; + margin-top: 7px; background: #F9F9F9; } /deep/.el-input__inner { height: 30px; line-height: 30px; border-radius: 0 !important; + width: 200px; } } } From 47da77630bfef54b69f87805b3888a7bc743b107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 9 Jul 2021 16:21:45 +0800 Subject: [PATCH 126/528] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1.vue | 82 +++- .../pages/creatProcess/xmpg/step2.vue | 449 ++++++++++++++++++ .../pages/creatProcess/xmpg/step3.vue | 449 ++++++++++++++++++ .../pages/creatProcess/xmpg/step4.vue | 13 + .../pages/creatProcess/xmpg/step5.vue | 13 + .../pages/creatProcess/xmpg/step6.vue | 13 + .../pages/creatProcess/xmpg/step7.vue | 13 + src/router/index.js | 54 +++ 8 files changed, 1067 insertions(+), 19 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step2.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step3.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step4.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step5.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step6.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step7.vue diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index e0bc6558e..a4d847af7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -39,6 +39,22 @@ clearable > + + + + + + @@ -70,19 +86,17 @@ label="产品线"> + - @@ -271,13 +272,13 @@ title="下载" @click="downloadFile(file.id)" class="icon-download" - v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'" + v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" /> 上传时间：{{ dateFormat(file.modifyTime) }} diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 98f2d0e0f..5f0b7ebe2 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3123,7 +3123,7 @@ export default { this.personCollect.collectType = 'INLAND_STAND' this.personCollect.id = this.id this.personCollect.collectResId = this.collectId - this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')' this.personCollect.userId = this.$store.getters.userInfo.userId this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, { _this: this, @@ -3204,6 +3204,7 @@ export default { formData.collectMenuId = undefined } formData.standType = 'INLAND' + formData.userId = this.$store.getters.userInfo.userId this.SarExportSearchEo = formData this.loading = true this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { @@ -3250,6 +3251,7 @@ export default { } this.sarConfigStandSearch.page = this.configPage // this.sarConfigStandSearch.pageSize = this.configRows + this.sarConfigStandSearch.userId = this.$store.getters.userInfo.userId this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, { _this: this, @@ -3414,6 +3416,7 @@ export default { this.quoteIdList1 = [] this.replaceStandNumForm.quoteIdList = '' } + this.replaceStandNumForm.userId = this.$store.getters.userInfo.userId // if (this.sarStandardsInfoEO.replaceStandNumId !== null && this.sarStandardsInfoEO.replaceStandNumId !== '') { // this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString() // (this.replaceStandNumForm.quoteIdList) @@ -3650,6 +3653,7 @@ export default { if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') { this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString() } + this.sarStandardsInfoEO.userId = this.$store.getters.userInfo.userId this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, { _this: this, loading: 'lawsExplainQuoteFormLoading' From 3a5dd8ed1d8529ea3431d9001d64ec63e845279a Mon Sep 17 00:00:00 2001 From: fanlin Date: Sat, 24 Jul 2021 14:26:45 +0800 Subject: [PATCH 274/528] =?UTF-8?q?bug:=E5=9B=BD=E5=86=85/=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=A0=91=E4=B8=8A=E6=96=B9=E9=9C=80=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=8A=82=E7=82=B9=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 16 ++++++++++++++++ .../foreignStandardsAndRegulations/index.vue | 16 +++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 5f0b7ebe2..cec1fc816 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3,6 +3,10 @@
    + + @@ -1286,6 +1291,7 @@ export default { }, data () { return { + filterText: '', // 国内法规过滤 props: { label: 'menuName', children: 'children' @@ -1943,7 +1949,17 @@ export default { textStatusMap: {} // 文本状态id与name对应 } }, + watch: { + filterText(val) { + this.$refs.tree.filter(val); + } + }, methods: { + // 国内标签过滤 + filterNode(value, data) { + if (!value) return true; + return data.menuName.indexOf(value) !== -1; + }, choiceZRR1 (type, title, id) { this.drawerTitle = title this.modalShowFlag1 = true diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index b394854ef..d7acd19ee 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3,6 +3,10 @@
    + + @@ -1741,14 +1746,23 @@ export default { displayLocation: [], orgData: [], delLoading: false, - standState: '' + standState: '', + filterText: '' } }, props: { }, watch: { + filterText(val) { + this.$refs.tree.filter(val); + } }, methods: { + // 海外标签过滤 + filterNode(value, data) { + if (!value) return true; + return data.menuName.indexOf(value) !== -1; + }, choiceZRR2 (type, title, id) { this.drawerTitle = title this.modalShowFlag2 = true From 2990241a64df8a9b314206b5978f796f3a520814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 24 Jul 2021 15:23:00 +0800 Subject: [PATCH 275/528] =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 16 +-- .../pages/creatProcess/bzqdfb/step2.vue | 135 +++++++++++++----- .../pages/creatProcess/bzqdfb/step4.vue | 92 +++++++----- .../pages/creatProcess/xmpg/step1.vue | 12 +- .../pages/details.vue | 6 +- 5 files changed, 172 insertions(+), 89 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 7bd76fbbd..78beff3a1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -800,7 +800,6 @@ export default { listForm: { listType: "", //区分是哪个清单 listName: "", //清单名称 - // applyRegion: "", //适用区域 descriptionList: "", //清单说明 fileId: "", model: "", // 上传模板 @@ -1097,8 +1096,7 @@ export default { }); this.fileListName = middle; this.fileIds.push(file.response.data.id); - // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id - // this.$message.success('上传成功') + this.$message.success('上传成功') } else { this.$message.error(res.message); fileList.pop(); @@ -1110,7 +1108,6 @@ export default { var index1 = filename.lastIndexOf("."); var index2 = filename.length; var fileSuffix = filename.substring(index1, index2); - // const fileSuffix = file.name.split('.')[1] // 后缀名 //把后缀转大写 if (fileSuffix !== undefined && fileSuffix !== null) { fileSuffix = fileSuffix.toUpperCase(); @@ -1260,16 +1257,17 @@ export default { } this.listForm.standId = bringData[0].id; this.listForm.listName = bringData[0].detailedListName; - this.listForm.applyRegion = bringData[0].applicationScope; this.listForm.descriptionList = bringData[0].remark; this.listForm.fileId = bringData[0].fileId; this.ListModel = false; - this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: bringData[0].id }, { + this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", + { id: bringData[0].id, page: this.page, Size:this.pageSize}, { _this: this }, res => { - if (res.data == null) { - res.data = []; - } + console.log(res.data); + // if (res.data == null) { + // res.data = []; + // } this.dataList = res.data; this.listForm.dataList = res.data; let formId = []; diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 5ae8b512e..976a14cda 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -37,19 +37,26 @@ clearable > - - - - + +
    +

    {{ listForm.modelName }} + + +

    +
    +
    + 暂无数据 +
    @@ -70,6 +77,10 @@ prop="code" width="180px" label="标准号"> + { + console.log(res); + this.$nextTick(() => { + res.data.map(item => { + this.listForm.modelName = item.oldFileName + this.listForm.model = item.id + }); + }); + }, e => { + }); + }, + /** + * @Description: 点击下载 + */ + downloadFile(attId) { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + }, + downloadFileByWater(attId, fileSuffix) { + let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); + if (fileExtension !== "pdf" && fileExtension !== "PDF") { + this.$message.error("水印下载仅支持PDF,pdf格式文件"); + } else { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + } + }, //保存事件 handleSave() { @@ -356,28 +407,6 @@ export default { }, selectThree() { - }, - // 请求上传的文件信息 - getFileInfo() { - // this.$http.get("att/attFile/getMultiFileInfos", { - // fileIds: this.sarAccessEO.fileIds - // }, { - // _this: this - // }, res => { - // console.log(res); - // this.$nextTick(() => { - // res.data.map(item => { - // // 赋值要回显的上传文件内容 - // this.fileInfoList.push({ - // name: item.oldFileName, - // uid: item.uid, - // status: item.status, - // id: item.id - // }); - // }); - // }); - // }, e => { - // }); }, pageChange(page) { this.page = page; @@ -397,8 +426,6 @@ export default { mounted() { this.processTable(); this.getData(); - this.getFileInfo(); - // console.log(this.$store.getters.getHandleInfo); } }; @@ -413,6 +440,36 @@ export default { padding: 0 20px 0; } } + .fileClass { + cursor: pointer; + } + .fileClass:hover{ + color: #0c91e5; + } + p { + & > a { + cursor: pointer; + } + + & > i { + display: inline-block; + margin-left: 3px; + width: 18px; + height: 16px; + background-repeat: no-repeat; + background-size: 100% 100%; + background-position: center center; + vertical-align: sub; + cursor: pointer; + } + .icon-download { + background-image: url("~assets/images/shangqi/img/download.png"); + } + + .icon-download2 { + background-image: url("~assets/images/shangqi/img/download2.png"); + } + } .choiceBtn { .el-button--primary { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 41f77d353..eadf18395 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -21,14 +21,6 @@ > - - - - - - - - - - - - - - - - - - - - - + +
    +

    {{ listForm.modelName }} + + +

    +
    +
    + 暂无数据 +
    +     @@ -251,7 +241,6 @@ listForm: { listType: "", //区分是哪个清单 listName: "", //清单名称 - // applyRegion: "", //适用区域 descriptionList: "", //清单说明 enclosure: "", //附件 signFlag: "1", //是否会签 1为会签 2为不会签 @@ -337,6 +326,45 @@ this.listForm.zrUserId = item.zrUserId }) }, + // 请求上传的文件信息 + getFileInfo() { + this.$http.get("att/attFile/getMultiFileInfos", { + fileIds: this.fileIds + }, { + _this: this + }, res => { + console.log(res); + this.$nextTick(() => { + res.data.map(item => { + this.listForm.modelName = item.oldFileName + this.listForm.model = item.id + }); + }); + }, e => { + }); + }, + /** + * @Description: 点击下载 + */ + downloadFile(attId) { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + }, + downloadFileByWater(attId, fileSuffix) { + let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); + if (fileExtension !== "pdf" && fileExtension !== "PDF") { + this.$message.error("水印下载仅支持PDF,pdf格式文件"); + } else { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + } + }, //驳回事件 beforeBack() { this.listForm.approvalOpinion = '1' diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index bd52ce074..1c6baaad8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -496,17 +496,17 @@ export default { } else if (this.type === "qualityEngineer") { this.roleForm.qualityEngineer = data[0].id; this.roleForm.qualityEngineerName = data[0].name; - this.listForm.qualityEngineer = this.roleForm.qualityEngineer; - this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName; + this.listForm.qualityEngineer = data[0].id; + this.listForm.qualityEngineerName = data[0].name; } else if (this.type === "certifiedEngineer") { this.roleForm.certifiedEngineer = data[0].id; this.roleForm.certifiedEngineerName = data[0].name; - this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer; - this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName; + this.listForm.certifiedEngineer = data[0].id; + this.listForm.certifiedEngineerName = data[0].name; } else if (this.type === "distributePerson") { this.listForm.distributePerson = data[0].name; - this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id - this.listForm.dataList[this.dsadadadsada].distributePerson=this.roleRow.name + this.listForm.dataList[this.dsadadadsada].distributePersonId= data[0].id + this.listForm.dataList[this.dsadadadsada].distributePerson= data[0].name this.showColumn = false; this.$nextTick(() => { this.showColumn = true diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 6ab697efe..d50c934ca 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -30,11 +30,11 @@
    - 调取 - 批量删除 + 调取 + 批量删除 导出 From 0cfa7167314bd08418262595105467cb596b405b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 24 Jul 2021 15:43:00 +0800 Subject: [PATCH 276/528] =?UTF-8?q?=E8=AF=84=E4=BC=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step5.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step7.vue | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 307ae7832..7c9ef4c0b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -37,16 +37,16 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 5965a188a..bd027def8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -39,14 +39,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index d3f680706..ca0d504ef 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -39,14 +39,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 1dc390e5a..7d55dff6f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -39,14 +39,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index c5b0bb69a..eaa28bcd6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -39,14 +39,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 607b70c25..467b93137 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -39,14 +39,14 @@ From cb528250cae04731f2fa1c89bc5eeb5e012dfdc0 Mon Sep 17 00:00:00 2001 From: fanlin Date: Sat, 24 Jul 2021 16:30:28 +0800 Subject: [PATCH 277/528] =?UTF-8?q?bug=EF=BC=9A=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=BA=94=E5=8E=BB=E6=8E=89=E8=A2=AB=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E6=A0=87=E5=87=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/treeSelect/treeSelectNew.vue | 14 ++++++++++++++ .../domesticStandardsAndRegulations/index.vue | 1 + 2 files changed, 15 insertions(+) diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue index 1ac8eb973..b8a892ea0 100644 --- a/src/components/treeSelect/treeSelectNew.vue +++ b/src/components/treeSelect/treeSelectNew.vue @@ -218,6 +218,20 @@ this.isShowSelect = !this.isShowSelect; } }, + // 递归 + getTreeData(data) { + // 循环遍历json数据 + for (let i = 0; i < data.length; i++) { + if (data[i].children.length < 1) { + // children若为空数组，则将children设为undefined + delete data[i].children + } else { + // children若不为空数组，则继续 递归调用 本方法 + this.getTreeData(data[i].children) + } + } + return data + }, // 节点选中状态发生变化时的回调 handleCheckChange () { var checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据 diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index cec1fc816..e34a317ae 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -444,6 +444,7 @@ From 8cfb1430584891f874cc224eb8f0e6978e0ed74e Mon Sep 17 00:00:00 2001 From: fanlin Date: Sat, 24 Jul 2021 16:45:53 +0800 Subject: [PATCH 278/528] =?UTF-8?q?bug:=20=E5=85=A5=E5=BA=93=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=B6=E6=9C=AA=E5=BF=85=E5=A1=AB=E9=A1=B9=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=A1=AB=E5=86=99=EF=BC=8C=20=E5=9C=A8=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=9F=A5=E7=9C=8B=EF=BC=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8C=E5=BA=94=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index e34a317ae..b7a97c8e7 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2291,8 +2291,10 @@ export default { Promise.all([this.queryDisplayLocation()]).then((values) => { const [displayLocation] = values console.log(this.formFieldList, 'assssssssssss') + console.log(item, 'itemitemitemitem') const formFieldList = this.formFieldList this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) + console.log(item.attrInfoCaseMap, 'gggg大大大滴滴答答') if(this.sarStandardsInfoEO.standSystem){ this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; } @@ -2303,10 +2305,9 @@ export default { } Object.keys(item.attrInfoMap || {}).forEach((key) => { if (item.attrInfoMap[key]) { - this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key]) + this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key]) } }) - const dynamicFormField = this.sarStandardsInfoEO this.sarStandardsInfoEO.EOPSSRQ = this.$moment(this.sarStandardsInfoEO.EOPSSRQ).isValid() ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ this.sarStandardsInfoEO['id'] = item.id From 33e84ae2bb51d7ffc666644353b6712342304bba Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Sat, 24 Jul 2021 16:54:02 +0800 Subject: [PATCH 279/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E6=97=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=87=BA=E7=8E=B0value=E5=8F=98=E4=B8=BA=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/unqualProcess.js | 14 ++ .../pages/addEdit.vue | 177 +++++++------- .../pages/details.vue | 79 +------ .../pages/otherAddEit.vue | 214 +++++++++++------ .../pages/projectAddEit.vue | 215 ++++++++++++------ 5 files changed, 422 insertions(+), 277 deletions(-) diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index a87c8a3ac..94d623b60 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -24,3 +24,17 @@ export function uploadFileText (data) { params: data }) } +export function dicTypeData (data) { + return axios({ + url: 'api/sys/dictype/getDicTypeListCode', + method: 'get', + params: data + }) +} +export function StandardsInfoPage (data) { + return axios({ + url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', + method: 'get', + params: data + }) +} diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 69bb4a9e0..9300400fc 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -80,7 +80,7 @@ - +
    - - - - - - - + + + +
    @@ -403,18 +395,12 @@ align="center" width="180px" label="适用车型"> - - - - - + @@ -359,6 +368,7 @@ name: "bzjdStep3", data() { return { + cxList: [], histortData: [], plForm: { technicalRequir: '', // 核心技术要求 @@ -367,11 +377,12 @@ complianceState: '', // 合规性分析 newData: '', // 新车型实施日期 onlineData: '', // 在产车实施日期 + applyArctic: '', // 适用车型 }, modalshowflag: false, sarType: '', itemList: [], - loading: false, + loading: true, commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, @@ -380,10 +391,10 @@ isSubmit: false, saveLoading: false, form: { - number: '', - name: '', - number1: '', - name1: '' + itemsNum: '', + itemsName: '', + itemsNum1: '', + itemsName1: '', }, json: {}, idList: [] @@ -412,6 +423,7 @@ this.itemList[a].complianceState = this.plForm.complianceState this.itemList[a].newData = this.plForm.newData this.itemList[a].onlineData = this.plForm.onlineData + this.itemList[a].applyArctic = this.plForm.applyArctic } } } @@ -446,7 +458,7 @@ handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { - let num1 = 0, num2 = 0, num3 = 0, num4 = 0, num5 = 0 + let num1 = 0, num2 = 0, num3 = 0, num4 = 0, num5 = 0, num6 = 0 for (let a = 0; a < this.itemList.length; a++) { if (!this.itemList[a].technicalRequir) { num1++ @@ -463,6 +475,9 @@ if (!this.itemList[a].onlineData) { num5++ } + if (!this.itemList[a].applyArctic) { + num6++ + } } if (num1 > 0) { this.$message.warning('请输入核心技术要求') @@ -478,7 +493,10 @@ this.$message.warning('请输入新车型实施日期') } else if (num5 > 0) { this.$message.warning('请输入在产车实施日期') + } else if (num6 > 0) { + this.$message.warning('请选择适用车型') } else { + this.isSubmit = true var json = this.json json.commentText = this.commentText json.itemList = this.itemList @@ -492,6 +510,7 @@ this.$router.push('/processCenter') } }) + this.isSubmit = false } } else { return this.$message.warning('请完善基础信息') @@ -505,10 +524,10 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.number = data.number - this.form.name = data.name - this.form.number1 = data.number1 - this.form.name1 = data.name1 + this.form.itemsNum = data.itemsNum + this.form.itemsName = data.itemsName + this.form.itemsNum1 = data.itemsNum1 + this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data const itemList = JSON.parse(data.itemList) @@ -524,6 +543,7 @@ item.itemsTitle = item.itermsConditions }) this.itemList = itemList + this.loading = false }).catch(e => { }) }) @@ -532,6 +552,11 @@ mounted () { this.getHistoryData() this.getData() + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.cxList = res.data.ENERGYTYPES // 适用车型 + }) } } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 4d68f687d..ff4b8c6aa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,28 +42,28 @@ @@ -176,7 +176,6 @@ align="center"> - 数据获取中
    @@ -250,8 +249,8 @@
    + 加载中... { let data = JSON.parse(res.mesg) - this.form.number = data.number - this.form.name = data.name - this.form.number1 = data.number1 - this.form.name1 = data.name1 + this.form.itemsNum = data.itemsNum + this.form.itemsName = data.itemsName + this.form.itemsNum1 = data.itemsNum1 + this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data this.itemList = data.itemList + this.loading = false }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index d8fbe2523..8030287a6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,28 +42,28 @@ @@ -176,7 +176,6 @@ align="center">     - 数据获取中
    @@ -251,7 +250,6 @@
    + 加载中...
    @@ -278,7 +277,7 @@ histortData: [], sarType: '', itemList: [], - loading: false, + loading: true, commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, @@ -287,10 +286,10 @@ isSubmit: false, saveLoading: false, form: { - number: '', - name: '', - number1: '', - name1: '' + itemsNum: '', + itemsName: '', + itemsNum1: '', + itemsName1: '', }, json: {}, } @@ -313,6 +312,7 @@ }, handleSave() {}, handleSubmit() { + this.isSubmit = true var json = this.json json.zrApplyFlag = 1 json.commentText = this.commentText @@ -325,10 +325,12 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) }, handleSubmitNo () { if (this.commentText) { + this.isSubmit = true var json = this.json json.zrApplyFlag = 2 json.commentText = this.commentText @@ -341,6 +343,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') @@ -353,13 +356,14 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.number = data.number - this.form.name = data.name - this.form.number1 = data.number1 - this.form.name1 = data.name1 + this.form.itemsNum = data.itemsNum + this.form.itemsName = data.itemsName + this.form.itemsNum1 = data.itemsNum1 + this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data this.itemList = data.itemList + this.loading = true }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index c29c8e39e..9c0039f5d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,28 +42,28 @@ @@ -177,7 +177,6 @@ align="center"> - 数据获取中
    @@ -252,17 +251,15 @@
    + 加载中...
    @@ -279,7 +276,7 @@ histortData: [], sarType: '', itemList: [], - loading: false, + loading: true, commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, @@ -288,10 +285,10 @@ isSubmit: false, saveLoading: false, form: { - number: '', - name: '', - number1: '', - name1: '' + itemsNum: '', + itemsName: '', + itemsNum1: '', + itemsName1: '', }, json: {}, } @@ -314,6 +311,7 @@ }, handleSave() {}, handleSubmit() { + this.isSubmit = true var json = this.json json.gcApplyFlag = 1 json.commentText = this.commentText @@ -326,10 +324,12 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) }, handleSubmitNo () { if (this.commentText) { + this.isSubmit = true var json = this.json json.gcApplyFlag = 2 json.commentText = this.commentText @@ -342,6 +342,7 @@ this.$message.success('驳回成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') @@ -354,13 +355,14 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.number = data.number - this.form.name = data.name - this.form.number1 = data.number1 - this.form.name1 = data.name1 + this.form.itemsNum = data.itemsNum + this.form.itemsName = data.itemsName + this.form.itemsNum1 = data.itemsNum1 + this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data this.itemList = data.itemList + this.loading = false }).catch(e => { }) }) From fdcc5a86923d55c1096b2abddd483c4fdfdcff2f Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 3 Aug 2021 13:40:38 +0800 Subject: [PATCH 404/528] commit --- .../processCenter/pages/creatProcess/bzjd/step1.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index f274448db..55c6529cd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -248,6 +248,17 @@ + + + +
    From af7a7493699aba09e0b357469d44a795c8d8c72f Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 3 Aug 2021 13:57:13 +0800 Subject: [PATCH 405/528] commit --- .../pags/consultationDetails.vue | 738 +++++++++--------- 1 file changed, 375 insertions(+), 363 deletions(-) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 684ffedb8..578bec260 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -1,92 +1,92 @@ + + + + Date: Tue, 3 Aug 2021 14:49:11 +0800 Subject: [PATCH 408/528] commit --- .../pages/creatProcess/bzjd/step1-1.vue | 874 ++++++++++++++++++ .../pages/creatProcess/bzjd/step1.vue | 123 ++- .../pages/creatProcess/bzjd/step2.vue | 2 +- .../pages/creatProcess/bzjd/step3.vue | 2 +- .../tabComponents/taskDraft/index.vue | 10 + .../domesticStandardsAndRegulations/index.vue | 1 - src/router/index.js | 9 + 7 files changed, 995 insertions(+), 26 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue new file mode 100644 index 000000000..56f6aa09e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -0,0 +1,874 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 55c6529cd..0e1e083c2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -272,7 +272,7 @@
    - - - - + label="标准号" + > + - - - - + label="标准名称"> + + + + + + + + + + + +
    @@ -339,11 +363,12 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - + import { saveTaskFirst } from 'api/process' export default { name: "bzjdStep1", data() { return { + textStatusMap: {}, listModel2: false, standInfoList2: [], sarType: '', @@ -384,7 +409,7 @@ standCommonlySearch2: { page: 1, pageSize: this.$store.getters.userInfo.configContent, - result: '1', + userId : this.$store.getters.userInfo.userId, standType: 'INLAND' }, spinShow: false, @@ -433,6 +458,19 @@ ProcessTitle }, methods: { + setMap(data){ + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label) + }) + }, + formatIssueDate(str) { + const momentDate = this.$moment(str) + if (momentDate.isValid()) { + return this.$moment(str).format('YYYY-MM-DD') + } else { + return str + } + }, addZqyjList() { this.title = '标准拆分数据库' this.listModel = true @@ -468,11 +506,25 @@ }, sarStandCompareHis2 () { var form = this.standCommonlySearch2 - this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage', form, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', form, { _this: this }, res => { this.standInfoList2 = res.data.list - this.total2 = res.data.total + this.standInfoList2.forEach(item => { + if (item.attrInfoMap && item.attrInfoMap.XCXSSRQ) { + item.XCXSSRQ = item.attrInfoMap.XCXSSRQ + } + if (item.attrInfoMap && item.attrInfoMap.ZCCSSRQ) { + item.ZCCSSRQ = item.attrInfoMap.ZCCSSRQ + } + }) + + this.total2 = res.data.count + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.setMap(res.data.WBZTCLASS) + }) }, e => { }) }, @@ -580,7 +632,11 @@ // this.form.itemsNum1 = bringData[0].showNumber // this.form.itemsName1 = bringData[0].standName // } - this.form.itemsNum1 = bringData[0].showNumber + if (bringData[0].standYear) { + this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + } else { + this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + } this.form.itemsName1 = bringData[0].standName this.form.oldNumber = bringData[0].id this.listModel2 = false @@ -646,7 +702,28 @@ handleTabs(name) { this.active = name }, - handleSave() {}, + handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('id', this.bpnId || '') + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', '9') + _formData.append('json', JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText, + itemList: this.itemList, + sarType: this.sarType + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { @@ -682,9 +759,9 @@ }) } else { this.$message.warning('流程启动失败') + this.isSubmit = false } }) - this.isSubmit = false } } else { return this.$message.warning('请完善人员信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 77c7bec18..1ebcac3fe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -332,8 +332,8 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) - this.isSubmit = false } } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 5a7bfc5ef..b1513d569 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -509,8 +509,8 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false }) - this.isSubmit = false } } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index bd68b0c25..9c30e58d3 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -335,6 +335,16 @@ export default { } }) break + case '9': + this.$router.push({ + name: 'bzjdStep1-1', + query: { + type: '9', + processName: '标准解读流程', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index f14971026..dcdd4e90e 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3501,7 +3501,6 @@ export default { } } this.stahndinfoList = res.data.list - console.log(this.stahndinfoList) this.total = res.data.count if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) { this.pageChange(1) diff --git a/src/router/index.js b/src/router/index.js index 9b3ba16fc..abb7f7bf3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -781,6 +781,15 @@ const routes = [ title: '标准解读流程' } }, + { + path: '/bzjdStep1-1', + name: 'bzjdStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, { path: '/bzjdStep2', name: 'bzjdStep2', From 1746c1d5b7fe77ed8a2074b4a7b912f538191776 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 3 Aug 2021 15:07:08 +0800 Subject: [PATCH 409/528] commit --- src/common/axiosV2/index.js | 3 ++- src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/axiosV2/index.js b/src/common/axiosV2/index.js index e86814c70..f4aaa8125 100644 --- a/src/common/axiosV2/index.js +++ b/src/common/axiosV2/index.js @@ -2,6 +2,7 @@ import axios from 'axios' import router from '@/router' import store from '@/store' import {Message} from 'element-ui' +import { baseUrl } from '@/sysConfig' // import 'element-ui/lib/theme-chalk/index.css' /** @@ -18,7 +19,7 @@ let formData = (data) => { } const service = axios.create({ - baseURL: '/' + baseURL: process.env.NODE_ENV === 'production' ? baseUrl : '/' }) service.defaults.timeout = 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 56f6aa09e..337123722 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -176,7 +176,6 @@
    Date: Tue, 3 Aug 2021 15:41:21 +0800 Subject: [PATCH 410/528] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 0e1e083c2..bd91ea3ca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -14,6 +14,7 @@ @@ -499,7 +500,7 @@ _this: this }, res => { this.standInfoList = res.data.list - this.total = res.data.total + this.total = res.data.count this.spinShow = false }, e => { }) @@ -727,8 +728,10 @@ handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { + console.log(1); this.$refs['Form'].validate((valid) => { if (valid) { + console.log(2); let b = 0 for (let a = 0; a < this.itemList.length; a++) { if (!this.itemList[a].zrUserId) { From f43744422387ff81fea0d65f91bdcd1500180cd2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 3 Aug 2021 15:58:04 +0800 Subject: [PATCH 411/528] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84--=E5=88=97=E8=A1=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AE=9E=E6=96=BD=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=EF=BC=88=E6=A0=87=E5=87=86=E6=96=87=E6=9C=AC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 76ff36995..082aff793 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -195,7 +195,7 @@ width="150px" label="实施日期">     From 28451a6343bfdb1aff4508b2adc23e38c167a4cb Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 3 Aug 2021 16:28:11 +0800 Subject: [PATCH 412/528] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step1.vue | 18 ++- .../pages/creatProcess/wfhxzg/step4.vue | 126 ++++++++++-------- .../pages/creatProcess/wfhxzg/step5.vue | 59 +++++++- 3 files changed, 142 insertions(+), 61 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 49068ff27..7d0b0fe66 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -265,7 +265,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { startProcess, completeTask, saveTaskFirst } from '@/api/process.js' +import { startProcess, completeTask, saveTaskFirst, queryTaskFirst } from '@/api/process.js' import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js' export default { name: "wfhxzgStep1", @@ -322,7 +322,23 @@ export default { ProcessFooter, ProcessTitle }, + mounted() { + this.bpnId = this.$route.query.bpnId + if (this.bpnId !== undefined) { + this.getData() + } + }, methods: { + getData() { + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes); + this.dataList = mes.dataList; + this.roleForm = mes.roleForm; + this.commentText = mes.commentText; + }); + }, //点击新增事件 addList() { dicTypeData().then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index b5827c953..df0c6c866 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -13,7 +13,7 @@ - + + + + + + + @@ -97,32 +107,30 @@ - + - @@ -214,23 +222,6 @@ @submit="handleSubmit" > - - -
    - -

    点击或拖拽上传文件

    -
    -     -     @@ -238,7 +229,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {interfaceUrl} from "@/sysConfig"; +import {uploadFile} from '@/api/unqualProcess.js'; import {inboundLiaisonDetail, completeTask} from "@/api/process" export default { @@ -268,6 +259,8 @@ export default { // 上传路径 uploadPath: 'api/att/attFile/upload', fileMadel: false, + // 上传所储存文件数组 + fileTextList: [], newDataList: [], // 责任部门 zNodesSItem: [], @@ -315,12 +308,18 @@ export default { this.$nextTick(() => { this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))] - /*for (let i = 0; i { + if (item.fileText.length !== 0) { + item.fileText.forEach(item1 => { + this.fileTextList.push({ + id: item1.id, + name: item1.name + }) + }) } - }*/ + }) }) }, @@ -328,16 +327,22 @@ export default { this.active = name }, /************ 上传佐证材料 *****************/ - fileUpload (val) { - this.newDataList = val - this.fileMadel = true + uploadFile (val) { + this.fileListData = val }, // 文件上传成功 handleOnsuccess(res, file, fileList) { if (res.ok) { - this.newDataList.fileText = res.data.name - this.newDataList.fileTextId = res.data.id - this.newDataList.fileTextPath = res.data.filePath + this.newDataList.push({ + id: res.data.attId, + name: res.data.standName + }) + this.newDataList.forEach(item =>{ + this.fileListData.fileText.push({ + id: item.id, + name: item.name + }) + }) this.$message({ showClose: true, message: res.message, @@ -374,13 +379,28 @@ export default { return true }, // 移除上传的文件 - handleBeforeRemove() {}, - handleOnRemove() {}, - // 文件超过限制数量提示 - handleExceed() { - this.$message.error(``) + handleBeforeRemove(file, fileList) { + this.fileTextList = fileList + this.newDataList.forEach((item, index) => { + if (file.name === item.name || file.id === item.id) { + this.newDataList.splice(index, 1) + } + }) }, + /************ ********* *****************/ + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, // 保存按钮 handleSave() {}, // 提交按钮 @@ -388,7 +408,7 @@ export default { this.isSubmit = true let flag=false this.dataList.forEach(item => { - if (item.fileText === '') { + if (item.fileText.length === 0) { flag=true this.isSubmit = false } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 389c2dc99..073001399 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -13,7 +13,7 @@ - + + + + + + + @@ -96,14 +106,19 @@ - - + + - @@ -222,6 +237,7 @@ export default { productName: '', // 项目名称 responsibleUnit: '' // 责任部门 }, + fileTextList: [], active: '1', // 默认显示 isSubmit: false, backLoading: false, @@ -281,13 +297,39 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList + this.dataList.forEach(item => { + item.fileText.forEach(item1 => { + this.fileTextList.push({ + id: item1.id, + name: item1.name + }) + }) + }) }) }, handleTabs(name) { this.active = name }, - + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, + // 点击上传的文件进行下载 + handleOnPreview(file) { + let attId = file.id + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, // 提交按钮 handleSubmit() { this.isSubmit = true @@ -407,6 +449,9 @@ export default { background: #E6A23C; } } + /deep/.el-upload{ + display: block; + } .content-center { padding: 10px 0px 10px 10px; } From fe9f8f14b146d678e1b26c5a982d36159aaaaaf0 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 3 Aug 2021 16:30:27 +0800 Subject: [PATCH 413/528] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 7d0b0fe66..6d8ca7b07 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -78,8 +78,8 @@

    流程发起人

    - - + +
    From d6e4b164d7993522f4ee3df486c0c26eb191dfcc Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Tue, 3 Aug 2021 16:46:12 +0800 Subject: [PATCH 414/528] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9--=E7=94=B1=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?-=E6=A0=87=E5=87=86=E5=BD=92=E6=A1=A3=E5=88=B0=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index cc52cb45e..514caf49e 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -168,7 +168,7 @@ + label="不合规项目"> -
    {{historySeeForm.standId}}
    +
    {{historySeeForm.standSerialNumber}}
    {{historySeeForm.standName}}
    @@ -253,7 +253,7 @@
    {{historySeeForm.productName}}
     - +
    {{historySeeForm.reason}}
     From fc2044ad33dec4f0d148c26b915d284ec6562027 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Tue, 3 Aug 2021 17:53:42 +0800 Subject: [PATCH 415/528] =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E8=AE=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=20=E6=A0=87=E5=87=86=E6=80=A7=E8=B4=A8?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=8C?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E4=B8=8D=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzrk/step1.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index fd24218c6..4701fe62d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1392,14 +1392,15 @@ { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } ], standNature: [ - { required: false, message: '请选择标准性质', trigger: 'change' } + { required: true, message: '请选择标准性质', trigger: 'change' } ], textStatus: [ { required: true, message: '请选择文本状态', trigger: 'change' } - ], - issueTime: [ - { required: true, message: '请选择标准发布日期', trigger: 'change' } - ], + ] + , + // issueTime: [ + // { required: true, message: '请选择标准发布日期', trigger: 'change' } + // ], qcdw: [ { required: true, message: '请选择起草单位', trigger: 'change' } ], From 001353d687184718e20a973dc41573be3a2be21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 3 Aug 2021 18:01:11 +0800 Subject: [PATCH 416/528] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standAutoSplit/pages/itemSplitInfo.vue | 5 +- .../pages/creatProcess/bzqdfb/step3.vue | 5 +- .../pages/creatProcess/bzqdfb/step4.vue | 1063 +++++++++-------- .../tabComponents/taskDraft/index.vue | 38 +- 4 files changed, 555 insertions(+), 556 deletions(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index a4035fe21..c531d6c0f 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -1305,6 +1305,7 @@ export default { if (cur[i].pId == null || cur[i].pId === '') { this.parentNode = cur[i] } + console.log(str); this.zNodes = str } // 查完左侧目录后，如果没有选中的，设置最外层选中 @@ -1450,7 +1451,6 @@ export default { loading: 'loading' }, res => { - console.log(res) if (res.ok) { this.$copyText(this.copyMessage).then((e) => { }) @@ -1657,7 +1657,6 @@ export default { let regSt = / 1 && countEd.length > 1) { @@ -2115,7 +2114,6 @@ export default { this.standItemEO.ZRBM = this.standItemEO.responsibleUnit this.saveItemId = row.id this.showUpdateItemInfo() - console.log(this.standItemEO) }, getOrgTreeSource () { this.$http.get('sys/org/getTree', {}, {_this: this}, @@ -2148,7 +2146,6 @@ export default { attribute (row) { this.getFileName(row) this.showItemInfoEO = JSON.parse(JSON.stringify(row)) - console.log(this.showItemInfoEO) }, getDicTypeName(opt, type) { const _type = type ? type.split(',') : [] diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index d82a474de..79adf88df 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -376,7 +376,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, saveTaskFirst } from "api/process"; +import { inboundLiaisonDetail, saveinboundTask } from "api/process"; export default { name: "bzqdfbStep3", @@ -700,9 +700,10 @@ export default { pId: this.$route.query.prcId, commentText: this.commentText })); - saveTaskFirst(_formData).then(res => { + saveinboundTask(_formData).then(res => { this.saveLoading = false; this.$message.success("保存成功"); + this.$router.push('/processCenter') this.bpnId = res.result; }).catch(e => { this.saveLoading = false; diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index af40db76d..cfb326ed6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -1,546 +1,547 @@ diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index bd68b0c25..cca5d95c9 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -69,43 +69,43 @@ width="55" align="center"> - - + + + + + + + - - + + + + + + + + - + @@ -260,6 +259,8 @@ export default { tabValue: "listOfCountries", selectedList: [], //选择清单的选择框 selectList: [], //选择标准的选择框 + lsIndex: '', + lsType: '', bringData: [], commentText: "", //填写会签意见 page: 1, @@ -346,7 +347,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res); + console.log(res.mesg) if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -355,11 +356,6 @@ export default { }); }); }, - - createItemId() { - return Number(Math.random().toString().substr(3,18) + Date.now()).toString(36); - }, - /** * @description: 动态表单读取 */ @@ -373,7 +369,6 @@ export default { for (let i = 0; i < item.pepdtos.length; i++) { for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { this.listForm.breakdownList.push({ - itemId: this.createItemId(), itemsName: item.pepdtos[i].breakdownList[j].itemsName, itemNum: item.pepdtos[i].breakdownList[j].itemsNum, responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer, @@ -395,46 +390,47 @@ export default { }); } } + console.log(this.listForm.breakdownList); }, - //批量操作按钮 - batchOperation(id) { - if (this.selectList.length === 0) { - this.$message.warning("请至少选择一条数据进行批量分发"); - } else { - this.nodeList = []; - this.nodeList.push(id); - this.modalshowflag = true; + checkedRole (data) { + if (this.type === 1) { + this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id + this.listForm.breakdownList[this.lsIndex].implementer = data[0].name + } else if(this.type === 2) { + this.listForm.breakdownList.forEach( item => { + this.selectList.forEach( items => { + if (item === items) { + item.implementerId = data[0].id + item.implementer = data[0].name + } + }) + }) } - }, - checkedRole(data) { - // 选取负责人时的操作 - let mis = []; - let miss = []; - this.selectList.forEach(item => { - item.implementer = data[0].name; - item.implementerId = data[0].id; - mis.push(item.projectNumber); - miss.push(item.itemNum) - }); - this.listForm.breakdownList.forEach(item => { - if (!mis.includes(item.projectNumber) && !miss.includes(item.itemsNum)) { - this.selectList.push(item); - } - }); - this.listForm.breakdownList = this.selectList; - this.$refs.selection.clearSelection(); - this.modalshowflag = false; + this.modalshowflag = false }, cancleUserInfo() { this.modalshowflag = false; }, - choiceZRRS(scope) { - if (scope != null) this.dsadadadsada = scope.$index; - this.nodeList = []; - if (this.roleForm.implementer.length > 0) { - this.nodeList = this.roleForm.implementer.split(","); + choiceZRRS (row, type, index) { + this.type = type + if (type === 1) { + this.drawerTitle = '选择责任人' + this.nodeList = [] + this.lsIndex = index + this.lsType = type + this.nodeList.push(row) + this.modalshowflag = true + } else if (type === 2) { + // 批量 + if (this.selectList.length > 0) { + this.lsType = type + this.nodeList = [] + this.modalshowflag = true + this.drawerTitle = '批量选择责任人' + } else { + this.$message.warning('请选择要分发的数据') + } } - this.modalshowflag2 = true; }, getTree() { this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/test.vue b/src/pages/processCenter/pages/creatProcess/xmpg/test.vue new file mode 100644 index 000000000..daa015930 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg/test.vue @@ -0,0 +1,595 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index ff4dd93eb..120de5f7b 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -178,6 +178,7 @@ export default { let row = {...this.detailData[index]} row.taskIds = row.id row.taskInfo = row.name + console.log(row.name) row.tabsName = this.$route.query.tabsName let prcType = this.detailData[index].prcType // 流程类型 // 判断当前流程是否已全部办理完成 @@ -205,7 +206,7 @@ export default { this.toProcessDetail('bzqdfbStep4',row) }else if (prcType === '5'){ //标准项目合规评估 标准维度 - if(row.taskInfo === '标准法规部部长审批'){ + if(row.taskInfo === '标准法规部领导审核'){ this.toProcessDetail('xmpgStep7',row) }else{ this.toProcessDetail('xmpgStep2',row) diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 3e3f73c32..1a8c3c2a8 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -4,22 +4,22 @@
    - - - - - - + + + + + + + + + + + + + + + + Date: Wed, 4 Aug 2021 17:56:37 +0800 Subject: [PATCH 443/528] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step4.vue | 10 +---- .../pages/creatProcess/wfhxzg/step5.vue | 39 ++++++++++++++----- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 627b58150..a684c38a4 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -312,8 +312,7 @@ export default { } else { this.dataList = [listJSON] } - this.newDataList = [] - this.dataList.forEach(item => { + this.dataList.forEach(item => { if (item.fileText.length !== 0) { item.fileText.forEach(item1 => { this.fileTextList.push({ @@ -340,12 +339,7 @@ export default { id: res.data.attId, name: res.data.standName }) - this.newDataList.forEach(item =>{ - this.fileListData.fileText.push({ - id: item.id, - name: item.name - }) - }) + this.fileListData.fileText = this.newDataList this.$message({ showClose: true, message: res.message, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 073001399..ab8c6df90 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -107,15 +107,9 @@ - + @@ -212,6 +206,15 @@ submitBTNText="同意" > + + + +
    @@ -226,6 +229,7 @@ export default { name: "wfhxzgStep5", data() { return { + fileMadel: false, detailData: [], loading: false, commentText: '', @@ -271,6 +275,10 @@ export default { } }, methods: { + queryFile(row) { + this.fileTextList = row.fileText + this.fileMadel = true + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -297,14 +305,14 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList - this.dataList.forEach(item => { + /*this.dataList.forEach(item => { item.fileText.forEach(item1 => { this.fileTextList.push({ id: item1.id, name: item1.name }) }) - }) + })*/ }) }, @@ -351,6 +359,9 @@ export default { handleSubmitNo() { if (this.commentText) { var json = { + responUserInfo: { + info: this.dataList + }, actionFlag: 1, commentText: this.commentText } @@ -361,6 +372,7 @@ export default { }, {}, res => { if (res.success) { this.$message.success('驳回成功') + this.fileTextList = [] this.$router.push('/processCenter') } }) @@ -452,6 +464,13 @@ export default { /deep/.el-upload{ display: block; } + // 上传信息回显多余隐藏 + /deep/.el-upload-list__item .el-icon-close { + font-size: 0; + } + /deep/.el-upload-list__item .el-icon-close-tip { + font-size: 0; + } .content-center { padding: 10px 0px 10px 10px; } From 45345d44a25b5385923533b601d2271d9a424f2f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 4 Aug 2021 18:00:23 +0800 Subject: [PATCH 444/528] =?UTF-8?q?feat:=20=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E5=8A=A8=E6=80=81=E5=8C=B9=E9=85=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchCenter/pages/advancedSearch.vue | 544 ++++++++++++++---- 1 file changed, 422 insertions(+), 122 deletions(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 8de49527b..4611f40a4 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -54,13 +54,15 @@ - - - {{ opt.label }} + + + @@ -83,41 +85,60 @@ - - + + - - + + - + + + - - + + + + - + + v-model="standForm.issueTime" + type="date" + placeholder="请选择标准发布日期" + value-format="yyyy-MM-dd"> @@ -125,115 +146,181 @@ - - - - + + + - + + v-model="standForm.ssrq" + type="date" + placeholder="请选择标准实施日期(标准文本)" + value-format="yyyy-MM-dd"> - + + v-model="standForm.xcxssrq" + type="date" + placeholder="请选择新车型实施日期(标准文本" + value-format="yyyy-MM-dd"> - + + v-model="standForm.zccssrq" + type="date" + placeholder="请选择在产车实施日期(标准文本)" + value-format="yyyy-MM-dd"> - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + @@ -245,40 +332,68 @@ - - + + + - + - - + + + - - + + + + - - + + @@ -939,9 +1054,13 @@ import "../../../assets/zTree/js/jquery.ztree.core.js"; import "../../../assets/zTree/js/jquery.ztree.excheck.js"; import "../../../assets/zTree/js/jquery.ztree.exedit.js"; -// import deptTree from '../../processCenter/pages/components/deptTree' +import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; + export default { name: "advancedSearch", + components: { + TreeSelectNew + }, data() { return { tableLoading: false, @@ -949,6 +1068,42 @@ export default { saveRoleBuss: [], bussRoleFlag: false, drawerModal: false, + modalShowFlag1: false, // drawer开关 + modalShowFlag2: false, // drawer开关 + modalShowFlag3: false, // drawer开关 + modalShowFlag4: false, // drawer开关 + url:'', + urlChild:'', + drawerTitle: '', //drawer标题 + showCheckBox: true, // 树形控件是否展示多选框 + defaultProps: { + children: 'children', + label: 'menuName' + }, + defaultCodeProps: { + children: 'children', + label: 'code' + }, + defaultModelProps: { + children: 'children', + label: 'model' + }, + type: '', + defaultUserProps: { + children: 'children', + label: 'name' + }, + key:1, + key1:2, + key2:3, + key3:4, + nodeKey: 'id', + defaultCheckedKeys: [], + nodeKeyCode: 'code', + nodeKeyModel: 'model', + defaultCheckedKeys1: [], + defaultCheckedKeys2: [], + defaultCheckedKeys3: [], drawerModalstyles: { height: "calc(100% - 55px)", overflow: "auto", @@ -975,11 +1130,7 @@ export default { selectIndex: "stand", nature: "", // 标准性质 country: "", // 国家 - standSort: "", // 标准类别 applyArctic: "", // 适用车型 - standNumber: "", // 标准编号 - standYear: "", // 标准年份 - standEnName: "", // 标准英文名称 standState: "", // 标准状态 replaceStandNum: "", // 代替标准号 replacedStandNum: "", // 被代替标准号 @@ -987,7 +1138,6 @@ export default { adoptExtent: "", // 采标程度 energyKind: "", // 能源种类 applyAuth: "", // 适用认证 - issueTime: "", // 发布日期 issueTimeSt: "", // 发布日期(开始) issueTimeEd: "", // 发布日期(结束) putTime: "", // 实施日期 @@ -1023,12 +1173,100 @@ export default { registerPutTime: "", // 注册登记车实施日期 itemsNum: "", // 条款号 itemsName: "", // 条款名称 - parts: "" // 关联零部件 + parts: "", // 关联零部件 + // 基础信息 + textStatus: '', // 文本状态 + standYear: '', // 标准年份 + standInData: '0', // 标准类型 + standSort: '', // 标准类别 + standNumber: '', // 标准编号 + standNature: '', // 标准性质 + standEnName: '', // 英文名称 + standName: '', // 中文名称 + signFlag: '1', // 是否需要会签 + issueTime: '', // 发布时间 + isRelateAccess: '', // 是否纳入认证清单 + standSystem: '',// 标准体系 + standSystemName: '',// 标准体系 + gxhbq: '', // 标签 + // 实施日期 + ssrq: '', // 实施日期(标准文本) + xcxssrq: '', // 新车型实施日期(标准文本) + zccssrq: '', // 在产车实施日期(标准文本) + ssrqgj: '', // 实施日期(国际) + xcxssrqgj: '', // 新车型实施日期(国际) + zccssrqgj: '', // 在产车实施日期(国际) + // 文本信息 + ca: '', // 草案 + fbgbjbd: '', // 发布稿 + xgd: '', // 修改单 + bpg: '', // 报批稿 + ssg: '', // 送审稿 + zqyjg: '', // 征求意见稿 + jdwj: '', // 解读文件 + zbjbd: '', // 增补件 + bfbdtbzh: '', // 增补件 + 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: '', // 参会记录 }, // 国家/地区 countryOptions: [], + standSystemOptions: [], // 标准体系 + busVppsOptions: [], // 车系体系架构 + busVppsChildOptions: [], // 车系体系架构子集合 + modelOptions: [], // 模块体系架构 + modelChildOptions: [], // 模块体系架构子集合 + cysdOptions: [], // 我司参与深度 + sycpxOptions: [], // 适用产品线 + zrbmOptions: [], // 责任部门 + zrgcsOptions: [], // 责任工程师 + txlbOptions: [], // 体系类别 // 标准类别 standSortOptions: [], + // 我司署名人 + wssmrOptions: [], + // 体系类别 + qcdwOption: [], + // 归口管理部门 + gkglbmOptions: [], + // 采标程度 + cbcdOptions: [], // 标准性质 standNatureOptions: [], // 标准、文件状态 @@ -1081,6 +1319,74 @@ export default { }; }, methods: { + choiceZRR1 (type, title, id) { + this.drawerTitle = title + this.modalShowFlag1 = true + this.key++ + }, + choiceZRR2 (type, title, id) { + this.drawerTitle = title + this.modalShowFlag2 = true + this.url = '' + this.urlChild = '' + this.url="sarVppsTree/list" + this.urlChild="sarVppsTree/childByList" + this.key1++ + }, + choiceZRR3 (type, title, id) { + this.drawerTitle = title + this.modalShowFlag3 = true + this.url = '' + this.urlChild = '' + this.url="sarVppsTree/list" + this.urlChild="sarVppsTree/childByList" + this.key2++ + }, + choiceZRR4 (type, title, id) { + this.drawerTitle = title + this.modalShowFlag4 = true + this.url = '' + this.urlChild = '' + this.url="sarModelTree/list" + this.urlChild="sarModelTree/childByList" + this.key3++ + }, + popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.standForm.dybxh = checkedData.map(item => item.model).join(",") + this.standForm.dymc = checkedData.map(item => item.name).join(",") + }else { + this.standForm.dybxh = checkedData.model + this.standForm.dymc = checkedData.name + } + } + this.modalShowFlag4 = false + }, + popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.standForm.kccvppsbm = checkedData.map(item => item.code).join(",") + this.standForm.kccvppscn = checkedData.map(item => item.chineseName).join(",") + }else { + this.standForm.kccvppsbm = checkedData.code + this.standForm.kccvppscn = checkedData.chineseName + } + } + this.modalShowFlag3 = false + }, + popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.standForm.cycvppsbm = checkedData.map(item => item.code).join(",") + this.standForm.cycvppscn = checkedData.map(item => item.chineseName).join(",") + }else { + this.standForm.cycvppsbm = checkedData.code + this.standForm.cycvppscn = checkedData.chineseName + } + } + this.modalShowFlag2 = false + }, // 关联零部件 getRelationParts() { this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this }, res => { @@ -1473,6 +1779,7 @@ export default { nowStandForm.putYear = this.$dateFormat(this.standForm.putYear, "yyyy"); } this.exportSearchInfo = nowStandForm; + nowStandForm['sarStandAttrEOStr'] = JSON.stringify(nowStandForm).replace(/"/g, "'") this.$http.post("search/searchCenter/searchSarBykey", nowStandForm, { _this: this, loading: "resultLoading" @@ -2038,9 +2345,6 @@ export default { window.open("/api/search/searchCenter/exportSearchCenterDatas?exportDatas=" + searchInfoEO + "&searchType=" + this.selectIndex); } }, - components: { - // deptTree - }, props: {}, computed: { // 条件按钮提示 @@ -2069,7 +2373,6 @@ export default { } }, mounted() { - this.getRelationParts(); // 查询检索历史 this.getSearchHistoty(); // 切换标签 @@ -2077,29 +2380,26 @@ export default { _this: this }, res => { // 设置高级搜索下拉框 - this.standNatureOptions = res.data.SARPROPERTY; // 标准性质 - // this.standNatureOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) + this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + this.standStateOptions = res.data.WBZTCLASS // 文本状态 + this.standSystemOptions = res.data.BZTXCLASS // 标准体系 + this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车型” + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.wssmrOptions = res.data.WSSMR // 我司署名人 + this.qcdwOption = res.data.QCDW // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 + this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 + this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 + this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.countryOptions = res.data.COUNTRY; - // this.countryOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) - // this.standSortOptions = res.data.STANDCLASSIFY - // this.standSortOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) - this.applyArcticOptions = res.data.PRODUCTTYPE; // 根据需求文档，产品类别对应标准属性中的“适用车型” - // this.applyArcticOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) - this.applyAuthOptions = res.data.PROVETYPE; // 适用认证下拉框 - // this.applyAuthOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) - this.categoryOptions = res.data.CATEGORY; - // this.categoryOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) - this.standStateOptions = res.data.STANDSTATE; - // this.standStateOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) this.adoptExtentOptions = res.data.DEGREESTANDARD; - // this.adoptExtentOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) this.energyKindOptions = res.data.ENERGYTYPES; - // this.energyKindOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) this.bussBigClassOptions = res.data.BUSSBIGCLASS; - // this.bussBigClassOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) this.bussStandClassOptions = res.data.BUSSSTANDCLASS; - // this.bussStandClassOptions.splice(0, 0, {'label': '全部', 'value': 'all'}) - // 区域前台新加----没测试噢噢噢噢哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦 this.regionOptions = res.data.REGION; // 区域 }, e => { }); @@ -2110,7 +2410,7 @@ export default { this.showBuyRole(); // 组织结构 this.getOrgTreeSource(); - this.selectBussRoleMsg(); + // this.selectBussRoleMsg(); // 滚动事件绑定 window.addEventListener("scroll", this.handleScrollHeader); // 检索中心特殊处理 From d56974c416b6edc7e94a4f5e74babf4c7d330f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 4 Aug 2021 18:00:55 +0800 Subject: [PATCH 445/528] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E4=BA=A4lod?= =?UTF-8?q?ing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 2 + .../pages/creatProcess/bzqdfb/step1.vue | 5 +- .../pages/creatProcess/bzqdfb/step2.vue | 2 + .../pages/creatProcess/bzqdfb/step3.vue | 2 + .../pages/creatProcess/bzqdfb/step4.vue | 2 + .../pages/creatProcess/xmpg/step1-1.vue | 3 +- .../pages/creatProcess/xmpg/step1.vue | 1 + .../pages/creatProcess/xmpg/step2.vue | 2 + .../pages/creatProcess/xmpg/step3.vue | 2 + .../pages/creatProcess/xmpg/step4.vue | 2 + .../pages/creatProcess/xmpg/step5.vue | 2 + .../pages/creatProcess/xmpg/step6.vue | 2 + .../pages/creatProcess/xmpg/step7.vue | 2 + .../pages/creatProcess/xmpg/test.vue | 595 ------------------ 14 files changed, 26 insertions(+), 598 deletions(-) delete mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/test.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index da6e5b796..0aaef349e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1057,6 +1057,7 @@ export default { if (valid) { this.$refs["Form"].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.get("lawss/activiti/startProcess", { type: "4" }, { _this: this }, res => { @@ -1072,6 +1073,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 1fad32ba3..574677866 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -208,7 +208,7 @@ + :color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">

    标准/政策法规工程师

    @@ -1024,11 +1024,11 @@ export default { this.$message.warning("标准不能为空"); } else { var json = Object.assign(this.listForm, this.roleForm); - console.log(json) this.$refs["qdfbForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.get("lawss/activiti/startProcess", { type: "4" }, { _this: this }, res => { @@ -1044,6 +1044,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 1b18f1766..f651fe48e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -390,6 +390,7 @@ export default { if (this.commentText === null || this.commentText === undefined || this.commentText === "") { this.$message.warning("请填写会签意见"); }else{ + this.isSubmit = true this.listForm.commentText = this.commentText; this.listForm.approvalOpinion = ""; this.listForm.signFlag = ""; @@ -405,6 +406,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 79adf88df..8c29d742e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -712,6 +712,7 @@ export default { //提交事件 handleSubmit() { const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -723,6 +724,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }); }, //标准表格选择框改变 diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index cfb326ed6..0d8cf9310 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -404,6 +404,7 @@ export default { if (this.commentText === null || this.commentText === undefined || this.commentText === "") { this.$message.warning("请填写审批意见"); } else { + this.isSubmit = true this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -417,6 +418,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 48849b845..2e84bd32f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -681,7 +681,7 @@ export default { this.$message.warning("请选择分发责任人"); } else { var json = Object.assign(this.listForm, this.roleForm); - console.log(json); + this.isSubmit = true this.$refs["listForm"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate((valid) => { @@ -701,6 +701,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index c75e17d9b..58f52cd16 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -678,6 +678,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 688712f47..696a2f8e8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -341,6 +341,7 @@ export default { }else{ this.listForm.commentText = this.commentText const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -352,6 +353,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index e3362d266..29c37d98e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -459,6 +459,7 @@ export default { this.listForm.approvalOpinion = ""; this.listForm.signFlag = ""; const json = JSON.stringify(this.listForm.breakdownList); + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -470,6 +471,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 1a4d60404..548f3e639 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -493,6 +493,7 @@ export default { this.listForm.signFlag = ""; this.listForm.dataList = this.dataList; const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -504,6 +505,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 4e92accc3..b350287cb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -480,6 +480,7 @@ export default { this.listForm.dataList = this.dataList this.listForm.fenFlag = '2' const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -491,6 +492,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index eeec0a723..e74199aa4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -455,6 +455,7 @@ export default { if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ this.$message.warning('请填写审批意见') } else { + this.isSubmit = true this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; @@ -475,6 +476,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index a1ef9dd2f..40b79891e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -463,6 +463,7 @@ export default { this.listForm.fenFlag = "1"; this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -474,6 +475,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/test.vue b/src/pages/processCenter/pages/creatProcess/xmpg/test.vue deleted file mode 100644 index daa015930..000000000 --- a/src/pages/processCenter/pages/creatProcess/xmpg/test.vue +++ /dev/null @@ -1,595 +0,0 @@ - - - - - - - From dbc0c82b220b1186345b592cbf719618ae3fc792 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 5 Aug 2021 09:11:42 +0800 Subject: [PATCH 446/528] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?-=E9=A1=B9=E7=9B=AE---=E6=A0=87=E5=87=86=E5=8F=B7=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E4=B9=B1=E7=A0=81=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 1 + .../pages/creatProcess/xmpg2/step1.vue | 1 + .../pages/creatProcess/xmpg2/step10.vue | 43 ++++++++++++++++++ .../pages/creatProcess/xmpg2/step11.vue | 43 ++++++++++++++++++ .../pages/creatProcess/xmpg2/step12.vue | 43 ++++++++++++++++++ .../pages/creatProcess/xmpg2/step3.vue | 45 ++++++++++++++++++- .../pages/creatProcess/xmpg2/step4.vue | 45 ++++++++++++++++++- .../pages/creatProcess/xmpg2/step5.vue | 45 ++++++++++++++++++- .../pages/creatProcess/xmpg2/step6.vue | 43 ++++++++++++++++++ .../pages/creatProcess/xmpg2/step7.vue | 43 ++++++++++++++++++ .../pages/creatProcess/xmpg2/step8.vue | 45 ++++++++++++++++++- .../pages/creatProcess/xmpg2/step9.vue | 43 ++++++++++++++++++ 12 files changed, 436 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 1fad32ba3..21f701beb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -936,6 +936,7 @@ export default { }; this.getStandData(); }, + //查询项目下的标准 getStandData() { this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { standType: this.standardSearch.standType, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 725892839..050aaba49 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -452,6 +452,7 @@ export default { _this: this }, res => { this.listForm.dataList = res.data.records; + this.dataList = res.data.records; let ids = []; this.dataList.forEach(item => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 5d7b5b78f..dc5411ced 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -63,6 +63,13 @@ fixed="left" align="center" > + { + this.standardData = res.data.list; + this.standardData.forEach(item => { + if(item.attrInfoMap === null){ + this.$set(item, "ZCCSSRQ", ''); + this.$set(item, "XCXSSRQ", ''); + }else{ + this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); + this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); + } + }) + this.totalNo = res.data.count; + }, e => { + }); + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index 08c35a775..d94aab4b9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -63,6 +63,13 @@ fixed="left" align="center" > + { + this.standardData = res.data.list; + this.standardData.forEach(item => { + if(item.attrInfoMap === null){ + this.$set(item, "ZCCSSRQ", ''); + this.$set(item, "XCXSSRQ", ''); + }else{ + this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); + this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); + } + }) + this.totalNo = res.data.count; + }, e => { + }); + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 775521076..246dab1e3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -63,6 +63,13 @@ fixed="left" align="center" > + { + this.standardData = res.data.list; + this.standardData.forEach(item => { + if(item.attrInfoMap === null){ + this.$set(item, "ZCCSSRQ", ''); + this.$set(item, "XCXSSRQ", ''); + }else{ + this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); + this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); + } + }) + this.totalNo = res.data.count; + }, e => { + }); + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index 13c6cd453..af4c565bd 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -67,8 +67,15 @@ + { }); }, + // 点击查看 + handlePreview(item) { + console.log(item) + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }, + //查询项目下的标准 + getStandData() { + this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { + standType: this.standardSearch.standType, + standNumber: this.standardSearch.standNumber, + page: this.pageNo, + pageSize: this.pageSizeNo + }, { + _this: this + }, res => { + this.standardData = res.data.list; + this.standardData.forEach(item => { + if(item.attrInfoMap === null){ + this.$set(item, "ZCCSSRQ", ''); + this.$set(item, "XCXSSRQ", ''); + }else{ + this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); + this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); + } + }) + this.totalNo = res.data.count; + }, e => { + }); + }, //tab改变 handleTabs(type) { this.active = type; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index 95cf42fe0..808d861a7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -64,8 +64,15 @@ + { + this.standardData = res.data.list; + this.standardData.forEach(item => { + if(item.attrInfoMap === null){ + this.$set(item, "ZCCSSRQ", ''); + this.$set(item, "XCXSSRQ", ''); + }else{ + this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); + this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); + } + }) + this.totalNo = res.data.count; + }, e => { + }); + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index c920a368e..f192017ae 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -65,8 +65,15 @@ + { + this.standardData = res.data.list; + this.standardData.forEach(item => { + if(item.attrInfoMap === null){ + this.$set(item, "ZCCSSRQ", ''); + this.$set(item, "XCXSSRQ", ''); + }else{ + this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); + this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); + } + }) + this.totalNo = res.data.count; + }, e => { + }); + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 571089bfc..7b034e7d7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -64,6 +64,13 @@ fixed="left" align="center" > + { + this.standardData = res.data.list; + this.standardData.forEach(item => { + if(item.attrInfoMap === null){ + this.$set(item, "ZCCSSRQ", ''); + this.$set(item, "XCXSSRQ", ''); + }else{ + this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); + this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); + } + }) + this.totalNo = res.data.count; + }, e => { + }); + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index 6e2987607..be6930e03 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -63,6 +63,13 @@ fixed="left" align="center" > + { + this.standardData = res.data.list; + this.standardData.forEach(item => { + if(item.attrInfoMap === null){ + this.$set(item, "ZCCSSRQ", ''); + this.$set(item, "XCXSSRQ", ''); + }else{ + this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); + this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); + } + }) + this.totalNo = res.data.count; + }, e => { + }); + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index 76691bd6c..58a19121c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -58,11 +58,18 @@ + { + this.standardData = res.data.list; + this.standardData.forEach(item => { + if(item.attrInfoMap === null){ + this.$set(item, "ZCCSSRQ", ''); + this.$set(item, "XCXSSRQ", ''); + }else{ + this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); + this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); + } + }) + this.totalNo = res.data.count; + }, e => { + }); + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index 97e7b0ffa..358573f9d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -63,6 +63,13 @@ fixed="left" align="center" > + { + this.standardData = res.data.list; + this.standardData.forEach(item => { + if(item.attrInfoMap === null){ + this.$set(item, "ZCCSSRQ", ''); + this.$set(item, "XCXSSRQ", ''); + }else{ + this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); + this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); + } + }) + this.totalNo = res.data.count; + }, e => { + }); + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, From b2498c485dd24557eaac2739c233c7906134de0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 5 Aug 2021 09:15:16 +0800 Subject: [PATCH 447/528] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sysConfig/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 3ea4b4abd..d2960cf5d 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,7 +6,7 @@ // 服务器地址 // const devIp = '10.96.10.171' // const devInterfacePORT = '9999' -const devIp = '127.0.0.1' +const devIp = '10.96.170.156' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' From 1ac7563d7098cc83188c7b34e94040ccc73b5d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 5 Aug 2021 11:20:02 +0800 Subject: [PATCH 448/528] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-4.vue | 537 ++++++++++++++++ .../pages/creatProcess/xmpg/step1-2.vue | 456 ++++++++++++++ .../pages/creatProcess/xmpg/step1-4.vue | 13 - .../pages/creatProcess/xmpg/step1-7.vue | 581 ++++++++++++++++++ .../pages/creatProcess/xmpg2/step1-12.vue | 532 ++++++++++++++++ .../{xmpg/step1-3.vue => xmpg2/step1-2.vue} | 2 +- .../pages/creatProcess/xmpg2/step1.vue | 26 +- .../pages/creatProcess/xmpg2/step2.vue | 10 +- .../pages/creatProcess/xmpg2/step3.vue | 2 + .../pages/creatProcess/xmpg2/step4.vue | 80 ++- .../pages/processDetail/index.vue | 10 +- .../pages/details.vue | 1 + src/router/index.js | 39 +- 13 files changed, 2225 insertions(+), 64 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue delete mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue rename src/pages/processCenter/pages/creatProcess/{xmpg/step1-3.vue => xmpg2/step1-2.vue} (80%) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue new file mode 100644 index 000000000..358b5f851 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue @@ -0,0 +1,537 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue new file mode 100644 index 000000000..18a0232bd --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue @@ -0,0 +1,456 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue deleted file mode 100644 index 8366e5eb4..000000000 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue new file mode 100644 index 000000000..1984c73f1 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue @@ -0,0 +1,581 @@ + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue new file mode 100644 index 000000000..90f130c65 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue @@ -0,0 +1,532 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue similarity index 80% rename from src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue rename to src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue index 4caae637d..83bf7cf4c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue @@ -4,7 +4,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 050aaba49..30d04e355 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -382,6 +382,7 @@ export default { projectModel: false, //项目抽屉开关 projectId: "", //项目id 用来查询标准 standId: [], //标准id 用来条款 + zrbmOptions: [], searching: false, //项目检索条件 projectSearch: { @@ -452,8 +453,21 @@ export default { _this: this }, res => { this.listForm.dataList = res.data.records; - this.dataList = res.data.records; + this.listForm.dataList.forEach(item => { + // 责任部门转换 + if (item.zrbm !== null || item.zrbm !== "") { + let k = (item.zrbm || "").split(',') + for (let i in this.zrbmOptions) { + for (let m = 0; m< k.length; m++) { + if (this.zrbmOptions[i].value === k[m]) { + k[m] = this.zrbmOptions[i].label + } + item.zrbm = k.join(',') + } + } + } + }) let ids = []; this.dataList.forEach(item => { ids.push(item.standId); @@ -518,6 +532,7 @@ export default { if (valid) { this.$refs['roleForm'].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.get("lawss/activiti/startProcess", { type: "6" }, { _this: this }, res => { @@ -533,6 +548,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); @@ -567,6 +583,14 @@ export default { }, mounted() { this.getProjectData(); + // 查询各下拉框数据 + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this, + loading: 'loading' + }, res => { + this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 + }, e => { + }) } }; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue index 6bdf02a5e..f05bd4925 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue @@ -80,22 +80,22 @@ { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index af4c565bd..8a522f912 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -336,6 +336,7 @@ export default { if (this.listForm.jgUser == null || this.listForm.jgUser == undefined ) { this.$message.warning("请选择架构经理"); } else { + this.isSubmit = true this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -349,6 +350,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index 808d861a7..dbd1b065f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -44,7 +44,7 @@
    - 批量分发负责人 + 批量分发责任人
    - + @@ -227,6 +226,8 @@ export default { modalshowflag: false, // drawer开关 selectList: [], treeData: [], // 人员数据 + zrIndex: '', + zrType: '', roleForm: { liablePeople: "" }, @@ -254,7 +255,6 @@ export default { methods: { // 点击查看 handlePreview(item) { - console.log(item) let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { @@ -329,7 +329,7 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.dataList = item.dataList; - this.dataList.distributePerson = item.dataList[0].distributePerson; + // this.dataList.distributePerson = item.dataList[0].distributePerson; this.listForm.breakdownList = item.breakdownList; }); }, @@ -366,14 +366,25 @@ export default { this.$message.warning('请选择分发负责人') } }, - //批量操作按钮 - batchOperation(id) { - if (this.selectList.length === 0) { - this.$message.warning("请至少选择一条数据进行批量分发"); - } else { - this.nodeList = []; - this.nodeList.push(id); - this.modalshowflag = true; + choiceZRRS (row, type, index) { + this.type = type + if (type === 1) { + this.drawerTitle = '选择责任人' + this.nodeList = [] + this.zrIndex = index + this.zrType = type + this.nodeList.push(row) + this.modalshowflag = true + } else if (type === 2) { + // 批量 + if (this.selectList.length > 0) { + this.zrType = type + this.nodeList = [] + this.modalshowflag = true + this.drawerTitle = '批量选择责任人' + } else { + this.$message.warning('请选择要分发的数据') + } } }, //标准表格选择框改变 @@ -394,22 +405,23 @@ export default { this.roleRow = this.$refs.tree.getCheckedNodes()[0]; } }, - checkedRole(data) { - // 选取负责人时的操作 - let mis = []; - this.selectList.forEach(item => { - item.liablePeople = data[0].name; - item.liablePeopleId = data[0].id; - mis.push(item.standId); - }); - this.dataList.forEach(item => { - if (!mis.includes(item.standId)) { - this.selectList.push(item); - } - }); - this.dataList = this.selectList; - this.$refs.selection.clearSelection(); - this.modalshowflag = false; + checkedRole (data) { + let roleId = data[0].id + let roleName = data[0].name + if (this.type === 1) { + this.dataList[this.zrIndex].liablePeopleId = roleId + this.dataList[this.zrIndex].liablePeople = roleName + } else if(this.type === 2) { + this.dataList.forEach( item => { + this.selectList.forEach( items => { + if (item.standId === items.standId) { + item.liablePeopleId = roleId + item.liablePeople = roleName + } + }) + }) + } + this.modalshowflag = false }, cancleUserInfo() { this.modalshowflag = false; diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 120de5f7b..a5b265b96 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -203,20 +203,20 @@ export default { this.toProcessDetail('bzrkStep5',row) }else if(prcType === '4'){ //标准清单发布流程数据 - this.toProcessDetail('bzqdfbStep4',row) + this.toProcessDetail('bzqdfbStep1-4',row) }else if (prcType === '5'){ //标准项目合规评估 标准维度 if(row.taskInfo === '标准法规部领导审核'){ - this.toProcessDetail('xmpgStep7',row) + this.toProcessDetail('xmpgStep1-7',row) }else{ - this.toProcessDetail('xmpgStep2',row) + this.toProcessDetail('xmpgStep1-2',row) } }else if(prcType === '6'){ //标准项目合规评估 项目维度 if(row.taskInfo === '标准法规部领导审核'){ - this.toProcessDetail('xmpg2Step12',row) + this.toProcessDetail('xmpg2Step1-12',row) }else{ - this.toProcessDetail('xmpg2Step2',row) + this.toProcessDetail('xmpg2Step1-2',row) } } } else { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index c6b031fc6..bc11e32d1 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -676,6 +676,7 @@ export default { _this: this, loading: 'loading' }, res => { + console.log(res.data) this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.setMap(this.zrbmMap,res.data.ZRBMCLASS) this.setMap(this.textStatusMap,res.data.WBZTCLASS) diff --git a/src/router/index.js b/src/router/index.js index abb7f7bf3..40040f9a2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -294,6 +294,15 @@ const routes = [ title: '标准清单发布/更新流程' } }, + { + path: '/bzqdfbStep1-4', + name: 'bzqdfbStep1-4', + component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue'), + meta: { + requireAuth: true, + title: '标准清单发布/更新流程' + } + }, { path: '/xmpgStep1', name: 'xmpgStep1', @@ -314,18 +323,18 @@ const routes = [ } }, { - path: '/xmpgStep1-3', - name: 'xmpgStep1-3', - component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue'), + path: '/xmpgStep1-2', + name: 'xmpgStep1-2', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue'), meta: { requireAuth: true, title: '项目合规评估流程' } }, { - path: '/xmpgStep1-4', - name: 'xmpgStep1-4', - component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue'), + path: '/xmpgStep1-7', + name: 'xmpgStep1-7', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue'), meta: { requireAuth: true, title: '项目合规评估流程' @@ -403,6 +412,24 @@ const routes = [ title: '项目合规评估流程-项目' } }, + { + path: '/xmpg2Step1-2', + name: 'xmpg2Step1-2', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step1-12', + name: 'xmpg2Step1-12', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, { path: '/xmpg2Step2', name: 'xmpg2Step2', From a341b2b20ebccdbb597afeeeeb43bcbac0882215 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 5 Aug 2021 11:26:42 +0800 Subject: [PATCH 449/528] commit --- .../pages/creatProcess/bzdy/step1.vue | 16 +++++++++- .../pages/creatProcess/bzjd/step3.vue | 29 +++++++++---------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 4bed4251c..dab32ce04 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -169,6 +169,7 @@ >
    @@ -184,6 +186,7 @@

    点击或拖拽上传文件

     +
    @@ -198,6 +201,8 @@ export default { name: "bzdyStep1", data() { return { + progressType: false, + loadProgress: 0, commentText: '', nodeList: [], nodeList2: [], @@ -310,6 +315,10 @@ export default { this.drawerTitle = title this.modalshowflag = true }, + progressFile (event, file, fileList) { + let loadProgress = Math.floor(event.percent) + this.loadProgress = loadProgress + }, // 导入按钮 上传之前的钩子 beginImportFile (file) { var filename = file.name @@ -318,11 +327,13 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 + this.progressType = true if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + this.progressType = false return false } // 判断文件上传大小 @@ -331,6 +342,7 @@ export default { return true } else { this.$message.error('文件' + file.name + '大小不超过200M') + this.progressType = false return false } return true @@ -339,6 +351,8 @@ export default { importFileSuccess (response, file) { if (response.ok) { this.fileMadel = false + this.loadProgress = 0 + this.progressType = false this.form.model = response.data.id this.form.modelName = response.data.name this.$message({ @@ -412,7 +426,7 @@ export default { }) } }, - mounted () {} + mounted () {}, } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index ffb1fd8fe..162232581 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -102,12 +102,12 @@ width="100" align="center">     - - + + + + + + { item.unitDeptName = this.$store.getters.userInfo.orgName - item.onlineData = '' - item.newData = '' - item.complianceState = '' - item.oldNumber = '' - item.complianceRequir = '1' - item.changePoint = '' - item.technicalRequir = '' + item.onlineData = item.onlineData || '' + item.newData = item.newData || '' + item.complianceState = item.complianceState || '' + item.oldNumber = item.oldNumber || '' + item.complianceRequir = item.complianceRequir || '1' + item.changePoint = item.changePoint || '' + item.technicalRequir = item.technicalRequir || '' item.itemsTitle = item.itermsConditions }) - console.log(2); this.itemList = itemList + console.log(this.itemList) this.loading = false }).catch(e => { }) From bd4daea81bce111d345b244db015bbdd467efbb7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 5 Aug 2021 13:52:56 +0800 Subject: [PATCH 450/528] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E9=99=A4?= =?UTF-8?q?=E4=BA=86=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9=EF=BC=8C=EF=BC=8C?= =?UTF-8?q?=E5=90=8E=E7=BB=AD=E6=89=80=E6=9C=89=E8=8A=82=E7=82=B9=EF=BC=8C?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=99=84=E4=BB=B6=E6=8A=A5=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=88=E6=9C=AC=E5=9C=B0=EF=BC=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index dd5c530aa..f92ea5f99 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -862,8 +862,13 @@ }, methods: { downloadFile (fileType) { + //文件id中出现了','字符,去除掉 if(fileType === 'fbgbjbd'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + if(this.fbgbjbdFileId.search(',')){ + this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); + console.log(this.fbgbjbdFileId); + } + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId }else if(fileType === 'bpg'){ @@ -964,6 +969,7 @@ this.caFileId = processForm.ca this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) + console.log(processForm); } }).catch(e => { }) From bb287587cd854612095c084d73041f6692182bb5 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 5 Aug 2021 13:57:26 +0800 Subject: [PATCH 451/528] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E9=99=A4?= =?UTF-8?q?=E4=BA=86=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9=EF=BC=8C=EF=BC=8C?= =?UTF-8?q?=E5=90=8E=E7=BB=AD=E6=89=80=E6=9C=89=E8=8A=82=E7=82=B9=EF=BC=8C?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=99=84=E4=BB=B6=E6=8A=A5=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=88=E6=9C=AC=E5=9C=B0=EF=BC=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 4 ++++ src/pages/processCenter/pages/creatProcess/bzrk/step5.vue | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index e0b897644..26187ebbd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -836,6 +836,10 @@ export default { methods: { downloadFile (fileType) { if(fileType === 'fbgbjbd'){ + if(this.fbgbjbdFileId.search(',')){ + this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); + console.log(this.fbgbjbdFileId); + } window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 2d414fb44..840e35e6e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -815,6 +815,10 @@ methods: { downloadFile (fileType) { if(fileType === 'fbgbjbd'){ + if(this.fbgbjbdFileId.search(',')){ + this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); + console.log(this.fbgbjbdFileId); + } window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId From 959725449d116407c6b4df6d6f3988a54cb13325 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 5 Aug 2021 14:15:14 +0800 Subject: [PATCH 452/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81--=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=A0=B9=E6=8D=AE=E7=AB=A0=E8=8A=82=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E8=BF=9B=E8=A1=8C=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardForComments/pags/consultationDetails.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 2af3b6084..4a37819e5 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -43,6 +43,7 @@ From 2d441e65ab69bdcd993f558bebc868c06199f3e5 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 5 Aug 2021 14:24:05 +0800 Subject: [PATCH 453/528] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=BA=94=E8=AF=A5=E8=B7=9F=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=BA=93=E4=B8=80=E8=87=B4=EF=BC=8C=E5=8F=AF=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=B8=8A=E4=BC=A0=E5=A4=9A=E4=B8=AA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzdy/step1.vue | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index dab32ce04..45ccf0b85 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -45,18 +45,23 @@ v-model="form.modelName" clearable > -
    - {{ form.modelName }} -
    -
    - - 点击上传 + + + + + + + + + + + + + + + {{isFileUploadStr}} -
    + @@ -179,7 +184,7 @@ :before-upload="beginImportFile" :on-success="importFileSuccess" :on-progress="progressFile" - :show-file-list="false" + :show-file-list="true" >
    @@ -201,6 +206,7 @@ export default { name: "bzdyStep1", data() { return { + isFileUploadStr:'点击上传', progressType: false, loadProgress: 0, commentText: '', @@ -350,7 +356,8 @@ export default { // 导入标准数据成功后执行 importFileSuccess (response, file) { if (response.ok) { - this.fileMadel = false + this.isFileUploadStr='点击查看已上传文件'; + this.fileMadel = true; this.loadProgress = 0 this.progressType = false this.form.model = response.data.id From 07e9255e5f4699ec7e38235db32c3b69ac645400 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 5 Aug 2021 14:47:13 +0800 Subject: [PATCH 454/528] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=88=E7=BB=8F?= =?UTF-8?q?=E7=90=86=E4=BA=BA=E5=AE=A1=E6=89=B9=EF=BC=89=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=80=9A=E8=BF=87=EF=BC=8C=E5=BA=94=E4=B8=8D=E5=BF=85=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=84=8F=E8=A7=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index f92ea5f99..bdbc16be0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -890,11 +890,12 @@ } }, getRule(){ + if (this.formTongGuo.approvalOpinion === '0') { - this.rules.commentText.required = false + this.rules.commentText[0].required = false; this.$refs.formTongGuo.clearValidate('commentText') - } else { - this.rules.commentText.required = true + }else { + this.rules.commentText[0].required = true; } }, popoverHide (checkedIds, checkedData) { From 2cc5ca1632a62adacbb0ead1866a20156b0f2646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 5 Aug 2021 14:53:15 +0800 Subject: [PATCH 455/528] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=E5=B7=B2=E7=BB=B4=E6=8A=A4=E6=9C=AA=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E5=88=87=E6=8D=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step4.vue | 10 +- .../localProductsOrProjectLibrary/index.vue | 1583 +++++++++-------- .../pages/details.vue | 9 +- 3 files changed, 822 insertions(+), 780 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index dbd1b065f..b97ace1ac 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -406,17 +406,15 @@ export default { } }, checkedRole (data) { - let roleId = data[0].id - let roleName = data[0].name if (this.type === 1) { - this.dataList[this.zrIndex].liablePeopleId = roleId - this.dataList[this.zrIndex].liablePeople = roleName + this.dataList[this.zrIndex].liablePeopleId = data[0].id + this.dataList[this.zrIndex].liablePeople = data[0].name } else if(this.type === 2) { this.dataList.forEach( item => { this.selectList.forEach( items => { if (item.standId === items.standId) { - item.liablePeopleId = roleId - item.liablePeople = roleName + item.liablePeopleId = data[0].id + item.liablePeople = data[0].name } }) }) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 1b966f002..601dc8728 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -3,21 +3,22 @@
    - + @@ -30,7 +31,8 @@ :value="opt.label" :key="opt.value" :label="opt.label" - >{{ opt.label}} + >{{ opt.label }} + @@ -49,14 +51,16 @@ class="common-button-primary" size="small" v-btn-permission="'d1b1bffb39a67dea0d452a8ba4e3ae35'" - @click="getLocalProductTableBtn">查询 + @click="getLocalProductTableBtn">查询 + 清空 + @click="clearAllSearch">清空 + 高级查询 + >高级查询 +
    @@ -79,110 +84,110 @@
    + @selection-change="handleSelectionChange"> + type="selection" + width="55" + align="center"> + show-overflow-tooltip + prop="projectPlatfor" + align="center" + label="产品平台"> + prop="projectNumber" + align="center" + width="90" + label="项目编号"> + show-overflow-tooltip + prop="projectName" + align="center" + label="项目名称"> - + - + + show-overflow-tooltip + prop="currentNode" + align="center" + label="当前节点"> - + prop="projectLevel" + align="center" + label="项目级别"> + + show-overflow-tooltip + prop="projectManager" + align="center" + label="项目经理"> - + .dem diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 29c37d98e..49726090c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -126,6 +126,21 @@ +
    + + +
    + + +
    +     +     +
    - - - - - - - - - - - - - - - +
    + + +
    + + +
    +     +     +
    @@ -611,10 +611,4 @@ export default { } } - .demo-drawer-content { - margin-top: 10px; - } -} - - - + .demo-draw diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index b350287cb..684e338b6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -447,9 +447,6 @@ export default { }, //驳回事件 beforeBack () { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - } else { this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.commentText = this.commentText; this.listForm.dataList = this.dataList @@ -468,17 +465,13 @@ export default { } }, e => { }); - } }, //提交事件 handleSubmit() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - }else { this.listForm.applyUpdUserId = this.dataList[0].distributePersonId - this.listForm.commentText = this.commentText; this.listForm.dataList = this.dataList this.listForm.fenFlag = '2' + this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { @@ -495,7 +488,7 @@ export default { this.isSubmit = false }, e => { }); - } + }, //标准表格选择框改变 selectStandChange(data) { @@ -598,10 +591,4 @@ export default { } } - .demo-drawer-content { - margin-top: 10px; - } -} - - - + .demo- diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index e74199aa4..95cf31713 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -452,9 +452,6 @@ export default { }, //提交事件 handleSubmit() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - } else { this.isSubmit = true this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; @@ -480,7 +477,7 @@ export default { }, e => { }); - } + }, //标准表格选择框改变 selectStandChange(data) { @@ -583,10 +580,4 @@ export default { } } - .demo-drawer-content { - margin-top: 10px; - } -} - - - + .demo- diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 40b79891e..3f5518210 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -451,9 +451,6 @@ export default { }, //提交事件 handleSubmit() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - } else { this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; @@ -479,7 +476,6 @@ export default { }, e => { }); - } }, //标准表格选择框改变 selectStandChange(data) { From 18aed9b6926befe75c9b9113d820b7f811dfcefb Mon Sep 17 00:00:00 2001 From: song2048 <2639528268@qq.com> Date: Thu, 5 Aug 2021 16:27:21 +0800 Subject: [PATCH 459/528] no message --- src/sysConfig/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index d2960cf5d..18d7b7c7a 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,7 +6,7 @@ // 服务器地址 // const devIp = '10.96.10.171' // const devInterfacePORT = '9999' -const devIp = '10.96.170.156' +const devIp = '192.168.0.104' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' From 526bc169e036aa02543f56392433b3346e55078e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 5 Aug 2021 16:49:31 +0800 Subject: [PATCH 460/528] =?UTF-8?q?feat:=20=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=20es=20=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchCenter/pages/advancedSearch.vue | 272 +++++++----------- 1 file changed, 99 insertions(+), 173 deletions(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 4611f40a4..ffcef1be5 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -27,10 +27,8 @@ {{ $t("m.clearQuery") }}
    - {{ $t("m.export") }} - + +
    @@ -932,65 +930,41 @@ align="center" :label="$t('m.action')" width="200"> - +
    @@ -1315,10 +1289,29 @@ export default { dropdownItemsCollect: [{ "val": "取消收藏" }, { "val": "分享" }, { "val": "流程" }], judgeRoleFlag: false, judgeRoleMessage: "", - exportSearchInfo: {} + exportSearchInfo: {}, + twoOptions: [], + formFieldListStandData: [] }; }, methods: { + getAddFormFieldList (isEdit) { + this.$http.get('lawss/sarStandAttrDetails/list', {}, { + _this: this + }, + res => { + if (res.ok) { + const { data = {} } = res + // 国内外标准 + const inlandList = data['INLAND_STAND'] || [] + const foreignList = data['FOREIGN_STAND'] || [] + const foreignFilterList = foreignList.filter ( item => item.attrField === 'GXHBQ' || item.attrField === 'ZBJBD' || item.attrField === 'KWJ' || item.attrField === 'TXLB'); + console.log(foreignFilterList) + this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList); + console.log(this.formFieldListStandData,'-----------------------------------1') + } + }, e => {}) + }, choiceZRR1 (type, title, id) { this.drawerTitle = title this.modalShowFlag1 = true @@ -1497,22 +1490,22 @@ export default { } } }, // 点击收藏/取消收藏事件 - handleCommand(command) { - switch (command.command) { - case "d": - this.judgeRolePermiOnSar(command.item, 2); // 收藏 - break; - case "a": - this.judgeRolePermiOnSar(command.item, 3); // 取消收藏 - break; - case "b": - this.judgeRolePermiOnSar(command.item, 4); // 分享 - break; - case "c": - this.judgeRolePermiOnSar(command.item, 6); // 流程 - break; - } - }, // 下拉菜单点击事件 + handleCommand (command) { + switch (command.command) { + case 'd': + this.judgeRolePermiOnSar(command.item, 2) // 收藏 + break + case 'a': + this.judgeRolePermiOnSar(command.item, 3) // 取消收藏 + break + case 'b': + this.judgeRolePermiOnSar(command.item, 4) // 分享 + break + case 'l': + this.judgeRolePermiOnSar(command.item, 1) // 查看 + break + } + }, // 下拉菜单点击事件 beforeHandleCommand(command, item) { return { "item": item, @@ -1658,37 +1651,19 @@ export default { pagetype = "BUSINESS_STAND"; } } - this.$http.get("lawss/sarMenu/judgeSarMenuByRole", { - sarId: item.id, - sarType: pagetype - }, { - _this: this - }, res => { - if (res.ok) { - this.judgeRoleFlag = true; - if (type === 1) { + if (type === 1) { this.detailsStandardLaws(item); - } else if (type === 2) { + } else if (type === 2) { this.collectStandard(item); - } else if (type === 3) { + } else if (type === 3) { this.cancelCollectStandard(item); - } else if (type === 4) { + } else if (type === 4) { this.shareSarInfo(item); - } else if (type === 5) { + } else if (type === 5) { this.showRecommendDetials(item); - } else if (type === 6) { + } else if (type === 6) { this.goProcess(item); - } - } else { - this.judgeRoleFlag = false; - this.$message({ - message: res.message, - type: "error" - }); } - }, e => { - this.judgeRoleFlag = false; - }); } }, showDetailsByRole(item) { @@ -1722,64 +1697,20 @@ export default { this.standForm.page = this.page; this.standForm.pageSize = this.$store.getters.userInfo.configContent; let nowStandForm = JSON.parse(JSON.stringify(this.standForm)); - if (this.standForm.issueTime != null && this.standForm.issueTime !== "") { - nowStandForm.issueTime = this.$dateFormat(this.standForm.issueTime, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.issueTimeSt != null && this.standForm.issueTimeSt !== "") { - nowStandForm.issueTimeSt = this.$dateFormat(this.standForm.issueTimeSt, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.issueTimeEd != null && this.standForm.issueTimeEd !== "") { - nowStandForm.issueTimeEd = this.$dateFormat(this.standForm.issueTimeEd, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.putTime != null && this.standForm.putTime !== "") { - nowStandForm.putTime = this.$dateFormat(this.standForm.putTime, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.putTimeSt != null && this.standForm.putTimeSt !== "") { - nowStandForm.putTimeSt = this.$dateFormat(this.standForm.putTimeSt, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.putTimeEd != null && this.standForm.putTimeEd !== "") { - nowStandForm.putTimeEd = this.$dateFormat(this.standForm.putTimeEd, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.newproductPutTime != null && this.standForm.newproductPutTime !== "") { - nowStandForm.newproductPutTime = this.$dateFormat(this.standForm.newproductPutTime, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.registerPutTime != null && this.standForm.registerPutTime !== "") { - nowStandForm.registerPutTime = this.$dateFormat(this.standForm.registerPutTime, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.productPutTime != null && this.standForm.productPutTime !== "") { - nowStandForm.productPutTime = this.$dateFormat(this.standForm.productPutTime, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.productPutTimeSt != null && this.standForm.productPutTimeSt !== "") { - nowStandForm.productPutTimeSt = this.$dateFormat(this.standForm.productPutTimeSt, "yyyy-MM-dd hh:mm:ss"); - } else { - nowStandForm.productPutTimeSt = ""; - } - if (this.standForm.productPutTimeEd != null && this.standForm.productPutTimeEd !== "") { - nowStandForm.productPutTimeEd = this.$dateFormat(this.standForm.productPutTimeEd, "yyyy-MM-dd hh:mm:ss"); - } else { - nowStandForm.productPutTimeEd = ""; - } - if (this.standForm.newcarPutTime != null && this.standForm.newcarPutTime !== "") { - nowStandForm.newcarPutTime = this.$dateFormat(this.standForm.newcarPutTime, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.newcarPutTimeSt != null && this.standForm.newcarPutTimeSt !== "") { - nowStandForm.newcarPutTimeSt = this.$dateFormat(this.standForm.newcarPutTimeSt, "yyyy-MM-dd hh:mm:ss"); - } else { - nowStandForm.newcarPutTimeSt = ""; - } - if (this.standForm.newcarPutTimeEd != null && this.standForm.newcarPutTimeEd !== "") { - nowStandForm.newcarPutTimeEd = this.$dateFormat(this.standForm.newcarPutTimeEd, "yyyy-MM-dd hh:mm:ss"); - } else { - nowStandForm.newcarPutTimeEd = ""; - } - if (this.standForm.firstPutTime != null && this.standForm.firstPutTime !== "") { - nowStandForm.firstPutTime = this.$dateFormat(this.standForm.firstPutTime, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.putYear != null && this.standForm.putYear !== "") { - nowStandForm.putYear = this.$dateFormat(this.standForm.putYear, "yyyy"); - } + // 处理动态表单的时间和下拉框格式 + const formFieldList = this.formFieldListStandData + const sarStandAttrObj = {} + formFieldList.forEach((item) => { + const attrField = item.attrField.toLowerCase(); + const value = nowStandForm[attrField] + // 时间格式处理 + if (item.attrType === 'DATE_PICKER' && value) { + nowStandForm[item.attrField] = this.standForm[attrField] + } + sarStandAttrObj[item.attrField] = nowStandForm[attrField] + }) + nowStandForm['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") this.exportSearchInfo = nowStandForm; - nowStandForm['sarStandAttrEOStr'] = JSON.stringify(nowStandForm).replace(/"/g, "'") this.$http.post("search/searchCenter/searchSarBykey", nowStandForm, { _this: this, loading: "resultLoading" @@ -1920,20 +1851,13 @@ export default { let routername = ""; let pagetype = ""; if (item.type === "stand") { - if (this.$hasPermission("CFEZ3VP7EA95CTRBH3JB") || this.$hasPermission("R5DNG6EZC66CNFC4RHPH")) { - if (item.stand_type === "INLAND") { - routername = "OtherStandardDetails"; - pagetype = "INLAND_STAND"; + if (item.standType === "INLAND") { + routername = "OtherStandardDetails"; + pagetype = "INLAND_STAND"; } else { - routername = "OtherForeignDetails"; - pagetype = "FOREIGN_STAND"; + routername = "OtherForeignDetails"; + pagetype = "FOREIGN_STAND"; } - } else { - this.$message({ - message: "无权访问", - type: "warning" - }); - } } else if (item.type === "laws") { if (this.$hasPermission("9P2UTSAHZ3AHKDGAEY6V")) { routername = "OtherLawsDetails"; @@ -2349,6 +2273,7 @@ export default { computed: { // 条件按钮提示 toggleConditionTips() { + this.standForm.selectValue = '' return this.kindtext ? "收起条件" : "展开条件"; } }, @@ -2408,6 +2333,7 @@ export default { // 加载表格 this.searchSarBykey(); this.showBuyRole(); + this.getAddFormFieldList(); // 组织结构 this.getOrgTreeSource(); // this.selectBussRoleMsg(); From a2af7ad00729df73e1d8f377575e0b9a1475c9f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 5 Aug 2021 16:56:29 +0800 Subject: [PATCH 461/528] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step1-1.vue | 11 ++++++----- .../processCenter/pages/creatProcess/xmpg2/step1.vue | 2 +- .../processCenter/pages/creatProcess/xmpg2/step12.vue | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index db6b832e9..19a55d780 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -87,22 +87,22 @@ { - console.log(res.mes); let mes = JSON.parse(res.mes); this.listForm = mes.form; this.dataList = mes.form.dataList; @@ -547,6 +546,7 @@ export default { if (valid) { this.$refs['roleForm'].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.get("lawss/activiti/startProcess", { type: "6" }, { _this: this }, res => { @@ -562,6 +562,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 2539b5689..1f8280f2b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -526,7 +526,7 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "6"); _formData.append("json", JSON.stringify({ - form: this.form, + form: this.listForm, roleForm: this.roleForm, commentText: this.commentText })); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 7daf927fe..f2e01646f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -2,7 +2,7 @@
    - +
    基础信息
    From 050a3a30a592d0efc2acad914727cc157b793002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 5 Aug 2021 17:22:06 +0800 Subject: [PATCH 462/528] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/searchCenter/pages/standardSearch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 04ef5ace5..b4d0b82af 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -212,7 +212,7 @@ export default { //查询选项 queryOptions() { let _this = this; - this.$http.post("search/searchCenter/getMenu", {}, { + this.$http.post("search/getMenu", {}, { _this: this }, res => { _this.searchData = [ From 2e3232ade284d01078e955f7718bd2fe8ce9f57f Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 5 Aug 2021 17:31:47 +0800 Subject: [PATCH 463/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=82=B9=E5=87=BB=E5=8F=AF=E8=BF=9B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=EF=BC=8C=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/components/ProcessFooter.vue | 7 +++- .../pages/creatProcess/wfhxzg/step1.vue | 15 +++---- .../pages/creatProcess/wfhxzg/step2.vue | 4 +- .../pages/creatProcess/wfhxzg/step3.vue | 4 +- .../pages/creatProcess/wfhxzg/step4.vue | 39 +++++++++++-------- .../pages/creatProcess/wfhxzg/step5.vue | 10 +++-- .../pages/addEdit.vue | 9 +++++ .../pages/otherAddEit.vue | 9 +++++ .../pages/projectAddEit.vue | 9 +++++ 9 files changed, 74 insertions(+), 32 deletions(-) diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 7afe67ada..266344463 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -53,7 +53,7 @@ size="small" class="common-button-danger" @click="beforeBack" - :loading="isSubmit" + :loading="isSubmitBack" v-if="showBack"> {{ backBTNText }} @@ -151,6 +151,11 @@ export default { type: Boolean, default: false }, + // 保存按钮loading + isSubmitBack: { + type: Boolean, + default: false + }, // 是否默认委托事件 defaultEntrust: { type: Boolean, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index b15859b09..de2138c64 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -31,7 +31,7 @@ @@ -102,7 +102,7 @@

    确认+选择责任人

    - +
    @@ -114,7 +114,7 @@

    负责人

    - +
    @@ -126,7 +126,7 @@

    分发负责人

    - +
    @@ -148,7 +148,7 @@ @@ -210,9 +210,9 @@ @selection-change="selectedChange" > - + @@ -291,6 +291,7 @@ export default { pageSize: 10, total: 0, closeState: '1', + standId: '', standSerialNumber: '', // 标准号/名称 productName: '', // 项目名称 responsibleUnit: '' // 责任部门 diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 34d9c9a60..b52339f31 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'}"> - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index e8a67fc9b..5716eb580 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'}"> - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index a684c38a4..71d89ca6a 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'}"> - + @@ -118,6 +118,7 @@ accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" + :on-remove="handleONRemove" :on-success="handleOnsuccess" > { if (item.fileText.length !== 0) { - item.fileText.forEach(item1 => { - this.fileTextList.push({ - id: item1.id, - name: item1.name - }) - }) + this.fileTextList = item.fileText } }) }) @@ -335,10 +331,18 @@ export default { // 文件上传成功 handleOnsuccess(res, file, fileList) { if (res.ok) { - this.newDataList.push({ - id: res.data.attId, - name: res.data.standName - }) + if (this.fileTextList !== null) { + this.newDataList = this.fileTextList + this.newDataList.push({ + id: res.data.attId, + name: res.data.standName + }) + } else { + this.newDataList.push({ + id: res.data.attId, + name: res.data.standName + }) + } this.fileListData.fileText = this.newDataList this.$message({ showClose: true, @@ -377,14 +381,17 @@ export default { }, // 移除上传的文件 handleBeforeRemove(file, fileList) { + this.fileListData.fileText = fileList this.fileTextList = fileList - this.newDataList.forEach((item, index) => { +/* this.newDataList.forEach((item, index) => { if (file.name === item.name || file.id === item.id) { this.newDataList.splice(index, 1) - } - }) - }, + console.log(this.dataList) + } + })*/ + }, + handleONRemove() {}, /************ ********* *****************/ // 点击查看 handlePreview (item) { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index ab8c6df90..865a6a96e 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'}"> - + @@ -201,7 +201,7 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="backLoading" @submit="handleSubmit" submitBTNText="同意" > @@ -357,6 +357,7 @@ export default { }) }, handleSubmitNo() { + this.backLoading = true if (this.commentText) { var json = { responUserInfo: { @@ -372,12 +373,13 @@ export default { }, {}, res => { if (res.success) { this.$message.success('驳回成功') - this.fileTextList = [] this.$router.push('/processCenter') + this.backLoading = false } }) } else { this.$message.warning('请输入反馈意见') + this.backLoading = false } }, //未整改项抽屉中的查询按钮 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 4a89f62c4..883ef6927 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -185,6 +185,9 @@ prop="standName" label="标准名称" > + + + + + + + + + Date: Thu, 5 Aug 2021 17:33:04 +0800 Subject: [PATCH 464/528] =?UTF-8?q?=E6=9B=B4=E6=94=B97=E6=AD=A5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8Fstyle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1-1.vue | 1 + .../pages/creatProcess/xmpg/step1.vue | 1 + .../pages/creatProcess/xmpg/step2.vue | 6 +++++- .../pages/creatProcess/xmpg/step3.vue | 16 +--------------- .../pages/creatProcess/xmpg/step4.vue | 6 +++++- .../pages/creatProcess/xmpg/step5.vue | 6 +++++- .../pages/creatProcess/xmpg/step6.vue | 6 +++++- .../pages/creatProcess/xmpg/step7.vue | 1 - 8 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 5842ea30e..e01298782 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -405,6 +405,7 @@ export default { drawerTitle: "", //drawer标题 // 查询相关参数 searching: false, + commentText:'', standardSearch: { standType: "", standName: "" diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 5c28d466d..93b96686c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -389,6 +389,7 @@ export default { productData: [], //添加抽屉的数据 standList: [], //新添加的标准 modalshowflag: false, // drawer开关 + commentText: '', drawerTitle: "", //drawer标题 // 查询相关参数 searching: false, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 856ce6777..91cc0a018 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -456,4 +456,8 @@ export default { } } - .dem + .demo-drawer-content { + margin-top: 10px; + } +} + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 49726090c..aafe0469e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -126,21 +126,7 @@ -
    - - -
    - - -
    -     -     -
    + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 684e338b6..9bf3d7814 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -591,4 +591,8 @@ export default { } } - .demo- + .demo-drawer-content { + margin-top: 10px; + } +} +> diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index 95cf31713..da7a853ea 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -580,4 +580,8 @@ export default { } } - .demo- + .demo-drawer-content { + margin-top: 10px; + } +} + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 3f5518210..d12fc2bc4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -510,7 +510,6 @@ export default { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 162232581..9b7748313 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -114,7 +114,9 @@ label="核心技术要求" align="center">     @@ -76,65 +77,29 @@ .active { background-color: rgb(245, 247, 250); } - /*ul {*/ - /* position: absolute;*/ - /* z-index: 9999;*/ - /* background-color: rgb(255, 255, 255);*/ - /* box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px 0px;*/ - /* box-sizing: border-box;*/ - /* border-width: 1px;*/ - /* border-style: solid;*/ - /* border-color: rgb(228, 231, 237);*/ - /* border-image: initial;*/ - /* border-radius: 4px;*/ - /* box-sizing: border-box;*/ - /* list-style: none;*/ - /* padding: 6px 0px;*/ - /* margin: 0px;*/ - /* display: block;*/ - /* list-style-type: disc;*/ - /* margin-block-start: 1em;*/ - /* margin-block-end: 1em;*/ - /* margin-inline-start: 0px;*/ - /* margin-inline-end: 0px;*/ - /* width: 100%;*/ - /* li {*/ - /* list-style:none;*/ - /* height: 34px;*/ - /* line-height: 34px;*/ - /* padding: 0 20px;*/ - /* }*/ - /* li:hover {*/ - /* background-color: rgb(245, 247, 250);*/ - /* }*/ - /*}*/ - /*.mySelect {*/ - /* width: 100%;*/ - /* position: relative;*/ - /* option {*/ - /* height: 34px;*/ - /* line-height: 34px;*/ - /* padding: 0 20px;*/ - /* }*/ - /*}*/ - /*.mySelect:focus + .myIcon{*/ - /* transform:rotate(180deg);*/ - /* -ms-transform:rotate(180deg); !* IE 9 *!*/ - /* -moz-transform:rotate(180deg); !* Firefox *!*/ - /* -webkit-transform:rotate(180deg); !* Safari 和 Chrome *!*/ - /* -o-transform:rotate(180deg);*/ - /*}*/ - /*.mySelect:focus-within + .myIcon{*/ - /* transform:rotate(180deg);*/ - /* -ms-transform:rotate(180deg); !* IE 9 *!*/ - /* -moz-transform:rotate(180deg); !* Firefox *!*/ - /* -webkit-transform:rotate(180deg); !* Safari 和 Chrome *!*/ - /* -o-transform:rotate(180deg);*/ - /*}*/ - /*.myIcon {*/ - /* position: absolute;*/ - /* right: 7px;*/ - /* top: calc(~'50% - 7px');*/ - /* transition: all .3s;*/ - /*}*/ + .mySelect { + width: 100%; + position: relative; + } + .mySelect:focus + .myIcon{ + transform:rotate(180deg); + -ms-transform:rotate(180deg); /* IE 9 */ + -moz-transform:rotate(180deg); /* Firefox */ + -webkit-transform:rotate(180deg); /* Safari 和 Chrome */ + -o-transform:rotate(180deg); + } + .mySelect:focus-within + .myIcon{ + transform:rotate(180deg); + -ms-transform:rotate(180deg); /* IE 9 */ + -moz-transform:rotate(180deg); /* Firefox */ + -webkit-transform:rotate(180deg); /* Safari 和 Chrome */ + -o-transform:rotate(180deg); + } + .myIcon { + cursor: pointer; + position: absolute; + right: 7px; + top: calc(~'50% - 7px'); + transition: all .3s; + } diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue index 6dbb4e219..af18030c8 100644 --- a/src/pages/config/pages/attributeCustom/components/stand.vue +++ b/src/pages/config/pages/attributeCustom/components/stand.vue @@ -353,7 +353,7 @@ export default { showRegionId: '', selVal: '', isSearch: '1', - sarType: '', + sarType: 'STAND', isWarn: '1' }, attrTypeOptions: [ @@ -561,7 +561,7 @@ export default { queryDisplayLocationList (sarType) { return new Promise((resolve, reject) => { this.$http.get('lawssBase/utArea/getAreaList', { - sarType: 'INLAND_STAND' + sarType: sarType }, { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 8df138551..e585ffffa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -235,8 +235,7 @@ width="170" align="center"> - - + - - + { this.$set(this.textStatusMap, item.value, item.label) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 45d18b0dc..489a91441 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -272,14 +272,14 @@ choiceZRRS (row, type, index) { this.type = type if (type === 1) { - this.drawerTitle = '选择责任部门对接人' + this.drawerTitle = '选择执行人' this.nodeList2 = [] this.zxIndex= index this.nodeList2.push(row) this.modalshowflag2 = true } else { // 批量 - this.drawerTitle = '批量选择责任部门对接人' + this.drawerTitle = '批量选择执行人' if (this.zxIdList.length > 0) { this.nodeList2 = [] this.modalshowflag2 = true diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 06d10b06c..af104870f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -220,13 +220,13 @@ @@ -361,6 +361,23 @@ } }, methods: { + // 点击查看 + handlePreview (item) { + let pageType + if (item.standType === 'FOREIGN') { + pageType = 'FOREIGN_STAND' + } else { + pageType = 'INLAND_STAND' + } + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.id, + pageType: pageType + } + }) + window.open(routeUrl.href, '_blank') + }, getData () { queryTaskFirst({ bpnId: this.$route.query.bpnId diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 1f82da739..cbfc3ee3e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -221,13 +221,13 @@ @@ -361,6 +361,23 @@ export default { } }, methods: { + // 点击查看 + handlePreview (item) { + let pageType + if (item.standType === 'FOREIGN') { + pageType = 'FOREIGN_STAND' + } else { + pageType = 'INLAND_STAND' + } + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.id, + pageType: pageType + } + }) + window.open(routeUrl.href, '_blank') + }, addZqyjList() { this.title = '国内外标准库' this.listModel = true diff --git a/src/router/index.js b/src/router/index.js index 40040f9a2..590a4b6f0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1708,6 +1708,7 @@ const routes = [ meta: { requireAuth: true, title: '征求意见详情', + parentPath: '/standardForComments', // isBoolean: true, // menuId: '' } From 4d1eff6eb25f65623a104f008ce90b2e8a732a45 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Fri, 6 Aug 2021 10:17:22 +0800 Subject: [PATCH 474/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86--?= =?UTF-8?q?=E6=8B=86=E5=88=86=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A5=E6=A0=87=E5=87=86=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/index.vue | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 3f07616db..fd2a4796b 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -51,12 +51,20 @@ prop="showNumber" label="标准号/政策号" align="center"> + + Date: Fri, 6 Aug 2021 10:38:43 +0800 Subject: [PATCH 475/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=AF=94=E5=AF=B9--?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=BA=94=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standContrast/pages/contrastDetails.vue | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/pages/localTool/standContrast/pages/contrastDetails.vue b/src/pages/localTool/standContrast/pages/contrastDetails.vue index 6e42c79aa..8e6d60755 100644 --- a/src/pages/localTool/standContrast/pages/contrastDetails.vue +++ b/src/pages/localTool/standContrast/pages/contrastDetails.vue @@ -57,8 +57,8 @@ label="标准号/政策号" align="center"> { From 68777a0c87503edc1b9128669fc77577c40d6a35 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Fri, 6 Aug 2021 10:51:08 +0800 Subject: [PATCH 476/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 11 +- .../pages/details.vue | 236 +++++++++--------- .../pages/otherAddEit.vue | 11 +- .../pages/projectAddEit.vue | 11 +- 4 files changed, 147 insertions(+), 122 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 883ef6927..2d70086ad 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -119,13 +119,15 @@ - + 导出     - - - 高级查询 - - + 高级查询     -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - 确认 - -
    -     -     -     -
    @@ -358,6 +266,101 @@
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + 搜索 + 取消 +
    +     + {{ $t("m.dataAcquisition") }}
    @@ -368,6 +371,7 @@ export default { name: "AccessStandardDetails", data() { return { + isAdvancedSearch: false, // 高级检索状态 showSelectBox: true, textStatusMap: {}, @@ -519,11 +523,6 @@ export default { // this.$router.push(this.$store.state.detailMap) // this.$store.commit('setDetailMap', '') }, - selectSuper() { - this.page = 1; - this.standardForm.page = 1; - this.selectInfoMore(); - }, // 搜索 selectProductBtn() { this.page = 1; @@ -535,11 +534,6 @@ export default { this.standardForm.zrbm = '' this.standardForm.standName = '' this.standardForm.responseUnit = '' - this.standardFormList.standName = '' - this.standardFormList.typeApplicable = '' - this.standardFormList.nylx = '' - this.standardFormList.zrbm = '' - this.standardFormList.sycpx = '' this.selectInfobyAccid() this.selectInfoMore() }, @@ -701,18 +695,31 @@ export default { * 高级检索 */ selectMoreBtn() { - this.showSelectBox = !this.showSelectBox + this.isAdvancedSearch = true + this.standardFormList.standName = '' + this.standardFormList.typeApplicable = '' + this.standardFormList.nylx = '' + this.standardFormList.zrbm = '' + this.standardFormList.sycpx = '' this.showTableFlag = false - if (!this.showSelectBox) { - // this.standardForm = {} - // this.standardForm.issueTime = '' - // this.standardForm.textStatus = '' - // this.standardForm.modifyTime = '' - } this.page = 1 this.standardForm.page = 1 this.selectInfoMore() }, + queryInfo() { + this.page = 1; + this.standardForm.page = 1; + this.selectInfoMore(); + this.isAdvancedSearch = false + }, + backInfo() { + this.standardFormList.standName = '' + this.standardFormList.typeApplicable = '' + this.standardFormList.nylx = '' + this.standardFormList.zrbm = '' + this.standardFormList.sycpx = '' + this.isAdvancedSearch = false + }, // 获取工作组信息下拉框信息 getGzzOption() { this.$http.get("lawss/sarGroupMenu/queryGroup", "", { @@ -927,10 +934,8 @@ export default { } } } - .labelBox { - /deep/ .el-form-item__label { - padding-right: 5px; - } + .labelForm { + margin-top: 20px; } /deep/ .relateClass { & > button { @@ -964,7 +969,7 @@ export default { } /deep/.showBox{ - width: 165px; + width: 300px; } .iconClass { width: 18px; @@ -989,7 +994,6 @@ export default { cursor: pointer } } - .relateClass { .el-dialog__body { max-height: 460px; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 42cb7de2a..cb8e18827 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -104,13 +104,15 @@ - + - + Date: Fri, 6 Aug 2021 11:20:38 +0800 Subject: [PATCH 477/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index cbdf615b8..7ae835bc2 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -188,7 +188,7 @@ label="相对于国行标差异点">     From 5b8a528da670da8f238759d0f99efe9bafe71078 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 6 Aug 2021 14:02:00 +0800 Subject: [PATCH 478/528] =?UTF-8?q?feat:=20=E4=B8=8D=E4=BC=9A=E7=AD=BE=20?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=20=E4=BF=AE=E8=AE=A2=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 32977c38e..c38d5d117 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -810,7 +810,7 @@ - +

    修订申请人

    From 8ef1fdeaef89c662493b45e9c752b99f8660a5c4 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 6 Aug 2021 14:04:48 +0800 Subject: [PATCH 479/528] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=9F=A5=E7=9C=8B=E7=9A=84dialog=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E8=BF=87=E5=A4=A7=E7=9A=84ui=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 01f2866bd..22cb60d74 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -203,6 +203,7 @@ + 查看 @@ -224,7 +225,7 @@ destroy-on-close :wrapperClosable="false" class="seeHisToryDraw" - size="1000px" + size="600px" >
    From 930759eaa5d226ce550789b11203110ed0600603 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 6 Aug 2021 14:08:37 +0800 Subject: [PATCH 480/528] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=B8=8D=E4=BC=9A=E7=AD=BE=20=E5=9C=A8=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BF=AE=E8=AE=A2=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index c38d5d117..b00082a3f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -810,7 +810,7 @@ - +

    修订申请人

    From 2df6b33b420759356aa5ff5a66cc2fc0a14032ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 6 Aug 2021 14:27:01 +0800 Subject: [PATCH 481/528] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step4.vue | 23 +++++++++++++++++-- .../pages/creatProcess/xmpg2/step3.vue | 20 +++++++++------- .../pages/creatProcess/xmpg2/step4.vue | 15 ++++++++++-- .../pages/creatProcess/xmpg2/step5.vue | 1 + 4 files changed, 47 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 72226053d..7b9b0d664 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -399,8 +399,27 @@ export default { }, //驳回事件 beforeBack() { - this.listForm.approvalOpinion = "1"; - this.handleSubmit(); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.approvalOpinion = "1"; + this.saveLoading = true + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.saveLoading = false + }); + }/**/ }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index c59d0535d..81f1b0667 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -282,7 +282,7 @@ export default { }, // 点击查看 handlePreview(item) { - console.log(item) + console.log(item); let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { @@ -304,14 +304,14 @@ export default { }, res => { this.standardData = res.data.list; this.standardData.forEach(item => { - if(item.attrInfoMap === null){ - this.$set(item, "ZCCSSRQ", ''); - this.$set(item, "XCXSSRQ", ''); - }else{ + if (item.attrInfoMap === null) { + this.$set(item, "ZCCSSRQ", ""); + this.$set(item, "XCXSSRQ", ""); + } else { this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); } - }) + }); this.totalNo = res.data.count; }, e => { }); @@ -354,7 +354,10 @@ export default { }, //提交事件 handleSubmit() { - this.isSubmit = true + if (!this.listForm.jgUser) { + this.$message.warning("请选择架构经理"); + } else { + this.isSubmit = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -368,9 +371,10 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } - this.isSubmit = false + this.isSubmit = false; }, e => { }); + } }, choiceZRR(scope, type, title, id) { if (scope != null) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index 7bf689c06..7f30f2f5b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -108,12 +108,12 @@ > @@ -370,6 +370,7 @@ export default { if(this.peopleFlag === 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, @@ -430,6 +431,7 @@ export default { if (this.type === 1) { this.dataList[this.zrIndex].liablePeopleId = data[0].id this.dataList[this.zrIndex].liablePeople = data[0].name + this.$forceUpdate() } else if(this.type === 2) { this.dataList.forEach( item => { this.selectList.forEach( items => { @@ -437,6 +439,7 @@ export default { item.liablePeopleId = data[0].id item.liablePeople = data[0].name } + this.$forceUpdate() }) }) } @@ -451,6 +454,14 @@ export default { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; } }, + watch: { + // dataList: { + // deep: true, + // handler (val) { + // console.log('dataList update', val) + // } + // } + }, mounted() { this.processTable(); this.getData(); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 1f133c46f..eae3ab927 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -315,6 +315,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg) if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); From 23b53acfd5944fc2618060783580aaa5f84a0771 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Fri, 6 Aug 2021 14:29:30 +0800 Subject: [PATCH 482/528] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/linkManage/index.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index 6f7caa83e..846e6f474 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -50,7 +50,10 @@ + placeholder="请输入链接"> + From 4dd2f05b04fcf1643ba2c414a7f48dc3dbf26170 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Fri, 6 Aug 2021 14:31:17 +0800 Subject: [PATCH 483/528] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/linkManage/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index 846e6f474..c8f93bc6b 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -51,7 +51,7 @@ label="链接"> From 0267a00eefe43f8da5f9daf2b89aedb8bb5173f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 6 Aug 2021 14:55:45 +0800 Subject: [PATCH 484/528] =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step4.vue | 71 ++++++++++++++++--- 1 file changed, 63 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 7b9b0d664..f1966e1a7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -37,18 +37,40 @@ clearable >     - -
    -

    {{ listForm.modelName }} + + + + + + + + + + + + + + + + + + + + + + +

    +

    {{ item.name }} @@ -255,6 +277,7 @@ export default { selectList: [], //选择标准的选择框 bringData: [], commentText: "", //填写会签意见 + fileList:[], page: 1, total: 0, pageSize: this.$store.getters.userInfo.configContent, @@ -356,6 +379,9 @@ export default { this.listForm.applyUpdUserId = item.applyUpdUserId; this.listForm.jlUserId = item.jlUserId; this.listForm.zrUserId = item.zrUserId; + this.fileIds = item.fileId; + console.log(this.fileIds); + this.getFileInfo(); }); }, // 请求上传的文件信息 @@ -365,11 +391,15 @@ export default { }, { _this: this }, res => { - console.log(res); this.$nextTick(() => { res.data.map(item => { - this.listForm.modelName = item.oldFileName; - this.listForm.model = item.id; + // 赋值要回显的上传文件内容 + this.fileList.push({ + name: item.oldFileName, + uid: item.uid, + status: item.status, + id: item.id + }); }); }); }, e => { @@ -499,6 +529,31 @@ export default { padding: 0 20px 0; } } + p { + & > a { + cursor: pointer; + } + + & > i { + display: inline-block; + margin-left: 3px; + width: 18px; + height: 16px; + background-repeat: no-repeat; + background-size: 100% 100%; + background-position: center center; + vertical-align: sub; + cursor: pointer; + } + + .icon-download { + background-image: url("~assets/images/shangqi/img/download.png"); + } + + .icon-download2 { + background-image: url("~assets/images/shangqi/img/download2.png"); + } + } .choiceBtn { .el-button--primary { From b1e39201f567260dd1fe4cfe3d36d37323af678a Mon Sep 17 00:00:00 2001 From: song2048 <2639528268@qq.com> Date: Fri, 6 Aug 2021 15:10:47 +0800 Subject: [PATCH 485/528] =?UTF-8?q?=E5=9C=A8=E8=A1=A8=E6=A0=BC=E5=90=8E?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E2=80=9C=E6=93=8D=E4=BD=9C=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 601dc8728..03ea3ab2f 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -189,7 +189,7 @@ align="center" label="项目经理"> - + From eee6759ca148fde91e16dd52b88a99beb802a305 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 6 Aug 2021 17:48:58 +0800 Subject: [PATCH 495/528] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=BA=94=E8=AF=A5=E8=B7=9F=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=BA=93=E4=B8=80=E8=87=B4=EF=BC=8C=E5=8F=AF=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=B8=8A=E4=BC=A0=E5=A4=9A=E4=B8=AA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 130 ++++++++++++++---- 1 file changed, 102 insertions(+), 28 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index b00082a3f..5676fad34 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -217,14 +217,15 @@ clearable >

    - {{ form.xgdName }} + - 重新上传 + + 查看已上传的文件
    @@ -233,7 +234,8 @@ class="common-button-primary" size="mini" @click="fileUpload('xgd')"> - 点击上传 + + 点击上传
    @@ -245,14 +247,15 @@ clearable >
    - {{ form.fbgbjbdName }} + - 重新上传 + + 查看已上传的文件
    @@ -261,6 +264,7 @@ class="common-button-primary" size="mini" @click="fileUpload('fbgbjbd')"> + 点击上传
    @@ -273,14 +277,15 @@ clearable >
    - {{ form.zbjbdName }} + - 重新上传 + + 查看已上传的文件
    @@ -289,6 +294,7 @@ class="common-button-primary" size="mini" @click="fileUpload('zbjbd')"> + 点击上传
    @@ -301,14 +307,15 @@ clearable >
    - {{ form.bpgName }} + - 重新上传 + + 查看已上传的文件
    @@ -317,6 +324,7 @@ class="common-button-primary" size="mini" @click="fileUpload('bpg')"> + 点击上传
    @@ -329,14 +337,15 @@ clearable >
    - {{ form.ssgName }} + - 重新上传 + + 查看已上传的文件
    @@ -345,6 +354,7 @@ class="common-button-primary" size="mini" @click="fileUpload('ssg')"> + 点击上传
    @@ -359,14 +369,15 @@ clearable >
    - {{ form.kwjName }} + - 重新上传 + + 查看已上传的文件
    @@ -375,6 +386,7 @@ class="common-button-primary" size="mini" @click="fileUpload('kwj')"> + 点击上传
    @@ -387,14 +399,15 @@ clearable >
    - {{ form.zqyjgName }} + - 重新上传 + + 查看已上传的文件
    @@ -403,6 +416,7 @@ class="common-button-primary" size="mini" @click="fileUpload('zqyjg')"> + 点击上传
    @@ -415,14 +429,15 @@ clearable >
    - {{ form.caName }} + - 重新上传 + + 查看已上传的文件
    @@ -431,6 +446,7 @@ class="common-button-primary" size="mini" @click="fileUpload('ca')"> + 点击上传
    @@ -443,14 +459,15 @@ clearable >
    - {{ form.jdwjName }} + - 重新上传 + + 查看已上传的文件
    @@ -459,6 +476,7 @@ class="common-button-primary" size="mini" @click="fileUpload('jdwj')"> + 点击上传
    @@ -702,7 +720,16 @@ clearable >
    - {{ form.glwjName }} + + + + 查看已上传文件 + +
    + 点击上传
    @@ -1196,6 +1224,16 @@ data () { return { fileList: [], + caFileList: [], + FBGBJBDFileList: [], + xgdFileList: [], + bpgFileList: [], + ssgFileList: [], + zqyjgFileList: [], + jdwjFileList: [], + zbjbdFileList: [], + kwjFileList: [], + qlwjFileList: [], filterText:'', textStatusMap: {}, // 文本状态id与name对应 standardDrawer: false, @@ -1332,7 +1370,7 @@ zqyjg: '', // 征求意见稿 jdwj: '', // 解读文件 zbjbd: '', // 增补件 - kwj: '', // 勘误件 + kwj: '', // 勘 误件 caName: '', // 草案 fbgbjbdName: '', // 发布稿 xgdName: '', // 修改单 @@ -2040,43 +2078,54 @@ // 导入标准数据成功后执行 importFileSuccess (response, file,fileList) { // 上传成功后判断是否是两条数据是的话替换掉旧数据 - if (fileList.length > 1) { - this.fileList = fileList.splice(0, 1) - } + // if (fileList.length > 1) { + // this.fileList = fileList.splice(0, 1) + // } if (response.ok) { - this.fileMadel = false - this.fileList = [] + // this.fileMadel = false + // this.fileList = [] if(this.fileType === 'fbgbjbd'){ + this.FBGBJBDFileList=fileList; this.form.fbgbjbd = response.data.id; this.form.fbgbjbdName = response.data.name; }else if(this.fileType === 'xgd'){ - this.form.xgd = response.data.id; + this.xgdFileList=fileList; + this.form.xgd = response.data.id; this.form.xgdName = response.data.name; }else if(this.fileType === 'bpg'){ + this.bpgFileList=fileList; this.form.bpg = response.data.id; this.form.bpgName = response.data.name; }else if(this.fileType === 'ssg'){ + this.ssgFileList=fileList; this.form.ssg = response.data.id; this.form.ssgName = response.data.name; }else if(this.fileType === 'zqyjg'){ + this.zqyjgFileList=fileList; this.form.zqyjg = response.data.id; this.form.zqyjgName = response.data.name; }else if(this.fileType === 'jdwj'){ + this.jdwjFileList=fileList; this.form.jdwj = response.data.id; this.form.jdwjName = response.data.name; }else if(this.fileType === 'kwj'){ + this.kwjFileList=fileList; this.form.kwj = response.data.id; this.form.kwjName = response.data.name; }else if(this.fileType === 'xgd'){ + this.xgdFileList=fileList; this.form.xgd = response.data.id; this.form.xgdName = response.data.name; }else if(this.fileType === 'glwj'){ + this.qlwjFileList=fileList; this.form.glwj = response.data.id; this.form.glwjName = response.data.name; }else if(this.fileType === 'ca'){ + this.caFileList=fileList; this.form.ca = response.data.id; this.form.caName = response.data.name; }else if(this.fileType === 'zbjbd'){ + this.zbjbdFileList=fileList; this.form.zbjbd = response.data.id; this.form.zbjbdName = response.data.name; } @@ -2089,8 +2138,33 @@ }, fileUpload (type) { this.fileType = ''; - this.fileMadel = true + // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表 + this.fileType = type; + if (type==='ca'){ + this.fileList=this.caFileList; + }else if (type==='fbgbjbd'){ + this.fileList=this.FBGBJBDFileList; + }else if (type==='xgd'){ + this.fileList=this.xgdFileList; + }else if(type==='bpg'){ + this.fileList=this.bpgFileList; + }else if (type==='ssg'){ + this.fileList=this.ssgFileList; + }else if (type==='zqyjg'){ + this.fileList=this.zqyjgFileList; + }else if (type==='jdwj'){ + this.fileList=this.jdwjFileList; + }else if (type==='zbjbd'){ + this.fileList=this.zbjbdFileList; + }else if (type==='kwj'){ + this.fileList=this.kwjFileList; + }else if (type==='glwj'){ + this.fileList=this.qlwjFileList; + } + + this.fileMadel = true; + }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { From 5489e13b926e36b73deca5dcfadb81a2631b3077 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 6 Aug 2021 17:53:46 +0800 Subject: [PATCH 496/528] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E4=B8=8D=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 5676fad34..5f38e84b8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1451,9 +1451,9 @@ { required: true, message: '请选择文本状态', trigger: 'change' } ] , - // issueTime: [ - // { required: true, message: '请选择标准发布日期', trigger: 'change' } - // ], + issueTime: [ + { required: false, message: '请选择标准发布日期', trigger: 'change' } + ], qcdw: [ { required: true, message: '请选择起草单位', trigger: 'change' } ], From 07940a5b8c27db0fbb7ec37c0d5e8a47aa321990 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 6 Aug 2021 17:57:03 +0800 Subject: [PATCH 497/528] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E8=AE=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=20=E6=A0=87=E5=87=86=E6=80=A7=E8=B4=A8?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=8C?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E4=B8=8D=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 28fbcddac..9d7c27f09 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1138,13 +1138,13 @@ export default { { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } ], standNature: [ - { required: false, message: '请选择标准性质', trigger: 'change' } + { required: true, message: '请选择标准性质', trigger: 'change' } ], textStatus: [ { required: true, message: '请选择文本状态', trigger: 'change' } ], issueTime: [ - { required: true, message: '请选择标准发布日期', trigger: 'change' } + { required: false, message: '请选择标准发布日期', trigger: 'change' } ], qcdw: [ { required: true, message: '请选择起草单位', trigger: 'change' } From 43f5a92ba79488f65e36783a5801669244eef356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 6 Aug 2021 17:58:37 +0800 Subject: [PATCH 498/528] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1-1.vue | 19 ++++++++++++------- .../pages/creatProcess/xmpg/step1.vue | 1 - .../pages/creatProcess/xmpg2/step5.vue | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 385f8b8b7..baef49e58 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -533,9 +533,14 @@ export default { }).then(res => { let mes = JSON.parse(res.mes); this.listForm = mes.form; - this.dataList = mes.form.dataList; this.roleForm = mes.roleForm; this.commentText = mes.commentText; + this.dataList = mes.form.dataList; + this.dataList.forEach(item => { + if(!item.projectLine){ + this.dataList = null + } + }) }); }, checkedRole(data) { @@ -866,12 +871,12 @@ export default { }, computed: {}, watch: { - dataList: { - deep: true, - handler (val) { - console.log('dataList update', val) - } - } + // dataList: { + // deep: true, + // handler (val) { + // console.log('dataList update', val) + // } + // } }, mounted() { //从数据库中查询下拉框数据 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 7b8e2183f..a36e82cb4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -662,7 +662,6 @@ export default { saveTaskFirst(_formData).then(res => { this.saveLoading = false; this.$message.success("保存成功"); - this.$router.push("/processCenter"); }).catch(e => { this.saveLoading = false; }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index eae3ab927..39e39eeb9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -315,7 +315,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg) + console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); From 13d969a4a7464da910bd6e907ffdc099e13138c5 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 7 Aug 2021 11:23:13 +0800 Subject: [PATCH 499/528] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84id=E4=B8=AD=E5=B8=A6=E6=9C=89','=E5=AD=97=E7=AC=A6,?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=97=B6=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step3.vue | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 26187ebbd..352131b8a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -836,29 +836,26 @@ export default { methods: { downloadFile (fileType) { if(fileType === 'fbgbjbd'){ - if(this.fbgbjbdFileId.search(',')){ - this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); - console.log(this.fbgbjbdFileId); - } - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",",""); }else if(fileType === 'xgd'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId + + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId.replace(",",""); }else if(fileType === 'bpg'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId.replace(",",""); }else if(fileType === 'ssg'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId.replace(",",""); }else if(fileType === 'zqyjg'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId.replace(",",""); }else if(fileType === 'jdwj'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId.replace(",",""); }else if(fileType === 'kwj'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId.replace(",",""); }else if(fileType === 'glwj'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId.replace(",",""); }else if(fileType === 'ca'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId.replace(",",""); }else if(fileType === 'zbjbd'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId.replace(",",""); } }, popoverHide (checkedIds, checkedData) { From d43546fc3ce30b7a63c53634722882f964faf89b Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Sun, 8 Aug 2021 09:46:46 +0800 Subject: [PATCH 500/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=AF=94=E5=AF=B9--?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=BA=94=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/details.vue | 1 - .../pages/standInvolveProjectDetail.vue | 18 ++++++++++++++- .../pags/consultationDetails.vue | 23 +++++++++++++++---- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index c5488eaf5..bb19c111f 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -646,7 +646,6 @@ export default { }, // 点击查看 handlePreview(data) { - debugger let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index e881b4ce8..04bb340e5 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -60,13 +60,18 @@ width="180" > +

    - {{ this.$route.query.item.cid }} + {{ $route.query.item.cid }}

    - {{ this.$route.query.item.cname || '-' }} + {{ $route.query.item.cname || '-' }}

    - {{ this.$route.query.item.endTime || '-' }} + {{ $route.query.item.endTime || '-' }}

    - {{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}} + {{ $route.query.item.startTime + ' ~ ' + $route.query.item.endTime}} -

    @@ -166,6 +166,21 @@ } }) }, + + //点击查看 + handlePreview(data) { + console.log(data); + return + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: data.id, + pageType: data.standType + } + }); + window.open(routeUrl.href, "_blank"); + }, + // 获取详情信息列表 getList() { this.spinShow = true From 5e68c10d498659f09a8883ae2439ef409390fafb Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Sun, 8 Aug 2021 09:51:08 +0800 Subject: [PATCH 501/528] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 4 ++-- .../accessStandardsAndRegulations/index.vue | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 5f429c122..8f5a892f1 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -300,11 +300,11 @@ export default { // path: '/convertDocView', // menuId: '3F52K25546' // }, - { + /*{ title: '菜单管理', path: '/menuManage', menuId: '87b8b4f5817a7829696e63185c744d52' - }, + },*/ { title: '链接管理', path: '/linkManage', diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 5fae96a98..686e52b43 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -9,9 +9,9 @@
    -
    +
    @@ -68,13 +68,13 @@ export default { name: "listProject" }); continue; - } else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") { + }/* else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") { list.push({ label: "重点标准跟踪清单", name: "listTracking" }); continue; - } else if (entity.id === "5a75523729b04102a565167004d640e9") { + }*/ else if (entity.id === "5a75523729b04102a565167004d640e9") { list.push({ label: "其他清单", name: "listOther" From 9c30db39761ce9f934b078572b022ef04ba04b57 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Sun, 8 Aug 2021 09:51:20 +0800 Subject: [PATCH 502/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C--=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9Ctab=E9=A1=B5=E5=92=8C?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9Ctab?= =?UTF-8?q?=E9=A1=B5=E7=82=B9=E5=87=BB=E6=AF=94=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A5=E6=A0=87=E5=87=86=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 7ae835bc2..9ea5ba731 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -65,14 +65,19 @@ label="标准/政策号" width="180" > - + + {}) - }, // 分页查询 + }, + //点击查看详情 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'INLAND_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, + // 分页查询 resetSelect () { this.sarProject.country = '' this.sarProject.standCode='' From dd4cf4a36c0259645e39de639681272c3073fc81 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Sun, 8 Aug 2021 09:54:43 +0800 Subject: [PATCH 503/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C--=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9Ctab=E9=A1=B5=E5=92=8C?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9Ctab?= =?UTF-8?q?=E9=A1=B5=E7=82=B9=E5=87=BB=E6=AF=94=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A5=E6=A0=87=E5=87=86=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 9ea5ba731..53b6bf83e 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -271,7 +271,7 @@ name: "technologyInvolveProject", name: 'OtherStandardDetails', params: { id: item.standId, - pageType: 'INLAND_STAND' + pageType: item.standType + '_STAND' } }) window.open(routeUrl.href, '_blank') From 79dacb01de27a85951128280c00990be10ab570a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Sun, 8 Aug 2021 11:46:38 +0800 Subject: [PATCH 504/528] commit --- .../pages/creatProcess/bzjd/step1-1.vue | 4 ++-- .../pages/creatProcess/bzjd/step1.vue | 4 ++-- .../pages/creatProcess/bzjd/step2.vue | 4 ++-- .../pages/creatProcess/bzjd/step3.vue | 14 +++++++------- .../pages/creatProcess/bzjd/step4.vue | 4 ++-- .../pages/creatProcess/bzjd/step5.vue | 4 ++-- .../pages/creatProcess/bzjd/step6.vue | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 2bd84c26a..edcdc36b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -103,13 +103,13 @@ + + - - - - - - Date: Sun, 8 Aug 2021 13:37:28 +0800 Subject: [PATCH 505/528] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step3.vue | 52 ++++++++++--------- .../pages/creatProcess/xmpg/step1-1.vue | 7 +-- .../pages/creatProcess/xmpg/step1.vue | 4 +- 3 files changed, 35 insertions(+), 28 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index b2d848d1b..187975a72 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -397,7 +397,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, saveinboundTask } from "api/process"; +import { inboundLiaisonDetail, saveTaskForPub } from "api/process"; export default { name: "bzqdfbStep3", @@ -693,16 +693,24 @@ export default { getFormFieldList (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.listForm.dataList = item.dataList - this.dataList = item.dataList - this.listForm.applyUpdUserId = item.applyUpdUserId - this.listForm.jlUserId = item.jlUserId - this.listForm.zrUserId = item.zrUserId - this.fileIds = item.fileId; - this.getFileInfo(); + if(item.form === undefined){ + this.listForm.prcNum = this.prcNum + this.listForm.prcName = this.prcName + this.listForm['id'] = item.id + this.listForm.dataList = item.dataList + this.dataList = item.dataList + this.listForm.applyUpdUserId = item.applyUpdUserId + this.listForm.jlUserId = item.jlUserId + this.listForm.zrUserId = item.zrUserId + this.fileIds = item.fileId; + this.getFileInfo(); + } else { + this.listForm = item.form + this.dataList = item.form.dataList + this.listForm.dataList = item.form.dataList + this.fileIds = item.form.fileId; + this.getFileInfo(); + } }) }, //保存事件 @@ -713,23 +721,19 @@ export default { _formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "4"); + _formData.append('taskIds', this.taskIds) _formData.append("json", JSON.stringify({ - taskInfo: '根据会签意见修订', form: this.listForm, - roleForm: this.roleForm, - prcNum: this.$route.query.prcNum, - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId, commentText: this.commentText })); - saveinboundTask(_formData).then(res => { - this.saveLoading = false; - this.$message.success("保存成功"); - this.$router.push('/processCenter') - this.bpnId = res.result; - }).catch(e => { - this.saveLoading = false; - }); + + // saveTaskForPub(_formData).then(res => { + // this.saveLoading = false; + // this.$message.success("保存成功"); + // this.bpnId = res.result; + // }).catch(e => { + // this.saveLoading = false; + // }); }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index baef49e58..66f7e7ff7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -531,13 +531,13 @@ export default { queryTaskFirst({ bpnId: this.$route.query.bpnId }).then(res => { - let mes = JSON.parse(res.mes); + console.log(mes.form.dataList); this.listForm = mes.form; this.roleForm = mes.roleForm; this.commentText = mes.commentText; this.dataList = mes.form.dataList; this.dataList.forEach(item => { - if(!item.projectLine){ + if(!item.productLine){ this.dataList = null } }) @@ -760,8 +760,9 @@ export default { //选择拆分标准确定事件 OkDrawer() { if (this.selectedList.length == 1) { - this.listForm.standNumber = this.selectedList[0].standNumber; + this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; + this.listForm.standType = this.selectedList[0].standType; this.listForm.id = this.selectedList[0].id; this.$http.get("SarStandItems/sar-stand-items/findAllItems", { ids: this.listForm.id, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index a36e82cb4..fd53bcbf2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -470,6 +470,7 @@ export default { listForm: { standNumber: "", //标准编号 standName: "",//标准名称 + standType: "", //标准类型 XCXSSRQ: "", //新车型实施日期 ZCCSSRQ: "", //在产车实施日期 certifiedEngineer: "", //认证工程师 @@ -732,8 +733,9 @@ export default { //选择拆分标准确定事件 OkDrawer() { if (this.selectedList.length === 1) { - this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; + this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; + this.listForm.standType = this.selectedList[0].standType; this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj this.listForm.id = this.selectedList[0].id; From dd8b15406cc3d96aca3b96f7e9b5085a8ef1559b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 8 Aug 2021 14:16:57 +0800 Subject: [PATCH 506/528] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue | 3 ++- src/pages/processCenter/pages/creatProcess/xmpg/step1.vue | 1 + src/pages/processCenter/pages/creatProcess/xmpg/step4.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step5.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step6.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step7.vue | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 66f7e7ff7..5e3894f7f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -531,7 +531,7 @@ export default { queryTaskFirst({ bpnId: this.$route.query.bpnId }).then(res => { - console.log(mes.form.dataList); + let mes = JSON.parse(res.mes); this.listForm = mes.form; this.roleForm = mes.roleForm; this.commentText = mes.commentText; @@ -763,6 +763,7 @@ export default { this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; this.listForm.standType = this.selectedList[0].standType; + this.listForm.standId = this.selectedList[0].id; this.listForm.id = this.selectedList[0].id; this.$http.get("SarStandItems/sar-stand-items/findAllItems", { ids: this.listForm.id, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index fd53bcbf2..ad4acb396 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -736,6 +736,7 @@ export default { this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; this.listForm.standType = this.selectedList[0].standType; + this.listForm.standId = this.selectedList[0].id; this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj this.listForm.id = this.selectedList[0].id; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 06ec3df9c..6b7dfb9d1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -64,7 +64,7 @@ style="width: 100%" border @selection-change="selectStandChange" - :height="sarProStateTableHeight" + height="56%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> Date: Sun, 8 Aug 2021 14:44:47 +0800 Subject: [PATCH 507/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86--?= =?UTF-8?q?=E6=8B=86=E5=88=86=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A5=E6=A0=87=E5=87=86=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/index.vue | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index fd2a4796b..1d6be7da5 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -186,12 +186,20 @@ prop="standNumber" label="标准号/政策号" align="center"> + + Date: Sun, 8 Aug 2021 15:08:40 +0800 Subject: [PATCH 508/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85,?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=88=86=E8=A7=A3=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 24f5c3bb9..28b2f0d98 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -188,11 +188,11 @@ /> 上传时间：{{ dateFormat(file.modifyTime) }} - - - - - + 标准分解单

    From 9af8203bf332a82a23707ecff6f9cfb56a2dac3b Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 8 Aug 2021 15:11:46 +0800 Subject: [PATCH 509/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85,?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=88=86=E8=A7=A3=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 28b2f0d98..afc9a4ef2 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -188,11 +188,11 @@ /> 上传时间：{{ dateFormat(file.modifyTime) }} - 标准分解单 + + + + +

    @@ -376,12 +376,12 @@ 上传时间：{{ dateFormat(file.modifyTime) }}

    - - - - - - + 标准分解单 From 600c5f6d62ccd8ef60537c9d2f428c4890157ab2 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Sun, 8 Aug 2021 15:20:31 +0800 Subject: [PATCH 510/528] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 22836fdde..8db39fdaf 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -39,7 +39,7 @@
    导入 导出 - 删除 + 模板下载 批量复制 合并条款 From 3ee0a71810467fcbea979521f49caf2d365876cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 8 Aug 2021 15:43:14 +0800 Subject: [PATCH 511/528] commit --- src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue | 1 - src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue | 4 +++- src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index c5656481f..8f1fdd0e5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -370,7 +370,6 @@ export default { if(this.peopleFlag === 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/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 39e39eeb9..dce551cfb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -64,7 +64,7 @@ align="center"> @@ -3509,6 +3511,10 @@ export default { if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) { res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ } + if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) { + res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ + console.log(res.data.list[i].SSRQ); + } } this.stahndinfoList = res.data.list this.total = res.data.count From e14730c0a675dbef6c8ce70e7d77ac49ba41321a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 9 Aug 2021 14:14:54 +0800 Subject: [PATCH 528/528] commit --- .../pages/creatProcess/bzdy/step2.vue | 31 ++++++++++++---- .../pages/creatProcess/bzdy/step3.vue | 35 ++++++++++++++----- .../pages/creatProcess/bzdy/step4.vue | 15 ++++---- .../pages/creatProcess/bzdy/step5.vue | 29 +++++++++++---- .../pages/creatProcess/bzdy/step6.vue | 12 +++---- .../pages/creatProcess/bzdy/step7.vue | 12 +++---- .../pages/creatProcess/bzdy/step8.vue | 12 +++---- .../pages/creatProcess/bzdy/step9.vue | 12 +++---- .../pages/creatProcess/bzjd/step2.vue | 1 - 9 files changed, 104 insertions(+), 55 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 1c406b205..842b3a8d0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -135,6 +135,7 @@
    { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { @@ -261,11 +276,13 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.form.model = data.model - this.form.modelName = data.modelName + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.form.model = data.model || data.form.model + this.form.modelName = data.modelName || data.form.modelName + this.form.responUserList = data.form.responUserList + this.form.responUserListName = data.form.responUserListName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index e4b8d0b87..e3f635c75 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -147,6 +147,7 @@ { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { @@ -305,13 +320,15 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.form.model = data.model - this.form.modelName = data.modelName - this.form.fileName = data.fileName || '' - this.form.fileId = data.fileId || '' + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.form.model = data.model || data.form.model + this.form.modelName = data.modelName || data.form.modelName + this.form.responUserList = data.form.responUserList + this.form.responUserListName = data.form.responUserListName + this.form.fileName = data.form.fileName || data.fileName || '' + this.form.fileId = data.form.fileId || data.fileId || '' }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 8cc57135e..d991f2dac 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -252,13 +252,14 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.form.file = data.fileId - this.form.fileName = data.fileName - this.form.model = data.model - this.form.modelName = data.modelName + console.log(data); + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.form.file = data.fileId || data.form.fileId + this.form.fileName = data.fileName || data.form.fileName + this.form.model = data.model || data.form.model + this.form.modelName = data.modelName || data.form.modelName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index a590d8ece..011d29d6d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -174,6 +174,7 @@ { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { @@ -327,12 +342,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileId = data.hzfileId - this.form.hzfileName = data.hzfileName + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index b55d1e585..3e33eac63 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index 953b1085a..2d7c2e343 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index 2efa1dc5c..2942c2ccb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 7339115b3..41e534615 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 69682b390..9838e9e60 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -321,7 +321,6 @@ this.active = name }, handleSave() { - this.saveLoading = true let _formData = new FormData() _formData.append('taskIds', this.taskIds)