浏览代码

费用模板10.11

caojunjie 1 年之前
父节点
当前提交
794a0b7050

+ 4 - 1
src/views/iosBasicData/baccelements/index.vue

@@ -22,7 +22,7 @@
                @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 299)"
                @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 299)"
                @on-load="onLoad">
-      
+
       <template slot="code" slot-scope="scope">
         <avue-text-ellipsis :text="scope.row.code" :height="30" use-tooltip placement="top">
           <small slot="more">...</small>
@@ -258,6 +258,9 @@
         return ids.join(",");
       }
     },
+      async created() {
+          this.option = await this.getColumnData(this.getColumnName(299), this.optionBack);
+      },
     methods: {
       rowSave(row, done, loading) {
         addBaccelements(row).then(() => {

+ 0 - 2
src/views/iosBasicData/bcntrtypes/index.vue

@@ -152,7 +152,6 @@
             {
               label: "箱型 ISO 代码",
               prop: "code",
-                search: true,
                 width: 100,
               rules: [{
                 required: true,
@@ -163,7 +162,6 @@
             {
               label: "箱型 95 码",
               prop: "code95",
-                search: true,
               rules: [{
                 required: true,
                 message: "请输入箱型 95 码,22G1, 45R1 etc.",

+ 3 - 0
src/views/iosBasicData/bcommodity/index.vue

@@ -93,6 +93,7 @@
             {
               label: "HS CODE",
               prop: "hsCode",
+                search: true,
               rules: [{
                 required: true,
                 message: "请输入HS CODE(The Harmonization System Code)",
@@ -102,6 +103,7 @@
             {
               label: "中文名称",
               prop: "cnName",
+                search: true,
               rules: [{
                 required: true,
                 message: "请输入中文名称",
@@ -111,6 +113,7 @@
             {
               label: "英文名称",
               prop: "enName",
+                search: true,
               rules: [{
                 required: true,
                 message: "请输入英文名称",

+ 3 - 0
src/views/iosBasicData/bcountrys/index.vue

@@ -74,6 +74,7 @@ export default {
                     {
                         label: "编码",
                         prop: "code",
+                        search: true,
                         rules: [{
                             required: true,
                             message: "请输入编码",
@@ -97,6 +98,7 @@ export default {
                     {
                         label: "中文名称",
                         prop: "cnName",
+                        search: true,
                         rules: [{
                             required: true,
                             message: "请输入中文名称",
@@ -106,6 +108,7 @@ export default {
                     {
                         label: "英文名称",
                         prop: "enName",
+                        search: true,
                         rules: [{
                             required: true,
                             message: "请输入英文名称",

+ 42 - 3
src/views/iosBasicData/bfeesdefine/index.vue

@@ -1,16 +1,23 @@
 <template>
     <div>
         <el-row>
-            <el-col :span="5">
+            <el-col :span="4">
                 <div class="box">
                     <el-scrollbar>
                         <basic-container>
-                            <avue-tree :option="treeOption" :data="feesTypeData" @node-click="nodeClick" />
+                            <avue-tree :option="treeOption" :data="feesTypeData" @node-click="nodeClick" >
+                                <template slot="addBtn">
+                                    <el-tooltip class="item" effect="dark" content="新建分类" placement="top">
+                                        <i class="el-icon-setting" style="font-size:18px;line-height: 30px;width: 20px;padding: 0 10px;"
+                                           @click="corpTypeVisible = true"></i>
+                                    </el-tooltip>
+                                </template>
+                            </avue-tree>
                         </basic-container>
                     </el-scrollbar>
                 </div>
             </el-col>
-            <el-col :span="19">
+            <el-col :span="20">
                 <basic-container>
                     <avue-crud :option="option"
                                :table-loading="loading"
@@ -88,6 +95,23 @@
                 </basic-container>
             </el-col>
         </el-row>
+
+        <!--类别弹窗-->
+        <el-dialog
+            title="类别"
+            :visible.sync="corpTypeVisible"
+            append-to-body
+            width="60%"
+            :before-close="corpTypeClose">
+            <div>
+                <bfeesdetype></bfeesdetype>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="corpTypeVisible = false">取 消</el-button>
+                <el-button type="primary" @click="corpTypeVisible = false">确 定</el-button>
+            </span>
+        </el-dialog>
+
     </div>
 </template>
 
@@ -102,10 +126,13 @@
   import bfeesdetype from "@/views/iosBasicData/bfeesdefine/bfeesdetype.vue";
   import rateManagement from '@/views/iosBasicData/rateManagement/index.vue'
 
+
   export default {
       components: {bunits,bfeesdetype,rateManagement, SearchQuery},
     data() {
       return {
+          // 类别弹窗的开启
+          corpTypeVisible:false,
           // 费用类别数据
           feesTypeData:[],
           // 计量单位数据
@@ -557,6 +584,14 @@
           this.selectionClear();
         });
       },
+        // 类别弹窗关闭
+        corpTypeClose(done) {
+            this.$confirm('确认关闭?')
+                .then(_ => {
+                    done();
+                })
+                .catch(_ => {});
+        },
 
         //自定义列保存
         async saveColumnTwo(ref, option, optionBack, code) {
@@ -606,4 +641,8 @@
 ::v-deep#out-table .back-two {
     background: #ecf5ff !important;
 }
+
+::v-deep .el-input-group__append {
+    padding: 0 0px !important;
+}
 </style>

+ 4 - 1
src/views/iosBasicData/bpackages/index.vue

@@ -159,6 +159,7 @@
             {
               label: "编码",
               prop: "code",
+                search: true,
               rules: [{
                 required: true,
                 message: "请输入编码",
@@ -168,6 +169,7 @@
             {
               label: "中文名称",
               prop: "cnName",
+                search: true,
               rules: [{
                 required: true,
                 message: "请输入中文名称",
@@ -177,6 +179,7 @@
             {
               label: "英文名称",
               prop: "enName",
+                search: true,
               rules: [{
                 required: true,
                 message: "请输入英文名称",
@@ -552,4 +555,4 @@
   width: 24.33333%;
 }
 
-</style>
+</style>

+ 29 - 12
src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -97,17 +97,16 @@
                                 :class="{ isShow: item.display }" >
                             <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
                                 <div v-if="item.prop == 'corpId'">
-                                    <template slot="corpForm">
-                                        <search-query ref="SearchQuery"
-                                                      :datalist="corpData"
-                                                      title="计量单位"
-                                                      :filterable="true"
-                                                      :clearable="true"
-                                                      :remote="true"
-                                                      :forParameter="{key:'id',label:'cnName',value:'id'}"
-                                                      @remoteMethod="getBunitsListfun" @corpChange="corpChange" >
-                                        </search-query>
-                                    </template>
+                                    <search-query ref="SearchQuery"
+                                                  :datalist="corpData"
+                                                  title="客户"
+                                                  :filterable="true"
+                                                  :clearable="true"
+                                                  :remote="true"
+                                                  :forParameter="{key:'id',label:'cnName',value:'id'}"
+                                                  @remoteMethod="getBcorpsListfun" @corpChange="corpCorpChange($event,item.prop)" >
+                                        <bcorps></bcorps>
+                                    </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>
@@ -128,10 +127,12 @@
 
 <script>
 import {losbfeestemplateDetail, losbfeestemplateSubmit} from "@/api/iosBasicData/losbfeestemplate";
+import {getBcorpsList} from "@/api/iosBasicData/bcorps";
 import SearchQuery from '@/components/iosbasic-data/searchquery.vue'
+import bcorps from "@/views/iosBasicData/bcorps/index.vue";
 
 export default {
-    components: {SearchQuery},
+    components: {SearchQuery,bcorps},
     props:{
         detailData: {
             type: Object
@@ -147,6 +148,8 @@ export default {
             // 费用详细弹窗绑定的数据
             feestemplateForm:{},
             feestemplateIndex:null,
+            // 客户请求数据
+            corpData:[],
 
             // 获取到的数据
             form:{
@@ -364,7 +367,21 @@ export default {
             },
         }
     },
+    created() {
+        this.getBcorpsListfun()
+    },
     methods:{
+        // 获取客户数据
+        getBcorpsListfun(cnName){
+            getBcorpsList(1,10,{cnName}).then(res=>{
+                this.corpData = res.data.data.records
+            })
+        },
+        // 客户选择之后的回调
+        corpCorpChange(value,row){
+            console.log(row,382)
+            console.log(value)
+        },
         // 获取详情数据
         losbfeestemplateDetailfun(id){
             this.pageLoading = true

+ 2 - 0
src/views/iosBasicData/losbfeestemplate/index.vue

@@ -140,6 +140,7 @@
               prop: "cnName",
                 width:120,
                 search: true,
+                searchLabelWidth:120,
               rules: [{
                 required: true,
                 message: "请输入模版中文名称",
@@ -151,6 +152,7 @@
               prop: "enName",
                 width:120,
                 search: true,
+                searchLabelWidth:120,
               rules: [{
                 required: true,
                 message: "请输入模版英文名称",