cloud-web-corejs 1.0.54-dev.135 → 1.0.54-dev.137

package/src/views/support/export_template/edit.vue

@@ -76,10 +76,6 @@
                   <el-input type="text" autocomplete="off" v-model="exportTemplate.etCompanyCode" clearable/>
                 </el-form-item>
               </td>
-
-
-            </tr>
-            <tr>
               <th>
                 {{ $t1('是否启用') }}
               </th>
@@ -91,21 +87,10 @@
                   </el-radio-group>
                 </el-form-item>
               </td>
-              <th>
-                {{ $t1('通知类型') }}
-              </th>
-              <td  colspan="3">
-                <el-form-item prop="ntType;" :rules="[{ required: false, trigger: 'blur' }]">
-                  <el-radio-group v-model="exportTemplate.ntType">
-                    <el-radio :label="0">{{ $t1('系统通知') }}</el-radio>
-                    <el-radio :label="1">{{ $t1('邮件通知') }}</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </td>
             </tr>
             <tr>
               <th>{{ $t1('备注') }}</th>
-              <td colspan="5">
+              <td colspan="7">
                 <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
                           v-model="exportTemplate.remark"
                           clearable></el-input>
@@ -203,7 +188,7 @@ export default {
       isEdit: false,
       tabIndex: 'first',
       dataId: '',
-      exportTemplate: {enabled: true, etType: null,ntType:0},
+      exportTemplate: {enabled: true, etType: null},
       showCodeEditor: false,
       showHiprintDesignDialog: false,
       printTypes: [2, 3, 6, 7, 8, 9],

package/src/views/support/export_template/list.vue

@@ -136,10 +136,6 @@ export default {
         7: this.$t1('拼多多打印'),
         8: this.$t1('唯品会打印'),
         9: this.$t1('小红书打印')
-      },
-      ntTypeMap: {
-        0: this.$t1('系统通知'),
-        1: this.$t1('邮件通知')
       }
     };
   },
@@ -206,16 +202,6 @@ export default {
               },
             },
           },
