cloud-web-corejs 1.0.54-dev.63 → 1.0.54-dev.630

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

@@ -0,0 +1,83 @@
+<template>
+  <div>
+    <el-dialog
+      :title="$t1('表单模板分派')"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      :close-on-click-modal="false"
+      :visible.sync="showDialog"
+      :modal="false"
+      custom-class="dialog-style list-dialog dialog-checkbox pd_0"
+      width="650px"
+      @close="dialogClose"
+      v-el-drag-dialog
+      v-el-dialog-center
+    >
+      <div class="cont">
+        <div class="grid-height" style="height: 500px">
+          <vxe-grid
+            class="is-pointer"
+            ref="table-m1"
+            :data="tableData"
+            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="openUserAddDialog">
+                    {{ $t1('新增用户') }}
+                  </vxe-button>
+                </div>
+              </div>
+            </template>
+            <template #user="{row,rowIndex}">
+              <el-input
+                class="search-input"
+                v-model="row.nickName"
+                clearable
+                @clear="
+                  row.userId = null;
+                "
+                v-if="!row._isParent"
+                v-el-readonly
+              >
+                <i slot="suffix" class="el-input__icon el-icon-search" @click="openUserRowDialog(row,rowIndex)"></i>
+              </el-input>
+              <template v-else>{{ row.nickName }}</template>
+            </template>
+            <template #switch="{row,column,rowIndex}">
+              <el-switch v-model="row[column.field]" :key="column.field+rowIndex" :active-value="1"
+                         :inactive-value="0"></el-switch>
+            </template>
+          </vxe-grid>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+			<el-button type="primary" plain class="button-sty" @click="dialogClose">
+				<i class="el-icon-close el-icon"></i>
+				{{ $t1('取 消') }}
+			</el-button>
+			<el-button type="primary" @click="saveData" class="button-sty">
+				<i class="el-icon-check el-icon"></i>
+				{{ $t1('确 定') }}
+			</el-button>
+		</span>
+    </el-dialog>
+    <userDialog v-if="showUserAddDialog" :visiable.sync="showUserAddDialog" @confirm="confirmtUserAddDialog"
+                multi="true" :param="{flag:8}"/>
+  </div>
+</template>
+
+<script>
+import mixin from "./mixins/otherAuthDialog";
+
+export default {
+  mixins: [mixin]
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="'设置企业流程对象（'+formTemplate.formName+'）'"
+    :title="'设置组织流程单据类型（'+formTemplate.formName+'）'"
     :append-to-body="true"
     :modal-append-to-body="true"
     :close-on-click-modal="false"
@@ -31,7 +31,7 @@
                                 @click="openCompanyDialog">
                       新增
                     </vxe-button>
-                    <span class="button-sty tips">{{ $t1('选择表单所在的企业，填写企业对应的流程对象数据。') }}</span>
+                    <span class="button-sty tips">{{ $t1('选择表单所在的组织，填写组织对应的流程单据类型数据。') }}</span>
                   </div>
                 </div>
               </template>
@@ -191,7 +191,7 @@ export default {
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
-            title: this.$t1('表单类型名称'),
+            title: this.$t1('单据类型名称'),
             field: 'objTypeName',
             width: 250,
             slots: {
@@ -204,7 +204,7 @@ export default {
             width: 200,
           },
           {
-            title: this.$t1('表单类型编码'),
+            title: this.$t1('单据类型编码'),
             field: 'objTypeCode',
             width: 200
           },

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

@@ -1,127 +1,161 @@
-<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" :readonly="true"></editView>
-      </el-tab-pane>
-      <el-tab-pane :label="$t1('列表')" name="second">
-        <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 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"
-                              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="menuKindName">
-                    <template v-slot>
-                      <el-input
-                        class="search-input"
-                        max="200"
-                        v-model="formData.menuKindName"
-                        @clear="
-                          formData.menuKindName = null;
-                          formData.menuKindCode = null;
-                        "
-                        v-el-readonly
-                        clearable
-                      >
-                        <i slot="suffix" class="el-input__icon el-icon-search" @click="showMenuKindDialog=true"></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>
-      </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"
-                    :readonly="true"></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>
-    <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/wf_list";
-import wfObjConfigDialog from "./wfObjConfigDialog.vue";
-import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
-import batchWfObjConfigDialog from "./batchWfObjConfigDialog.vue";
-
-export default {
-  name: 'form_template:wf_list',
-  components: {MenuKindDialog, wfObjConfigDialog,batchWfObjConfigDialog},
-  mixins: [mixin]
-}
-</script>
-<style scoped lang="scss">
-
-</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"
+          :readonly="true"
+        ></editView>
+      </el-tab-pane>
+      <el-tab-pane :label="$t1('列表')" name="second">
+        <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
+                    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"
+                    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="menuKindName">
+                    <template v-slot>
+                      <el-input
+                        class="search-input"
+                        max="200"
+                        v-model="formData.menuKindName"
+                        @clear="
+                          formData.menuKindName = null;
+                          formData.menuKindCode = null;
+                        "
+                        v-el-readonly
+                        clearable
+                      >
+                        <i
+                          slot="suffix"
+                          class="el-input__icon el-icon-search"
+                          @click="showMenuKindDialog = true"
+                        ></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>
+      </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"
+            :readonly="true"
+          ></editView>
+        </el-tab-pane>
+      </template>
+    </x-tabs>
+    <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/wf_list";
+import wfObjConfigDialog from "./wfObjConfigDialog.vue";
+import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
+import batchWfObjConfigDialog from "./batchWfObjConfigDialog.vue";
+
+export default {
+  name: "form_template:wf_list",
+  components: { MenuKindDialog, wfObjConfigDialog, batchWfObjConfigDialog },
+  mixins: [mixin],
+};
+</script>
+<style scoped lang="scss"></style>

package/src/views/bd/setting/logic_param/edit.vue

@@ -0,0 +1,146 @@
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="logicParam">
+      <div class="d-header clearfix">
+        <div class="fl">
+          <i class="el-icon-info" />
+          {{ dataId ? $t1("查看逻辑参数") : $t1("新增逻辑参数") }}
+        </div>
+        <div class="fr">
+          <el-button
+            type="primary"
+            plain
+            class="button-sty"
+            @click="$baseReload()"
+            icon="el-icon-refresh-right"
+          >
+            {{ $t1("重置") }}
+          </el-button>
+          <el-button
+            type="primary"
+            class="button-sty"
+            icon="el-icon-check"
+            @click="saveData"
+            >{{ $t1("保存") }}
+          </el-button>
+        </div>
+      </div>
+      <div class="d-cont">
+        <div class="d-item">
+          <div class="title first">
+            <b>{{ $t1("基本信息") }}</b>
+          </div>
+          <table class="table-detail">
+            <tbody>
+              <tr>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1("参数编码") }}
+                </th>
+                <td colspan="5">
+                  <el-form-item
+                    prop="paramCode"
+                    :rules="[{ required: true, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="text"
+                      autocomplete="off"
+                      v-model="logicParam.paramCode"
+                      clearable
+                    />
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1("组织编码") }}
+                </th>
+                <td colspan="5">
+                  <el-form-item
+                    prop="paramCompanyCode"
+                    :rules="[{ required: true, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="text"
+                      autocomplete="off"
+                      v-model="logicParam.paramCompanyCode"
+                      clearable
+                    />
+                  </el-form-item>
+                </td>
+                <td colspan="2">
+                  <span class="tips_1">{{ $t1('注：多个用逗号","隔开') }}</span>
+                </td>
+              </tr>
+              <tr>
+                <th>
+                  {{ $t1("参数值") }}
+                </th>
+                <td colspan="5">
+                  <el-form-item
+                    prop="paramValue"
+                    :rules="[{ required: false, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="textarea"
+                      :rows="2"
+                      :placeholder="$t1('请输入内容')"
+                      size="small"
+                      v-model="logicParam.paramValue"
+                      clearable
+                    ></el-input>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1("参数备注") }}</th>
+                <td colspan="5">
+                  <el-input
+                    type="textarea"
+                    :rows="2"
+                    :placeholder="$t1('请输入内容')"
+                    size="small"
+                    v-model="logicParam.remark"
+                    clearable
+                  ></el-input>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1("是否启用") }}</th>
+                <td>
+                  <el-form-item
+                    prop="enabled"
+                    :rules="[{ required: false, trigger: 'blur' }]"
+                  >
+                    <el-radio-group v-model="logicParam.enabled">
+                      <el-radio :label="true">{{ $t1("启用") }}</el-radio>
+                      <el-radio :label="false">{{ $t1("禁用") }}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1("创建人") }}</th>
+                <td>{{ logicParam.createBy }}</td>
+                <th>{{ $t1("创建时间") }}</th>
+                <td>{{ logicParam.createDate }}</td>
+                <th>{{ $t1("更新人") }}</th>
+                <td>{{ logicParam.modifyBy }}</td>
+                <th>{{ $t1("更新时间") }}</th>
+                <td>{{ logicParam.modifyDate }}</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import editMixin from "./mixins/edit.js";
+export default {
+  mixins: [editMixin],
+};
+</script>