cloud-web-corejs 1.0.54-dev.344 → 1.0.54-dev.346

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

@@ -4,7 +4,7 @@
       <div class="d-header clearfix">
         <div class="fl">
           <i class="el-icon-info" />
-          {{ title }}
+          {{ dataId ? $t1("查看逻辑参数") : $t1("新增逻辑参数") }}
         </div>
         <div class="fr">
           <el-button
@@ -52,19 +52,6 @@
                 </td>
               </tr>
               <tr>
-                <th>{{ $t1("参数备注") }}</th>
-                <td colspan="5">
-                  <el-input
-                    type="textarea"
-                    :rows="2"
-                    :placeholder="$t1('请输入内容')"
-                    size="small"
-                    v-model="logicParam.remark"
-                    clearable
-                  ></el-input>
-                </td>
-              </tr>
-              <tr v-if="logicParam.paramType === 0">
                 <th>
                   <em class="f-red">*</em>
                   {{ $t1("组织编码") }}
@@ -86,27 +73,11 @@
                   <span class="tips_1">{{ $t1('注：多个用逗号","隔开') }}</span>
                 </td>
               </tr>
-              <tr v-if="logicParam.paramType === 0">
-                <th>{{ $t1("是否启用") }}</th>
-                <td>
-                  <el-form-item
-                    prop="enabled"
-                    :rules="[{ required: false, trigger: 'blur' }]"
-                  >
-                    <el-radio-group v-model="logicParam.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("参数值") }}
-                  <!-- <scriptDescriptionButton path="static/readme/RequestSetting.txt"></scriptDescriptionButton>
-                  <scriptTestButton :script.sync="requestSetting.postScript"></scriptTestButton> -->
                 </th>
-                <td colspan="7">
+                <td colspan="5">
                   <el-form-item
                     prop="paramValue"
                     :rules="[{ required: false, trigger: 'blur' }]"
@@ -118,20 +89,37 @@
                       size="small"
                       v-model="logicParam.paramValue"
                       clearable
-                      v-if="logicParam.paramType !== 2"
                     ></el-input>
-                    <template v-else>
-                      <code-editor
-                        mode="json"
-                        :readonly="!1"
-                        v-model="logicParam.paramValue"
-                        v-if="showCodeEditor"
-                      ></code-editor>
-                    </template>
                   </el-form-item>
                 </td>
               </tr>
-
+              <tr>
+                <th>{{ $t1("参数备注") }}</th>
+                <td colspan="5">
+                  <el-input
+                    type="textarea"
+                    :rows="2"
+                    :placeholder="$t1('请输入内容')"
+                    size="small"
+                    v-model="logicParam.remark"
+                    clearable
+                  ></el-input>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1("是否启用") }}</th>
+                <td>
+                  <el-form-item
+                    prop="enabled"
+                    :rules="[{ required: false, trigger: 'blur' }]"
+                  >
+                    <el-radio-group v-model="logicParam.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>{{ logicParam.createBy }}</td>
@@ -151,115 +139,8 @@
 </template>
 
 <script>
+import editMixin from "./mixins/edit.js";
 export default {
-  name: "logic_paramEdit",
-  props: {
-    _dataId: [String, Number],
-    copyId: [String, Number],
-    paramType: {
-      type: Number,
-      default: 0,
-    },
-  },
-  components: {},
-  data() {
-    return {
-      isEdit: false,
-      tabIndex: "first",
-      dataId: "",
-      logicParam: {
-        enabled: true,
-        paramValue: null,
-        paramType: this.paramType,
-      },
-      showCodeEditor: false,
-      paramTypeMap: {
-        0: "逻辑参数",
-        1: "操作日志编码",
-        2: "上传文件服务",
-      },
-    };
-  },
-  computed: {
-    valueInputType() {
-      let paramType = this.logicParam.paramType;
-      let result = "text";
-      if (paramType == 2) {
-        return "json";
-      }
-    },
-    title() {
-      let paramType = this.logicParam.paramType;
-      let label = this.paramTypeMap[paramType];
-      let title = !!this.dataId ? `查看${label}` : `新增${label}`;
-      return this.$t1(title);
-    },
-  },
-  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 + `/logic_param/get`,
-          method: `post`,
-          data: {
-            id: this.dataId,
-          },
-          isLoading: true,
-          modalStrictly: true,
-          success: (res) => {
-            this.logicParam = 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 ? `/logic_param/update` : `/logic_param/save`);
-            this.$http({
-              url: url,
-              method: `post`,
-              data: this.logicParam,
-              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,
-                        },
-                      });
-                    }
-                  },
-                });
-              },
-            });
-          });
-        }
-      });
-    },
-  },
+  mixins: [editMixin],
 };
 </script>

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

@@ -0,0 +1,106 @@
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="logicParam">
+      <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="paramValue"
+                    :rules="[{ required: true, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="textarea"
+                      :rows="2"
+                      :placeholder="$t1('请输入内容')"
+                      size="small"
+                      v-model="logicParam.paramValue"
+                      clearable
+                    ></el-input>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1("参数备注") }}</th>
+                <td colspan="5">
+                  <el-input
+                    type="textarea"
+                    :rows="2"
+                    :placeholder="$t1('请输入内容')"
+                    size="small"
+                    v-model="logicParam.remark"
+                    clearable
+                  ></el-input>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1("是否启用") }}</th>
+                <td>
+                  <el-form-item
+                    prop="enabled"
+                    :rules="[{ required: false, trigger: 'blur' }]"
+                  >
+                    <el-radio-group v-model="logicParam.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>{{ logicParam.createBy }}</td>
+                <th>{{ $t1("创建时间") }}</th>
+                <td>{{ logicParam.createDate }}</td>
+                <th>{{ $t1("更新人") }}</th>
+                <td>{{ logicParam.modifyBy }}</td>
+                <th>{{ $t1("更新时间") }}</th>
+                <td>{{ logicParam.modifyDate }}</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import editMixin from "./mixins/edit.js";
+export default {
+  mixins: [editMixin],
+};
+</script>

