费用模板详情10.13

src/api/iosBasicData/balancecycle.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const balancecycleList = (current, size, params) => {
+  return request({
+    url: '/api/blade-los/balancecycle/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const balancecycleDetail = (id) => {
+  return request({
+    url: '/api/blade-los/balancecycle/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const balancecycleRemove = (ids) => {
+  return request({
+    url: '/api/blade-los/balancecycle/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const balancecycleSubmit = (row) => {
+  return request({
+    url: '/api/blade-los/balancecycle/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/blade-los/balancecycle/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/enums/column-name.js

@@ -1361,6 +1361,10 @@ const columnName = [{
     code: 307,
     name: '货运代理-财务管理-协议管理'
   },
+  {
+    code: 308,
+    name: '货运代理-财务管理-结算周期'
+  },
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

src/views/financialManagementF/agreementprice/agreementpriceitems.vue

@@ -33,6 +33,7 @@
                                                   :clearable="true"
                                                   :remote="true"
                                                   :selectValue="form.corpCnName"
+                                                  :disabled="item.disabled || detailData.seeDisabled"
                                                   :forParameter="{key:'id',label:'cnName',value:'cnName'}"
                                                   @remoteMethod="getBcorpsListfun" @corpChange="corpCorpChange" >
                                         <bcorps></bcorps>
@@ -44,6 +45,7 @@
                                     type="date"
                                     size="small"
                                     value-format="yyyy-MM-dd"
+                                    :disabled="item.disabled || detailData.seeDisabled"
                                     placeholder="选择日期">
                                 </el-date-picker>
                                 <el-select v-else-if="item.type == 'select'"  v-model="form[item.prop]" :placeholder="'请选择' + item.label" clearable
@@ -80,6 +82,31 @@
                     :header-cell-class-name="headerClassName"
                     style="width: 100%">
                     <el-table-column
+                        prop="carrierCnName"
+                        label="船公司中文名称">
+                    </el-table-column>
+                    <el-table-column
+                        prop="carrierEnName"
+                        label="船公司英文名称">
+                    </el-table-column>
+                    <el-table-column
+                        prop="accountPeriodDays"
+                        label="账期天数">
+                    </el-table-column>
+                    <el-table-column
+                        prop="settlementPeriodType"
+                        label="结算周期类型">
+                    </el-table-column>
+                    <el-table-column
+                        prop="settlementPeriodName"
+                        label="结算周期名称">
+                    </el-table-column>
+                    <el-table-column
+                        prop="settlementPeriodDescr"
+                        label="结算周期描述">
+                    </el-table-column>
+
+                    <el-table-column
                         prop="remarks"
                         label="备注">
                     </el-table-column>
@@ -117,19 +144,32 @@
                         <el-col v-for="(item, index) in agreementPriceData.column" :key="index" :span="item.span ? item.span : 12"
                                 :class="{ isShow: item.display }" >
                             <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                                <div v-if="item.prop == 'corpId'">
+                                <div v-if="item.prop == 'carrierCnName'">
                                     <search-query ref="SearchQuery"
-                                                  :datalist="corpData"
-                                                  title="客户"
+                                                  :datalist="carrierData"
+                                                  title="船公司"
                                                   :filterable="true"
                                                   :clearable="true"
                                                   :remote="true"
-                                                  :forParameter="{key:'id',label:'cnName',value:'id'}"
-                                                  @remoteMethod="getBcorpsListfun" @corpChange="corpCorpChange" >
+                                                  :disabled="item.disabled"
+                                                  :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                  @remoteMethod="getBcorpsListCarrierfun" @corpChange="carrierCorpChange" >
                                         <bcorps></bcorps>
                                     </search-query>
                                 </div>
-
+                                <div v-else-if="item.prop == 'settlementPeriodType'">
+                                    <search-query ref="SearchQuery"
+                                                  :datalist="settlementPeriodData"
+                                                  title="结算周期"
+                                                  :filterable="true"
+                                                  :clearable="true"
+                                                  :remote="true"
+                                                  :disabled="item.disabled"
+                                                  :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                  @remoteMethod="balancecycleListfun" @corpChange="settlementPeriodCorpChange" >
+                                        <balancecycle></balancecycle>
+                                    </search-query>
+                                </div>
                                 <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model.trim="agreementPriceForm[item.prop]" size="small"
                                           autocomplete="off" :disabled="item.disabled" :placeholder="'请输入' + item.label"></el-input>
                                 <el-input v-else type="age" style="width: 100%;" v-model.trim="agreementPriceForm[item.prop]" size="small" autocomplete="off"
@@ -157,11 +197,13 @@ import SearchQuery from '@/components/iosbasic-data/searchquery.vue'
 import bcorps from "@/views/iosBasicData/bcorps/index.vue";
 import bfeesdefine from "@/views/iosBasicData/bfeesdefine/index.vue";
 import bbusinesstype from "@/views/iosBasicData/bbusinesstype/index.vue";
+import balancecycle from "@/views/financialManagementF/balancecycle/index.vue";
 import {getWorkDicts} from "@/api/system/dictbiz";
+import {balancecycleList} from "@/api/iosBasicData/balancecycle";
 
 
 export default {
-    components: {SearchQuery,bcorps,bfeesdefine,bbusinesstype},
+    components: {SearchQuery,bcorps,bfeesdefine,bbusinesstype,balancecycle},
     props:{
         detailData: {
             type: Object
@@ -179,6 +221,10 @@ export default {
             agreementPriceIndex:null,
             // 客户请求数据
             corpData:[],
+            // 船公司请求到的数据
+            carrierData:[],
+            // 结算周期数据
+            settlementPeriodData:[],
             // 获取到的数据
             form:{
                 isShared:0,
@@ -296,10 +342,10 @@ export default {
                     //         trigger: "blur"
                     //     }]
                     // },
-                    {
-                        label: "船公司 Id",
-                        prop: "carrierId",
-                    },
+                    // {
+                    //     label: "船公司 Id",
+                    //     prop: "carrierId",
+                    // },
                     {
                         label: "船公司中文名称",
                         prop: "carrierCnName",
@@ -307,10 +353,12 @@ export default {
                     {
                         label: "船公司英文名称",
                         prop: "carrierEnName",
+                        disabled:true,
                     },
                     {
                         label: "账期天数",
                         prop: "accountPeriodDays",
+
                     },
                     {
                         label: "结算周期类型",
@@ -319,10 +367,12 @@ export default {
                     {
                         label: "结算周期名称",
                         prop: "settlementPeriodName",
+                        disabled:true,
                     },
                     {
                         label: "结算周期描述",
                         prop: "settlementPeriodDescr",
+                        disabled:true,
                     },
                     {
                         label: "备注",
@@ -337,6 +387,8 @@ export default {
     },
     created() {
         this.getBcorpsListfun()
+        this.getBcorpsListCarrierfun()
+        this.balancecycleListfun()
         this.getWorkDictsfun()
     },
     methods:{
@@ -364,6 +416,18 @@ export default {
                 this.corpData = res.data.data.records
             })
         },
+        // 获取船公司数据
+        getBcorpsListCarrierfun(cnName){
+            getBcorpsList(1,10,{corpTypeName:'船公司',cnName}).then(res=>{
+                this.carrierData = res.data.data.records
+            })
+        },
+        // 结算周期数据
+        balancecycleListfun(cnName){
+            balancecycleList(1,10,{cnName}).then(res=>{
+                this.settlementPeriodData = res.data.data.records
+            })
+        },
         // 客户选择之后的回调
         corpCorpChange(value){
             for(let item of this.corpData) {
@@ -374,6 +438,20 @@ export default {
                 }
             }
         },
+        // 船公司选择之后的回调
+        carrierCorpChange(value){
+            for(let item of this.carrierData) {
+                if (item.cnName == value) {
+                    this.$set(this.agreementPriceForm,'carrierId',item.id)
+                    this.$set(this.agreementPriceForm,'carrierEnName',item.enName)
+                    this.$set(this.agreementPriceForm,'carrierCnName',item.cnName)
+                }
+            }
+        },
+        // 结算周期类型
+        settlementPeriodCorpChange(value) {
+            console.log(value)
+        },
         // 获取详情数据
         agreementpriceDetailfun(id){
             this.pageLoading = true
@@ -384,7 +462,8 @@ export default {
         },
         // 编辑按钮更改状态
         editHandle(){
-            this.detailData.seeDisabled = false;
+            this.$set(this.detailData,'seeDisabled',false)
+            // this.detailData.seeDisabled = false;
         },
         // 保存按钮
         editCustomer(){

src/views/financialManagementF/agreementprice/index.vue

@@ -37,6 +37,14 @@
                                @click="handleDelete">删 除
                     </el-button>
                 </template>
+                <template slot-scope="scope" slot="menu">
+                    <el-button :type="scope.type" :size="scope.size" icon="el-icon-edit"
+                               @click.stop="rowCellfun(scope.row, scope.index)">编辑
+                    </el-button>
+                    <el-button :type="scope.type" :size="scope.size" icon="el-icon-delete"
+                               @click.stop="rowDel(scope.row, scope.index)">删除
+                    </el-button>
+                </template>
             </avue-crud>
         </basic-container>
 
@@ -192,7 +200,6 @@
                     label:'停用',
                     value:1
                 }],
-
             },
             {
               label: "版本",
@@ -270,10 +277,10 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          // addBtn: this.vaildData(this.permission.agreementprice_add, false),
-          // viewBtn: this.vaildData(this.permission.agreementprice_view, false),
-          // delBtn: this.vaildData(this.permission.agreementprice_delete, false),
-          // editBtn: this.vaildData(this.permission.agreementprice_edit, false)
+          addBtn: this.vaildData(this.permission.agreementprice_add, false),
+          viewBtn: this.vaildData(this.permission.agreementprice_view, false),
+          delBtn: this.vaildData(this.permission.agreementprice_delete, false),
+          editBtn: this.vaildData(this.permission.agreementprice_edit, false)
         };
       },
       ids() {
@@ -293,6 +300,17 @@
               this.detailData.seeDisabled = false
               this.isShow = false
           },
+          // 编辑详情打开
+          rowCellfun(row, index) {
+              this.detailData = {
+                  seeDisabled:true,
+                  id:row.id
+              }
+              this.isShow = false
+              this.$nextTick(() => {
+                  this.$refs.agreementpriceitems.agreementpriceDetailfun(row.id)
+              })
+          },
           // 详情的返回列表
           goBack(){
               // 初始化数据

src/views/financialManagementF/balancecycle/index.vue

@@ -0,0 +1,399 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               id="out-table"
+               :header-cell-class-name="headerClassName"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 308)"
+               @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 308)"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.balancecycle_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import {
+    balancecycleList,
+    balancecycleDetail,
+    balancecycleSubmit,
+    balancecycleRemove,
+} from "@/api/iosBasicData/balancecycle";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option:{},
+        optionBack: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "主键",
+              prop: "id",
+              rules: [{
+                required: true,
+                message: "请输入主键",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "创建人 Id",
+              prop: "createUser",
+              rules: [{
+                required: true,
+                message: "请输入创建人 Id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "创建人",
+              prop: "createUserName",
+              rules: [{
+                required: true,
+                message: "请输入创建人",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "创建部门 Id",
+              prop: "createDept",
+              rules: [{
+                required: true,
+                message: "请输入创建部门 Id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "创建部门",
+              prop: "createDeptName",
+              rules: [{
+                required: true,
+                message: "请输入创建部门",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "创建时间",
+              prop: "createTime",
+              rules: [{
+                required: true,
+                message: "请输入创建时间",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "修改人 Id",
+              prop: "updateUser",
+              rules: [{
+                required: true,
+                message: "请输入修改人 Id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "修改人",
+              prop: "updateUserName",
+              rules: [{
+                required: true,
+                message: "请输入修改人",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "修改时间",
+              prop: "updateTime",
+              rules: [{
+                required: true,
+                message: "请输入修改时间",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "结算周期类型",
+              prop: "balanceCycleType",
+              rules: [{
+                required: true,
+                message: "请输入结算周期类型",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "中文名称",
+              prop: "balanceCycleName",
+              rules: [{
+                required: true,
+                message: "请输入中文名称",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "结算周期描述",
+              prop: "balanceCycleDescribe",
+              rules: [{
+                required: true,
+                message: "请输入结算周期描述",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "版本",
+              prop: "version",
+              rules: [{
+                required: true,
+                message: "请输入版本",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "状态（0 正常 1停用）",
+              prop: "status",
+              rules: [{
+                required: true,
+                message: "请输入状态（0 正常 1停用）",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "是否已删除（0 否 1是）",
+              prop: "isDeleted",
+              rules: [{
+                required: true,
+                message: "请输入是否已删除（0 否 1是）",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "备注",
+              prop: "remarks",
+              rules: [{
+                required: true,
+                message: "请输入备注",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.balancecycle_add, false),
+          viewBtn: this.vaildData(this.permission.balancecycle_view, false),
+          delBtn: this.vaildData(this.permission.balancecycle_delete, false),
+          editBtn: this.vaildData(this.permission.balancecycle_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+      async created() {
+          this.option = await this.getColumnData(this.getColumnName(308), this.optionBack);
+      },
+    methods: {
+      rowSave(row, done, loading) {
+        balancecycleSubmit(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        balancecycleSubmit(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return balancecycleRemove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return balancecycleRemove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          balancecycleDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        balancecycleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      },
+        //自定义列保存
+        async saveColumnTwo(ref, option, optionBack, code) {
+            /**
+             * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
+             * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
+             * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
+             */
+            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+            if (inSave) {
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        //自定义列重置
+        async resetColumnTwo(ref, option, optionBack, code) {
+            this[option] = this[optionBack];
+            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+            if (inSave) {
+                this.$message.success("重置成功");
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        // 更改表格颜色
+        headerClassName(tab){
+            //颜色间隔
+            let back = ""
+            if (tab.columnIndex >= 0 && tab.column.level === 1) {
+                if (tab.columnIndex % 2 === 0) {
+                    back = "back-one"
+                } else if (tab.columnIndex % 2 === 1) {
+                    back = "back-two"
+                }
+            }
+            return back;
+        },
+    }
+  };
+</script>
+
+<style scoped>
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+}
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+}
+</style>

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -25,20 +25,6 @@
                         <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">
-                                <!--<div v-if="item.prop == 'businessTypeCnName'">-->
-                                <!--    <search-query ref="SearchQuery"-->
-                                <!--                  :selectValue="form[item.prop]"-->
-                                <!--                  :datalist="businessTypeData"-->
-                                <!--                  title="业务类型"-->
-                                <!--                  :filterable="true"-->
-                                <!--                  :clearable="true"-->
-                                <!--                  :remote="true"-->
-                                <!--                  :disabled="item.disabled || detailData.seeDisabled"-->
-                                <!--                  :forParameter="{key:'id',label:'cnName',value:'cnName'}"-->
-                                <!--                  @remoteMethod="bbusinesstypeListfun" @corpChange="businessTypeCorpChange" >-->
-                                <!--        <bbusinesstype></bbusinesstype>-->
-                                <!--    </search-query>-->
-                                <!--</div>-->
                                 <el-select v-if="item.type == 'select'"  v-model="form[item.prop]" :placeholder="'请选择' + item.label" clearable
                                            filterable style="width: 100%" size="small"
                                            :disabled="item.disabled || detailData.seeDisabled">
@@ -105,6 +91,10 @@
                         label="单价">
                     </el-table-column>
                     <el-table-column
+                        prop="unitNo"
+                        label="计算属性">
+                    </el-table-column>
+                    <el-table-column
                         prop="curCode"
                         label="币别">
                     </el-table-column>
@@ -182,6 +172,18 @@
                                         <bfeesdefine></bfeesdefine>
                                     </search-query>
                                 </div>
+                                <div v-else-if="item.prop == 'unitNo'">
+                                    <search-query ref="SearchQuery"
+                                                  :datalist="unitNoData"
+                                                  title="计量单位"
+                                                  :filterable="true"
+                                                  :clearable="true"
+                                                  :remote="true"
+                                                  :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                                  @remoteMethod="getBunitsListfun" @corpChange="unitNoCorpChange" >
+                                        <bunits></bunits>
+                                    </search-query>
+                                </div>
 
                                 <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model.trim="feestemplateForm[item.prop]" size="small"
                                           autocomplete="off" :disabled="item.disabled" :placeholder="'请输入' + item.label"></el-input>
@@ -205,15 +207,16 @@ import {losbfeestemplateDetail, losbfeestemplateSubmit} from "@/api/iosBasicData
 import {bfeesList} from "@/api/iosBasicData/bfees";
 import {getBcorpsList} from "@/api/iosBasicData/bcorps";
 import { getRateList } from "@/api/iosBasicData/rateManagement";
-import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
+import {getBunitsList} from "@/api/iosBasicData/bunits";
 import SearchQuery from '@/components/iosbasic-data/searchquery.vue'
 import bcorps from "@/views/iosBasicData/bcorps/index.vue";
 import bfeesdefine from "@/views/iosBasicData/bfeesdefine/index.vue";
 import bbusinesstype from "@/views/iosBasicData/bbusinesstype/index.vue";
+import bunits from "@/views/iosBasicData/bunits/index.vue";
 
 
 export default {
-    components: {SearchQuery,bcorps,bfeesdefine,bbusinesstype},
+    components: {SearchQuery,bcorps,bfeesdefine,bbusinesstype,bunits},
     props:{
         detailData: {
             type: Object
@@ -235,8 +238,8 @@ export default {
             feeData:[],
             // 币别请求数据
             curCodeData:[],
-            // 业务类型数据
-            businessTypeData:[],
+            // 计算属性数据
+            unitNoData:[],
 
             // 获取到的数据
             form:{
@@ -429,6 +432,15 @@ export default {
                         }]
                     },
                     {
+                        label: "计量单位",
+                        prop: "unitNo",
+                        rules: [{
+                            required: true,
+                            // message: "请输入计量单位",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
                         label: "币别",
                         prop: "curCode",
                         rules: [{
@@ -452,7 +464,7 @@ export default {
         this.getBcorpsListfun()
         this.bfeesListfun()
         this.getRateListfun()
-        this.bbusinesstypeListfun()
+        this.getBunitsListfun()
     },
     methods:{
         // 获取客户数据
@@ -476,10 +488,10 @@ export default {
                 this.curCodeData = res.data.data.records
             })
         },
-        // 获取业务类型
-        bbusinesstypeListfun(cnName){
-            bbusinesstypeList(1,10,{cnName}).then(res=>{
-                this.businessTypeData = res.data.data.records
+        // 获取计算属性
+        getBunitsListfun(){
+            getBunitsList().then(res=>{
+                this.unitNoData = res.data.data.records
             })
         },
         // 客户选择之后的回调
@@ -507,15 +519,15 @@ export default {
         curCodeCorpChange(value) {
             this.$set(this.feestemplateForm,'curCode',value)
         },
-        // 业务类型选择之后
-        businessTypeCorpChange(value){
-            for(let item of this.businessTypeData) {
-                if (item.cnName == value){
-                    this.$set(this.form,'businessTypeId',item.id)
-                    this.$set(this.form,'businessTypeCnName',item.cnName)
-                    this.$set(this.form,'businessTypeEnName',item.enName)
+        // 计算属性选择之后
+        unitNoCorpChange(value) {
+            for(let item of this.unitNoData) {
+                if (item.cnName == value) {
+                    this.$set(this.feestemplateForm,'unitId',item.id)
+                    this.$set(this.feestemplateForm,'unitNo',item.cnName)
                 }
             }
+            console.log(value)
         },
         // 获取详情数据
         losbfeestemplateDetailfun(id){