修改货代 贸易代理

src/views/financialManagement/paymentSettlement/paymentSettle.vue

@@ -1,304 +1,278 @@
 <template>
-  <basic-container v-if="show">
-    <avue-crud :option="option"
-               :data="dataList"
-               ref="crud"
-               v-model="form"
-               :page.sync="page"
-               :search.sync="search"
-               :table-loading="loading"
-               :cell-style="cellStyle"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @saveColumn="saveColumn"
-               @resetColumn="resetColumn"
-               @on-load="onLoad"
-               @search-criteria-switch="searchCriteriaSwitch">
-      <template slot="corpIdSearch">
-        <crop-select v-model="search.corpId"
-                     :refresh="false"
-                     corpType="KG"/>
-      </template>
-      <template slot="amount" slot-scope="{row}">
-        <span style="color: #FF0000" v-if="row.amount <= 0">{{row.amount}}</span>
-        <span v-else>{{row.amount}}</span>
-      </template>
-      <template slot="menuLeft">
-        <el-button type="primary"
-                   size="small"
-                   icon="el-icon-plus"
-                   @click="addReceipt">创建单据
-        </el-button>
-        <el-button type="warning" size="small" icon="el-icon-top" @click.stop="openExport()">导出</el-button>
-      </template>
-      <template slot-scope="scope" slot="menu">
-        <el-button
-          type="text"
-          size="small"
-          icon="el-icon-delete"
-          @click.stop="rowDel(scope.row, scope.index)"
-        >删除
-        </el-button>
-      </template>
-      <template slot-scope="scope" slot="srcOrderno">
-        <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.srcOrderno }}</span>
-      </template>
-      <template slot-scope="scope" slot="corpId">
-        <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.corpName }}</span>
-      </template>
-    </avue-crud>
-  </basic-container>
-  <detail-page
-    ref="detail"
-    @goBack="goBack"
-    :detailData="detailData"
-    v-else
-  ></detail-page>
+  <div>
+    <basic-container v-show="show">
+      <avue-crud :option="option" :data="dataList" ref="crud" v-model="form" :page.sync="page" :search.sync="search"
+        :table-loading="loading" :cell-style="cellStyle" @search-change="searchChange" @search-reset="searchReset"
+        @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+        @refresh-change="refreshChange" @saveColumn="saveColumn" @resetColumn="resetColumn" @on-load="onLoad"
+        @search-criteria-switch="searchCriteriaSwitch">
+        <template slot="corpIdSearch">
+          <crop-select v-model="search.corpId" :refresh="false" corpType="KG" />
+        </template>
+        <template slot="amount" slot-scope="{row}">
+          <span style="color: #FF0000" v-if="row.amount <= 0">{{ row.amount }}</span>
+          <span v-else>{{ row.amount }}</span>
+        </template>
+        <template slot="menuLeft">
+          <el-button type="primary" size="small" icon="el-icon-plus" @click="addReceipt">创建单据
+          </el-button>
+          <el-button type="warning" size="small" icon="el-icon-top" @click.stop="openExport()">导出</el-button>
+        </template>
+        <template slot-scope="scope" slot="menu">
+          <el-button type="text" size="small" icon="el-icon-delete" @click.stop="rowDel(scope.row, scope.index)">删除
+          </el-button>
+        </template>
+        <template slot-scope="scope" slot="srcOrderno">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.srcOrderno
+            }}</span>
+        </template>
+        <template slot-scope="scope" slot="corpId">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.corpName }}</span>
+        </template>
+      </avue-crud>
+    </basic-container>
+    <detail-page ref="detail" @goBack="goBack" :detailData="detailData" v-if="!show"></detail-page>
+  </div>
+
 </template>
 
 <script>
-  import option from "./configuration/mainList.json";
-  import {getList ,remove} from "@/api/financialManagement/financialManagement"
-  import detailPage from "./paymentSettleDetailsPage";
-  import {getToken} from "@/util/auth";
+import option from "./configuration/mainList.json";
+import { getList, remove } from "@/api/financialManagement/financialManagement"
+import detailPage from "./paymentSettleDetailsPage";
+import { getToken } from "@/util/auth";
 
