cloud-web-corejs 1.0.54-dev.50 → 1.0.54-dev.500

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

@@ -1,214 +1,326 @@
-<template>
-  <div id="containt">
-    <x-tabs ref="xTabs" v-model="activeName" class="tab-box" paneKeyName="formCode">
-      <el-tab-pane :label="$t1('常规')" name="first">
-        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :currentFormType="currentFormType"
-                  :parent-target="_self" @reload="$reloadHandle"
-                  @openDesignDialog="openDesingerDialogByChild"></editView>
-      </el-tab-pane>
-      <el-tab-pane :label="$t1('列表')" name="second">
-        <div class="tree-box fl">
-          <div class="tit"><b>{{ $t1('表单分类') }}</b></div>
-          <div class="tree-btns" style="margin-top: 10px;">
-          </div>
-          <el-tree
-            v-if="showTree"
-            :props="defaultProps"
-            :load="loadNode"
-            node-key="id"
-            ref="tree"
-            highlight-current
-            lazy
-            :expand-on-click-node="false"
-            @node-click="handleNodeClick"
-            class="tree-list"
-            icon-class="el-icon-arrow-down"
-          ></el-tree>
-        </div>
-        <label id="labBtn">
-          <div class="icon">
-            <i class="el-icon-more"></i>
-            <i class="el-icon-more"></i>
-          </div>
-        </label>
-        <div class="main-right fr" style="padding-left:6px;">
-          <div class="grid-height">
-            <vxe-grid
-              ref="table-m1"
-              v-bind="vxeOption"
-              @resizable-change="$vxeTableUtil.onColumnWitchChange"
-              @custom="$vxeTableUtil.customHandle"
-            >
-              <template #form>
-                <tableForm :formData.sync="formData" @searchEvent="searchEvent" @resetEvent="resetEvent">
-                  <template #buttonLeft>
-                    <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog()"
-                                v-if="isDev && currentFormType.editAuth===1">{{ $t1('新增') }}
-                    </vxe-button>
-                    <vxe-button status="success" class="button-sty" icon="el-icon-download" @click="jsonImport">{{ $t1('导入发布') }}
-                    </vxe-button>
-                    <vxe-button status="success" class="button-sty" icon="el-icon-upload2" @click="jsonExport"
-                                v-if="isDev && currentFormType.exportAuth===1">{{ $t1('导出发布') }}
-                    </vxe-button>
-                    <projectTagAddButton :option="addProjectTagOption"
-                                         v-if="isDev && currentFormType.editAuth===1"></projectTagAddButton>
-                    <projectTagDeleteButton :option="deleteProjectTagOption"
-                                            v-if="isDev && currentFormType.editAuth===1"></projectTagDeleteButton>
-                  </template>
-                  <template #buttonRight>
-                    <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                                plain>{{ $t1('重置') }}
-                    </vxe-button>
-                    <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
-                      {{ $t1('搜索') }}
-                    </vxe-button>
-                  </template>
-                  <template #menuKindName>
-                    <vxe-form-item :title="$t1('表单分类') + ':'" field="tag">
-                      <template v-slot>
-                        <el-input v-model="currentMenuKindName" disabled></el-input>
-                      </template>
-                    </vxe-form-item>
-                  </template>
-                  <template #tag>
-                    <vxe-form-item :title="$t1('项目标签') + ':'" field="tag">
-                      <template v-slot>
-                        <el-input
-                          class="search-input"
-                          max="200"
-                          :value="getTabNames()"
-                          @clear="
-                            checkTags = [];
-                          "
-                          v-el-readonly
-                          clearable
-                        >
-                          <i slot="suffix" class="el-input__icon el-icon-search" @click="openProjectTagDialog3"></i>
-                        </el-input>
-                      </template>
-                    </vxe-form-item>
-                  </template>
-                </tableForm>
-              </template>
-              <template #tag="{row}">
-                <projectTagView v-model="row.formTemplateTagDTOs" :readonly="true"></projectTagView>
-              </template>
-            </vxe-grid>
-            <el-drawer :title="$t1('流程模板')" :visible.sync="showItemView" :modal="false" :wrapperClosable="false"
-                       :destroy-on-close="true" size="90%" direction="btt">
-              <itemList v-if="showItemView" :formTemplate="currentRow"
-                        @openWfDesignDialog="openWfDesignDialog"></itemList>
-            </el-drawer>
-          </div>
-        </div>
-      </el-tab-pane>
-      <template #editTab="{tab,index,reloadTabContent}">
-        <el-tab-pane :key="tab.data.id" :label.sync="tab.data.formName" :name="tab.data.formCode"
-                     :closable="true">
-          <editView v-if="tab.showContent" :_dataId="tab.dataId" :currentFormType="currentFormType"
-                    :parent-target="_self"
-                    @reload="reloadTabContent" @openDesignDialog="openDesingerDialogByChild"></editView>
-        </el-tab-pane>
-      </template>
-    </x-tabs>
-    <el-drawer :title="$t1('表单设计({formName})',{formName})" :visible.sync="showDesingerDialog" :modal="false"
-               :destroy-on-close="true"
-               size="100%" direction="rtl" :before-close="closeFormDesignwinEvent" :append-to-body="false"
-               class="designer-drawer" :class="[isFullscreen ? 'is-fullscreen' : '']" @close="handleFormDesignClose">
-      <el-tabs v-model="formDesTabs" type="card" class="tab-boxOnly" :stretch="true">
-        <el-tab-pane :label="$t1('设计器')" name="first">
-          <designer ref="designer" :formCode.sync="formCode" @reflushTemplateList="reflushTemplateList"></designer>
-        </el-tab-pane>
-        <el-tab-pane :label="$t1('后端脚本')" name="second">
-          <formScriptList :formCode="formCode" :formTemplate="currentFormTemplate"
-                          v-if="showFormScriptList"></formScriptList>
-        </el-tab-pane>
-      </el-tabs>
-      <el-button class="isFullIcon" v-if="!isFullscreen" @click="handleFullscreen">
-        <el-tooltip effect="dark" :content="$t1('全屏')" placement="top">
-          <i class="iconfont icon-quanping"></i>
-        </el-tooltip>
-
-      </el-button>
-      <el-button class="isFullIcon" v-else @click="handleFullscreen">
-        <el-tooltip effect="dark" :content="$t1('缩小')" placement="top">
-          <i class="iconfont icon-suoxiao"></i>
-        </el-tooltip>
-      </el-button>
-    </el-drawer>
-
-    <el-dialog
-      :title="$t1('流程设计')"
-      :append-to-body="true"
-      :modal-append-to-body="true"
-      :close-on-click-modal="false"
-      v-if="showWfDialog"
-      :visible.sync="showWfDialog"
-      :modal="false"
-      custom-class="dialog-style designer-dialog"
-      width="100%"
-      height="100%"
-      top="0px"
-      bottom="0px"
-      :before-close="closeDesignwinEvent"
-      :destroy-on-close="true"
-      v-el-drag-dialog
-    >
-      <iframe :src="wfUrl" :style="'width:100%;height:' + ($root.$el.clientHeight - 30 - 12) + 'px'"></iframe>
-    </el-dialog>
-
-    <userDialog v-if="showUserDialog" :visiable.sync="showUserDialog" @confirm="confirmUser"
-                :multi.sync="wfAssignMulti"/>
-    <positionDialog v-if="showPositionDialog" :visiable.sync="showPositionDialog" @confirm="confirmPosition"/>
-    <scriptDescriptionDialog path="static/readme/Wf.txt" v-if="showScriptDescriptionDialog"
-                             :visiable.sync="showScriptDescriptionDialog"></scriptDescriptionDialog>
-
-    <formTypeEditDialog v-if="showFormTypeDialog" :visiable.sync="showFormTypeDialog" :_dataId.sync="editFormTypeId"
-                        @confirm="confirmFormTypeEditDialog"></formTypeEditDialog>
-
-    <ftHistoryDialog v-if="showFtHistoryDialog" :visiable.sync="showFtHistoryDialog"
-                     :formCode.sync="operateFtHistory.formCode" @confirm="confirmFtHistoryDialog" :multi="false"/>
-    <projectTagDialog v-if="showProjectTagDialog3"
-                      :visiable.sync="showProjectTagDialog3"
-                      @confirm="confirmProjectTagDialog3"
-                      :rows="checkTags"
-                      :multi="true"></projectTagDialog>
-
-  </div>
-</template>
-
-<script>
-import mixin from "./mixins/list";
-
-export default {
-  name: 'bd_form_template:list',
-  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>
+<template>
+  <div id="containt">
+    <x-tabs ref="xTabs" v-model="activeName" class="tab-box" paneKeyName="formCode">
+      <el-tab-pane :label="$t1('常规')" name="first">
+        <editView
+          v-if="showEdit"
+          visible-key="showEdit"
+          :_dataId.sync="dataId"
+          :currentFormType="currentFormType"
+          :parent-target="_self"
+          @reload="$reloadHandle"
+          @openDesignDialog="openDesingerDialogByChild"
+          :otherFlag="otherFlag"
+        ></editView>
+      </el-tab-pane>
+      <el-tab-pane :label="$t1('列表')" name="second">
+        <div class="tree-box fl">
+          <div class="tit">
+            <b>{{ $t1("表单分类") }}</b>
+          </div>
+          <div class="tree-btns" style="margin-top: 10px"></div>
+          <el-tree
+            v-if="showTree"
+            :props="defaultProps"
+            :load="loadNode"
+            node-key="id"
+            ref="tree"
+            highlight-current
+            lazy
+            :expand-on-click-node="false"
+            @node-click="handleNodeClick"
+            class="tree-list"
+            icon-class="el-icon-arrow-down"
+          ></el-tree>
+        </div>
+        <label id="labBtn">
+          <div class="icon">
+            <i class="el-icon-more"></i>
+            <i class="el-icon-more"></i>
+          </div>
+        </label>
+        <div class="main-right fr" style="padding-left: 6px">
+          <div class="grid-height">
+            <vxe-grid
+              ref="table-m1"
+              v-bind="vxeOption"
+              @resizable-change="$vxeTableUtil.onColumnWitchChange"
+              @custom="$vxeTableUtil.customHandle"
+            >
+              <template #form>
+                <tableForm
+                  :formData.sync="formData"
+                  @searchEvent="searchEvent"
+                  @resetEvent="resetEvent"
+                >
+                  <template #buttonLeft>
+                    <vxe-button
+                      status="primary"
+                      class="button-sty"
+                      icon="el-icon-plus"
+                      @click="openEditDialog()"
+                      v-if="isDev && currentFormType.addAuth === 1"
+                      >{{ $t1("新增") }}
+                    </vxe-button>
+                    <vxe-button
+                      status="success"
+                      class="button-sty"
+                      icon="el-icon-download"
+                      @click="jsonImport"
+                      >{{ $t1("导入发布") }}
+                    </vxe-button>
+                    <vxe-button
+                      status="success"
+                      class="button-sty"
+                      icon="el-icon-upload2"
+                      @click="jsonExport"
+                      v-if="isDev && currentFormType.exportAuth === 1"
+                      >{{ $t1("导出发布") }}
+                    </vxe-button>
+                    <projectTagAddButton
+                      :option="addProjectTagOption"
+                      v-if="isDev && (currentFormType.editAuth === 1 || otherFlag)"
+                    ></projectTagAddButton>
+                    <projectTagDeleteButton
+                      :option="deleteProjectTagOption"
+                      v-if="isDev && (currentFormType.editAuth === 1 || otherFlag)"
+                    ></projectTagDeleteButton>
+                  </template>
+                  <template #buttonRight>
+                    <vxe-button
+                      icon="el-icon-brush"
+                      class="button-sty"
+                      @click="resetEvent"
+                      type="text"
+                      status="primary"
+                      plain
+                      >{{ $t1("重置") }}
+                    </vxe-button>
+                    <vxe-button
+                      status="warning"
+                      icon="el-icon-search"
+                      class="button-sty"
+                      @click="searchEvent"
+                    >
+                      {{ $t1("搜索") }}
+                    </vxe-button>
+                  </template>
+                  <template #menuKindName>
+                    <vxe-form-item :title="$t1('表单分类') + ':'" field="tag">
+                      <template v-slot>
+                        <el-input v-model="currentMenuKindName" disabled></el-input>
+                      </template>
+                    </vxe-form-item>
+                  </template>
+                  <template #tag>
+                    <vxe-form-item :title="$t1('项目标签') + ':'" field="tag">
+                      <template v-slot>
+                        <el-input
+                          class="search-input"
+                          max="200"
+                          :value="getTabNames()"
+                          @clear="checkTags = []"
+                          v-el-readonly
+                          clearable
+                        >
+                          <i
+                            slot="suffix"
+                            class="el-input__icon el-icon-search"
+                            @click="openProjectTagDialog3"
+                          ></i>
+                        </el-input>
+                      </template>
+                    </vxe-form-item>
+                  </template>
+                </tableForm>
+              </template>
+              <template #tag="{ row }">
+                <projectTagView
+                  v-model="row.formTemplateTagDTOs"
+                  :readonly="true"
+                ></projectTagView>
+              </template>
+            </vxe-grid>
+            <el-drawer
+              :title="$t1('流程模板')"
+              :visible.sync="showItemView"
+              :modal="false"
+              :wrapperClosable="false"
+              :destroy-on-close="true"
+              size="90%"
+              direction="btt"
+            >
+              <itemList
+                v-if="showItemView"
+                :formTemplate="currentRow"
+                @openWfDesignDialog="openWfDesignDialog"
+              ></itemList>
+            </el-drawer>
+          </div>
+        </div>
+      </el-tab-pane>
+      <template #editTab="{ tab, index, reloadTabContent }">
+        <el-tab-pane
+          :key="tab.data.id"
+          :label.sync="tab.data.formName"
+          :name="tab.data.formCode"
+          :closable="true"
+        >
+          <editView
+            v-if="tab.showContent"
+            :_dataId="tab.dataId"
+            :currentFormType="currentFormType"
+            :parent-target="_self"
+            @reload="reloadTabContent"
+            @openDesignDialog="openDesingerDialogByChild"
+            :otherFlag="otherFlag"
+          ></editView>
+        </el-tab-pane>
+      </template>
+    </x-tabs>
+    <el-drawer
+      :title="$t1('表单设计({formName})', { formName })"
+      :visible.sync="showDesingerDialog"
+      :modal="false"
+      :destroy-on-close="true"
+      size="100%"
+      direction="rtl"
+      :before-close="closeFormDesignwinEvent"
+      :append-to-body="false"
+      class="designer-drawer"
+      :class="[isFullscreen ? 'is-fullscreen' : '']"
+      @close="handleFormDesignClose"
+    >
+      <el-tabs v-model="formDesTabs" type="card" class="tab-boxOnly" :stretch="true">
+        <el-tab-pane :label="$t1('设计器')" name="first">
+          <designer
+            ref="designer"
+            :formCode.sync="formCode"
+            @reflushTemplateList="reflushTemplateList"
+            :readonly="designerReadonly"
+          ></designer>
+        </el-tab-pane>
+        <el-tab-pane :label="$t1('后端脚本')" name="second">
+          <formScriptList
+            :formCode="formCode"
+            :formTemplate="currentFormTemplate"
+            v-if="showFormScriptList"
+          ></formScriptList>
+        </el-tab-pane>
+      </el-tabs>
+      <el-button class="isFullIcon" v-if="!isFullscreen" @click="handleFullscreen">
+        <el-tooltip effect="dark" :content="$t1('全屏')" placement="top">
+          <i class="iconfont icon-quanping"></i>
+        </el-tooltip>
+      </el-button>
+      <el-button class="isFullIcon" v-else @click="handleFullscreen">
+        <el-tooltip effect="dark" :content="$t1('缩小')" placement="top">
+          <i class="iconfont icon-suoxiao"></i>
+        </el-tooltip>
+      </el-button>
+    </el-drawer>
+
+    <el-dialog
+      :title="$t1('流程设计')"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      :close-on-click-modal="false"
+      v-if="showWfDialog"
+      :visible.sync="showWfDialog"
+      :modal="false"
+      custom-class="dialog-style designer-dialog"
+      width="100%"
+      height="100%"
+      top="0px"
+      bottom="0px"
+      :before-close="closeDesignwinEvent"
+      :destroy-on-close="true"
+      v-el-drag-dialog
+    >
+      <iframe
+        :src="wfUrl"
+        :style="'width:100%;height:' + ($root.$el.clientHeight - 30 - 12) + 'px'"
+      ></iframe>
+    </el-dialog>
+
+    <userDialog
+      v-if="showUserDialog"
+      :visiable.sync="showUserDialog"
+      @confirm="confirmUser"
+      :multi.sync="wfAssignMulti"
+    />
+    <positionDialog
+      v-if="showPositionDialog"
+      :visiable.sync="showPositionDialog"
+      @confirm="confirmPosition"
+    />
+    <scriptDescriptionDialog
+      path="static/readme/Wf.txt"
+      v-if="showScriptDescriptionDialog"
+      :visiable.sync="showScriptDescriptionDialog"
+    ></scriptDescriptionDialog>
+
+    <formTypeEditDialog
+      v-if="showFormTypeDialog"
+      :visiable.sync="showFormTypeDialog"
+      :_dataId.sync="editFormTypeId"
+      @confirm="confirmFormTypeEditDialog"
+    ></formTypeEditDialog>
+
+    <ftHistoryDialog
+      v-if="showFtHistoryDialog"
+      :visiable.sync="showFtHistoryDialog"
+      :formCode.sync="operateFtHistory.formCode"
+      @confirm="confirmFtHistoryDialog"
+      :multi="false"
+    />
+    <projectTagDialog
+      v-if="showProjectTagDialog3"
+      :visiable.sync="showProjectTagDialog3"
+      @confirm="confirmProjectTagDialog3"
+      :rows="checkTags"
+      :multi="true"
+    ></projectTagDialog>
+  </div>
+</template>
+
+<script>
+import mixin from "./mixins/list";
+
+export default {
+  name: "bd_form_template:list",
+  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/bd/setting/form_template/mixins/batchWfObjConfigDialog.js

@@ -1,4 +1,5 @@
 /**version-1.0*/
+import { getErrorMsg } from '@base/utils/index.js'
 let tmixins = {};
 tmixins = {
   props: ['formTemplates'],
@@ -38,16 +39,16 @@ tmixins = {
       let tableRef = 'resGrid';
       let resultColumns = [
         {
-          title: this.$t1('模板名称'),
+          title: this.$t1('表单模板名称'),
           field: 'formName',
           width: 250
         },
         {
-          title: this.$t1('模板编码'),
+          title: this.$t1('表单模板编码'),
           field: 'formCode',
           width: 250
         },
-        {field: 'objTypeName', title: this.$t1('默认流程对象名'), width: 150},
+        {field: 'objTypeName', title: this.$t1('默认流程单据类型名称'), width: 200},
         {field: '_companyNames', title: this.$t1('本次设置的组织名称'), width: 250},
         {field: 'menuKindName', title: this.$t1('表单分类'), width: 200},
         {field: 'serviceName', title: this.$t1('服务名'), width: 150},
@@ -145,7 +146,7 @@ tmixins = {
       this.dialogClose1();
     },
     handleRes(val) {
-      var content = val;
+      /* var content = val;
       var text = content;
       if (content && content.indexOf("Exception") >= 0) {
         var index0 = content.lastIndexOf("*]");
@@ -158,11 +159,11 @@ tmixins = {
             }
           }
         }
-      }
+      } */
+      let text = getErrorMsg(val)
       return text;
     },
     beforeCloseCompanyInfoDialog() {
-      debugger
       this.dialogClose1()
     },
     beforeConfirmCompanyInfoDialog(rows) {
@@ -176,7 +177,7 @@ tmixins = {
     },
     confirmCompanyInfoDialog(rows) {
       let that = this;
-      let companyNames = rows.map(row=>row.companyName).join(',')
+      let companyNames = rows.map(row => row.companyName).join(',')
       let tableDatas = this.formTemplates.map(formTemplate => {
         let wfObjConfigDTOs = rows.map(row => {
           return {
@@ -191,11 +192,11 @@ tmixins = {
         let formData = {
           objTypeCode: formTemplate.objTypeCode,
           wfObjConfigDTOs: wfObjConfigDTOs,
-          save0nly: true
+          saveOnly: true
         }
         return {
           ...formTemplate,
-          _companyNames:companyNames,
+          _companyNames: companyNames,
           resultMessage: null,
           resultType: null,
           formData: formData
@@ -254,7 +255,7 @@ tmixins = {
             }
           });
         } else {
-          item.resultMessage = that.$t1('默认流程对象名不能为空');
+          item.resultMessage = that.$t1('默认流程单据类型名称不能为空');
           item.resultType = "error";
           failNum++
           that.totalErrorNum = failNum;