cloud-web-corejs 1.0.54-dev.47 → 1.0.54-dev.49

package/src/views/bd/setting/form_template/wfObjConfigDialog.vue

@@ -1,85 +1,84 @@
 <template>
   <el-dialog
-    custom-class="dialog-style list-dialog"
-    :title="'流程单据定义（'+formTemplate.formName+'）'"
+    :title="'设置企业流程对象（'+formTemplate.formName+'）'"
+    :append-to-body="true"
+    :modal-append-to-body="true"
+    :close-on-click-modal="false"
     :visible.sync="dialogVisible"
-    :show-close="!0"
-    :append-to-body="false"
     :modal="false"
-    :close-on-click-modal="!1"
-    :close-on-press-escape="!1"
-    :destroy-on-close="!0"
-    width="1220px"
-    top="5vh"
-    v-dialog-drag
+    custom-class="dialog-style list-dialog dialog-checkbox pd_0"
+    width="1200px"
     @close="closeDialog"
+    v-el-drag-dialog
+    v-el-dialog-center
   >
     <div class="cont">
-      <el-form ref="editForm" :model="formData">
-        <el-table
-          ref="singleTable"
-          width="100%"
-          :data="formData.wfObjConfigDTOs"
-          height="500"
-          border=""
-          row-key="columnId"
-          stripe=""
-        >
-          <el-table-column type="index" width="35" fixed="left"></el-table-column>
-          <el-table-column :label="i18nt('表单类型名称')" width="250" prop="objTypeName">
-            <template slot-scope="scope">
-              <el-form-item :prop="'wfObjConfigDTOs.'+scope.$index+'.objTypeName'"
-                            :rules="[{ required: true, trigger: 'blur' }]">
-                <el-input v-model="scope.row.objTypeName" clearable></el-input>
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column :label="i18nt('组织名称')" width="150" prop="companyCode">
-            <template slot-scope="scope">
-              {{ scope.row.companyName }}
-            </template>
-          </el-table-column>
-          <el-table-column :label="i18nt('表单类型编码')" width="200" prop="objTypeCode"></el-table-column>
-          <el-table-column :label="i18nt('服务名')" width="150" prop="serviceId"></el-table-column>
-          <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
-            <template #header>
-              <span>{{ i18nt('designer.setting.actionColumn') }}</span>
-              <el-button :title="i18nt('designer.setting.addTableColumn')" size="mini" type="" circle=""
-                         icon="el-icon-plus" @click="openCompanyDialog"></el-button>
-            </template>
-            <template slot-scope="scope">
-              <el-button
-                :title="i18nt('designer.setting.deleteTableColumn')"
-                size="mini"
-                type=""
-                circle=""
-                icon="el-icon-minus"
-                @click="formData.wfObjConfigDTOs.splice(scope.$index,1)"
-              ></el-button>
-            </template>
-          </el-table-column>
-
-        </el-table>
-      </el-form>
-    </div>
-    <div class="dialog-footer" slot="footer">
-      <el-button @click="closeDialog" class="button-sty" icon="el-icon-close">
-        {{ i18nt('designer.hint.cancel') }}
-      </el-button>
-      <el-button type="primary" @click="saveData" class="button-sty" icon="el-icon-check">
-        {{ i18nt('designer.hint.confirm') }}
-      </el-button>
+      <div id="containt">
+        <el-form ref="editForm" :model="formData">
+          <div class="grid-height" style="height: 500px">
+            <vxe-grid
+              class="is-pointer"
+              ref="table-m1"
+              :data="formData.wfObjConfigDTOs"
+              v-bind="vxeOption"
+              @resizable-change="$vxeTableUtil.onColumnWitchChange"
+              @custom="$vxeTableUtil.customHandle"
+            >
+              <template #form>
+                <div class="clearfix screen-btns">
+                  <div class="fl">
+                    <vxe-button status="primary" class="button-sty" icon="el-icon-plus"
+                                @click="openCompanyDialog">
+                      新增
+                    </vxe-button>
+                    <span class="button-sty tips">{{ $t1('选择表单所在的企业，填写企业对应的流程对象数据。') }}</span>
+                  </div>
+                </div>
+              </template>
+              <template #objTypeName="{row,rowIndex}">
+                <el-form-item :prop="'wfObjConfigDTOs.'+rowIndex+'.objTypeName'"
+                              :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input v-model="row.objTypeName" clearable></el-input>
+                </el-form-item>
+              </template>
+              <template #operate="{row}">
+                <a
+                  href="javascript:void(0);"
+                  class="a-link"
+                  @click="openEditDialog(row.id)"
+                >
+                  <el-tooltip :enterable="false" effect="dark" :content="$t2('查看','common.view')" placement="top"
+                              popper-class="tooltip-skin">
+                    <i class="el-icon-edit"/>
+                  </el-tooltip>
+                </a>
+              </template>
+            </vxe-grid>
+          </div>
+        </el-form>
+      </div>
     </div>
