cloud-web-corejs 1.0.54-dev.24 → 1.0.54-dev.241

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

@@ -0,0 +1,164 @@
+<template>
+  <div id="containt">
+    <el-tabs v-model="activeName" class="tab-box">
+      <el-tab-pane :label="$t1('常规')" name="first">
+        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :copyId.sync="copyId"
+                  :parent-target="_self" @reload="$reloadHandle"></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 status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">{{ $t1('新增') }}
+                  </vxe-button>
+                  <base-table-export :option="{ title: '企业组织环境设置导出', targetRef: 'table-m1'}" :parent-target="_self"/>
+                </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>
+              </tableForm>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import editView from './edit.vue';
+import tableForm from "@base/components/table/tableForm.vue";
+
+export default {
+  name: 'bd_company_env:list',
+  components: {tableForm, editView},
+  data() {
+    return {
+      activeName: 'second',
+      dataId: 0,
+      showEdit: false,
+      vxeOption: {},
+      formData: {},
+    };
+  },
+  mounted() {
+    this.initTableList();
+  },
+  methods: {
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.advancedFormData = {};
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    openEditDialog(id) {
+      this.copyId = 0;
+      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
+    },
+    initTableList() {
+      let that = this;
+      let pushTypeMap = {0: '异步推送', 1: '同步调用'};
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'bd_company_env_list-m1',
+        path: USER_PREFIX + '/bd_company_env/listPage',
+        param: () => {
+          return {
+            ...this.formData
+          }
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: '服务',
+            field: 'bdService',
+            width: 150,
+            fixed: 'left'
+          },
+          {
+            title: '组织编码',
+            field: 'bdCompanyCode',
+            width: 150,
+            fixed: 'left'
+          },
+          {
+            field: 'createBy',
+            title: this.$t1('创建人'),
+            width: 150
+          },
+          {
+            field: 'createDate',
+            title: this.$t1('创建时间'),
+            width: 150
+          },
+          {
+            field: 'modifyBy',
+            title: this.$t1('更新人'),
+            width: 150
+          },
+          {
+            field: 'modifyDate',
+            title: this.$t1('更新时间'),
+            width: 150
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <div>
+                    <a
+                      href="javascript:void(0);"
+                      class="a-link"
+                      onclick={() => {
+                        this.openEditDialog(row.id);
+                      }}
+                    >
+                      <el-tooltip enterable={false} effect="dark" content={ this.$t1('查看') } placement="top"
+                                  popper-class="tooltip-skin">
+                        <i class="el-icon-edit"/>
+                      </el-tooltip>
+                    </a>
+                  </div>
+                ];
+              }
+            }
+          }
+        ],
+        searchColumns: [
+          {
+            title: this.$t1("服务"),
+            field: "bdService",
+            type: "input",
+            common: true,
+          },
+          {
+            title: this.$t1("组织编码"),
+            field: "bdCompanyCode",
+            type: "input",
+            common: true,
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+    }
+  }
+};
+</script>

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

