cloud-web-corejs 1.0.54-dev.65 → 1.0.54-dev.651

package/src/views/user/position/list.vue

@@ -2,42 +2,77 @@
   <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>
+        <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">
+          <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">
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
-                    {{ $t1('新增') }}
+                  <vxe-button
+                    status="primary"
+                    class="button-sty"
+                    icon="el-icon-plus"
+                    @click="openEditDialog"
+                  >
+                    {{ $t1("新增") }}
                   </vxe-button>
-                  <base-table-export :option="{ title: $t1('岗位导出'), targetRef: 'table-m1'}" :parent-target="_self"/>
+                  <base-table-export
+                    :option="{ title: $t1('岗位导出'), targetRef: 'table-m1' }"
+                    :parent-target="_self"
+                  />
                 </div>
                 <div class="fr">
-                  <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>{{ $t1('重置') }}
+                  <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
+                    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="name">
+              <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="name">
                   <template v-slot>
-                    <el-input v-model="formData.name" size="small" clearable/>
+                    <el-input v-model="formData.name" size="small" clearable />
                   </template>
                 </vxe-form-item>
-                <vxe-form-item :title="$t1('岗位编码')+':'" field="code">
+                <!-- <vxe-form-item :title="$t1('岗位编码')+':'" field="code">
                   <template v-slot>
                     <el-input v-model="formData.code" size="small" clearable/>
                   </template>
-                </vxe-form-item>
+                </vxe-form-item> -->
               </vxe-form>
             </template>
           </vxe-grid>
@@ -48,18 +83,18 @@
 </template>
 
 <script>
-import editView from './edit.vue';
+import editView from "./edit.vue";
 
 export default {
-  name: 'position:list',
-  components: {editView},
+  name: "position:list",
+  components: { editView },
   data() {
     return {
-      activeName: 'second',
+      activeName: "second",
       dataId: 0,
       showEdit: false,
       vxeOption: {},
-      formData: {}
+      formData: {},
     };
   },
   mounted() {
@@ -67,85 +102,85 @@ export default {
   },
   methods: {
     searchEvent() {
-      this.$refs['table-m1'].commitProxy('reload');
+      this.$refs["table-m1"].commitProxy("reload");
     },
     resetEvent() {
       this.formData = {};
-      this.$refs['table-m1'].commitProxy('reload');
+      this.$refs["table-m1"].commitProxy("reload");
     },
     openEditDialog(id) {
-      this.dataId = !id || typeof id == 'object' ? 0 : id;
-      this.activeName = 'first';
-      this.$openEditView('showEdit');
+      this.dataId = !id || typeof id == "object" ? 0 : id;
+      this.activeName = "first";
+      this.$openEditView("showEdit");
     },
     initTableList() {
       let that = this;
       let tableOption = {
         vue: this,
-        tableRef: 'table-m1',
-        tableName: 'basic_position_list-m2',
-        path: USER_PREFIX + '/position/listCurrentPage',
+        tableRef: "table-m1",
+        tableName: "basic_position_list-mxxxxxx",
+        path: USER_PREFIX + "/position/listCurrentPage",
         param: () => {
           return this.formData;
         },
         columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
           {
-            title: this.$t1('岗位名称'),
-            field: 'name',
+            title: this.$t1("岗位名称"),
+            field: "name",
             width: 150,
-            fixed: 'left'
+            fixed: "left",
           },
-          {
+          /* {
             field: 'code',
             title: this.$t1('岗位编码'),
             width: 250
-          },
-          {title: this.$t1('所属组织'), field: 'companyName', width: 150},
+          }, */
+          { title: this.$t1("所属组织"), field: "companyName", width: 150 },
           {
-            field: 'enabled',
-            title: this.$t1('是否启用'),
+            field: "enabled",
+            title: this.$t1("是否启用"),
             width: 150,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 if (row.enabled) {
                   return [
                     <div class="txt-status">
-                      <span>{this.$t1('启用')}</span>
-                    </div>
+                      <span>{this.$t1("启用")}</span>
+                    </div>,
                   ];
                 } else {
                   return [
                     <div class="txt-status disable">
-                      <span>{this.$t1('禁用')}</span>
-                    </div>
+                      <span>{this.$t1("禁用")}</span>
+                    </div>,
                   ];
                 }
-              }
-            }
+              },
+            },
           },
           {
-            field: 'createDate',
-            title: this.$t1('创建时间'),
-            width: 150
+            field: "createDate",
+            title: this.$t1("创建时间"),
+            width: 150,
           },
           {
-            field: '_createBy',
-            title: this.$t1('创建人'),
-            width: 150
+            field: "_createBy",
+            title: this.$t1("创建人"),
+            width: 150,
           },
           {
-            field: '_modifyBy',
-            title: this.$t1('更新人'),
-            width: 150
+            field: "_modifyBy",
+            title: this.$t1("更新人"),
+            width: 150,
           },
           {
             width: 47,
-            fixed: 'right',
-            title: '',
+            fixed: "right",
+            title: "",
             sortable: false,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 return [
                   <div>
                     <a
@@ -155,19 +190,24 @@ export default {
                         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
+                        enterable={false}
+                        effect="dark"
+                        content={this.$t1("查看")}
+                        placement="top"
+                        popper-class="tooltip-skin"
+                      >
+                        <i class="el-icon-edit" />
                       </el-tooltip>
                     </a>
-                  </div>
+                  </div>,
                 ];
-              }
-            }
-          }
-        ]
+              },
+            },
+          },
+        ],
       };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         this.vxeOption = opts;
       });
     },
