cloud-web-corejs 1.0.108 → 1.0.110

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

@@ -0,0 +1,163 @@
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="bdCompanyEnv">
+      <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>
+                <el-form-item prop="bdService" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-select v-model="bdCompanyEnv.bdService">
+                    <el-option value="dev" :label="$t1('测试')"></el-option>
+                    <el-option value="uat" :label="$t1('UAT')"></el-option>
+                    <el-option value="prod" :label="$t1('正式')"></el-option>
+                  </el-select>
+                </el-form-item>
+              </td>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('组织编码') }}
+              </th>
+              <td>
+                <el-form-item prop="bdCompanyCode" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="bdCompanyEnv.bdCompanyCode" clearable/>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>{{ $t1('组织备注') }}</th>
+              <td colspan="5">
+                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
+                          v-model="bdCompanyEnv.bdCompanyRemark"
+                          clearable></el-input>
+              </td>
+            </tr>
+            <tr>
+              <th>{{ $t1('创建人') }}</th>
+              <td>{{ bdCompanyEnv.createBy }}</td>
+              <th>{{ $t1('创建时间') }}</th>
+              <td>{{ bdCompanyEnv.createDate }}</td>
+              <th>{{ $t1('更新人') }}</th>
+              <td>{{ bdCompanyEnv.modifyBy }}</td>
+              <th>{{ $t1('更新时间') }}</th>
+              <td>{{ bdCompanyEnv.modifyDate }}</td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'request_setttingEdit',
+  props: {
+    _dataId: [String, Number],
+    copyId: [String, Number]
+  },
+  components: {},
+  data() {
+    return {
+      isEdit: false,
+      tabIndex: 'first',
+      dataId: '',
+      bdCompanyEnv: {
+        enabled: true,
+        connectTimeout: 10000,
+        readTimeout: 60000,
+        preScript: null,
+        postScript: null,
+        exeCompanyCode: null
+      },
+      showCodeEditor: false
+    };
+  },
+  created() {
+    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
+  },
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      if (this.copyId) {
+        return;
+      }
+      if (this.dataId && !isNaN(this.dataId)) {
+        this.isEdit = true;
+        this.$commonHttp({
+          url: USER_PREFIX + `/bd_company_env/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            this.bdCompanyEnv = res.objx || {};
+            this.showCodeEditor = true;
+          }
+        });
+      } else {
+        this.showCodeEditor = true;
+      }
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate(valid => {
+        if (valid) {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+            var url = USER_PREFIX + (this.isEdit ? `/bd_company_env/update` : `/bd_company_env/save`);
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.bdCompanyEnv,
+              isLoading: true,
+              success: res => {
+                this.$message({
+                  message: res.content,
+                  type: 'success',
+                  duration: 500,
+                  onClose: t => {
+                    if (this.isEdit) {
+                      this.$baseReload();
+                    } else {
+                      this.$baseReload({
+                        updateParam: {
+                          _dataId: res.objx,
+                          copyId: null
+                        }
+                      });
+                    }
+                  }
+                });
+              }
+            });
+          });
+        }
+      });
+    }
+  }
+};
+
+</script>

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

@@ -0,0 +1,175 @@
+<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>
+                </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 bdServiceMap = {"dev": this.$t1("测试"), "uat": this.$t1("UAT"), "prod": this.$t1("正式")};
+      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: this.$t1('服务'),
+            field: 'bdService',
+            width: 150,
+            fixed: 'left',
+            slots: {
+              default: ({row}) => {
+                return bdServiceMap[row.bdService] || "";
+              }
+            }
+          },
+          {
+            title: this.$t1('组织编码'),
+            field: 'bdCompanyCode',
+            width: 150,
+          },
+          {
+            title: this.$t1('组织备注'),
+            field: 'bdCompanyRemark',
+            width: 150,
+          },
+          {
+            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: "select", common: true, itemOption: [
+              {label: this.$t1("测试"), value: "dev"},
+              {label: this.$t1("UAT"), value: "uat"},
+              {label: this.$t1("正式"), value: "prod"}
+            ]
+          },
+          {
+            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,51 @@
+<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/bd/setting/request_setting/list.vue";
+import bd_company_env_list from "@base/views/bd/setting/bd_company_env/list.vue";
+// import request_async_setting_list from "@base/views/bd/setting/request_async_setting/list.vue";
+
+export default {
+  name: "list",
+  components: {bd_attach_setting_list, request_setting_list, bd_company_env_list, request_async_setting_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: "request_async_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/user/wf/wf_manage/list.vue

@@ -93,6 +93,35 @@
                       </el-select>
                     </template>
                   </vxe-form-item>
+                  <vxe-form-item :title="$t1('启动人')+':'" field="starterName">
+                    <template v-slot>
+                      <el-input v-model="formData.starterName" size="small" clearable/>
+                    </template>
+                  </vxe-form-item>
+                  <!-- <vxe-form-item title="启动时间:">
+                    <template v-slot>
+                      <el-date-picker
+                        v-model="formData.startTime"
+                        type="datetime"
+                        placeholder=""
+                        size="small"
+                        clearable
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        :picker-options="$baseStartPickerOptions(formData.endTime)"
+                      ></el-date-picker>
+                      <span>-</span>
+                      <el-date-picker
+                        v-model="formData.endTime"
+                        type="datetime"
+                        placeholder=""
+                        size="small"
+                        clearable
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        default-time="23:59:59"
+                        :picker-options="$baseEndPickerOptions(formData.startTime)"
+                      ></el-date-picker>
+                    </template>
+                  </vxe-form-item> -->
                 </vxe-form>
               </template>
             </vxe-grid>