费用模板详情10.11

src/enums/column-name.js

@@ -1349,6 +1349,10 @@ const columnName = [{
     code: 304.1,
     name: '货运代理-基础资料-客户类别'
   },
+  {
+    code: 305,
+    name: '货运代理-基础资料-币别及汇率'
+  },
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -25,7 +25,10 @@
                         <el-col v-for="(item, index) in basicData.column" :key="index" :span="item.span ? item.span : 8"
                                 :class="{ isShow: item.display }" >
                             <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                                <el-select v-if="item.type == 'select'"  v-model="form[item.prop]" :placeholder="'请选择' + item.label" clearable
+                                <div v-if="item.prop == 'businessTypeId'">
+                                    业务类型
+                                </div>
+                                <el-select v-else-if="item.type == 'select'"  v-model="form[item.prop]" :placeholder="'请选择' + item.label" clearable
                                            filterable style="width: 100%" size="small"
                                            :disabled="item.disabled || detailData.seeDisabled">
                                     <el-option v-for="(ite, inde) in item.dicData" :key="inde" :label="ite.label"
@@ -192,26 +195,27 @@ export default {
             basicData:{
                 column:[
                     {
-                        label: "业务类型 Id",
+                        label: "业务类型",
                         prop: "businessTypeId",
                         rules: [{
                             required: true,
-                            message: "请输入业务类型 Id",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "业务类型中文名称",
-                        prop: "businessTypeCnName",
-                        rules: [{
-                            required: true,
-                            message: "请输入业务类型中文名称",
+                            message: "",
                             trigger: "blur"
                         }]
                     },
+                    // {
+                    //     label: "业务类型中文名称",
+                    //     prop: "businessTypeCnName",
+                    //     rules: [{
+                    //         required: true,
+                    //         message: "",
+                    //         trigger: "blur"
+                    //     }]
+                    // },
                     {
-                        label: "业务类型英文名称",
+                        label: "业务类型英文",
                         prop: "businessTypeEnName",
+                        disabled:true,
                         rules: [{
                             required: true,
                             message: "请输入业务类型英文名称",
@@ -312,7 +316,7 @@ export default {
                         type:'select',
                         rules: [{
                             required: true,
-                            message: "请输入客户 Id",
+                            message: "",
                             trigger: "blur"
                         }]
                     },
@@ -326,7 +330,7 @@ export default {
                         prop: "feeId",
                         rules: [{
                             required: true,
-                            message: "请输入费用",
+                            message: "",
                             trigger: "blur"
                         }]
                     },
@@ -359,11 +363,11 @@ export default {
                         prop: "quantity",
                         rules: [{
                             required: true,
-                            message: "请输入数量",
+                            // message: "请输入数量",
                             trigger: "blur"
                         },{
-                            pattern:/[1-9]\d*.\d*|0\.\d*[1-9]\d*/,
-                            message:"请输入数字",
+                            pattern:/-?[1-9]\d*/,
+                            // message:"请输入数字",
                             trigger:'blur'
                         }]
                     },
@@ -372,11 +376,12 @@ export default {
                         prop: "price",
                         rules: [{
                             required: true,
-                            message: "请输入单价",
+                            // message: "请输入单价",
                             trigger: "blur"
                         },{
-                            pattern:/[1-9]\d*.\d*|0\.\d*[1-9]\d*/,
-                            message:"请输入数字",
+                            // pattern:/[1-9]\d*.\d*|0\.\d*[1-9]\d*/,
+                            pattern:/-?[1-9]\d*/,
+                            // message:"请输入数字",
                             trigger:'blur'
                         }]
                     },
@@ -385,7 +390,7 @@ export default {
                         prop: "curCode",
                         rules: [{
                             required: true,
-                            message: "请输入币别",
+                            // message: "请输入币别",
                             trigger: "blur"
                         }]
                     },

src/views/iosBasicData/losbfeestemplate/index.vue

@@ -52,6 +52,11 @@
                   >删除
                   </el-button>
               </template>
+              <template slot="remarks" slot-scope="scope">
+                  <avue-text-ellipsis :text="scope.row.remarks" :height="30" use-tooltip placement="top">
+                      <small slot="more">...</small>
+                  </avue-text-ellipsis>
+              </template>
 
           </avue-crud>
       </basic-container>
@@ -95,16 +100,16 @@
           selection: true,
           dialogClickModal: false,
           column: [
-            {
-              label: "业务类型 Id",
-              prop: "businessTypeId",
-                width:120,
-              rules: [{
-                required: true,
-                message: "请输入业务类型 Id",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "业务类型 Id",
+            //   prop: "businessTypeId",
+            //     width:120,
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入业务类型 Id",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "业务类型中文名称",
               prop: "businessTypeCnName",

src/views/iosBasicData/rateManagement/index.vue

@@ -17,8 +17,8 @@
         @refresh-change="refreshChange"
         @on-load="onLoad"
         :table-loading="loading"
-        @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 293)"
-        @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 293)"
+        @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 305)"
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 305)"
         @selection-change="selectionChange"
         :cell-style="cellStyle"
         @search-criteria-switch="searchCriteriaSwitch"
@@ -169,8 +169,9 @@ export default {
       }
     };
   },
-  created() {
+  async created() {
     this.option.height = window.innerHeight - 210;
+      this.option = await this.getColumnData(this.getColumnName(305), this.optionBack);
   },
   activated() {
     if (this.$route.query.check) {
@@ -180,10 +181,6 @@ export default {
       }, 100);
     }
   },
-  
-  async created() {
-          this.option = await this.getColumnData(this.getColumnName(301), this.optionBack);
-      },
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {