修改PS客户和费用模板bug

src/views/iosBasicData/SeafreightExportF/bills/assembly/businessReports.vue

@@ -9,6 +9,7 @@
                  ref="crud"
                  id="out-table"
                  :header-cell-class-name="headerClassName"
+                 :search.sync="query"
                  @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 312.3)"
                  @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 312.3)"
                  @search-change="searchChange"
@@ -92,6 +93,22 @@
               }]
             },
             {
+              label: "业务类别",
+              prop: "classifyCode",
+              type: 'select',
+              search:true,
+              dicData: [{
+              label: '业务',
+              value:'业务'
+            }, {
+             label:'费用',
+             value: '费用'
+          }, {
+             label:'单证',
+             value: '单证'
+          }]
+            },
+            {
               label: "报表编码",
               prop: "code",
               rules: [{

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -163,12 +163,26 @@
             :close-on-click-modal="false"
             :before-close="feestemplateClose">
             <div>
+                {{feestemplateForm }}
                 <el-form :model="feestemplateForm" ref="feestemplateForm" label-width="100px" class="demo-ruleForm">
                     <el-row>
                         <el-col v-for="(item, index) in feestemplateData.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 == 'corpCnName'">
+                                <div v-if="item.prop == 'corpType'">
+                                    <search-query ref="SearchQuery"
+                                                  :datalist="corpTypeData"
+                                                  :selectValue="feestemplateForm[item.prop]"
+                                                  title="客户类型"
+                                                  :filterable="true"
+                                                  :clearable="true"
+                                                  :buttonIf="false"
+                                                  :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
+                                                  :disabled="feestemplateForm.corpCnName==''||feestemplateForm.corpCnName==null||!feestemplateForm.corpCnName?false:true"
+                                                  @corpChange="corpTypeChange" >
+                                    </search-query>
+                                </div>
+                                <div v-else-if="item.prop == 'corpCnName'">
                                     <search-query ref="SearchCorp"
                                                   :datalist="corpData"
                                                   :selectValue="feestemplateForm[item.prop]"
@@ -177,7 +191,7 @@
                                                   :clearable="true"
                                                   :remote="true"
                                                   :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                                  :disabled="feestemplateForm.corpType"
+                                                  :disabled="feestemplateForm.corpType==''||feestemplateForm.corpType==null||!feestemplateForm.corpType?false:true"
                                                   @remoteMethod="getBcorpsListfun" @corpChange="corpCorpChange"
                                                   @eldialogConfirm="eldialogConfirm(item.prop)" >
                                         <bcorps ref="bcorps"
@@ -185,27 +199,6 @@
                                                 @selectionChange="eldialogMultipleChoice($event,'bcorps')" ></bcorps>
                                     </search-query>
                                 </div>
-                                <div v-if="item.prop == 'corpType'">
-                                    <search-query ref="SearchQuery"
-                                                  :datalist="corpTypeData"
-                                                  :selectValue="feestemplateForm[item.prop]"
-                                                  title="客户类型"
-                                                  :filterable="true"
-                                                  :clearable="true"
-                                                  :buttonIf="false"
-                                                  :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
-                                                  :disabled="feestemplateForm.corpCnName"
-                                                  @corpChange="corpTypeChange" >
-                                    </search-query>
-                                    <!-- <el-select v-model="feestemplateForm[item.prop]" placeholder="请选择">
-                               <el-option
-                                 v-for="item in corpTypeData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictValue">
-                                </el-option>
-                            </el-select> -->
-                                </div>
                                 <div v-else-if="item.prop == 'feeCnName'">
                                     <search-query ref="SearchFee"
                                                   :datalist="feeData"
@@ -446,10 +439,13 @@ export default {
             // 费用详细数据
             feestemplateData:{
                 column:[
+                {
+                        label: "客户类型",
+                        prop: "corpType",
+                    },
                     {
                         label: "客户",
                         prop: "corpCnName",
-                        type:'select',
                         // rules: [{
                         //     required: true,
                         //     message: "",
@@ -457,15 +453,6 @@ export default {
                         // }]
                     },
                     {
-                        label: "客户类型",
-                        prop: "corpType",
-                    },
-                    {
-                        label: "客户英文名称",
-                        prop: "corpEnName",
-                        disabled:true,
-                    },
-                    {
                         label: "费用",
                         prop: "feeCnName",
                         rules: [{

src/views/iosBasicData/psBcorps/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row v-show="isShow">
-      <el-col :span="5">
+      <!-- <el-col :span="5">
         <div class="box">
           <el-scrollbar>
             <basic-container>
@@ -16,8 +16,8 @@
             </basic-container>
           </el-scrollbar>
         </div>
-      </el-col>
-      <el-col :span="19">
+      </el-col> -->
+      <el-col :span="24">
         <basic-container class="page-crad">
           <!-- :on-change="handleChange" -->
           <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"