Merge remote-tracking branch 'origin/dev' into dev

src/enums/column-name.js

@@ -1377,6 +1377,10 @@ const columnName = [{
     code: 310,
     name: '货运代理-账单管理-费用中心'
   },
+  {
+    code: 311,
+    name: '货运代理-业务配置-单号配置'
+  },
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

src/views/serviceConfiguration/businessbillno/index.vue

@@ -53,6 +53,16 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
+      <template slot-scope="{type,disabled}" slot="businessTypeIdForm">
+        <el-select v-model="form.businessTypeId" clearable @change="businessTypeChange(form.businessTypeId)" placeholder="请选择">
+          <el-option
+            v-for="item in feesTypeList"
+            :key="item.id"
+            :label="item.cnName"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </template>
       <template slot-scope="scope" slot="menu">
         <el-link type="primary" style="font-size: 12px" icon="el-icon-view" :underline="false" @click="detail(scope.row.id)">查看详情&nbsp;&nbsp;</el-link>
         <el-link type="primary" style="font-size: 12px" icon="el-icon-edit" :underline="false" @click="addedData(2, scope)">编 辑&nbsp;&nbsp;</el-link>
@@ -61,7 +71,7 @@
     </avue-crud>
 
     <el-dialog
-      title="提示"
+      title="详情"
       :visible.sync="dialogVisible"
       :append-to-body="true"
       width="60%">
@@ -125,6 +135,7 @@
               prop: "businessTypeId",
               width: "180",
               search:true,
+              formslot: true,
               type: 'select',
               props: {
                 label: 'cnName',
@@ -132,14 +143,14 @@
               },
               dicData: [],
               change: (column,value) => {
-                console.log(column)
-                if (column) {
-                    this.feesTypeList.forEach(data => {
-                      if (data.id == column.value) {
-                        this.form.businessType = data.code
-                      }
-                    })
-                }
+                // console.log(column)
+                // if (column) {
+                //     this.feesTypeList.forEach(data => {
+                //       if (data.id == column.value) {
+                //         this.form.businessType = data.code
+                //       }
+                //     })
+                // }
               },
               rules: [{
                 required: true,
@@ -294,6 +305,16 @@
       })
     },
     methods: {
+      businessTypeChange(column) {
+        // console.log(column, 1234)
+        if (column) {
+          this.feesTypeList.forEach(data => {
+            if (data.id == column) {
+              this.form.businessType = data.code
+            }
+          })
+        }
+      },
       addedData(type, scope) {
         this.form = {};
         if (type == 1) {