cloud-web-corejs 1.0.54-dev.34 → 1.0.54-dev.340

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;

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

@@ -14,60 +14,61 @@
           </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="name" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="position.name" clearable/>
-                </el-form-item>
-              </td>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('岗位编码') }}
-              </th>
-              <td>
-                <template v-if="dataId">
-                  {{ position.code }}
-                </template>
-                <el-form-item v-else prop="code" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="position.code" clearable/>
-                </el-form-item>
-              </td>
-              <th>{{ $t1('设置') }}</th>
-              <td>
-                <el-checkbox :label="$t1('是否启用')" v-model="position.enabled"></el-checkbox>
-              </td>
-            </tr>
-            <tr>
-              <th>{{ $t1('备注') }}</th>
-              <td colspan="5">
-                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
-                          v-model="position.memo"
-                          clearable></el-input>
-              </td>
-            </tr>
-            <tr>
-              <th>{{ $t1('创建人') }}</th>
-              <td>{{ position._createBy }}</td>
-              <th>{{ $t1('创建时间') }}</th>
-              <td>{{ position.createDate }}</td>
-              <th>{{ $t1('更新人') }}</th>
-              <td>{{ position._modifyBy }}</td>
-              <th>{{ $t1('更新时间') }}</th>
-              <td>{{ position.modifyDate }}</td>
-            </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
+      <baseTabs>
+        <baseTabPane :label="$t1('基本信息')">
+          <template #default>
+            <table class="table-detail">
+              <tbody>
+              <tr>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1('岗位名称') }}
+                </th>
+                <td>
+                  <el-form-item prop="name" :rules="[{ required: true, trigger: 'blur' }]">
+                    <el-input type="text" autocomplete="off" v-model="position.name" clearable/>
+                  </el-form-item>
+                </td>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1('岗位编码') }}
+                </th>
+                <td>
+                  <template v-if="dataId">
+                    {{ position.code }}
+                  </template>
+                  <el-form-item v-else prop="code" :rules="[{ required: true, trigger: 'blur' }]">
+                    <el-input type="text" autocomplete="off" v-model="position.code" clearable/>
+                  </el-form-item>
+                </td>
+                <th>{{ $t1('设置') }}</th>
+                <td>
+                  <el-checkbox :label="$t1('是否启用')" v-model="position.enabled"></el-checkbox>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1('备注') }}</th>
+                <td colspan="5">
+                  <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
+                            v-model="position.memo"
+                            clearable></el-input>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1('创建人') }}</th>
+                <td>{{ position._createBy }}</td>
+                <th>{{ $t1('创建时间') }}</th>
+                <td>{{ position.createDate }}</td>
+                <th>{{ $t1('更新人') }}</th>
+                <td>{{ position._modifyBy }}</td>
+                <th>{{ $t1('更新时间') }}</th>
+                <td>{{ position.modifyDate }}</td>
+              </tr>
+              </tbody>
+            </table>
+          </template>
+        </baseTabPane>
+      </baseTabs>
     </el-form>
   </div>
 </template>

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

@@ -33,11 +33,11 @@
                     <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>
@@ -96,11 +96,11 @@ export default {
             width: 150,
             fixed: 'left'
           },
-          {
+          /* {
             field: 'code',
             title: this.$t1('岗位编码'),
             width: 250
-          },
+          }, */
           {title: this.$t1('所属组织'), field: 'companyName', width: 150},
           {
             field: 'enabled',

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/push_setting/list.vue

@@ -32,7 +32,7 @@
                     <el-input v-model="formData.dataType" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="推送企业编码:" field="pushCompanyCode">
+                <vxe-form-item title="推送组织编码:" field="pushCompanyCode">
                   <template v-slot>
                     <el-input v-model="formData.pushCompanyCode" size="small" clearable/>
                   </template>
@@ -142,7 +142,7 @@ export default {
             fixed: 'left'
           },
           {
-            title: '推送企业编码',
+            title: '推送组织编码',
             field: 'pushCompanyCode',
             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>