-  export default {
-    data() {
-      return {
-        loading : false,
-        form: {},
-        search:{},
-        show:true,
-        detailData:{},
-        option: {},
-        parentId:0,
-        dataList: [],
-        page: {
-          pageSize: 10,
-          pagerCount: 5,
-          total: 0,
-        },
-        query:{},
-        configuration:{
-          multipleChoices:false,
-          multiple:false,
-          disabled:false,
-          searchShow:true,
-          collapseTags:false,
-          clearable:true,
-          placeholder:'请点击右边按钮选择',
-          dicData:[]
-        },
-      }
-    },
-    activated() {
-      if(!this.show && !this.$store.getters.paySettle){
-        this.show = true;
-      }
-      setTimeout(() => {
-        if(this.$route.query.params  && this.show){
-          this.detailData={
-            id:this.$route.query.params
-          }
-          this.show = false;
-          this.$store.commit("PAY_IN_DETAIL");
-        }
-      }, 100);
-    },
-    components:{
-      detailPage
-    },
-    async created() {
-      this.option = await this.getColumnData(this.getColumnName(250), option);
-      let i = 0;
-      this.option.column.forEach(item => {
-        if (item.search) i++
-      })
-      if (i % 3 !== 0) {
-        const num = 3 - Number(i % 3)
-        this.option.searchMenuSpan = num * 8;
-        this.option.searchMenuPosition = "right";
-      }
-    },
-    mounted() {
-      // this.option.height = window.innerHeight - 200;
-    },
-    methods: {
-      //新单打开
-      addReceipt(row){
+export default {
+  data() {
+    return {
+      loading: false,
+      form: {},
+      search: {},
+      show: true,
+      detailData: {},
+      option: {},
+      parentId: 0,
+      dataList: [],
+      page: {
+        pageSize: 10,
+        pagerCount: 5,
+        total: 0,
+      },
+      query: {},
+      configuration: {
+        multipleChoices: false,
+        multiple: false,
+        disabled: false,
+        searchShow: true,
+        collapseTags: false,
+        clearable: true,
+        placeholder: '请点击右边按钮选择',
+        dicData: []
+      },
+    }
+  },
+  activated() {
+    if (!this.show && !this.$store.getters.paySettle) {
+      this.show = true;
+    }
+    setTimeout(() => {
+      if (this.$route.query.params && this.show) {
         this.detailData = {
-          id: row.id,
-          status: 1
-        };
+          id: this.$route.query.params
+        }
         this.show = false;
         this.$store.commit("PAY_IN_DETAIL");
-      },
-      //编辑打开
-      editOpen(row){
-        const data = {
-          moduleName: 'ff',
-          tableName: 'finance_settlement',
-          billId: row.id,
-          no: localStorage.getItem('browserID')
-        }
-        this.checkLock(data).then(res => {
-          if (res.data.code == 200) {
-            this.detailData = {
-              disabled: true,
-              id: row.id
-            };
-            this.show = false;
-            this.$store.commit("PAY_IN_DETAIL");
-          }
-        }).catch(error => {
+      }
+    }, 100);
+  },
+  components: {
+    detailPage
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(250), option);
+    let i = 0;
+    this.option.column.forEach(item => {
+      if (item.search) i++
+    })
+    if (i % 3 !== 0) {
+      const num = 3 - Number(i % 3)
+      this.option.searchMenuSpan = num * 8;
+      this.option.searchMenuPosition = "right";
+    }
+  },
+  mounted() {
+    // this.option.height = window.innerHeight - 200;
+  },
+  methods: {
+    //新单打开
+    addReceipt(row) {
+      this.detailData = {
+        id: row.id,
+        status: 1
+      };
+      this.show = false;
+      this.$store.commit("PAY_IN_DETAIL");
+    },
+    //编辑打开
+    editOpen(row) {
+      const data = {
+        moduleName: 'ff',
+        tableName: 'finance_settlement',
+        billId: row.id,
+        no: localStorage.getItem('browserID')
+      }
+      this.checkLock(data).then(res => {
+        if (res.data.code == 200) {
           this.detailData = {
             disabled: true,
             id: row.id
           };
           this.show = false;
           this.$store.commit("PAY_IN_DETAIL");
-        })
-      },
-      rowDel(row, index, done) {
-        if(row.id){
-          this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(() => {
-            remove(row.id).then(res =>{
-              if(res.data.success){
-                this.$message.success("操作成功!");
-                this.onLoad(this.page);
-              }
-            })
-          });
-        }
-      },
-      //点击搜索按钮触发
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done()
-      },
-      searchReset() {
-        console.log('1')
-      },
-      selectionChange() {
-        console.log('1')
-      },
-      currentChange(val) {
-        this.page.currentPage = val
-      },
-      sizeChange() {
-        console.log('1')
-      },
-      refreshChange(params) {
-        this.onLoad(this.page,params)
-      },
-      paramsAdjustment(params) {
-        params = Object.assign({}, this.search);
-        if (params.settlementDate &&  params.settlementDate.length !==0 ) {  //合同
-          params.settlementStartDate = params.settlementDate[0]+ " " + "00:00:00";
-          params.settlementEndDate = params.settlementDate[1] + " " + "23:59:59";
-          this.$delete(params,'settlementDate')
-        }
-        if (params.completionTime &&  params.completionTime.length !==0 ) {
-          params.completionTimeStart = params.completionTime[0]+ " " + "00:00:00";
-          params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
-          this.$delete(params,'completionTime')
         }
-        return params
-      },
-      onLoad(page, params) {
-        this.loading = true
-        params =  this.paramsAdjustment(params)
-        params.billType = "付费"
-        params.settlementType = 1
+      }).catch(error => {
+        this.detailData = {
+          disabled: true,
+          id: row.id
+        };
+        this.show = false;
+        this.$store.commit("PAY_IN_DETAIL");
+      })
+    },
+    rowDel(row, index, done) {
+      if (row.id) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          remove(row.id).then(res => {
+            if (res.data.success) {
+              this.$message.success("操作成功!");
+              this.onLoad(this.page);
+            }
+          })
+        });
+      }
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done()
+    },
+    searchReset() {
+      console.log('1')
+    },
+    selectionChange() {
+      console.log('1')
+    },
+    currentChange(val) {
+      this.page.currentPage = val
+    },
+    sizeChange() {
+      console.log('1')
+    },
+    refreshChange(params) {
+      this.onLoad(this.page, params)
+    },
+    paramsAdjustment(params) {
+      params = Object.assign({}, this.search);
+      if (params.settlementDate && params.settlementDate.length !== 0) {  //合同
+        params.settlementStartDate = params.settlementDate[0] + " " + "00:00:00";
+        params.settlementEndDate = params.settlementDate[1] + " " + "23:59:59";
+        this.$delete(params, 'settlementDate')
+      }
+      if (params.completionTime && params.completionTime.length !== 0) {
+        params.completionTimeStart = params.completionTime[0] + " " + "00:00:00";
+        params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
+        this.$delete(params, 'completionTime')
+      }
+      return params
+    },
+    onLoad(page, params) {
+      this.loading = true
+      params = this.paramsAdjustment(params)
+      params.billType = "付费"
+      params.settlementType = 1
 
-        getList(page.currentPage, page.pageSize,params).then(res =>{
-          this.dataList = res.data.data.records
-          this.page.total = res.data.data.total
-          if (this.page.total) {
-            this.option.height = window.innerHeight - 240;
-          }
-        }).finally(()=>{
-          this.loading = false
-        })
-      },
-      searchCriteriaSwitch(type){
-        if (type){
-          this.option.height = this.option.height - 90
-        }else {
-          this.option.height = this.option.height + 90
+      getList(page.currentPage, page.pageSize, params).then(res => {
+        this.dataList = res.data.data.records
+        this.page.total = res.data.data.total
+        if (this.page.total) {
+          this.option.height = window.innerHeight - 240;
         }
-        this.$refs.crud.getTableHeight()
-      },
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 90
+      } else {
+        this.option.height = this.option.height + 90
+      }
+      this.$refs.crud.getTableHeight()
+    },
 
-      goBack() {
-        this.detailData=this.$options.data().detailData
-        this.show = true;
-        this.onLoad(this.page,this.search)
-      },
-      cellStyle() {
-        return "padding:0;height:40px;";
-      },
-      //列保存触发
-      async saveColumn() {
-        const inSave = await this.saveColumnData(
-          this.getColumnName(250),
-          this.option
-        );
-        if (inSave) {
-          this.$message.success("保存成功");
-          //关闭窗口
-          this.$refs.crud.$refs.dialogColumn.columnBox = false;
-        }
-      },
-      async resetColumn() {
-        const inSave = await this.delColumnData(
-          this.getColumnName(250),
-          option
-        );
-        if (inSave) {
-          this.$message.success("重置成功");
-          this.option = option;
-          //关闭窗口
-          this.$refs.crud.$refs.dialogColumn.columnBox = false;
-        }
-      },
-      openExport() {
-        let params = JSON.parse(JSON.stringify(this.search))
-        if (params.settlementDate &&  params.settlementDate.length !==0 ) {  //合同
-          params.settlementStartDate = params.settlementDate[0]+ " " + "00:00:00";
-          params.settlementEndDate = params.settlementDate[1] + " " + "23:59:59";
-          this.$delete(params,'settlementDate')
-        }
-        if (params.completionTime &&  params.completionTime.length !==0 ) {
-          params.completionTimeStart = params.completionTime[0]+ " " + "00:00:00";
-          params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
-          this.$delete(params,'completionTime')
+    goBack() {
+      this.detailData = this.$options.data().detailData
+      this.show = true;
+      this.onLoad(this.page, this.search)
+    },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    //列保存触发
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(250),
+        this.option
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    async resetColumn() {
+      const inSave = await this.delColumnData(
+        this.getColumnName(250),
+        option
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.option = option;
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    openExport() {
+      let params = JSON.parse(JSON.stringify(this.search))
+      if (params.settlementDate && params.settlementDate.length !== 0) {  //合同
+        params.settlementStartDate = params.settlementDate[0] + " " + "00:00:00";
+        params.settlementEndDate = params.settlementDate[1] + " " + "23:59:59";
+        this.$delete(params, 'settlementDate')
+      }
+      if (params.completionTime && params.completionTime.length !== 0) {
+        params.completionTimeStart = params.completionTime[0] + " " + "00:00:00";
+        params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
+        this.$delete(params, 'completionTime')
+      }
+      params.billType = "付费"
+      params.settlementType = 1
+      console.log(params)
+      const routeData = this.$router.resolve({
+        path: '/api/trade-finance/settlement/expenseExport',      //跳转目标窗口的地址
+        query: {
+          ...params    //括号内是要传递给新窗口的参数
         }
-        params.billType = "付费"
-        params.settlementType = 1
-        console.log(params)
-        const routeData = this.$router.resolve({
-          path: '/api/trade-finance/settlement/expenseExport',      //跳转目标窗口的地址
-          query: {
-            ...params    //括号内是要传递给新窗口的参数
-          }
-        })
-        window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
-      },
-    }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+    },
   }
+}
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

src/views/financialManagement/receiptSettle/receiptSettle.vue

@@ -1,295 +1,268 @@
 <template>
-  <basic-container v-if="show">
-    <avue-crud :option="option"
-               :data="dataList"
-               ref="crud"
-               v-model="form"
-               :page.sync="page"
-               :search.sync="search"
-               :table-loading="loading"
-               :cell-style="cellStyle"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @saveColumn="saveColumn"
-               @resetColumn="resetColumn"
-               @on-load="onLoad"
-               @search-criteria-switch="searchCriteriaSwitch">
-      <template slot="corpIdSearch">
-        <select-component
-          v-model="search.corpId"
-          :configuration="configuration"
-        ></select-component>
-      </template>
-      <template slot="menuLeft">
-        <el-button type="primary"
-                   size="small"
-                   icon="el-icon-plus"
-                   @click="addReceipt">创建单据
-        </el-button>
-        <el-button type="warning" size="small" icon="el-icon-top" @click.stop="openExport()">导出</el-button>
-      </template>
-      <template slot-scope="scope" slot="menu">
-        <el-button
-          type="text"
-          size="small"
-          icon="el-icon-delete"
-          @click.stop="rowDel(scope.row, scope.index)"
-        >删除
-        </el-button>
-      </template>
-      <template slot-scope="scope" slot="srcOrderno">
-        <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.srcOrderno }}</span>
-      </template>
-      <template slot-scope="scope" slot="corpId">
-        <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.corpName }}</span>
-      </template>
-    </avue-crud>
-  </basic-container>
-  <detail-page
-    ref="detail"
-    @goBack="goBack"
-    :detailData="detailData"
-    v-else
-  ></detail-page>
+  <div>
+    <basic-container v-show="show">
+      <avue-crud :option="option" :data="dataList" ref="crud" v-model="form" :page.sync="page" :search.sync="search"
+        :table-loading="loading" :cell-style="cellStyle" @search-change="searchChange" @search-reset="searchReset"
+        @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+        @refresh-change="refreshChange" @saveColumn="saveColumn" @resetColumn="resetColumn" @on-load="onLoad"
+        @search-criteria-switch="searchCriteriaSwitch">
+        <template slot="corpIdSearch">
+          <select-component v-model="search.corpId" :configuration="configuration"></select-component>
+        </template>
+        <template slot="menuLeft">
+          <el-button type="primary" size="small" icon="el-icon-plus" @click="addReceipt">创建单据
+          </el-button>
+          <el-button type="warning" size="small" icon="el-icon-top" @click.stop="openExport()">导出</el-button>
+        </template>
+        <template slot-scope="scope" slot="menu">
+          <el-button type="text" size="small" icon="el-icon-delete" @click.stop="rowDel(scope.row, scope.index)">删除
+          </el-button>
+        </template>
+        <template slot-scope="scope" slot="srcOrderno">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.srcOrderno
+            }}</span>
+        </template>
+        <template slot-scope="scope" slot="corpId">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(scope.row)">{{ scope.row.corpName }}</span>
+        </template>
+      </avue-crud>
+    </basic-container>
+    <detail-page ref="detail" @goBack="goBack" :detailData="detailData" v-if="!show"></detail-page>
+  </div>
+
 </template>
 
 <script>