@@ -0,0 +1,49 @@
+<template>
+  <div id="containt">
+    <div class="flex">
+      <div class="tab-box-vertical">
+        <div class="list-scroll">
+          <div class="item" v-for="(item,index) in typeTabs" :key="item.name" :class="{on:item.name==activeName}"
+               @click="chooseTab(item)">{{ item.label }}
+          </div>
+        </div>
+      </div>
+      <div class="flex-tabboxWidth">
+        <div v-for="(item,index) in typeTabs" :key="item.name" v-show="item.name==activeName">
+          <component :is="item.name" :containtId="false" v-if="item.inited"></component>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import bd_attach_setting_list from "@base/views/bd/setting/bd_attach_setting/list.vue";
+import request_setting_list from "@base/views/user/request_setting/list.vue";
+import bd_company_env_list from "@base/views/bd/setting/bd_company_env/list.vue";
+
+export default {
+  name: "list",
+  components: {bd_attach_setting_list, request_setting_list, bd_company_env_list},
+  data() {
+    return {
+      activeName: "bd_attach_setting_list",
+      typeTabs: [
+        {label: this.$t1("导入模板"), name: "bd_attach_setting_list", inited: true},
+        {label: this.$t1("同步调用接口"), name: "request_setting_list", inited: false},
+        {label: this.$t1("企业组织环境设置"), name: "bd_company_env_list", inited: false},
+      ]
+    }
+  },
+  methods: {
+    chooseTab(item) {
+      this.activeName = item.name;
+      item.inited = true;
+    }
+  }
+}
+</script>
+
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,127 @@
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="formImportLog">
+      <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>
+        </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">
+                {{ formImportLog.treePathName }}
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('日志类型') }}
+              </th>
+              <td>
+                {{ formImportLog.logType }}
+              </td>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('日志对象') }}
+              </th>
+              <td colspan="3">
+                [{{ formImportLog.abc }}] {{ formImportLog.logObj }}
+              </td>
+            </tr>
+            <tr>
+              <th>
+                {{ $t1('导入时间') }}
+              </th>
+              <td>
+                {{ formImportLog.impDate }}
+              </td>
+              <th>
+                {{ $t1('结果') }}
+              </th>
+              <td>
+                {{ impReturnTypeMap[formImportLog.impReturnType] }}
+              </td>
+            </tr>
+            <tr>
+              <th>{{ $t1('失败描述') }}</th>
+              <td colspan="7">{{ formImportLog.impReturnMsg }}</td>
+            </tr>
+            <tr>
+              <th>{{ $t1('创建人') }}</th>
+              <td>{{ formImportLog.createBy }}</td>
+              <th>{{ $t1('创建时间') }}</th>
+              <td>{{ formImportLog.createDate }}</td>
+              <th>{{ $t1('更新人') }}</th>
+              <td>{{ formImportLog.modifyBy }}</td>
+              <th>{{ $t1('更新时间') }}</th>
+              <td>{{ formImportLog.modifyDate }}</td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'formImportLogEdit',
+  props: {
+    _dataId: [String, Number]
+  },
+  components: {},
+  data() {
+    return {
+      isEdit: false,
+      tabIndex: 'first',
+      dataId: '',
+      formImportLog: {},
+      impReturnTypeMap: {
+        success: this.$t1('成功'),
+        fail: this.$t1('失败')
+      }
+    };
+  },
+  created() {
+    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
+  },
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      if (this.dataId && !isNaN(this.dataId)) {
+        this.isEdit = true;
+        this.$commonHttp({
+          aes: true,
+          url: USER_PREFIX + `/form_import_log/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            this.formImportLog = res.objx || {};
+          }
+        });
+      }
+    }
+  }
+};
+</script>

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

@@ -0,0 +1,205 @@
+<template>
+  <div id="containt">
+    <el-tabs v-model="activeName" class="tab-box">
+      <el-tab-pane :label="$t1('常规')" name="first">
+        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self"
+                  @reload="$reloadHandle"></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>
+              <div class="clearfix screen-btns">
+                <div class="fl">
+                </div>
+                <div class="fr">
+                  <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>
+                </div>
+              </div>
+              <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
+                        @submit="searchEvent" @reset="searchEvent">
+                <vxe-form-item :title="$t1('表单分类路径')+':'" field="treePathName">
+                  <template v-slot>
+                    <el-input v-model="formData.treePathName" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('日志类型')+':'" field="logType">
+                  <template v-slot>
+                    <el-input v-model="formData.logType" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('日志对象')+':'" field="logObj">
+                  <template v-slot>
+                    <el-input v-model="formData.logObj" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('结果')+':'" field="impReturnType">
+                  <template v-slot>
+                    <el-select v-model="formData.impReturnType" size="small" clearable>
+                      <el-option value="success" label="成功"></el-option>
+                      <el-option value="fail" label="失败"></el-option>
+                    </el-select>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item title="导入时间:" field="date1">
+                  <template #default="{ data }">
+                    <el-date-picker
+                      v-model="formData.startImpDate"
+                      type="datetime"
+                      placeholder=""
+                      size="small"
+                      clearable
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      :picker-options="$baseStartPickerOptions(formData.endImpDate)"
+                    ></el-date-picker>
+                    <span>-</span>
+                    <el-date-picker
+                      v-model="formData.endImpDate"
+                      type="datetime"
+                      placeholder=""
+                      size="small"
+                      clearable
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      :picker-options="$baseEndPickerOptions(formData.startImpDate)"
+                    ></el-date-picker>
+                  </template>
+                </vxe-form-item>
+              </vxe-form>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import editView from './edit.vue';
+
+export default {
+  name: 'form_import_log:list',
+  components: {editView},
+  data() {
+    return {
+      activeName: 'second',
+      dataId: 0,
+      showEdit: false,
+      vxeOption: {},
+      formData: {}
+    };
+  },
+  mounted() {
+    this.initTableList();
+  },
+  methods: {
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    openEditDialog(id) {
+      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
+    },
+    initTableList() {
+      let that = this;
+      let impReturnTypeMap = {
+        success: this.$t1('成功'),
+        fail: this.$t1('失败')
+      }
+      let tableOption = {
+        aes: true,
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'user_form_import_log_list-m1',
+        path: USER_PREFIX + '/form_import_log/listPage',
+        param: () => {
+          return this.formData;
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: this.$t1('表单分类路径'),
+            field: 'treePathName',
+            width: 250,
+            fixed: 'left'
+          },
+          {
+            field: 'logType',
+            title: this.$t1('日志类型'),
+            width: 150
+          },
+          {
+            field: 'logObj',
+            title: this.$t1('日志对象'),
+            width: 250,
+            slots: {
+              default: ({row}) => {
+                return `[${row.abc}] ${row.logObj}`;
+              }
+            }
+          },
+          {
+            field: 'impReturnType',
+            title: this.$t1('结果'),
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                return impReturnTypeMap[row.impReturnType];
+              }
+            }
+          },
+          {
+            field: 'impReturnMsg',
+            title: this.$t1('失败描述'),
+            width: 250
+          },
+          {
+            field: 'impDate',
+            title: this.$t1('导入时间'),
+            width: 150
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <div>
+                    <a
+                      href="javascript:void(0);"
+                      class="a-link"
+                      onclick={() => {
+                        this.openEditDialog(row.id);
+                      }}
+                    >
+                      <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
+                                  popper-class="tooltip-skin">
+                        <i class="el-icon-edit"/>
+                      </el-tooltip>
+                    </a>
+                  </div>
+                ];
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+    }
+  }
+};
+</script>

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

@@ -40,6 +40,15 @@
                 </td>
               </tr>
               <tr>
+                <th>{{ $t1('是否启用') }}</th>
+                <td>
+                  <el-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
+                    <el-radio-group v-model="formScript.enabled">
+                      <el-radio :label="true">{{ $t1('启用') }}</el-radio>
+                      <el-radio :label="false">{{ $t1('禁用') }}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </td>
                 <th>{{ $t1('开启事务') }}</th>
                 <td>
                   <el-radio-group v-model="formScript.transactions">

package/src/views/bd/setting/form_script/edit1.vue

@@ -7,11 +7,21 @@
           {{ 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 && !formTemplate"
+          >
+            {{ $t1("分派") }}
+          </el-button>
           <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"
-                     v-if="isDev && menuKindAuth.editAuth===1">{{ $t1('保存') }}
+                     v-if="isDev && menuKindAuth.editAuth===1 && !readonly">{{ $t1('保存') }}
           </el-button>
         </div>
       </div>
@@ -43,7 +53,7 @@
                   {{ $t1('表单分类') }}
                 </th>
                 <td colspan="5">
-                  <el-form-item v-if="formScript.formCode=='intf'" prop="menuKindName"
+                  <el-form-item v-if="formScript.formCode=='intf' || formScript.formCode=='busgeneral'" prop="menuKindName"
                                 :rules="[{ required:true, trigger: ['blur', 'change'] }]">
                     <el-input
                       class="search-input"
@@ -55,6 +65,7 @@
                       "
                       v-el-readonly
                       clearable
+                      :disabled="otherFlag"
                     >
                       <i slot="suffix" class="el-input__icon el-icon-search" @click="showMenuKindDialog = true"></i>
                     </el-input>
@@ -66,7 +77,18 @@
               <tr>
                 <th>{{ $t1('表单模板编码') }}</th>
                 <td colspan="3">
-                  {{ formScript.formCode }}
+                  <template v-if="!dataId && !formTemplate">
+                    <el-radio-group v-model="formScript.formCode">
+                      <el-radio label="intf">intf(接口)</el-radio>
+                      <el-radio label="busgeneral">busgeneral(业务通用)</el-radio>
+                    </el-radio-group>
+                  </template>
+                  <template v-else>
+                    <span v-if="formScript.formCode=='intf'">intf(接口)</span>
+                    <span v-else-if="formScript.formCode=='busgeneral'">busgeneral(业务通用)</span>
+                    <span v-else>{{ formScript.formCode }}</span>
+                  </template>
+
                 </td>
                 <th>{{ $t1('Url路径') }}</th>
                 <td colspan="3">
@@ -74,6 +96,15 @@
                 </td>
               </tr>
               <tr>
+                <th>{{ $t1('是否启用') }}</th>
+                <td>
+                  <el-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
+                    <el-radio-group v-model="formScript.enabled">
+                      <el-radio :label="true">{{ $t1('启用') }}</el-radio>
+                      <el-radio :label="false">{{ $t1('禁用') }}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </td>
                 <th>{{ $t1('开启事务') }}</th>
                 <td>
                   <el-radio-group v-model="formScript.transactions">
@@ -174,6 +205,8 @@
     <preformDialog v-if="showPreformDialog" :visiable.sync="showPreformDialog"
                    :formScript="formScript"
                    @confirm="confirmPreformDialog"></preformDialog>
+    <otherAuthDialog v-if="showOtherAuthDialog" :visiable.sync="showOtherAuthDialog" :sid="sid"
+                     @confirm="confirmOtherAuthDialog"></otherAuthDialog>
   </div>
 </template>
 

package/src/views/bd/setting/form_script/form_list.vue

@@ -20,7 +20,7 @@
                   <projectTagDeleteButton :option="deleteProjectTagOption" v-if="isDev && menuKindAuth.editAuth===1"></projectTagDeleteButton>
                   <el-button icon="el-icon-setting" class="button-sty" @click="showScriptDialog=true" type="success"
                              v-if="isDev && menuKindAuth.editAuth===1"
-                  >{{ $t1('选择模板，初始化后台脚本') }}
+                  >{{ $t1('选择需要定制的后台脚本模板') }}
                   </el-button>
                 </template>
                 <template #buttonRight>