cloud-web-corejs 1.0.54-dev.33 → 1.0.54-dev.331

package/src/views/bd/setting/form_script/mixins/otherAuthDialog.js

@@ -0,0 +1,194 @@
+import userDialog from "@base/views/user/user/form_dialog.vue";
+import {getJsxBtn} from "@base/views/bd/setting/utils/index";
+import {getBdEnv} from "@base/api/user";
+
+let modules = {};
+modules = {
+  props: {
+    currentMenuKind: Object,
+    sid:String
+  },
+  components: {
+    userDialog
+  },
+  computed: {
+
+  },
+  async mounted() {
+    // await this.initBdEnv();
+    this.initTableList();
+  },
+  data() {
+    let that = this;
+    return {
+      showDialog: true,
+      activeName: 'second',
+      value10: '',
+      dataId: '',
+      showEdit: false,
+      formData: {},
+      vxeOption: {},
+      showUserDialog: false,
+      showPositionDialog: false,
+      showSaleOrgDialog: false,
+      operateIndex: 0,
+      showViewDialog: false,
+
+      tableData: [],
+      showUserRowDialog: false,
+      showUserAddDialog: false,
+      currentRow: null,
+      isDev: true
+
+    };
+  },
+  methods: {
+    getFieldDisabled() {
+
+    },
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    initBdEnv() {
+      return getBdEnv({
+        success: res => {
+          this.isDev = res.objx == "dev"
+        }
+      });
+    },
+    initTableList() {
+      let that = this;
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'user_form_script_auth-list-m1',
+        config: {
+          height: "auto"
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: this.$t1('用户'),
+            field: 'nickName',
+            width: 250
+          },
+          {
+            title: this.$t1('编辑'),
+            field: 'editAuth',
+            width: 150,
+            slots: {
+              default: "switch"
+            }
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row, rowIndex, $table}) => {
+                return getJsxBtn({
+                  iconName: "el-icon-delete",
+                  content: this.$t1('删除'),
+                  onclick: () => {
+                    this.tableData.splice(rowIndex, 1)
+                  }
+                });
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+      this.initData();
+    },
+    initData() {
+      let sid = this.sid;
+      this.$http({
+        // aes: true,
+        url: USER_PREFIX + '/form_script_auth/list',
+        method: `post`,
+        data: {
+          sid,
+        },
+        isLoading: true,
+        modalStrictly: true,
+        success: res1 => {
+          let rows = res1.objx || [];
+          this.tableData = rows;
+
+        }
+      });
+    },
+    dialogClose() {
+      this.$emit('update:visiable', false)
+    },
+    dialogConfirm(){
+      this.$emit('confirm')
+      this.dialogClose()
+    },
+    openUserAddDialog(row, rowIndex) {
+      this.showUserAddDialog = true;
+    },
+    confirmtUserAddDialog(rows) {
+      if (rows.length) {
+        const tableData = this.tableData;
+        const map = {};
+        tableData.filter(item => !!item.userId).forEach(function (item) {
+          map[item.userId] = 1;
+        });
+        let items = [];
+
+        rows.forEach((row, index) => {
+          let item = this.createRow();
+          item.userId = row.id;
+          item.nickName = row.nickName;
+          if (!map[item.userId]) {
+            items.push(item);
+          }
+        });
+        this.tableData.push(...items);
+      }
+    },
+    saveData() {
+      this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+        var url = USER_PREFIX + `/form_script_auth/save`;
+        this.$http({
+          // aes: true,
+          url: url,
+          method: `post`,
+          data: {
+            sid:this.sid,
+            formScriptAuthDTOs: this.tableData
+          },
+          isLoading: true,
+          success: res => {
+            this.$message({
+              message: res.content,
+              type: 'success',
+              duration: 500,
+              onClose: t => {
+                this.dialogConfirm()
+              }
+            });
+          }
+        });
+      });
+    },
+    createRow() {
+      let row = {
+        nickName: null,
+        userId: null,
+        editAuth: 1
+      }
+      return row;
+    }
+  }
+}
+export default modules