-  import option from "./configuration/mainList.json";
-  import {getList ,remove} from "@/api/financialManagement/financialManagement"
-  import detailPage from "./receiptSettleDetailsPage.vue";
-  import {getToken} from "@/util/auth";
+import option from "./configuration/mainList.json";
+import { getList, remove } from "@/api/financialManagement/financialManagement"
+import detailPage from "./receiptSettleDetailsPage.vue";
+import { getToken } from "@/util/auth";
 
-  export default {
-    data() {
-      return {
-        loading : false,
-        form: {},
-        search:{},
-        option: {},
-        parentId:0,
-        show:true,
-        detailData:{},
-        dataList: [{
-          canem:""
-        }],
-        page: {
-          pageSize: 10,
-          pagerCount: 5,
-          total: 0,
-        },
-        query:{},
-        configuration:{
-          multipleChoices:false,
-          multiple:false,
-          disabled:false,
-          searchShow:true,
-          collapseTags:false,
-          clearable:true,
-          placeholder:'请点击右边按钮选择',
-          dicData:[]
-        },
+export default {
+  data() {
+    return {
+      loading: false,
+      form: {},
+      search: {},
+      option: {},
+      parentId: 0,
+      show: true,
+      detailData: {},
+      dataList: [{
+        canem: ""
+      }],
+      page: {
+        pageSize: 10,
+        pagerCount: 5,
+        total: 0,
+      },
+      query: {},
+      configuration: {
+        multipleChoices: false,
+        multiple: false,
+        disabled: false,
+        searchShow: true,
+        collapseTags: false,
+        clearable: true,
+        placeholder: '请点击右边按钮选择',
+        dicData: []
+      },
+    }
+  },
+  components: {
+    detailPage
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(64), option);
+    let i = 0;
+    this.option.column.forEach(item => {
+      if (item.search) i++
+    })
+    if (i % 3 !== 0) {
+      const num = 3 - Number(i % 3)
+      this.option.searchMenuSpan = num * 8;
+      this.option.searchMenuPosition = "right";
+    }
+  },
+  activated() {
+    if (this.$route.query.id) {
+      this.show = true;
+      this.$store.commit("COLL_OPEN_EXPORT_DETAIL");
+      this.editOpen({ id: this.$route.query.id });
+    }
+  },
+  mounted() {
+    // this.option.height = window.innerHeight - 200;
+  },
+  methods: {
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 90
+      } else {
+        this.option.height = this.option.height + 90
       }
+      this.$refs.crud.getTableHeight()
     },
-    components:{
-      detailPage
-    },
-    async created() {
-      this.option = await this.getColumnData(this.getColumnName(64), option);
-      let i = 0;
-      this.option.column.forEach(item => {
-        if (item.search) i++
-      })
-      if (i % 3 !== 0) {
-        const num = 3 - Number(i % 3)
-        this.option.searchMenuSpan = num * 8;
-        this.option.searchMenuPosition = "right";
-      }
+    //新单打开
+    addReceipt(row) {
+      this.detailData = {
+        id: row.id,
+        status: 1,
+        corpId: row.corpId,
+      };
+      this.show = false;
     },
-    activated() {
-      if (this.$route.query.id) {
-        this.show = true;
-        this.$store.commit("COLL_OPEN_EXPORT_DETAIL");
-        this.editOpen({ id: this.$route.query.id });
+    //编辑打开
+    editOpen(row) {
+      const data = {
+        moduleName: 'sf',
+        tableName: 'finance_settlement',
+        billId: row.id,
+        no: localStorage.getItem('browserID')
       }
-    },
-    mounted() {
-      // this.option.height = window.innerHeight - 200;
-    },
-    methods: {
-      searchCriteriaSwitch(type){
-        if (type){
-          this.option.height = this.option.height - 90
-        }else {
-          this.option.height = this.option.height + 90
-        }
-        this.$refs.crud.getTableHeight()
-      },
-      //新单打开
-      addReceipt(row){
-        this.detailData = {
-          id: row.id,
-          status: 1,
-            corpId:row.corpId,
-        };
-        this.show = false;
-      },
-      //编辑打开
-      editOpen(row){
-        const data = {
-          moduleName: 'sf',
-          tableName: 'finance_settlement',
-          billId: row.id,
-          no: localStorage.getItem('browserID')
-        }
-        this.checkLock(data).then(res => {
-          if (res.data.code == 200) {
-            this.detailData = {
-              disabled: true,
-              id: row.id,
-              corpId:row.corpId,
-            };
-            this.show = false;
-          }
-        }).catch(error => {
+      this.checkLock(data).then(res => {
+        if (res.data.code == 200) {
           this.detailData = {
             disabled: true,
             id: row.id,
-              corpId:row.corpId,
+            corpId: row.corpId,
           };
           this.show = false;
-        })
-      },
-      rowDel(row, index, done) {
-        if(row.id){
-          this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(() => {
-            remove(row.id).then(res =>{
-              if(res.data.success){
-                this.$message.success("操作成功!");
-                this.onLoad(this.page);
-              }
-            })
-          });
-        }
-      },
-      //点击搜索按钮触发
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done()
-      },
-      searchReset() {
-        console.log('1')
-      },
-      selectionChange() {
-        console.log('1')
-      },
-      currentChange(val) {
-        this.page.currentPage = val
-      },
-      sizeChange() {
-        console.log('1')
-      },
-      refreshChange(params) {
-        this.onLoad(this.page,params)
-      },
-      paramsAdjustment(params) {
-        params = Object.assign({}, this.search);
-        if (params.settlementDate &&  params.settlementDate.length !==0 ) {  //合同
-          params.settlementStartDate = params.settlementDate[0]+ " " + "00:00:00";
-          params.settlementEndDate = params.settlementDate[1] + " " + "23:59:59";
-          this.$delete(params,'settlementDate')
         }
+      }).catch(error => {
+        this.detailData = {
+          disabled: true,
+          id: row.id,
+          corpId: row.corpId,
+        };
+        this.show = false;
+      })
+    },
+    rowDel(row, index, done) {
+      if (row.id) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          remove(row.id).then(res => {
+            if (res.data.success) {
+              this.$message.success("操作成功!");
+              this.onLoad(this.page);
+            }
+          })
+        });
+      }
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done()
+    },
+    searchReset() {
+      console.log('1')
+    },
+    selectionChange() {
+      console.log('1')
+    },
+    currentChange(val) {
+      this.page.currentPage = val
+    },
+    sizeChange() {
+      console.log('1')
+    },
+    refreshChange(params) {
+      this.onLoad(this.page, params)
+    },
+    paramsAdjustment(params) {
+      params = Object.assign({}, this.search);
+      if (params.settlementDate && params.settlementDate.length !== 0) {  //合同
+        params.settlementStartDate = params.settlementDate[0] + " " + "00:00:00";
+        params.settlementEndDate = params.settlementDate[1] + " " + "23:59:59";
+        this.$delete(params, 'settlementDate')
+      }
 
-        if (params.completionTime &&  params.completionTime.length !==0 ) {
-          params.completionTimeStart = params.completionTime[0]+ " " + "00:00:00";
-          params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
-          this.$delete(params,'completionTime')
-        }
-        return params
-      },
-      onLoad(page, params) {
-        this.loading = true
-        params = this.paramsAdjustment(params)
-        params.billType = "收费"
-        params.settlementType = 1
+      if (params.completionTime && params.completionTime.length !== 0) {
+        params.completionTimeStart = params.completionTime[0] + " " + "00:00:00";
+        params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
+        this.$delete(params, 'completionTime')
+      }
+      return params
+    },
+    onLoad(page, params) {
+      this.loading = true
+      params = this.paramsAdjustment(params)
+      params.billType = "收费"
+      params.settlementType = 1
 
-        getList(page.currentPage, page.pageSize,params).then(res =>{
-          this.dataList = res.data.data.records
-          this.page.total = res.data.data.total
-          if (this.page.total) {
-            this.option.height = window.innerHeight - 240;
-          }
-        }).finally(()=>{
-          this.loading = false
-        })
-      },
-      goBack() {
-        this.detailData=this.$options.data().detailData
-        this.show = true;
-        this.onLoad(this.page,this.search)
-      },
-      cellStyle() {
-        return "padding:0;height:40px;";
-      },
-      //列保存触发
-      async saveColumn() {
-        const inSave = await this.saveColumnData(
-          this.getColumnName(64),
-          this.option
-        );
-        if (inSave) {
-          this.$message.success("保存成功");
-          //关闭窗口
-          this.$refs.crud.$refs.dialogColumn.columnBox = false;
-        }
-      },
-      async resetColumn() {
-        const inSave = await this.delColumnData(
-          this.getColumnName(64),
-          option
-        );
-        if (inSave) {
-          this.$message.success("重置成功");
-          this.option = option;
-          //关闭窗口
-          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      getList(page.currentPage, page.pageSize, params).then(res => {
+        this.dataList = res.data.data.records
+        this.page.total = res.data.data.total
+        if (this.page.total) {
+          this.option.height = window.innerHeight - 240;
         }
-      },
-      openExport() {
-        let params = JSON.parse(JSON.stringify(this.search))
-        if (params.settlementDate &&  params.settlementDate.length !==0 ) {  //合同
-          params.settlementStartDate = params.settlementDate[0]+ " " + "00:00:00";
-          params.settlementEndDate = params.settlementDate[1] + " " + "23:59:59";
-          this.$delete(params,'settlementDate')
-        }
-        if (params.completionTime &&  params.completionTime.length !==0 ) {
-          params.completionTimeStart = params.completionTime[0]+ " " + "00:00:00";
-          params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
-          this.$delete(params,'completionTime')
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    goBack() {
+      this.detailData = this.$options.data().detailData
+      this.show = true;
+      this.onLoad(this.page, this.search)
+    },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    //列保存触发
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(64),
+        this.option
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    async resetColumn() {
+      const inSave = await this.delColumnData(
+        this.getColumnName(64),
+        option
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.option = option;
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    openExport() {
+      let params = JSON.parse(JSON.stringify(this.search))
+      if (params.settlementDate && params.settlementDate.length !== 0) {  //合同
+        params.settlementStartDate = params.settlementDate[0] + " " + "00:00:00";
+        params.settlementEndDate = params.settlementDate[1] + " " + "23:59:59";
+        this.$delete(params, 'settlementDate')
+      }
+      if (params.completionTime && params.completionTime.length !== 0) {
+        params.completionTimeStart = params.completionTime[0] + " " + "00:00:00";
+        params.completionTimeEnd = params.completionTime[1] + " " + "23:59:59";
+        this.$delete(params, 'completionTime')
+      }
+      params.billType = "收费"
+      params.settlementType = 1
+      const routeData = this.$router.resolve({
+        path: '/api/trade-finance/settlement/expenseExport',      //跳转目标窗口的地址
+        query: {
+          ...params    //括号内是要传递给新窗口的参数
         }
-        params.billType = "收费"
-        params.settlementType = 1
-        const routeData = this.$router.resolve({
-          path: '/api/trade-finance/settlement/expenseExport',      //跳转目标窗口的地址
-          query: {
-            ...params    //括号内是要传递给新窗口的参数
-          }
-        })
-        window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
-      },
-    }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+    },
   }
+}
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

src/views/financialManagement/rechargeDetails/rechargeDetails.vue

@@ -1,5 +1,5 @@
 <template>
-    <basic-container v-if="show">
+    <basic-container v-show="show">
         <avue-crud :option="option"
                    :data="dataList"
                    ref="crud"

src/views/financialManagementF/agreementprice/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <basic-container v-if="isShow">
+        <basic-container v-show="isShow">
             <avue-crud :option="option"
                        :table-loading="loading"
                        :data="data"

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <basic-container v-if="isShow">
+        <basic-container v-show="isShow">
             <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" id="out-table"
                 :header-cell-class-name="headerClassName" :permission="permissionList" :before-open="beforeOpen"
                 v-model="form" ref="crud" :search.sync="query" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-      <basic-container v-if="isShow">
+      <basic-container v-show="isShow">
           <avue-crud :option="option"
                      :table-loading="loading"
                      :data="data"

src/views/iosBasicData/ComputationCenter/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <basic-container v-if="isShow">
+        <basic-container v-show="isShow">
             <div style="margin-top: 10px">
                 <el-tabs type="card" v-model="tabsValue" @tab-click="handleClick">
                     <el-tab-pane label="待付" name="C">

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <basic-container v-if="isShow">
+        <basic-container v-show="isShow">
             <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" id="out-table"
                 :header-cell-class-name="headerClassName" :permission="permissionList" :before-open="beforeOpen"
                 v-model="form" ref="crud" :search.sync="query" @row-update="rowUpdate" @row-save="rowSave"

src/views/iosBasicData/PaymentApplication/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="isShow">
+    <basic-container v-show="isShow">
       <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"

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

@@ -2,63 +2,62 @@
     <div>
         <el-form :model="assemblyForm" ref="form" label-width="90px" class="demo-ruleForm" :disabled="disabled">
             <el-row>
+                <el-button icon="el-icon-plus" size="small" type="primary" style="margin: 5px;"
+                    @click="inHmmEdi">现代EDI</el-button>
+            </el-row>
+            <el-row>
                 <el-col :span="12">
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="ERNNO" prop="ediErnno" >
+                            <el-form-item label="ERNNO" prop="ediErnno">
                                 <span slot="label">
                                     <span style="color: #1e9fff">ERNNO</span>
                                 </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediErnno"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="请输入ERNNO" ></el-input>
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                    placeholder="请输入ERNNO"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="VAENO" prop="ediVaeno" >
+                            <el-form-item label="VAENO" prop="ediVaeno">
                                 <span slot="label">
                                     <span style="color: #1e9fff">VAENO</span>
                                 </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediVaeno"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="请输入VAENO" ></el-input>
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                    placeholder="请输入VAENO"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="TACNO" prop="ediTacno" >
+                            <el-form-item label="TACNO" prop="ediTacno">
                                 <span slot="label">
                                     <span style="color: #1e9fff">TACNO</span>
                                 </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediTacno"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="请输入TACNO" ></el-input>
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                    placeholder="请输入TACNO"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="IEMAL" prop="ediIemail" >
+                            <el-form-item label="IEMAL" prop="ediIemail">
                                 <span slot="label">
                                     <span style="color: #1e9fff">IEMAL</span>
                                 </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediIemail"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="请输入IEMAL" ></el-input>
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                    placeholder="请输入IEMAL"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
-                    <el-form-item label="订舱备注" prop="bookingRemarks" >
+                    <el-form-item label="订舱备注" prop="bookingRemarks">
                         <span slot="label">
-                             <span style="color: #1e9fff">订舱备注</span>
+                            <span style="color: #1e9fff">订舱备注</span>
                         </span>
                         <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.bookingRemarks"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled" rows="3"
-                                  clearable placeholder="请输入订舱备注" ></el-input>
+                            size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="3" clearable
+                            placeholder="请输入订舱备注"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -72,55 +71,47 @@
                         <!--    </el-form-item>-->
                         <!--</el-col>-->
                         <el-col :span="12">
-                            <el-form-item label="IEIEC" prop="ediIeiec" >
+                            <el-form-item label="IEIEC" prop="ediIeiec">
                                 <span slot="label">
                                     <span style="color: #1e9fff">IEIEC</span>
                                 </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediIeiec"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="请输入IEIEC" ></el-input>
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                    placeholder="请输入IEIEC"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="IEGSTIN" prop="ediIegstin" >
+                            <el-form-item label="IEGSTIN" prop="ediIegstin">
                                 <span slot="label">
                                     <span style="color: #1e9fff">IEGSTIN</span>
                                 </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.detail.ediIegstin"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="请输入IEGSTIN" ></el-input>
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                                    placeholder="请输入IEGSTIN"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="PIL HBL" prop="pilHbl" >
+                            <el-form-item label="PIL HBL" prop="pilHbl">
                                 <span slot="label">
                                     <span style="color: #1e9fff">PIL HBL</span>
                                 </span>
-                                <search-query :datalist="pilHblData"
-                                              :selectValue="assemblyForm.pilHbl"
-                                              :clearable="true"
-                                              :disabled="detailData.seeDisabled"
-                                              :buttonIf="false"
-                                              :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey',}"
-                                              placeholder="请选择PIL HBL"
-                                              @corpChange="pilHblChange"
-                                              @corpFocus="pilHblfun" >
+                                <search-query :datalist="pilHblData" :selectValue="assemblyForm.pilHbl"
+                                    :clearable="true" :disabled="detailData.seeDisabled" :buttonIf="false"
+                                    :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey', }"
+                                    placeholder="请选择PIL HBL" @corpChange="pilHblChange" @corpFocus="pilHblfun">
                                 </search-query>
                             </el-form-item>
                         </el-col>
                     </el-row>
-                    <el-form-item label="SI备注" prop="siRemarks" >
+                    <el-form-item label="SI备注" prop="siRemarks">
                         <span slot="label">
                             <span style="color: #1e9fff">SI备注</span>
                         </span>
-                        <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.siRemarks"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled" rows="3"
-                                  clearable placeholder="请输入SI备注" ></el-input>
+                        <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.siRemarks" size="small"
+                            autocomplete="off" :disabled="detailData.seeDisabled" rows="3" clearable
+                            placeholder="请输入SI备注"></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -131,39 +122,271 @@
 </template>
 
 <script>
-    import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {getWorkDicts} from "@/api/system/dictbiz";
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+import { getWorkDicts } from "@/api/system/dictbiz";
 
-    export default {
-        components: {SearchQuery},
-        props:{
-            assemblyForm:{
-                type:Object
-            },
-            detailData:{
-                type:Boolean,
-            },
+export default {
+    components: { SearchQuery },
+    props: {
+        assemblyForm: {
+            type: Object
+        },
+        detailData: {
+            type: Boolean,
+        },
         disabled: {
             type: Boolean,
             default: false
         }
+    },
+    data() {
+        return {
+            pilHblData: [],
+        }
+    },
+    methods: {
+        pilHblChange(value) {
+            this.$set(this.assemblyForm, 'pilHbl', value)
         },
-        data(){
-            return {
-                pilHblData:[],
-            }
+        pilHblfun() {
+            getWorkDicts('pilhbl_los').then(res => {
+                this.pilHblData = res.data.data
+            })
         },
-        methods:{
-            pilHblChange(value){
-                this.$set(this.assemblyForm,'pilHbl',value)
-            },
-            pilHblfun(){
-                getWorkDicts('pilhbl_los').then(res=>{
-                    this.pilHblData = res.data.data
-                })
-            },
+        inHmmEdi() {
+            if (!this.assemblyForm.id) {
+                return this.$message.error('请先保存数据');
+            }
+            this.$DialogForm.show({
+                title: 'HMM EDI信息',
+                width: '70%',
+                data: this.assemblyForm.hmmEdi,
+                menuPosition: 'right',
+                option: {
+                    submitText: '保存',
+                    emptyText: '取消',
+                    labelWidth: 130,
+                    column: [
+                        {
+                            label: "欧线ENS申报标识",
+                            span: 8,
+                            prop: "emsDeclarationIdentification",
+                            type: 'select',
+                            dicUrl: "/api/blade-system/dict-biz/dictionary?code=ENS_Identification",
+                            props: {
+                                label: "dictValue",
+                                value: "dictValue"
+                            },
+                            rules: [{
+                                required: true,
+                                message: "请输入欧线ENS申报标识",
+                                trigger: "blur",
+                            }],
+                        },
+                        {
+                            label: "舱单类型",
+                            span: 8,
+                            prop: "manifestType",
+                            type: 'select',
+                            dicUrl: "/api/blade-system/dict-biz/dictionary?code=manifest_Type",
+                            props: {
+                                label: "dictValue",
+                                value: "dictValue"
+                            },
+                        },
+                        {
+                            label: "",
+                            span: 8,
+                            prop: "europeanLineSign",
+                            type: 'checkbox',
+                            dataType: 'string',
+                            dicData: [{
+                                label: '欧线标识',
+                                value: 1
+                            }]
+                        },
+                        {
+                            label: "补充申报人",
+                            span: 12,
+                            prop: "applicant",
+                            row: true
+                        },
+                        {
+                            label: "发货人代码",
+                            span: 12,
+                            prop: "shipperCode",
+                        },
+                        {
+                            label: "实际发货人代码",
+                            span: 12,
+                            prop: "actualShipperCode",
+                        },
+                        {
+                            label: "发货人邮政信箱",
+                            span: 12,
+                            prop: "shipperEmail",
+                        },
+                        {
+                            label: "实际发货人名称",
+                            span: 12,
+                            prop: "actualShipperName",
+                        },
+                        {
+                            label: "发货人街道号码",
+                            span: 12,
+                            prop: "shipperStreetNo",
+                        },
+                        {
+                            label: "实际发货人地址",
+                            span: 12,
+                            prop: "actualShipperAddress",
+                        },
+                        {
+                            label: "发货人街道名称",
+                            span: 12,
+                            prop: "shipperStreetName",
+                        },
+                        {
+                            label: "实际发货人邮政信箱",
+                            span: 12,
+                            prop: "actualShipperEmail",
+                        },
+                        {
+                            label: "发货人邮政编码",
+                            span: 12,
+                            prop: "shipperPostalCode",
+                        },
+                        {
+                            label: "实际发货人街道号码",
+                            span: 12,
+                            prop: "actualShipperStreetNo",
+                        },
+                        {
+                            label: "收货人代码",
+                            span: 12,
+                            prop: "consigneeCode",
+                        },
+                        {
+                            label: "实际发货人街道名称",
+                            span: 12,
+                            prop: "actualShipperStreetName",
+                        },
+                        {
+                            label: "收货人邮政信箱",
+                            span: 12,
+                            prop: "consigneeEmail",
+                        },
+                        {
+                            label: "实际发货人邮政编码",
+                            span: 12,
+                            prop: "actualShipperPostalCode",
+                        },
+                        {
+                            label: "收货人街道号码",
+                            span: 12,
+                            prop: "consigneeStreetNo",
+                        },
+                        {
+                            label: "实际收货人代码",
+                            span: 12,
+                            prop: "actualConsigneeCode",
+                        },
+                        {
+                            label: "收货人街道名称",
+                            span: 12,
+                            prop: "consigneeStreetName",
+                        },
+                        {
+                            label: "实际收货人名称",
+                            span: 12,
+                            prop: "actualConsigneeName",
+                        },
+                        {
+                            label: "收货人邮政编码",
+                            span: 12,
+                            prop: "consigneePostalCode",
+                        },
+                        {
+                            label: "实际收货人地址",
+                            span: 12,
+                            prop: "actualConsigneeAddress",
+                        },
+                        {
+                            label: "通知人代码",
+                            span: 12,
+                            prop: "notifierCode",
+                        },
+                        {
+                            label: "实际收货人邮政信箱",
+                            span: 12,
+                            prop: "actualConsigneeEmail",
+                        },
+                        {
+                            label: "通知人邮政信箱",
+                            span: 12,
+                            prop: "notifierEmail",
+                        },
+                        {
+                            label: "实际收货人街道号码",
+                            span: 12,
+                            prop: "actualConsigneeStreetNo",
+                        },
+                        {
+                            label: "通知人街道号码",
+                            span: 12,
+                            prop: "notifierStreetNo",
+                        },
+                        {
+                            label: "实际收货人街道名称",
+                            span: 12,
+                            prop: "actualConsigneeStreetName",
+                        },
+                        {
+                            label: "通知人街道名称",
+                            span: 12,
+                            prop: "notifierStreetName",
+                        },
+                        {
+                            label: "实际收货人邮政编码",
+                            span: 12,
+                            prop: "actualConsigneePostalCode",
+                        },
+                        {
+                            label: "通知人电话",
+                            span: 12,
+                            prop: "notifierTel",
+                        },
+                        {
+                            label: "化工品标识",
+                            span: 12,
+                            prop: "chemicalIdentification",
+                            type: 'select',
+                            dicUrl: "/api/blade-system/dict-biz/dictionary?code=chemical_Identification",
+                            props: {
+                                label: "dictValue",
+                                value: "dictValue"
+                            },
+                        },
+                        {
+                            label: "通知人邮政编码",
+                            span: 12,
+                            prop: "notifierPostalCode",
+                        }
+                    ]
+                },
+                beforeClose: (done) => {
+                    done()
+                },
+                callback: (res) => {
+                    res.done()
+                    console.log(res.data, 'hmmEdi')
+                    this.assemblyForm.hmmEdi = res.data
+                    res.close()
+                }
+            })
         }
     }
+}
 
 </script>
 

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <basic-container v-if="isShow">
+        <basic-container v-show="isShow">
             <avue-crud :option="optionBack" :table-loading="loading" :data="data" :page.sync="page" id="out-table"
                 :header-cell-class-name="headerClassName" :permission="permissionList" :before-open="beforeOpen"
                 v-model="form" ref="crud" :search.sync="query" @row-update="rowUpdate" @row-save="rowSave"

src/views/iosBasicData/accounts/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-      <basic-container v-if="isShow">
+      <basic-container v-show="isShow">
           <avue-crud :option="option"
                      :table-loading="loading"
                      :data="data"

src/views/iosBasicData/advanceCharge/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <basic-container v-if="isShow">
+        <basic-container v-show="isShow">
             <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
                 v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
                 @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"

src/views/iosBasicData/aeamends/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-      <basic-container v-if="isShow">
+      <basic-container v-show="isShow">
           <avue-crud :option="option"
                      :table-loading="loading"
                      :data="data"

src/views/iosBasicData/aiamends/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-      <basic-container v-if="isShow">
+      <basic-container v-show="isShow">
           <avue-crud :option="option"
                      :table-loading="loading"
                      :data="data"

src/views/iosBasicData/baccitemstype/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="isShow">
+    <basic-container v-show="isShow">
       <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" :search.sync="search"
         v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"

src/views/iosBasicData/bports/index.vue

@@ -1,7 +1,7 @@
 <!--港口-->
 <template>
   <div>
-    <basic-container v-if="isShow">
+    <basic-container v-show="isShow">
       <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" :search.sync="search"
         v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"

src/views/iosBasicData/fininvoices/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="isShow">
+    <basic-container v-show="isShow">
       <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
         :before-open="beforeOpen" v-model="form" ref="crud" id="out-table" :header-cell-class-name="headerClassName"
         @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @search-change="searchChange"

src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="isShow">
+    <basic-container v-show="isShow">
       <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
         :before-open="beforeOpen" v-model="form" ref="crud" id="out-table" :header-cell-class-name="headerClassName"
         @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @search-change="searchChange"

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <basic-container v-if="isShow">
+        <basic-container v-show="isShow">
             <div style="margin-top: 10px">
                 <el-tabs type="card" v-model="tabsValue" @tab-click="handleClick">
                     <el-tab-pane label="任务列表" name="申请">

src/views/iosBasicData/finstlbills/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="isShow">
+    <basic-container v-show="isShow">
       <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"

src/views/iosBasicData/losbfeestemplate/index.vue

@@ -1,7 +1,7 @@
 <!--费用模板-->
 <template>
   <div>
-    <el-row v-if="isShow">
+    <el-row v-show="isShow">
       <el-col :span="5">
         <div class="box">
           <el-scrollbar>

src/views/iosBasicData/reportClose/AEreportClose/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <basic-container v-if="isShow">
+        <basic-container v-show="isShow">
             <avue-crud :option="option"
                        :table-loading="loading"
                        :data="data"

src/views/iosBasicData/reportClose/AIreportClose/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <basic-container v-if="isShow">
+        <basic-container v-show="isShow">
             <avue-crud :option="option"
                        :table-loading="loading"
                        :data="data"

src/views/iosBasicData/reportClose/SEreportClose/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <basic-container v-if="isShow">
+        <basic-container v-show="isShow">
             <avue-crud :option="option"
                        :table-loading="loading"
                        :data="data"

src/views/iosBasicData/reportClose/SIreportClose/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <basic-container v-if="isShow">
+        <basic-container v-show="isShow">
             <avue-crud :option="option"
                        :table-loading="loading"
                        :data="data"

src/views/iosBasicData/seamends/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="isShow">
+    <basic-container v-show="isShow">
       <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
         :before-open="beforeOpen" v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud"
         @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @search-change="searchChange"

src/views/iosBasicData/siamends/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="isShow">
+    <basic-container v-show="isShow">
       <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
         :before-open="beforeOpen" v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud"
         @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @search-change="searchChange"

src/views/serviceConfiguration/configurationModification/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <basic-container v-if="isShow">
+        <basic-container v-show="isShow">
             <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
                 v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
                 @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"

src/views/serviceConfiguration/modifyData/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <basic-container v-if="isShow">
+        <basic-container v-show="isShow">
             <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
                 v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
                 @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -243,7 +243,7 @@
                         <span v-else>{{ row.boxNo }}</span>
                     </template>
                     <template slot="goodsNameForm" slot-scope="{ row }">
-                        <dic-select v-if="row.$cellEdit && !row.srcId" v-model="row.goodsName" placeholder="品名" key="id"
+                        <dic-select v-if="row.$cellEdit" v-model="row.goodsName" placeholder="品名" key="id"
                             res="records" label="cnName" url="/blade-los/bcommodity/list" :filterable="true"
                             :remote="true" dataName="cnName"
                             @selectChange="rowDicChange('goodsName', $event, row)"></dic-select>