Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

components/page/dataGrid.vue

@@ -479,7 +479,7 @@ export default {
             this.$api.post(`${systemUrl}/user/paged`, {
                     conditions: [],
                     pageIndex: 1,
-                    pageSize: 1000,
+                    pageSize: 100000,
                 })
                 .then((r) => {
                     if (r.success) {

components/page/inputIcon.vue

 <template>
-  <div>
-    <Input  v-model.trim="curModel" @on-change="change" placeholder="请输入图标" @>
+<div>
+    <Input v-model.trim="curModel" @on-change="change" placeholder="请输入图标">
     <span slot="prepend">
         <a @click="iconModal=true" class="setIcon">
             <Icon :type="type"></Icon>
         </a>
     </span>
+    <span slot="append">
+        <a @click="clearIcon" class="setIcon">
+            <Icon type="ios-close" />
+        </a>
+    </span>
     </Input>
     <Modal v-model="iconModal" title="设置图标" :width="800">
         <div id="icons">
@@ -15,52 +20,55 @@
         </div>
         <div slot="footer"></div>
     </Modal>
-  </div>
+</div>
 </template>
 
 <script>
 export default {
-    model:{
-        prop:"value",
-        event:"on-change"
+    model: {
+        prop: "value",
+        event: "on-change"
     },
-    props:{
-        value:{
-            type:String
+    props: {
+        value: {
+            type: String
         }
     },
     name: 'InputIcon',
     data() {
         return {
-        curModel:this.value,
+            curModel: this.value,
             iconModal: false,
-      icons:
-        'ios-add,md-add,ios-add-circle,ios-add-circle-outline,md-add-circle,ios-alarm,ios-alarm-outline,md-alarm,ios-albums,ios-albums-outline,md-albums,ios-alert,ios-alert-outline,md-alert,ios-american-football,ios-american-football-outline,md-american-football,ios-analytics,ios-analytics-outline,md-analytics,logo-android,logo-angular,ios-aperture,ios-aperture-outline,md-aperture,logo-apple,ios-apps,ios-apps-outline,md-apps,ios-appstore,ios-appstore-outline,md-appstore,ios-archive,ios-archive-outline,md-archive,ios-arrow-back,md-arrow-back,ios-arrow-down,md-arrow-down,ios-arrow-dropdown,md-arrow-dropdown,ios-arrow-dropdown-circle,md-arrow-dropdown-circle,ios-arrow-dropleft,md-arrow-dropleft,ios-arrow-dropleft-circle,md-arrow-dropleft-circle,ios-arrow-dropright,md-arrow-dropright,ios-arrow-dropright-circle,md-arrow-dropright-circle,ios-arrow-dropup,md-arrow-dropup,ios-arrow-dropup-circle,md-arrow-dropup-circle,ios-arrow-forward,md-arrow-forward,ios-arrow-round-back,md-arrow-round-back,ios-arrow-round-down,md-arrow-round-down,ios-arrow-round-forward,md-arrow-round-forward,ios-arrow-round-up,md-arrow-round-up,ios-arrow-up,md-arrow-up,ios-at,ios-at-outline,md-at,ios-attach,md-attach,ios-backspace,ios-backspace-outline,md-backspace,ios-barcode,ios-barcode-outline,md-barcode,ios-baseball,ios-baseball-outline,md-baseball,ios-basket,ios-basket-outline,md-basket,ios-basketball,ios-basketball-outline,md-basketball,ios-battery-charging,md-battery-charging,ios-battery-dead,md-battery-dead,ios-battery-full,md-battery-full,ios-beaker,ios-beaker-outline,md-beaker,ios-beer,ios-beer-outline,md-beer,ios-bicycle,md-bicycle,logo-bitcoin,ios-bluetooth,md-bluetooth,ios-boat,ios-boat-outline,md-boat,ios-body,ios-body-outline,md-body,ios-bonfire,ios-bonfire-outline,md-bonfire,ios-book,ios-book-outline,md-book,ios-bookmark,ios-bookmark-outline,md-bookmark,ios-bookmarks,ios-bookmarks-outline,md-bookmarks,ios-bowtie,ios-bowtie-outline,md-bowtie,ios-briefcase,ios-briefcase-outline,md-briefcase,ios-browsers,ios-browsers-outline,md-browsers,ios-brush,ios-brush-outline,md-brush,logo-buffer,ios-bug,ios-bug-outline,md-bug,ios-build,ios-build-outline,md-build,ios-bulb,ios-bulb-outline,md-bulb,ios-bus,ios-bus-outline,md-bus,ios-cafe,ios-cafe-outline,md-cafe,ios-calculator,ios-calculator-outline,md-calculator,ios-calendar,ios-calendar-outline,md-calendar,ios-call,ios-call-outline,md-call,ios-camera,ios-camera-outline,md-camera,ios-car,ios-car-outline,md-car,ios-card,ios-card-outline,md-card,ios-cart,ios-cart-outline,md-cart,ios-cash,ios-cash-outline,md-cash,ios-chatboxes,ios-chatboxes-outline,md-chatboxes,ios-chatbubbles,ios-chatbubbles-outline,md-chatbubbles,ios-checkbox,ios-checkbox-outline,md-checkbox,md-checkbox-outline,ios-checkmark,md-checkmark,ios-checkmark-circle,ios-checkmark-circle-outline,md-checkmark-circle,md-checkmark-circle-outline,logo-chrome,ios-clipboard,ios-clipboard-outline,md-clipboard,ios-clock,ios-clock-outline,md-clock,ios-close,md-close,ios-close-circle,ios-close-circle-outline,md-close-circle,ios-closed-captioning,ios-closed-captioning-outline,md-closed-captioning,ios-cloud,ios-cloud-outline,md-cloud,ios-cloud-circle,ios-cloud-circle-outline,md-cloud-circle,ios-cloud-done,ios-cloud-done-outline,md-cloud-done,ios-cloud-download,ios-cloud-download-outline,md-cloud-download,md-cloud-outline,ios-cloud-upload,ios-cloud-upload-outline,md-cloud-upload,ios-cloudy,ios-cloudy-outline,md-cloudy,ios-cloudy-night,ios-cloudy-night-outline,md-cloudy-night,ios-code,md-code,ios-code-download,md-code-download,ios-code-working,md-code-working,logo-codepen,ios-cog,ios-cog-outline,md-cog,ios-color-fill,ios-color-fill-outline,md-color-fill,ios-color-filter,ios-color-filter-outline,md-color-filter,ios-color-palette,ios-color-palette-outline,md-color-palette,ios-color-wand,ios-color-wand-outline,md-color-wand,ios-compass,ios-compass-outline,md-compass,ios-construct,ios-construct-outline,md-construct,ios-contact,ios-contact-outline,md-contact,ios-contacts,ios-contacts-outline,md-contacts,ios-contract,md-contract,ios-contrast,md-contrast,ios-copy,ios-copy-outline,md-copy,ios-create,ios-create-outline,md-create,ios-crop,ios-crop-outline,md-crop,logo-css3,ios-cube,ios-cube-outline,md-cube,ios-cut,ios-cut-outline,md-cut,logo-designernews,ios-desktop,ios-desktop-outline,md-desktop,ios-disc,ios-disc-outline,md-disc,ios-document,ios-document-outline,md-document,ios-done-all,md-done-all,ios-download,ios-download-outline,md-download,logo-dribbble,logo-dropbox,ios-easel,ios-easel-outline,md-easel,ios-egg,ios-egg-outline,md-egg,logo-euro,ios-exit,ios-exit-outline,md-exit,ios-expand,md-expand,ios-eye,ios-eye-outline,md-eye,ios-eye-off,ios-eye-off-outline,md-eye-off,logo-facebook,ios-fastforward,ios-fastforward-outline,md-fastforward,ios-female,md-female,ios-filing,ios-filing-outline,md-filing,ios-film,ios-film-outline,md-film,ios-finger-print,md-finger-print,ios-flag,ios-flag-outline,md-flag,ios-flame,ios-flame-outline,md-flame,ios-flash,ios-flash-outline,md-flash,ios-flask,ios-flask-outline,md-flask,ios-flower,ios-flower-outline,md-flower,ios-folder,ios-folder-outline,md-folder,ios-folder-open,ios-folder-open-outline,md-folder-open,ios-football,ios-football-outline,md-football,logo-foursquare,logo-freebsd-devil,ios-funnel,ios-funnel-outline,md-funnel,ios-game-controller-a,ios-game-controller-a-outline,md-game-controller-a,ios-game-controller-b,ios-game-controller-b-outline,md-game-controller-b,ios-git-branch,md-git-branch,ios-git-commit,md-git-commit,ios-git-compare,md-git-compare,ios-git-merge,md-git-merge,ios-git-network,md-git-network,ios-git-pull-request,md-git-pull-request,logo-github,ios-glasses,ios-glasses-outline,md-glasses,ios-globe,ios-globe-outline,md-globe,logo-google,logo-googleplus,ios-grid,ios-grid-outline,md-grid,logo-hackernews,ios-hammer,ios-hammer-outline,md-hammer,ios-hand,ios-hand-outline,md-hand,ios-happy,ios-happy-outline,md-happy,ios-headset,ios-headset-outline,md-headset,ios-heart,ios-heart-outline,md-heart,md-heart-outline,ios-help,md-help,ios-help-buoy,ios-help-buoy-outline,md-help-buoy,ios-help-circle,ios-help-circle-outline,md-help-circle,ios-home,ios-home-outline,md-home,logo-html5,ios-ice-cream,ios-ice-cream-outline,md-ice-cream,ios-image,ios-image-outline,md-image,ios-images,ios-images-outline,md-images,ios-infinite,ios-infinite-outline,md-infinite,ios-information,md-information,ios-information-circle,ios-information-circle-outline,md-information-circle,logo-instagram,ios-ionic,ios-ionic-outline,md-ionic,ios-ionitron,ios-ionitron-outline,md-ionitron,logo-javascript,ios-jet,ios-jet-outline,md-jet,ios-key,ios-key-outline,md-key,ios-keypad,ios-keypad-outline,md-keypad,ios-laptop,md-laptop,ios-leaf,ios-leaf-outline,md-leaf,ios-link,ios-link-outline,md-link,logo-linkedin,ios-list,md-list,ios-list-box,ios-list-box-outline,md-list-box,ios-locate,ios-locate-outline,md-locate,ios-lock,ios-lock-outline,md-lock,ios-log-in,md-log-in,ios-log-out,md-log-out,ios-magnet,ios-magnet-outline,md-magnet,ios-mail,ios-mail-outline,md-mail,ios-mail-open,ios-mail-open-outline,md-mail-open,ios-male,md-male,ios-man,ios-man-outline,md-man,ios-map,ios-map-outline,md-map,logo-markdown,ios-medal,ios-medal-outline,md-medal,ios-medical,ios-medical-outline,md-medical,ios-medkit,ios-medkit-outline,md-medkit,ios-megaphone,ios-megaphone-outline,md-megaphone,ios-menu,ios-menu-outline,md-menu,ios-mic,ios-mic-outline,md-mic,ios-mic-off,ios-mic-off-outline,md-mic-off,ios-microphone,ios-microphone-outline,md-microphone,ios-moon,ios-moon-outline,md-moon,ios-more,ios-more-outline,md-more,ios-move,md-move,ios-musical-note,ios-musical-note-outline,md-musical-note,ios-musical-notes,ios-musical-notes-outline,md-musical-notes,ios-navigate,ios-navigate-outline,md-navigate,ios-no-smoking,ios-no-smoking-outline,md-no-smoking,logo-nodejs,ios-notifications,ios-notifications-outline,md-notifications,ios-notifications-off,ios-notifications-off-outline,md-notifications-off,md-notifications-outline,ios-nuclear,ios-nuclear-outline,md-nuclear,ios-nutrition,ios-nutrition-outline,md-nutrition,logo-octocat,ios-open,ios-open-outline,md-open,ios-options,ios-options-outline,md-options,ios-outlet,ios-outlet-outline,md-outlet,ios-paper,ios-paper-outline,md-paper,ios-paper-plane,ios-paper-plane-outline,md-paper-plane,ios-partly-sunny,ios-partly-sunny-outline,md-partly-sunny,ios-pause,ios-pause-outline,md-pause,ios-paw,ios-paw-outline,md-paw,ios-people,ios-people-outline,md-people,ios-person,ios-person-outline,md-person,ios-person-add,ios-person-add-outline,md-person-add,ios-phone-landscape,md-phone-landscape,ios-phone-portrait,md-phone-portrait,ios-photos,ios-photos-outline,md-photos,ios-pie,ios-pie-outline,md-pie,ios-pin,ios-pin-outline,md-pin,ios-pint,ios-pint-outline,md-pint,logo-pinterest,ios-pizza,ios-pizza-outline,md-pizza,ios-plane,ios-plane-outline,md-plane,ios-planet,ios-planet-outline,md-planet,ios-play,ios-play-outline,md-play,logo-playstation,ios-podium,ios-podium-outline,md-podium,ios-power,ios-power-outline,md-power,ios-pricetag,ios-pricetag-outline,md-pricetag,ios-pricetags,ios-pricetags-outline,md-pricetags,ios-print,ios-print-outline,md-print,ios-pulse,ios-pulse-outline,md-pulse,logo-python,ios-qr-scanner,md-qr-scanner,ios-quote,ios-quote-outline,md-quote,ios-radio,ios-radio-outline,md-radio,ios-radio-button-off,md-radio-button-off,ios-radio-button-on,md-radio-button-on,ios-rainy,ios-rainy-outline,md-rainy,ios-recording,ios-recording-outline,md-recording,logo-reddit,ios-redo,ios-redo-outline,md-redo,ios-refresh,md-refresh,ios-refresh-circle,ios-refresh-circle-outline,md-refresh-circle,ios-remove,md-remove,ios-remove-circle,ios-remove-circle-outline,md-remove-circle,ios-reorder,md-reorder,ios-repeat,md-repeat,ios-resize,md-resize,ios-restaurant,ios-restaurant-outline,md-restaurant,ios-return-left,md-return-left,ios-return-right,md-return-right,ios-reverse-camera,ios-reverse-camera-outline,md-reverse-camera,ios-rewind,ios-rewind-outline,md-rewind,ios-ribbon,ios-ribbon-outline,md-ribbon,ios-rose,ios-rose-outline,md-rose,logo-rss,ios-sad,ios-sad-outline,md-sad,logo-sass,ios-school,ios-school-outline,md-school,ios-search,ios-search-outline,md-search,ios-send,ios-send-outline,md-send,ios-settings,ios-settings-outline,md-settings,ios-share,ios-share-outline,md-share,ios-share-alt,ios-share-alt-outline,md-share-alt,ios-shirt,ios-shirt-outline,md-shirt,ios-shuffle,md-shuffle,ios-skip-backward,ios-skip-backward-outline,md-skip-backward,ios-skip-forward,ios-skip-forward-outline,md-skip-forward,logo-skype,logo-snapchat,ios-snow,ios-snow-outline,md-snow,ios-speedometer,ios-speedometer-outline,md-speedometer,ios-square,ios-square-outline,md-square,md-square-outline,ios-star,ios-star-outline,md-star,ios-star-half,md-star-half,md-star-outline,ios-stats,ios-stats-outline,md-stats,logo-steam,ios-stopwatch,ios-stopwatch-outline,md-stopwatch,ios-subway,ios-subway-outline,md-subway,ios-sunny,ios-sunny-outline,md-sunny,ios-swap,md-swap,ios-switch,ios-switch-outline,md-switch,ios-sync,md-sync,ios-tablet-landscape,md-tablet-landscape,ios-tablet-portrait,md-tablet-portrait,ios-tennisball,ios-tennisball-outline,md-tennisball,ios-text,ios-text-outline,md-text,ios-thermometer,ios-thermometer-outline,md-thermometer,ios-thumbs-down,ios-thumbs-down-outline,md-thumbs-down,ios-thumbs-up,ios-thumbs-up-outline,md-thumbs-up,ios-thunderstorm,ios-thunderstorm-outline,md-thunderstorm,ios-time,ios-time-outline,md-time,ios-timer,ios-timer-outline,md-timer,ios-train,ios-train-outline,md-train,ios-transgender,md-transgender,ios-trash,ios-trash-outline,md-trash,ios-trending-down,md-trending-down,ios-trending-up,md-trending-up,ios-trophy,ios-trophy-outline,md-trophy,logo-tumblr,logo-tux,logo-twitch,logo-twitter,ios-umbrella,ios-umbrella-outline,md-umbrella,ios-undo,ios-undo-outline,md-undo,ios-unlock,ios-unlock-outline,md-unlock,logo-usd,ios-videocam,ios-videocam-outline,md-videocam,logo-vimeo,ios-volume-down,md-volume-down,ios-volume-mute,md-volume-mute,ios-volume-off,md-volume-off,ios-volume-up,md-volume-up,ios-walk,md-walk,ios-warning,ios-warning-outline,md-warning,ios-watch,md-watch,ios-water,ios-water-outline,md-water,logo-whatsapp,ios-wifi,ios-wifi-outline,md-wifi,logo-windows,ios-wine,ios-wine-outline,md-wine,ios-woman,ios-woman-outline,md-woman,logo-wordpress,logo-xbox,logo-yahoo,logo-yen,logo-youtube,ios-loading'
+            icons: 'ios-add,md-add,ios-add-circle,ios-add-circle-outline,md-add-circle,ios-alarm,ios-alarm-outline,md-alarm,ios-albums,ios-albums-outline,md-albums,ios-alert,ios-alert-outline,md-alert,ios-american-football,ios-american-football-outline,md-american-football,ios-analytics,ios-analytics-outline,md-analytics,logo-android,logo-angular,ios-aperture,ios-aperture-outline,md-aperture,logo-apple,ios-apps,ios-apps-outline,md-apps,ios-appstore,ios-appstore-outline,md-appstore,ios-archive,ios-archive-outline,md-archive,ios-arrow-back,md-arrow-back,ios-arrow-down,md-arrow-down,ios-arrow-dropdown,md-arrow-dropdown,ios-arrow-dropdown-circle,md-arrow-dropdown-circle,ios-arrow-dropleft,md-arrow-dropleft,ios-arrow-dropleft-circle,md-arrow-dropleft-circle,ios-arrow-dropright,md-arrow-dropright,ios-arrow-dropright-circle,md-arrow-dropright-circle,ios-arrow-dropup,md-arrow-dropup,ios-arrow-dropup-circle,md-arrow-dropup-circle,ios-arrow-forward,md-arrow-forward,ios-arrow-round-back,md-arrow-round-back,ios-arrow-round-down,md-arrow-round-down,ios-arrow-round-forward,md-arrow-round-forward,ios-arrow-round-up,md-arrow-round-up,ios-arrow-up,md-arrow-up,ios-at,ios-at-outline,md-at,ios-attach,md-attach,ios-backspace,ios-backspace-outline,md-backspace,ios-barcode,ios-barcode-outline,md-barcode,ios-baseball,ios-baseball-outline,md-baseball,ios-basket,ios-basket-outline,md-basket,ios-basketball,ios-basketball-outline,md-basketball,ios-battery-charging,md-battery-charging,ios-battery-dead,md-battery-dead,ios-battery-full,md-battery-full,ios-beaker,ios-beaker-outline,md-beaker,ios-beer,ios-beer-outline,md-beer,ios-bicycle,md-bicycle,logo-bitcoin,ios-bluetooth,md-bluetooth,ios-boat,ios-boat-outline,md-boat,ios-body,ios-body-outline,md-body,ios-bonfire,ios-bonfire-outline,md-bonfire,ios-book,ios-book-outline,md-book,ios-bookmark,ios-bookmark-outline,md-bookmark,ios-bookmarks,ios-bookmarks-outline,md-bookmarks,ios-bowtie,ios-bowtie-outline,md-bowtie,ios-briefcase,ios-briefcase-outline,md-briefcase,ios-browsers,ios-browsers-outline,md-browsers,ios-brush,ios-brush-outline,md-brush,logo-buffer,ios-bug,ios-bug-outline,md-bug,ios-build,ios-build-outline,md-build,ios-bulb,ios-bulb-outline,md-bulb,ios-bus,ios-bus-outline,md-bus,ios-cafe,ios-cafe-outline,md-cafe,ios-calculator,ios-calculator-outline,md-calculator,ios-calendar,ios-calendar-outline,md-calendar,ios-call,ios-call-outline,md-call,ios-camera,ios-camera-outline,md-camera,ios-car,ios-car-outline,md-car,ios-card,ios-card-outline,md-card,ios-cart,ios-cart-outline,md-cart,ios-cash,ios-cash-outline,md-cash,ios-chatboxes,ios-chatboxes-outline,md-chatboxes,ios-chatbubbles,ios-chatbubbles-outline,md-chatbubbles,ios-checkbox,ios-checkbox-outline,md-checkbox,md-checkbox-outline,ios-checkmark,md-checkmark,ios-checkmark-circle,ios-checkmark-circle-outline,md-checkmark-circle,md-checkmark-circle-outline,logo-chrome,ios-clipboard,ios-clipboard-outline,md-clipboard,ios-clock,ios-clock-outline,md-clock,ios-close,md-close,ios-close-circle,ios-close-circle-outline,md-close-circle,ios-closed-captioning,ios-closed-captioning-outline,md-closed-captioning,ios-cloud,ios-cloud-outline,md-cloud,ios-cloud-circle,ios-cloud-circle-outline,md-cloud-circle,ios-cloud-done,ios-cloud-done-outline,md-cloud-done,ios-cloud-download,ios-cloud-download-outline,md-cloud-download,md-cloud-outline,ios-cloud-upload,ios-cloud-upload-outline,md-cloud-upload,ios-cloudy,ios-cloudy-outline,md-cloudy,ios-cloudy-night,ios-cloudy-night-outline,md-cloudy-night,ios-code,md-code,ios-code-download,md-code-download,ios-code-working,md-code-working,logo-codepen,ios-cog,ios-cog-outline,md-cog,ios-color-fill,ios-color-fill-outline,md-color-fill,ios-color-filter,ios-color-filter-outline,md-color-filter,ios-color-palette,ios-color-palette-outline,md-color-palette,ios-color-wand,ios-color-wand-outline,md-color-wand,ios-compass,ios-compass-outline,md-compass,ios-construct,ios-construct-outline,md-construct,ios-contact,ios-contact-outline,md-contact,ios-contacts,ios-contacts-outline,md-contacts,ios-contract,md-contract,ios-contrast,md-contrast,ios-copy,ios-copy-outline,md-copy,ios-create,ios-create-outline,md-create,ios-crop,ios-crop-outline,md-crop,logo-css3,ios-cube,ios-cube-outline,md-cube,ios-cut,ios-cut-outline,md-cut,logo-designernews,ios-desktop,ios-desktop-outline,md-desktop,ios-disc,ios-disc-outline,md-disc,ios-document,ios-document-outline,md-document,ios-done-all,md-done-all,ios-download,ios-download-outline,md-download,logo-dribbble,logo-dropbox,ios-easel,ios-easel-outline,md-easel,ios-egg,ios-egg-outline,md-egg,logo-euro,ios-exit,ios-exit-outline,md-exit,ios-expand,md-expand,ios-eye,ios-eye-outline,md-eye,ios-eye-off,ios-eye-off-outline,md-eye-off,logo-facebook,ios-fastforward,ios-fastforward-outline,md-fastforward,ios-female,md-female,ios-filing,ios-filing-outline,md-filing,ios-film,ios-film-outline,md-film,ios-finger-print,md-finger-print,ios-flag,ios-flag-outline,md-flag,ios-flame,ios-flame-outline,md-flame,ios-flash,ios-flash-outline,md-flash,ios-flask,ios-flask-outline,md-flask,ios-flower,ios-flower-outline,md-flower,ios-folder,ios-folder-outline,md-folder,ios-folder-open,ios-folder-open-outline,md-folder-open,ios-football,ios-football-outline,md-football,logo-foursquare,logo-freebsd-devil,ios-funnel,ios-funnel-outline,md-funnel,ios-game-controller-a,ios-game-controller-a-outline,md-game-controller-a,ios-game-controller-b,ios-game-controller-b-outline,md-game-controller-b,ios-git-branch,md-git-branch,ios-git-commit,md-git-commit,ios-git-compare,md-git-compare,ios-git-merge,md-git-merge,ios-git-network,md-git-network,ios-git-pull-request,md-git-pull-request,logo-github,ios-glasses,ios-glasses-outline,md-glasses,ios-globe,ios-globe-outline,md-globe,logo-google,logo-googleplus,ios-grid,ios-grid-outline,md-grid,logo-hackernews,ios-hammer,ios-hammer-outline,md-hammer,ios-hand,ios-hand-outline,md-hand,ios-happy,ios-happy-outline,md-happy,ios-headset,ios-headset-outline,md-headset,ios-heart,ios-heart-outline,md-heart,md-heart-outline,ios-help,md-help,ios-help-buoy,ios-help-buoy-outline,md-help-buoy,ios-help-circle,ios-help-circle-outline,md-help-circle,ios-home,ios-home-outline,md-home,logo-html5,ios-ice-cream,ios-ice-cream-outline,md-ice-cream,ios-image,ios-image-outline,md-image,ios-images,ios-images-outline,md-images,ios-infinite,ios-infinite-outline,md-infinite,ios-information,md-information,ios-information-circle,ios-information-circle-outline,md-information-circle,logo-instagram,ios-ionic,ios-ionic-outline,md-ionic,ios-ionitron,ios-ionitron-outline,md-ionitron,logo-javascript,ios-jet,ios-jet-outline,md-jet,ios-key,ios-key-outline,md-key,ios-keypad,ios-keypad-outline,md-keypad,ios-laptop,md-laptop,ios-leaf,ios-leaf-outline,md-leaf,ios-link,ios-link-outline,md-link,logo-linkedin,ios-list,md-list,ios-list-box,ios-list-box-outline,md-list-box,ios-locate,ios-locate-outline,md-locate,ios-lock,ios-lock-outline,md-lock,ios-log-in,md-log-in,ios-log-out,md-log-out,ios-magnet,ios-magnet-outline,md-magnet,ios-mail,ios-mail-outline,md-mail,ios-mail-open,ios-mail-open-outline,md-mail-open,ios-male,md-male,ios-man,ios-man-outline,md-man,ios-map,ios-map-outline,md-map,logo-markdown,ios-medal,ios-medal-outline,md-medal,ios-medical,ios-medical-outline,md-medical,ios-medkit,ios-medkit-outline,md-medkit,ios-megaphone,ios-megaphone-outline,md-megaphone,ios-menu,ios-menu-outline,md-menu,ios-mic,ios-mic-outline,md-mic,ios-mic-off,ios-mic-off-outline,md-mic-off,ios-microphone,ios-microphone-outline,md-microphone,ios-moon,ios-moon-outline,md-moon,ios-more,ios-more-outline,md-more,ios-move,md-move,ios-musical-note,ios-musical-note-outline,md-musical-note,ios-musical-notes,ios-musical-notes-outline,md-musical-notes,ios-navigate,ios-navigate-outline,md-navigate,ios-no-smoking,ios-no-smoking-outline,md-no-smoking,logo-nodejs,ios-notifications,ios-notifications-outline,md-notifications,ios-notifications-off,ios-notifications-off-outline,md-notifications-off,md-notifications-outline,ios-nuclear,ios-nuclear-outline,md-nuclear,ios-nutrition,ios-nutrition-outline,md-nutrition,logo-octocat,ios-open,ios-open-outline,md-open,ios-options,ios-options-outline,md-options,ios-outlet,ios-outlet-outline,md-outlet,ios-paper,ios-paper-outline,md-paper,ios-paper-plane,ios-paper-plane-outline,md-paper-plane,ios-partly-sunny,ios-partly-sunny-outline,md-partly-sunny,ios-pause,ios-pause-outline,md-pause,ios-paw,ios-paw-outline,md-paw,ios-people,ios-people-outline,md-people,ios-person,ios-person-outline,md-person,ios-person-add,ios-person-add-outline,md-person-add,ios-phone-landscape,md-phone-landscape,ios-phone-portrait,md-phone-portrait,ios-photos,ios-photos-outline,md-photos,ios-pie,ios-pie-outline,md-pie,ios-pin,ios-pin-outline,md-pin,ios-pint,ios-pint-outline,md-pint,logo-pinterest,ios-pizza,ios-pizza-outline,md-pizza,ios-plane,ios-plane-outline,md-plane,ios-planet,ios-planet-outline,md-planet,ios-play,ios-play-outline,md-play,logo-playstation,ios-podium,ios-podium-outline,md-podium,ios-power,ios-power-outline,md-power,ios-pricetag,ios-pricetag-outline,md-pricetag,ios-pricetags,ios-pricetags-outline,md-pricetags,ios-print,ios-print-outline,md-print,ios-pulse,ios-pulse-outline,md-pulse,logo-python,ios-qr-scanner,md-qr-scanner,ios-quote,ios-quote-outline,md-quote,ios-radio,ios-radio-outline,md-radio,ios-radio-button-off,md-radio-button-off,ios-radio-button-on,md-radio-button-on,ios-rainy,ios-rainy-outline,md-rainy,ios-recording,ios-recording-outline,md-recording,logo-reddit,ios-redo,ios-redo-outline,md-redo,ios-refresh,md-refresh,ios-refresh-circle,ios-refresh-circle-outline,md-refresh-circle,ios-remove,md-remove,ios-remove-circle,ios-remove-circle-outline,md-remove-circle,ios-reorder,md-reorder,ios-repeat,md-repeat,ios-resize,md-resize,ios-restaurant,ios-restaurant-outline,md-restaurant,ios-return-left,md-return-left,ios-return-right,md-return-right,ios-reverse-camera,ios-reverse-camera-outline,md-reverse-camera,ios-rewind,ios-rewind-outline,md-rewind,ios-ribbon,ios-ribbon-outline,md-ribbon,ios-rose,ios-rose-outline,md-rose,logo-rss,ios-sad,ios-sad-outline,md-sad,logo-sass,ios-school,ios-school-outline,md-school,ios-search,ios-search-outline,md-search,ios-send,ios-send-outline,md-send,ios-settings,ios-settings-outline,md-settings,ios-share,ios-share-outline,md-share,ios-share-alt,ios-share-alt-outline,md-share-alt,ios-shirt,ios-shirt-outline,md-shirt,ios-shuffle,md-shuffle,ios-skip-backward,ios-skip-backward-outline,md-skip-backward,ios-skip-forward,ios-skip-forward-outline,md-skip-forward,logo-skype,logo-snapchat,ios-snow,ios-snow-outline,md-snow,ios-speedometer,ios-speedometer-outline,md-speedometer,ios-square,ios-square-outline,md-square,md-square-outline,ios-star,ios-star-outline,md-star,ios-star-half,md-star-half,md-star-outline,ios-stats,ios-stats-outline,md-stats,logo-steam,ios-stopwatch,ios-stopwatch-outline,md-stopwatch,ios-subway,ios-subway-outline,md-subway,ios-sunny,ios-sunny-outline,md-sunny,ios-swap,md-swap,ios-switch,ios-switch-outline,md-switch,ios-sync,md-sync,ios-tablet-landscape,md-tablet-landscape,ios-tablet-portrait,md-tablet-portrait,ios-tennisball,ios-tennisball-outline,md-tennisball,ios-text,ios-text-outline,md-text,ios-thermometer,ios-thermometer-outline,md-thermometer,ios-thumbs-down,ios-thumbs-down-outline,md-thumbs-down,ios-thumbs-up,ios-thumbs-up-outline,md-thumbs-up,ios-thunderstorm,ios-thunderstorm-outline,md-thunderstorm,ios-time,ios-time-outline,md-time,ios-timer,ios-timer-outline,md-timer,ios-train,ios-train-outline,md-train,ios-transgender,md-transgender,ios-trash,ios-trash-outline,md-trash,ios-trending-down,md-trending-down,ios-trending-up,md-trending-up,ios-trophy,ios-trophy-outline,md-trophy,logo-tumblr,logo-tux,logo-twitch,logo-twitter,ios-umbrella,ios-umbrella-outline,md-umbrella,ios-undo,ios-undo-outline,md-undo,ios-unlock,ios-unlock-outline,md-unlock,logo-usd,ios-videocam,ios-videocam-outline,md-videocam,logo-vimeo,ios-volume-down,md-volume-down,ios-volume-mute,md-volume-mute,ios-volume-off,md-volume-off,ios-volume-up,md-volume-up,ios-walk,md-walk,ios-warning,ios-warning-outline,md-warning,ios-watch,md-watch,ios-water,ios-water-outline,md-water,logo-whatsapp,ios-wifi,ios-wifi-outline,md-wifi,logo-windows,ios-wine,ios-wine-outline,md-wine,ios-woman,ios-woman-outline,md-woman,logo-wordpress,logo-xbox,logo-yahoo,logo-yen,logo-youtube,ios-loading'
         }
     },
     computed: {
         iconList() {
             return this.icons.split(',')
         },
-    type(){
-        if(this.curModel&&this.curModel!=''){
+        type() {
+            if (this.curModel && this.curModel != '') {
                 return this.curModel
-        }else{
+            } else {
                 return "md-add"
             }
         }
     },
     methods: {
         setIcon(name) {
-      this.curModel=name;
-      this.iconModal=false;
+            this.curModel = name;
+            this.iconModal = false;
             this.$emit('on-change', name)
         },
-    change(name){
+        change(name) {
             this.$emit('on-change', name)
+        },
+        clearIcon() {
+            this.curModel = '';
+            this.$emit('on-change', '')
         }
     },
-  watch:{
+    watch: {
         value: {
             handler(v, o) {
                 this.curModel = v
@@ -72,16 +80,19 @@ export default {
 </script>
 
 <style lang="less">
-#icons{
+#icons {
     max-height: 500px;
     overflow: auto;
-    a{
+
+    a {
         display: inline-block;
         width: 40px;
         height: 40px;
         border: 1px solid transparent;
     }
-    a:hover,.checked{
+
+    a:hover,
+    .checked {
         border: 1px solid #999;
     }
 }

pages/aps/supprotMain/index.vue

 <template>
-  <div class="h100">
-    <DataGrid :columns="columns" ref="grid" :action="action">
+<div class="h100">
+    <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch">
         <template slot="easySearch">
             <Form ref="formInline" :model="easySearch" inline>
                 <FormItem prop="keys">
                     <Input placeholder="请输入申请单号或订单编号" v-model="easySearch.keys.value" v-width="240" />
                 </FormItem>
+                <FormItem>
+                    <Dictionary code="accessory.status" placeholder="请选择配套状态" :multiple="true" v-model="easySearch.status.value"></Dictionary>
+                </FormItem>
                 <FormItem>
                     <Button type="primary" @click="search">查询</Button>
                 </FormItem>
@@ -15,8 +18,9 @@
     <Modal v-model="modal" :title="title" width="1200" fullscreen footer-hide @on-cancel="ok">
         <component :is="detail" :eid="curId" :row="entity" @on-close="cancel" @on-ok="ok" />
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from "./api";
 export default {
@@ -31,17 +35,21 @@ export default {
         return {
             action: Api.index,
             easySearch: {
-        keys: { op: "orderCode,code", value: null },
+                keys: {
+                    op: "orderCode,code",
+                    value: null
+                },
+                status: {
+                    op: "In",
+                    value: [0, 1]
+                }
             },
-      statuList: this.$store.getters.dictionaryByKey("accessory.status") || [],
-      statuList1: this.$store.getters.dictionaryByKey("outstore.status") || [],
             modal: false,
             title: "新增",
             detail: null,
             curId: 0,
             entity: {},
-      columns: [
-        {
+            columns: [{
                     key: "code",
                     title: this.l("code"),
                     align: "left",
@@ -52,7 +60,7 @@ export default {
                     title: this.l("finishDate"),
                     align: "center",
                     type: "date",
-          width:200,
+                    width: 200,
                 },
                 {
                     key: "orderCode",
@@ -65,25 +73,19 @@ export default {
                     title: this.l("creationTime"),
                     align: "center",
                     type: "date",
-          width:200,
+                    width: 200,
+                },
+                {
+                    key: "creator",
+                    title: this.l("creator"),
+                    align: "left"
                 },
-        { key: "creator", title: this.l("creator"), align: "left" },
                 {
                     key: "status",
                     title: this.l("status"),
                     align: "center",
-          width:150,
-          render: (h, params) => {
-            return h(
-              "span",
-              {
-                style: {
-                  color: this.setName(this.statuList,params.row.status).color,
-                },
-              },
-              this.setName(this.statuList,params.row.status).name
-            );
-          },
+                    width: 150,
+                    code: 'accessory.status'
                 },
                 {
                     title: "操作",
@@ -91,21 +93,31 @@ export default {
                     width: 140,
                     align: "center",
                     render: (h, params) => {
-            return h("div", { class: "action" }, [
+                        return h("div", {
+                            class: "action"
+                        }, [
                             h(
-                "op",
-                {
-                  attrs: { oprate: "detail" },
-                  on: { click: () => this.getAccessory(params.row) },
+                                "op", {
+                                    attrs: {
+                                        oprate: "detail"
+                                    },
+                                    on: {
+                                        click: () => this.getAccessory(params.row)
+                                    },
                                 },
                                 "配套"
                             ),
                             h(
-                "op",
-                {
-                  attrs: { oprate: "edit" },
-                  style:{color:params.row.status==0?"#bebebe":""},
-                  on: { click: () => params.row.status!=0?this.getOutBound(params.row):null },
+                                "op", {
+                                    attrs: {
+                                        oprate: "edit"
+                                    },
+                                    style: {
+                                        color: params.row.status == 0 ? "#bebebe" : ""
+                                    },
+                                    on: {
+                                        click: () => params.row.status != 0 ? this.getOutBound(params.row) : null
+                                    },
                                 },
                                 "出库单"
                             ),
@@ -118,7 +130,10 @@ export default {
     mounted() {
         this.search();
     },
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
     },
     methods: {
@@ -179,5 +194,6 @@ export default {
     },
 };
 </script>
+
 <style lang="less">
 </style>

pages/bug/component/detail.vue

 <template>
-  <div style="width:100%;overflow:auto">
+<div style="width:100%;overflow:auto">
     <div style="width:80%; border-right:1px solid #ccc;padding-right:30px;float:left">
         <Form :model="bugForm" :label-width="5" ref="formValidate">
             <Row>
@@ -63,6 +63,9 @@
                 <p class="time" v-else>
                     <state code="Test.bug.statusHistory" :value="item.action" type="text"></state>
                 </p>
+                <Tooltip max-width="400" :content="item.remark" v-if="item.remark">
+                    <a>查看</a>
+                </Tooltip>
                 <p class="content">{{item.actionName}}</p>
                 <p class="content">{{item.creationTime}}</p>
             </TimelineItem>
@@ -97,8 +100,9 @@
             <Button @click="showInfo=false">关闭</Button>
         </div>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 export default {
     name: 'detail',
@@ -109,7 +113,7 @@ export default {
             detailForm: {
                 remark: '',
                 actionName: '',
-        creationTime:'',
+                creationTime: '',
                 workHours: 0
             },
             divHeight: '200px',
@@ -118,8 +122,7 @@ export default {
                 eid: null,
                 name: ''
             },
-      postUrl:
-        fileUrl + '/?token=Bearer ' + window.sessionStorage.getItem('token'),
+            postUrl: fileUrl + '/?token=Bearer ' + window.sessionStorage.getItem('token'),
             downUrl: fileUrlDown,
             fileUrlPath: '',
             bugForm: {
@@ -143,7 +146,9 @@ export default {
         detailInfo(value) {
             this.nameList = []
             this.parms.eid = value.id
-      this.$http.bug.get({ id: value.id }).then((res) => {
+            this.$http.bug.get({
+                id: value.id
+            }).then((res) => {
                 if (res.result) {
                     this.bugForm = res.result
                     //this.bugForm.statusNew=res.result.level
@@ -155,7 +160,9 @@ export default {
             let id = value.id
             if (id != null) {
                 //增加确定
-        this.$http.bug.getallaction({ id: id }).then((res) => {
+                this.$http.bug.getallaction({
+                    id: id
+                }).then((res) => {
                     if (res.result) {
                         this.timeLineLista = []
                         this.timeLineList = res.result
@@ -180,7 +187,7 @@ export default {
             this.detailForm = {
                 remark: value.remark,
                 actionName: value.actionName,
-        creationTime:value.creationTime,
+                creationTime: value.creationTime,
                 workHours: value.workHours
             }
         },
@@ -201,18 +208,21 @@ export default {
     }
 }
 </script>
+
 <style scoped>
 .time {
     font-size: 14px;
     font-weight: bold;
 }
+
 .content {
     padding-left: 5px;
 }
+
 .rightDiv {
     width: 18%;
     float: left;
     padding-left: 50px;
-  overflow: auto;
+
 }
 </style>

pages/handle/api.js

@@ -28,6 +28,6 @@ export default {
         return Api.post(`${workflowUrl}/instance/terminate`, params);
     },
     listTable(params){
-        return Api.post(`${systemUrl}/custompropertydefinition/list`,params); //物料扩展属性
+        return Api.post(`${material}/custompropertydefinition/list`,params); //物料扩展属性
     },
 }
\ No newline at end of file

pages/produce/orderlist.vue

 <template>
-  <div class="aps-r">
-    <DataGrid
-      :columns="columns"
-      ref="grid"
-      :batch="false"
-      :type="typeInfo"
-      :span="6"
-      :lazy="true"
-      :conditions="easySearch"
-      :action="action"
-      :gutter="40"
-    >
+<div class="aps-r">
+    <DataGrid :columns="columns" ref="grid" :batch="false" :type="typeInfo" :span="6" :lazy="true" :conditions="easySearch" :action="action" :gutter="40">
         <template slot="easySearch">
             <Form ref="formInline" :model="easySearch" inline>
                 <FormItem prop="keys">
-            <Input
-              placeholder="请输入订单编号/产品名称/图号"
-              v-model="easySearch.keys.value"
-              v-width="260"
-              clearable
-            />
+                    <Input placeholder="请输入订单编号/产品名称/图号" v-model="easySearch.keys.value" v-width="260" clearable />
                 </FormItem>
+                <!--
+                <FormItem>
+                    <Dictionary code="taskList.status" placeholder="请选择工单状态" :multiple="true" v-model="easySearch.status.value"></Dictionary>
+                </FormItem>
+                -->
                 <FormItem>
                     <Button type="primary" @click="search">查询</Button>
                 </FormItem>
@@ -33,10 +23,7 @@
             <Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button>
         </template>
         <template slot="card" slot-scope="{row}">
-        <div
-          class="body"
-          @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.quantity,row.status,row.mesCode,row.productName,row.drawnNumber)"
-        >
+            <div class="body" @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.quantity,row.status,row.mesCode,row.productName,row.drawnNumber)">
                 <Row class="title-i">
                     <Col :span="10" class="order-code">
                     <Ellipsis :text="row.productName" :lines="1" tooltip transfer />
@@ -48,13 +35,7 @@
                     <div class="statuBg" :style="tdStyle(row.status)"></div>
                     <div class="boxTitle">
                         <div class="text">
-                  <state
-                    code="taskList.status"
-                    ref="state"
-                    :value="row.status"
-                    type="text"
-                    :color="false"
-                  ></state>
+                            <state code="taskList.status" ref="state" :value="row.status" type="text" :color="false"></state>
                         </div>
                     </div>
                     </Col>
@@ -92,33 +73,17 @@
                     <Row class="rowBottom">
                         <Col span="14">{{l("drawnNumber")}}：{{row.drawnNumber}}</Col>
                         <Col span="10" class="tr">
-                <Icon
-                  type="md-alert"
-                  size="18"
-                  color="#FFA000"
-                  v-if="getStatus(row.status)&&getTimes(row.endTime)<86400&&getTimes(row.endTime)>0"
-                />
-                <span
-                  style="color:#FFA000"
-                  v-if="getStatus(row.status)&&getTimes(row.endTime)<86400&&getTimes(row.endTime)>0"
-                >预警</span>&nbsp;&nbsp;
-                <Icon
-                  type="md-timer"
-                  size="18"
-                  color="#FE7777"
-                  v-if="getStatus(row.status)&&compareTime(row.endTime)"
-                />
-                <span
-                  style="color:#FE7777"
-                  v-if="getStatus(row.status)&&compareTime(row.endTime)"
-                >超期</span>
+                        <Icon type="md-alert" size="18" color="#FFA000" v-if="getStatus(row.status)&&getTimes(row.endTime)<86400&&getTimes(row.endTime)>0" />
+                        <span style="color:#FFA000" v-if="getStatus(row.status)&&getTimes(row.endTime)<86400&&getTimes(row.endTime)>0">预警</span>&nbsp;&nbsp;
+                        <Icon type="md-timer" size="18" color="#FE7777" v-if="getStatus(row.status)&&compareTime(row.endTime)" />
+                        <span style="color:#FE7777" v-if="getStatus(row.status)&&compareTime(row.endTime)">超期</span>
                         </Col>
                     </Row>
                 </div>
             </div>
         </template>
     </DataGrid>
-  </div>
+</div>
 </template>
 
 <script>
@@ -137,10 +102,13 @@ export default {
                     op: "mesCode,productName,drawnNumber",
                     value: null,
                 },
+                // status: {
+                //     op: "In",
+                //     value: [12, 14, 5, 7, -1]
+                // }
             },
             downUrl: fileUrlDown,
-      columns: [
-        {
+            columns: [{
                     title: this.l("mesCode"),
                     key: "mesCode",
                     width: 240,
@@ -194,14 +162,12 @@ export default {
                     align: "center",
                     render: (h, params) => {
                         return h(
-              "div",
-              {
+                            "div", {
                                 class: "action",
                             },
                             [
                                 h(
-                  "op",
-                  {
+                                    "op", {
                                         attrs: {
                                             oprate: "edit",
                                         },
@@ -238,7 +204,10 @@ export default {
         let oldStr = localStorage.getItem("admin");
         let userlist = this.$store.getters.getUser(2);
     },
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
     },
     mounted() {
@@ -390,16 +359,19 @@ export default {
 
         .panel-text {
             padding: 5px 8px;
+
             .img-i {
                 width: 120px;
                 height: 120px;
                 overflow: hidden;
                 border: #cacbd0 dashed 1px;
+
                 img {
                     //   width: 90px;
                     //   height: 90px;
                 }
             }
+
             .row {
                 color: #666666;
                 padding-left: 10px;

pages/qc/certificate/endIssued/index.vue

 <template>
-  <div class="end-issued">
-    <DataGrid
-      :columns="columns"
-      ref="grid"
-      :action="action"
-      :conditions="easySearch"
-      :high="false"
-      :height="tdHeight"
-    ></DataGrid>
-    <Modal
-      v-model="detailModal"
-      title="查看合格证"
-      @on-cancel="reload"
-      footer-hide
-      width="1000"
-      :mask-closable="false"
-    >
+<div class="end-issued">
+    <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :high="false" :height="tdHeight"></DataGrid>
+    <Modal v-model="detailModal" title="查看合格证" @on-cancel="reload" footer-hide width="1000" :mask-closable="false">
         <Detail @on-close="cancel" @on-ok="addOk" :eid="curId" ref="listDetail" />
     </Modal>
-  </div>
+</div>
 </template>
 
 <script>
@@ -37,10 +23,18 @@ export default {
             modalInfo: false,
             tdHeight: "",
             rules: {
-        approveUser: [{ required: true, message: "必填", trigger: "blur" }]
+                approveUser: [{
+                    required: true,
+                    message: "必填",
+                    trigger: "blur"
+                }]
+            },
+            columns: [{
+                    key: "id",
+                    title: this.l("id"),
+                    hide: true,
+                    align: "left"
                 },
-      columns: [
-        { key: "id", title: this.l("id"), hide: true, align: "left" },
                 // {
                 //   type: 'selection',
                 //   width: 60,
@@ -98,9 +92,9 @@ export default {
                     render: (h, params) => {
                         return h(
                             "span",
-              params.row.actualFinishDate == "0001-01-01 00:00:00"
-                ? ""
-                : params.row.actualFinishDate
+                            params.row.actualFinishDate == "0001-01-01 00:00:00" ?
+                            "" :
+                            params.row.actualFinishDate
                         );
                     }
                 },
@@ -121,17 +115,20 @@ export default {
                 },
                 {
                     title: "操作",
-          key: "id",
-
+                    key: "action",
                     render: (h, params) => {
-            return h("div", { class: "action" }, [
+                        return h("div", {
+                            class: "action"
+                        }, [
                             h(
-                "op",
-                {
+                                "op", {
                                     attrs: {
-                    oprate: "detail",title: "查看合格证" 
+                                        oprate: "detail",
+                                        title: "查看合格证"
                                     },
-                  on: { click: () => this.detail(params.row.id) }
+                                    on: {
+                                        click: () => this.detail(params.row.id)
+                                    }
                                 },
                                 "查看合格证"
                             )
@@ -140,8 +137,15 @@ export default {
                 }
             ],
             easySearch: {
-        keys: { op: "mesCode", value: "", default: true },
-        type: { op: "Equal", value: 2 }
+                keys: {
+                    op: "mesCode",
+                    value: "",
+                    default: true
+                },
+                type: {
+                    op: "Equal",
+                    value: 2
+                }
             }
         };
     },

pages/qc/certificate/waitOpened/index.vue

 <template>
-  <div class="wait-opened">
-    <DataGrid
-      :columns="columns"
-      ref="grid"
-      :action="action"
-      :conditions="easySearch"
-      :high="false"
-      :height="tdHeight"
-    ></DataGrid>
+<div class="wait-opened">
+    <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :high="false" :height="tdHeight"></DataGrid>
     <Modal v-model="addModal" title="开合格证" fullscreen footer-hide :mask-closable="false">
         <Add @on-close="cancel" @on-ok="addOk" :eid="curId" ref="addFile" />
     </Modal>
-  </div>
+</div>
 </template>
 
 <script>
@@ -29,8 +22,12 @@ export default {
             addModal: false,
             curId: null,
             tdHeight: "",
-      columns: [
-        { key: "id", title: this.l("id"), hide: true, align: "left" },
+            columns: [{
+                    key: "id",
+                    title: this.l("id"),
+                    hide: true,
+                    align: "left"
+                },
                 {
                     key: "mesCode",
                     title: this.l("mesCode"),
@@ -84,9 +81,9 @@ export default {
                     render: (h, params) => {
                         return h(
                             "span",
-              params.row.actualFinishDate == "0001-01-01 00:00:00"
-                ? ""
-                : params.row.actualFinishDate
+                            params.row.actualFinishDate == "0001-01-01 00:00:00" ?
+                            "" :
+                            params.row.actualFinishDate
                         );
                     }
                 },
@@ -107,18 +104,21 @@ export default {
                 },
                 {
                     title: "操作",
-          key: "id",
+                    key: "action",
                     // width: 250,
                     align: "center",
                     render: (h, params) => {
-            return h("div", { class: "action" }, [
+                        return h("div", {
+                            class: "action"
+                        }, [
                             h(
-                "op",
-                {
+                                "op", {
                                     attrs: {
                                         oprate: "add"
                                     },
-                  on: { click: () => this.add(params.row) }
+                                    on: {
+                                        click: () => this.add(params.row)
+                                    }
                                 },
                                 "开合格证"
                             )
@@ -127,12 +127,22 @@ export default {
                 }
             ],
             easySearch: {
-        keys: { op: "mesCode", value: null, default: true },
-        type: { op: "Equal", value: 1 }
+                keys: {
+                    op: "mesCode",
+                    value: null,
+                    default: true
+                },
+                type: {
+                    op: "Equal",
+                    value: 1
+                }
             }
         };
     },
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
     },
     mounted() {},

pages/technology/add.vue

 <template>
-  <Form ref="form" :model="entity" :rules="rules" :label-width="110">
+<Form ref="form" :model="entity" :rules="rules" :label-width="110">
     <Row>
         <!-- <Col :span="12">
         <FormItem :label="l('classId')" prop="classId">
@@ -151,10 +151,9 @@
         <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
         <Button @click="handleClose" class="ml20">取消</Button>
     </FormItem>
-  </Form>
+</Form>
 </template>
 
-    
 <script>
 import Api from "./api";
 import ApiWorkflow from "../workflow/process/api";
@@ -198,28 +197,22 @@ export default {
                 fileId: "",
             },
             rules: {
-        name: [
-          {
+                name: [{
                     required: true,
                     message: "必填",
                     trigger: "blur",
-          },
-        ],
-        code: [
-          {
+                }, ],
+                code: [{
                     required: true,
                     message: "必填",
                     trigger: "blur",
-          },
-        ],
-        routingType: [
-          {
+                }, ],
+                routingType: [{
                     required: true,
                     message: "请选择工艺类型",
                     trigger: "change",
                     type: "number",
-          },
-        ],
+                }, ],
             },
             parms: {
                 app: "technology",
@@ -272,6 +265,18 @@ export default {
                                             if (r.success) {
                                                 this.$Message.success("保存成功");
                                                 this.$emit("on-ok");
+                                                //保存成功后直接打开主页面查看功能
+                                                let rowInfo = {
+                                                    id: null, //????保存成功后需要返回id
+                                                    code: this.entity.code,
+                                                    name: this.entity.name,
+                                                    routingType: this.entity.routingType,
+                                                    version: this.entity.versionid,
+                                                    departmentName: this.entity.departmentName,
+                                                    approvalStatus: this.entity.approvalStatus,
+                                                    productBomId: this.entity.productBomId
+                                                }
+                                                // this.$emit("on-goPage", rowInfo)
                                             } else {
                                                 this.$Message.error("保存失败");
                                             }

pages/technology/index.vue

@@ -52,7 +52,7 @@
             </template>
         </DataGrid>
         <Modal v-model="modal" :title="title" width="1120" footer-hide>
-            <component :is="detail" :eid="curId" :uid="uId" :title="title" :headid="hid" @on-close="cancel" @on-ok="ok" />
+            <component :is="detail" :eid="curId" :uid="uId" :title="title" :headid="hid" @on-close="cancel" @on-ok="ok" @on-goPage="view" />
         </Modal>
         <Modal v-model="documentShow" title="送审" :mask-closable="false" :scrollable="true" ok-text="确定" cancel-text="取消" fullscreen>
             <sendAudit ref="sendAudit"></sendAudit>