费用多语言,看板设计行列模块,文本显示模块加入边框控制

languages/en.js

@@ -524,6 +524,7 @@ module.exports = {
     fee: 'Expense',
     feeName: 'Expense name',
     feeValue: 'Specific expenses',
+    feePrice: 'Unit-price',
     feeNumber: 'Expense batch',
     feeTime: 'Time of expense',
     feeGroupName: 'Group Name',

languages/es.js

@@ -524,6 +524,7 @@ module.exports = {
     fee: 'Gastos',
     feeName: 'Nombre de la tarifa',
     feeValue: 'Gastos específicos',
+    feePrice: 'Precio unitario',
     feeNumber: 'Lote de gastos',
     feeTime: 'Tiempo incurrido en los gastos',
     feeGroupName: 'Nombre del Grupo',

languages/ru-RU.js

@@ -525,6 +525,7 @@ module.exports = {
     feeName: 'наименование расходов',
     feeValue: 'конкретные расходы',
     feeNumber: 'партия расходов',
+    feePrice: 'Стоимость единицы',
     feeTime: 'время возникновения расходов',
     feeGroupName: 'название группы',
     feeKeyCode: 'Кодировка',

languages/zh-CN.js

@@ -524,10 +524,11 @@ module.exports = {
     remarkName: '备注人: ',
     addRemark: '添加备注',
     fee: '费用',
-    feeName: '费用名称',
-    feeValue: '具体费用',
-    feeNumber: '费用批次',
-    feeTime: '费用产生的时间',
+    feeName: '收费项目',
+    feePrice: '单价',
+    feeValue: '小计',
+    feeNumber: '数量',
+    feeTime: '计费时间',
     feeGroupName: '费用项组名',
     feeKeyCode: '费用编码',
     feeUnit: '单位',

src/views/custom-infoboard/templates/common/cloumn-container.vue

@@ -35,10 +35,14 @@
             moduleIconClass:'icon-Columns',
             moduleConfig:{
                 moduleStyle: {
-                    // borderColor: '',
+                    borderColor: '',
                     // borderWidth:'0px',
-                    // borderRadius:'0px',
-                    // borderStyle:'solid',
+                    borderTopWidth:'0px',
+                    borderRightWidth:'0px',
+                    borderBottomWidth:'0px',
+                    borderLeftWidth:'0px',
+                    borderRadius:'0px',
+                    borderStyle:'solid',
                     // backgroundColor:''
                 },
                 styleConfig:{

src/views/custom-infoboard/templates/common/text-display.vue

@@ -2,13 +2,13 @@
 
     <drag-tool  :unique="data.unique" @delete="deleteModule" :is-edit="isEdit" @copy="copyModule" @active="activeModule">
         <div :style="moduleComputedStyle" class="flex">
-            <span class="iconfont" :class="data.moduleConfig.dataConfig.iconClass" v-if="data.moduleConfig.showIcon" :style="data.moduleConfig.iconStyle"></span>
-    <span :style="titleComputedStyle" v-if="data.moduleConfig.showTitle" class="content_item">
-      {{data.moduleConfig.dataConfig.titleText}}
-    </span>
-    <span :style="textComputedStyle" class="content_item">
+            <div class="iconfont" :class="data.moduleConfig.dataConfig.iconClass" v-if="data.moduleConfig.showIcon" :style="data.moduleConfig.iconStyle"></div>
+    <div :style="titleComputedStyle" v-if="data.moduleConfig.showTitle" class="titlewrap">
+        <div class="titleStyle"> {{data.moduleConfig.dataConfig.titleText}}</div>
+    </div>
+    <div :style="textComputedStyle" class="content_item">
       {{displayText}}
-    </span>
+    </div>
 
     </div>
     </drag-tool>
@@ -80,9 +80,12 @@
             moduleConfig:{
                 moduleStyle: {
                     borderColor: '',
-                    borderWidth:'0px',
                     borderRadius:'0px',
                     borderStyle:'solid',
+                    borderTopWidth:'0px',
+                    borderRightWidth:'0px',
+                    borderBottomWidth:'0px',
+                    borderLeftWidth:'0px',
                     backgroundColor:'',
                     justifyContent:'flex-start',
                     margin:'0px',
@@ -112,6 +115,13 @@
                     fontWeight:'normal',
                     marginLeft:'0px',
                     marginRight:'0px',
+                    border:'0px',
+                    width:'auto',
+                    borderColor:'',
+                    paddingRight:'0px',
+                    paddingLeft:'0px',
+                    borderStyle: 'solid',
+                    borderRightWidth: '0px'
                 },
                 textStyle:{ //内容样式
                    fontSize:'14px',
@@ -142,5 +152,21 @@
     .content_item{
         align-self: center;
     }
+    .titlewrap{
+        align-items: center;
+        display: flex;
+        flex-direction: column;
+        overflow: hidden;
+        overflow-wrap: break-word;
+    }
+    .titleStyle{
+        height: 100%;
+        display: inline-flex;
+        align-items: center;
+        flex-direction: row-reverse;
+        width: 100%;
+        overflow-wrap: break-word;
+        word-break: break-all;
+    }
 
 </style>

src/views/custom-infoboard/templates/common/text-display2.vue

@@ -74,6 +74,13 @@
                     fontWeight:'normal',
                     marginLeft:'0px',
                     marginRight:'0px',
+                    border:'0px',
+                    width:'auto',
+                    borderColor:'',
+                    paddingRight:'10px',
+                    paddingLeft:'10px',
+                    borderStyle: 'solid',
+                    borderRightWidth: '0px'
                 },
                 textStyle:{ //内容样式
                     fontSize:'14px',

src/views/custom-infoboard/templates/moduleConfig.vue

@@ -398,6 +398,41 @@
 
                 </el-form-item>
 
+                <el-form-item label="title宽度" v-if="moduleConfig.showTitle&&moduleConfig.titleStyle&&moduleConfig.titleStyle.width!==undefined">
+                    <el-input placeholder="title宽度" v-model="moduleConfig.titleStyle.width">
+
+                    </el-input>
+
+                </el-form-item>
+
+                <el-form-item label="title右边框宽度" v-if="moduleConfig.showTitle&&moduleConfig.titleStyle&&moduleConfig.titleStyle.borderRightWidth!==undefined">
+                    <el-input placeholder="title右边框宽度" v-model="moduleConfig.titleStyle.borderRightWidth">
+
+                    </el-input>
+
+                </el-form-item>
+
+                <el-form-item label="title左内边距" v-if="moduleConfig.showTitle&&moduleConfig.titleStyle&&moduleConfig.titleStyle.paddingLeft!==undefined">
+                    <el-input placeholder="title左内边距" v-model="moduleConfig.titleStyle.paddingLeft">
+
+                    </el-input>
+
+                </el-form-item>
+
+                <el-form-item label="title右内边距" v-if="moduleConfig.showTitle&&moduleConfig.titleStyle&&moduleConfig.titleStyle.paddingRight!==undefined">
+                    <el-input placeholder="title右内边距" v-model="moduleConfig.titleStyle.paddingRight">
+
+                    </el-input>
+
+                </el-form-item>
+
+                <el-form-item label="title边框颜色" v-if="moduleConfig.showTitle&&moduleConfig.titleStyle&&moduleConfig.titleStyle.borderColor!==undefined">
+                    <el-input placeholder="title边框颜色" v-model="moduleConfig.titleStyle.borderColor">
+                        <el-color-picker slot="append" v-model="moduleConfig.titleStyle.borderColor" size="mini" @change="colorChange"></el-color-picker>
+                    </el-input>
+
+                </el-form-item>
+
                 <el-form-item label="title右外边距" v-if="moduleConfig.showTitle&&moduleConfig.titleStyle&&moduleConfig.titleStyle.marginRight!==undefined">
                     <el-input placeholder="右外边距" v-model="moduleConfig.titleStyle.marginRight">
 

src/views/ncs_fee/index.vue

@@ -102,15 +102,18 @@ export default {
         resizable: false,
         valueGetter: this.hashValueGetter
       },
-      {headerName: this.$t('customerManage.feeName'), field: 'fee_name', sortable: true, filter: 'agTextColumnFilter', width: 100},
-      {headerName: this.$t('customerManage.feeValue'), field: 'fee_value', sortable: true, filter: 'agNumberColumnFilter', width: 100},
-      {headerName: this.$t('customerManage.feeNumber'), field: 'fee_number', sortable: true, filter: 'agNumberColumnFilter', width: 100},
-      {headerName: this.$t('customerManage.feeTime'), field: 'fee_time', sortable: true, valueFormatter: this.formatterDate, width: 100},
-      {headerName: this.$t('customerManage.feeGroupName'), field: 'group_name', sortable: true, filter: 'agTextColumnFilter', width: 100},
-      {headerName: this.$t('customerManage.feeKeyCode'), field: 'key_code', sortable: true, filter: 'agTextColumnFilter', width: 100},
-      {headerName: this.$t('customerManage.feeUnit'), field: 'unit', sortable: true, filter: 'agTextColumnFilter', width: 100},
-      {headerName: this.$t('customerManage.feeDescription'), field: 'description', sortable: true, filter: 'agTextColumnFilter', width: 100},
-      {headerName: this.$t('customerManage.feeKeyType'), field: 'key_type', sortable: true, filter: 'agTextColumnFilter', width: 100},
+      {headerName: this.$t('customerManage.feeName'), field: 'fee_name', sortable: true, filter: 'agTextColumnFilter', width: 120},
+      {headerName: this.$t('customerManage.feeNumber'), field: 'fee_number', sortable: true, filter: 'agNumberColumnFilter', width: 120},
+      {headerName: this.$t('customerManage.feeUnit'), field: 'unit', sortable: true, filter: 'agTextColumnFilter', width: 120},
+      {headerName: this.$t('customerManage.feePrice'), field: 'fee_price', sortable: true, filter: 'agNumberColumnFilter', width: 120},
+      {headerName: this.$t('customerManage.feeValue'), field: 'fee_value', sortable: true, filter: 'agNumberColumnFilter', width: 120},
+
+      {headerName: this.$t('customerManage.feeTime'), field: 'fee_time', sortable: true, valueFormatter: this.formatterDate, flex:1},
+      // {headerName: this.$t('customerManage.feeGroupName'), field: 'group_name', sortable: true, filter: 'agTextColumnFilter', width: 100},
+      // {headerName: this.$t('customerManage.feeKeyCode'), field: 'key_code', sortable: true, filter: 'agTextColumnFilter', width: 100},
+      //
+      // {headerName: this.$t('customerManage.feeDescription'), field: 'description', sortable: true, filter: 'agTextColumnFilter', width: 100},
+      // {headerName: this.$t('customerManage.feeKeyType'), field: 'key_type', sortable: true, filter: 'agTextColumnFilter', width: 100},
     ]
     this.defaultColDef = {
       // filter: 'agTextColumnFilter',
@@ -229,4 +232,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>