Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp =================================================================== diff -u -r33909 -r34209 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 33909) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 34209) @@ -231,6 +231,7 @@ + <%@ include file="/common/include_Ext2_Js.jsp"%> Index: ssts-web/src/main/webapp/common/wangEditor/style.css =================================================================== diff -u --- ssts-web/src/main/webapp/common/wangEditor/style.css (revision 0) +++ ssts-web/src/main/webapp/common/wangEditor/style.css (revision 34209) @@ -0,0 +1,8 @@ +:host,:root{--w-e-textarea-bg-color:#fff;--w-e-textarea-color:#333;--w-e-textarea-border-color:#ccc;--w-e-textarea-slight-border-color:#e8e8e8;--w-e-textarea-slight-color:#d4d4d4;--w-e-textarea-slight-bg-color:#f5f2f0;--w-e-textarea-selected-border-color:#b4d5ff;--w-e-textarea-handler-bg-color:#4290f7;--w-e-toolbar-color:#595959;--w-e-toolbar-bg-color:#fff;--w-e-toolbar-active-color:#333;--w-e-toolbar-active-bg-color:#f1f1f1;--w-e-toolbar-disabled-color:#999;--w-e-toolbar-border-color:#e8e8e8;--w-e-modal-button-bg-color:#fafafa;--w-e-modal-button-border-color:#d9d9d9} +.w-e-text-container *,.w-e-toolbar *{box-sizing:border-box;margin:0;outline:none;padding:0}.w-e-text-container blockquote,.w-e-text-container li,.w-e-text-container p,.w-e-text-container td,.w-e-text-container th,.w-e-toolbar *{line-height:1.5}.w-e-text-container{background-color:var(--w-e-textarea-bg-color);color:var(--w-e-textarea-color);height:100%;position:relative}.w-e-text-container .w-e-scroll{-webkit-overflow-scrolling:touch;height:100%}.w-e-text-container [data-slate-editor]{word-wrap:break-word;border-top:1px solid transparent;min-height:100%;outline:0;padding:0 10px;white-space:pre-wrap}.w-e-text-container [data-slate-editor] p{margin:15px 0}.w-e-text-container [data-slate-editor] h1,.w-e-text-container [data-slate-editor] h2,.w-e-text-container [data-slate-editor] h3,.w-e-text-container [data-slate-editor] h4,.w-e-text-container [data-slate-editor] h5{margin:20px 0}.w-e-text-container [data-slate-editor] img{cursor:default;display:inline!important;max-width:100%;min-height:20px;min-width:20px}.w-e-text-container [data-slate-editor] [data-selected=true]{box-shadow:0 0 0 2px var(--w-e-textarea-selected-border-color)}.w-e-text-placeholder{font-style:italic;left:10px;top:17px;width:90%}.w-e-max-length-info,.w-e-text-placeholder{color:var(--w-e-textarea-slight-color);pointer-events:none;position:absolute;-webkit-user-select:none;-moz-user-select:none;user-select:none}.w-e-max-length-info{bottom:.5em;right:1em}.w-e-bar{background-color:var(--w-e-toolbar-bg-color);color:var(--w-e-toolbar-color);font-size:14px;padding:0 5px}.w-e-bar svg{fill:var(--w-e-toolbar-color);height:14px;width:14px}.w-e-bar-show{display:flex}.w-e-bar-hidden{display:none}.w-e-hover-bar{border:1px solid var(--w-e-toolbar-border-color);border-radius:3px;box-shadow:0 2px 5px #0000001f;position:absolute}.w-e-toolbar{flex-wrap:wrap;position:relative}.w-e-bar-divider{background-color:var(--w-e-toolbar-border-color);display:inline-flex;height:40px;margin:0 5px;width:1px}.w-e-bar-item{display:flex;height:40px;padding:4px;position:relative;text-align:center}.w-e-bar-item,.w-e-bar-item button{align-items:center;justify-content:center}.w-e-bar-item button{background:transparent;border:none;color:var(--w-e-toolbar-color);cursor:pointer;display:inline-flex;height:32px;overflow:hidden;padding:0 8px;white-space:nowrap}.w-e-bar-item button:hover{background-color:var(--w-e-toolbar-active-bg-color);color:var(--w-e-toolbar-active-color)}.w-e-bar-item button .title{margin-left:5px}.w-e-bar-item .active{background-color:var(--w-e-toolbar-active-bg-color);color:var(--w-e-toolbar-active-color)}.w-e-bar-item .disabled{color:var(--w-e-toolbar-disabled-color);cursor:not-allowed}.w-e-bar-item .disabled svg{fill:var(--w-e-toolbar-disabled-color)}.w-e-bar-item .disabled:hover{background-color:var(--w-e-toolbar-bg-color);color:var(--w-e-toolbar-disabled-color)}.w-e-bar-item .disabled:hover svg{fill:var(--w-e-toolbar-disabled-color)}.w-e-menu-tooltip-v5:before{background-color:var(--w-e-toolbar-active-color);border-radius:5px;color:var(--w-e-toolbar-bg-color);content:attr(data-tooltip);font-size:.75em;opacity:0;padding:5px 10px;position:absolute;text-align:center;top:40px;transition:opacity .6s;visibility:hidden;white-space:pre;z-index:1}.w-e-menu-tooltip-v5:after{border:5px solid transparent;border-bottom:5px solid var(--w-e-toolbar-active-color);content:"";opacity:0;position:absolute;top:30px;transition:opacity .6s;visibility:hidden}.w-e-menu-tooltip-v5:hover:after,.w-e-menu-tooltip-v5:hover:before{opacity:1;visibility:visible}.w-e-menu-tooltip-v5.tooltip-right:before{left:100%;top:10px}.w-e-menu-tooltip-v5.tooltip-right:after{border-bottom-color:transparent;border-left-color:transparent;border-right-color:var(--w-e-toolbar-active-color);border-top-color:transparent;left:100%;margin-left:-10px;top:16px}.w-e-bar-item-group .w-e-bar-item-menus-container{background-color:var(--w-e-toolbar-bg-color);border:1px solid var(--w-e-toolbar-border-color);border-radius:3px;box-shadow:0 2px 10px #0000001f;display:none;left:0;margin-top:40px;position:absolute;top:0;z-index:1}.w-e-bar-item-group:hover .w-e-bar-item-menus-container{display:block}.w-e-select-list{background-color:var(--w-e-toolbar-bg-color);border:1px solid var(--w-e-toolbar-border-color);border-radius:3px;box-shadow:0 2px 10px #0000001f;left:0;margin-top:40px;max-height:350px;min-width:100px;overflow-y:auto;position:absolute;top:0;z-index:1}.w-e-select-list ul{line-height:1;list-style:none}.w-e-select-list ul .selected{background-color:var(--w-e-toolbar-active-bg-color)}.w-e-select-list ul li{cursor:pointer;padding:7px 0 7px 25px;position:relative;text-align:left;white-space:nowrap}.w-e-select-list ul li:hover{background-color:var(--w-e-toolbar-active-bg-color)}.w-e-select-list ul li svg{left:0;margin-left:5px;margin-top:-7px;position:absolute;top:50%}.w-e-bar-bottom .w-e-select-list{bottom:0;margin-bottom:40px;margin-top:0;top:inherit}.w-e-drop-panel{background-color:var(--w-e-toolbar-bg-color);border:1px solid var(--w-e-toolbar-border-color);border-radius:3px;box-shadow:0 2px 10px #0000001f;margin-top:40px;min-width:200px;padding:10px;position:absolute;top:0;z-index:1}.w-e-bar-bottom .w-e-drop-panel{bottom:0;margin-bottom:40px;margin-top:0;top:inherit}.w-e-modal{background-color:var(--w-e-toolbar-bg-color);border:1px solid var(--w-e-toolbar-border-color);border-radius:3px;box-shadow:0 2px 10px #0000001f;color:var(--w-e-toolbar-color);font-size:14px;min-height:40px;min-width:100px;padding:20px 15px 0;position:absolute;text-align:left;z-index:1}.w-e-modal .btn-close{cursor:pointer;line-height:1;padding:5px;position:absolute;right:8px;top:7px}.w-e-modal .btn-close svg{fill:var(--w-e-toolbar-color);height:10px;width:10px}.w-e-modal .babel-container{display:block;margin-bottom:15px}.w-e-modal .babel-container span{display:block;margin-bottom:10px}.w-e-modal .button-container{margin-bottom:15px}.w-e-modal button{background-color:var(--w-e-modal-button-bg-color);border:1px solid var(--w-e-modal-button-border-color);border-radius:4px;color:var(--w-e-toolbar-color);cursor:pointer;font-weight:400;height:32px;padding:4.5px 15px;text-align:center;touch-action:manipulation;transition:all .3s cubic-bezier(.645,.045,.355,1);-webkit-user-select:none;-moz-user-select:none;user-select:none;white-space:nowrap}.w-e-modal input[type=number],.w-e-modal input[type=text],.w-e-modal textarea{font-feature-settings:"tnum";background-color:var(--w-e-toolbar-bg-color);border:1px solid var(--w-e-modal-button-border-color);border-radius:4px;color:var(--w-e-toolbar-color);font-variant:tabular-nums;padding:4.5px 11px;transition:all .3s;width:100%}.w-e-modal textarea{min-height:60px}body .w-e-modal,body .w-e-modal *{box-sizing:border-box}.w-e-progress-bar{background-color:var(--w-e-textarea-handler-bg-color);height:1px;position:absolute;transition:width .3s;width:0}.w-e-full-screen-container{bottom:0!important;display:flex!important;flex-direction:column!important;height:100%!important;left:0!important;margin:0!important;padding:0!important;position:fixed;right:0!important;top:0!important;width:100%!important}.w-e-full-screen-container [data-w-e-textarea=true]{flex:1!important} +.w-e-text-container [data-slate-editor] code{background-color:var(--w-e-textarea-slight-bg-color);border-radius:3px;font-family:monospace;padding:3px}.w-e-panel-content-color{list-style:none;text-align:left;width:230px}.w-e-panel-content-color li{border:1px solid var(--w-e-toolbar-bg-color);border-radius:3px 3px;cursor:pointer;display:inline-block;padding:2px}.w-e-panel-content-color li:hover{border-color:var(--w-e-toolbar-color)}.w-e-panel-content-color li .color-block{border:1px solid var(--w-e-toolbar-border-color);border-radius:3px 3px;height:17px;width:17px}.w-e-panel-content-color .active{border-color:var(--w-e-toolbar-color)}.w-e-panel-content-color .clear{line-height:1.5;margin-bottom:5px;width:100%}.w-e-panel-content-color .clear svg{height:16px;margin-bottom:-4px;width:16px}.w-e-text-container [data-slate-editor] blockquote{background-color:var(--w-e-textarea-slight-bg-color);border-left:8px solid var(--w-e-textarea-selected-border-color);display:block;font-size:100%;line-height:1.5;margin:10px 0;padding:10px}.w-e-panel-content-emotion{font-size:20px;list-style:none;text-align:left;width:300px}.w-e-panel-content-emotion li{border-radius:3px 3px;cursor:pointer;display:inline-block;padding:0 5px}.w-e-panel-content-emotion li:hover{background-color:var(--w-e-textarea-slight-bg-color)}.w-e-textarea-divider{border-radius:3px;margin:20px auto;padding:20px}.w-e-textarea-divider hr{background-color:var(--w-e-textarea-border-color);border:0;display:block;height:1px}.w-e-text-container [data-slate-editor] pre>code{background-color:var(--w-e-textarea-slight-bg-color);border:1px solid var(--w-e-textarea-slight-border-color);border-radius:4px 4px;display:block;font-size:14px;padding:10px;text-indent:0}.w-e-text-container [data-slate-editor] .w-e-image-container{display:inline-block;margin:0 10px}.w-e-text-container [data-slate-editor] .w-e-image-container:hover{box-shadow:0 0 0 2px var(--w-e-textarea-selected-border-color)}.w-e-text-container [data-slate-editor] .w-e-selected-image-container{overflow:hidden;position:relative}.w-e-text-container [data-slate-editor] .w-e-selected-image-container .w-e-image-dragger{background-color:var(--w-e-textarea-handler-bg-color);height:7px;position:absolute;width:7px}.w-e-text-container [data-slate-editor] .w-e-selected-image-container .left-top{cursor:nwse-resize;left:0;top:0}.w-e-text-container [data-slate-editor] .w-e-selected-image-container .right-top{cursor:nesw-resize;right:0;top:0}.w-e-text-container [data-slate-editor] .w-e-selected-image-container .left-bottom{bottom:0;cursor:nesw-resize;left:0}.w-e-text-container [data-slate-editor] .w-e-selected-image-container .right-bottom{bottom:0;cursor:nwse-resize;right:0}.w-e-text-container [data-slate-editor] .w-e-selected-image-container:hover{box-shadow:none}.w-e-text-container [contenteditable=false] .w-e-image-container:hover{box-shadow:none} +.w-e-text-container [data-slate-editor] ol,.w-e-text-container [data-slate-editor] ul{padding-left:20px}.w-e-text-container [data-slate-editor] li{line-height:inherit;margin:10px 0} +.w-e-text-container [data-slate-editor] .table-container{border:1px dashed var(--w-e-textarea-border-color);border-radius:5px;margin-top:10px;overflow-x:auto;padding:10px;width:100%}.w-e-text-container [data-slate-editor] table{border-collapse:collapse}.w-e-text-container [data-slate-editor] table td,.w-e-text-container [data-slate-editor] table th{border:1px solid var(--w-e-textarea-border-color);line-height:1.5;min-width:30px;padding:3px 5px;text-align:left}.w-e-text-container [data-slate-editor] table th{background-color:var(--w-e-textarea-slight-bg-color);font-weight:700;text-align:center}.w-e-panel-content-table{background-color:var(--w-e-toolbar-bg-color)}.w-e-panel-content-table table{border-collapse:collapse}.w-e-panel-content-table td{border:1px solid var(--w-e-toolbar-border-color);cursor:pointer;height:15px;padding:3px 5px;width:20px}.w-e-panel-content-table td.active{background-color:var(--w-e-toolbar-active-bg-color)} +.w-e-textarea-video-container{background-image:linear-gradient(45deg,#eee 25%,transparent 0,transparent 75%,#eee 0,#eee),linear-gradient(45deg,#eee 25%,#fff 0,#fff 75%,#eee 0,#eee);background-position:0 0,10px 10px;background-size:20px 20px;border:1px dashed var(--w-e-textarea-border-color);border-radius:5px;margin:10px auto 0;padding:10px 0;text-align:center} + +.w-e-text-container [data-slate-editor] pre>code{word-wrap:normal;font-family:Consolas,Monaco,Andale Mono,Ubuntu Mono,monospace;-webkit-hyphens:none;hyphens:none;line-height:1.5;margin:.5em 0;overflow:auto;padding:1em;-moz-tab-size:4;-o-tab-size:4;tab-size:4;text-align:left;text-shadow:0 1px #fff;white-space:pre;word-break:normal;word-spacing:normal}.w-e-text-container [data-slate-editor] pre>code .token.cdata,.w-e-text-container [data-slate-editor] pre>code .token.comment,.w-e-text-container [data-slate-editor] pre>code .token.doctype,.w-e-text-container [data-slate-editor] pre>code .token.prolog{color:#708090}.w-e-text-container [data-slate-editor] pre>code .token.punctuation{color:#999}.w-e-text-container [data-slate-editor] pre>code .token.namespace{opacity:.7}.w-e-text-container [data-slate-editor] pre>code .token.boolean,.w-e-text-container [data-slate-editor] pre>code .token.constant,.w-e-text-container [data-slate-editor] pre>code .token.deleted,.w-e-text-container [data-slate-editor] pre>code .token.number,.w-e-text-container [data-slate-editor] pre>code .token.property,.w-e-text-container [data-slate-editor] pre>code .token.symbol,.w-e-text-container [data-slate-editor] pre>code .token.tag{color:#905}.w-e-text-container [data-slate-editor] pre>code .token.attr-name,.w-e-text-container [data-slate-editor] pre>code .token.builtin,.w-e-text-container [data-slate-editor] pre>code .token.char,.w-e-text-container [data-slate-editor] pre>code .token.inserted,.w-e-text-container [data-slate-editor] pre>code .token.selector,.w-e-text-container [data-slate-editor] pre>code .token.string{color:#690}.w-e-text-container [data-slate-editor] pre>code .language-css .token.string,.w-e-text-container [data-slate-editor] pre>code .style .token.string,.w-e-text-container [data-slate-editor] pre>code .token.entity,.w-e-text-container [data-slate-editor] pre>code .token.operator,.w-e-text-container [data-slate-editor] pre>code .token.url{color:#9a6e3a}.w-e-text-container [data-slate-editor] pre>code .token.atrule,.w-e-text-container [data-slate-editor] pre>code .token.attr-value,.w-e-text-container [data-slate-editor] pre>code .token.keyword{color:#07a}.w-e-text-container [data-slate-editor] pre>code .token.class-name,.w-e-text-container [data-slate-editor] pre>code .token.function{color:#dd4a68}.w-e-text-container [data-slate-editor] pre>code .token.important,.w-e-text-container [data-slate-editor] pre>code .token.regex,.w-e-text-container [data-slate-editor] pre>code .token.variable{color:#e90}.w-e-text-container [data-slate-editor] pre>code .token.bold,.w-e-text-container [data-slate-editor] pre>code .token.important{font-weight:700}.w-e-text-container [data-slate-editor] pre>code .token.italic{font-style:italic}.w-e-text-container [data-slate-editor] pre>code .token.entity{cursor:help} \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r33935 -r34209 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 33935) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 34209) @@ -1826,6 +1826,9 @@ xtype: 'hidden', id: 'packedPhotographed', name: 'packedPhotographed' + },{ + xtype:'hidden', + id:'note' }, { columnWidth: .5, hidden: sstsConfig.disableIdCard, @@ -3213,24 +3216,31 @@ return; } var checked = node.get('checked'); - + var tousseName = node.get('tousseName'); var note = node.get('note'); - // alert(note+','+checked) if (!Ext.isEmpty(note) && checked) { - var width = Ext4.getCmp('materialGrid').getSize().width; - alertDiv(note, width); + $('#hiddenNote').val(note); + Ext4.MessageBox.confirm("配包注意事项", tousseName + " 含有配包注意事项,是否查看?",function (btn) { + if (btn == 'yes') { + previewWangEditor('【'+tousseName+'】'); + } + }); } } function updateNoteWindow(record) { if (!sstsConfig.showTousseNoteOnClickTousse) { return; } var note = record.data['note'];//配包注意事项 - // if(!Ext.isEmpty(note)){ - // }else{ - // hide(); - // } - updateNote(note); + var tousseName = record.data['tousseName']; + if (!Ext.isEmpty(note)) { + $('#hiddenNote').val(note); + Ext4.MessageBox.confirm("配包注意事项", tousseName + " 含有配包注意事项,是否查看?",function (btn) { + if (btn == 'yes') { + previewWangEditor('【'+tousseName+'】'); + } + }); + } } function getSelAmount() { var basketTree = Ext4.getCmp('basketTreeGrid'); Index: ssts-web/src/main/webapp/common/wangEditor.js =================================================================== diff -u --- ssts-web/src/main/webapp/common/wangEditor.js (revision 0) +++ ssts-web/src/main/webapp/common/wangEditor.js (revision 34209) @@ -0,0 +1,63 @@ +var text = top.Ext.getCmp('note').getValue(); +var note = ''; +if (text.split('

').length > 1) { + note = text; +} else { + note = '

' + text + '

'; +} +var E = window.wangEditor; +var { createEditor, createToolbar, IEditorConfig, uploadImage } = window.wangEditor; +var editorConfig = { + MENU_CONF: {} +} +editorConfig.placeholder = '请输入内容'; +editorConfig.MENU_CONF['uploadImage'] = { + server: WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!uploadImage.do', + fieldName: 'uploadFiles', + maxNumberOfFiles: 1, + allowedFileTypes: ['image/*'], + meta: { + imageType: '配包注意事项图片', + objectId: objectId + }, + customInsert(res, insertFn) { + if (res.success) { + var imageIds = res.imageIds; + insertFn(WWWROOT + '/disinfectSystem/baseData/uploadImageAndVideoAction!getImageById.do?imageId=' + imageIds + '&original=true', '', '') + } else { + showResult(res.msg); + } + } +}; +editorConfig.MENU_CONF['uploadVideo'] = { + server: WWWROOT + '/disinfectSystem/baseData/videoFileAction!uploadVideo.do', + fieldName: 'uploadFiles', + maxNumberOfFiles: 1, + meta: { + videoType: '配包注意事项视频', + objectId: objectId + }, + customInsert(res, insertFn) { + if (res.success) { + var videoId = res.videoId; + insertFn(WWWROOT + '/disinfectSystem/baseData/uploadImageAndVideoAction!getVideoPartById.do?videoId=' + videoId + '&original=true', '', '') + } else { + showResult(res.msg); + } + } +}; +var editor = createEditor({ + selector: '#editor-container', + config: editorConfig, + html: note, + mode: 'default' +}); +// 创建工具栏1 +var toolbar = createToolbar({ + editor: editor, + selector: '#toolbar-container', + mode: 'default' +}); +$('#btn').click(function () { + $('#getHtml').html(editor.getHtml()); +}); \ No newline at end of file Index: ssts-web/src/main/webapp/common/wangEditor.jsp =================================================================== diff -u --- ssts-web/src/main/webapp/common/wangEditor.jsp (revision 0) +++ ssts-web/src/main/webapp/common/wangEditor.jsp (revision 34209) @@ -0,0 +1,33 @@ +<%@ page contentType="text/html; charset=UTF-8"%> +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + 富文本编辑器 + + + + + <%@ include file="/common/include_Ext425JsAndCss.jsp"%> + + + + + +
+
+
+
+ + + + + + \ No newline at end of file Index: ssts-web/src/main/webapp/common/wangEditor/index.js =================================================================== diff -u --- ssts-web/src/main/webapp/common/wangEditor/index.js (revision 0) +++ ssts-web/src/main/webapp/common/wangEditor/index.js (revision 34209) @@ -0,0 +1,136 @@ +!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).wangEditor={})}(this,(function(e){"use strict";var t="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function n(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}function r(e){var t={exports:{}};return e(t,t.exports),t.exports}var o,i,a=function(e){return e&&e.Math==Math&&e},u=a("object"==typeof globalThis&&globalThis)||a("object"==typeof window&&window)||a("object"==typeof self&&self)||a("object"==typeof t&&t)||function(){return this}()||Function("return this")(),s=Function.prototype,l=s.apply,c=s.bind,f=s.call,d="object"==typeof Reflect&&Reflect.apply||(c?f.bind(l):function(){return f.apply(l,arguments)}),p=Function.prototype,h=p.bind,v=p.call,g=h&&h.bind(v),y=h?function(e){return e&&g(v,e)}:function(e){return e&&function(){return v.apply(e,arguments)}},m=function(e){return"function"==typeof e},b=function(e){try{return!!e()}catch(e){return!0}},w=!b((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]})),E=Function.prototype.call,D=E.bind?E.bind(E):function(){return E.apply(E,arguments)},x={}.propertyIsEnumerable,S=Object.getOwnPropertyDescriptor,C={f:S&&!x.call({1:2},1)?function(e){var t=S(this,e);return!!t&&t.enumerable}:x},A=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}},O=y({}.toString),k=y("".slice),T=function(e){return k(O(e),8,-1)},B=u.Object,F=y("".split),_=b((function(){return!B("z").propertyIsEnumerable(0)}))?function(e){return"String"==T(e)?F(e,""):B(e)}:B,P=u.TypeError,j=function(e){if(null==e)throw P("Can't call method on "+e);return e},N=function(e){return _(j(e))},I=function(e){return"object"==typeof e?null!==e:m(e)},R={},M=function(e){return m(e)?e:void 0},L=function(e,t){return arguments.length<2?M(R[e])||M(u[e]):R[e]&&R[e][t]||u[e]&&u[e][t]},z=y({}.isPrototypeOf),$=L("navigator","userAgent")||"",H=u.process,V=u.Deno,U=H&&H.versions||V&&V.version,W=U&&U.v8;W&&(i=(o=W.split("."))[0]>0&&o[0]<4?1:+(o[0]+o[1])),!i&&$&&(!(o=$.match(/Edge\/(\d+)/))||o[1]>=74)&&(o=$.match(/Chrome\/(\d+)/))&&(i=+o[1]);var G,q=i,K=!!Object.getOwnPropertySymbols&&!b((function(){var e=Symbol();return!String(e)||!(Object(e)instanceof Symbol)||!Symbol.sham&&q&&q<41})),Y=K&&!Symbol.sham&&"symbol"==typeof Symbol.iterator,X=u.Object,Z=Y?function(e){return"symbol"==typeof e}:function(e){var t=L("Symbol");return m(t)&&z(t.prototype,X(e))},J=u.String,Q=function(e){try{return J(e)}catch(e){return"Object"}},ee=u.TypeError,te=function(e){if(m(e))return e;throw ee(Q(e)+" is not a function")},ne=function(e,t){var n=e[t];return null==n?void 0:te(n)},re=u.TypeError,oe=Object.defineProperty,ie="__core-js_shared__",ae=u[ie]||function(e,t){try{oe(u,e,{value:t,configurable:!0,writable:!0})}catch(n){u[e]=t}return t}(ie,{}),ue=ae,se=r((function(e){(e.exports=function(e,t){return ue[e]||(ue[e]=void 0!==t?t:{})})("versions",[]).push({version:"3.19.3",mode:"pure",copyright:"© 2021 Denis Pushkarev (zloirock.ru)"})})),le=u.Object,ce=function(e){return le(j(e))},fe=y({}.hasOwnProperty),de=Object.hasOwn||function(e,t){return fe(ce(e),t)},pe=0,he=Math.random(),ve=y(1..toString),ge=function(e){return"Symbol("+(void 0===e?"":e)+")_"+ve(++pe+he,36)},ye=se("wks"),me=u.Symbol,be=me&&me.for,we=Y?me:me&&me.withoutSetter||ge,Ee=function(e){if(!de(ye,e)||!K&&"string"!=typeof ye[e]){var t="Symbol."+e;K&&de(me,e)?ye[e]=me[e]:ye[e]=Y&&be?be(t):we(t)}return ye[e]},De=u.TypeError,xe=Ee("toPrimitive"),Se=function(e,t){if(!I(e)||Z(e))return e;var n,r=ne(e,xe);if(r){if(void 0===t&&(t="default"),n=D(r,e,t),!I(n)||Z(n))return n;throw De("Can't convert object to primitive value")}return void 0===t&&(t="number"),function(e,t){var n,r;if("string"===t&&m(n=e.toString)&&!I(r=D(n,e)))return r;if(m(n=e.valueOf)&&!I(r=D(n,e)))return r;if("string"!==t&&m(n=e.toString)&&!I(r=D(n,e)))return r;throw re("Can't convert object to primitive value")}(e,t)},Ce=function(e){var t=Se(e,"string");return Z(t)?t:t+""},Ae=u.document,Oe=I(Ae)&&I(Ae.createElement),ke=function(e){return Oe?Ae.createElement(e):{}},Te=!w&&!b((function(){return 7!=Object.defineProperty(ke("div"),"a",{get:function(){return 7}}).a})),Be=Object.getOwnPropertyDescriptor,Fe={f:w?Be:function(e,t){if(e=N(e),t=Ce(t),Te)try{return Be(e,t)}catch(e){}if(de(e,t))return A(!D(C.f,e,t),e[t])}},_e=/#|\.prototype\./,Pe=function(e,t){var n=Ne[je(e)];return n==Re||n!=Ie&&(m(t)?b(t):!!t)},je=Pe.normalize=function(e){return String(e).replace(_e,".").toLowerCase()},Ne=Pe.data={},Ie=Pe.NATIVE="N",Re=Pe.POLYFILL="P",Me=Pe,Le=y(y.bind),ze=function(e,t){return te(e),void 0===t?e:Le?Le(e,t):function(){return e.apply(t,arguments)}},$e=u.String,He=u.TypeError,Ve=function(e){if(I(e))return e;throw He($e(e)+" is not an object")},Ue=u.TypeError,We=Object.defineProperty,Ge={f:w?We:function(e,t,n){if(Ve(e),t=Ce(t),Ve(n),Te)try{return We(e,t,n)}catch(e){}if("get"in n||"set"in n)throw Ue("Accessors not supported");return"value"in n&&(e[t]=n.value),e}},qe=w?function(e,t,n){return Ge.f(e,t,A(1,n))}:function(e,t,n){return e[t]=n,e},Ke=Fe.f,Ye=function(e){var t=function(n,r,o){if(this instanceof t){switch(arguments.length){case 0:return new e;case 1:return new e(n);case 2:return new e(n,r)}return new e(n,r,o)}return d(e,this,arguments)};return t.prototype=e.prototype,t},Xe=function(e,t){var n,r,o,i,a,s,l,c,f=e.target,d=e.global,p=e.stat,h=e.proto,v=d?u:p?u[f]:(u[f]||{}).prototype,g=d?R:R[f]||qe(R,f,{})[f],b=g.prototype;for(o in t)n=!Me(d?o:f+(p?".":"#")+o,e.forced)&&v&&de(v,o),a=g[o],n&&(s=e.noTargetGet?(c=Ke(v,o))&&c.value:v[o]),i=n&&s?s:t[o],n&&typeof a==typeof i||(l=e.bind&&n?ze(i,u):e.wrap&&n?Ye(i):h&&m(i)?y(i):i,(e.sham||i&&i.sham||a&&a.sham)&&qe(l,"sham",!0),qe(g,o,l),h&&(de(R,r=f+"Prototype")||qe(R,r,{}),qe(R[r],o,i),e.real&&b&&!b[o]&&qe(b,o,i)))},Ze=se("keys"),Je=function(e){return Ze[e]||(Ze[e]=ge(e))},Qe=!b((function(){function e(){}return e.prototype.constructor=null,Object.getPrototypeOf(new e)!==e.prototype})),et=Je("IE_PROTO"),tt=u.Object,nt=tt.prototype,rt=Qe?tt.getPrototypeOf:function(e){var t=ce(e);if(de(t,et))return t[et];var n=t.constructor;return m(n)&&t instanceof n?n.prototype:t instanceof tt?nt:null},ot=u.String,it=u.TypeError,at=Object.setPrototypeOf||("__proto__"in{}?function(){var e,t=!1,n={};try{(e=y(Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set))(n,[]),t=n instanceof Array}catch(e){}return function(n,r){return Ve(n),function(e){if("object"==typeof e||m(e))return e;throw it("Can't set "+ot(e)+" as a prototype")}(r),t?e(n,r):n.__proto__=r,n}}():void 0),ut=Math.ceil,st=Math.floor,lt=function(e){var t=+e;return t!=t||0===t?0:(t>0?st:ut)(t)},ct=Math.max,ft=Math.min,dt=function(e,t){var n=lt(e);return n<0?ct(n+t,0):ft(n,t)},pt=Math.min,ht=function(e){return(t=e.length)>0?pt(lt(t),9007199254740991):0;var t},vt=function(e){return function(t,n,r){var o,i=N(t),a=ht(i),u=dt(r,a);if(e&&n!=n){for(;a>u;)if((o=i[u++])!=o)return!0}else for(;a>u;u++)if((e||u in i)&&i[u]===n)return e||u||0;return!e&&-1}},gt={includes:vt(!0),indexOf:vt(!1)},yt={},mt=gt.indexOf,bt=y([].push),wt=function(e,t){var n,r=N(e),o=0,i=[];for(n in r)!de(yt,n)&&de(r,n)&&bt(i,n);for(;t.length>o;)de(r,n=t[o++])&&(~mt(i,n)||bt(i,n));return i},Et=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],Dt=Et.concat("length","prototype"),xt={f:Object.getOwnPropertyNames||function(e){return wt(e,Dt)}},St={f:Object.getOwnPropertySymbols},Ct=y([].concat),At=L("Reflect","ownKeys")||function(e){var t=xt.f(Ve(e)),n=St.f;return n?Ct(t,n(e)):t},Ot=Object.keys||function(e){return wt(e,Et)},kt=w?Object.defineProperties:function(e,t){Ve(e);for(var n,r=N(t),o=Ot(t),i=o.length,a=0;i>a;)Ge.f(e,n=o[a++],r[n]);return e},Tt=L("document","documentElement"),Bt=Je("IE_PROTO"),Ft=function(){},_t=function(e){return" + + + + +
+ +
+ + + + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp =================================================================== diff -u -r33856 -r34209 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp (.../tousseView.jsp) (revision 33856) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp (.../tousseView.jsp) (revision 34209) @@ -113,6 +113,14 @@ SSTS_ShowAllBelongDepartTousseDefinition = true; +/** + * <编辑配包注意事项》权限 + */ +var SSTS_TousseInstanceManager_Note_update = false; + + SSTS_TousseInstanceManager_Note_update = true; + + var enableEditBtn = false; var enableSaveBtn = false; var enableSaveAndNewBtn = false; Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r34079 -r34209 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 34079) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 34209) @@ -406,6 +406,7 @@ +