package/src/views/bd/setting/logic_param/edit2.vue

@@ -0,0 +1,122 @@
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="logicParam">
+      <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="paramCode"
+                    :rules="[{ required: true, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="text"
+                      autocomplete="off"
+                      v-model="logicParam.paramCode"
+                      clearable
+                    />
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>
+                  {{ $t1("参数值") }}
+                </th>
+                <td colspan="7">
+                  <el-form-item
+                    prop="paramValue"
+                    :rules="[{ required: false, trigger: 'blur' }]"
+                  >
+                    <code-editor
+                      mode="json"
+                      :readonly="!1"
+                      v-model="logicParam.paramValue"
+                      v-if="showCodeEditor"
+                    ></code-editor>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1("参数备注") }}</th>
+                <td colspan="7">
+                  <el-input
+                    type="textarea"
+                    :rows="2"
+                    :placeholder="$t1('请输入内容')"
+                    size="small"
+                    v-model="logicParam.remark"
+                    clearable
+                  ></el-input>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1("是否启用") }}</th>
+                <td>
+                  <el-form-item
+                    prop="enabled"
+                    :rules="[{ required: false, trigger: 'blur' }]"
+                  >
+                    <el-radio-group v-model="logicParam.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>{{ logicParam.createBy }}</td>
+                <th>{{ $t1("创建时间") }}</th>
+                <td>{{ logicParam.createDate }}</td>
+                <th>{{ $t1("更新人") }}</th>
+                <td>{{ logicParam.modifyBy }}</td>
+                <th>{{ $t1("更新时间") }}</th>
+                <td>{{ logicParam.modifyDate }}</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import editMixin from "./mixins/edit.js";
+export default {
+  mixins: [editMixin],
+};
+</script>

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

@@ -2,15 +2,16 @@
   <div id="containt">
     <el-tabs v-model="activeName" class="tab-box">
       <el-tab-pane :label="$t1('常规')" name="first">
-        <editView
+        <component
           v-if="showEdit"
+          :is="editViewName"
           visible-key="showEdit"
           :_dataId.sync="dataId"
           :copyId.sync="copyId"
           :parent-target="_self"
           @reload="$reloadHandle"
           :paramType="paramType"
-        ></editView>
+        ></component>
       </el-tab-pane>
       <el-tab-pane :label="$t1('列表')" name="second">
         <div class="grid-height">
@@ -65,193 +66,9 @@
 </template>
 
 <script>
-import editView from "./edit.vue";
-import tableForm from "@base/components/table/tableForm.vue";
-
+import listMixin from "./mixins/list";
 export default {
   name: "logic_param:list",
-  props: {
-    paramType: {
-      type: Number,
-      default: 0,
-    },
-  },
-  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 otherColumns = [];
-      let otherSearchColumns = [];
-      if (this.paramType === 0) {
-        otherColumns = [
-          {
-            title: this.$t1("组织编码"),
-            field: "paramCompanyCode",
-            width: 150,
-          },
-          {
-            title: this.$t1("是否启用"),
-            field: "enabled",
-            width: 150,
-            slots: {
-              default: ({ row }) => {
-                if (row.enabled) {
-                  return getJsxStatus(null, this.$t1("启用"));
-                } else {
-                  return getJsxStatus("s-3", this.$t1("禁用"));
-                }
-              },
-            },
-          },
-        ];
-        otherSearchColumns = [
-          {
-            title: this.$t1("组织编码"),
-            field: "paramCompanyCode",
-            type: "input",
-            common: true,
-          },
-          {
-            title: this.$t1("是否启用"),
-            field: "enabled",
-            type: "select",
-            itemOption: [
-              {
-                label: this.$t1("启用"),
-                value: true,
-              },
-              {
-                label: this.$t1("禁用"),
-                value: false,
-              },
-            ],
-            common: true,
-          },
-        ];
-      }
-      let tableOption = {
-        vue: this,
-        tableRef: "table-m1",
-        tableName: "logic_param_list-m" + this.paramType,
-        path: USER_PREFIX + "/logic_param/listPage",
-        param: () => {
-          return {
-            ...this.formData,
-            paramType: this.paramType,
-          };
-        },
-        columns: [
-          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
-          {
-            title: this.$t1("参数编码"),
-            field: "paramCode",
-            width: 150,
-            fixed: "left",
-          },
-          {
-            title: this.$t1("参数备注"),
-            field: "remark",
-            width: 150,
-          },
-          ...otherColumns,
-          {
-            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: "paramCode",
-            type: "input",
-            common: true,
-          },
-          {
-            title: this.$t1("参数备注"),
-            field: "remark",
-            type: "input",
-            common: true,
-          },
-          ...otherSearchColumns,
-        ],
-      };
-      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
-        this.vxeOption = opts;
-      });
-    },
-  },
+  mixins: [listMixin],
 };
 </script>