+    <span slot="footer" class="dialog-footer">
+			<el-button type="primary" plain class="button-sty" @click="closeDialog">
+				<i class="el-icon-close el-icon"></i>
+				取 消
+			</el-button>
+			<el-button type="primary" @click="saveData" class="button-sty">
+				<i class="el-icon-check el-icon"></i>
+				确 定
+			</el-button>
+		</span>
     <companyInfoDialog v-if="showCompanyInfoDialog" :visiable.sync="showCompanyInfoDialog"
-                       @confirm="confirmCompanyDialog" multi="false"/>
+                       @confirm="confirmCompanyDialog" :multi="true" :allCompany="true"/>
   </el-dialog>
 </template>
 <script>
 import i18n from '../../../../components/xform/utils/i18n';
 import companyInfoDialog from "@base/views/user/company_info/dialog.vue";
+import fileObjNotifyEdit from "@/components/fileLibrary/fileObjNotifyEdit.vue";
 
 export default {
-  components: {companyInfoDialog},
+  components: {fileObjNotifyEdit, companyInfoDialog},
   props: ['formTemplate'],
   mixins: [i18n],
   data() {
@@ -90,7 +89,8 @@ export default {
         wfObjConfigDTOs: []
       },
       operateIndex: 0,
-      showCompanyInfoDialog: false
+      showCompanyInfoDialog: false,
+      vxeOption: {}
     }
   },
   created() {
@@ -99,6 +99,7 @@ export default {
   mounted() {
     this.formData.objTypeCode = this.formTemplate.objTypeCode;
     this.getListByObjTypeCode();
+    this.initTableList()
   },
   methods: {
     getListByObjTypeCode(callback) {
@@ -166,19 +167,85 @@ export default {
       if (rows.length) {
         let row = rows[0];
         let formTemplate = this.formTemplate;
-        if (!this.formData.wfObjConfigDTOs.find(item => item.companyCode == row.companyCode)) {
-          let newrow = {
+        let companyCodes = this.formData.wfObjConfigDTOs.map(item => item.companyCode)
+        let items = rows.filter(item => !companyCodes.includes(item.companyCode)).map(item => {
+          return {
             objTypeCode: formTemplate.objTypeCode,
-            objTypeName: formTemplate.formName,
+            objTypeName: formTemplate.objTypeName,
             serviceId: formTemplate.serviceName,
             url: "form",
             companyCode: row.companyCode,
             companyName: row.companyName
           }
-          this.formData.wfObjConfigDTOs.push(newrow);
-        }
+        })
+        this.formData.wfObjConfigDTOs.push(...items);
       }
-    }
+    },
+    initTableList() {
+      let that = this;
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'user_form_template-wfObj-list-m1',
+        config: {
+          height: "auto"
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: this.$t1('表单类型名称'),
+            field: 'objTypeName',
+            width: 250,
+            slots: {
+              default: "objTypeName"
+            }
+          },
+          {
+            title: this.$t1('组织名称'),
+            field: 'companyName',
+            width: 200,
+          },
+          {
+            title: this.$t1('表单类型编码'),
+            field: 'objTypeCode',
+            width: 200
+          },
+          {
+            title: this.$t1('服务名'),
+            field: 'serviceId',
+            width: 150
+          },
+          {
+            width: 100,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row, rowIndex, $table}) => {
+                return [
+                  <a
+                    href="javascript:void(0);"
+                    class="a-link"
+                    onClick={() => {
+                      this.formData.wfObjConfigDTOs.splice(rowIndex, 1)
+                    }}
+                  >
+                    <el-tooltip enterable={false} effect="dark" content="删除" placement="top"
+                                popper-class="tooltip-skin">
+                      <i class="el-icon-delete"/>
+                    </el-tooltip>
+                  </a>
+                ];
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+      // this.initData();
+    },
   }
 }
 </script>

package/src/views/bd/setting/form_template/{list2.vue → wf_list.vue}

@@ -17,7 +17,9 @@
             <template #form>
               <tableForm :formData.sync="formData" @searchEvent="searchEvent" @resetEvent="resetEvent">
                 <template #buttonLeft>
-
+                  <vxe-button icon="el-icon-setting" class="button-sty" @click="openBatchWfObjConfigDialog" type="text" status="primary"
+                              plain>{{ $t1('批量设置企业流程对象') }}
+                  </vxe-button>
                 </template>
                 <template #buttonRight>
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
@@ -27,20 +29,21 @@
                     {{ $t1('搜索') }}
                   </vxe-button>
                 </template>
-                <template #tag>
-                  <vxe-form-item :title="$t1('项目标签') + ':'" field="tag">
+                <template #menuKindName>
+                  <vxe-form-item :title="$t1('表单分类') + ':'" field="menuKindName">
                     <template v-slot>
                       <el-input
                         class="search-input"
                         max="200"
-                        :value="getTabNames()"
+                        v-model="formData.menuKindName"
                         @clear="
-                            checkTags = [];
-                          "
+                          formData.menuKindName = null;
+                          formData.menuKindCode = null;
+                        "
                         v-el-readonly
                         clearable
                       >
-                        <i slot="suffix" class="el-input__icon el-icon-search" @click="openProjectTagDialog3"></i>
+                        <i slot="suffix" class="el-input__icon el-icon-search" @click="showMenuKindDialog=true"></i>
                       </el-input>
                     </template>
                   </vxe-form-item>
@@ -63,7 +66,8 @@
                      :closable="true">
           <editView v-if="tab.showContent" :_dataId="tab.dataId" :currentFormType="currentFormType"
                     :parent-target="_self"
-                    @reload="reloadTabContent" @openDesignDialog="openDesingerDialogByChild" :readonly="true"></editView>
+                    @reload="reloadTabContent" @openDesignDialog="openDesingerDialogByChild"
+                    :readonly="true"></editView>
         </el-tab-pane>
       </template>
     </x-tabs>
@@ -94,44 +98,30 @@
     </el-drawer>
     <wfObjConfigDialog v-if="showWfObjConfigDialog" :visiable.sync="showWfObjConfigDialog"
                        @confirm="confirmWfObjConfigDialog" :formTemplate="formTemplate"/>
+    <MenuKindDialog v-if="showMenuKindDialog"
+                    :visiable.sync="showMenuKindDialog"
+                    @confirm="confirmInsertMenuKind"
+                    :param="{ taType: 0 }"
+                    :multi="false"
+    />
 
+    <batchWfObjConfigDialog v-if="showBatchWfObjConfigDialog" :visiable.sync="showBatchWfObjConfigDialog"
+                            :formTemplates="formTemplates" @confirm="confirmBatchWfObjConfigDialog"></batchWfObjConfigDialog>
   </div>
 </template>
 
 <script>
 import mixin from "./mixins/list2";
 import wfObjConfigDialog from "./wfObjConfigDialog.vue";
+import MenuKindDialog from "@/views/bd/setting/menu_kind/dialog.vue";
+import batchWfObjConfigDialog from "./batchWfObjConfigDialog.vue";
 
 export default {
-  name: 'bd_form_template:list2',
-  components: {wfObjConfigDialog},
+  name: 'form_template:wf_list',
+  components: {MenuKindDialog, wfObjConfigDialog,batchWfObjConfigDialog},
   mixins: [mixin]
 }
 </script>
 <style scoped lang="scss">
-::v-deep .tab-boxOnly > .el-tabs__header {
-  position: absolute;
-  right: 130px;
-  top: 0;
-}
-
-::v-deep .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
-  .detail-wrap .d-cont {
-    height: calc(100vh - 158px) !important
-  }
 
-  .grid-height {
-    height: calc(100vh - 126px) !important
-  }
-}
-
-::v-deep .designer-drawer.is-fullscreen .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
-  .detail-wrap .d-cont {
-    height: calc(100vh - 116px) !important
-  }
-
-  .grid-height {
-    height: calc(100vh - 84px) !important
-  }
-}
 </style>

