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

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -271,10 +271,26 @@
               <template slot="expand" slot-scope="{row}" >
                   <SplitList :typeMenu="true" :data="row.billsListAllData" :loading="SplitLoading" ></SplitList>
               </template>
-              <!--<temolate slot="billStatus" slot-scope="{row}">-->
-              <!--    &lt;!&ndash;this.c&ndash;&gt;-->
-              <!--    <span v-for="item of ">{{row.billStatus}}</span>-->
-              <!--</temolate>-->
+              <temolate slot="billStatus" slot-scope="{row}">
+                  <span v-if="row.billStatus == item.dictKey"
+                        v-for="(item,index) in billStatusData" :key="index"
+                        :style="{'color':item.colour}" >
+                      {{item.dictValue}}
+                  </span>
+              </temolate>
+              <template slot="accountStatus" slot-scope="{ row }">
+                  <span v-if="row.accountStatus == item.dictKey"
+                        v-for="(item,index) in accountStatusData" :key="index"
+                        :style="{'color':item.colour}" >
+                      {{item.dictValue}}
+                  </span>
+              </template>
+              <template slot="corpCnName" slot-scope="scope">
+                  <span style="color: #1e9fff;cursor: pointer;"
+                        @click.stop="rowCellfun(scope.row, scope.index)" >
+                      {{scope.row.corpCnName}}
+                  </span>
+              </template>
           </avue-crud>
       </basic-container>
 
@@ -827,6 +843,10 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
         data: [],
         // 弹窗数据
         mawbData:[],
+          // 业务状态数据
+          billStatusData:[],
+          // 财务状态
+          accountStatusData:[],
       };
     },
     computed: {
@@ -882,12 +902,14 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
         billStatusWorkDictsfun(){
            getWorkDicts('bill_status').then(res=>{
                this.findObject(this.option.column, "billStatus").dicData = res.data.data;
+               this.billStatusData = res.data.data
            })
         },
         // 获取财务状态字典数据
         accountStatusWorkDictsfun(){
            getWorkDicts('account_status').then(res=>{
               this.findObject(this.option.column, "accountStatus").dicData = res.data.data;
+              this.accountStatusData = res.data.data
            })
         },
         // 添加到主单