-          {
-            title: this.$t1('通知类型'),
-            field: "ntType",
-            width: 250,
-            slots: {
-              default: ({row}) => {
-                return this.ntTypeMap[row.ntType] || "";
-              },
-            },
-          },
           {
             title: this.$t1('组织编码'),
             field: "etCompanyCode",

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

@@ -1,187 +1,188 @@
-<template>
-  <div class="detail-wrap">
-    <el-form ref="editForm" :model="notifyTemplate">
-      <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>
-      <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="notifyType" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="notifyTemplate.notifyType" clearable/>
-                  </el-form-item>
-                </td>
-                <th>
-                  <em class="f-red">*</em>
-                  {{ $t1('通知模板名称') }}
-                </th>
-                <td>
-                  <el-form-item prop="ntName" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="text" autocomplete="off" v-model="notifyTemplate.ntName" clearable/>
-                  </el-form-item>
-                </td>
-                <th>{{ $t1('是否启用') }}</th>
-                <td>
-                  <el-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
-                    <el-radio-group v-model="notifyTemplate.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><em class="f-red">*</em>{{ $t1('通知内容') }}</th>
-                <td colspan="5">
-                  <el-form-item prop="content" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input type="textarea" :rows="2" size="small"
-                              v-model="notifyTemplate.content"
-                              clearable></el-input>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th>{{ $t1('跳转内容') }}</th>
-                <td colspan="5">
-                  <el-form-item prop="jumpContent" :rules="[{ required: false, trigger: 'blur' }]">
-                    <el-input type="textarea" :rows="2" size="small"
-                              v-model="notifyTemplate.jumpContent"
-                              clearable></el-input>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th>{{ $t1('备注') }}</th>
-                <td colspan="5">
-                  <el-input type="textarea" :rows="2" size="small" v-model="notifyTemplate.remark"
-                            clearable></el-input>
-                </td>
-              </tr>
-              <tr>
-                <th>
-                  {{ $t1('脚本(获取通知人)') }}
-                  <!--                  <scriptDescriptionButton path="static/readme/PushSetting.txt"></scriptDescriptionButton>-->
-                  <scriptTestButton :script.sync="notifyTemplate.script"></scriptTestButton>
-                </th>
-                <td colspan="7">
-                  <el-form-item prop="script" :rules="[{ required: false, trigger: 'blur' }]">
-                    <code-editor mode="java" :readonly="!1" v-model="notifyTemplate.script"
-                                 v-if="showCodeEditor"></code-editor>
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th>{{ $t1('创建人') }}</th>
-                <td>{{ notifyTemplate.createBy }}</td>
-                <th>{{ $t1('创建时间') }}</th>
-                <td>{{ notifyTemplate.createDate }}</td>
-                <th>{{ $t1('更新人') }}</th>
-                <td>{{ notifyTemplate.modifyBy }}</td>
-                <th>{{ $t1('更新时间') }}</th>
-                <td>{{ notifyTemplate.modifyDate }}</td>
-              </tr>
-              </tbody>
-            </table>
-          </template>
-        </baseTabPane>
-      </baseTabs>
-    </el-form>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'notify_templateEdit',
-  props: {
-    _dataId: [String, Number]
-  },
-  components: {},
-  data() {
-    return {
-      isEdit: false,
-      tabIndex: 'first',
-      dataId: '',
-      notifyTemplate: {
-        enabled: true
-      },
-      showCodeEditor: false
-    };
-  },
-  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({
-          url: USER_PREFIX + `/notify_template/get`,
-          method: `post`,
-          data: {
-            id: this.dataId
-          },
-          isLoading: true,
-          modalStrictly: true,
-          success: res => {
-            this.notifyTemplate = 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 ? `/notify_template/update` : `/notify_template/save`);
-            this.$http({
-              url: url,
-              method: `post`,
-              data: this.notifyTemplate,
-              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
-                        }
-                      });
-                    }
-                  }
-                });
-              }
-            });
-          });
-        }
-      });
-    }
-  }
-};
-</script>
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="notifyTemplate">
+      <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>
+      <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="notifyType" :rules="[{ required: true, trigger: 'blur' }]">
+                    <el-input type="text" autocomplete="off" v-model="notifyTemplate.notifyType" clearable/>
+                  </el-form-item>
+                </td>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1('通知模板名称') }}
+                </th>
+                <td>
+                  <el-form-item prop="ntName" :rules="[{ required: true, trigger: 'blur' }]">
+                    <el-input type="text" autocomplete="off" v-model="notifyTemplate.ntName" clearable/>
+                  </el-form-item>
+                </td>
+                <th>{{ $t1('是否启用') }}</th>
+                <td>
+                  <el-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
+                    <el-radio-group v-model="notifyTemplate.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><em class="f-red">*</em>{{ $t1('通知内容') }}</th>
+                <td colspan="5">
+                  <el-form-item prop="content" :rules="[{ required: true, trigger: 'blur' }]">
+                    <el-input type="textarea" :rows="2" size="small"
+                              v-model="notifyTemplate.content"
+                              clearable></el-input>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1('跳转内容') }}</th>
+                <td colspan="5">
+                  <el-form-item prop="jumpContent" :rules="[{ required: false, trigger: 'blur' }]">
+                    <el-input type="textarea" :rows="2" size="small"
+                              v-model="notifyTemplate.jumpContent"
+                              clearable></el-input>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1('备注') }}</th>
+                <td colspan="5">
+                  <el-input type="textarea" :rows="2" size="small" v-model="notifyTemplate.remark"
+                            clearable></el-input>
+                </td>
+              </tr>
+              <tr>
+                <th>
+                  {{ $t1('脚本(获取通知人)') }}
+                  <!--                  <scriptDescriptionButton path="static/readme/PushSetting.txt"></scriptDescriptionButton>-->
+                  <scriptTestButton :script.sync="notifyTemplate.script"></scriptTestButton>
+                </th>
+                <td colspan="7">
+                  <el-form-item prop="script" :rules="[{ required: false, trigger: 'blur' }]">
+                    <code-editor mode="java" :readonly="!1" v-model="notifyTemplate.script"
+                                 v-if="showCodeEditor"></code-editor>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1('创建人') }}</th>
+                <td>{{ notifyTemplate.createBy }}</td>
+                <th>{{ $t1('创建时间') }}</th>
+                <td>{{ notifyTemplate.createDate }}</td>
+                <th>{{ $t1('更新人') }}</th>
+                <td>{{ notifyTemplate.modifyBy }}</td>
+                <th>{{ $t1('更新时间') }}</th>
+                <td>{{ notifyTemplate.modifyDate }}</td>
+              </tr>
+              </tbody>
+            </table>
+          </template>
+        </baseTabPane>
+      </baseTabs>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'notify_templateEdit',
+  props: {
+    _dataId: [String, Number]
+  },
+  components: {},
+  data() {
+    return {
+      isEdit: false,
+      tabIndex: 'first',
+      dataId: '',
+      notifyTemplate: {
+        enabled: true,
+        ntType:0
+      },
+      showCodeEditor: false
+    };
+  },
+  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({
+          url: USER_PREFIX + `/notify_template/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            this.notifyTemplate = 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 ? `/notify_template/update` : `/notify_template/save`);
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.notifyTemplate,
+              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
+                        }
+                      });
+                    }
+                  }
+                });
+              }
+            });
+          });
+        }
+      });
+    }
+  }
+};
+</script>

package/src/views/user/notify_template/edit2.vue

@@ -0,0 +1,176 @@
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="notifyTemplate">
+      <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>
+      <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="notifyType" :rules="[{ required: true, trigger: 'blur' }]">
+                    <el-input type="text" autocomplete="off" v-model="notifyTemplate.notifyType" clearable/>
+                  </el-form-item>
+                </td>
+                <th>
+                  <em class="f-red">*</em>
+                  {{ $t1('主题') }}
+                </th>
+                <td>
+                  <el-form-item prop="ntName" :rules="[{ required: true, trigger: 'blur' }]">
+                    <el-input type="text" autocomplete="off" v-model="notifyTemplate.ntName" clearable/>
+                  </el-form-item>
+                </td>
+                <th>{{ $t1('是否启用') }}</th>
+                <td>
+                  <el-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
+                    <el-radio-group v-model="notifyTemplate.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-input type="textarea" :rows="2" size="small" v-model="notifyTemplate.remark"
+                            clearable></el-input>
+                </td>
+              </tr>
+              <tr>
+                <th><em class="f-red">*</em>{{ $t1('内容') }}</th>
+                <td colspan="7">
+                  <el-form-item prop="content" :rules="[{ required: true, trigger: 'blur' }]">
+                              <tinymce v-model="notifyTemplate.content" :language="lan" :height="300"/>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>
+                  {{ $t1('脚本(获取通知人)') }}
+                  <scriptTestButton :script.sync="notifyTemplate.script"></scriptTestButton>
+                </th>
+                <td colspan="7">
+                  <el-form-item prop="script" :rules="[{ required: false, trigger: 'blur' }]">
+                    <code-editor mode="java" :readonly="!1" v-model="notifyTemplate.script"
+                                 v-if="showCodeEditor"></code-editor>
+                  </el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ $t1('创建人') }}</th>
+                <td>{{ notifyTemplate.createBy }}</td>
+                <th>{{ $t1('创建时间') }}</th>
+                <td>{{ notifyTemplate.createDate }}</td>
+                <th>{{ $t1('更新人') }}</th>
+                <td>{{ notifyTemplate.modifyBy }}</td>
+                <th>{{ $t1('更新时间') }}</th>
+                <td>{{ notifyTemplate.modifyDate }}</td>
+              </tr>
+              </tbody>
+            </table>
+          </template>
+        </baseTabPane>
+      </baseTabs>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import Tinymce from '@base/components/Tinymce';
+export default {
+  name: 'notify_templateEdit',
+  props: {
+    _dataId: [String, Number]
+  },
+  components: {Tinymce},
+  data() {
+    return {
+      isEdit: false,
+      tabIndex: 'first',
+      dataId: '',
+      notifyTemplate: {
+        enabled: true,
+        ntType:1
+      },
+      showCodeEditor: false
+    };
+  },
+  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({
+          url: USER_PREFIX + `/notify_template/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            this.notifyTemplate = 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 ? `/notify_template/update` : `/notify_template/save`);
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.notifyTemplate,
+              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
+                        }
+                      });
+                    }
+                  }
+                });
+              }
+            });
+          });
+        }
+      });
+    }
+  }
+};
+</script>

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

@@ -95,7 +95,10 @@ export default {
         tableName: 'basic_notifyTemplate_list-m1',
         path: USER_PREFIX + '/notify_template/listPage',
         param: () => {
-          return this.formData;
+          return {
+            ...this.formData,
+            ntType: 0
+          };
         },
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},