package/src/views/user/company_info/dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="$t1('组织列表')"
+    :title="title || $t1('组织列表')"
     :append-to-body="true"
     :modal-append-to-body="true"
     :close-on-click-modal="falseValue"
@@ -8,6 +8,7 @@
     :modal="falseValue"
     custom-class="dialog-style list-dialog dialog-checkbox pd_0"
     width="1200px"
+    :before-close="handleBeforeClose"
     @close="dialogClose"
     v-el-drag-dialog
     v-el-dialog-center
@@ -64,7 +65,7 @@
     </div>
     <span slot="footer" class="dialog-footer">
 			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
-			<el-button type="primary" plain class="button-sty" @click="dialogClose">
+			<el-button type="primary" plain class="button-sty" @click="dialogCancel">
 				<i class="el-icon-close el-icon"></i>
 				{{ $t1('取 消') }}
 			</el-button>
@@ -81,7 +82,7 @@ import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
 
 export default {
   name: 'company_info_dialog',
-  props: ['visiable', 'multi', 'rows', 'param', 'firstEnabled'],
+  props: ['title', 'visiable', 'multi', 'rows', 'param', 'firstEnabled', 'allCompany'],
   mixins: [selectDialogMixins],
   created() {
     this.initSetting();
@@ -90,7 +91,6 @@ export default {
     this.initTableM1();
   },
   data() {
-    var that = this;
     return {
       showDialog: true,
       falseValue: false,
@@ -102,17 +102,26 @@ export default {
   methods: {
     initTableM1() {
       let that = this;
+      let path = USER_PREFIX + '/user_company_info/getCurrentList';
+      let treeNodeUrl = USER_PREFIX + '/user_company_info/getChildren';
+      if (this.allCompany) {
+        path = USER_PREFIX + '/company_info/getRoot';
+        treeNodeUrl = USER_PREFIX + '/company_info/getChildren';
+      }
       let tableOption = {
         vue: that,
         tableRef: 'table-m1',
         tableName: 'basic_ompany_info_dialog_list',
-        path: USER_PREFIX + '/user_company_info/getCurrentList',
-        treeNodeUrl: USER_PREFIX + '/user_company_info/getChildren',
+        path: path,
+        treeNodeUrl: treeNodeUrl,
         treeNodeParam: function (row) {
-          return {parentCompanyCode: row.companyCode};
+          return {enabled: true, parentCompanyCode: row.companyCode};
         },
         param: () => {
-          return this.formData;
+          return {
+            enabled: true,
+            ...this.formData
+          }
         },
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},