package/src/views/bd/setting/form_script/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/batchWfObjConfigDialog.vue

@@ -0,0 +1,105 @@
+<template>
+  <div>
+    <companyInfoDialog v-if="showCompanyInfoDialog" :visiable.sync="showCompanyInfoDialog"
+                       :title="$t1('批量设置组织流程单据类型')" :allCompany="true"
+                       :beforeConfirm="beforeConfirmCompanyInfoDialog"
+                       :beforeCancel="beforeCloseCompanyInfoDialog"
+                       @confirm="confirmCompanyInfoDialog"></companyInfoDialog>
+    <el-dialog
+      ref="importDialog"
+      :title="$t1('批量设置组织流程单据类型')"
+      :append-to-body="falseValue"
+      :modal-append-to-body="falseValue"
+      :close-on-click-modal="falseValue"
+      :visible.sync="showImportDialog2"
+      :modal="falseValue"
+      custom-class="dialog-style"
+      width="501px"
+      height="250px"
+      @close="dialogClose2"
+      v-el-drag-dialog
+    >
+      <div>
+        <div class="import-box">
+          <div class="i-status" style="margin-top: 14px;">
+            <div class="item">
+              <i class="el-icon-success f-green"></i>
+              {{ $t2('成功', 'components.excelImport.success') }}：
+              <span class="successNum" @click="showSuccessResult">{{ totalSuccessNum }}</span>
+            </div>
+            <div class="item">
+              <i class="el-icon-error f-red"></i>
+              {{ $t2('失败', 'components.excelImport.fail') }}：
+              <span class="failNum" @click="showErrorResult">{{ totalErrorNum }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer" center="true">
+        <div class="fl import-count">
+          <span class="f-red doneNum">{{ doneSize }}</span>
+          /
+          <span class="dataSize">{{ dataSize }}</span>
+        </div>
+        <el-button type="primary" plain class="button-sty" @click="dialogClose2">
+          <i class="el-icon-close el-icon"></i>
+          {{ $t1('取 消') }}
+        </el-button>
+        <el-button type="primary" class="button-sty" @click="dialogPrimary2">
+          <i class="el-icon-check el-icon"></i>
+          {{ $t1('确 定') }}
+        </el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :title="$t1(resultType==1?'结果(成功)':'结果(失败)')"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      :close-on-click-modal="falseValue"
+      :visible.sync="showImportResult"
+      :modal="falseValue"
+      custom-class="dialog-style list-dialog"
+      width="1200px"
+      v-el-drag-dialog
+    >
+      <div>
+        <div class="box-style">
+          <div class="cont">
+            <div class="table-div">
+              <vxe-grid
+                id="resGrid"
+                ref="resGrid"
+                height="440px"
+                v-bind="resOption"
+                @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-upload2" @click="exportToExcel()">
+                        {{ $t1('导出') }}
+                      </vxe-button>
+                    </div>
+                    <div class="fr"></div>
+                  </div>
+                </template>
+              </vxe-grid>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {mixins} from './mixins/batchWfObjConfigDialog';
+import companyInfoDialog from "@base/views/user/company_info/dialog.vue";
+
+
+export default {
+  mixins: [mixins],
+  components: {companyInfoDialog}
+};
+</script>

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

@@ -7,6 +7,16 @@
           {{ dataId ? $t1('查看表单模板') : $t1('新增表单模板') }}
         </div>
         <div class="fr">
+          <el-button
+            type="primary"
+            plain
+            class="button-sty"
+            icon="el-icon-set-up"
+            @click="openOtherAuthDialog"
+            v-if="isDev && !!dataId && menuKindAuth.editAuth === 1 && !readonly && !otherFlag"
+          >
+            {{ $t1("分派") }}
+          </el-button>
           <el-button type="success" class="button-sty" @click="openDesignDialog"
                      icon="iconfont icon-liuchengguanli-shejiqi_liucheng" v-if="!!dataId">{{ $t1('表单设计') }}
           </el-button>
@@ -14,7 +24,7 @@
             {{ $t1('重置') }}
           </el-button>
           <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData"
-                     v-if="isDev && menuKindAuth.editAuth===1">
+                     v-if="!readonly && isDev && menuKindAuth.editAuth===1">
             {{ $t1('保存') }}
           </el-button>
         </div>
@@ -78,6 +88,7 @@
                       "
                       v-el-readonly
                       clearable
+                      :disabled="otherFlag"
                     >
                       <i slot="suffix" class="el-input__icon el-icon-search" @click="showMenuKindDialog = true"></i>
                     </el-input>
@@ -111,6 +122,14 @@
                   <projectTagView v-model="formTemplate.formTemplateTagDTOs"></projectTagView>
                 </td>
               </tr>
+              <tr>
+                <th>
+                  {{ $t1('唯一标识') }}
+                </th>
+                <td colspan="7">
+                  {{ formTemplate.sid }}
+                </td>
+              </tr>
               <tr>
                 <th>{{ $t1('创建人') }}</th>
                 <td>{{ formTemplate.createBy }}</td>
@@ -171,6 +190,8 @@
     />
     <preformDialog v-if="showPreformDialog" :visiable.sync="showPreformDialog"
                    @confirm="confirmPreformDialog"></preformDialog>
+    <otherAuthDialog v-if="showOtherAuthDialog" :visiable.sync="showOtherAuthDialog" :sid="sid"
+                                                                                    @confirm="confirmOtherAuthDialog"></otherAuthDialog>
   </div>
 </template>
 

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

@@ -16,10 +16,10 @@
     <div class="cont">
       <el-form ref="editForm" :model="wfObjConfig" label-width="110px" class="adSearchForm"
                style="width: 362px;height: auto;">
-        <el-form-item :label="$t1('表单类型编码')">
+        <el-form-item :label="$t1('单据类型编码')">
           <span>{{ wfObjConfig.objTypeCode }}</span>
         </el-form-item>
-        <el-form-item :label="$t1('表单类型名称')" :rules="[{ required: true, trigger: 'blur' }]">
+        <el-form-item :label="$t1('单据类型名称')" :rules="[{ required: true, trigger: 'blur' }]">
           <el-input v-model="wfObjConfig.objTypeName" clearable class="all-width"/>
         </el-form-item>
       </el-form>

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

@@ -4,7 +4,7 @@
       <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>
+                  @openDesignDialog="openDesingerDialogByChild" :otherFlag="otherFlag"></editView>
       </el-tab-pane>
       <el-tab-pane :label="$t1('列表')" name="second">
         <div class="tree-box fl">
@@ -51,9 +51,9 @@
                                 v-if="isDev && currentFormType.exportAuth===1">{{ $t1('导出发布') }}
                     </vxe-button>
                     <projectTagAddButton :option="addProjectTagOption"
-                                         v-if="isDev && currentFormType.editAuth===1"></projectTagAddButton>
+                                         v-if="isDev && (currentFormType.editAuth===1 || otherFlag)"></projectTagAddButton>
                     <projectTagDeleteButton :option="deleteProjectTagOption"
-                                            v-if="isDev && currentFormType.editAuth===1"></projectTagDeleteButton>
+                                            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"
@@ -107,7 +107,7 @@
                      :closable="true">
           <editView v-if="tab.showContent" :_dataId="tab.dataId" :currentFormType="currentFormType"
                     :parent-target="_self"
-                    @reload="reloadTabContent" @openDesignDialog="openDesingerDialogByChild"></editView>
+                    @reload="reloadTabContent" @openDesignDialog="openDesingerDialogByChild" :otherFlag="otherFlag"></editView>
         </el-tab-pane>
       </template>
     </x-tabs>
@@ -117,7 +117,7 @@
                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>
+          <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"