Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-op-mini-web

src/view/mst/agreement/index.vue

@@ -26,10 +26,12 @@ export default {
   mounted() {
     console.log('this.$route.query', this.$route.query)
     this.loading = true
-    this.excuteNoParam(this.$service.agreementService, this.$service.agreementService.selectById, [this.$route.query.agId],false).then(res => {
+    this.excute(this.$service.agreementService, this.$service.agreementService.selectByCond, {agId:this.$route.query.agId}).then(res => {
       // 通过id查询
       if (res.code === 200) {
-        this.agcontent = res.data.agContent
+        if(res.data.list && res.data.list.length > 0){
+          this.agcontent = res.data.list[0]
+        }
         this.loading = false
       } else {
         this.$Message.error(res.message)

src/view/mst/com-menu/index.vue

@@ -31,6 +31,7 @@
           <DkTableColumn field="appName"></DkTableColumn>
           <DkTableColumn field="menuName"></DkTableColumn>
         </DkTable>
+
       </DkSplit>
     </div>
 
@@ -82,16 +83,23 @@
             </DkTabs>
           </div>
           <!--常用功能-->
-          <DkTable slot="right" v-show="showTable" :id="'table-' + $options.name" ref="table-select"
-                   :data="useMenuData"
-                   :width="500"
-                   :height="670"
-                   :pageFlag="false"
-                   :choose-flag="false"
-                   primaryKey="menuUuid">
-            <DkTableColumn field="menuName"></DkTableColumn>
-          </DkTable>
-
+<!--          <DkTable slot="right" v-show="showTable" :id="'table-' + $options.name" ref="table-select"-->
+<!--                   :data="useMenuData"-->
+<!--                   :width="500"-->
+<!--                   :height="670"-->
+<!--                   :pageFlag="false"-->
+<!--                   :choose-flag="false"-->
+<!--                   primaryKey="menuUuid">-->
+<!--            <DkTableColumn field="menuName"></DkTableColumn>-->
+<!--          </DkTable>-->
+          <EditTable slot="right" ref="table-select" :data="useMenuData"
+                     :columns="columns"
+                     :width="500"
+                     :height="670"
+                     :operate-flag="false"
+                     :show-setting-flag="false"
+                     :row-drop-flag="true"
+                     :freeze="false"></EditTable>
         </DkSplit>
       </div>
     </DkModal>
@@ -141,7 +149,13 @@ export default {
       appList: [],
       tabList: [],
       tableRef: 'left-table',
-      appCode: 'CP-WEB'
+      appCode: 'CP-WEB',
+      columns:[
+        {
+          field: 'menuName',
+          type:'text'
+        },
+      ],
     }
   },
   methods: {

src/view/mst/company-init/index.vue

@@ -106,7 +106,6 @@
 
 <script>
 import {indexMixin} from "@/mixins";
-import XLSX from 'xlsx';
 import {request} from "@/api/base";
 
 export default {

src/view/mst/company/index.vue

@@ -96,7 +96,7 @@
                            @ok="staffOk"/>
         </DkFormItem>
         <!--运维用户-->
-        <DkFormItem prop="userPhone" :required="true" :data-type="$config.dataType.number">
+        <DkFormItem prop="userPhone" :required="true" >
           <InputPop v-model="formData.userPhone" :telephone="true"/>
         </DkFormItem>
       </DkForm>

src/view/mst/print-layout/layout-setting.vue

@@ -48,15 +48,15 @@
                 <span class="label">图片</span>
               </div>
             </DkCol>
-            <DkCol span="12">
-              <!--    表格     -->
-              <div class="ep-draggable-item" tid="DKModule.table">
-                <div class="label">
-                  <span class="glyphicon glyphicon-th-list" aria-hidden="true"></span>
+              <DkCol span="12">
+                <!--    表格     -->
+                <div class="ep-draggable-item" tid="DKModule.table">
+                  <div class="label">
+                    <span class="glyphicon glyphicon-th-list" aria-hidden="true"></span>
+                  </div>
+                  <span class="label">表格</span>
                 </div>
-                <span class="label">表格</span>
-              </div>
-            </DkCol>
+              </DkCol>
           </DkRow>
           <div class="title">
             <Icon type="ios-apps" :size="20" class="icon"/>