优化一些bug

wuxw
1 parent 1f1e38a5
Showing 5 changed files with 33 additions and 10 deletions
.gitignore
src/components/contract/addTemplateView.vue
src/views/account/accountManageList.vue
src/views/fee/printPayFeeXiangyun.vue
vue.config.js
@@ -10,4 +10,6 @@ yarn-error.log*
 *.ntvs*
 *.njsproj
 *.sln
-*.sw*
 \ No newline at end of file
+*.sw*
+.txcode
+access.log
 \ No newline at end of file
@@ -10,8 +10,7 @@
     <el-form label-width="120px">
       <el-form-item :label="$t('contractTypeManage.template.content')">
         <div class="editor-container">
-          <el-input type="textarea" :rows="15" v-model="context"
-            :placeholder="$t('contractTypeManage.template.placeholder')" />
+          <rich-text-editor ref="richTextEditor" v-model="context" />
         </div>
       </el-form-item>
     </el-form>
@@ -28,9 +27,13 @@
 <script>
 import { saveContractTypeTemplate, updateContractTypeTemplate, queryContractTypeTemplate, printContractTemplate } from '@/api/contract/contractTypeManageApi'
+import RichTextEditor from '@/components/editor/RichTextEditor'
 export default {
   name: 'AddTemplateView',
+  components: {
+    RichTextEditor
+  },
   data() {
     return {
       visible: false,
@@ -69,7 +72,9 @@ export default {
       }
     },
     insertAttrs(attr) {
-      this.context += attr
+      if (this.$refs.richTextEditor && this.$refs.richTextEditor.editor) {
+        this.$refs.richTextEditor.editor.txt.append(attr)
+      }
     },
     async saveTemplateInfo() {
       if (!this.addTemplateValidate()) {
@@ -121,9 +126,15 @@ export default {
         if (data.length > 0) {
           this.templateId = data[0].templateId
           this.context = data[0].context
+          if (this.$refs.richTextEditor) {
+            this.$refs.richTextEditor.setContent(this.context)
+          }
         } else {
           this.templateId = ''
           this.context = ''
+          if (this.$refs.richTextEditor) {
+            this.$refs.richTextEditor.clear()
+          }
         }
       } catch (error) {
         console.error('加载模板失败:', error)
@@ -133,6 +144,9 @@ export default {
       this.contractTypeId = ''
       this.context = ''
       this.templateId = ''
+      if (this.$refs.richTextEditor) {
+        this.$refs.richTextEditor.clear()
+      }
     }
   }
 }
@@ -20,7 +20,7 @@
           <el-row :gutter="20">
             <el-col :span="6">
-              <el-input v-model="conditions.ownerName" :placeholder="$t('accountManage.placeholderName')" clearable />
+              <el-input v-model="conditions.acctName" :placeholder="$t('accountManage.placeholderName')" clearable />
             </el-col>
             <el-col :span="6">
@@ -114,7 +114,7 @@ export default {
       accountTypes: [],
       conditions: {
         acctType: '',
-        ownerName: '',
+        acctName: '',
         idCard: '',
         link: '',
         page: 1,
@@ -9,7 +9,7 @@
             <span>{{ $t('printPayFeeXiangyun.receiptNum') }}：{{ printPayFeeInfo.receiptNum }}</span>
         </div>
         <el-row style="color:#000;font-size:20px;margin-bottom:10px;">
-            <el-col :span="12" class="text-left">
+            <el-col :span="12" class="text-right">
                 <span>{{ $t('printPayFeeXiangyun.owner') }}：{{ printPayFeeInfo.payObjName }}</span>
             </el-col>
             <el-col :span="12" style="text-align:right;">
@@ -103,7 +103,7 @@
             <el-col :span="20">
                 <el-row>
                     <el-col :span="6">{{ $t('printPayFeeXiangyun.departmentHead') }}：</el-col>
-                    <el-col :span="6">{{ $t('printPayFeeXiangyun.operator') }}：</el-col>
+                    <el-col :span="6">{{ $t('printPayFeeXiangyun.operator') }}：{{userInfo.name}}</el-col>
                     <el-col :span="6">{{ $t('printPayFeeXiangyun.financeReceipt') }}：</el-col>
                     <el-col :span="6">{{ $t('printPayFeeXiangyun.customerConfirm') }}：</el-col>
                 </el-row>
@@ -123,6 +123,8 @@
 <script>
 import { getCommunityId, getCommunityName } from '@/api/community/communityApi'
 import { queryFeeReceipt, queryFeeReceiptDetail, queryFeePrintSpec } from '@/api/fee/printPayFeeApi'
+import { getUserId, getUserName } from '@/api/user/userApi'
+
 import { dateFormat } from '@/utils/dateUtil'
 import { changeNumMoneyToChinese } from '@/utils/moneyUtil'
@@ -148,12 +150,17 @@ export default {
                 receiptNum: '',
                 merge: ''
             },
+             userInfo: {},
             printFlag: '0',
             communityId: ''
         }
     },
     created() {
         this.communityId = getCommunityId()
+        this.userInfo = {
+      userId: getUserId(),
+      name: getUserName()
+    }
         this.initData()
     },
     methods: {
@@ -4,14 +4,14 @@ module.exports = {
     open: true, // 自动打开浏览器
     proxy: {
       '/app': {
-        target: 'https://demo.homecommunity.cn/app', // 后端API地址
+        target: 'https://wuye.xywlgyl.xyz/app', // 后端API地址
         changeOrigin: true,
         pathRewrite: {
           '^/app': ''
         }
       },
       '/callComponent': {
-        target: 'https://demo.homecommunity.cn/callComponent', // 后端API地址
+        target: 'https://wuye.xywlgyl.xyz/callComponent', // 后端API地址
         changeOrigin: true,
         pathRewrite: {
           '^/callComponent': ''