@@ -175,14 +215,14 @@ export default {
       let that = this;
       that.$excelImport({
         prefix: USER_PREFIX,
-        excel: USER_PREFIX + '/excelTemplate/position/position.xlsx',
+        excel: USER_PREFIX + "/excelTemplate/position/position.xlsx",
         multi: false,
-        saveUrl: USER_PREFIX + '/position/save',
+        saveUrl: USER_PREFIX + "/position/save",
         callback: () => {
           that.searchEvent();
-        }
+        },
       });
-    }
-  }
+    },
+  },
 };
 </script>

package/src/views/user/project_tag/dialog.vue

@@ -144,19 +144,24 @@ export default {
             field: 'tagRemark',
             width: 250
           },
+          {
+            field: 'createBy',
+            title: this.$t1('创建人'),
+            width: 150
+          },
           {
             field: 'createDate',
             title: this.$t1('创建时间'),
             width: 150
           },
           {
-            field: '_createBy',
-            title: this.$t1('创建人'),
+            field: 'modifyBy',
+            title: this.$t1('更新人'),
             width: 150
           },
           {
-            field: '_modifyBy',
-            title: this.$t1('更新人'),
+            field: 'modifyDate',
+            title: this.$t1('更新时间'),
             width: 150
           },
           {

package/src/views/user/project_tag/edit.vue

@@ -46,11 +46,11 @@
             </tr>
             <tr>
               <th>{{ $t1('创建人') }}</th>
-              <td>{{ projectTag._createBy }}</td>
+              <td>{{ projectTag.createBy }}</td>
               <th>{{ $t1('创建时间') }}</th>
               <td>{{ projectTag.createDate }}</td>
               <th>{{ $t1('更新人') }}</th>
-              <td>{{ projectTag._modifyBy }}</td>
+              <td>{{ projectTag.modifyBy }}</td>
               <th>{{ $t1('更新时间') }}</th>
               <td>{{ projectTag.modifyDate }}</td>
             </tr>

package/src/views/user/project_tag/list.vue

@@ -113,19 +113,24 @@ export default {
             field: 'tagRemark',
             width: 250
           },
+          {
+            field: 'createBy',
+            title: this.$t1('创建人'),
+            width: 150
+          },
           {
             field: 'createDate',
             title: this.$t1('创建时间'),
             width: 150
           },
           {
-            field: '_createBy',
-            title: this.$t1('创建人'),
+            field: 'modifyBy',
+            title: this.$t1('更新人'),
             width: 150
           },
           {
-            field: '_modifyBy',
-            title: this.$t1('更新人'),
+            field: 'modifyDate',
+            title: this.$t1('更新时间'),
             width: 150
           },
           {

package/src/views/user/request_setting/edit.vue

@@ -0,0 +1,258 @@
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="requestSetting">
+      <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="reqCode" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="requestSetting.reqCode" clearable/>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('请求名称') }}
+              </th>
+              <td colspan="5">
+                <el-form-item prop="reqName" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="requestSetting.reqName" clearable/>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('执行组织编码') }}
+              </th>
+              <td colspan="5">
+                <el-form-item prop="exeCompanyCode" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="requestSetting.exeCompanyCode" clearable/>
+                </el-form-item>
+              </td>
+              <td colspan="2"><span class="tips_1">{{ $t1('注：多个用逗号","隔开') }}</span></td>
+            </tr>
+            <tr>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('请求Url') }}
+              </th>
+              <td colspan="7">
+                <el-form-item prop="url" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input type="text" autocomplete="off" v-model="requestSetting.url" clearable/>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>
+                {{ $t1('请求头') }}
+              </th>
+              <td colspan="7">
+                <el-form-item prop="header" :rules="[{ required: false, trigger: 'blur' }]">
+                  <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
+                            v-model="requestSetting.header"
+                            clearable></el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>
+                {{ $t1('连接超时(ms)') }}
+              </th>
+              <td>
+                <el-form-item prop="connectTimeout" :rules="[{ required: false, trigger: 'blur' }]">
+                  <base-input-number v-model="requestSetting.connectTimeout" clearable/>
+                </el-form-item>
+              </td>
+              <td colspan="2"><span class="tips_1">{{ $t1('注：不填默认10000毫秒') }}</span></td>
+              <th>
+                {{ $t1('读取超时(ms)') }}
+              </th>
+              <td>
+                <el-form-item prop="readTimeout" :rules="[{ required: false, trigger: 'blur' }]">
+                  <base-input-number v-model="requestSetting.readTimeout" clearable/>
+                </el-form-item>
+              </td>
+              <td colspan="2"><span class="tips_1">{{ $t1('注：不填默认60000毫秒') }}</span></td>
+            </tr>
+            <tr>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('是否启用') }}
+              </th>
+              <td>
+                <el-form-item prop="enabled" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-radio-group v-model="requestSetting.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 colspan="7">
+                <el-form-item prop="remark" :rules="[{ required: false, trigger: 'blur' }]">
+                  <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
+                            v-model="requestSetting.remark"
+                            clearable></el-input>
+                </el-form-item>
+              </td>
+            </tr>
+            <!--            <tr>
+                          <th>
+                            {{ $t1('前置脚本') }}
+                            <scriptTestButton :script.sync="requestSetting.preScript"></scriptTestButton>
+                          </th>
+                          <td colspan="7">
+                            <el-form-item prop="preScript" :rules="[{ required: false, trigger: 'blur' }]">
+                              <code-editor mode="java" :readonly="!1" v-model="requestSetting.preScript"
+                                           v-if="showCodeEditor"></code-editor>
+                            </el-form-item>
+                          </td>
+                        </tr>-->
+            <tr>
+              <th>
+                {{ $t1('后置脚本') }}
+                <scriptTestButton :script.sync="requestSetting.postScript"></scriptTestButton>
+              </th>
+              <td colspan="7">
+                <el-form-item prop="postScript" :rules="[{ required: false, trigger: 'blur' }]">
+                  <code-editor mode="java" :readonly="!1" v-model="requestSetting.postScript"
+                               v-if="showCodeEditor"></code-editor>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>{{ $t1('创建人') }}</th>
+              <td>{{ requestSetting.createBy }}</td>
+              <th>{{ $t1('创建时间') }}</th>
+              <td>{{ requestSetting.createDate }}</td>
+              <th>{{ $t1('更新人') }}</th>
+              <td>{{ requestSetting.modifyBy }}</td>
+              <th>{{ $t1('更新时间') }}</th>
+              <td>{{ requestSetting.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: '',
+      requestSetting: {
+        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 + `/request_setting/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            this.requestSetting = 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 ? `/request_setting/update` : `/request_setting/save`);
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.requestSetting,
+              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>