cloud-web-corejs 1.0.66 → 1.0.68

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

@@ -0,0 +1,254 @@
+<template>
+  <el-dialog
+    :title="'设置企业流程对象（'+formTemplate.formName+'）'"
+    :append-to-body="true"
+    :modal-append-to-body="true"
+    :close-on-click-modal="false"
+    :visible.sync="dialogVisible"
+    :modal="false"
+    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">
+      <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="true" :allCompany="true"/>
+  </el-dialog>
+</template>
+<script>
+import companyInfoDialog from "@base/views/user/company_info/dialog.vue";
+import fileObjNotifyEdit from "@base/components/fileLibrary/fileObjNotifyEdit.vue";
+
+export default {
+  components: {fileObjNotifyEdit, companyInfoDialog},
+  props: ['formTemplate'],
+  data() {
+    return {
+      dialogVisible: true,
+      formData: {
+        objTypeCode: null,
+        wfObjConfigDTOs: []
+      },
+      operateIndex: 0,
+      showCompanyInfoDialog: false,
+      vxeOption: {}
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    this.formData.objTypeCode = this.formTemplate.objTypeCode;
+    this.getListByObjTypeCode();
+    this.initTableList()
+  },
+  methods: {
+    getListByObjTypeCode(callback) {
+      let formTemplate = this.formTemplate
+      this.$http({
+        url: `/${formTemplate.serviceName}/wf_obj_config/listByObjTypeCode`,
+        method: `post`,
+        data: {
+          stringOne: formTemplate.objTypeCode
+        },
+        isLoading: true,
+        success: res => {
+          let rows = res.objx || [];
+          this.formData.wfObjConfigDTOs = rows;
+          callback && callback(rows)
+        }
+      });
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate(valid => {
+        if (valid) {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+            var url = `/${this.formTemplate.serviceName}/wf_obj_config/saveUpdates`;
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.formData,
+              isLoading: true,
+              success: res => {
+                this.$message({
+                  message: res.content,
+                  type: 'success',
+                  duration: 1000
+                });
+                this.getListByObjTypeCode(rows => {
+                  this.$emit('confirm', rows)
+                  this.closeDialog();
+                })
+              }
+            });
+          });
+        }
+      });
+    },
+    addItem() {
+      let formTemplate = this.formTemplate;
+      let row = {
+        objTypeCode: formTemplate.objTypeCode,
+        objTypeName: formTemplate.objTypeName,
+        serviceId: formTemplate.serviceName,
+        url: "form",
+        companyCode: null,
+        companyName: null
+      }
+      this.formData.wfObjConfigDTOs.push(row);
+    },
+    closeDialog() {
+      this.dialogVisible = false;
+      this.$emit("update:visiable", false);
+    },
+    openCompanyDialog() {
+      this.showCompanyInfoDialog = true;
+    },
+    confirmCompanyDialog(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        let formTemplate = this.formTemplate;
+        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.objTypeName,
+            serviceId: formTemplate.serviceName,
+            url: "form",
+            companyCode: row.companyCode,
+            companyName: row.companyName
+          }
+        })
+        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>
+
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,127 @@
+<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>

package/src/views/user/outLink/form_view.vue

