diff --git a/src/App.vue b/src/App.vue index 2f9429400..610b62e0c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -69,34 +69,6 @@
-
@@ -238,7 +210,12 @@ export default { }, // 监听路由 控制isBoolean $route() { - if (this.$route.name !== 'Login' && this.$route.name !== 'Home' && !this.$route.meta.isBoolean && this.$route.name !== 'beeEChungLogin' && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' && this.$route.name !== 'StandardSearch') { + if (this.$route.name !== 'Login' && this.$route.name !== 'Home' + && !this.$route.meta.isBoolean && this.$route.name !== 'beeEChungLogin' + && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' + && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' + && this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex' + && this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage' ) { this.isBoolean = true } else { this.isBoolean = false diff --git a/src/api/getFileByAttId.js b/src/api/getFileByAttId.js new file mode 100644 index 000000000..b896e7476 --- /dev/null +++ b/src/api/getFileByAttId.js @@ -0,0 +1,28 @@ +import axios from '@/common/axiosV2' + +export function getFileAttId (data) { + this.getBusStandFileByAttId(data) + .then(res => { + if(res){ + const editFileInfo = res + if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){ + window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl) + }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){ + window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) + }else { + const nowTime = new Date().getTime() + window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) + } + } + }).catch(e => { + this.$message.warning('文件不存在,预览失败') + }) +} + +export function getBusStandFileByAttId(data) { + return axios({ + url: 'api/att/attFile/getBusStandFileByAttId', + method: 'get', + params: data + }) +} diff --git a/src/api/hwh5-cloudonline.js b/src/api/hwh5-cloudonline.js new file mode 100644 index 000000000..c04b47ae6 --- /dev/null +++ b/src/api/hwh5-cloudonline.js @@ -0,0 +1,7 @@ +!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("hwh5",[],t):"object"==typeof exports?exports.hwh5=t():e.hwh5=t()}(window,function(){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var a=t[r]={i:r,l:!1,exports:{}};return e[r].call(a.exports,a,a.exports,n),a.l=!0,a.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var a in e)n.d(r,a,function(t){return e[t]}.bind(null,a));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=90)}([function(e,t){var n=e.exports={version:"2.5.7"};"number"==typeof __e&&(__e=n)},function(e,t){var n=e.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(e,t,n){var r=n(51)("wks"),a=n(33),o=n(1).Symbol,i="function"==typeof o;(e.exports=function(e){return r[e]||(r[e]=i&&o[e]||(i?o:a)("Symbol."+e))}).store=r},function(e,t,n){var r=n(1),a=n(0),o=n(9),i=n(10),u=n(13),c=function(e,t,n){var s,f,l,d=e&c.F,p=e&c.G,h=e&c.S,v=e&c.P,m=e&c.B,g=e&c.W,y=p?a:a[t]||(a[t]={}),w=y.prototype,_=p?r:h?r[t]:(r[t]||{}).prototype;for(s in p&&(n=t),n)(f=!d&&_&&void 0!==_[s])&&u(y,s)||(l=f?_[s]:n[s],y[s]=p&&"function"!=typeof _[s]?n[s]:m&&f?o(l,r):g&&_[s]==l?function(e){var t=function(t,n,r){if(this instanceof e){switch(arguments.length){case 0:return new e;case 1:return new e(t);case 2:return new e(t,n)}return new e(t,n,r)}return e.apply(this,arguments)};return t.prototype=e.prototype,t}(l):v&&"function"==typeof l?o(Function.call,l):l,v&&((y.virtual||(y.virtual={}))[s]=l,e&c.R&&w&&!w[s]&&i(w,s,l)))};c.F=1,c.G=2,c.S=4,c.P=8,c.B=16,c.W=32,c.U=64,c.R=128,e.exports=c},function(e,t,n){var r=n(8),a=n(66),o=n(47),i=Object.defineProperty;t.f=n(5)?Object.defineProperty:function(e,t,n){if(r(e),t=o(t,!0),r(n),a)try{return i(e,t,n)}catch(e){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(e[t]=n.value),e}},function(e,t,n){e.exports=!n(12)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(e,t){e.exports=function(e){return"object"==typeof e?null!==e:"function"==typeof e}},function(e,t,n){e.exports={default:n(92),__esModule:!0}},function(e,t,n){var r=n(6);e.exports=function(e){if(!r(e))throw TypeError(e+" is not an object!");return e}},function(e,t,n){var r=n(22);e.exports=function(e,t,n){if(r(e),void 0===t)return e;switch(n){case 1:return function(n){return e.call(t,n)};case 2:return function(n,r){return e.call(t,n,r)};case 3:return function(n,r,a){return e.call(t,n,r,a)}}return function(){return e.apply(t,arguments)}}},function(e,t,n){var r=n(4),a=n(23);e.exports=n(5)?function(e,t,n){return r.f(e,t,a(1,n))}:function(e,t,n){return e[t]=n,e}},function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.globalUserInfo=t.headersGetFun=t.base64ToArrayBuffer=t.arrayBufferToBase64=t.serialize=t.performanceHwa=t.fetchPerformance=t.isIOS=t.emptyFun=t.encode=t.mappingField=t.callBackField=t.processData=t.mappingParameter=t.config=t.cloudonlineCallBack=t.mappingApiName=t.hwaAction=t.getWecodeInfo=t.decode=void 0;var r=m(n(19)),a=m(n(81)),o=m(n(20)),i=m(n(14)),u=m(n(15)),c=m(n(7)),s=m(n(57)),f=m(n(129)),l=m(n(36)),d=m(n(31)),p=n(82),h=n(59),v=n(130);function m(e){return e&&e.__esModule?e:{default:e}}var g=function(e){return e&&"string"==typeof e?s.default.encode(unescape(encodeURIComponent(e))):""},y=function(e){return e&&"string"==typeof e?decodeURIComponent(escape(s.default.decode(e))):""},w=function(e){return Object(e)===e},_={},b=null,k=function(){return new c.default(function(){var t=(0,u.default)(i.default.mark(function t(n){return i.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:if(!b){t.next=3;break}return n(b),t.abrupt("return");case 3:return t.next=5,e.HWH5&&e.HWH5.wecodeInfo&&e.HWH5.wecodeInfo({common_internal_call:!0});case 5:b=t.sent,n(b);case 7:case"end":return t.stop()}},t,void 0)}));return function(e){return t.apply(this,arguments)}}())},x=function(e){var t=(0,o.default)({funcName:"hwa",data:e});HWH5.callMethod(t)},N=function e(t,n){var r=t;return r.data?r.data=e(r.data,n):r=Array.isArray(r)?r.map(function(t){return e(t,n)}):I(r,v.fields,n),r},C=function(e,t){var n={},o=[].concat((0,a.default)(l.default),(0,a.default)(d.default));return(0,r.default)(e).forEach(function(r){var i=!1;o.forEach(function(o){r!==o.nativeName&&r!==o.schema||(function(e){var t=[];return[].concat((0,a.default)(l.default),(0,a.default)(d.default)).forEach(function(n){e!==n.nativeName&&e!==n.schema||t.push(n)}),t}(r).length>1?-1!==t.indexOf(o.apiName)&&(n[o.apiName]=e[r]):n[o.apiName]=e[r],i=!0)}),i||(n[r]=e[r])}),n},I=function(e,t,n){var r=e;return t.forEach(function(t){var n=t.origin,a=t.target;void 0!==e[n]&&void 0===r[a]&&(r[a]=e[n])}),"function"==typeof h.apisAttrInterception[n]?h.apisAttrInterception[n](r):r},S=function(){if(!e.navigator)return!1;var t=e.navigator.userAgent||e.navigator.vendor||e.opera;return!(!/iPad|iPhone|iPod|Mac/.test(t)||e.MSStream)};var P=new function(){var e=null;this.getGlobalUserInfo=function(){return e&&e.corpUserId?c.default.resolve(e):new c.default(function(t){HWH5.getUserInfo({common_internal_call:!0}).then(function(n){t(e=n)})})}};t.decode=y,t.getWecodeInfo=k,t.hwaAction=function(t,n,r,a,i){return new c.default(function(u){if(!n||!n.common_internal_call){if("wecodeInfo"!==r){if(e.HWH5&&!e.HWH5.wecodeInfo){var c={eventId:"WELINK_ONLINE_JSAPI_HWA",eventLabel:"WeLink online JSAPI HWA",extendData:(0,o.default)({apiname:a,payload:i||void 0,jssdk:f.default,time:new Date-0,appId:e.location.href,type:t})};return void x(c)}k().then(function(e){var n={eventId:"WELINK_JSAPI_HWA",eventLabel:"WeLink JSAPI HWA",extendData:(0,o.default)({apiname:a,payload:i||void 0,jssdk:f.default,time:new Date-0,appId:e.appId,type:t})};x(n)})}u()}})},t.mappingApiName=C,t.cloudonlineCallBack=function(e,t,n){var r=t;"config"===e.funcName?(r.data=JSON.parse(r.data),_.status=r.data.status,_.errorCode=r.data.errorCode,_.msg=r.data.msg,"1"===r.data.status?(0,p.emit)("__config_ready__"):(0,p.emit)("__config_error__",_)):(r.data=JSON.parse(r.data),r.data.jsApiList=C(r.data.jsApiList,e.data.apiNameList),n(r.data))},t.config=_,t.mappingParameter=function(e,t){var n=t;return v.params.forEach(function(r){var a=r.funcName,o=r.mapping;a===e&&(n=I(t,o))}),n},t.processData=N,t.callBackField=function(e,t){var n={};try{n=JSON.parse(e)}catch(t){console.log("error occured in callback Native",e,t)}var r=y(n.data),a=w(r);if("string"==typeof r&&"undefined"!==r)try{r=JSON.parse(r),a=w(r)}catch(e){a=!1}return a&&(r=N(r,t),r=g((0,o.default)(r)),n.data=r),n},t.mappingField=I,t.encode=g,t.emptyFun=function(){},t.isIOS=S,t.fetchPerformance={},t.performanceHwa=function(e,t,n,r){k().then(function(a){var i={eventId:"WELINK_JSAPI_HWA_FETCH",eventLabel:"WeLink JSAPI HWA FETCH",extendData:(0,o.default)({apiName:e,url:t,time:n,status:r,appId:a.appId})};x(i)})},t.serialize=function(e){return(0,r.default)(e).map(function(t){return encodeURIComponent(t)+"="+encodeURIComponent(e[t])}).join("&")},t.arrayBufferToBase64=function(e){for(var t="",n=new Uint8Array(e),r=n.byteLength,a=0;a=t.length?{value:void 0,done:!0}:(e=r(t,n),this._i+=e.length,{value:e,done:!1})})},function(e,t){e.exports={}},function(e,t,n){var r=n(49),a=n(44);e.exports=function(e){return r(a(e))}},function(e,t,n){e.exports={default:n(113),__esModule:!0}},function(e,t,n){e.exports={default:n(116),__esModule:!0}},function(e,t){e.exports=!0},function(e,t){e.exports=function(e){if("function"!=typeof e)throw TypeError(e+" is not a function!");return e}},function(e,t){e.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},function(e,t,n){var r=n(69),a=n(52);e.exports=Object.keys||function(e){return r(e,a)}},function(e,t){var n={}.toString;e.exports=function(e){return n.call(e).slice(8,-1)}},function(e,t,n){var r=n(4).f,a=n(13),o=n(2)("toStringTag");e.exports=function(e,t,n){e&&!a(e=n?e:e.prototype,o)&&r(e,o,{configurable:!0,value:t})}},function(e,t,n){var r=n(44);e.exports=function(e){return Object(r(e))}},function(e,t,n){n(98);for(var r=n(1),a=n(10),o=n(17),i=n(2)("toStringTag"),u="CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,TextTrackList,TouchList".split(","),c=0;cw;w++)if((m=t?y(i(h=e[w])[0],h[1]):y(e[w]))===s||m===f)return m}else for(v=g.call(e);!(h=v.next()).done;)if((m=a(v,y,h.value,t))===s||m===f)return m}).BREAK=s,t.RETURN=f},function(e,t){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(e){"object"==typeof window&&(n=window)}e.exports=n},function(e,t,n){"use strict";var r=[];r=n(107),e.exports=r},function(e,t,n){var r=n(43),a=Math.min;e.exports=function(e){return e>0?a(r(e),9007199254740991):0}},function(e,t){var n=0,r=Math.random();e.exports=function(e){return"Symbol(".concat(void 0===e?"":e,")_",(++n+r).toString(36))}},function(e,t,n){var r=n(25),a=n(2)("toStringTag"),o="Arguments"==r(function(){return arguments}());e.exports=function(e){var t,n,i;return void 0===e?"Undefined":null===e?"Null":"string"==typeof(n=function(e,t){try{return e[t]}catch(e){}}(t=Object(e),a))?n:o?r(t):"Object"==(i=r(t))&&"function"==typeof t.callee?"Arguments":i}},function(e,t,n){(function(t){var n;n="undefined"!=typeof window?window:void 0!==t?t:"undefined"!=typeof self?self:{},e.exports=n}).call(this,n(30))},function(e,t,n){"use strict";var r=[];r=n(106),e.exports=r},function(e,t,n){"use strict";t.__esModule=!0;var r=i(n(131)),a=i(n(133)),o="function"==typeof a.default&&"symbol"==typeof r.default?function(e){return typeof e}:function(e){return e&&"function"==typeof a.default&&e.constructor===a.default&&e!==a.default.prototype?"symbol":typeof e};function i(e){return e&&e.__esModule?e:{default:e}}t.default="function"==typeof a.default&&"symbol"===o(r.default)?function(e){return void 0===e?"undefined":o(e)}:function(e){return e&&"function"==typeof a.default&&e.constructor===a.default&&e!==a.default.prototype?"symbol":void 0===e?"undefined":o(e)}},function(e,t){t.f={}.propertyIsEnumerable},function(e,t,n){"use strict";t.__esModule=!0;var r=function(e){return e&&e.__esModule?e:{default:e}}(n(144));t.default=r.default||function(e){for(var t=1;t0?r:n)(e)}},function(e,t){e.exports=function(e){if(void 0==e)throw TypeError("Can't call method on "+e);return e}},function(e,t,n){"use strict";var r=n(21),a=n(3),o=n(67),i=n(10),u=n(17),c=n(94),s=n(26),f=n(97),l=n(2)("iterator"),d=!([].keys&&"next"in[].keys()),p=function(){return this};e.exports=function(e,t,n,h,v,m,g){c(n,t,h);var y,w,_,b=function(e){if(!d&&e in C)return C[e];switch(e){case"keys":case"values":return function(){return new n(this,e)}}return function(){return new n(this,e)}},k=t+" Iterator",x="values"==v,N=!1,C=e.prototype,I=C[l]||C["@@iterator"]||v&&C[v],S=I||b(v),P=v?x?b("entries"):S:void 0,E="Array"==t&&C.entries||I;if(E&&(_=f(E.call(new e)))!==Object.prototype&&_.next&&(s(_,k,!0),r||"function"==typeof _[l]||i(_,l,p)),x&&I&&"values"!==I.name&&(N=!0,S=function(){return I.call(this)}),r&&!g||!d&&!N&&C[l]||i(C,l,S),u[t]=S,u[k]=p,v)if(y={values:x?S:b("values"),keys:m?S:b("keys"),entries:P},g)for(w in y)w in C||o(C,w,y[w]);else a(a.P+a.F*(d||N),t,y);return y}},function(e,t,n){var r=n(6),a=n(1).document,o=r(a)&&r(a.createElement);e.exports=function(e){return o?a.createElement(e):{}}},function(e,t,n){var r=n(6);e.exports=function(e,t){if(!r(e))return e;var n,a;if(t&&"function"==typeof(n=e.toString)&&!r(a=n.call(e)))return a;if("function"==typeof(n=e.valueOf)&&!r(a=n.call(e)))return a;if(!t&&"function"==typeof(n=e.toString)&&!r(a=n.call(e)))return a;throw TypeError("Can't convert object to primitive value")}},function(e,t,n){var r=n(8),a=n(68),o=n(52),i=n(50)("IE_PROTO"),u=function(){},c=function(){var e,t=n(46)("iframe"),r=o.length;for(t.style.display="none",n(70).appendChild(t),t.src="javascript:",(e=t.contentWindow.document).open(),e.write(" - diff --git a/src/components/CustomFormComponents/InputForAllStandards.vue b/src/components/CustomFormComponents/InputForAllStandards.vue index ed9bae380..d33c1a176 100644 --- a/src/components/CustomFormComponents/InputForAllStandards.vue +++ b/src/components/CustomFormComponents/InputForAllStandards.vue @@ -5,6 +5,7 @@ :prop="config.attrField" :label-width="labelWidth" class="add-form-item" + style="width: 100%;" :class="{'form-item-disabled': disabled}" > - + @@ -125,8 +126,8 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace">
- 取消 - 提交 + 取消 + 提交
@@ -176,7 +177,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: 'ALL', + standType: '', quoteIdList: '', validFlag: '0', menuId: 'nomenu' diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue new file mode 100644 index 000000000..48ffe0938 --- /dev/null +++ b/src/components/CustomFormComponents/InputForAllStandards2.vue @@ -0,0 +1,349 @@ + + + + + diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index b9f5ea7d2..50581f7bd 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -38,13 +38,20 @@
- + + + + - + 手动查找 + type="primary" + class="common-button-primary" + size="mini" + style="position:absolute;top: 10px;right: 0;" + @click="selectLaws" + v-if="(processModel && !disabled) || !processModel" + >手动查找 +
- - - - - - - - - - - - + + + + + + + + + + + + + v-model="replaceLawsNumForm.numberName" + placeholder="根据企标编号/标准名称查找" + clearable + :maxlength="100"> + type="primary" + class="common-button-primary" + round + @click="getReplaceLawsNumRowSearch"> 查询 + class="common-button-default" + round + type="default" + @click="getResetLawsNumRow"> 清空 @@ -75,77 +80,87 @@
+ @selection-change="selectReplaceStandNumRowChange"> + type="selection" + width="55" + align="center"> - - - - - - + + + + + + + label="企标编号" + min-width="130"> + prop="standName" + label="标准名称" + min-width="130"> + prop="issueTime" + label="发布日期" + width="130"> + prop="putTime" + label="实施日期" + width="130"> + prop="standStatusShow" + label="文本状态" + width="130"> - {{$t('m.dataAcquisition')}} + {{ $t('m.dataAcquisition') }} + style="position: relative;" + :page="replacePage" + :total="replaceTotal" + @pageChange="pageChangeReplace" + @pageSizeChange="pageSizeChangeReplace">
- 取消 - 提交 + 取消 + + 提交 +
- + @@ -180,7 +195,7 @@ export default { default: '150px' } }, - data () { + data() { return { replaceLawsNumModel: false, sarBussionessLawsEO: { @@ -212,28 +227,28 @@ export default { } }, computed: { - placeholder () { + placeholder() { return `请输入${this.config.attrName}` }, - showMessage () { + showMessage() { return `${this.config.attrName}不能为空` }, - isRequired () { + isRequired() { return !!this.config.isMust } }, methods: { - getReplaceLawsNumRowSearch () { + getReplaceLawsNumRowSearch() { this.replaceLawsNumForm.page = 1 this.replacePage = 1 this.getReplaceLawsNumRow() }, - handleChange (event) { + handleChange(event) { // const value = event.target.value const value = event this.$emit('input', value) }, - selectLaws () { + selectLaws() { // if (this.standNumFlag === 1) { // this.$refs.selections.selectAll(false) // } @@ -242,7 +257,7 @@ export default { this.getReplaceLawsNumRow() }, // 代替政策号 请求数据 - getReplaceLawsNumRow () { + getReplaceLawsNumRow() { if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') { this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1 } else { @@ -257,7 +272,7 @@ export default { formData.standType = this.replaceLawsNumForm.dataSource === 'INLAND_STAND' ? 'INLAND' : this.replaceLawsNumForm.dataSource === 'FOREIGN_STAND' ? 'FOREIGN' : '' formData.standNumber = formData.numberName - let url = this.replaceLawsNumForm.dataSource === 'BUSINESS' ? 'lawss/sarBussionessStand/getSarBussionStandPage' : 'sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage' + let url = this.replaceLawsNumForm.dataSource === 'BUSINESS' ? 'lawss/sarBussionessStand/getSarBussionStandPage' : 'sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage' this.$http.get(url, formData, { _this: this, loading: 'replaceLoading' @@ -277,27 +292,27 @@ export default { }) }, // 代替政策编号-取消 - replaceLawsNumModelCancel () { + replaceLawsNumModelCancel() { // this.replaceLawsNumModel = false this.$refs.selections.clearSelection() }, // 代替政策号 table选择事件 - selectReplaceStandNumRowChange (row) { + selectReplaceStandNumRowChange(row) { this.selectedListRep = row }, // 代替政策分页 - pageChangeReplace (page) { + pageChangeReplace(page) { this.replacePage = page this.replaceLawsNumForm.page = page this.getReplaceLawsNumRow() }, - pageSizeChangeReplace (pageSize) { + pageSizeChangeReplace(pageSize) { // this.replaceRows = pageSize this.replaceLawsNumForm.pageSize = pageSize this.getReplaceLawsNumRow() }, // 代替政策编号确定 - replaceLawsNumModelBt () { + replaceLawsNumModelBt() { let textArr = [] if (typeof this.value === 'string') { @@ -342,7 +357,7 @@ export default { this.$refs.selections.clearSelection() }, // 点击查看 - handlePreview (item) { + handlePreview(item) { let name = '' let pageType = '' switch (this.dataSource) { @@ -369,7 +384,7 @@ export default { window.open(routeUrl.href, '_blank') }, - getResetLawsNumRow () { + getResetLawsNumRow() { this.replaceLawsNumForm = { dataSource: 'BUSINESS', numberName: '', // 政策编号 @@ -387,13 +402,23 @@ export default { diff --git a/src/components/index.js b/src/components/index.js index d5f444b04..cb817aa18 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -26,6 +26,9 @@ import MechanismTree from './mechanismTree' import SQTree from './SQTree' import OrgTable from './OrgTable' import MySelect from './mySelect' +import PhoneHistortTable from './phoneHistortTable' + +import phoneRole from './phoneRole' const install = function (Vue) { Vue.component('loading', Loading) @@ -52,6 +55,8 @@ const install = function (Vue) { Vue.component('RoleTree', RoleTree) Vue.component('MechanismTree', MechanismTree) Vue.component('MySelect', MySelect) + Vue.component('phoneRole', phoneRole) + Vue.component('PhoneHistortTable', PhoneHistortTable) } export default { diff --git a/src/components/mechanismTree/index.vue b/src/components/mechanismTree/index.vue index a134dbbdd..fca2173aa 100644 --- a/src/components/mechanismTree/index.vue +++ b/src/components/mechanismTree/index.vue @@ -2,6 +2,7 @@
{ this.treeData = res.data - console.log(this.treeData); this.nodeKeyId = this.treeData[0].id this.id = res.data[0].id }, e => { diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index e9e9b928e..37d3d434e 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -111,27 +111,55 @@ path: '/domesticStandardsAndRegulations', menuId: '3e3657498664beaa0dc1de1ecb3ae0da' }, - // { - // title: '零部件编号申请', - // path: '/partCodeApply', - // menuId: 'ad9db496772c075f78495382b7581fe9' - // }, - { - title: '工作组数据统计', - path: '/dataStatisComments', - menuId: '' - }, { title: '海外法规', path: '/foreignStandardsAndRegulations', menuId: '18c1e5134ea0cf865e8960b26b81fd8c' }, + { + title: '企业标准', + path: '/enterpriseStandardDatabase', + menuId: '01ed8f752748227777b3572d56ee9ab5' + }, + { + title: '企标计划', + path: '/enterpriseStandardPlan', + // menuId: '8a9c87fe06244fb9d55e78fb281f625b' + }, + { + title: '法规清单', + path: '/accessStandardsAndRegulations', + menuId: '08dbd417864b08426034ca56d1fa3d02' + }, + { + title: '未符合项', + path: '/nonConfomity', + menuId: '0119abd677e0204e061eb0f0b8cafda0' + }, + { + title: '工作组', + path: '/workingGroup', + }, { title: '征求意见', path: '/standardForComments', menuId: '2b25c67f10abbbadf37d60daaaec54d3' }, - + { + title: '合规评估', // 把 标准涉及项目 这几个字 改成 标准合规评估结果 + path: '/standInvolveProject', + menuId: '8a9c87fe06244fb9d55e78fb281f625b' + }, + // { + // title: '零部件编号申请', + // path: '/partCodeApply', + // menuId: 'ad9db496772c075f78495382b7581fe9' + // }, + // { + // title: '工作组统计', + // path: '/dataStatisComments', + // menuId: '' + // }, { title: '国内外政策', path: '/foreignRegulationsDatabase', @@ -141,11 +169,6 @@ // // // title: '标准制修订管理', // // // path: '/demo2One' // // // }, - { - title: '法规清单', - path: '/accessStandardsAndRegulations', - menuId: '08dbd417864b08426034ca56d1fa3d02' - }, // // { // // title: '标准法规清单详情', // // path: '/details' @@ -158,11 +181,6 @@ // // // title: '本地产品/项目库', // // // path: '/localProductsOrProjectLibrary' // // // }, - { - title: '企业标准', - path: '/enterpriseStandardDatabase', - menuId: '01ed8f752748227777b3572d56ee9ab5' - }, // { // title: '企标制修订计划', // path: '/enterBSysRevPlanManaLib', @@ -177,30 +195,11 @@ path: '/localProductsOrProjectLibrary', menuId: '42ce39c9f953be65a3e5643a4a2c786f' },*/ - { - title: '未符合项', - path: '/nonConfomity', - menuId: '0119abd677e0204e061eb0f0b8cafda0' - }, - { - title: '工作组', - path: '/workingGroup', - }, // { // title: '备案产品标准库', // path: '/enterpriseStandardFiling', // menuId: 'MQBAGJQMSRZDRX3X5AVR' // }, - { - title: '合规评估', // 把 标准涉及项目 这几个字 改成 标准合规评估结果 - path: '/standInvolveProject', - menuId: '8a9c87fe06244fb9d55e78fb281f625b' - }, - { - title: '企标制修订计划', - path: '/enterpriseStandardPlan', - // menuId: '8a9c87fe06244fb9d55e78fb281f625b' - } // { // title: '动态信息', // path: '/information', @@ -282,6 +281,13 @@ menuId: 'asfdew33', isChildren: true // 判断没有子菜单 }, + { + title: '资料中心', + path: '/dataCenter', + 'icon-class': 'el-icon-s-order', + menuId: '', + isChildren: true // 判断没有子菜单 + }, // { // title: '技术要求清单', // path: '/skillReq', @@ -611,6 +617,7 @@ color: #fff; } .nav-menu /deep/.el-submenu__title i { + font-size: 16px; color: #fff; } .nav-menu{ @@ -636,6 +643,7 @@ } .el-menu-item { + font-size: 16px; span { margin-left: 5px; font-weight: normal; @@ -672,6 +680,7 @@ background-color: red; } /deep/.el-submenu__title { + font-size: 16px; padding: 0 16px !important; span { font-weight: normal; @@ -706,7 +715,7 @@ } .el-menu-item { padding-left: 29px !important; - font-size: 14px; + font-size: 16px; font-weight: normal; height: 40px; line-height: 40px; diff --git a/src/components/phoneHistortTable/index.vue b/src/components/phoneHistortTable/index.vue new file mode 100644 index 000000000..66c24d901 --- /dev/null +++ b/src/components/phoneHistortTable/index.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/src/components/phoneRole/index.vue b/src/components/phoneRole/index.vue new file mode 100644 index 000000000..1716fd155 --- /dev/null +++ b/src/components/phoneRole/index.vue @@ -0,0 +1,265 @@ + + + + + diff --git a/src/main.js b/src/main.js index 5b6945484..569a45775 100644 --- a/src/main.js +++ b/src/main.js @@ -10,6 +10,7 @@ import 'element-ui/lib/theme-chalk/index.css' import $ from 'jquery' // vuex import store from './store' +import Axios from 'axios' // 复制 import VueClipboard from 'vue-clipboard2' // 全局样式文件 @@ -51,210 +52,292 @@ import router from './router' // 路由解析器 import Re from 'path-to-regexp' -import { get_verify_by_instance,loginIdm,getMenu } from 'api/process' +import { get_verify_by_instance,loginIdm,getMenu,loginMobile } from 'api/process' +import hwh5 from 'api/hwh5-cloudonline.js'; import { ssoLoginUrlDev,ssoLoginUrl,webLoginType,devWebUrl } from '@/sysConfig' import { mapMutations, mapActions } from 'vuex' +import isMobile from "./store/isMobile"; // 路由拦截 router.beforeEach(function (to, from, next) { - let toName = to.name - let token = store.state.token - let path = to.path; - let requireAuth = to.meta.requireAuth; - let taskId = to.query.taskIds; - let prcId = to.query.prcId; - let prcNum = to.query.prcNum; - let prcName = to.query.prcName; - let prcType = to.query.prcType; - let routerType = to.query.routerType; - let param = "taskIds=" + taskId + "&prcId=" + prcId - + "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType; - let url = window.location.search - let code = ""; - if(url){ - url = url.substr(1); - url = url.split('&'); - let info = []; - let obj = {}; - for (let i = 0,len = url.length; i < len; i++) { - info = url[i].split('=') - obj[info[0]] = decodeURI(info[1]); - url[i] = obj; - } - code = url[0].code + let toName = to.name + let token = store.state.token + let path = to.path; + let requireAuth = to.meta.requireAuth; + let taskId = to.query.taskIds; + let prcId = to.query.prcId; + let prcNum = to.query.prcNum; + let prcName = to.query.prcName; + let prcType = to.query.prcType; + let routerType = to.query.routerType; + let param = "taskIds=" + taskId + "&prcId=" + prcId + + "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType; + let param4 = { + path: path, + token: token, + taskId: taskId, + prcId: prcId, + prcNum: prcNum, + prcName: prcName, + prcType: prcType, + toName: toName + } + let url = window.location.search + let code = ""; + if(url){ + url = url.substr(1); + url = url.split('&'); + let info = []; + let obj = {}; + for (let i = 0,len = url.length; i < len; i++) { + info = url[i].split('=') + obj[info[0]] = decodeURI(info[1]); + url[i] = obj; } + code = url[0].code + } - function extractedLocalStorage(url,param) { - localStorage.removeItem("routerUrl") - localStorage.setItem('routerUrl', url) - localStorage.removeItem("routerParam") - localStorage.setItem('routerParam', param) - } - // 返回值为登录状态 - if ((token === null || token === '' ) && toName !== 'Login') { - if(webLoginType != null && webLoginType === 'idm' ){ - if(code){ - next() - }else { - if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { - extractedVerify(token) - }else { - if(path === '/standardSearch/All'){ - extractedLocalStorage('standardSearch/All',''); - }else { - extractedLocalStorage('home2',''); - } - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev - } - } - }else if(webLoginType != null && webLoginType === 'dev'){ - next('/Login') - } + function extractedLocalStorage(url,param,param4) { + localStorage.removeItem("routerUrl") + localStorage.setItem('routerUrl', url) + localStorage.removeItem("routerParam") + localStorage.setItem('routerParam', param) + } + // 返回值为登录状态 + /** 判断是不是在手机端操作 */ + if (isMobile()) { + if(toName === 'processCenter'){ + hwh5.close(); }else { - extractedVerify(token) - } - - function extractedVerify() { - if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { - get_verify_by_instance({ - taskId: taskId, // 任务id - pId: prcId // 流程实例 - }).then(res => { - let hisCount = res.hisCount === undefined ? 0 : res.hisCount; - let commitStatus = res.commitStatus === undefined ? 0 : res.commitStatus; - let isNotFinished = res.isNotFinished === undefined ? 0 : res.isNotFinished; - - if (hisCount && hisCount > 0) { // 业务系统 当前节点已完成 - // 根据type判断跳转具体流程页面 - if (prcType === '1') { - // 标准入库流程数据 - extracted("bzrkStep5"); - } else if (prcType === '4') { - //标准清单发布流程数据 - extracted("bzqdfbStep1-4"); - } else if (prcType === '5') { - //标准项目合规评估 标准维度 - if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") { - extracted("xmpgStep1-2"); - } else { - extracted("xmpgStep1-7"); - } - } else if (prcType === '6') { - //标准项目合规评估 项目维度 - if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") { - extracted("xmpg2Step1-2"); - } else { - extracted("xmpg2Step1-12"); - } - } else if (prcType === '8') { - // 未符合项整改 - extracted("wfhxzgStep5-1"); - } else if (prcType === '9') { - extracted("bzjdStep1-6"); - //标准调研流程 - } else if (prcType === '2') { - extracted("bzdyStep1-9"); - } else if (prcType === '3') { - //标准征求意见 - extracted("bzzqyjStep1-9"); - } else if (prcType === '10') { - //项目清单确认 - extracted("xmqdqrStep1-3"); - } - } else { // 业务系统 当前节点未完成 - // commitStatus 大于0 表示当前节点存在未完成干活流程 - // isNotFinished OA 系统显示接受任务 已置为已办 - if (routerType && routerType === 'oa' &&isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) { - if (prcType === '3') { - //标准征求意见 接受节点 未完成 oa已办 跳转详情页面 - if (path === '/bzzqyjStep3') { - extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); - } - }else if (prcType === '5') { - if (path === '/xmpgStep4') { - extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); - } - }else if (prcType === '2') { - if (path === '/bzdyStep3') { - extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); - } - }else if (prcType === '9') { - if (path === '/bzjdStep3') { - extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); - } - }else if (prcType === '6') { - if (path === '/xmpg2Step6') { - extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); - } - }else if (prcType === '10') { - if (path === '/xmqdqrStep2') { - extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); - } - }else if (prcType === '8') { - if (path === '/wfhxzgStep4') { - extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); - } - } - } else { - // oa 待测 sso - extracted3() - } - } - function extracted(routerPath) { - if (token === null || token === '') { - extractedLocalStorage(routerPath,param); - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev - } else { - next({path: routerPath + '?' +param}) - } - } - - function extracted3() { - if (token === null || token === '') { - extractedLocalStorage(toName,param); - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev - } else { - next() - } - } - function extracted2(routerPath,param2) { - if (token === null || token === '') { - extractedLocalStorage(routerPath,param2); - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev - } else { - next({path: routerPath + '?' + param2}) - } - } - }) - } - if(path === '/loginVerify'){ - if(webLoginType != null && webLoginType === 'dev'){ - next('/Login') - }else { - next() - } + if ((token === null || token === '' ) && toName !== 'Login') { + if(toName !== 'phoneIndex'){ + localStorage.removeItem("param"); + localStorage.setItem('param',JSON.stringify(param4)) + next('/phoneIndex') }else { - next() + next() } + } else { + if (toName.slice(0,5) !== 'phone') { + if(toName === 'LoginVerify'){ + next('/blankPage') + }else { + if(toName === 'blankPage' || toName === 'processedPage') { + next() + }else { + extractedVerify() + } + } + }else { + if(toName !== 'blankPage'){ + if(to.matched.length === 0){ + next('/blankPage') + }else { + next() + } + }else { + next() + } + } + } } + } else { + if ((token === null || token === '' ) && toName !== 'Login') { + if(webLoginType != null && webLoginType === 'idm' ){ + if(code){ + next() + }else { + if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { + extractedVerify(token) + }else { + if(path === '/standardSearch/All'){ + extractedLocalStorage('standardSearch/All',''); + }else { + extractedLocalStorage('home2',''); + } + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } + } + }else if(webLoginType != null && webLoginType === 'dev'){ + if (isMobile()) { + extractedVerify(token) + } else { + next('/Login') + } + + } + }else { + extractedVerify(token) + } + } + + function extractedVerify() { + if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { + get_verify_by_instance({ + taskId: taskId, // 任务id + pId: prcId // 流程实例 + }).then(res => { + let hisCount = res.hisCount === undefined ? 0 : res.hisCount; + let commitStatus = res.commitStatus === undefined ? 0 : res.commitStatus; + let isNotFinished = res.isNotFinished === undefined ? 0 : res.isNotFinished; + + if ((hisCount && hisCount > 0)) { // 业务系统 当前节点已完成 + if(isMobile()){ + next('/processedPage') + }else { + // 根据type判断跳转具体流程页面 + if (prcType === '1') { + // 标准入库流程数据 + extracted("bzrkStep5"); + } else if (prcType === '4') { + //标准清单发布流程数据 + extracted("bzqdfbStep1-4"); + } else if (prcType === '5') { + //标准项目合规评估 标准维度 + if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") { + extracted("xmpgStep1-2"); + } else { + extracted("xmpgStep1-7"); + } + } else if (prcType === '6') { + //标准项目合规评估 项目维度 + if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") { + extracted("xmpg2Step1-2"); + } else { + extracted("xmpg2Step1-12"); + } + } else if (prcType === '8') { + // 未符合项整改 + extracted("wfhxzgStep5-1"); + } else if (prcType === '9') { + extracted("bzjdStep1-6"); + //标准调研流程 + } else if (prcType === '2') { + extracted("bzdyStep1-9"); + } else if (prcType === '3') { + //标准征求意见 + extracted("bzzqyjStep1-9"); + } else if (prcType === '10') { + //项目清单确认 + extracted("xmqdqrStep1-3"); + } + } + } else { // 业务系统 当前节点未完成 + // commitStatus 大于0 表示当前节点存在未完成干活流程 + // isNotFinished OA 系统显示接受任务 已置为已办 + if (routerType && routerType === 'oa' &&isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) { + if(isMobile()) { + extractedIphone() + }else if (prcType === '3') { + //标准征求意见 接受节点 未完成 oa已办 跳转详情页面 + if (path === '/bzzqyjStep3') { + extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); + } + }else if (prcType === '5') { + if (path === '/xmpgStep4') { + extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); + } + }else if (prcType === '2') { + if (path === '/bzdyStep3') { + extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); + } + }else if (prcType === '9') { + if (path === '/bzjdStep3') { + extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); + } + }else if (prcType === '6') { + if (path === '/xmpg2Step6') { + extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); + } + }else if (prcType === '10') { + if (path === '/xmqdqrStep2') { + extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); + } + }else if (prcType === '8') { + if (path === '/wfhxzgStep4') { + extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); + } + } + } else { + if(isMobile()) { + extractedIphone() + }else{ + extracted3() + } + + } + } + function extracted(routerPath) { + if (token === null || token === '') { + extractedLocalStorage(routerPath,param); + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } else { + next({path: routerPath + '?' +param}) + } + } + + function extracted3() { + if (token === null || token === '') { + extractedLocalStorage(toName,param); + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } else { + next() + } + } + + function extractedIphone() { + let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + + '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType + let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) + next({path: phoneRouter + '?' + paramPhone}) + } + function extracted2(routerPath,param2) { + if (token === null || token === '') { + extractedLocalStorage(routerPath,param2); + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } else { + next({path: routerPath + '?' + param2}) + } + } + function extracted4(routerPath,param4) { + if (token === null || token === '') { + extractedLocalStorage(routerPath,param4); + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } else { + next({path: routerPath + '?' + param4}) + } + } + }) + } + if(path === '/loginVerify'){ + if(webLoginType != null && webLoginType === 'dev'){ + next('/Login') + }else { + next() + } + }else { + next() + } + } }) // 设置用户信息 function setUserInfo (userInfo) { - const timeStamp = new Date().getTime().toString() - const _USERINFO = JSON.parse(userInfo) - _USERINFO.userId = _USERINFO.userId || _USERINFO.usId - _USERINFO.userName = _USERINFO.userName || _USERINFO.uName - try { - localStorage.setItem('userInfo', JSON.stringify(_USERINFO)) - localStorage.setItem('userInfoModifyTime', timeStamp) - } catch (e) {} + const timeStamp = new Date().getTime().toString() + const _USERINFO = JSON.parse(userInfo) + _USERINFO.userId = _USERINFO.userId || _USERINFO.usId + _USERINFO.userName = _USERINFO.userName || _USERINFO.uName + try { + localStorage.setItem('userInfo', JSON.stringify(_USERINFO)) + localStorage.setItem('userInfoModifyTime', timeStamp) + } catch (e) {} } @@ -279,16 +362,16 @@ Vue.prototype.simpleUploadPath = simpleUploadPath Vue.prototype.$moment = moment // 国际化 const i18n = new VueI18n({ - locale: store.getters.getLanguage || 'cn', // 定义默认语言为中文 - messages: { - cn: require('@/assets/languages/cn'), - en: require('@/assets/languages/en') - } + locale: store.getters.getLanguage || 'cn', // 定义默认语言为中文 + messages: { + cn: require('@/assets/languages/cn'), + en: require('@/assets/languages/en') + } }) /* eslint-disable no-new */ window.vm = new Vue({ - router, - store, - i18n, - render: h => h(App) + router, + store, + i18n, + render: h => h(App) }).$mount('#app') diff --git a/src/pages/blankPage/index.vue b/src/pages/blankPage/index.vue new file mode 100644 index 000000000..160185587 --- /dev/null +++ b/src/pages/blankPage/index.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/pages/config/pages/attributeCustom/components/buss.vue b/src/pages/config/pages/attributeCustom/components/buss.vue index e45fbcff2..e0b1918aa 100644 --- a/src/pages/config/pages/attributeCustom/components/buss.vue +++ b/src/pages/config/pages/attributeCustom/components/buss.vue @@ -77,7 +77,7 @@ 编辑 - 删除 + 删除
diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue index 69a6e9f69..dc59712d8 100644 --- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue +++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue @@ -185,7 +185,7 @@ export default { pubOrgName: '', content: '', linkUri: '', - uploadPath: 'uploadPath', + uploadPath: 'file', resPk: '', fileList: [], picList: [], diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue index 1a97d9e98..44e1c8863 100644 --- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue +++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue @@ -174,7 +174,7 @@ export default { pubOrgName: '', content: '', linkUri: '', - uploadPath: 'uploadPath', + uploadPath: 'file', resPk: '', fileList: [], picList: [], diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 4bb1ef841..cdc948f50 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -2276,7 +2276,7 @@ export default { }else { const nowTime = new Date().getTime() // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); - // window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) + // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) } // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) } diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue index dffdfcbf3..2a55b0ad1 100644 --- a/src/pages/details/otherLawsStandDetails/index.vue +++ b/src/pages/details/otherLawsStandDetails/index.vue @@ -17,7 +17,7 @@ >
+ style="border-top:none; position: absolute;right: 36px;border: none">
@@ -1516,7 +1516,7 @@ export default { }else { const nowTime = new Date().getTime() // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); - // window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) + // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) } // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) } diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 970392e3e..1404296b9 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -46,7 +46,7 @@
@@ -214,9 +231,6 @@ import ProcessTitle from "../../components/ProcessTitle"; import { completeTask, inboundLiaisonDetail, - startProcess, - saveinboundTask, - saveTaskForPub, } from "@/api/process.js" export default { @@ -248,7 +262,7 @@ export default { workPath: '', comityTel: [], comityOpRole: '', - comityInRoleId: '', + comityOpRoleId: '', }, roleForm: {}, commentText: '', @@ -278,9 +292,6 @@ export default { this.getData() }, methods: { - phoneClick () { - this.$router.push('/phoneBzrhStep2') - }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -308,7 +319,6 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData - this.rh_pageData.comityOpRole = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList @@ -318,7 +328,11 @@ export default { handleTabs(name) { this.active = name }, - + // 预览 + fileLook(file) { // 预览 + const attId = file.id + this.$preview(attId) + }, /** 点击对应附件进行下载*/ previews(val) { let attId = val @@ -326,6 +340,30 @@ export default { window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; } }, + + /** 选择入会人员 */ + choiceRole() { + this.nodeList = [] + if (this.rh_pageData.comityOpRoleId.length > 0) { + this.nodeList = this.rh_pageData.comityOpRoleId.split(',') + } + this.roleShowflag = true + }, + drawerCheck(data) { + var idList = '' + var nameList = '' + data.forEach(item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id; + nameList += item.name; + }) + this.rh_pageData.comityOpRole = nameList + this.rh_pageData.comityOpRoleId = idList + this.roleShowflag = false + }, // 退回按钮 handleSubmitNo() { if (this.commentText === '') { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index 54da34528..1ef79891d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -72,12 +72,20 @@ {{ '-' }} - - + @@ -184,7 +192,8 @@ :action="uploadPath" name="file" :file-list="fillFileList" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" + :http-request="httpRequest" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -210,7 +219,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentStep3">
@@ -252,7 +261,7 @@ sortable="custom" align="center"> { this.saveLoading = false @@ -477,7 +488,7 @@ export default { roleList: this.roleForm, selfUser: this.$store.getters.userInfo.userId, charge: this.rh_pageData.fillLeaderId, - commentText: this.commentText, + commentText: this.commentStep3, rh_pageData: this.rh_pageData, } this.$refs['rh_pageData'].validate((valid) => { @@ -506,11 +517,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -533,6 +544,21 @@ export default { }) this.rh_pageData.fillFile = this.fillFileList }, + /** 覆盖默认的上传行为,实现多个文件一起上传 */ + httpRequest(params) { + const file = params.file + // 根据后台需求数据格式 + const form = new FormData() + // 文件对象 + form.append("file", file) + upFile(form).then(res=>{ + if (res.ok) { + this.handleOnsuccess(res) + } else { + this.$message.warning('上传失败') + } + }) + }, // 文件上传成功 handleOnsuccess(res, file, fileList) { if (res.ok) { @@ -557,6 +583,11 @@ export default { this.fileMadel = false } }, + // 预览 + fileLook(file) { // 预览 + const attId = file.id + this.$preview(attId) + }, /** 点击对应附件进行下载*/ previews(val) { let attId = val diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index 58335a576..88159ba87 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -72,12 +72,20 @@ {{ '-' }} - - + @@ -178,7 +186,7 @@ sortable="custom" align="center"> - {{ item.name || '-'}} + {{ item.name || '-' }} @@ -72,12 +72,20 @@ {{ '-' }} - - - {{ item.name.slice(0,30) + '...' }} {{ ';' }} + @@ -130,11 +138,16 @@
+ + 新增 + + @click="del_partForm"> 批量删除
@@ -148,18 +161,51 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '20px'}"> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -175,7 +221,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentStep5">
@@ -217,7 +263,7 @@ sortable="custom" align="center"> 流程列表加载中
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + 上传文件 + + + + +
+
+ 取消 + 确认 +
+ + + + + +
+ +

点击或拖拽上传文件

+
+ + +
@@ -267,9 +403,7 @@ import ProcessTitle from "../../components/ProcessTitle"; import { completeTask, inboundLiaisonDetail, - saveinboundTask, - saveTaskForPub, - changeAssigneeNew + saveTaskForPub,upFile } from "@/api/process.js" export default { @@ -324,7 +458,27 @@ export default { deleteDataList: [], infoSourcesLength: '', - commentText: '' + commentStep5: '', + + editFlag: false, + editForm: { + fillPeople: '', + fillUnit: '', + fillDept: '', + fillPost: '', + fillTel: '', + fillMail: '', + fillFile: [], + }, + + // 上传文件储存 + reData: [], + upDialog: false, + actionPath: 'api/att/attFile/upload', + acceptShow: false, + roleShowflag: false, + nodeList: [], + isTitle: '' } }, computed: { @@ -369,12 +523,165 @@ export default { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData this.roleForm = JSON.parse(JSON.stringify(item)).roleList + this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5 this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList }) }, + /** 我司参与人员新增 */ + add_partForm() { + var list = { + fillPeople: this.fillPeople, + fillUnit: this.fillUnit, + fillDept: this.fillDept, + fillPost: this.fillPost, + fillTel: this.fillTel, + fillMail: this.fillMail, + fillFile: this.fillFile = [] + } + this.rh_pageData.myPartRole.push(list) + this.isTitle = '新增人员信息' + this.add_partDialog(list) + }, + + fillFile_up(row) { + this.fileListData = row + this.reData = this.fileListData.fillFile + this.upDialog = true + }, + /** 覆盖默认的上传行为,实现多个文件一起上传 */ + httpRequest(params) { + const file = params.file + // 根据后台需求数据格式 + const form = new FormData() + // 文件对象 + form.append("file", file) + upFile(form).then(res=>{ + if (res.ok) { + this.handleOnsuccess(res) + } else { + this.$message.warning('上传失败') + } + }) + }, + // 文件上传成功 + handleOnsuccess(res, file, fileList) { + if (res.ok) { + if (this.reData !== undefined) { + this.newDataList = this.reData + this.newDataList.push({ + id: res.data.attId, + name: res.data.name + }) + } else { + this.newDataList.push({ + id: res.data.attId, + name: res.data.name + }) + } + + this.fileListData.fillFile = this.newDataList + this.$message({ + showClose: true, + message: res.message, + type: 'success' + }) + this.newDataList = [] + this.fileMadel = false + } + }, + // 文件上传限制条件 + handleBeforeUpload(file) { + var filename = file.name + var index1 = filename.lastIndexOf('.') + var index2 = filename.length + var fileSuffix = filename.substring(index1, index2) + // const fileSuffix = file.name.split('.')[1] // 后缀名 + // 判断上传文件格式 + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { + return true + } else { + this.spinShow = false + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') + return false + } + // 判断文件上传大小 + // eslint-disable-next-line no-unreachable + if (file.size / 1024 / 1024 <= 200) { + return true + } else { + this.$message.error('文件' + file.name + '大小不超过200M') + return false + } + return true + }, + // 移除上传的文件 + handleBeforeRemove(file, fileList) { + this.reData.forEach((item, index) => { + if (item.name === file.name || item.id === file.id) { + this.reData.splice(index, 1) + } + }) + this.fileListData.fillFile = this.reData + }, + + handleClose() { + this.upDialog = false + }, + add_partDialog(row) { + // 用来储存取消时原来的数据，防止取消时修改 + localStorage.setItem('obj', JSON.stringify(row)) + this.fileListData = row + this.reData = this.fileListData.fillFile + this.editForm = row + this.editFlag = true + }, + // 编辑按钮 + edit_partForm(row) { + this.isTitle = '编辑人员信息' + // 用来储存取消时原来的数据，防止取消时修改 + localStorage.setItem('obj', JSON.stringify(row)) + this.fileListData = row + this.reData = this.fileListData.fillFile + this.editForm = row + this.editFlag = true + }, + // 编辑框确认按钮 + OkDrawer() { + this.editFlag = false + }, + falseDrawer() { + if (this.isTitle === '新增人员信息') { + this.getData() + } else { + let Item = JSON.parse(localStorage.getItem('obj')) + this.editForm.fillPeopleId = Item.fillPeopleId + this.editForm.fillPeople = Item.fillPeople + this.editForm.fillUnit = Item.fillUnit + this.editForm.fillDept = Item.fillDept + this.editForm.fillPost = Item.fillPost + this.editForm.fillTel = Item.fillTel + this.editForm.fillMail = Item.fillMail + this.editForm.fillFile = Item.fillFile + } + this.editFlag = false + }, + // 编辑框选人 + choiceRole(type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.roleShowflag = true + }, + drawerCheck(data) { + if (data.length > 0) { + this.fileListData.fillPeopleId = data[0].id + this.fileListData.fillPeople = data[0].name + } + this.roleShowflag = false + }, /** 批量删除 */ - del_paryForm() { + del_partForm() { if (this.deleteDataList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else { @@ -412,7 +719,7 @@ export default { _formData.append('json', JSON.stringify({ rh_pageData: this.rh_pageData, roleList: this.roleForm, - commentText: this.commentText + commentStep5: this.commentStep5 })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -428,7 +735,7 @@ export default { leader: this.roleForm.leaderUserId, rh_pageData: this.rh_pageData, roleList: this.roleForm, - commentText: this.commentText + commentText: this.commentStep5 } this.$refs['rh_pageData'].validate((valid) => { if (valid) { @@ -448,6 +755,11 @@ export default { }) }, + // 预览 + fileLook(file) { // 预览 + const attId = file.id + this.$preview(attId) + }, /** 点击对应附件进行下载*/ previews(val) { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue index 5f83fc0ed..db367a6a7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue @@ -72,12 +72,12 @@ {{ '-' }} - + @@ -180,7 +180,7 @@ sortable="custom" align="center"> {{ '-' }} - - + @@ -183,7 +191,7 @@ sortable="custom" align="center"> { + if (res.ok) { + this.handleOnsuccess(res) + } else { + this.$message.warning('上传失败') + } + }) + }, // 文件上传成功 handleOnsuccess(res, file, fileList) { if (res.ok) { @@ -420,11 +438,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -460,6 +478,21 @@ export default { this.upThemeDialog = true }, + /** 覆盖默认的上传行为,实现多个文件一起上传 */ + httpRequestTheme(params) { + const file = params.file + // 根据后台需求数据格式 + const form = new FormData() + // 文件对象 + form.append("file", file) + upFile(form).then(res=>{ + if (res.ok) { + this.onsuccessTheme(res) + } else { + this.$message.warning('上传失败') + } + }) + }, // 文件上传成功 onsuccessTheme(res, file, fileList) { if (res.ok) { @@ -493,11 +526,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -521,6 +554,22 @@ export default { }, /** 其他资料上传 */ + + /** 覆盖默认的上传行为,实现多个文件一起上传 */ + httpRequestOther(params) { + const file = params.file + // 根据后台需求数据格式 + const form = new FormData() + // 文件对象 + form.append("file", file) + upFile(form).then(res=>{ + if (res.ok) { + this.onsuccessOther(res) + } else { + this.$message.warning('上传失败') + } + }) + }, // 文件上传成功 onsuccessOther(res, file, fileList) { if (res.ok) { @@ -553,11 +602,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -603,15 +652,16 @@ export default { 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', '22') + // _formData.append('id', this.bpnId || '') + // _formData.append('createUser', this.$store.getters.userInfo.userId) + // _formData.append('createUserName', this.$store.getters.userInfo.userName) + // _formData.append('prcType', '22') + _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ roleForm: this.roleForm, - hh_pageData: this.hh_pageData + hh_pageData: this.hh_pageData, })) - saveTaskFirst(_formData).then(res => { + saveTaskForPub(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue index b2569dde1..64b12093f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue @@ -166,7 +166,7 @@ sortable="custom" align="center"> - + - + - + @@ -48,6 +49,7 @@ @@ -62,6 +64,7 @@ - + @@ -86,7 +90,7 @@ - + @@ -100,43 +104,34 @@ - - - + + - +
+
+ + {{ item.name.slice(0,30) + '...' }} {{ ';' }} + + {{ item.name }} - 点击上传 - - + size="mini" + @click="filesUpload(item)" + icon="el-icon-download" + style="height: 25px; margin-left: 5px;" + > +
+
+ + 点击上传 + @@ -181,7 +176,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentStep1">
@@ -269,7 +264,7 @@ -

管理推荐部

+

管理推进部

@@ -281,10 +276,10 @@ -

技术委员会常务副主任/总院院长

+

业务主管副院长

- +
@@ -292,11 +287,11 @@ - -

技术委员会主任

+ +

院长

- - + +
@@ -306,6 +301,29 @@
+ + + +
+ +

点击或拖拽上传文件

+
+ + { - this.ch_pageData.associaOptionsOne = res.data.children + if (res.data.children !== null) { + this.ch_pageData.associaOptionsOne = res.data.children + this.ch_pageData.associaName = this.ch_pageData.associaOptionsOne[0].id + this.ch_pageData.associaOptionsOne.forEach(item => { + if (item.children !== null && item.id === this.ch_pageData.associaName) { + this.ch_pageData.associaOptionsTwo = item.children + this.ch_pageData.associaNameOne = this.ch_pageData.associaOptionsTwo[0].id + } + }) + this.ch_pageData.associaOptionsTwo.forEach(item => { + if (item.children !== null && item.id === this.ch_pageData.associaNameOne) { + this.ch_pageData.associaOptionsTree = item.children + this.ch_pageData.associaNameTwo = this.ch_pageData.associaOptionsTree[0].id + } + }) + } }) }, methods: { @@ -467,15 +520,15 @@ export default { }).then(res => { let mes = JSON.parse(res.mes) this.ch_pageData = mes.ch_pageData - this.commentText = mes.commentText + this.commentInfo = mes.commentInfo this.roleForm = mes.roleForm }); }, //上传按钮 - /* uploadFile(val) { - this.fileListData = val - },*/ + fileUpload () { + this.fileMadel = true + }, // 文件上传限制条件 handleBeforeUpload(file) { var filename = file.name @@ -484,11 +537,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -510,6 +563,21 @@ export default { } }) }, + /** 覆盖默认的上传行为,实现多个文件一起上传 */ + httpRequest(params) { + const file = params.file + // 根据后台需求数据格式 + const form = new FormData() + // 文件对象 + form.append("file", file) + upFile(form).then(res=>{ + if (res.ok) { + this.handleOnsuccess(res) + } else { + this.$message.warning('上传失败') + } + }) + }, // 文件上传成功 handleOnsuccess(res, file, fileList) { if (res.ok) { @@ -534,6 +602,19 @@ export default { this.fileMadel = false } }, + // 文件预览 + fileLook(file) { // 预览 + const attId = file.id + this.$preview(attId) + }, + filesUpload (file) { // 下载 + const attId = file.id + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + }, meeting_add() { var list = { @@ -615,9 +696,12 @@ export default { if (this.type === 'leaderUser') { this.roleForm.leaderUser = data[0].name this.roleForm.leaderUserId = data[0].id - } else { + } else if(this.type ==='engineerUser') { this.roleForm.engineerUser = data[0].name this.roleForm.engineerUserId = data[0].id + } else { + this.roleForm.directorUserName = data[0].name + this.roleForm.directorUserId = data[0].id } this.roleShowflagOne = false }, @@ -632,7 +716,7 @@ export default { _formData.append('json', JSON.stringify({ roleForm: this.roleForm, ch_pageData: this.ch_pageData, - commentText: this.commentText + commentInfo: this.commentInfo })) saveTaskFirst(_formData).then(res => { @@ -650,18 +734,22 @@ export default { prcCreateUserName: this.$store.getters.userInfo.userName, roleList: this.roleForm, ch_pageData: this.ch_pageData, - commentText: this.commentText, + commentText: this.commentInfo, directorList: this.roleForm.dockUser, + roleForm: this.roleForm, } this.$refs['ch_pageData'].validate((valid) => { if (valid) { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - const paramsInfo = { - type: '21' - } - startProcess(paramsInfo).then(res => { + let paramsInfo = new FormData() + // paramsInfo.append('id', this.bpnId || '') + paramsInfo.append('createUser', this.$store.getters.userInfo.userId) + paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) + paramsInfo.append('type', '21') + paramsInfo.append('json', JSON.stringify({json})) + processBack(paramsInfo).then(res => { this.taskID = res.data const params = new FormData(); params.set('json', JSON.stringify(json)) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index 6d606aad2..d056e26d5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -56,23 +56,29 @@ - + {{ ch_pageData.feeKind || '-' }} - + {{ '-' }} - - + @@ -101,11 +107,12 @@ - + + @@ -162,7 +169,7 @@ sortable="custom" align="center"> + +
@@ -210,7 +224,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import {startProcess, saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js' +import {completeTask, inboundLiaisonDetail} from '@/api/process.js' export default { components: { @@ -251,9 +265,6 @@ export default { this.getData() }, methods: { - phoneClick () { - this.$router.push('/phoneBzchStep2') - }, // 右上标签页面切换 handleTabs(name) { this.active = name @@ -287,10 +298,33 @@ export default { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData this.uploadFileLength = this.ch_pageData.fileTextList.length - this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList }) }, + + /** 选择入会人员 */ + choiceRole() { + this.nodeList = [] + if (this.ch_pageData.meetingInRoleId.length > 0) { + this.nodeList = this.ch_pageData.meetingInRoleId.split(',') + } + this.roleShowflag = true + }, + drawerCheck(data) { + var idList = '' + var nameList = '' + data.forEach(item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id; + nameList += item.name; + }) + this.ch_pageData.meetingInRole = nameList + this.ch_pageData.meetingInRoleId = idList + this.roleShowflag = false + }, // 退回按钮 handleSubmitNo() { if (this.commentText === '') { @@ -349,6 +383,10 @@ export default { }) }, + fileLook(file) { // 预览 + const attId = file.id + tis.$preview(attId) + }, /** 点击对应附件进行下载*/ previews(val) { let attId = val @@ -471,6 +509,9 @@ export default { /deep/ .el-table th { padding: 0px; } + /deep/.el-form-item__content { + margin-top: 4px; + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index fb4d922a4..3fe8cfa32 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -56,23 +56,29 @@ - + {{ ch_pageData.feeKind || '-' }} - + {{ '-' }} - - + @@ -175,7 +181,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentStep3">
@@ -217,7 +223,7 @@ sortable="custom" align="center"> diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue index 757b7c6a2..0b5e95d1f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -56,23 +56,29 @@ - + {{ ch_pageData.feeKind || '-' }} - + {{ '-' }} - - + @@ -168,7 +174,7 @@ sortable="custom" align="center"> diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue index 97abfc922..583a25fe0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -56,23 +56,29 @@ - + {{ ch_pageData.feeKind || '-' }} - + {{ '-' }} - - + @@ -107,11 +113,15 @@
+ + 新增 + @click="del_partForm"> 批量删除
@@ -126,11 +136,40 @@ fontWeight: 'bold', height: '20px'}"> - - - - - + + + + + + + + + + + + + + + + + + @@ -144,7 +183,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentStep5"> @@ -186,7 +225,7 @@ sortable="custom" align="center"> 流程列表加载中 + +
+ + + + + + + + + + + + + + + + + + +
+
+ 取消 + 确认 +
+ + @@ -233,7 +315,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import {startProcess, saveTaskForPub, completeTask, inboundLiaisonDetail} from '@/api/process.js' +import {saveTaskForPub, completeTask, inboundLiaisonDetail} from '@/api/process.js' export default { components: { @@ -263,7 +345,19 @@ export default { pId: this.$route.query.prcId, uploadFileLength: '', - commentText: '' + commentStep5: '', + roleShowflag: false, + nodeList: [], + // 人员编辑 + editFlag: false, + editForm: { + fillPeople: '', + fillUnit: '', + fillDept: '', + fillTel: '', + fillMail: '', + }, + isTitle: '' } }, computed: { @@ -309,12 +403,73 @@ export default { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData this.uploadFileLength = this.ch_pageData.fileTextList.length this.roleForm = JSON.parse(JSON.stringify(item)).roleList + this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5 // this.ch_pageData.comityFileNum = this.fileTextList }) }, + /** 我司参与人员新增 */ + add_partForm() { + var list = { + fillPeople: this.fillPeople, + fillUnit: this.fillUnit, + fillDept: this.fillDept, + fillTel: this.fillTel, + fillMail: this.fillMail, + } + this.ch_pageData.myPartRole.push(list) + this.isTitle = '新增人员信息' + this.add_partDialog(list) + }, + // 编辑框确认按钮 + OkDrawer() { + this.editFlag = false + }, + falseDrawer() { + if (this.isTitle = '新增人员信息') { + this.getData() + } else { + let Item = JSON.parse(localStorage.getItem('obj')) + this.editForm.fillPeopleId = Item.fillPeopleId + this.editForm.fillPeople = Item.fillPeople + this.editForm.fillUnit = Item.fillUnit + this.editForm.fillDept = Item.fillDept + this.editForm.fillTel = Item.fillTel + this.editForm.fillMail = Item.fillMail + } + this.editFlag = false + }, + add_partDialog(row) { + // 用来储存取消时原来的数据，防止取消时修改 + localStorage.setItem('obj', JSON.stringify(row)) + this.fileListData = row + this.editForm = row + this.editFlag = true + }, + /** 入会人员编辑 */ + edit_partForm(row) { + // 用来储存取消时原来的数据，防止取消时修改 + localStorage.setItem('obj', JSON.stringify(row)) + this.fileListData = row + this.editForm = row + this.editFlag = true + }, + // 编辑框选人 + choiceRole(type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.roleShowflag = true + }, + drawerCheck(data) { + if (data.length > 0) { + this.fileListData.fillPeopleId = data[0].id + this.fileListData.fillPeople = data[0].name + } + this.roleShowflag = false + }, /** 批量删除 */ - del_paryForm() { + del_partForm() { if (this.deleteDataList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else { @@ -352,7 +507,7 @@ export default { _formData.append('json', JSON.stringify({ ch_pageData: this.ch_pageData, roleList: this.roleForm, - commentText: this.commentText + commentStep5: this.commentStep5 })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -367,7 +522,7 @@ export default { let json = { leader: this.roleForm.leaderUserId, ch_pageData: this.ch_pageData, - commentText: this.commentText, + commentText: this.commentStep5, roleList: this.roleForm, } this.$refs['ch_pageData'].validate((valid) => { @@ -388,6 +543,11 @@ export default { }) }, + // 预览 + fileLook(file) { // 预览 + const attId = file.id + this.$preview(attId) + }, /** 点击对应附件进行下载*/ previews(val) { let attId = val @@ -494,6 +654,9 @@ export default { /deep/ .el-table th { padding: 0px; } + /deep/.el-form-item__content { + margin-top: 4px; + } /deep/ .el-upload { display: unset; diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue index cad47abe9..0aaf6bc93 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue @@ -56,7 +56,7 @@ - + {{ ch_pageData.feeKind || '-' }} @@ -65,14 +65,14 @@ {{ '-' }} - + @@ -168,7 +168,7 @@ sortable="custom" align="center"> diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue index b6da5b467..0b145656b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue @@ -59,23 +59,29 @@ - + {{ ch_pageData.feeKind || '-' }} - + {{ '-' }} - - + @@ -171,7 +177,7 @@ sortable="custom" align="center"> diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 02735c0ca..0383d75d5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -1,6 +1,6 @@ + + + + + + + + + + + + + + + @@ -333,83 +335,6 @@ - -
-
- -
-
- - - - - - - - - - - - - - - - - - - - -
-
-
- -
- 取消 - 确定 -
-
- -
+
关闭
+ +
+
+
+
+ + + + + + + +
+
+
+ 数据加载中…… +
+ 取消 + 导入 +
+
+ + +
+
+
+
无相似文本
+
+
比对条款: {{ plForm.itemsNum }}
+
相似度: {{ similarityDegree }}
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
+
+ + + +
比对条款: {{ itemsNum }}
+
相似度: {{ similarityDegree }}
+
+
+
+
+ diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index d3fefbe8a..9367084a2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -365,6 +365,14 @@ - - + +
+ {{value.name}} +
+
+ - - +
+ @@ -548,6 +556,17 @@ > + + + + + @@ -701,11 +720,6 @@ :no-data-text="listNoDataText" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" > - - - {{form.wssmr}} + {{form.wssmr}} @@ -629,11 +629,6 @@ :no-data-text="listNoDataText" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" > - - - + 国内标准入库 海外标准入库 @@ -156,13 +156,11 @@ @@ -624,6 +621,29 @@ + + +
+
+
{{ item.name }}
+
+
+ + + +
+
+ @@ -704,6 +724,14 @@
+ + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - @@ -894,6 +953,17 @@ > + + + + +
@@ -1101,11 +1171,6 @@ :no-data-text="listNoDataText" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" > - - - + + v-model="replaceLawsNumForm.standNumber" + placeholder="根据标准编号查找" + clearable + :maxlength="100"> + + + import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' +import CustomSelectArray from '@/components/CustomFormComponents/SelectArray' import ProcessTitle from '../../components/ProcessTitle' import { inboundLiaisonDetail, @@ -1332,12 +1405,14 @@ export default { TreeSelectModule, ProcessHeader, ProcessFooter, + CustomSelectArray, ProcessTitle, TreeSelect, TreeSelectNew }, data () { return { + modalShowRoleFlag: false, fileList: [], caFileList: [], FBGBJBDFileList: [], @@ -1348,6 +1423,7 @@ export default { jdwjFileList: [], zbjbdFileList: [], kwjFileList: [], + xdbFileList: [], glwjFileList: [], textStatus:'',//文本状态 textStatusMap: {}, // 文本状态id与name对应 @@ -1413,6 +1489,7 @@ export default { replaceLawsNumForm: { dataSource: '', standNumber: '', // 标准编号 + standName: '', // 标准编号 page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, @@ -1427,9 +1504,9 @@ export default { replaceLoading: true, replacePage: 1, rules:{ - /* standSort: [ + standSort: [ { required: true, message: '请选择标准类别', trigger: 'change' } - ],*/ + ], standNumber: [ { required: true, message: '请输入标准编号', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' } @@ -1512,6 +1589,7 @@ export default { qcdw: '', // 起草单位 wssmr: '', // 我司署名人 cysd: '', // 我司参与深度 + cyzbpm:[],// 我司参与制标排名 cllx: '', // 适用车型 nylx: '',// 能源类型 sycpx: '',// 适用产品线 @@ -1546,17 +1624,36 @@ export default { standSystemOptions: [], // 标准体系 busVppsOptions: [], // 车系体系架构 modelOptions: [], // 模块体系架构 - applyArcticOptions: [], // 适用车型 - categoryOptions: [], // 能源类型 + applyArcticOptions: { + attrName: '适用车型', + options:[] + }, // 适用车型 + categoryOptions: { + attrName: '能源类型', + options:[] + }, // 能源类型 gkglbmOptions: [], // 归口管理部门 cbcdOptions: [], // 采标程度 - applyAuthOptions: [], // 适用认证 + applyAuthOptions: { + attrName: '适用认证', + options:[] + }, // 适用认证 cysdOptions: [], // 我司参与深度 + cyzbpmOptions:[], // 我司参与制标排名 wssmrOptions: [], // 我司署名人 qcdwOptions: [], // 起草单位 - sycpxOptions: [], // 适用产品线 - zrbmOptions: [], // 责任部门 - zrgcsOptions: [], // 责任工程师 + sycpxOptions: { + attrName: '适用产品线', + options:[] + }, // 适用产品线 + zrbmOptions: { + attrName: '责任部门', + options:[] + }, // 责任部门 + zrgcsOptions: { + attrName: '责任工程师', + options:[] + }, // 责任工程师 txlbOptions: [], // 体系类别 data: [], // 标准列表数据 ListForm: {}, // 新增数据 @@ -1572,6 +1669,7 @@ export default { drawerModal: false, nodeList: [], selectPeople:'', + nodeList2: [] } }, computed: { @@ -1580,6 +1678,23 @@ export default { }, }, methods: { + // 标准来源改变事件 + standInChange(val) { + this.verifySarStandard = false + + /** val === '1' (国外) val === '0'（ 国内 ）*/ + // 国内英文名称不必填 国外必填 ，标准性质国内不体现 + if (val === '1') { + this.rules.standName[0].required = false + this.rules.standNature[0].required = false + this.rules.standEnName[0].required = true; + } else { + this.rules.standName[0].required = true + this.rules.standNature[0].required = true + this.rules.standEnName[0].required = false; + } + this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN' + }, getBusStandFileByAttId(attId) { return new Promise((resolve, reject) => { getBusStandFileByAttId({ @@ -1609,7 +1724,7 @@ export default { }else { const nowTime = new Date().getTime() // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); - window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) + window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) } // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) } @@ -1674,7 +1789,6 @@ export default { } }, choiceZRRS (type, title, id) { - console.log('2077',title) this.nodeList = [] this.nodeList.push(id) this.userType = type @@ -2045,6 +2159,9 @@ export default { case 'kwj': this.kwjFileList=fileList; break; + case 'xdb': + this.xdbFileList=fileList; + break; case 'ca': this.caFileList=fileList; break; @@ -2082,6 +2199,9 @@ export default { case 'kwj': this.kwjFileList=fileList; break; + case 'xdb': + this.xdbFileList=fileList; + break; case 'ca': this.caFileList=fileList; break; @@ -2113,6 +2233,8 @@ export default { this.fileList=this.zbjbdFileList; }else if (type==='kwj'){ this.fileList=this.kwjFileList; + }else if (type==='xdb'){ + this.fileList=this.xdbFileList; }else if (type==='glwj'){ this.fileList=this.glwjFileList; } @@ -2254,7 +2376,7 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) - this.commentText = processForm.commentText + // this.commentText = processForm.commentText if (processForm.form === undefined) { this.getFormFieldList(processForm) } else { @@ -2313,6 +2435,9 @@ export default { case 'kwj': this.getFileList(value,this.kwjFileList); break; + case 'xdb': + this.getFileList(value,this.xdbFileList); + break; case 'jdwj': this.getFileList(value,this.jdwjFileList); break; @@ -2416,6 +2541,9 @@ export default { this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",") this.form.kwjName=this.kwjFileList.map(item => item.name).join(",") + this.form.kwj=this.xdbFileList.map(item => item.response.data.id).join(",") + this.form.kwjName=this.xdbFileList.map(item => item.name).join(",") + this.form.ca=this.caFileList.map(item => item.response.data.id).join(",") this.form.caName=this.caFileList.map(item => item.name).join(",") @@ -2495,15 +2623,16 @@ export default { 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.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型 + this.categoryOptions.options = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 this.wssmrOptions = res.data.WSSMR // 我司署名人 this.qcdwOptions = res.data.QCDW // 起草单位 - this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线 + this.zrbmOptions.options = res.data.ZRBMCLASS // 责任部门 + this.zrgcsOptions.options = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 5998e3c4d..011c25da2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -170,32 +170,32 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -430,10 +430,12 @@ > - - - - + + + + + + @@ -613,11 +615,6 @@ :no-data-text="listNoDataText" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" > - - - - - @@ -47,12 +48,18 @@ 选择附件
-
- {{ item.fileName }} +
+ {{ item.fileName }} +
@@ -63,12 +70,18 @@ v-model="form.modelNameList" clearable > -
-
- {{ item.name }} +
+
+ {{ item.name }} +
-
+
- - + +
+ @click.native="choiceZRRS('1')">
@@ -149,13 +162,13 @@ -

技术管理中心主任

+

技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任

 @@ -164,13 +177,13 @@ -

工程研究总院院长

+

工程研究总院院长或标准法规主管副院长

 @@ -275,7 +288,7 @@
0) { - this.nodeList2 = this.roleForm.dockUserList.split(',') + if (type === '1') { + this.drawerTitle2 = '选择责任部门对接人' + if ( this.roleForm.dockUserList.length > 0) { + this.nodeList2 = this.roleForm.dockUserList.split(',') + } + } else { + this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任' + if (this.roleForm.directorUser.length > 0) { + this.nodeList2 = this.roleForm.directorUser.split(',') + } } this.modalshowflag2 = true }, @@ -756,7 +799,7 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { + this.$http.post('lawss/activiti/startProcessRollBack', { type: '3' }, {}, res => { if (res.ok) { @@ -771,6 +814,12 @@ export default { }, {}, res => { if (res.success) { this.$message.success('流程发起成功') + let taskId = { + id: this.$route.query.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) this.$router.push('/processCenter') } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index b8f5b7b80..0a2f22706 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -169,31 +169,28 @@ prop="name" label="任务步骤" align="center" - sortable="custom" > + prop="createTime" + label="创建时间" + align="center"> + prop="endTime" + label="完成时间" + align="center"> @@ -51,17 +52,17 @@ style="display: none;" >
-
- {{ item.fileName }} +
+ {{ item.fileName }} +
- - - - - - -
-
- {{ item.name }} +
+
+ {{ item.name }} +
-
+
- - + +
+ @click.native="choiceZRRS('1')">
@@ -155,13 +162,13 @@ -

技术管理中心主任

+

技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任

 @@ -170,13 +177,13 @@ -

工程研究总院院长

+

工程研究总院院长或标准法规主管副院长

 @@ -282,7 +289,7 @@
{ this.standInfoList = res.data.list @@ -668,7 +696,7 @@ export default { // 分页每页显示数改变后方法 pageSizeChange(pageSize) { this.$store.getters.userInfo.configContent = pageSize - this.standCommonlySearch.size = pageSize + this.standCommonlySearch.pageSize = pageSize this.sarStandCompareHis() }, /** 选择带入数据的方法操作 @@ -719,8 +747,13 @@ export default { idList += item.id nameList += item.name }) - this.roleForm.dockUserList = idList - this.roleForm.dockUserListName = nameList + if (this.type2 === '1') { + this.roleForm.dockUserList = idList + this.roleForm.dockUserListName = nameList + } else { + this.roleForm.directorUser = idList + this.roleForm.directorUserName = nameList + } }, checkedRole(data) { if (this.type === 'ministerUser') { @@ -734,10 +767,19 @@ export default { this.roleForm.presidentUserName = data[0].name } }, - choiceZRRS() { + choiceZRRS(type) { + this.type2 = type this.nodeList2 = [] - if (this.roleForm.dockUserList.length > 0) { - this.nodeList2 = this.roleForm.dockUserList.split(',') + if (type === '1') { + this.drawerTitle2 = '选择责任部门对接人' + if ( this.roleForm.dockUserList.length > 0) { + this.nodeList2 = this.roleForm.dockUserList.split(',') + } + } else { + this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任' + if (this.roleForm.directorUser.length > 0) { + this.nodeList2 = this.roleForm.directorUser.split(',') + } } this.modalshowflag2 = true }, @@ -777,8 +819,16 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { - type: '3' + this.$http.post('lawss/activiti/startProcessRollBack', { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '3', + json: JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText + }) }, {}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) @@ -792,6 +842,14 @@ export default { }, {}, res => { if (res.success) { this.$message.success('流程发起成功') + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push('/processCenter') this.isSubmit = false } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 3a573f99c..94ef10e6d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -46,13 +46,30 @@ style="display: none;" >
-
{{ item.fileName }}
+
+ {{ item.fileName }} + +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -100,31 +117,28 @@ prop="name" label="任务步骤" align="center" - sortable="custom" > + prop="createTime" + label="创建时间" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }} { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') + } + this.isSubmit = false + }) } else { var a = 0 var b = 0 @@ -651,9 +684,9 @@ } else { this.form.fjListId = data.fjListId || data.form.fjListId } - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + // this.form.modelNameList = data.modelNameList || data.form.modelNameList this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime this.todoId = res.id diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 8a5edbd2d..9a957e8d5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -46,29 +46,43 @@ style="display: none;" >
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
- -
- + - + @@ -169,23 +183,20 @@ prop="name" label="任务步骤" align="center" - sortable="custom" > { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index 5caae05e7..b60ee3a97 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -46,16 +46,30 @@ style="display: none;" >
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -161,23 +175,20 @@ prop="name" label="任务步骤" align="center" - sortable="custom" >
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -170,7 +184,7 @@
- +
+ prop="createTime" + label="创建时间" + align="center"> + prop="endTime" + label="完成时间" + align="center"> { @@ -436,8 +459,9 @@ export default { newText: '', reason: '', id: id, - department: this.$store.getters.userInfo.upDeptName, + department: this.$store.getters.userInfo.institutionName, responUserName: this.$store.getters.userInfo.userName, + responUser: this.$store.getters.userInfo.userId } this.data.push(json) this.itemId = id @@ -550,14 +574,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { @@ -592,6 +609,8 @@ export default { } this.isSubmit = false }) + } else { + this.$message.warning('请选择审批人') } }) }, @@ -639,9 +658,9 @@ export default { this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime this.form.cname = data.cname || data.form.cname - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList this.form.spId = data.spId || '' this.form.spName = data.spName || '' this.json = data diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 995ed952d..7982461c2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -46,16 +46,30 @@ style="display: none;" >
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -165,7 +179,7 @@
- +
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -181,31 +195,28 @@ prop="name" label="任务步骤" align="center" - sortable="custom" > + prop="createTime" + label="创建时间" + align="center"> + prop="endTime" + label="完成时间" + align="center"> { - }); + params.dataList = JSON.parse(JSON.stringify(row)); + params.dataList.forEach(item => { + if (item.state === "1") { + item.stateText = "上报"; + } else if (item.state === "2") { + item.stateText = "处理后上报"; + } else { + item.stateText = "不上报"; + } + }); + this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { + }); + } else { + this.$message.warning('无上报数据') + } }, handleTabs(name) { this.active = name; @@ -424,9 +444,6 @@ export default { handleSave() { }, handleSubmit() { - if (this.data.length < 1) { - this.$message.warning("请输入征求意见搞"); - } else { this.isSubmit = true; var json = this.json; json.hqFlag = '0'; @@ -442,7 +459,6 @@ export default { } this.isSubmit = false; }); - } }, handleSubmitNo() { if (this.commentText) { @@ -481,7 +497,6 @@ export default { this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; - this.oldData = JSON.parse(JSON.stringify(data.info)) var arr = [] data.info.forEach(item => { @@ -490,9 +505,9 @@ export default { } }) this.json = data - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList this.data = arr }).catch(e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 6e959ee91..fc799148d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -42,20 +42,34 @@
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -181,31 +195,28 @@ prop="name" label="任务步骤" align="center" - sortable="custom" > + prop="createTime" + label="创建时间" + align="center"> + prop="endTime" + label="完成时间" + align="center"> { - if (item.state === '1') { - item.stateText = '上报' - } else if (item.state === '2') { - item.stateText = '处理后上报' - } else { - item.stateText = '不上报' + if (row.length > 0) { + var params = { + columnName: { + chapterNumber: "章条编号", + chapterName: "章节名称", + commentText: "修改意见内容（包括理由或依据）", + oldText: "修改前", + newText: "修改后", + reason: "修改理由", + department: "提出部门", + responUserName: "提出人", + }, + dataList: [] + }; + if (title === '上报意见.xls') { + params.columnName.stateText = "处理意见" } - }) - this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => { - }) + params.dataList = JSON.parse(JSON.stringify(row)); + params.dataList.forEach(item => { + if (item.state === "1") { + item.stateText = "上报"; + } else if (item.state === "2") { + item.stateText = "处理后上报"; + } else { + item.stateText = "不上报"; + } + }); + this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { + }); + } else { + this.$message.warning('无上报数据') + } }, stateText(row) { if (row === '1') { @@ -419,9 +441,6 @@ export default { handleSave() { }, handleSubmit() { - if (this.data.length < 1) { - this.$message.warning('请输入征求意见搞') - } else { this.isSubmit = true var json = this.json json.bdFlag = '0' @@ -437,7 +456,6 @@ export default { } this.isSubmit = false }) - } }, handleSubmitNo() { if (this.commentText) { @@ -483,9 +501,9 @@ export default { arr.push(item) } }) - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList this.json = data this.data = arr }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 31006296c..a5a771887 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -42,20 +42,34 @@
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -192,20 +206,20 @@ > + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> { - if (item.state === '1') { - item.stateText = '上报' - } else if (item.state === '2') { - item.stateText = '处理后上报' - } else { - item.stateText = '不上报' + if (row.length > 0) { + var params = { + columnName: { + chapterNumber: "章条编号", + chapterName: "章节名称", + commentText: "修改意见内容（包括理由或依据）", + oldText: "修改前", + newText: "修改后", + reason: "修改理由", + department: "提出部门", + responUserName: "提出人", + }, + dataList: [] + }; + if (title === '上报意见.xls') { + params.columnName.stateText = "处理意见" } - }) - this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => { - }) + params.dataList = JSON.parse(JSON.stringify(row)); + params.dataList.forEach(item => { + if (item.state === "1") { + item.stateText = "上报"; + } else if (item.state === "2") { + item.stateText = "处理后上报"; + } else { + item.stateText = "不上报"; + } + }); + this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { + }); + } else { + this.$message.warning('无上报数据') + } }, stateText(row) { if (row === '1') { @@ -419,9 +444,6 @@ export default { handleSave() { }, handleSubmit() { - if (this.data.length < 1) { - this.$message.warning('请输入征求意见搞') - } else { this.isSubmit = true var json = this.json json.directorFlag = '0' @@ -437,13 +459,12 @@ export default { } this.isSubmit = false }) - } }, handleSubmitNo() { if (this.commentText) { this.isSubmit = true var json = this.json - json.directorFlag = '0' + json.directorFlag = '1' json.commentText = this.commentText this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -484,9 +505,9 @@ export default { } }) this.json = data - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList this.data = arr }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 95c0b267d..fdd493c52 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -42,20 +42,34 @@
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -192,20 +206,20 @@ > + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> { - }); + params.dataList = JSON.parse(JSON.stringify(row)); + params.dataList.forEach(item => { + if (item.state === "1") { + item.stateText = "上报"; + } else if (item.state === "2") { + item.stateText = "处理后上报"; + } else { + item.stateText = "不上报"; + } + }); + this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { + }); + } else { + this.$message.warning('无上报数据') + } }, stateText(row) { if (row === "1") { @@ -419,9 +444,6 @@ export default { handleSave() { }, handleSubmit() { - if (this.data.length < 1) { - this.$message.warning("请输入征求意见搞"); - } else { this.isSubmit = true; var json = this.json; json.presidentFlag = '0'; @@ -437,7 +459,6 @@ export default { } this.isSubmit = false; }); - } }, handleSubmitNo() { if (this.commentText) { @@ -484,9 +505,9 @@ export default { } }) this.json = data - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList this.data = arr }).catch(e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue index f46d88d82..893c90db0 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue @@ -186,7 +186,15 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "14"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '14', + json: JSON.stringify({ + taskInfo: '责任部门对接人选择责任人', + roleForm: this.roleForm, + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue index dddcfb8de..6d988ab50 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue @@ -37,12 +37,19 @@ placeholder="请输入标准编号" clearable> + 手动查找
@@ -81,23 +88,18 @@ clearable> - -
- - - - -
+ + +
@@ -226,7 +228,7 @@ sortable="custom" align="center"> 流程列表加载中
+ + +
+
+
+
+ + + + + + + + + + + + + 查询 + + + + 清空 + + + +
+ + + + + + + + + + + + + + + + + +
+ +
+
+
+ 取消 + 添加 +
+ 1){ + this.$message.warning('您只能选择一条标准进行添加') + }else{ + this.wbbzform.standName = this.standList[0].standName || this.standList[0].standEnName + this.wbbzform.standType = this.standList[0].standSort + this.wbbzform.standNumber = this.standList[0].standSort + '\xa0\xa0 '+ this.standList[0].standNumber + this.standModel = false + } + + }, + //添加标准取消事件 + cancelStand() { + this.standModel = false; + }, + typeChange(type) { + this.standardSearch.standType = type; + }, + clearStandSearch() { + this.standardSearch = { + standType: "", + standNumber: "" + }; + this.getStandData(); + }, + getStandDataBtn(){ + this.pageNo =1; + this.getStandData(); + }, + //查询项目下的标准 + getStandData() { + this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", { + 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 => { + this.$set(item, "ZCCSSRQ", item.zccssrq); + this.$set(item, "XCXSSRQ", item.xcxssrq); + }) + this.totalNo = res.data.count; + }, e => { + }); + }, + // 点击查看 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }, + //添加标准select的改变 + selectThree(data) { + this.standList = data; + }, + pageChangeNo(page) { + this.pageNo = page; + this.getStandData(); + }, + pageSizeChangeNo(pageSize) { + this.pageSizeNo = this.$store.getters.userInfo.configContent; + this.getStandData(); + + }, handleSave() { }, //不备案 @@ -520,6 +772,9 @@ export default { background: #E6A23C; } } - + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue index 2f1490c90..3431c448c 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue @@ -188,7 +188,7 @@ sortable="custom" align="center"> { - if (item.projectNumber === undefined) { - this.$message.warning("请完善项目信息"); - } - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ this.wbbzform.commentText = this.commentText; let json = { participantsData: this.participantsData, diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue index a9d49dfbf..96cee0880 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue @@ -188,7 +188,7 @@ sortable="custom" align="center"> { - if (item.projectNumber === undefined) { - this.$message.warning("请完善项目信息"); - } - }); this.wbbzform.commentText = this.commentText; let json = { participantsData: this.participantsData, wbbzform: this.wbbzform, - signFlag: '2', + signFlag: "2" }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue index 45b9aa29a..29e5900d6 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue @@ -188,7 +188,7 @@ sortable="custom" align="center"> { - if (item.projectNumber === undefined) { - this.$message.warning("请完善项目信息"); - } - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ this.wbbzform.commentText = this.commentText; let json = { participantsData: this.participantsData, diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue index 21eda1b26..0e330888d 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue @@ -185,7 +185,15 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "15"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '15', + json: JSON.stringify({ + taskInfo: '备案任务下发', + roleForm: this.roleForm, + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue index 4012ab90e..0f0a0c050 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue @@ -33,37 +33,37 @@
- + + v-for="item in comityOptionsOne" + :key="item.id" + :label="item.name" + :value="item.id"> - + + v-for="item in comityOptionsTwo" + :key="item.id" + :label="item.name" + :value="item.id"> - + + v-for="item in comityOptionsOneThree" + :key="item.id" + :label="item.name" + :value="item.id">
- +
@@ -122,47 +122,67 @@ + + + + + + @@ -185,7 +205,6 @@ row-key="id"> + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue new file mode 100644 index 000000000..c80d45cdd --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue @@ -0,0 +1,418 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue new file mode 100644 index 000000000..fc1f6205e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -0,0 +1,2765 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue new file mode 100644 index 000000000..56b62e5dc --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue @@ -0,0 +1,2462 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue new file mode 100644 index 000000000..00ce5e7d1 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue @@ -0,0 +1,2462 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue new file mode 100644 index 000000000..804c28069 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue @@ -0,0 +1,2462 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue new file mode 100644 index 000000000..0a16da727 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -0,0 +1,2613 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue new file mode 100644 index 000000000..8a1fbf833 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue @@ -0,0 +1,2613 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue new file mode 100644 index 000000000..707f8770b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -0,0 +1,2514 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue new file mode 100644 index 000000000..19e362079 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -0,0 +1,2630 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue new file mode 100644 index 000000000..f73db12da --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue @@ -0,0 +1,2462 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue new file mode 100644 index 000000000..24b5c7ff7 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -0,0 +1,2562 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue new file mode 100644 index 000000000..5c93b1bb8 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -0,0 +1,2635 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue new file mode 100644 index 000000000..ed0546294 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue @@ -0,0 +1,2616 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue new file mode 100644 index 000000000..a7b591e0e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue @@ -0,0 +1,2462 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue new file mode 100644 index 000000000..b4e677629 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue @@ -0,0 +1,2462 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue new file mode 100644 index 000000000..a8d12be8a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -0,0 +1,2622 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue new file mode 100644 index 000000000..edcad9083 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -0,0 +1,2635 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue new file mode 100644 index 000000000..0a465070e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue @@ -0,0 +1,2413 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue new file mode 100644 index 000000000..97c3b1122 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -0,0 +1,675 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue new file mode 100644 index 000000000..8f4833d00 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -0,0 +1,433 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 3185e6547..97879e923 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1,12 +1,12 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 0fa4fd455..c57d0d1d7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -81,33 +81,50 @@ placeholder="请选择初稿完成时间"> - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + @@ -136,6 +153,34 @@ placeholder="请选择标准发布时间"> + + + + + + + + + + + + + @@ -280,6 +325,129 @@ 带入
+ + +
+
+ +
+ + + + + + + + + 查询 + + 清空 + + + +
+
+
+ + + + + + + + + + + + + + + + +
+ + 数据加载中…… +
+
+
+ 取消 + 导入 +
+
+ + + +
+
+ + +
+
+ 取消 + 确定 +
+
+ + - - - - - -
- 确认 - -
-
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 0eced1161..8fe1d1227 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -54,6 +54,27 @@ placeholder="请选择初稿完成时间"> + + + + + + + + + - -
- + +
+ @@ -109,12 +130,51 @@
+ + + + + + + + + + + + + + + + + + @@ -284,6 +344,7 @@ export default { }, ListModel: false, standinfoList: [], + BZList: [], page: 1, total: 0, pageSize: this.$store.getters.userInfo.configContent, @@ -316,6 +377,16 @@ export default { } } }, + mounted(){ + if(!this.qbfsForm.passFlag){ + this.qbfsForm = {} + } + this.$http.get('sys/dictype/getDicTypeListCode', '',{ + _this: this + }, res => { + this.BZList = res.data.ENERGYTYPES //标准范围 + }) + }, methods: { validateForm () { let flag = null @@ -374,8 +445,18 @@ export default { this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') - this.qbfsForm.unit = this.selectList[0].unit + this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName + if(this.selectList[0].area){ + this.qbfsForm.area = this.selectList[0].area.split(',') + } + this.qbfsForm.rqbName = this.selectList[0].rqbName + this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName + this.qbfsForm.isRelate = this.selectList[0].isRelate + this.qbfsForm.useLevel = this.selectList[0].useLevel + this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations + this.qbfsForm.technologic = this.selectList[0].technologic + this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue index 0802b80b5..dbde6d77d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue @@ -75,13 +75,73 @@ placeholder="请选择计划标准发布时间"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
+
流程列表加载中
+ + + + + + + + + + + + + { + this.BZList = res.data.ENERGYTYPES //标准范围 + }) }, methods:{ processTable() { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 74b20d5c7..c0f297174 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -23,6 +23,8 @@ + 立项 + 合并 延期 @@ -31,8 +33,6 @@ 更名 - 立项 - @@ -270,10 +270,11 @@ export default { }, data() { return { - comFlag: 0, + toggleType: '5', + comFlag: 1, active: "1", commentText: "", - comName: "merge", + comName: "establish", qbfsForm: {}, formLoading: false, approvalFlag: false, @@ -405,15 +406,15 @@ export default { toggleComName(name) { this.comName = name; if(this.comName === 'merge'){ - this.$refs["childForm"].qbfsForm.type = '1' + this.toggleType = '1' }else if(this.comName === 'delay'){ - this.$refs["childForm"].qbfsForm.type = '2' + this.toggleType = '2' }else if(this.comName === 'cancel'){ - this.$refs["childForm"].qbfsForm.type = '3' + this.toggleType = '3' }else if(this.comName === 'rename'){ - this.$refs["childForm"].qbfsForm.type = '4' + this.toggleType = '4' }else if(this.comName === 'establish'){ - this.$refs["childForm"].qbfsForm.type = '5' + this.toggleType = '5' } }, //流程保存 @@ -438,29 +439,13 @@ export default { this.saveLoading = false }) }, - repeatName(){ - let qbzxdFrom = this.$refs["childForm"].qbfsForm; - this.$http.get('esRevisePlan/es-revise-plan/getDataByName', {esName: qbzxdFrom.esName, id : qbzxdFrom.esId}, { - _this: this - }, res => { - let dataList = res.data - dataList.forEach(item => { - if(item.esName === qbzxdFrom.esName1 || item.esName === qbzxdFrom.esName2){ - this.comFlag++ - }else{ - this.comFlag = 0 - } - }) - }) - }, //流程提交 handleSubmit() { - if(this.$refs["childForm"].qbfsForm.type === undefined){ - this.$refs["childForm"].qbfsForm.type = '1' + if(!this.$refs["childForm"].qbfsForm.type){ + this.$refs["childForm"].qbfsForm.type = this.toggleType } - this.repeatName() - if(this.comFlag === '0'){ - this.$message.warning('请更改企标名称') + if(this.comFlag === 0){ + this.$message.warning('企标名称已存在,请更改!') }else { if (this.$route.query.prcNum === undefined) { let flag = this.$refs["childForm"].validateForm(); @@ -469,9 +454,18 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; - var json = Object.assign(qbzxdFrom, this.roleForm); + let json = Object.assign(qbzxdFrom, this.roleForm); console.log(json); - this.$http.get("lawss/activiti/startProcess", { type: "25" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '25', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: qbzxdFrom, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index 5fe8038a4..61f5b6413 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -75,13 +75,73 @@ placeholder="请选择计划标准发布时间"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + this.BZList = res.data.ENERGYTYPES //标准范围 + }) }, methods:{ processTable() { @@ -329,6 +396,7 @@ export default { console.log(item); this.$nextTick(() => { this.qbfsForm = JSON.parse(JSON.stringify(item)) + console.log(item.area.join(',')); this.type = item.type }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index 0908edc99..b9b2737fc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -75,13 +75,73 @@ placeholder="请选择计划标准发布时间"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + this.BZList = res.data.ENERGYTYPES //标准范围 + }) }, methods:{ processTable() { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index eff87f174..1129be8e7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -75,13 +75,73 @@ placeholder="请选择计划标准发布时间"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + this.BZList = res.data.ENERGYTYPES //标准范围 + }) }, methods:{ processTable() { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 015423a76..936a1db64 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -75,13 +75,73 @@ placeholder="请选择计划标准发布时间"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + this.BZList = res.data.ENERGYTYPES //标准范围 + }) }, methods:{ processTable() { diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue index 1b0d8508a..9cce7ecc6 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue @@ -74,7 +74,7 @@
-
+
{ if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "16"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '16', + json: JSON.stringify({ + roleForm: this.roleForm, + dataList: this.dataList, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue index 33508b21e..dba26f53d 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue @@ -74,7 +74,7 @@
-
+
-
+
-
+
- +
-
+
- - - -
-
- 添加 - 批量删除 -
+ + + +
+
+ 添加 + 批量删除
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
@@ -59,7 +59,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="textarea"> + v-model="commentText">
@@ -161,20 +161,11 @@ :maxlength="100"> - - - + + @click="getTableByPage"> 查询 @@ -198,38 +189,108 @@
+ 数据获取中.... - - + > + + + - + - - - - + + + + + + + + + + + + + + + + + + + + + - - { if (this.pageNo !== undefined) { this.queryUnqualidiedData.current = this.pageNo @@ -356,25 +420,26 @@ export default { if (item.responsibleUnit !== null || item.responsibleUnit !== "") { let k = (item.responsibleUnit || "").split(',') for (let i in this.zrbmOptions) { - for (let m = 0; m< k.length; m++) { + for (let m = 0; m < k.length; m++) { if (this.zrbmOptions[i].value === k[m]) { - k[m] = this.zrbmOptions[i].label + k[m] = this.zrbmOptions[i].label } item.responsibleUnit = k.join(',') } } } - this.$set(item,'engineer','') - this.$set(item,'engineerId','') - this.$set(item,'dutyPeopleInfo','') - this.$set(item,'dutyPeople','') - this.$set(item,'dutyPeopleInfoId','') - this.$set(item,'dutyPeopleId','') - this.$set(item,'fileText',[]) - this.$set(item,'fileTextId',[]) - this.$set(item,'fileTextPath',[]) + this.$set(item, 'engineer', '') + this.$set(item, 'engineerId', '') + this.$set(item, 'dutyPeopleInfo', '') + this.$set(item, 'dutyPeople', '') + this.$set(item, 'dutyPeopleInfoId', '') + this.$set(item, 'dutyPeopleId', '') + this.$set(item, 'fileText', []) + this.$set(item, 'fileTextId', []) + this.$set(item, 'fileTextPath', []) }) this.total = res.data.total + this.loading = false }) }) this.standModel = true; @@ -414,7 +479,7 @@ export default { } }, // 点击查看 - handlePreview (item) { + handlePreview(item) { let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { @@ -427,6 +492,9 @@ export default { }, //选择标准取消事件 closeDrawer() { + this.queryUnqualidiedData.standSerialNumber = '' + this.queryUnqualidiedData.responsibleUnit = '' + this.queryUnqualidiedData.productName = '' this.standModel = false }, //未符合项整合确定事件 @@ -439,18 +507,21 @@ export default { addList = this.dataList.findIndex(items => { return items.id === item.id }) - if(addList > -1){ + if (addList > -1) { // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() this.$message.warning('请勿添加重复数据') - } else{ + } else { this.dataList.push(item) // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() } }) + this.queryUnqualidiedData.standSerialNumber = '' + this.queryUnqualidiedData.responsibleUnit = '' + this.queryUnqualidiedData.productName = '' this.standModel = false; } else { this.$message.warning("请选择至少一条数据进行带入"); @@ -487,7 +558,7 @@ export default { }, // 提交按钮 handleSubmit() { - this.dataList.forEach(item =>{ + this.dataList.forEach(item => { item.standId = item.standSerialNumber }) let json = { @@ -495,6 +566,7 @@ export default { prcCreateUserName: this.$store.getters.userInfo.userName, engineer: this.roleForm.dockUser, standardInfoList: this.dataList, + commentText: this.commentText } if (this.dataList[0].standId === '') { this.$message.warning('请选择基础信息进行添加') @@ -505,23 +577,30 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - const paramsInfo = { - type: '8' - } - startProcess(paramsInfo).then(res => { + let paramsInfo = new FormData() + // paramsInfo.append('id', this.bpnId || '') + paramsInfo.append('createUser', this.$store.getters.userInfo.userId) + paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) + paramsInfo.append('type', '8') + paramsInfo.append('json', JSON.stringify({ + roleForm: this.roleForm, + dataList: this.dataList, + commentText: this.commentText + })) + processBack(paramsInfo).then(res => { this.taskID = res.data const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskID) completeTask(params).then(res => { - if(res.success === true) { + if (res.success === true) { this.$message.success('提交成功') if (this.bpnId !== '') { let taskId = { id: this.bpnId } - taskDel(taskId).then(res=>{ + taskDel(taskId).then(res => { return res }) } @@ -536,14 +615,14 @@ export default { } }, // 流程阶段负责人选择 - choiceZRR (type, title, id) { + choiceZRR(type, title, id) { this.nodeList = [] this.nodeList.push(id) this.type = type this.drawerTitle = title this.modalshowflag = true }, - drawerCheck (data) { + drawerCheck(data) { this.unqualidiedData.forEach(item => { item.engineer = data[0].name item.engineerId = data[0].id @@ -557,20 +636,18 @@ export default { this.addList() }, // 清空 查询条件 - clearAllSearch (search = true) { - this.queryUnqualidiedData = { - standSerialNumber: '', - productName: '', - responsibleUnit: '' - } + clearAllSearch() { + this.queryUnqualidiedData.standSerialNumber = '' + this.queryUnqualidiedData.productName = '' + this.queryUnqualidiedData.responsibleUnit = '' this.getTableByPage() }, // 分页事件 - pageChange (page) { + pageChange(page) { this.pageNo = page this.getTableByPage() }, - pageSizeChange (pageSize) { + pageSizeChange(pageSize) { this.size = pageSize this.getTableByPage(pageSize) }, @@ -581,15 +658,22 @@ export default { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 994a8e6a4..c73ea50ae 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,201 +131,201 @@ - - - -
-
- 批量编辑 - -
+
+ + + +
+
+ 批量编辑 +
- - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
+ + +
+ + +
@@ -365,7 +365,7 @@ sortable="custom" align="center"> { @@ -811,33 +810,44 @@ export default { }, //提交事件 handleSubmit() { - this.handlePrice() - if(this.comFlag > 0) { - this.$message.warning('请填写完整的不符合项信息') - this.comFlag = 0 + let submitFlag = 0; + this.dataList.forEach(item => { + if(item.complianceReasons || item.noCompliance){ + submitFlag = 1 + } + return + }) + if(submitFlag === 0 ){ + this.$message.warning('请至少对一条信息进行评估') }else{ - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.commentText = this.commentText; - this.listForm.approvalOpinion = ""; - 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, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { + this.handlePrice() + if(this.comFlag > 0) { + this.$message.warning('请填写完整的不符合项信息') + this.comFlag = 0 + }else{ + this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; + this.listForm.commentText = this.commentText; + this.listForm.approvalOpinion = ""; + 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, + json: json + }, { + _this: this + }, res => { + if (res.success) { + 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 6d1a5e859..47848c7d6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,143 +131,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
- - -
- - -
- -
@@ -307,7 +307,7 @@ sortable="custom" align="center"> 审批历史
-
+
@@ -131,143 +131,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
- - -
- - -
- -
@@ -307,7 +307,7 @@ sortable="custom" align="center"> 审批历史
-
+
@@ -131,143 +131,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
- - -
- - -
- -
@@ -307,7 +307,7 @@ sortable="custom" align="center"> { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '6', + json: JSON.stringify({ + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -647,7 +656,7 @@ export default { return this.$message.warning("请完善基础信息"); } }); - } + } } }, choiceZRR(type, title, id) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue index cdac9c9ef..0e6f8e884 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue @@ -155,6 +155,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -210,7 +212,7 @@ label="创建时间" 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, @@ -365,15 +343,21 @@ export default { let dataChildren = [] let dataListChildren = [] this.listForm.dataList.forEach(item => { - item.children.forEach(items=> { - if(items.key === item.standId){ - this.$set(items, "standName", item.standName); - this.$set(items, "standEnName", item.standEnName); - this.$set(items, "standYear", item.standYear); - this.$set(items, "standSort", item.standSort); - this.$set(items, "standNumber", item.standNumber); - } - }) + if(item.workPeople !== ''){ + this.dataList.push(item) + item.children.forEach(items=> { + if(items.key === item.standId){ + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + this.$set(items, "zccssrq", item.zccssrq); + this.$set(items, "xcxssrq", item.xcxssrq); + this.$set(items, "ssrq", item.ssrq); + } + }) + } }) this.listForm.dataList.forEach(item => { dataChildren.push(item.children) @@ -392,6 +376,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, //驳回事件 beforeBack() { if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue index 39946e082..f392d5e59 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue @@ -169,7 +169,7 @@ label="创建时间" align="center"> { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '6', + json: JSON.stringify({ + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -642,6 +651,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 4ea1a6af7..d53a543b5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -200,6 +200,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -256,7 +258,7 @@ sortable="custom" align="center"> { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -503,7 +507,7 @@ export default { }, //驳回事件 beforeBack() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { + if (!this.commentText) { this.$message.warning("请填写审批意见"); } else { this.listForm.bzFlag = "2"; @@ -549,6 +553,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index 7665ee262..984ad8d2b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -200,6 +200,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -256,7 +258,7 @@ sortable="custom" align="center"> { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -524,6 +528,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 1d20a7bb1..fba54c8cb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -200,6 +200,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -256,7 +258,7 @@ sortable="custom" align="center"> { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -503,7 +507,7 @@ export default { }, //驳回事件 beforeBack() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { + if (!this.commentText ) { this.$message.warning("请填写审批意见"); } else { this.listForm.dlFlag = "2"; @@ -549,6 +553,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue index 296b39017..139895ed7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue @@ -160,7 +160,7 @@ label="创建时间" align="center"> @@ -362,11 +362,7 @@ export default { } else { this.listForm = item.form; this.dataList = item.form.dataList; - this.dataList.forEach(item => { - this.$set(item, "workPeople", "请选择责任人"); - this.$set(item, "workPeopleId", ""); - }); - console.log(this.dataList); + this.commentText = item.commentText } }); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 38d19e256..33a90a927 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -226,6 +226,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -282,7 +284,7 @@ sortable="custom" align="center"> { @@ -752,6 +755,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, //保存事件 handleSave() { this.saveLoading = true; @@ -794,28 +800,44 @@ export default { }, //提交事件 handleSubmit() { - this.handlePrice() - if(this.comFlag > 0) { - this.$message.warning('请填写完整的不符合项信息') - this.comFlag = 0 + let submitFlag = 0; + this.dataList.forEach(item => { + if(item.complianceReasons || item.noCompliance){ + submitFlag = 1 + } + return + }) + if(submitFlag === 0 ){ + this.$message.warning('请至少对一条信息进行评估') }else{ - this.isSubmit = 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.isSubmit = false; - }, e => { - }); + this.handlePrice() + if(this.comFlag > 0) { + this.$message.warning('请填写完整的不符合项信息') + this.comFlag = 0 + }else{ + this.listForm.dataList.forEach(item => { + if(item.workPeople === '请选择责任人'){ + item.workPeople = '' + } + }) + this.isSubmit = 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.isSubmit = false; + }, e => { + }); + } } }, //标准表格选择框改变 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index a3cb98cd0..2e7651a5d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -158,6 +158,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -214,7 +216,7 @@ sortable="custom" 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, @@ -435,7 +413,9 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -507,6 +487,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index 1d4626568..8efce2454 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -198,6 +198,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -254,7 +256,7 @@ sortable="custom" align="center"> { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -501,7 +505,7 @@ export default { }, //驳回事件 beforeBack() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + if(!this.commentText){ this.$message.warning('请填写审批意见') }else{ this.listForm.jgFlag = "2"; @@ -547,6 +551,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index 720ee308c..9fac7b4aa 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -200,6 +200,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -256,7 +258,7 @@ sortable="custom" align="center"> { - this.dataList.push(item) + if(item.workPeople !== ''){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -503,7 +507,7 @@ export default { }, //驳回事件 beforeBack() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { + if (!this.commentText) { this.$message.warning("请填写审批意见"); } else { this.listForm.gcFlag = "2"; @@ -549,6 +553,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index 0cf0dad19..fd3614b34 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -191,7 +191,7 @@ tooltip-effect="dark" style="width: 100%" border - height="100%" + class="table-height" :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectProjectChange" @@ -499,7 +499,6 @@ export default { }, res => { this.ProjectDatas = res.data.total.records; this.total = res.data.total.total; - this.page = 1; }, e => { }); @@ -655,7 +654,17 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "10" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '10', + json: JSON.stringify({ + taskInfo: "产品经理分发", + form: this.qdform, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -837,6 +846,10 @@ export default { } } } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue index 988f3e6f5..8b45a5acd 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue @@ -189,7 +189,7 @@ sortable="custom" align="center"> 选择清单 { this.ProjectDatas = res.data.total.records; this.total = res.data.total.total; - this.page = 1; }, e => { }); @@ -659,7 +664,17 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "10" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '10', + json: JSON.stringify({ + taskInfo: "产品经理分发", + form: this.qdform, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -672,6 +687,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; @@ -823,6 +846,10 @@ export default { } } } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 301e8e390..834de3ce9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -188,7 +188,7 @@ label="创建时间" align="center">
- +
{ if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { - type: '18' + var json = Object.assign(this.rhform, this.roleForm) + json.commentText = this.commentText + json.data1 = this.data1 + json.data2 = this.data2 + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: res.data, + userId: this.$store.getters.userInfo.userId }, {}, res => { - if (res.ok) { - var json = Object.assign(this.rhform, this.roleForm) - json.commentText = this.commentText - json.data1 = this.data1 - json.data2 = this.data2 - 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') - this.isSubmit = false - } else { - this.$message.warning('流程启动失败') - this.isSubmit = false - } - }) + if (res.success) { + this.$message.success('流程发起成功') + this.$router.push('/processCenter') + this.isSubmit = false } else { this.$message.warning('流程启动失败') this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step2.vue b/src/pages/processCenter/pages/creatProcess/zcch/step2.vue index e48c4c26c..02bc371e8 100644 --- a/src/pages/processCenter/pages/creatProcess/zcch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/zcch/step2.vue @@ -5,7 +5,8 @@
-
基础信息
+
基础信息
+
人员信息
@@ -209,6 +210,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -368,6 +436,7 @@ }, mounted() { this.getData() + this.getHistoryData() } }; diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step3.vue b/src/pages/processCenter/pages/creatProcess/zcch/step3.vue index e282e2226..5e3e82d31 100644 --- a/src/pages/processCenter/pages/creatProcess/zcch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/zcch/step3.vue @@ -5,7 +5,8 @@
-
基础信息
+
基础信息
+
人员信息
@@ -209,6 +210,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -342,6 +410,7 @@ }, }, mounted() { + this.getHistoryData() this.getData() } }; diff --git a/src/pages/processCenter/pages/creatProcess/zchh/step2.vue b/src/pages/processCenter/pages/creatProcess/zchh/step2.vue index 33a994a10..46def0a2d 100644 --- a/src/pages/processCenter/pages/creatProcess/zchh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/zchh/step2.vue @@ -5,7 +5,8 @@
-
基础信息
+
基础信息
+
人员信息
@@ -246,6 +247,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, updataFj (item) { window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, @@ -405,6 +473,7 @@ }, }, mounted() { + this.getHistoryData() this.getData() } }; diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue index 9dfef74cb..6c8116174 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue @@ -752,28 +752,19 @@ this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { - type: '17' + var json = Object.assign(this.rhform, this.roleForm) + json.commentText = this.commentText + json.data1 = this.data1 + json.data2 = this.data2 + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: res.data, + userId: this.$store.getters.userInfo.userId }, {}, res => { - if (res.ok) { - var json = Object.assign(this.rhform, this.roleForm) - json.commentText = this.commentText - json.data1 = this.data1 - json.data2 = this.data2 - 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') - this.isSubmit = false - } else { - this.$message.warning('流程启动失败') - this.isSubmit = false - } - }) + if (res.success) { + this.$message.success('流程发起成功') + this.$router.push('/processCenter') + this.isSubmit = false } else { this.$message.warning('流程启动失败') this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue index c6f415184..5ddf8e5dd 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue @@ -5,7 +5,8 @@
-
基础信息
+
基础信息
+
人员信息
@@ -184,6 +185,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, handleSubmit() { this.isSubmit = true var json = this.json @@ -300,6 +368,7 @@ }, }, mounted () { + this.getHistoryData() this.getData() } } diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue index 5035bd5bb..8b3de2982 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue @@ -5,7 +5,8 @@
-
基础信息
+
基础信息
+
人员信息
@@ -184,6 +185,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, handleSubmit() { this.isSubmit = true var json = this.json @@ -300,6 +368,7 @@ }, }, mounted () { + this.getHistoryData() this.getData() } } diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue index 4a3e36791..d8220c590 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue @@ -5,7 +5,8 @@
-
基础信息
+
基础信息
+
人员信息
@@ -184,6 +185,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, handleSubmit() { this.isSubmit = true var json = this.json @@ -300,6 +368,7 @@ }, }, mounted () { + this.getHistoryData() this.getData() } } diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue index 641508646..aa845207d 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue @@ -162,10 +162,10 @@ > - - + + -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
-
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - -
+
+
+
{{ item.name }}
+
+
+ + + +
+
@@ -328,27 +314,20 @@ v-model="form.GCWBLAWSName" clearable > -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
@@ -468,12 +447,28 @@ - + +
+
+
{{ item.name }}
+
+
+ + + +
+
@@ -484,50 +479,34 @@ - - - - - - - - - - - + -
- - - - 查看已上传文件 - - -
-
- - - 点击上传 - -
+ {{'手动查找'}} + + + + + + + + + + + + + +
@@ -651,7 +630,7 @@ @@ -694,12 +673,11 @@ + size="mini" + style="margin-left: 5px" + @click="handleSearchStandard"> + 查询 + size="mini" + @click="handleResetSearch"> + 清空 +
@@ -927,6 +907,7 @@ diff --git a/src/pages/processCenter/pages/phone/bzdy/step2.vue b/src/pages/processCenter/pages/phone/bzdy/step2.vue new file mode 100644 index 000000000..5d50cef7a --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzdy/step2.vue @@ -0,0 +1,361 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzdy/step4.vue b/src/pages/processCenter/pages/phone/bzdy/step4.vue new file mode 100644 index 000000000..f8b76f847 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzdy/step4.vue @@ -0,0 +1,376 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzdy/step6.vue b/src/pages/processCenter/pages/phone/bzdy/step6.vue new file mode 100644 index 000000000..e650dc453 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzdy/step6.vue @@ -0,0 +1,409 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzdy/step7.vue b/src/pages/processCenter/pages/phone/bzdy/step7.vue index 622d08ba1..38e644e4e 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step7.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step7.vue @@ -15,7 +15,7 @@ :model="form" :rules="formRules" class="label-input-form" - label-width="210px" + label-width="100px" > @@ -41,20 +41,13 @@ -
+
{{ form.hzfileName }}
- -
- - - - - - -
@@ -91,7 +84,7 @@ label="文件" align="center"> @@ -112,68 +105,7 @@
- - - - - - - - - - - - - - - - - - +
+
@@ -277,7 +216,8 @@ }, e => {}) }, updateFile (fileId) { - window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId + this.$preview(fileId) + // window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId }, // 导入按钮 上传之前的钩子 beginImportFile (file) { @@ -396,33 +336,12 @@ /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { - height: 52px; - display: flex; - align-items: center; - position: absolute; - top: 52px; - right: 10px; - .headerTabsItem { - border: 1px solid #c1c1c1; - padding: 0 5px; - height: 30px; - line-height: 30px; - cursor: pointer; - } - .active { - border: 1px solid #E6A23C; - color: #fff; - background: #E6A23C; - } - } .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/bzdy/step8.vue b/src/pages/processCenter/pages/phone/bzdy/step8.vue index 824b425f5..8f143b491 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step8.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step8.vue @@ -15,7 +15,7 @@ :model="form" :rules="formRules" class="label-input-form" - label-width="210px" + label-width="100px" > @@ -112,68 +112,7 @@
- - - - - - - - - - - - - - - - - - +
+
@@ -277,7 +223,7 @@ }, e => {}) }, updateFile (fileId) { - window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId + this.$preview(fileId) }, // 导入按钮 上传之前的钩子 beginImportFile (file) { @@ -396,33 +342,12 @@ /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { - height: 52px; - display: flex; - align-items: center; - position: absolute; - top: 52px; - right: 10px; - .headerTabsItem { - border: 1px solid #c1c1c1; - padding: 0 5px; - height: 30px; - line-height: 30px; - cursor: pointer; - } - .active { - border: 1px solid #E6A23C; - color: #fff; - background: #E6A23C; - } - } .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/bzdy/step9.vue b/src/pages/processCenter/pages/phone/bzdy/step9.vue index dadc83ed7..e65fd3241 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step9.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step9.vue @@ -15,7 +15,7 @@ :model="form" :rules="formRules" class="label-input-form" - label-width="210px" + label-width="100px" > @@ -48,13 +48,6 @@ - -
- - - - - - -
@@ -112,68 +105,7 @@
- - - - - - - - - - - - - - - - - - +
+
@@ -277,7 +216,7 @@ }, e => {}) }, updateFile (fileId) { - window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId + this.$preview(fileId) }, // 导入按钮 上传之前的钩子 beginImportFile (file) { @@ -396,33 +335,12 @@ /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { - height: 52px; - display: flex; - align-items: center; - position: absolute; - top: 52px; - right: 10px; - .headerTabsItem { - border: 1px solid #c1c1c1; - padding: 0 5px; - height: 30px; - line-height: 30px; - cursor: pointer; - } - .active { - border: 1px solid #E6A23C; - color: #fff; - background: #E6A23C; - } - } .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue index cacd45882..40e757002 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue @@ -60,7 +60,7 @@ {{ '-' }} - + {{ item.name }} {{ ';' }} @@ -92,10 +92,11 @@ + @@ -118,69 +119,7 @@
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 +
+
@@ -226,6 +172,7 @@ export default { }, ch_rules: {}, nodeList: [], + modalshowflag: false, commentText: '', isBack: false, @@ -240,13 +187,7 @@ export default { uploadFileLength: '' } }, - computed: { - listNoDataText() { - return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; - } - }, created() { - this.processTable() this.getData() }, methods: { @@ -255,20 +196,6 @@ export default { this.active = name }, - 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 => { - }) - }, - getData() { const params = { taskIds: this.taskIds, @@ -283,7 +210,6 @@ export default { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData this.uploadFileLength = this.ch_pageData.fileTextList.length - this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList }) }, @@ -349,9 +275,31 @@ export default { previews(val) { let attId = val if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + this.$preview(attId) } }, + + choiceRole () { + this.nodeList = [] + if ( this.ch_pageData.meetingInRoleId.length > 0) { + this.nodeList = this.ch_pageData.meetingInRoleId.split(',') + } + this.modalshowflag = true + }, + checkedRole (data) { + var idList = '' + var nameList = '' + data.forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + this.ch_pageData.meetingInRoleId = idList + this.ch_pageData.meetingInRole = nameList + }, } } @@ -369,7 +317,7 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { + /*.headerTabs { height: 52px; display: flex; align-items: center; @@ -388,14 +336,14 @@ export default { color: #fff; background: #E6A23C; } - } + }*/ .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue index 770ea59ad..423b9b7f4 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue @@ -60,7 +60,7 @@ {{ '-' }} - + {{ item.name }} {{ ';' }} @@ -124,69 +124,7 @@
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 +
{ - this.detailData = res - }, e => { - }) - }, getData() { const params = { @@ -349,11 +268,11 @@ export default { } }) }, - /** 点击对应附件进行下载*/ + /** 点击对应附件进行预览 */ previews(val) { let attId = val if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + this.$preview(attId) } }, } @@ -369,7 +288,7 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { + /*.headerTabs { height: 52px; display: flex; align-items: center; @@ -388,14 +307,14 @@ export default { color: #fff; background: #E6A23C; } - } + }*/ .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue index be4341f0c..96d44bb14 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue @@ -62,7 +62,7 @@ {{ '-' }} - + {{ item.name }} {{ ';' }} @@ -126,69 +126,7 @@
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 +
{ - this.detailData = res - }, e => { - }) - }, getData() { if (this.taskInfo === '标准法规工程师修订完毕') { @@ -412,11 +331,11 @@ export default { }) }, - /** 点击对应附件进行下载*/ + /** 点击对应附件进行预览*/ previews(val) { let attId = val if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + this.$preview(attId) } }, } @@ -432,7 +351,7 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { + /*.headerTabs { height: 52px; display: flex; align-items: center; @@ -451,14 +370,14 @@ export default { color: #fff; background: #E6A23C; } - } + }*/ .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue index e303ba5c6..7b40400a3 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue @@ -119,69 +119,7 @@
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 +
{ - this.detailData = res - }, e => { - }) - }, - getData() { const params = { taskIds: this.taskIds, @@ -330,14 +248,14 @@ export default { handleOnPreview(file) { let attId = file.id if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + this.$preview(attId) } }, - // 点击上传的文件进行下载 + // 点击上传的文件进行预览 onPreviewTheme(file) { let attId = file.id if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + this.$preview(attId) } }, // 点击上传的文件进行下载 @@ -410,7 +328,7 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { + /*.headerTabs { height: 52px; display: flex; align-items: center; @@ -429,14 +347,14 @@ export default { color: #fff; background: #E6A23C; } - } + }*/ .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + /* height: calc(~'100% - 155px');*/ overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue index 3c97c30ac..8e4821d79 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue @@ -67,7 +67,7 @@ {{ '-' }} - + {{ item.name }} {{ ';' }} @@ -96,9 +96,11 @@ + @@ -121,69 +123,7 @@
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 +
+
@@ -239,6 +186,7 @@ export default { commentText: '', roleShowflag: false, nodeList: [], + modalshowflag: false, detailData: [], loading: false, @@ -252,29 +200,12 @@ export default { infoSourcesLength: '' } }, - computed: { - listNoDataText() { - return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; - } - }, + created() { - this.processTable() + this.getData() }, 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 => { - }) - }, getData() { const params = { @@ -289,7 +220,6 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData - this.rh_pageData.comityOpRole = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList @@ -300,11 +230,11 @@ export default { this.active = name }, - /** 点击对应附件进行下载*/ + /** 点击对应附件进行预览*/ previews(val) { let attId = val if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + this.$preview(attId) } }, // 退回按钮 @@ -362,7 +292,28 @@ export default { }); } }) - } + }, + choiceRole () { + this.nodeList = [] + if ( this.rh_pageData.comityOpRoleId.length > 0) { + this.nodeList = this.rh_pageData.comityOpRoleId.split(',') + } + this.modalshowflag = true + }, + checkedRole (data) { + var idList = '' + var nameList = '' + data.forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + this.rh_pageData.comityOpRoleId = idList + this.rh_pageData.comityOpRole = nameList + }, } } @@ -376,7 +327,7 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { + /*.headerTabs { height: 52px; display: flex; align-items: center; @@ -395,14 +346,14 @@ export default { color: #fff; background: #E6A23C; } - } + }*/ .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue index 44117ee36..892187bcf 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue @@ -67,7 +67,7 @@ {{ '-' }} - + {{ item.name }} {{ ';' }} @@ -110,7 +110,7 @@ @@ -136,69 +136,7 @@
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 +
{ - this.detailData = res - }, e => { - }) - }, getData() { const params = { @@ -391,11 +310,11 @@ export default { } }) }, - /** 点击对应附件进行下载*/ + /** 点击对应附件进行预览*/ previews(val) { let attId = val if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + this.$preview(attId) } }, } @@ -411,7 +330,7 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { + /*.headerTabs { height: 52px; display: flex; align-items: center; @@ -430,14 +349,14 @@ export default { color: #fff; background: #E6A23C; } - } + }*/ .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue index 2e51410a7..a962d58c6 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue @@ -69,7 +69,7 @@ {{ '-' }} - + {{ item.name }} {{ ';' }} @@ -140,69 +140,7 @@
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 +
{ - this.detailData = res - }, e => { - }) - }, getData() { const params = { @@ -331,11 +250,11 @@ export default { // this.rh_pageData.comityFileNum = this.fileTextList }) }, - /** 点击对应附件进行下载*/ + /** 点击对应附件进行预览*/ previews(val) { let attId = val if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + this.$preview(attId) } }, selectedDelete(val) { @@ -424,7 +343,7 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { + /*.headerTabs { height: 52px; display: flex; align-items: center; @@ -443,14 +362,14 @@ export default { color: #fff; background: #E6A23C; } - } + }*/ .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue index 530b3f58b..4b1877357 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step4.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue @@ -14,7 +14,7 @@ ref="bzzqyjForm" :model="form" class="label-input-form" - label-width="210px" + label-width="100px" > @@ -253,65 +253,7 @@
- - - - - - - - - - - - - - - - - - +
@@ -253,65 +253,7 @@
- - - - - - - - - - - - - - - - - - +
@@ -253,65 +253,7 @@
- - - - - - - - - - - - - - - - - - +
基础信息
审批历史
-
+
@@ -40,7 +40,8 @@

{{ item.name }} + :key="item.id" @click="clickButtonToUpload2(item.id)"> + {{ item.name }} - -

- - - - - - - - - - - - - - - - - - +
+
@@ -241,7 +185,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone' import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail ,changeAssigneeNew} from "api/process"; +import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js" export default { name: "phoneBzqdfbStep4", @@ -253,6 +197,9 @@ export default { }, data() { return { + modalshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', nodeList:[], isTransfer: false, drawerTitle:'', @@ -313,26 +260,6 @@ export default { }; }, methods: { - //确认转办 - checkedRole (data) { - this.assigneeNewLoading = true - changeAssigneeNew({ - taskId: this.$route.query.taskIds, // 任务id - assignee: data[0].id, // 被委托人 - userId: this.$store.getters.userInfo.userId, // 委托人 - pId: this.$route.query.prcId // 流程实例 - }).then(res => { - this.isTransfer = false - if (res.success) { - this.drawerModal = false - this.$message.success('调整成功') - this.$router.push("/processCenter"); - this.processNum() - } else { - this.$message.warning(res.message) - } - }) - }, // 请求转换流程图 processNum (row) { axios.request({ @@ -350,22 +277,29 @@ export default { }, //转办事件 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.modalshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' }, - 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 => { - }); + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.userId, // 委托人 + pId: this.pId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, //tab发生变化 handleTabs(name) { @@ -449,6 +383,11 @@ export default { }, e => { }); }, + //点击预览 + clickButtonToUpload2(file) { + const attId = file + this.$preview(attId) + }, /** * @Description: 点击下载 */ @@ -509,7 +448,7 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); - this.$router.push("/processCenter"); + window.history.back() } this.isSubmit = false }); @@ -558,7 +497,6 @@ export default { this.setMap(this.standStateOptions); }); this.getData(); - this.processTable(); } }; @@ -576,33 +514,33 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { - height: 52px; - display: flex; - align-items: center; - position: absolute; - top: 52px; - right: 10px; - .headerTabsItem { - border: 1px solid #c1c1c1; - padding: 0 5px; - height: 30px; - line-height: 30px; - cursor: pointer; - } - .active { - border: 1px solid #E6A23C; - color: #fff; - background: #E6A23C; - } - } + //.headerTabs { + // height: 52px; + // display: flex; + // align-items: center; + // position: absolute; + // top: 52px; + // right: 10px; + // .headerTabsItem { + // border: 1px solid #c1c1c1; + // padding: 0 5px; + // height: 30px; + // line-height: 30px; + // cursor: pointer; + // } + // .active { + // border: 1px solid #E6A23C; + // color: #fff; + // background: #E6A23C; + // } + //} .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue new file mode 100644 index 000000000..8a80d95ab --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -0,0 +1,1111 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue new file mode 100644 index 000000000..6d2074f2b --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue @@ -0,0 +1,439 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue new file mode 100644 index 000000000..41a91f071 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue @@ -0,0 +1,523 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue new file mode 100644 index 000000000..d18fb4b18 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue @@ -0,0 +1,510 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue new file mode 100644 index 000000000..2d2ccf72b --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue @@ -0,0 +1,507 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue new file mode 100644 index 000000000..5bbd4d91a --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue @@ -0,0 +1,508 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue new file mode 100644 index 000000000..fa154ef1e --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue @@ -0,0 +1,508 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue new file mode 100644 index 000000000..7873858e3 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue @@ -0,0 +1,522 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step2.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step2.vue new file mode 100644 index 000000000..4083435c3 --- /dev/null +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step2.vue @@ -0,0 +1,316 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue new file mode 100644 index 000000000..8347666a7 --- /dev/null +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue @@ -0,0 +1,474 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue new file mode 100644 index 000000000..3fea10ac6 --- /dev/null +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue @@ -0,0 +1,474 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue new file mode 100644 index 000000000..14a53617d --- /dev/null +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue @@ -0,0 +1,474 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/index.vue b/src/pages/processCenter/pages/phone/index.vue new file mode 100644 index 000000000..6979de337 --- /dev/null +++ b/src/pages/processCenter/pages/phone/index.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue index 7f473aeef..a60005f7f 100644 --- a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue +++ b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue @@ -1,6 +1,6 @@ + + diff --git a/src/pages/processCenter/pages/phone/qbfs/step4.vue b/src/pages/processCenter/pages/phone/qbfs/step4.vue new file mode 100644 index 000000000..bdf95231d --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfs/step4.vue @@ -0,0 +1,482 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfz/step2.vue b/src/pages/processCenter/pages/phone/qbfz/step2.vue new file mode 100644 index 000000000..961cfab6a --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfz/step2.vue @@ -0,0 +1,422 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfz/step5.vue b/src/pages/processCenter/pages/phone/qbfz/step5.vue new file mode 100644 index 000000000..8e46d6363 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfz/step5.vue @@ -0,0 +1,558 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfz/step6.vue b/src/pages/processCenter/pages/phone/qbfz/step6.vue new file mode 100644 index 000000000..66b43a24e --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfz/step6.vue @@ -0,0 +1,558 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfz/step7.vue b/src/pages/processCenter/pages/phone/qbfz/step7.vue new file mode 100644 index 000000000..237fad694 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfz/step7.vue @@ -0,0 +1,558 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue new file mode 100644 index 000000000..207ebc5fd --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue @@ -0,0 +1,479 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue new file mode 100644 index 000000000..250b8a677 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue @@ -0,0 +1,471 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue new file mode 100644 index 000000000..87c4ed9cd --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue @@ -0,0 +1,471 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue new file mode 100644 index 000000000..d3de1e41b --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue @@ -0,0 +1,471 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/wbsm/step3.vue b/src/pages/processCenter/pages/phone/wbsm/step3.vue index feb758afb..e5e18fcdc 100644 --- a/src/pages/processCenter/pages/phone/wbsm/step3.vue +++ b/src/pages/processCenter/pages/phone/wbsm/step3.vue @@ -1,13 +1,455 @@ - diff --git a/src/pages/processCenter/pages/phone/wbsm/step4.vue b/src/pages/processCenter/pages/phone/wbsm/step4.vue index e966bff51..9af5831a7 100644 --- a/src/pages/processCenter/pages/phone/wbsm/step4.vue +++ b/src/pages/processCenter/pages/phone/wbsm/step4.vue @@ -1,13 +1,455 @@ - diff --git a/src/pages/processCenter/pages/phone/wbsm/step5.vue b/src/pages/processCenter/pages/phone/wbsm/step5.vue index 60a5fa44d..d2f4024b2 100644 --- a/src/pages/processCenter/pages/phone/wbsm/step5.vue +++ b/src/pages/processCenter/pages/phone/wbsm/step5.vue @@ -1,13 +1,455 @@ - diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue new file mode 100644 index 000000000..ed67bb269 --- /dev/null +++ b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue @@ -0,0 +1,455 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue new file mode 100644 index 000000000..c3d383d96 --- /dev/null +++ b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue @@ -0,0 +1,519 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue index b438e87c6..990f20db5 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -1,7 +1,7 @@ - + + @@ -169,14 +108,13 @@ import ProcessTitle from '../../components/ProcessTitle' import {inboundLiaisonDetail, changeAssigneeNew} from "@/api/process"; export default { - name: "phoneWfhxStep5", + name: "phoneWfhxzgStep5", data() { return { drawerTitle: '', nodeList: [], modalshowflag: false, // drawer开关 fileMadel: false, - detailData: [], loading: false, commentText: '', title: '', // 新增编辑抽屉标题 @@ -207,6 +145,12 @@ export default { // 驳回弹窗状态 backDialog: false, + // 储存手机端选人集合 + phoneRoleList: [], + roleTitle: '', + showPage: false, + phoneRole: '', + } }, components: { @@ -215,32 +159,13 @@ export default { ProcessTitle }, created() { - this.processTable() this.getData() }, - computed: { - listNoDataText() { - return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; - } - }, 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, - sortWord: this.shunxu ? this.paixu : "", - shunxu: this.shunxu - }, { - loading: "loading", - _this: this - }, res => { - this.detailData = res - }, e => { - }); - }, getData() { const params = { taskIds: this.taskIds, @@ -284,7 +209,7 @@ export default { handleOnPreview(file) { let attId = file.id if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + this.$preview(attId) } }, // 提交按钮 @@ -308,8 +233,14 @@ export default { this.isSubmit = false }) }, - drawerCheck (data) { - this.turnLoading = true + + // 转办按钮 + handleTurnTo() { + this.showPage = true + this.roleTitle = '转办处理人' + }, + // 转办选人框 + phoneSumit (data) { changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -324,20 +255,13 @@ export default { this.$message.warning(res.message) } }) - this.modalshowflag = false - }, - // 转办按钮 - handleTurnTo() { - this.modalshowflag = true - this.drawerTitle = '转办处理人' + // this.showPage = false }, handleSubmitNo() { this.backLoading = true if (this.commentText) { var json = { - responUserList: { - standardInfoList: this.dataList - }, + responUserList: this.dataList, actionFlag: 1, commentText: this.commentText } @@ -402,6 +326,9 @@ export default { pageSizeChange () { this.getTableByPage() }, + showPagePC() { + this.showPage = true + }, } } @@ -415,7 +342,7 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { + /* .headerTabs { height: 52px; display: flex; align-items: center; @@ -434,14 +361,14 @@ export default { color: #fff; background: #E6A23C; } - } + }*/ .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/xmpg/step2.vue b/src/pages/processCenter/pages/phone/xmpg/step2.vue index 703717f69..2ee9bbc26 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step2.vue +++ b/src/pages/processCenter/pages/phone/xmpg/step2.vue @@ -178,67 +178,10 @@
- - - - - - - - - - - - - - - - - - +
+
@@ -272,6 +221,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, nodeList:[], @@ -393,11 +345,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { @@ -529,33 +502,13 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { - height: 52px; - display: flex; - align-items: center; - position: absolute; - top: 52px; - right: 10px; - .headerTabsItem { - border: 1px solid #c1c1c1; - padding: 0 5px; - height: 30px; - line-height: 30px; - cursor: pointer; - } - .active { - border: 1px solid #E6A23C; - color: #fff; - background: #E6A23C; - } - } .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/xmpg/step5.vue b/src/pages/processCenter/pages/phone/xmpg/step5.vue index d55f74197..b37064283 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step5.vue +++ b/src/pages/processCenter/pages/phone/xmpg/step5.vue @@ -260,67 +260,10 @@
- - - - - - - - - - - - - - - - - - +
+
@@ -354,6 +303,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, nodeList:[], @@ -475,11 +427,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { @@ -633,33 +606,13 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { - height: 52px; - display: flex; - align-items: center; - position: absolute; - top: 52px; - right: 10px; - .headerTabsItem { - border: 1px solid #c1c1c1; - padding: 0 5px; - height: 30px; - line-height: 30px; - cursor: pointer; - } - .active { - border: 1px solid #E6A23C; - color: #fff; - background: #E6A23C; - } - } .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/xmpg/step6.vue b/src/pages/processCenter/pages/phone/xmpg/step6.vue index 4f758a8dc..b58f8d2e4 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step6.vue +++ b/src/pages/processCenter/pages/phone/xmpg/step6.vue @@ -260,67 +260,10 @@
- - - - - - - - - - - - - - - - - - +
+
@@ -354,6 +303,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, nodeList:[], @@ -475,11 +427,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { @@ -620,33 +593,13 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { - height: 52px; - display: flex; - align-items: center; - position: absolute; - top: 52px; - right: 10px; - .headerTabsItem { - border: 1px solid #c1c1c1; - padding: 0 5px; - height: 30px; - line-height: 30px; - cursor: pointer; - } - .active { - border: 1px solid #E6A23C; - color: #fff; - background: #E6A23C; - } - } .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/xmpg/step7.vue b/src/pages/processCenter/pages/phone/xmpg/step7.vue index f489f7fb1..582c84325 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step7.vue +++ b/src/pages/processCenter/pages/phone/xmpg/step7.vue @@ -260,67 +260,10 @@
- - - - - - - - - - - - - - - - - - +
+
@@ -354,6 +303,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, nodeList:[], @@ -475,11 +427,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { @@ -616,33 +589,13 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { - height: 52px; - display: flex; - align-items: center; - position: absolute; - top: 52px; - right: 10px; - .headerTabsItem { - border: 1px solid #c1c1c1; - padding: 0 5px; - height: 30px; - line-height: 30px; - cursor: pointer; - } - .active { - border: 1px solid #E6A23C; - color: #fff; - background: #E6A23C; - } - } .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/xmpg2/step10.vue b/src/pages/processCenter/pages/phone/xmpg2/step10.vue new file mode 100644 index 000000000..c46540149 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step10.vue @@ -0,0 +1,550 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg2/step11.vue b/src/pages/processCenter/pages/phone/xmpg2/step11.vue new file mode 100644 index 000000000..03d355b05 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step11.vue @@ -0,0 +1,525 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg2/step12.vue b/src/pages/processCenter/pages/phone/xmpg2/step12.vue new file mode 100644 index 000000000..fa696026d --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step12.vue @@ -0,0 +1,550 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg2/step2.vue b/src/pages/processCenter/pages/phone/xmpg2/step2.vue index 0b3be18ee..51da41b06 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step2.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step2.vue @@ -159,69 +159,12 @@
- - - - - - - - - - - - - - - - - - +
+
@@ -252,6 +201,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, nodeList:[], @@ -321,11 +273,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { @@ -453,33 +426,13 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { - height: 52px; - display: flex; - align-items: center; - position: absolute; - top: 52px; - right: 10px; - .headerTabsItem { - border: 1px solid #c1c1c1; - padding: 0 5px; - height: 30px; - line-height: 30px; - cursor: pointer; - } - .active { - border: 1px solid #E6A23C; - color: #fff; - background: #E6A23C; - } - } .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/xmpg2/step3.vue b/src/pages/processCenter/pages/phone/xmpg2/step3.vue new file mode 100644 index 000000000..f0242772e --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step3.vue @@ -0,0 +1,464 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg2/step7.vue b/src/pages/processCenter/pages/phone/xmpg2/step7.vue index 9429b17af..717d6d45f 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step7.vue @@ -174,6 +174,7 @@ label="责任人"> + 加载更多...
@@ -189,69 +190,12 @@
- - - - - - - - - - - - - - - - - - +
+
@@ -282,6 +232,11 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', + tableIndex: 0, + itemLists: [], foldFormFlag: false, total: 0, currentPage: 1, @@ -314,6 +269,16 @@ export default { }; }, methods: { + tableLoading () { + this.tableIndex++ + let index = this.tableIndex * 20 + let endIndex = index + 20 + if (this.tableIndex * 20 > this.itemLists.length) { + this.$message.warning('没有更多了') + } + let newData = this.itemLists.slice(index, endIndex) + this.itemList = this.itemList.concat(newData) + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag @@ -353,11 +318,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, // 点击查看 handlePreview(item) { @@ -438,7 +424,7 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { - if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){ + if(item.workPeople !== ''){ this.dataList.push(item) } item.children.forEach(items=> { @@ -448,6 +434,9 @@ export default { this.$set(items, "standYear", item.standYear); this.$set(items, "standSort", item.standSort); this.$set(items, "standNumber", item.standNumber); + this.$set(items, "zccssrq", item.zccssrq); + this.$set(items, "xcxssrq", item.xcxssrq); + this.$set(items, "ssrq", item.ssrq); } }) }) @@ -534,33 +523,13 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { - height: 52px; - display: flex; - align-items: center; - position: absolute; - top: 52px; - right: 10px; - .headerTabsItem { - border: 1px solid #c1c1c1; - padding: 0 5px; - height: 30px; - line-height: 30px; - cursor: pointer; - } - .active { - border: 1px solid #E6A23C; - color: #fff; - background: #E6A23C; - } - } .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/xmpg2/step8.vue b/src/pages/processCenter/pages/phone/xmpg2/step8.vue new file mode 100644 index 000000000..1932c168c --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step8.vue @@ -0,0 +1,550 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg2/step9.vue b/src/pages/processCenter/pages/phone/xmpg2/step9.vue new file mode 100644 index 000000000..e1fd7d905 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step9.vue @@ -0,0 +1,549 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmqdqr/step5.vue b/src/pages/processCenter/pages/phone/xmqdqr/step5.vue index f78968e5e..7fe638983 100644 --- a/src/pages/processCenter/pages/phone/xmqdqr/step5.vue +++ b/src/pages/processCenter/pages/phone/xmqdqr/step5.vue @@ -190,67 +190,10 @@
- - - - - - - - - - - - - - - - - - +
+
@@ -284,6 +233,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, lawInfoTableLoading: true, @@ -403,11 +355,32 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - //转办事件 + //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + //确认转办 + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, // 将文本状态的id与name对应 setMap(data) { @@ -669,33 +642,13 @@ export default { /deep/.prc-content-border .el-form-item__content { width: 270px; } - .headerTabs { - height: 52px; - display: flex; - align-items: center; - position: absolute; - top: 52px; - right: 10px; - .headerTabsItem { - border: 1px solid #c1c1c1; - padding: 0 5px; - height: 30px; - line-height: 30px; - cursor: pointer; - } - .active { - border: 1px solid #E6A23C; - color: #fff; - background: #E6A23C; - } - } .content { border-top: 1px solid #DCDFE6; display: flex; flex-direction: column; justify-content: space-between; margin-top: 52px; - height: calc(~'100% - 155px'); + //height: calc(~'100% - 155px'); overflow: auto; .tableTitle { margin-bottom: 10px; diff --git a/src/pages/processCenter/pages/phone/zczqyj/step4.vue b/src/pages/processCenter/pages/phone/zczqyj/step4.vue index 9d74bfae8..a32b246f8 100644 --- a/src/pages/processCenter/pages/phone/zczqyj/step4.vue +++ b/src/pages/processCenter/pages/phone/zczqyj/step4.vue @@ -128,67 +128,7 @@
- - - - - - - - - - - - - - - - - - +
- - - - - - - - - - - - - - - - - - +
- - - - - - - - - - - - - - - - - - +
- - - - - - - - - - - - - - - - - - +
- - - - - - - - - - - - - - - - - - +
- - - - - - - - - - - - - - - - - - +
+
+ +
当前任务已处理
+ 返回 +
+ + + + + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 79b6974d5..52a5786b6 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -81,9 +81,9 @@ - + @@ -197,12 +197,11 @@ label="标准名称" > @@ -211,26 +210,17 @@ - - @@ -342,14 +331,12 @@ @@ -368,34 +355,6 @@ align="center" label="适用产品线"> - + + diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue new file mode 100644 index 000000000..c74ed9f61 --- /dev/null +++ b/src/pages/regulatoryRepository/dataCenter/index.vue @@ -0,0 +1,471 @@ + + + + + diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index a0b51bf52..6117dc657 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -163,10 +163,12 @@ v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'">移除标准 OCR 拆分 @@ -426,9 +428,9 @@ @@ -460,9 +462,9 @@ placeholder="请选择标准性质" clearable> @@ -477,9 +479,9 @@ placeholder="请选择文本状态" clearable> {{ opt.label }} @@ -519,7 +521,6 @@