@zscreate/form-component 1.1.572-test.6 → 1.1.572-test.7

package/dist/form-component.css

@@ -3877,13 +3877,13 @@ span.CodeMirror-selectedtext { background: none; }
 }
 
 
-[data-v-32113787] .ant-modal-content {
+[data-v-989916b4] .ant-modal-content {
   top: 0px !important;
 }
-[data-v-32113787] .ant-modal-body {
+[data-v-989916b4] .ant-modal-body {
   padding: 20px 12px !important;
 }
-.conference-room-content[data-v-32113787] {
+.conference-room-content[data-v-989916b4] {
   -webkit-user-select: none;
   /* Safari */
   -moz-user-select: none;
@@ -3892,71 +3892,71 @@ span.CodeMirror-selectedtext { background: none; }
   user-select: none;
   /* 标准语法 */
 }
-.conference-room-content .conference-room-content-hard[data-v-32113787] {
+.conference-room-content .conference-room-content-hard[data-v-989916b4] {
   display: flex;
   justify-content: space-between;
   align-items: center;
 }
-.conference-room-content .conference-room-content-hard .left[data-v-32113787] {
+.conference-room-content .conference-room-content-hard .left[data-v-989916b4] {
   display: flex;
 }
-.conference-room-content .conference-room-content-hard .left .left-date-type[data-v-32113787] {
+.conference-room-content .conference-room-content-hard .left .left-date-type[data-v-989916b4] {
   margin-right: 20px;
 }
-.conference-room-content .conference-room-content-hard .left .left-date-content .anticon[data-v-32113787] {
+.conference-room-content .conference-room-content-hard .left .left-date-content .anticon[data-v-989916b4] {
   cursor: pointer;
   color: #999;
 }
-.conference-room-content .conference-room-content-hard .left .left-date-content .left-date-content-show[data-v-32113787] .ant-input {
+.conference-room-content .conference-room-content-hard .left .left-date-content .left-date-content-show[data-v-989916b4] .ant-input {
   border: none;
   text-align: center;
 }
-.conference-room-content .conference-room-content-hard .left .left-date-content .left-date-content-show[data-v-32113787] .anticon {
+.conference-room-content .conference-room-content-hard .left .left-date-content .left-date-content-show[data-v-989916b4] .anticon {
   display: none;
 }
-.conference-room-content .conference-room-content-hard .left .left-date-button[data-v-32113787] {
+.conference-room-content .conference-room-content-hard .left .left-date-button[data-v-989916b4] {
   display: flex;
   align-items: center;
   margin-left: 12px;
 }
-.conference-room-content .conference-room-content-hard .right .right-content[data-v-32113787] {
+.conference-room-content .conference-room-content-hard .right .right-content[data-v-989916b4] {
   display: flex;
   margin-right: 10px;
 }
-.conference-room-content .conference-room-content-hard .right .right-content .right-content-item[data-v-32113787] {
+.conference-room-content .conference-room-content-hard .right .right-content .right-content-item[data-v-989916b4] {
   display: flex;
   margin-left: 20px;
   align-items: center;
 }
-.conference-room-content .conference-room-content-hard .right .right-content .right-content-item .color-0[data-v-32113787] {
+.conference-room-content .conference-room-content-hard .right .right-content .right-content-item .color-0[data-v-989916b4] {
   background-color: #D7F4DA;
   width: 14px;
   height: 14px;
   border-radius: 7px 7px 7px 7px;
 }
-.conference-room-content .conference-room-content-hard .right .right-content .right-content-item .color-1[data-v-32113787] {
+.conference-room-content .conference-room-content-hard .right .right-content .right-content-item .color-1[data-v-989916b4] {
   background-color: #FFD4AF;
   width: 14px;
   height: 14px;
   border-radius: 7px 7px 7px 7px;
 }
-.conference-room-content .conference-room-content-hard .right .right-content .right-content-item .color-2[data-v-32113787] {
+.conference-room-content .conference-room-content-hard .right .right-content .right-content-item .color-2[data-v-989916b4] {
   background-color: #FFB5B5;
   width: 14px;
   height: 14px;
   border-radius: 7px 7px 7px 7px;
 }
-.conference-room-content .conference-room-content-hard .right .right-content .right-content-item .text[data-v-32113787] {
+.conference-room-content .conference-room-content-hard .right .right-content .right-content-item .text[data-v-989916b4] {
   font-weight: 400;
   font-size: 14px;
   color: #333333;
   margin-left: 6px;
 }
-.conference-room-content .conference-room-body[data-v-32113787] {
+.conference-room-content .conference-room-body[data-v-989916b4] {
   margin-top: 16px;
   display: flex;
 }
-.conference-room-content .conference-room-body .conference-room-body-left[data-v-32113787] {
+.conference-room-content .conference-room-body .conference-room-body-left[data-v-989916b4] {
   width: 243px;
   height: 559px;
   background: #F5F9FF;
@@ -3964,82 +3964,82 @@ span.CodeMirror-selectedtext { background: none; }
   border: 1px solid #ECECEC;
   border-bottom: none;
 }
-.table[data-v-32113787] {
+.table[data-v-989916b4] {
   width: 100%;
 }
-.table tr td[data-v-32113787]:first-child,
-.table tr th[data-v-32113787]:first-child {
+.table tr td[data-v-989916b4]:first-child,
+.table tr th[data-v-989916b4]:first-child {
   width: 243px;
   background-color: #F5F9FF;
 }
-.table td[data-v-32113787],
-.table th[data-v-32113787] {
+.table td[data-v-989916b4],
+.table th[data-v-989916b4] {
   border: 1px solid #f1f1f1;
   padding: 5px;
   vertical-align: middle;
   text-align: center;
 }
-.table td .ellipsis[data-v-32113787],
-.table th .ellipsis[data-v-32113787] {
+.table td .ellipsis[data-v-989916b4],
+.table th .ellipsis[data-v-989916b4] {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   width: 97%;
 }
-.table .td-bg-0[data-v-32113787] {
+.table .td-bg-0[data-v-989916b4] {
   background-color: #fff;
   cursor: not-allowed;
 }
-.table .td-bg-0[data-v-32113787]:hover {
+.table .td-bg-0[data-v-989916b4]:hover {
   background-color: #efefee;
 }
-.table .td-bg-1[data-v-32113787] {
+.table .td-bg-1[data-v-989916b4] {
   background-color: #d7f4da;
   cursor: pointer;
 }
-.table .td-bg-1[data-v-32113787]:hover {
+.table .td-bg-1[data-v-989916b4]:hover {
   background-color: rgba(215, 244, 218, 0.5);
 }
-.table .td-bg-2[data-v-32113787] {
+.table .td-bg-2[data-v-989916b4] {
   background-color: #ffd4af;
   cursor: pointer;
 }
-.table .td-bg-2[data-v-32113787]:hover {
+.table .td-bg-2[data-v-989916b4]:hover {
   background-color: rgba(255, 212, 175, 0.5);
 }
-.table .td-bg-3[data-v-32113787] {
+.table .td-bg-3[data-v-989916b4] {
   background-color: #ffb5b5;
   cursor: pointer;
 }
-.table .td-bg-3[data-v-32113787]:hover {
+.table .td-bg-3[data-v-989916b4]:hover {
   background-color: rgba(255, 181, 181, 0.5);
 }
-.tooltip-data[data-v-32113787] {
+.tooltip-data[data-v-989916b4] {
   width: -moz-max-content;
   width: max-content;
 }
-.tooltip-data .tooltip-data-body[data-v-32113787] {
+.tooltip-data .tooltip-data-body[data-v-989916b4] {
   padding: 5px;
   font-size: 14px;
   color: #fff;
   border-bottom: 1px solid #fff;
 }
-.tooltip-data .tooltip-data-body .tooltip-data-body-item[data-v-32113787] {
+.tooltip-data .tooltip-data-body .tooltip-data-body-item[data-v-989916b4] {
   margin-bottom: 8px;
 }
-.tooltip-data .tooltip-data-body .tooltip-data-body-item div[data-v-32113787] {
+.tooltip-data .tooltip-data-body .tooltip-data-body-item div[data-v-989916b4] {
   margin-bottom: 8px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.tooltip-data .tooltip-data-body[data-v-32113787]:last-child {
+.tooltip-data .tooltip-data-body[data-v-989916b4]:last-child {
   border-bottom: none;
 }
-.input-no-border[data-v-32113787] {
+.input-no-border[data-v-989916b4] {
   border: none;
 }
-[data-v-32113787] .ant-table-body {
+[data-v-989916b4] .ant-table-body {
   margin: 0 !important;
 }
 

package/dist/form-component.umd.js

@@ -66848,7 +66848,7 @@ let getFileExt = filename => {
 /* harmony import */ var _util_mathUtils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(9548);
 /* harmony import */ var _util_util__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(4063);
 /* harmony import */ var _layoutItem__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(330);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(3277);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(3332);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(1528);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_9__);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(9274);
@@ -70020,7 +70020,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 3277:
+/***/ 3332:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -110998,12 +110998,12 @@ var componentvue_type_template_id_32013742_render = function () {var _vm=this;va
 var componentvue_type_template_id_32013742_staticRenderFns = []
 
 
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=template&id=32113787&scoped=true
-var conferenceRoomModalvue_type_template_id_32113787_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{attrs:{"title":_vm.title,"width":"100%","height":"100%","wrapClassName":"full-modal","visible":_vm.visible,"confirmLoading":_vm.confirmLoading,"cancelText":"关闭","destroyOnClose":true},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel}},[_c('div',{staticClass:"conference-room-content"},[_c('div',{staticClass:"conference-room-content-hard"},[_c('div',{staticClass:"left"},[_c('div',{staticClass:"left-date-type"},[_c('a-radio-group',{attrs:{"button-style":"solid","disabled":_vm.loading},on:{"change":_vm.changeDateType},model:{value:(_vm.dataObj.dateType),callback:function ($$v) {_vm.$set(_vm.dataObj, "dateType", $$v)},expression:"dataObj.dateType"}},[_c('a-radio-button',{attrs:{"value":0}},[_vm._v(" 日 ")]),_c('a-radio-button',{attrs:{"value":1}},[_vm._v(" 周 ")]),_c('a-radio-button',{attrs:{"value":2}},[_vm._v(" 月 ")])],1)],1),_c('div',{staticClass:"left-date-content"},[_c('a-icon',{attrs:{"type":"left"},on:{"click":function($event){return _vm.changeDate(false)}}}),(_vm.dataObj.dateType === 0)?_c('a-date-picker',{staticClass:"left-date-content-show",staticStyle:{"width":"132px"},attrs:{"allowClear":false,"format":"YYYY年MM月DD日","suffixIcon":false},on:{"change":_vm.onChange},model:{value:(_vm.dataObj.date),callback:function ($$v) {_vm.$set(_vm.dataObj, "date", $$v)},expression:"dataObj.date"}}):(_vm.dataObj.dateType === 1)?_c('a-week-picker',{staticClass:"left-date-content-show",staticStyle:{"width":"99px"},attrs:{"allowClear":false,"placeholder":"Select week","format":"YYYY年wo"},on:{"change":_vm.onChange},model:{value:(_vm.dataObj.date),callback:function ($$v) {_vm.$set(_vm.dataObj, "date", $$v)},expression:"dataObj.date"}}):_c('a-month-picker',{staticClass:"left-date-content-show",staticStyle:{"width":"99px"},attrs:{"allowClear":false,"placeholder":"Select month","format":"YYYY年MM月"},on:{"change":_vm.onChange},model:{value:(_vm.dataObj.date),callback:function ($$v) {_vm.$set(_vm.dataObj, "date", $$v)},expression:"dataObj.date"}}),_c('a-icon',{attrs:{"type":"right"},on:{"click":function($event){return _vm.changeDate(true)}}})],1),_c('div',{staticClass:"left-date-button"},[_c('a-button',{attrs:{"disabled":_vm.loading},on:{"click":_vm.resetDate}},[_vm._v(_vm._s(_vm.dataObj.dateType === 0 ? '今天' : _vm.dataObj.dateType === 1 ? '本周' : '本月'))]),_c('a-icon',{staticStyle:{"margin-left":"20px","color":"#999","font-size":"20px"},attrs:{"type":"redo"},on:{"click":function($event){return _vm.debounceGetDataListFunction()}}})],1)]),_c('div',{staticClass:"right"},[_c('div',{staticClass:"right-content"},[_c('div',{staticClass:"right-content-item"},[_c('div',{staticClass:"color-0"}),_c('div',{staticClass:"text"},[_vm._v("占用")])]),_c('div',{staticClass:"right-content-item"},[_c('div',{staticClass:"color-1"}),_c('div',{staticClass:"text"},[_vm._v("待审批")])]),_c('div',{staticClass:"right-content-item"},[_c('div',{staticClass:"color-2"}),_c('div',{staticClass:"text"},[_vm._v("冲突")])])])])]),_c('div',{staticClass:"conference-room-body"},[_c('a-spin',{staticStyle:{"width":"100%"},attrs:{"spinning":_vm.loading}},[_c('table',{staticClass:"table",attrs:{"cellspacing":"0","cellpadding":"0","border":"0"}},[_c('thead',[_c('tr',[_c('th',{attrs:{"colspan":"1"}},[_c('div',{staticStyle:{"display":"flex","justify-content":"center","align-items":"center","font-size":"16px"}},[_c('img',{staticStyle:{"width":"20px","margin-right":"5px"},attrs:{"src":__webpack_require__(4193),"alt":""}}),_c('div',[_vm._v("会议室")])])]),_c('th',{attrs:{"colspan":(_vm.dateTime.length * (_vm.dataObj.dateType === 0 ? 2 : 1)) || 1}},[_c('div',{staticStyle:{"display":"flex","justify-content":"center","align-items":"center","font-size":"14px"}},[_c('div',[_vm._v(_vm._s(_vm.moment(_vm.dataObj.dateShow).format(_vm.dataObj.dateType === 0 ? 'MM月DD日' : _vm.dataObj.dateType === 1 ? 'YYYY年wo' : 'YYYY年MM月')))]),(_vm.dataObj.dateType === 0)?_c('div',[_vm._v("（"+_vm._s(_vm.moment(_vm.dataObj.dateShow).format('dddd'))+"）")]):_vm._e(),(_vm.dataObj.dateType === 0)?_c('div',[_vm._v("单位：时")]):_vm._e(),(_vm.dataObj.dateType === 2)?_c('div',[_vm._v("（30天）")]):_vm._e()])])])]),_c('tbody',[_c('tr',[_c('td',{staticStyle:{"background-color":"#fff","padding":"0"},attrs:{"colspan":"1"}},[_c('div',{staticStyle:{"display":"flex","justify-content":"space-between"}},[_c('a-input',{staticClass:"input-no-border",attrs:{"placeholder":"请输入会议室"},model:{value:(_vm.searchKey),callback:function ($$v) {_vm.searchKey=(typeof $$v === 'string'? $$v.trim(): $$v)},expression:"searchKey"}}),_c('div',{staticStyle:{"display":"flex","align-items":"center","justify-content":"center"}},[_c('div',{staticStyle:{"width":"30px","text-align":"center"}},[_c('img',{staticStyle:{"width":"20px","cursor":"pointer"},attrs:{"src":__webpack_require__(5081),"alt":""},on:{"click":_vm.search}})])])],1)]),_vm._l((_vm.dateTime),function(i){return _c('td',{directives:[{name:"show",rawName:"v-show",value:(_vm.dateTime.length),expression:"dateTime.length"}],attrs:{"colspan":_vm.dataObj.dateType === 0 ? 2 : 1}},[_vm._v(_vm._s(i)+" ")])}),_c('td',{directives:[{name:"show",rawName:"v-show",value:(!_vm.dateTime.length),expression:"!dateTime.length"}],attrs:{"colspan":"1"}})],2),_vm._l((_vm.dataList),function(item,index){return _c('tr',[_c('td',{attrs:{"colspan":"1"}},[_c('div',{staticClass:"ellipsis",attrs:{"title":item.hysName}},[_vm._v(" "+_vm._s(item.hysName)+" ")])]),_vm._l((_vm.getdateTime(item.dateTime)),function(el){return _c('td',{directives:[{name:"show",rawName:"v-show",value:(_vm.dateTime.length),expression:"dateTime.length"}],class:'td-bg-' + el.status,staticStyle:{"padding":"0"},attrs:{"colspan":"1"}},[(el.dataList.length)?_c('a-tooltip',{attrs:{"placement":"bottom","overlayClassName":"tooltip-data"}},[_c('template',{slot:"title"},_vm._l((el.dataList),function(info){return _c('div',{staticClass:"tooltip-data-body"},[_c('div',{staticClass:"tooltip-data-body-item"},_vm._l((_vm.dataObj.dataColumns),function(j){return _c('div',{attrs:{"title":j.name + ':' + info[j.model]}},[_vm._v(" "+_vm._s(j.name)+":"+_vm._s(info[j.model])+" ")])}),0)])}),0),_c('div',{staticStyle:{"width":"100%","height":"32px","line-height":"32px"}},[_vm._v(_vm._s(el.dataList.length > 1 ? el.dataList.length : '  '))])],2):_vm._e()],1)}),_c('td',{directives:[{name:"show",rawName:"v-show",value:(!_vm.dateTime.length),expression:"!dateTime.length"}],attrs:{"colspan":"1"}})],2)})],2)])])],1),_c('div',{staticClass:"conference-room-table"},[_c('a-table',{attrs:{"columns":_vm.columns,"dataSource":_vm.dataSource,"pagination":_vm.ipagination,"size":"small","rowKey":"id"},on:{"change":_vm.handleTableChange},scopedSlots:_vm._u([{key:"action",fn:function(text){return _c('a',{attrs:{"href":"javascript:;"}},[_vm._v("取消")])}}])})],1)])])}
-var conferenceRoomModalvue_type_template_id_32113787_scoped_true_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=template&id=989916b4&scoped=true
+var conferenceRoomModalvue_type_template_id_989916b4_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{attrs:{"title":_vm.title,"width":"100%","height":"100%","wrapClassName":"full-modal","visible":_vm.visible,"confirmLoading":_vm.confirmLoading,"cancelText":"关闭","destroyOnClose":true},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel}},[_c('div',{staticClass:"conference-room-content"},[_c('div',{staticClass:"conference-room-content-hard"},[_c('div',{staticClass:"left"},[_c('div',{staticClass:"left-date-type"},[_c('a-radio-group',{attrs:{"button-style":"solid","disabled":_vm.loading},on:{"change":_vm.changeDateType},model:{value:(_vm.dataObj.dateType),callback:function ($$v) {_vm.$set(_vm.dataObj, "dateType", $$v)},expression:"dataObj.dateType"}},[_c('a-radio-button',{attrs:{"value":0}},[_vm._v(" 日 ")]),_c('a-radio-button',{attrs:{"value":1}},[_vm._v(" 周 ")]),_c('a-radio-button',{attrs:{"value":2}},[_vm._v(" 月 ")])],1)],1),_c('div',{staticClass:"left-date-content"},[_c('a-icon',{attrs:{"type":"left"},on:{"click":function($event){return _vm.changeDate(false)}}}),(_vm.dataObj.dateType === 0)?_c('a-date-picker',{staticClass:"left-date-content-show",staticStyle:{"width":"132px"},attrs:{"allowClear":false,"format":"YYYY年MM月DD日","suffixIcon":false},on:{"change":_vm.onChange},model:{value:(_vm.dataObj.date),callback:function ($$v) {_vm.$set(_vm.dataObj, "date", $$v)},expression:"dataObj.date"}}):(_vm.dataObj.dateType === 1)?_c('a-week-picker',{staticClass:"left-date-content-show",staticStyle:{"width":"99px"},attrs:{"allowClear":false,"placeholder":"Select week","format":"YYYY年wo"},on:{"change":_vm.onChange},model:{value:(_vm.dataObj.date),callback:function ($$v) {_vm.$set(_vm.dataObj, "date", $$v)},expression:"dataObj.date"}}):_c('a-month-picker',{staticClass:"left-date-content-show",staticStyle:{"width":"99px"},attrs:{"allowClear":false,"placeholder":"Select month","format":"YYYY年MM月"},on:{"change":_vm.onChange},model:{value:(_vm.dataObj.date),callback:function ($$v) {_vm.$set(_vm.dataObj, "date", $$v)},expression:"dataObj.date"}}),_c('a-icon',{attrs:{"type":"right"},on:{"click":function($event){return _vm.changeDate(true)}}})],1),_c('div',{staticClass:"left-date-button"},[_c('a-button',{attrs:{"disabled":_vm.loading},on:{"click":_vm.resetDate}},[_vm._v(_vm._s(_vm.dataObj.dateType === 0 ? '今天' : _vm.dataObj.dateType === 1 ? '本周' : '本月'))]),_c('a-icon',{staticStyle:{"margin-left":"20px","color":"#999","font-size":"20px"},attrs:{"type":"redo"},on:{"click":function($event){return _vm.debounceGetDataListFunction()}}})],1)]),_c('div',{staticClass:"right"},[_c('div',{staticClass:"right-content"},[_c('div',{staticClass:"right-content-item"},[_c('div',{staticClass:"color-0"}),_c('div',{staticClass:"text"},[_vm._v("占用")])]),_c('div',{staticClass:"right-content-item"},[_c('div',{staticClass:"color-1"}),_c('div',{staticClass:"text"},[_vm._v("待审批")])]),_c('div',{staticClass:"right-content-item"},[_c('div',{staticClass:"color-2"}),_c('div',{staticClass:"text"},[_vm._v("冲突")])])])])]),_c('div',{staticClass:"conference-room-body"},[_c('a-spin',{staticStyle:{"width":"100%"},attrs:{"spinning":_vm.loading}},[_c('table',{staticClass:"table",attrs:{"cellspacing":"0","cellpadding":"0","border":"0"}},[_c('thead',[_c('tr',[_c('th',{attrs:{"colspan":"1"}},[_c('div',{staticStyle:{"display":"flex","justify-content":"center","align-items":"center","font-size":"16px"}},[_c('img',{staticStyle:{"width":"20px","margin-right":"5px"},attrs:{"src":__webpack_require__(4193),"alt":""}}),_c('div',[_vm._v("会议室")])])]),_c('th',{attrs:{"colspan":(_vm.dateTime.length * (_vm.dataObj.dateType === 0 ? 2 : 1)) || 1}},[_c('div',{staticStyle:{"display":"flex","justify-content":"center","align-items":"center","font-size":"14px"}},[_c('div',[_vm._v(_vm._s(_vm.moment(_vm.dataObj.dateShow).format(_vm.dataObj.dateType === 0 ? 'MM月DD日' : _vm.dataObj.dateType === 1 ? 'YYYY年wo' : 'YYYY年MM月')))]),(_vm.dataObj.dateType === 0)?_c('div',[_vm._v("（"+_vm._s(_vm.moment(_vm.dataObj.dateShow).format('dddd'))+"）")]):_vm._e(),(_vm.dataObj.dateType === 0)?_c('div',[_vm._v("单位：时")]):_vm._e(),(_vm.dataObj.dateType === 2)?_c('div',[_vm._v("（30天）")]):_vm._e()])])])]),_c('tbody',[_c('tr',[_c('td',{staticStyle:{"background-color":"#fff","padding":"0"},attrs:{"colspan":"1"}},[_c('div',{staticStyle:{"display":"flex","justify-content":"space-between"}},[_c('a-input',{staticClass:"input-no-border",attrs:{"placeholder":"请输入会议室"},model:{value:(_vm.searchKey),callback:function ($$v) {_vm.searchKey=(typeof $$v === 'string'? $$v.trim(): $$v)},expression:"searchKey"}}),_c('div',{staticStyle:{"display":"flex","align-items":"center","justify-content":"center"}},[_c('div',{staticStyle:{"width":"30px","text-align":"center"}},[_c('img',{staticStyle:{"width":"20px","cursor":"pointer"},attrs:{"src":__webpack_require__(5081),"alt":""},on:{"click":_vm.search}})])])],1)]),_vm._l((_vm.dateTime),function(i){return _c('td',{directives:[{name:"show",rawName:"v-show",value:(_vm.dateTime.length),expression:"dateTime.length"}],attrs:{"colspan":_vm.dataObj.dateType === 0 ? 2 : 1}},[_vm._v(_vm._s(i)+" ")])}),_c('td',{directives:[{name:"show",rawName:"v-show",value:(!_vm.dateTime.length),expression:"!dateTime.length"}],attrs:{"colspan":"1"}})],2),_vm._l((_vm.dataList),function(item,index){return _c('tr',[_c('td',{attrs:{"colspan":"1"}},[_c('div',{staticClass:"ellipsis",attrs:{"title":item.hysName}},[_vm._v(" "+_vm._s(item.hysName)+" ")])]),_vm._l((_vm.getdateTime(item.dateTime)),function(el){return _c('td',{directives:[{name:"show",rawName:"v-show",value:(_vm.dateTime.length),expression:"dateTime.length"}],class:'td-bg-' + el.status,staticStyle:{"padding":"0"},attrs:{"colspan":"1"}},[(el.dataList.length)?_c('a-tooltip',{attrs:{"placement":"bottom","overlayClassName":"tooltip-data"}},[_c('template',{slot:"title"},_vm._l((el.dataList),function(info){return _c('div',{staticClass:"tooltip-data-body"},[_c('div',{staticClass:"tooltip-data-body-item"},_vm._l((_vm.dataObj.dataColumns),function(j){return _c('div',{attrs:{"title":j.name + ':' + info[j.model]}},[_vm._v(" "+_vm._s(j.name)+":"+_vm._s(info[j.model])+" ")])}),0)])}),0),_c('div',{staticStyle:{"width":"100%","height":"32px","line-height":"32px"}},[_vm._v(_vm._s(el.dataList.length > 1 ? el.dataList.length : '  '))])],2):_vm._e()],1)}),_c('td',{directives:[{name:"show",rawName:"v-show",value:(!_vm.dateTime.length),expression:"!dateTime.length"}],attrs:{"colspan":"1"}})],2)})],2)])])],1),_c('div',{staticClass:"conference-room-table"},[_c('a-table',{attrs:{"columns":_vm.columns,"dataSource":_vm.dataSource,"pagination":_vm.ipagination,"size":"small","rowKey":"id","loading":_vm.tableLoading},on:{"change":_vm.handleTableChange},scopedSlots:_vm._u([{key:"ableCancel",fn:function(text,record){return (text == '1')?_c('a',{attrs:{"href":"javascript:;"},on:{"click":function($event){return _vm.closeRomm(record.id)}}},[_vm._v("取消")]):_vm._e()}}],null,true)})],1)])])}
+var conferenceRoomModalvue_type_template_id_989916b4_scoped_true_staticRenderFns = []
 
 
-;// CONCATENATED MODULE: ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=template&id=32113787&scoped=true
+;// CONCATENATED MODULE: ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=template&id=989916b4&scoped=true
 
 ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=script&lang=js
 
@@ -111148,6 +111148,8 @@ var conferenceRoomModalvue_type_template_id_32113787_scoped_true_staticRenderFns
 //
 //
 //
+//
+//
 
 
 
@@ -111204,7 +111206,8 @@ var conferenceRoomModalvue_type_template_id_32113787_scoped_true_staticRenderFns
         total: 0
       },
       dataList: [],
-      loading: false
+      loading: false,
+      tableLoading: false
     };
   },
   computed: {
@@ -111262,12 +111265,17 @@ var conferenceRoomModalvue_type_template_id_32113787_scoped_true_staticRenderFns
         };
         this.columns.push(obj);
       });
+      this.columns.push({
+        title: '状态',
+        dataIndex: 'statusShow',
+        width: 200
+      });
       this.columns.push({
         title: '操作',
-        dataIndex: 'action',
+        dataIndex: 'ableCancel',
         width: 200,
         scopedSlots: {
-          customRender: 'action'
+          customRender: 'ableCancel'
         }
       });
       this.dataObj.models = models;
@@ -111290,10 +111298,11 @@ var conferenceRoomModalvue_type_template_id_32113787_scoped_true_staticRenderFns
       this.getDataList(val);
     }, 400),
     getDataList(type) {
-      this.loading = true;
+      if (type !== 'table') this.loading = true;
+      this.tableLoading = true;
       (0,manage/* postAction */.vd)('/formApi/queryMeettingRoomDetail', this.dataObj).then(res => {
         if (res.success) {
-          this.dataList = res.result.dataList || [];
+          if (type !== 'table') this.dataList = res.result.dataList || []; //type === table代表只刷新table表格即可
           this.dataSource = res.result.hysList;
           if (type == 'first') this.visible = true;
         } else {
@@ -111303,6 +111312,7 @@ var conferenceRoomModalvue_type_template_id_32113787_scoped_true_staticRenderFns
         }
       }).finally(() => {
         this.loading = false;
+        this.tableLoading = false;
       });
     },
     search() {
@@ -111342,6 +111352,29 @@ var conferenceRoomModalvue_type_template_id_32113787_scoped_true_staticRenderFns
         jssj: [] //借宿时间
       };
     },
+    closeRomm(id) {
+      let that = this;
+      this.$confirm({
+        title: "确定取消?",
+        okText: "确定",
+        cancelText: "关闭",
+        onOk() {
+          (0,manage/* getAction */.Th)('/formApi/cancelMeetingRoom', {
+            id
+          }).then(res => {
+            if (res.success) {
+              that.$message.success('取消成功');
+              that.debounceGetDataListFunction('table');
+            } else {
+              that.$message.warning(res.message || '取消失败!');
+            }
+          });
+        },
+        onCancel() {
+          console.log("Cancel");
+        }
+      });
+    },
     /* 确认添加 */
     handleOk() {
       this.$emit('ok');
@@ -111398,10 +111431,10 @@ var conferenceRoomModalvue_type_template_id_32113787_scoped_true_staticRenderFns
 });
 ;// CONCATENATED MODULE: ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=script&lang=js
  /* harmony default export */ const component_conferenceRoomModalvue_type_script_lang_js = (conferenceRoomModalvue_type_script_lang_js); 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.9.0@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=style&index=0&id=32113787&prod&lang=less&scoped=true
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.9.0@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=style&index=0&id=989916b4&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=style&index=0&id=32113787&prod&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue?vue&type=style&index=0&id=989916b4&prod&lang=less&scoped=true
 
 ;// CONCATENATED MODULE: ./src/form/modules/components/conferenceRoom/component/conferenceRoomModal.vue
 
@@ -111414,11 +111447,11 @@ var conferenceRoomModalvue_type_template_id_32113787_scoped_true_staticRenderFns
 
 var conferenceRoomModal_component = (0,componentNormalizer/* default */.A)(
   component_conferenceRoomModalvue_type_script_lang_js,
-  conferenceRoomModalvue_type_template_id_32113787_scoped_true_render,
-  conferenceRoomModalvue_type_template_id_32113787_scoped_true_staticRenderFns,
+  conferenceRoomModalvue_type_template_id_989916b4_scoped_true_render,
+  conferenceRoomModalvue_type_template_id_989916b4_scoped_true_staticRenderFns,
   false,
   null,
-  "32113787",
+  "989916b4",
   null
   
 )
@@ -137215,7 +137248,7 @@ var staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1010 modules
-var components = __webpack_require__(3277);
+var components = __webpack_require__(3332);
 ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/CorrectionItem.vue?vue&type=script&lang=js
 //
 //
@@ -139278,7 +139311,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /* harmony default export */ const CorrectionModal = (component.exports);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1010 modules
-var components = __webpack_require__(3277);
+var components = __webpack_require__(3332);
 // EXTERNAL MODULE: ./node_modules/_pubsub-js@1.9.4@pubsub-js/src/pubsub.js
 var pubsub = __webpack_require__(1528);
 var pubsub_default = /*#__PURE__*/__webpack_require__.n(pubsub);
@@ -140455,7 +140488,7 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(8501);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1010 modules
-var components = __webpack_require__(3277);
+var components = __webpack_require__(3332);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(1509);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -156344,7 +156377,7 @@ function toString(value) {
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"rE":"1.1.572-test.6"}');
+module.exports = /*#__PURE__*/JSON.parse('{"rE":"1.1.572-test.7"}');
 
 /***/ })
 
@@ -171600,7 +171633,7 @@ var es_array_unshift = __webpack_require__(5041);
 // EXTERNAL MODULE: ./src/form/util/util.js
 var util_util = __webpack_require__(4063);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1010 modules
-var components = __webpack_require__(3277);
+var components = __webpack_require__(3332);
 // EXTERNAL MODULE: ./src/form/modules/widgetFormItem.vue + 6 modules
 var widgetFormItem = __webpack_require__(2895);
 // EXTERNAL MODULE: ./src/form/modules/WidgetIdeaSignItem.vue + 5 modules

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zscreate/form-component",
-  "version": "1.1.572-test.6",
+  "version": "1.1.572-test.7",
   "private": false,
   "description": "",
   "main": "dist/form-component.umd.js",