@@ -64,6 +64,25 @@ export default {
 
       delete queryParam.urlmobile;
       delete queryParam.url;
+
+      if (purl.indexOf('.html') >= 0) {
+        let eUrl = purl;
+        let pstr = Object.keys(queryParam).map(key => {
+          return key + "=" + queryParam[key]
+        }).join("&")
+
+        if (pstr) {
+          if (purl.indexOf('.html?') >= 0) {
+            eUrl = eUrl + '&' + pstr
+          } else {
+            eUrl = eUrl + '?' + pstr
+          }
+        }
+
+        location.href = eUrl;
+        return
+      }
+
       delete queryParam.dataId;
       delete queryParam.showWfContent;
       delete queryParam.access_token;
@@ -74,7 +93,6 @@ export default {
       let url = purl + '.vue';
       this.queryParam = queryParam;
       this.showWfContent = true;
-      await this.initI18n();
       // this.wfContent = require('@/views' + url).default;
       let t = "@base/views";
       let urlArr = [
@@ -82,25 +100,34 @@ export default {
         '/user/form/view/list.vue',
         '/user/form/view/edit.vue'
       ]
-      if (urlArr.includes(url)) {
-        this.wfContent = require('@base/views' + url).default;
-      } else if (url.startsWith(t)) {
-        let path = url.slice(t.length);
-        this.wfContent = require('@base/views' + path).default;
-      } else {
-        this.wfContent = require('@/views' + url).default;
-      }
-
+      this.initUserInfo(() => {
+        this.initI18n();
+        if (urlArr.includes(url)) {
+          this.wfContent = require('@base/views' + url).default;
+        } else if (url.startsWith(t)) {
+          let path = url.slice(t.length);
+          this.wfContent = require('@base/views' + path).default;
+        } else {
+          this.wfContent = require('@/views' + url).default;
+        }
+      })
+    },
+    initUserInfo(callback) {
+      this.$store
+        .dispatch('user/getInfo2')
+        .then(() => {
+          callback && callback();
+        });
     },
     getI18nLang() {
       let i18nLang = this.$route.query.i18nLang || "zh";
       return i18nLang;
     },
-    initI18n() {
+    async initI18n() {
       let lang = this.getI18nLang();
       this.$i18n.locale = lang // 设置给本地的i18n插件
       localStorage.setItem("i18n-lang", lang);
-      return indexUtil.initI18nMessage("business", lang, true);
+      await indexUtil.initI18nMessage("business", lang, true);
     },
     login() {
       let token = this.$route.query.access_token;

package/src/views/user/outLink/view.vue

@@ -56,17 +56,17 @@ export default {
       delete queryParam.urlmobile;
       delete queryParam.url;
 
-      if(purl.indexOf('.html')>=0){
+      if (purl.indexOf('.html') >= 0) {
         let eUrl = purl;
-        let pstr = Object.keys(queryParam).map(key=>{
-          return key+"="+queryParam[key]
+        let pstr = Object.keys(queryParam).map(key => {
+          return key + "=" + queryParam[key]
         }).join("&")
 
-        if(pstr){
-          if(purl.indexOf('.html?')>=0){
-            eUrl = eUrl+'&'+pstr
-          }else{
-            eUrl = eUrl+'?'+pstr
+        if (pstr) {
+          if (purl.indexOf('.html?') >= 0) {
+            eUrl = eUrl + '&' + pstr
+          } else {
+            eUrl = eUrl + '?' + pstr
           }
         }
 
@@ -81,8 +81,6 @@ export default {
       delete queryParam.thirdparty_info;
       delete queryParam.i18nLang;
 
-
-
       let url = purl + '.vue';
       this.queryParam = queryParam;
       this.showWfContent = true;
@@ -93,27 +91,34 @@ export default {
         '/user/form/view/list.vue',
         '/user/form/view/edit.vue'
       ]
-      if (urlArr.includes(url)) {
-        this.wfContent = require('@base/views' + url).default;
-      } else if (url.startsWith(t)) {
-        let path = url.slice(t.length);
-        this.wfContent = require('@base/views' + path).default;
-      } else {
-        this.wfContent = require('@/views' + url).default;
-      }
-
-      this.initI18n();
-
+      this.initUserInfo(() => {
+        this.initI18n();
+        if (urlArr.includes(url)) {
+          this.wfContent = require('@base/views' + url).default;
+        } else if (url.startsWith(t)) {
+          let path = url.slice(t.length);
+          this.wfContent = require('@base/views' + path).default;
+        } else {
+          this.wfContent = require('@/views' + url).default;
+        }
+      })
+    },
+    initUserInfo(callback) {
+      this.$store
+        .dispatch('user/getInfo2')
+        .then(() => {
+          callback && callback();
+        });
     },
     getI18nLang() {
       let i18nLang = this.$route.query.i18nLang || "zh";
       return i18nLang;
     },
-    initI18n() {
+    async initI18n() {
       let lang = this.getI18nLang();
       this.$i18n.locale = lang // 设置给本地的i18n插件
       localStorage.setItem("i18n-lang", lang);
-      indexUtil.initI18nMessage("business", lang, true);
+      await indexUtil.initI18nMessage("business", lang, true);
     },
     login() {
       let token = this.$route.query.access_token;