修改bug

src/api/basicData/invoice.js

@@ -46,11 +46,12 @@ export function remove(data) {
   })
 }
 //获取商品
-export const getGoods = (current, size,goodsTypeId) => {
+export const getGoods = (current, size,goodsTypeId, params) => {
   return request({
       url: '/api//blade-client/goodsdesc/selectGoods',
       method: 'get',
       params: {
+        ...params,
           current,
           size,
           goodsTypeId,

src/api/basicData/portinformation.js

@@ -98,4 +98,9 @@ export const getTypeTree = () => {
   })
 }
 
-
+export const getAllBoxs = () => {
+  return request({
+    url: '/api/blade-client/container/listMessage',
+    method: 'get',
+  })
+}

src/api/basicData/purchaseInquiry.js

@@ -53,11 +53,12 @@ export function remove(data) {
   })
 }
 //获取商品
-export const getGoods = (current, size,goodsTypeId) => {
+export const getGoods = (current, size,goodsTypeId, params) => {
   return request({
       url: '/api//blade-client/goodsdesc/selectGoods',
       method: 'get',
       params: {
+        ...params,
           current,
           size,
           goodsTypeId,

src/api/basicData/salesContract.js

@@ -56,11 +56,12 @@ export function deliverGoods(data) {
   })
 }
 //获取商品
-export const getGoods = (current, size, goodsTypeId) => {
+export const getGoods = (current, size, goodsTypeId, params) => {
   return request({
     url: '/api//blade-client/goodsdesc/selectGoods',
     method: 'get',
     params: {
+      ...params,
       current,
       size,
       goodsTypeId,

src/api/basicData/shippingInquiry.js

@@ -54,11 +54,12 @@ export function remove(data) {
   })
 }
 //获取商品
-export const getGoods = (current, size,goodsTypeId) => {
+export const getGoods = (current, size,goodsTypeId, params) => {
   return request({
       url: '/api//blade-client/goodsdesc/selectGoods',
       method: 'get',
       params: {
+        ...params,
           current,
           size,
           goodsTypeId,

src/api/exportTrade/purchaseContract.js

@@ -53,11 +53,12 @@ export function deliverGoods(data) {
   })
 }
 //获取商品
-export const getGoods = (current, size, goodsTypeId) => {
+export const getGoods = (current, size, goodsTypeId, params) => {
   return request({
     url: '/api//blade-client/goodsdesc/selectGoods',
     method: 'get',
     params: {
+      ...params,
       current,
       size,
       goodsTypeId,

src/api/exportTrade/receipt.js

@@ -46,11 +46,12 @@ export function remove(data) {
   })
 }
 //获取商品
-export const getGoods = (current, size,goodsTypeId) => {
+export const getGoods = (current, size,goodsTypeId, params) => {
   return request({
       url: '/api/blade-client/goodsdesc/selectGoods',
       method: 'get',
       params: {
+        ...params,
           current,
           size,
           goodsTypeId,

src/components/price-Library/main.vue

@@ -108,9 +108,9 @@ export default {
         }
       }
       this.visible = false;
-      if(this.partType){
-        this.$emit("librayToPart", this.selectionList,this.partreData);
-      }else{
+      if (this.partType) {
+        this.$emit("librayToPart", this.selectionList, this.partreData);
+      } else {
         this.$emit("importLibray", this.selectionList);
       }
     },
@@ -123,17 +123,19 @@ export default {
     },
     //点击搜索按钮触发
     searchChange(params, done) {
+      this.search = this.deepClone(params);
       this.getList(this.page, params);
       done();
     },
     getList(page, params) {
-      const data = {
+      let data = {
         ...params,
         billType: "CG",
         statusTime: dateFormat(new Date(), "yyyy-MM-dd")
       };
+      let obj = Object.assign(data, this.search);
       this.loading = true;
-      getPricebank(page.currentPage, page.pageSize, data)
+      getPricebank(page.currentPage, page.pageSize, obj)
         .then(res => {
           this.data = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;

src/page/index/tags.vue

@@ -303,6 +303,12 @@ export default {
     menuTag(value, action) {
       if (action === "remove") {
         let { tag, key } = this.findTag(value);
+        if (tag.label == "报价(E)") {
+          this.$store.commit("OUT_BJ_STATUS");
+        }
+        if (tag.label == "销售(E)") {
+          this.$store.commit("OUT_XS_STATUS");
+        }
         if (tag.label == "发货(E)") {
           this.$store.commit("OUT_OUT_DETAIL");
         }

src/store/getters.js

@@ -44,5 +44,7 @@ const getters = {
   incomeStatus: state => state.ifdetail.incomeStatus,
   entranceCgStatus: state => state.ifdetail.entranceCgStatus,
   entranceXsStatus: state => state.ifdetail.entranceXsStatus,
+  xsStatus: state => state.ifdetail.xsStatus,
+  bjStatus: state => state.ifdetail.bjStatus,
 }
 export default getters

src/store/modules/ifdetail.js

@@ -7,17 +7,19 @@ const ifdetail = {
     outStatus: false, //出口发货单
     outtaskStatus: false, //出口收货单
     pqStatus: false, //付款
-    paySettle:false, //付款结算
-    receiptSettle:false, //收款结算
-    mainItemStatus:false, //主营业务明细
-    settleStatus:false,//结算明细
+    paySettle: false, //付款结算
+    receiptSettle: false, //收款结算
+    mainItemStatus: false, //主营业务明细
+    settleStatus: false, //结算明细
     domSaleStatus: false, // 内贸销售
     domStockDetail: false, // 国内库存账
     domPurStatus: false, // 内贸采购
-    outputStatus:false,//销项发票
-    incomeStatus:false,//进项发票
-    entranceCgStatus:false,//进口采购
-    entranceXsStatus:false,//进口销售
+    outputStatus: false, //销项发票
+    incomeStatus: false, //进项发票
+    entranceCgStatus: false, //进口采购
+    entranceXsStatus: false, //进口销售,
+    xsStatus: false, //出口销售
+    bjStatus: false //出口报价
   },
   actions: {},
   mutations: {
@@ -66,6 +68,20 @@ const ifdetail = {
     OUT_OUT_DETAIL(state) {
       state.outStatus = false;
     },
+    IN_XS_STATUS(state) {
+      state.xsStatus = true;
+    },
+    //退出详情页
+    OUT_XS_STATUS(state) {
+      state.xsStatus = false;
+    },
+    IN_BJ_STATUS(state) {
+      state.bjStatus = true;
+    },
+    //退出详情页
+    OUT_BJ_STATUS(state) {
+      state.bjStatus = false;
+    },
     //出口状态
     // 进入详情页
     REC_IN_DETAIL(state) {
@@ -193,6 +209,12 @@ const ifdetail = {
       if (tag.label == '收货(E)') {
         state.outtaskStatus = true;
       }
+      if (tag.label == '销售(E)') {
+        state.xsStatus = true;
+      }
+      if (tag.label == '报价(E)') {
+        state.bjStatus = true;
+      }
       if (tag.label == '付费申请') {
         state.pqStatus = true;
       }

src/views/basicData/container/index.vue

@@ -128,7 +128,7 @@
       },
       getList(page, params = {}) {
         this.loading = true
-        getList(page.currentPage, page.pageSize, params, this.treeDeptId).then(res => {
+        getList(page.currentPage, page.pageSize,Object.assign(params, this.search), this.treeDeptId).then(res => {
           this.data = res.data.data.records
           this.page.total = res.data.data.total
           this.loading = false

src/views/basicData/container/type.vue

@@ -66,7 +66,7 @@
           size:this.page.pageSize,
           parentId:0
         };
-        getTypeList(param).then(res => {
+        getTypeList(Object.assign(param, this.search)).then(res => {
           this.dataList = res.data.data.records
           this.page.total = res.data.data.total
           this.loading=false;

src/views/basicData/portinformation/index.vue

@@ -129,7 +129,7 @@
       },
       getList(page, params = {}) {
         this.loading = true
-        getList(page.currentPage, page.pageSize, params, this.treeDeptId).then(res => {
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.search), this.treeDeptId).then(res => {
           this.data = res.data.data.records
           this.page.total = res.data.data.total
           this.loading = false

src/views/basicData/portinformation/type.vue

@@ -67,7 +67,7 @@
           size:this.page.pageSize,
           parentId:0
         };
-        getTypeList(param).then(res => {
+        getTypeList(Object.assign(param, this.search)).then(res => {
           this.dataList = res.data.data.records
           this.page.total = res.data.data.total
           this.loading=false;

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -158,12 +158,30 @@
               @change="exchangeRateChange"
             />
           </template>
+          <template slot="boxPile">
+            <el-select
+              size="small"
+              v-model="form.boxPile"
+              placeholder="请选择"
+              clearable
+              filterable
+              :disabled="detailData.status == 1"
+            >
+              <el-option
+                v-for="item in allBoxs"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+              >
+              </el-option>
+            </el-select>
+          </template>
           <template slot="boxNumber">
             <el-input
               size="small"
               v-model="form.boxNumber"
               oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-              placeholder="请输入 起订量"
+              placeholder="请输入 箱量"
               :disabled="detailData.status == 1"
             />
           </template>
@@ -470,7 +488,7 @@
       />
       <containerTitle title="合同附件"></containerTitle>
       <c-upload
-        typeUpload='CK'
+        typeUpload="CK"
         :data="orderFilesList"
         :disabled="detailData.status == 1"
         :enumerationValue="76"
@@ -511,6 +529,7 @@
               :table-loading="loading"
               :data="goodsList"
               ref="goodsCrud"
+              :search.sync="search"
               @search-change="searchChange"
               @refresh-change="refreshChange"
               @selection-change="selectionChange"
@@ -572,6 +591,7 @@ import {
   saveSell,
   getPricedetail
 } from "@/api/basicData/customerInquiry";
+import { getAllBoxs } from "@/api/basicData/portinformation";
 import { getCorpsattn } from "@/api/basicData/customerInformation";
 import reportDialog from "@/components/report-dialog/main";
 import priceLibrary from "@/components/price-Library/main";
@@ -807,12 +827,6 @@ export default {
           {
             label: "箱型",
             prop: "boxPile",
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
             span: 8
           },
           {
@@ -937,7 +951,9 @@ export default {
       priceTermsList: [],
       paymentTermList: [],
       currencyList: [],
-      corpsattns: []
+      corpsattns: [],
+      allBoxs: [],
+      search: {}
     };
   },
   props: {
@@ -999,6 +1015,9 @@ export default {
       this.findObject(this.option.column, "portOfDestination").dicData =
         res.data;
     });
+    getAllBoxs().then(res => {
+      this.allBoxs = res.data.data;
+    });
     getGoods(1, 500).then(res => {
       this.goodsoptions = res.data.data.records;
     });
@@ -1585,13 +1604,15 @@ export default {
       this.onLoad(this.page);
     },
     searchChange(params, done) {
+      this.search = this.deepClone(params);
       this.onLoad(this.page, params);
       done();
     },
     //费用查询
     onLoad(page, params = {}) {
+      let obj = this.deepClone(Object.assign(params, this.search));
       this.loading = true;
-      getGoods(page.currentPage, page.pageSize, this.treeDeptId, params)
+      getGoods(page.currentPage, page.pageSize, this.treeDeptId, obj)
         .then(res => {
           const data = res.data.data;
           this.page.total = data.total;
@@ -1613,7 +1634,7 @@ export default {
           cname: e.cname,
           ename: e.ename,
           priceCategory: e.goodsTypeName,
-          purchaseCost:costCal(e.price,e.taxRate),
+          purchaseCost: costCal(e.price, e.taxRate),
           purchaseAmount: e.purchaseAmount,
           itemProp: null,
           remarksOne: null,

src/views/exportTrade/customerInquiry/index.vue

@@ -243,12 +243,22 @@ export default {
       return IntegerFormat(num);
     }
   },
+  activated() {
+    if (!this.$store.getters.bjStatus && !this.show) {
+      this.show = true;
+    }
+    if (this.$route.query.id) {
+      setTimeout(() => {
+        this.editOpen({ id: this.$route.query.id }, 1);
+      }, 100);
+    }
+  },
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 189;
+        this.option.height = this.option.height - 191;
       } else {
-        this.option.height = this.option.height + 189;
+        this.option.height = this.option.height + 191;
       }
       this.$refs.crud.getTableHeight();
     },
@@ -293,6 +303,7 @@ export default {
         status: status
       };
       this.show = false;
+      this.$store.commit("IN_BJ_STATUS");
     },
     copyDoc() {
       this.selectionList.forEach(e => {
@@ -301,6 +312,7 @@ export default {
           status: "copy"
         };
         this.show = false;
+        this.$store.commit("IN_BJ_STATUS");
       });
     },
     copyOrder(id) {
@@ -311,6 +323,7 @@ export default {
       };
       this.$nextTick(() => {
         this.show = false;
+        this.$store.commit("IN_BJ_STATUS");
       });
     },
     //点击搜索按钮触发
@@ -412,11 +425,19 @@ export default {
     },
     newAdd() {
       this.show = false;
+      this.$store.commit("IN_BJ_STATUS");
     },
     goBack() {
+      if (this.$route.query.id) {
+        this.$router.$avueRouter.closeTag(this.$route.fullPath);
+        this.$router.push({
+          path: "/exportTrade/customerInquiry/index"
+        });
+      }
       this.detailData = this.$options.data().detailData;
       this.show = true;
       this.onLoad(this.page, this.search);
+      this.$store.commit("OUT_BJ_STATUS");
     },
     async saveColumn() {
       /**

src/views/exportTrade/invoice/detailsPage.vue

@@ -241,6 +241,8 @@
               :table-loading="loading"
               :data="goodsList"
               ref="goodsCrud"
+              :search.sync="search"
+              @search-change="searchChange"
               @refresh-change="refreshChange"
               @selection-change="selectionChange"
               @row-click="rowClick"
@@ -475,7 +477,8 @@ export default {
       loading: false,
       subLoading: false,
       pageLoading: false,
-      showBut: true
+      showBut: true,
+      search: {}
     };
   },
   props: {
@@ -675,18 +678,26 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
+    searchChange(params, done) {
+      this.search = this.deepClone(params);
+      this.onLoad(this.page, params);
+      done();
+    },
     //费用查询
     onLoad(page, params = {}) {
+      let obj = this.deepClone(Object.assign(params, this.search));
       this.loading = true;
-      getGoods(page.currentPage, page.pageSize, this.treeDeptId).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.goodsList = data.records;
-        this.loading = false;
-        if (this.page.total) {
-          this.goodsOption.height = window.innerHeight - 350;
+      getGoods(page.currentPage, page.pageSize, this.treeDeptId, obj).then(
+        res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.goodsList = data.records;
+          this.loading = false;
+          if (this.page.total) {
+            this.goodsOption.height = window.innerHeight - 350;
+          }
         }
-      });
+      );
     },
     //商品明细导入
     newDetails() {

src/views/exportTrade/invoice/index.vue

@@ -184,9 +184,9 @@ export default {
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 189;
+        this.option.height = this.option.height - 191;
       } else {
-        this.option.height = this.option.height + 189;
+        this.option.height = this.option.height + 191;
       }
       this.$refs.crud.getTableHeight();
     },

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -316,6 +316,8 @@
               :table-loading="loading"
               :data="goodsList"
               ref="goodsCrud"
+              :search.sync="search"
+              @search-change="searchChange"
               @refresh-change="refreshChange"
               @selection-change="selectionChange"
               @row-click="rowClick"
@@ -627,7 +629,8 @@ export default {
       oldorderFilesList: [],
       subLoading: false,
       pageLoading: false,
-      showBut: true
+      showBut: true,
+      search: {}
     };
   },
   props: {
@@ -829,18 +832,26 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
+    searchChange(params, done) {
+      this.search = this.deepClone(params);
+      this.onLoad(this.page, params);
+      done();
+    },
     //费用查询
     onLoad(page, params = {}) {
+      let obj = this.deepClone(Object.assign(params, this.search));
       this.loading = true;
-      getGoods(page.currentPage, page.pageSize, this.treeDeptId).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.goodsList = data.records;
-        this.loading = false;
-        if (this.page.total) {
-          this.goodsOption.height = window.innerHeight - 350;
+      getGoods(page.currentPage, page.pageSize, this.treeDeptId, obj).then(
+        res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.goodsList = data.records;
+          this.loading = false;
+          if (this.page.total) {
+            this.goodsOption.height = window.innerHeight - 350;
+          }
         }
-      });
+      );
     },
     //商品明细导入
     newDetails() {

src/views/exportTrade/purchaseContract/index.vue

@@ -177,9 +177,9 @@ export default {
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 138;
+        this.option.height = this.option.height - 139;
       } else {
-        this.option.height = this.option.height + 138;
+        this.option.height = this.option.height + 139;
       }
       this.$refs.crud.getTableHeight();
     },

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -268,6 +268,8 @@
               :table-loading="loading"
               :data="goodsList"
               ref="goodsCrud"
+              :search.sync="search"
+              @search-change="searchChange"
               @refresh-change="refreshChange"
               @selection-change="selectionChange"
               @row-click="rowClick"
@@ -485,7 +487,8 @@ export default {
       pageLoading: false,
       showBut: true,
       goodsoptions: [],
-      currencyList: []
+      currencyList: [],
+      search: {}
     };
   },
   props: {
@@ -705,18 +708,26 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
+    searchChange(params, done) {
+      this.search = this.deepClone(params);
+      this.onLoad(this.page, params);
+      done();
+    },
     //费用查询
     onLoad(page, params = {}) {
+      let obj = this.deepClone(Object.assign(params, this.search));
       this.loading = true;
-      getGoods(page.currentPage, page.pageSize, this.treeDeptId).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.goodsList = data.records;
-        this.loading = false;
-        if (this.page.total) {
-          this.goodsOption.height = window.innerHeight - 350;
+      getGoods(page.currentPage, page.pageSize, this.treeDeptId, obj).then(
+        res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.goodsList = data.records;
+          this.loading = false;
+          if (this.page.total) {
+            this.goodsOption.height = window.innerHeight - 350;
+          }
         }
-      });
+      );
     },
     //商品明细导入
     newDetails() {

src/views/exportTrade/purchaseInquiry/index.vue

@@ -175,9 +175,9 @@ export default {
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 143;
+        this.option.height = this.option.height - 144;
       } else {
-        this.option.height = this.option.height + 143;
+        this.option.height = this.option.height + 144;
       }
       this.$refs.crud.getTableHeight();
     },

src/views/exportTrade/receipt/detailsPage.vue

@@ -226,6 +226,8 @@
               :table-loading="loading"
               :data="goodsList"
               ref="goodsCrud"
+              :search.sync="search"
+              @search-change="searchChange"
               @refresh-change="refreshChange"
               @selection-change="selectionChange"
               @row-click="rowClick"
@@ -487,7 +489,8 @@ export default {
       oldorderFilesList: [],
       subLoading: false,
       pageLoading: false,
-      showBut: true
+      showBut: true,
+      search: {}
     };
   },
   props: {
@@ -691,18 +694,26 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
+    searchChange(params, done) {
+      this.search = this.deepClone(params);
+      this.onLoad(this.page, params);
+      done();
+    },
     //费用查询
     onLoad(page, params = {}) {
+      let obj = this.deepClone(Object.assign(params, this.search));
       this.loading = true;
-      getGoods(page.currentPage, page.pageSize, this.treeDeptId).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.goodsList = data.records;
-        this.loading = false;
-        if (this.page.total) {
-          this.goodsOption.height = window.innerHeight - 350;
+      getGoods(page.currentPage, page.pageSize, this.treeDeptId, obj).then(
+        res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.goodsList = data.records;
+          this.loading = false;
+          if (this.page.total) {
+            this.goodsOption.height = window.innerHeight - 350;
+          }
         }
-      });
+      );
     },
     //商品明细导入
     newDetails() {

src/views/exportTrade/receipt/index.vue

@@ -168,9 +168,9 @@ export default {
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 189;
+        this.option.height = this.option.height - 191;
       } else {
-        this.option.height = this.option.height + 189;
+        this.option.height = this.option.height + 191;
       }
       this.$refs.crud.getTableHeight();
     },

src/views/exportTrade/salesContract/detailsPage.vue

@@ -187,12 +187,30 @@
               @change="exchangeRateChange"
             />
           </template>
+          <template slot="boxPile">
+            <el-select
+              size="small"
+              v-model="form.boxPile"
+              placeholder="请选择"
+              clearable
+              filterable
+              :disabled="detailData.status == 1"
+            >
+              <el-option
+                v-for="item in allBoxs"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+              >
+              </el-option>
+            </el-select>
+          </template>
           <template slot="boxNumber">
             <el-input
               size="mini"
               v-model="form.boxNumber"
               oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-              placeholder="请输入 起订量"
+              placeholder="请输入 箱量"
               :disabled="detailData.status == 1"
             />
           </template>
@@ -614,6 +632,8 @@
               :table-loading="loading"
               :data="goodsList"
               ref="goodsCrud"
+              :search.sync="search"
+              @search-change="searchChange"
               @refresh-change="refreshChange"
               @selection-change="selectionChange"
               @row-click="rowClick"
@@ -672,6 +692,7 @@ import {
   getPricedetail,
   pleaseCheck
 } from "@/api/basicData/salesContract";
+import { getAllBoxs } from "@/api/basicData/portinformation";
 import _ from "lodash";
 import reportDialog from "@/components/report-dialog/main";
 import partDialog from "@/components/part-dialog/main";
@@ -1090,7 +1111,9 @@ export default {
       goodsoptions: [],
       priceTermsList: [],
       paymentTermList: [],
-      currencyList: []
+      currencyList: [],
+      allBoxs: [],
+      search: {}
     };
   },
   props: {
@@ -1160,6 +1183,9 @@ export default {
     getGoods(1, 500).then(res => {
       this.goodsoptions = res.data.data.records;
     });
+    getAllBoxs().then(res => {
+      this.allBoxs = res.data.data;
+    });
   },
   filters: {
     isDiscount(val) {
@@ -1730,18 +1756,26 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
+    searchChange(params, done) {
+      this.search = this.deepClone(params);
+      this.onLoad(this.page, params);
+      done();
+    },
     //费用查询
     onLoad(page, params = {}) {
+      let obj = this.deepClone(Object.assign(params, this.search));
       this.loading = true;
-      getGoods(page.currentPage, page.pageSize, this.treeDeptId).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.goodsList = data.records;
-        this.loading = false;
-        if (this.page.total) {
-          this.goodsOption.height = window.innerHeight - 350;
+      getGoods(page.currentPage, page.pageSize, this.treeDeptId, obj).then(
+        res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.goodsList = data.records;
+          this.loading = false;
+          if (this.page.total) {
+            this.goodsOption.height = window.innerHeight - 350;
+          }
         }
-      });
+      );
     },
     importLibray(rows) {
       rows.forEach(e => {

src/views/exportTrade/salesContract/index.vue

@@ -236,17 +236,28 @@ export default {
       this.findObject(this.option.column, "createUser").dicData = res.data.data;
     });
   },
+
   filters: {
     IntegerFormat(num) {
       return IntegerFormat(num);
     }
   },
+  activated() {
+    if (!this.$store.getters.xsStatus && !this.show) {
+      this.show = true;
+    }
+    if (this.$route.query.id) {
+      setTimeout(() => {
+        this.editOpen({ id: this.$route.query.id }, 1);
+      }, 100);
+    }
+  },
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 189;
+        this.option.height = this.option.height - 191;
       } else {
-        this.option.height = this.option.height + 189;
+        this.option.height = this.option.height + 191;
       }
       this.$refs.crud.getTableHeight();
     },
@@ -287,11 +298,18 @@ export default {
     },
     //查看跳转页面
     editOpen(row, status) {
+      if (this.$route.query.id) {
+        this.$router.$avueRouter.closeTag(this.$route.fullPath);
+        this.$router.push({
+          path: "/exportTrade/salesContract/index"
+        });
+      }
       this.detailData = {
         id: row.id,
         status: status
       };
       this.show = false;
+      this.$store.commit("IN_XS_STATUS");
     },
     //点击搜索按钮触发
     searchChange(params, done) {
@@ -354,6 +372,7 @@ export default {
         pageType: type
       };
       this.show = false;
+      this.$store.commit("IN_XS_STATUS");
     },
     copyDoc() {
       this.selectionList.forEach(e => {
@@ -362,6 +381,7 @@ export default {
           status: "copy"
         };
         this.show = false;
+        this.$store.commit("IN_XS_STATUS");
       });
     },
     copyOrder(id) {
@@ -372,12 +392,14 @@ export default {
       };
       this.$nextTick(() => {
         this.show = false;
+        this.$store.commit("IN_XS_STATUS");
       });
     },
     goBack() {
       this.detailData = this.$options.data().detailData;
       this.show = true;
       this.onLoad(this.page, this.search);
+      this.$store.commit("OUT_XS_STATUS");
     },
     summaryMethod({ columns, data }) {
       const sums = [];

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -176,6 +176,8 @@
               :table-loading="loading"
               :data="goodsList"
               ref="goodsCrud"
+              :search.sync="search"
+              @search-change="searchChange"
               @refresh-change="refreshChange"
               @selection-change="selectionChange"
               @row-click="rowClick"
@@ -357,7 +359,8 @@ export default {
       oldfreightData: [],
       subLoading: false,
       pageLoading: false,
-      showBut: true
+      showBut: true,
+      search: {}
     };
   },
   props: {
@@ -474,18 +477,26 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
+    searchChange(params, done) {
+      this.search = this.deepClone(params);
+      this.onLoad(this.page, params);
+      done();
+    },
     //费用查询
     onLoad(page, params = {}) {
+      let obj = this.deepClone(Object.assign(params, this.search));
       this.loading = true;
-      getGoods(page.currentPage, page.pageSize, this.treeDeptId).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.goodsList = data.records;
-        this.loading = false;
-        if (this.page.total) {
-          this.goodsOption.height = window.innerHeight - 350;
+      getGoods(page.currentPage, page.pageSize, this.treeDeptId, obj).then(
+        res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.goodsList = data.records;
+          this.loading = false;
+          if (this.page.total) {
+            this.goodsOption.height = window.innerHeight - 350;
+          }
         }
-      });
+      );
     },
     getDetail(id) {
       this.showBut = false;

src/views/exportTrade/shippingInquiry/index.vue

@@ -125,9 +125,9 @@ export default {
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 92;
+        this.option.height = this.option.height - 93;
       } else {
-        this.option.height = this.option.height + 92;
+        this.option.height = this.option.height + 93;
       }
       this.$refs.crud.getTableHeight();
     },

src/views/maintenance/priceLibrary/index.vue

@@ -372,13 +372,13 @@ export default {
       this.page.currentPage = 1;
       this.page.pageSize = val;
     },
-    onLoad(page, params) {
+    onLoad(page, params = {}) {
       params = {
         ...params,
         tradeType: "CK"
       };
       this.loading = true;
-      getList(page.currentPage, page.pageSize, params)
+      getList(page.currentPage, page.pageSize,Object.assign(params, this.search))
         .then(res => {
           // if (res.data.data.records) {
           //   res.data.data.records.forEach(e => {

src/views/statisticAnalysis/salesProfit/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-show="isShow" class="page-crad">
+    <basic-container class="page-crad">
       <avue-crud
         ref="crud"
         :option="option"
@@ -56,6 +56,13 @@
         <template slot-scope="{ row }" slot="amount">
           <span>{{ row.amount | decimalFormat }}</span>
         </template>
+        <template slot-scope="scope" slot="orderNo">
+          <span
+            style="color: #409EFF;cursor: pointer"
+            @click.stop="editOpen(scope.row)"
+            >{{ scope.row.orderNo }}
+          </span>
+        </template>
       </avue-crud>
     </basic-container>
   </div>
@@ -74,7 +81,6 @@ export default {
       search: {},
       dataList: [],
       loading: false,
-      isShow: true,
       detailData: {},
       page: {
         pageSize: 10,
@@ -160,12 +166,18 @@ export default {
             width: 100
           },
           {
-            label: "采购成本",
+            label: "产品成本",
             prop: "procurementCost",
             overHidden: true,
             width: 100
           },
           {
+            label: "配件成本",
+            prop: "partsCost",
+            overHidden: true,
+            width: 100
+          },
+          {
             label: "采购报价",
             prop: "purchasePrice",
             overHidden: true,
@@ -362,19 +374,25 @@ export default {
           this.loading = false;
         });
     },
-    //新增跳转页面
-    beforeOpen() {
-      this.isShow = false;
-    },
-    editOpen(row, status) {
-      this.detailData = {
-        id: row.id,
-        status: status
-      };
-      this.isShow = false;
+    editOpen(row) {
+      if (row.billType == "BJ") {
+        this.$router.push({
+          path: "/exportTrade/customerInquiry/index",
+          query: {
+            id: row.id
+          }
+        });
+      } else {
+        this.$router.push({
+          path: "/exportTrade/salesContract/index",
+          query: {
+            id: row.id
+          }
+        });
+      }
     },
-    outExport(){
-         if (!this.search.billType) {
+    outExport() {
+      if (!this.search.billType) {
         return this.$message.error("请选择类别");
       }
       window.open(
@@ -383,10 +401,6 @@ export default {
         }=${getToken()}&billType=${this.search.billType}`
       );
     },
-    goBack() {
-      this.detailData = this.$options.data().detailData;
-      this.isShow = true;
-    },
     summaryMethod({ columns, data }) {
       const sums = [];
       if (columns.length > 0) {