修改bug

src/api/basicData/customerInquiry.js

@@ -83,9 +83,7 @@ export function saveShipping(data) {
   return request({
     url: '/api/trade-purchase/shipping-enquiry/update',
     method: 'post',
-    data: {
-      id: data
-    }
+    data:data
   })
 }
 //港口资料

src/api/basicData/salesContract.js

@@ -205,4 +205,13 @@ export function getCopy(id) {
       id: id
     }
   })
+}
+
+//生成船务询价单
+export function saveShipping(data) {
+  return request({
+    url: '/api/trade-purchase/shipping-enquiry/update',
+    method: 'post',
+    data: data
+  })
 }

src/enums/column-name.js

@@ -1745,6 +1745,9 @@ const columnName = [{
   },{
     code: 373,
     name: '货运代理-决策分析-向量横向统计-向量横向统计列表'
+  },{
+    code: 374,
+    name: '货运代理-库存管理-库存查询-品牌列表'
   }
 ]
 export const getColumnName = (key) => {

src/page/index/tags.vue

@@ -64,9 +64,8 @@
               <top-lang></top-lang>
             </div>
           </el-tooltip>
-          <el-tooltip v-if="showFullScren" effect="dark" :content="
-            isFullScren ? $t('navbar.screenfullF') : $t('navbar.screenfull')
-          " placement="bottom">
+          <el-tooltip v-if="showFullScren" effect="dark" :content="isFullScren ? $t('navbar.screenfullF') : $t('navbar.screenfull')
+            " placement="bottom">
             <div>
               <i :class="isFullScren ? 'icon-tuichuquanping' : 'icon-quanping'" @click="handleScreen"></i>
             </div>
@@ -85,31 +84,31 @@
             <top-theme ref="theme"></top-theme>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native="$parent.isSearch = true">{{
-                  $t("tagsView.search")
+                $t("tagsView.search")
               }}
               </el-dropdown-item>
               <el-dropdown-item @click.native="openBug">{{
-                  $t("navbar.bug")
+                $t("navbar.bug")
               }}
               </el-dropdown-item>
               <el-dropdown-item @click.native="openLock">{{
-                  $t("navbar.lock")
+                $t("navbar.lock")
               }}
               </el-dropdown-item>
               <el-dropdown-item @click.native="openTheme">{{
-                  $t("navbar.theme")
+                $t("navbar.theme")
               }}
               </el-dropdown-item>
               <el-dropdown-item @click.native="closeOthersTags">{{
-                  $t("tagsView.closeOthers")
+                $t("tagsView.closeOthers")
               }}
               </el-dropdown-item>
               <el-dropdown-item @click.native="closeAllTags">{{
-                  $t("tagsView.closeAll")
+                $t("tagsView.closeAll")
               }}
               </el-dropdown-item>
               <el-dropdown-item @click.native="clearCacheTags">{{
-                  $t("tagsView.clearCache")
+                $t("tagsView.clearCache")
               }}
               </el-dropdown-item>
             </el-dropdown-menu>
@@ -125,7 +124,7 @@
               </el-dropdown-item>
               <el-dropdown-item>
                 <router-link to="/info/index">{{
-                    $t("navbar.userinfo")
+                  $t("navbar.userinfo")
                 }}
                 </router-link>
               </el-dropdown-item>
@@ -264,9 +263,9 @@ export default {
     menuTag(value, action) {
       if (action === "remove") {
         let { tag, key } = this.findTag(value);
-          if (tag.label == "销售政策") {
-              this.$store.commit("XIAO_SHO_ZHENG_CEGUAN");  // 审批数据里加的
-          }
+        if (tag.label == "销售政策") {
+          this.$store.commit("XIAO_SHO_ZHENG_CEGUAN");  // 审批数据里加的
+        }
         if (tag.label == "报价(E)") {
           this.$store.commit("OUT_BJ_STATUS");
         }
@@ -310,26 +309,26 @@ export default {
           this.$store.commit("DOMXS_OUT_DETAIL");
         }
         console.log(tag.label);
-        if(tag.label == "库存账明细"){
+        if (tag.label == "库存账明细") {
           this.$store.commit("DOMAS_OUT_DETAIL");
         }
-        if(tag.label == "出库工单(L)"){
+        if (tag.label == "出库工单(L)") {
           this.$store.commit("DOMIO_OUT_DETAIL");
         }
-        if(tag.label == "盘点(L)"){
+        if (tag.label == "盘点(L)") {
           this.$store.commit("OUT_PD_STATUS");
         }
-        if(tag.label == "采购入库"){
+        if (tag.label == "采购入库") {
           this.$store.commit("DOMIO_OUT_DETAIL");
         }
-        if(tag.label == "采购入库(L)"){
+        if (tag.label == "采购入库(L)") {
           this.$store.commit("DOMIO_OUT_DETAIL");
         }
-        if(tag.label == "调拨(L)"){
-           this.$store.commit("DOMIO_OUT_ALLOCATW");
+        if (tag.label == "调拨(L)") {
+          this.$store.commit("DOMIO_OUT_ALLOCATW");
         }
-        if(tag.label == "往来单位(F)"){
-            this.$store.commit("DOMIO_OUT_CUL");
+        if (tag.label == "往来单位(F)") {
+          this.$store.commit("DOMIO_OUT_CUL");
         }
         if (tag.label == "代理订单(N)") {
           this.$store.commit("DOMXS_OUT_DETAIL");
@@ -379,90 +378,96 @@ export default {
         if (tag.label == "销售机会") {
           this.$store.commit('XSJH_OUT_DETAIL');
         }
-        if(tag.label == "出库管理"){
+        if (tag.label == "出库管理") {
           this.$store.commit("OUT_CKGL_STATUS");
         }
-        if(tag.label == "销售单"){
+        if (tag.label == "销售单") {
           this.$store.commit("OUT_PJXS_STATUS");
         }
-        if(tag.label == "采购单"){
+        if (tag.label == "采购单") {
           this.$store.commit("OUT_PJCG_STATUS");
         }
-        if(tag.label == "海运出口"){
+        if (tag.label == "海运出口") {
           this.$store.commit("DOMXS_CLOSE_EXPORT_DETAIL");
         }
-        if(tag.label == "海运出口"){
+        if (tag.label == "海运出口") {
           this.$store.commit("DOMXS_CLOSE_EXPORT_DETAIL");
         }
-        if(tag.label == "收款结算"){
+        if (tag.label == "收款结算") {
           this.$store.commit("COLL_CLOSE_EXPORT_DETAIL");
         }
-        if(tag.label == "采购(E)"){
+        if (tag.label == "采购(E)") {
           this.$store.commit("OUT_CG_STATUS");
         }
-        if(tag.label == "审批详情(F)"){
+        if (tag.label == "审批详情(F)") {
           this.$store.commit("HYCKLOS_OUT_DETAIL")
         }
-        if(tag.label == "付费申请(F)"){
-            this.$store.commit("FFQSF_OUT_DETAIL")
+        if (tag.label == "付费申请(F)") {
+          this.$store.commit("FFQSF_OUT_DETAIL")
+        }
+        if (tag.label == "对账中心(F)") {
+          this.$store.commit("DZZXF_OUT_DETAIL")
+        }
+        if (tag.label == "结算中心(F)") {
+          this.$store.commit("JSZX_OUT_DETAIL")
         }
-        if(tag.label == "对账中心(F)"){
-            this.$store.commit("DZZXF_OUT_DETAIL")
+        if (tag.label == "SEAMEND") {
+          this.$store.commit("SEA_OUT_DETAIL")
         }
-        if(tag.label == "结算中心(F)"){
-            this.$store.commit("JSZX_OUT_DETAIL")
+        if (tag.label == "SIAMEND") {
+          this.$store.commit("SIA_OUT_DETAIL")
         }
-        if(tag.label == "SEAMEND"){
-            this.$store.commit("SEA_OUT_DETAIL")
+        if (tag.label == "AEAMEND") {
+          this.$store.commit("AEA_OUT_DETAIL")
         }
-        if(tag.label == "SIAMEND"){
-            this.$store.commit("SIA_OUT_DETAIL")
+        if (tag.label == "AIAMEND") {
+          this.$store.commit("AIA_OUT_DETAIL")
         }
-        if(tag.label == "AEAMEND"){
-            this.$store.commit("AEA_OUT_DETAIL")
+        if (tag.label == "海运出口报关") {
+          this.$store.commit("SEBG_OUT_DETAIL")
         }
-        if(tag.label == "AIAMEND"){
-            this.$store.commit("AIA_OUT_DETAIL")
+        if (tag.label == "海运进口报关") {
+          this.$store.commit("SIBG_OUT_DETAIL")
         }
-        if(tag.label == "海运出口报关"){
-            this.$store.commit("SEBG_OUT_DETAIL")
+        if (tag.label == "空运出口报关") {
+          this.$store.commit("AEBG_OUT_DETAIL")
         }
-        if(tag.label == "海运进口报关"){
-            this.$store.commit("SIBG_OUT_DETAIL")
+        if (tag.label == "空运进口报关") {
+          this.$store.commit("AIBG_OUT_DETAIL")
         }
-        if(tag.label == "空运出口报关"){
-            this.$store.commit("AEBG_OUT_DETAIL")
+        if (tag.label == "空运进口报关") {
+          this.$store.commit("AIBG_OUT_DETAIL")
         }
-        if(tag.label == "空运进口报关"){
-            this.$store.commit("AIBG_OUT_DETAIL")
+        if (tag.label == "销售退货(L)") {
+          this.$store.commit("XSTH_OUT_DETAIL")
         }
-        if(tag.label == "空运进口报关"){
-            this.$store.commit("AIBG_OUT_DETAIL")
+        if (tag.label == "采购退货(L)") {
+          this.$store.commit("CGTH_OUT_DETAIL")
         }
-        if(tag.label == "销售退货(L)"){
-            this.$store.commit("XSTH_OUT_DETAIL")
+        if (tag.label == "海运出口(F)") {
+          console.log(1111, this.$store.getters.seaFEStatus)
+          this.$store.commit("OUT_SEAFE_DETAIL")
         }
-        if(tag.label == "采购退货(L)"){
-            this.$store.commit("CGTH_OUT_DETAIL")
+        if (tag.label == "SEAMEND") {
+          this.$store.commit("OUT_SFE_DETAIL")
         }
-        if(tag.label == "海运出口(F)"){
-          console.log(1111,this.$store.getters.seaFEStatus)
-            this.$store.commit("OUT_SEAFE_DETAIL")
+        if (tag.label == "海运进口(F)") {
+          this.$store.commit("OUT_OCEANFI_DETAIL")
         }
-        if(tag.label == "SEAMEND"){
-            this.$store.commit("OUT_SFE_DETAIL")
+        if (tag.label == "SIAMEND") {
+          this.$store.commit("OUT_OFI_DETAIL")
         }
-        if(tag.label == "海运进口(F)"){
-            this.$store.commit("OUT_OCEANFI_DETAIL")
+        if (tag.label == "付费申请(F)") {
+          this.$store.commit("OUT_PAYAPP_DETAIL")
         }
-        if(tag.label == "SIAMEND"){
-            this.$store.commit("OUT_OFI_DETAIL")
+        if (tag.label == "销项发票(F)") {
+          this.$store.commit("OUT_FINOUT_DETAIL")
         }
-        if(tag.label == "付费申请(F)"){
-            this.$store.commit("OUT_PAYAPP_DETAIL")
+        if (tag.label == "财务凭证(F)") {
+          this.$store.commit("OUT_VOUCHER_DETAIL")
         }
-        if(tag.label == "销项发票(F)"){
-            this.$store.commit("OUT_FINOUT_DETAIL")
+        if (tag.label == "明细账(F)") {
+          this.$store.commit("OUT_SUBLED_DETAIL")
         }
         this.$store.commit("DEL_TAG", tag);
         if (tag.value === this.tag.value) {

src/store/getters.js

@@ -86,5 +86,7 @@ const getters = {
   OFIStatus:state => state.ifdetail.OFIStatus,//货代海运出口seamend
   payAppStatus:state => state.ifdetail.payAppStatus,//货代海运进口
   finOutStatus:state => state.ifdetail.finOutStatus,//货代海运出口seamend
+  voucherStatus:state => state.ifdetail.voucherStatus,//财务凭证
+  subLedgerStatus:state => state.ifdetail.subLedgerStatus,//明细账
 }
 export default getters

src/store/modules/ifdetail.js

@@ -63,16 +63,26 @@ const ifdetail = {
     OFIStatus: false,//货代海运出口seamend
     payAppStatus: false,
     finOutStatus: false,
+    voucherStatus: false,//财务凭证(F)
+    subLedgerStatus: false,//明细账(F)
   },
   actions: {},
   mutations: {
-    //开启付费申请(F)
-    IN_PAYAPP_DETAIL(state) {
-      state.payAppStatus = true
+    //开启财务凭证
+    IN_VOUCHER_DETAIL(state) {
+      state.voucherStatus = true
     },
-    //关闭付费申请(F)
-    OUT_PAYAPP_DETAIL(state) {
-      state.payAppStatus = false
+    //关闭财务凭证
+    OUT_VOUCHER_DETAIL(state) {
+      state.voucherStatus = false
+    },
+    //开启明细账
+    IN_SUBLED_DETAIL(state) {
+      state.subLedgerStatus = true
+    },
+    //关闭明细账
+    OUT_SUBLED_DETAIL(state) {
+      state.subLedgerStatus = false
     },
     //开启销项发票(F)
     IN_FINOUT_DETAIL(state) {

src/views/basicData/commodityType/configuration/mainList.json

@@ -15,18 +15,21 @@
   "editBtn": false,
   "delBtn": false,
   "dialogClickModal": false,
-  "column": [{
+  "column": [
+    {
       "label": "商品编码",
       "prop": "code",
       "search": true,
       "searchSpan": 8,
       "width": 100,
       "overHidden": true,
-      "rules": [{
-        "required": true,
-        "message": " ",
-        "trigger": "blur"
-      }]
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
     },
     {
       "label": "商品名称",
@@ -36,11 +39,13 @@
       "searchSpan": 8,
       "overHidden": true,
       "width": 100,
-      "rules": [{
-        "required": true,
-        "message": " ",
-        "trigger": "blur"
-      }]
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
     },
     {
       "label": "英文名称",
@@ -68,12 +73,6 @@
       "overHidden": true
     },
     {
-      "label": "商品类别",
-      "prop": "category",
-      "slot": true,
-      "overHidden": true
-    },
-    {
       "label": "供应商",
       "prop": "corpName",
       "slot": true,
@@ -123,4 +122,4 @@
       "overHidden": true
     }
   ]
-}
+}

src/views/basicData/commodityType/index.vue

@@ -22,8 +22,8 @@
                 </el-button>
                 <el-button type="success" size="small" @click.stop="copyDoc()"
                   :disabled="selectionList.length != 1">复制单据</el-button>
-                  <el-button type="primary" size="small" icon="el-icon-bottom" @click="excelAdminProfiles = true">批量修改分管员
-                  </el-button>
+                <el-button type="primary" size="small" icon="el-icon-bottom" @click="excelAdminProfiles = true">批量修改分管员
+                </el-button>
               </template>
               <template slot-scope="scope" slot="menu">
                 <el-button type="text" icon="el-icon-view" size="small" @click.stop="editOpen(scope.row, 1)">查看
@@ -409,10 +409,19 @@ export default {
       loading = true;
     },
     derivationAdminProfiles() {
-      window.open(
-        `/api/blade-client/goodsdesc/exportAdminProfiles?${this.website.tokenHeader
-        }=${getToken()}`
-      );
+      let data = this.query
+      const routeData = this.$router.resolve({
+        path: '/api/blade-client/goodsdesc/exportAdminProfiles',      //跳转目标窗口的地址
+        query: {
+          'Blade-Auth': getToken(),
+          ...data    //括号内是要传递给新窗口的参数
+        }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length));
+      // window.open(
+      //   `/api/blade-client/goodsdesc/exportAdminProfiles?${this.website.tokenHeader
+      //   }=${getToken()}`
+      // );
     },
     // 导出
     dataListExport() {

src/views/exportTrade/customerInquiry/components/goodsInfo.vue

@@ -841,7 +841,12 @@ export default {
                 cancelButtonText: "取消",
                 type: "warning"
             }).then(() => {
-                saveShipping(this.form.id).then(res => {
+                let obj={}
+                obj={
+                    id:this.form.id,
+                    srcBillType:'BJ'
+                }
+                saveShipping(obj).then(res => {
                     if (res.data.code == 200) {
                         this.$message.success("生成成功");
                     }

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -1890,6 +1890,7 @@ export default {
       this.$refs.feeInfo.oceanUSD()
     },
     getDetail(id) {
+      console.log(id)
       this.loading = true;
       this.showBut = false;
       this.pageLoading = true;

src/views/exportTrade/purchaseContract/config/mainList.json

@@ -8,7 +8,7 @@
   "delBtn": false,
   "addBtn": false,
   "headerAlign": "center",
-  "menuWidth": "80",
+  "menuWidth": "120",
   "searchLabelWidth": "90",
   "searchIcon": true,
   "searchIndex": 2,

src/views/exportTrade/purchaseContract/index.vue

@@ -106,10 +106,11 @@
                 <template slot-scope="{ row }" slot="actualQuantity">
                     <span>{{ row.actualQuantity | decimalFormat2 }}</span>
                 </template>
-                <template slot-scope="scope" slot="menu">
+                <template slot-scope="{ row,index}" slot="menu">
                     <el-button type="text" icon="el-icon-delete" size="small"
-                        @click.stop="rowDel(scope.row, scope.index)">删除
+                        @click.stop="rowDel(row,index)">删除
                     </el-button>
+                    <el-button type="text" icon="el-icon-printer"  size="small" class="el-button--small-yh " @click.stop="openReports(row)">导出</el-button>
                 </template>
             </avue-crud>
         </basic-container>
@@ -183,7 +184,8 @@
 
         <report-dialog :switchDialog="switchDialog" :reportId="params.pid" reportName="出口贸易-采购"
             @onClose="onClose()"></report-dialog>
-
+        <report-dialog :switchDialog="switchDialogs" :reportId="srcIds" reportName="出口贸易-采购"
+            @onClose="onCloses()"></report-dialog>
         <el-dialog title="导入采购任务" :visible.sync="procureVisible" append-to-body>
             <avue-crud :data="procurelistData" :option="procurelistOption" :search.sync="params" ref="daorucaigoCrud"
                 @refresh-change="refreshChangeTwo"
@@ -249,6 +251,8 @@ export default {
     name: "customerInformation",
     data() {
         return {
+            switchDialog: false,
+            switchDialogs: false,
             tabsName: 'first',
             tabType: '',
             procureData: [], // 待采购数据
@@ -424,7 +428,6 @@ export default {
                     searchValue: 0
                 }]
             },
-            switchDialog: false,
             search: {
                 // businesDate: defaultDate()
                 // businesDate: ''
@@ -670,7 +673,8 @@ export default {
             show: true,
             detailData: {},
             loading: false,
-            selectionList: []
+            selectionList: [],
+            srcIds:null
         };
     },
     components: { detailPage, reportDialog },
@@ -713,6 +717,15 @@ export default {
         }
     },
     methods: {
+        openReports(row) {
+            this.switchDialogs = !this.switchDialogs;
+            this.srcIds=row.srcIds
+            
+        },
+        onCloses(val) {
+            this.switchDialogs = val;
+            this.srcIds=null
+        },
         handleClick() {
             if (this.tabsName == 'second') {
                 this.tabType = 1
@@ -1028,9 +1041,9 @@ export default {
                 };
                 delete params.requiredDeliveryDate
             }
-            params={
+            params = {
                 ...params,
-                tabType:this.tabType
+                tabType: this.tabType
             }
             this.loading = true;
             this.dataList.forEach(item => {

src/views/exportTrade/salesContract/components/goodsInfo.vue

@@ -12,6 +12,9 @@
           <!--            :disabled="detailData.status == 1 || orderItemIds.length == 0" @click="getInvoice">生成发货单-->
           <!--          </el-button>-->
           <el-button type="primary" size="small" @click="cnameData">刷新基础资料</el-button>
+          <el-button type="warning" size="small" @click.stop="saveShipping" :disabled="detailData.status == 1">
+            船务询价
+          </el-button>
           <el-button type="success" size="small" @click="calculate(1)" :disabled="detailData.status == 1"
             :loading="calculateLoading">分摊国内费用
           </el-button>
@@ -60,7 +63,7 @@
         {{ row.productPrice | decimalFormat2 }}
       </template>
       <template slot="outFactoryPrice" slot-scope="{row}">
-        {{ row.outFactoryPrice}}
+        {{ row.outFactoryPrice }}
       </template>
       <template slot="shareAmount" slot-scope="{row}">
         {{ row.shareAmount | decimalFormat2 }}
@@ -351,6 +354,7 @@ import {
   getDeptLazyTree,
   getGoods,
   getSpecification,
+  saveShipping,
   getPricebank,
   calculationDomesticFees, generatePurchaseNews, deliverGoods
 } from "@/api/basicData/salesContract";
@@ -681,7 +685,7 @@ export default {
           row.itemType = e.specs;
           row.tradeTerms = null;
           row.productPrice = productCal(e.purchaseAmount, 0, this.form.coefficient);
-          row.outFactoryPrice = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate,3);
+          row.outFactoryPrice = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate, 3);
           row.shareAmount = 0;
           row.internationalAmount = 0;
           row.totalValue = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
@@ -773,7 +777,7 @@ export default {
           productPrice: productCal(e.purchaseAmount, 0, this.form.coefficient),
           outFactoryPrice: sellingCal(
             productCal(e.purchaseAmount, 0, this.form.coefficient),
-            this.form.exchangeRate,3
+            this.form.exchangeRate, 3
           ),
           shareAmount: 0,
           internationalAmount: 0,
@@ -826,6 +830,30 @@ export default {
     openProperty(row) {
       this.$refs.property.init(row);
     },
+    saveShipping() {
+      if (!this.form.id) {
+        return this.$message.error("此单据没有提交记录，请先提交");
+      }
+      if (!this.form.shipkeeperId) {
+        return this.$message.error("船务员必填");
+      }
+      this.$confirm("是否生成船务询价单?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        let obj = {}
+        obj = {
+          id: this.form.id,
+          srcBillType: 'XS'
+        }
+        saveShipping(obj).then(res => {
+          if (res.data.code == 200) {
+            this.$message.success("生成成功");
+          }
+        });
+      });
+    },
     addLibrary() {
       if (!this.form.corpId) {
         return this.$message.error("请选择客户名称");
@@ -1071,7 +1099,7 @@ export default {
     submitPriceAD() {
       this.visible = false;
       this.data.forEach(e => {
-        e.outFactoryPrice = priceaAjustment(e.outFactoryPrice, this.priceAD,3)
+        e.outFactoryPrice = priceaAjustment(e.outFactoryPrice, this.priceAD, 3)
         e.totalValue = multiply(e.outFactoryPrice, e.orderQuantity)
         e.price = addPrice(e.outFactoryPrice, e.shareAmount, e.internationalAmount)
         e.amount = amountCal(
@@ -1113,7 +1141,7 @@ export default {
         row.partsPrice,
         this.form.coefficient
       );
-      row.outFactoryPrice = sellingCal(row.productPrice, this.form.exchangeRate,3);
+      row.outFactoryPrice = sellingCal(row.productPrice, this.form.exchangeRate, 3);
       row.totalValue = multiply(row.outFactoryPrice, row.orderQuantity)
       row.price = addPrice(
         row.outFactoryPrice,
@@ -1479,7 +1507,7 @@ export default {
       if (columns.length > 0) {
         columns.forEach((column, index) => {
           let prop = column.property
-          if (['orderQuantity', 'amount', 'partsCost', 'partsPrice', 'productPrice', 'actualQuantity','goodsGrossProfit'].includes(prop)) {
+          if (['orderQuantity', 'amount', 'partsCost', 'partsPrice', 'productPrice', 'actualQuantity', 'goodsGrossProfit'].includes(prop)) {
             let values = this.data.map(item => Number(item[prop] || 0));
             let all = values.length !== 0 ? sums[index] = values.reduce((a, b) => {
               return a + b;

src/views/exportTrade/salesContract/detailsPage.vue

@@ -909,7 +909,7 @@ export default {
         {
           label: "采购员",
           prop: "buyerId",
-          span: 6,
+          span: 5,
           overHidden: true,
           filterable: true,
           remote: true,
@@ -930,7 +930,7 @@ export default {
         }, {
           label: "跟单员",
           prop: "documenterId",
-          span: 6,
+          span: 5,
           overHidden: true,
           filterable: true,
           remote: true,
@@ -948,11 +948,25 @@ export default {
               trigger: "blur"
             }
           ]
+        }, {
+          label: "船务员",
+          prop: "shipkeeperId",
+          span: 5,
+          overHidden: true,
+          filterable: true,
+          remote: true,
+          type: "select",
+          dicUrl: "/api/blade-user/page?size=20&current=1&realName={{key}}",
+          props: {
+            label: "realName",
+            value: "id",
+            res: 'data.records'
+          },
         },
         {
           label: "三方检验",
           prop: "tripartiteInspection",
-          span: 6,
+          span: 5,
           type: "select",
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=tripartite_inspection",
           props: {
@@ -971,7 +985,7 @@ export default {
           label: '需产地证',
           prop: 'certificateOriginRequired',
           type: 'select',
-          span: 6,
+          span: 4,
           dicData: [{
             label: "是",
             value: "1"

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -579,6 +579,7 @@ export default {
             this.subLoading = true;
             submit({
               ...this.form,
+              billType:this.form.srcBillType?this.form.srcBillType:'BJ',
               orderFreightList: this.freightData,
               orderFeesList: orderFeesList
             })
@@ -640,6 +641,7 @@ export default {
             }
             commit({
               ...this.form,
+              billType:this.form.srcBillType?this.form.srcBillType:'BJ',
               orderFreightList: this.freightData,
               orderFeesList: orderFeesList
             }).then(res => {

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -191,8 +191,8 @@
                                     <el-checkbox v-model="appendType" :disabled="settlementdistar || editSave"
                                         false-label="检索" true-label="追加">追加</el-checkbox>
                                     <el-button size="small" type="primary" style="margin-right: 8px"
-                                        :disabled="settlementdistar || editSave" :loading="saveLoading"
-                                        @click="retrievalfun">检 索
+                                        :disabled="settlementdistar || editSave || (tableData.length > 0 && appendType == '检索')"
+                                        :loading="saveLoading" @click="retrievalfun">检 索
                                     </el-button>
                                 </div>
                             </el-col>
@@ -200,8 +200,6 @@
                     </el-row>
                 </el-form>
             </el-card>
-
-
             <el-card style="margin-top: 10px">
                 <div style="margin-bottom: 10px">
                     <el-button size="small" type="info" :disabled="editSave" :loading="saveLoading"

src/views/iosBasicData/accountsDetails/index.vue

@@ -49,6 +49,10 @@
         <el-col :span="20" style="padding-left: 20px;">
           <avue-crud :option="option" :data="dataList" ref="crud" id="out-table"
             :header-cell-class-name="headerClassName">
+            <template slot="voucherNo" slot-scope="{ row }">
+              <span style="color: #1e9fff;cursor: pointer;" @click="toJump(row)">{{ row.voucherNo }}
+              </span>
+            </template>
           </avue-crud>
         </el-col>
       </el-row>
@@ -457,7 +461,35 @@ export default {
   created() {
     this.option.height = window.innerHeight - 360;
   },
+  activated() {
+    if (this.$route.query.accId) {
+      setTimeout(() => {
+        if (!this.$store.getters.subLedgerStatus) {
+          this.$store.commit("IN_SUBLED_DETAIL");
+          this.query.accList = this.$route.query.accId ? this.$route.query.accId.split(',') : []
+          this.serach()
+        }
+      }, 200);
+    }
+  },
   methods: {
+    toJump(row) {
+      if (this.$store.getters.voucherStatus) {
+        this.$alert("财务凭证页面已存在,请关闭财务凭证再进行操作", "温馨提示", {
+          confirmButtonText: "确定",
+          type: 'warning',
+          callback: action => {
+          }
+        });
+      } else {
+        this.$router.push({
+          path: `/iosBasicData/finvouchers/index`,
+          query: {
+            id: row.voucherId
+          },
+        });
+      }
+    },
     showHight() {
       // this.$refs.crud.getTableHeight();
     },
@@ -491,13 +523,13 @@ export default {
     },
     //重置特殊值
     resetData() {
-      this.query.foreignCurrency = this.query.checkbox.find(e=>e=='foreignCurrency')?1:0
-      this.query.lastLevelItem = this.query.checkbox.find(e=>e=='lastLevelItem')?1:0
-      this.query.blcNotZero = this.query.checkbox.find(e=>e=='blcNotZero')?1:0
-      this.query.noAmountIncurred = this.query.checkbox.find(e=>e=='noAmountIncurred')?1:0
-      this.query.doNotDisplayYear = this.query.checkbox.find(e=>e=='doNotDisplayYearc')?1:0
-      this.query.oppositeAcc =this.query.checkbox.find(e=>e=='oppositeAcc')?1:0
-      this.query.total =this.query.checkbox.find(e=>e=='total')?1:0
+      this.query.foreignCurrency = this.query.checkbox.find(e => e == 'foreignCurrency') ? 1 : 0
+      this.query.lastLevelItem = this.query.checkbox.find(e => e == 'lastLevelItem') ? 1 : 0
+      this.query.blcNotZero = this.query.checkbox.find(e => e == 'blcNotZero') ? 1 : 0
+      this.query.noAmountIncurred = this.query.checkbox.find(e => e == 'noAmountIncurred') ? 1 : 0
+      this.query.doNotDisplayYear = this.query.checkbox.find(e => e == 'doNotDisplayYearc') ? 1 : 0
+      this.query.oppositeAcc = this.query.checkbox.find(e => e == 'oppositeAcc') ? 1 : 0
+      this.query.total = this.query.checkbox.find(e => e == 'total') ? 1 : 0
     },
     //导出
     outExport() {

src/views/iosBasicData/fingenleg/index.vue

@@ -32,6 +32,10 @@
     </basic-container>
     <basic-container v-show="dataList.length > 0">
       <avue-crud :option="option" :data="dataList" ref="crud" id="out-table" :header-cell-class-name="headerClassName">
+        <template slot="accCode" slot-scope="{ row }">
+          <span style="color: #1e9fff;cursor: pointer;" @click="toJump(row)">{{ row.accCode }}
+          </span>
+        </template>
       </avue-crud>
     </basic-container>
   </div>
@@ -95,7 +99,7 @@ export default {
             filterable: true,
             multiple: true,
             tags: true,
-            remote:true,
+            remote: true,
             dicUrl: `/api/blade-los/accounts/selectList?isDetail=1&cnName={{key}}`,
             dicData: [],
             props: {
@@ -334,6 +338,23 @@ export default {
 
   },
   methods: {
+    toJump(row) {
+      if (this.$store.getters.subLedgerStatus) {
+        this.$alert("明细账页面已存在,请关闭明细账再进行操作", "温馨提示", {
+          confirmButtonText: "确定",
+          type: 'warning',
+          callback: action => {
+          }
+        });
+      } else {
+        this.$router.push({
+          path: `/iosBasicData/accountsDetails/index`,
+          query: {
+            accId: row.accId
+          },
+        });
+      }
+    },
     //初始入账
     inItial() {
       this.$confirm('是否继续初始入账?', '提示', {
@@ -360,12 +381,12 @@ export default {
     },
     //重置特殊值
     resetData() {
-      this.query.auxiliaryAccounting = this.query.checkbox.find(e=>e=='auxiliaryAccounting')?1:0
-      this.query.foreignCurrency = this.query.checkbox.find(e=>e=='foreignCurrency')?1:0
-      this.query.lastLevelItem = this.query.checkbox.find(e=>e=='lastLevelItem')?1:0
-      this.query.blcNotZero = this.query.checkbox.find(e=>e=='blcNotZero')?1:0
-      this.query.noAmountIncurred = this.query.checkbox.find(e=>e=='noAmountIncurred')?1:0
-      this.query.doNotDisplayYear = this.query.checkbox.find(e=>e=='doNotDisplayYearc')?1:0
+      this.query.auxiliaryAccounting = this.query.checkbox.find(e => e == 'auxiliaryAccounting') ? 1 : 0
+      this.query.foreignCurrency = this.query.checkbox.find(e => e == 'foreignCurrency') ? 1 : 0
+      this.query.lastLevelItem = this.query.checkbox.find(e => e == 'lastLevelItem') ? 1 : 0
+      this.query.blcNotZero = this.query.checkbox.find(e => e == 'blcNotZero') ? 1 : 0
+      this.query.noAmountIncurred = this.query.checkbox.find(e => e == 'noAmountIncurred') ? 1 : 0
+      this.query.doNotDisplayYear = this.query.checkbox.find(e => e == 'doNotDisplayYearc') ? 1 : 0
     },
     //导出
     outExport() {

src/views/iosBasicData/fingenlegcalc/index.vue

@@ -44,6 +44,10 @@
         <el-col :span="20" style="padding-left: 20px;">
           <avue-crud :option="option" :data="dataList" ref="crud" id="out-table"
             :header-cell-class-name="headerClassName">
+            <template slot="voucherNo" slot-scope="{ row }">
+              <span style="color: #1e9fff;cursor: pointer;" @click="toJump(row)">{{ row.voucherNo }}
+              </span>
+            </template>
           </avue-crud>
         </el-col>
       </el-row>
@@ -428,6 +432,23 @@ export default {
     })
   },
   methods: {
+    toJump(row) {
+      if (this.$store.getters.voucherStatus) {
+        this.$alert("财务凭证页面已存在,请关闭财务凭证再进行操作", "温馨提示", {
+          confirmButtonText: "确定",
+          type: 'warning',
+          callback: action => {
+          }
+        });
+      } else {
+        this.$router.push({
+          path: `/iosBasicData/finvouchers/index`,
+          query: {
+            id: row.voucherId
+          },
+        });
+      }
+    },
     showHight(type) {
       // this.$refs.crud.getTableHeight();
     },

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -721,7 +721,7 @@ export default {
     activated() {
         if (this.$route.query.id) {
             setTimeout(() => {
-                if (!this.$store.getters.finOutStatu) {
+                if (!this.$store.getters.finOutStatus) {
                     this.editFun(this.$route.query)
                 }
             }, 200);

src/views/iosBasicData/finvouchers/finvouchersitems.vue

@@ -7,6 +7,8 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
+                <el-button type="primary" size="small" @click="addEdit()">新建财务凭证
+                </el-button>
                 <el-button size="small" type="success" style="margin-right: 8px" :loading="saveLoading"
                     :disabled="form.voucherStatus == 1">凭证标错
                 </el-button>
@@ -60,6 +62,13 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="业务编号" prop="srcBlllNo">
+                                <el-input style="width: 100%;" v-model="form.srcBlllNo" size="small" autocomplete="off"
+                                    :disabled="true" clearable placeholder="请输入编号">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
                         <!--<el-col :span="6">-->
                         <!--    <el-form-item label="附件" prop="billNo">-->
                         <!--        <el-input type="" style="width: 100%;" v-model="form.billNo"-->
@@ -326,6 +335,19 @@ export default {
         this.getWorkDictsfun()
     },
     methods: {
+        addEdit() {
+            if (this.form.voucherStatus == 1) {
+                this.$emit('toAddEdit')
+            } else {
+                this.$confirm('此操作将保存并新建, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    this.finvouchersSubmitfun('toAddEdit')
+                })
+            }
+        },
         // 下拉弹窗打开操作
         bottonSearchfun(name) {
             this.$nextTick(() => {
@@ -424,7 +446,7 @@ export default {
             }
         },
         // 大保存
-        finvouchersSubmitfun() {
+        finvouchersSubmitfun(type) {
             this.form.businessTypeCode = 'PZDH'
             this.form.billNoFormat = this.form.voucherType
             if (this.form.finVouchersItemsList.length < 2) {
@@ -458,6 +480,9 @@ export default {
             this.pageLoading = true
             finvouchersSubmit(this.form).then(res => {
                 this.$message.success('操作成功')
+                if (type == 'toAddEdit') {
+                    this.$emit('toAddEdit')
+                }
                 this.finvouchersDetailfun(res.data.data.id)
             }).finally(() => {
                 this.pageLoading = false

src/views/iosBasicData/finvouchers/index.vue

@@ -20,9 +20,9 @@
             </el-button>
           </template>
           <template slot="menu" slot-scope="{row}">
-            <el-button type="text" size="small" @click="editFun(row)" :disabled="row.voucherStatus==1">编辑
+            <el-button type="text" size="small" @click="editFun(row)" :disabled="row.voucherStatus == 1">编辑
             </el-button>
-            <el-button type="text" size="small" @click="rowDel(row)"  :disabled="row.voucherStatus==1">删除
+            <el-button type="text" size="small" @click="rowDel(row)" :disabled="row.voucherStatus == 1">删除
             </el-button>
           </template>
           <template slot="billNo" slot-scope="{row}">
@@ -32,7 +32,8 @@
       </custom-loading>
 
     </basic-container>
-    <finvouchersitems ref="finvouchersitemsRef" v-if="!isShow" @goBack="goBack"></finvouchersitems>
+    <finvouchersitems ref="finvouchersitemsRef" :key="datekey" v-if="!isShow" @goBack="goBack" @toAddEdit="toAddEdit">
+    </finvouchersitems>
   </div>
 </template>
 
@@ -52,6 +53,7 @@ import CustomLoading from '@/views/iosBasicData/finvouchers/components/loading.v
 export default {
   data() {
     return {
+      datekey: Date.now(),
       isShow: true, // 详情弹窗
       form: {},
       query: {},
@@ -283,8 +285,19 @@ export default {
     this.option = await this.getColumnData(this.getColumnName(321), this.optionBack);
     this.voucherStatusWorkDictsfun()
   },
+  activated() {
+    if (this.$route.query.id) {
+      setTimeout(() => {
+        if (!this.$store.getters.voucherStatus) {
+          this.editFun(this.$route.query)
+        }
+      }, 200);
+    }
+  },
   methods: {
-    revokeFinVouchers,
+    toAddEdit() {
+      this.datekey = Date.now()
+    },
     // 获取字典数据
     voucherStatusWorkDictsfun() {
       getWorkDicts("voucher_status_los").then(res => {
@@ -331,9 +344,9 @@ export default {
           // this.loading = false;
           this.onLoad(this.page, this.query);
         })
-        .finally(() => {
-          this.$refs.customLloading.endLoading()
-        });
+          .finally(() => {
+            this.$refs.customLloading.endLoading()
+          });
       })
     },
     // 撤销记账
@@ -365,14 +378,15 @@ export default {
           });
           this.onLoad(this.page, this.query);
         })
-        .finally(() => {
-          this.$refs.customLloading.endLoading()
-        });
+          .finally(() => {
+            this.$refs.customLloading.endLoading()
+          });
       })
     },
     // 新建凭证
     addbtnfun() {
       this.isShow = false
+      this.$store.commit("IN_VOUCHER_DETAIL");
     },
     // 编辑
     editFun(row) {
@@ -380,6 +394,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.finvouchersitemsRef.finvouchersDetailfun(row.id)
       })
+      this.$store.commit("IN_VOUCHER_DETAIL");
     },
     // 详情的返回列表
     goBack() {
@@ -392,8 +407,8 @@ export default {
       }
       this.isShow = true;
       this.onLoad(this.page, this.query);
+      this.$store.commit("OUT_VOUCHER_DETAIL");
     },
-
     rowSave(row, done, loading) {
       finvouchersSubmit(row).then(() => {
         this.onLoad(this.page);

src/views/tirePartsMall/inventory/index.vue

@@ -41,7 +41,9 @@
         <el-tab-pane label="品牌" name="second">
           <avue-crud :option="brandOption" :table-loading="loading" :data="brandList" ref="crudBrand"
             :search.sync="brandSearch" @on-load="onbrandLoad" @search-change="brandsearchChange"
-            @refresh-change="brandrefreshChange" :cell-style="cellStyle">
+            @refresh-change="brandrefreshChange" :cell-style="cellStyle"
+            @resetColumn="resetColumnTwo('crudBrand', 'brandOption', 'brandOptionList', 374)"
+            @saveColumn="saveColumnTwo('crudBrand', 'brandOption', 'brandOptionList', 374)">
             <template slot-scope="{type,size,row,$index}" slot="menuLeft">
               <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
             </template>
@@ -277,12 +279,12 @@ export default {
 
           }]
       },
-      brandOption: {
+      brandOption: {},
+      brandOptionList: {
         addBtn: false,
         menu: false,
         align: "center",
         searchMenuSpan: 12,
-        height: "700",
         column: [
           {
             label: '仓库',
@@ -316,64 +318,84 @@ export default {
           },
           {
             label: '品牌',
-            prop: 'brandName'
+            prop: 'brandName',
+            overHidden: true
           }, {
             label: '合计',
-            prop: 'goodsSizeTotal'
+            prop: 'goodsSizeTotal',
+            overHidden: true
           }, {
             label: '12',
-            prop: 'goodsSize12'
+            prop: 'goodsSize12',
+            overHidden: true
           }, {
             label: '13',
-            prop: 'goodsSize13'
+            prop: 'goodsSize13',
+            overHidden: true
           }, {
             label: '14',
-            prop: 'goodsSize14'
+            prop: 'goodsSize14',
+            overHidden: true
           }, {
             label: '15',
-            prop: 'goodsSize15'
+            prop: 'goodsSize15',
+            overHidden: true
           }, {
             label: '16',
-            prop: 'goodsSize16'
+            prop: 'goodsSize16',
+            overHidden: true
           }, {
             label: '17',
-            prop: 'goodsSize17'
+            prop: 'goodsSize17',
+            overHidden: true
           }, {
             label: '18',
-            prop: 'goodsSize18'
+            prop: 'goodsSize18',
+            overHidden: true
           }, {
             label: '19',
-            prop: 'goodsSize19'
+            prop: 'goodsSize19',
+            overHidden: true
           }, {
             label: '20',
-            prop: 'goodsSize20'
+            prop: 'goodsSize20',
+            overHidden: true
           }, {
             label: '21',
-            prop: 'goodsSize21'
+            prop: 'goodsSize21',
+            overHidden: true
           }, {
             label: '22',
-            prop: 'goodsSize22'
+            prop: 'goodsSize22',
+            overHidden: true
           }, {
             label: '23',
-            prop: 'goodsSize23'
+            prop: 'goodsSize23',
+            overHidden: true
           }, {
             label: '24',
-            prop: 'goodsSize24'
+            prop: 'goodsSize24',
+            overHidden: true
           }, {
             label: '25',
-            prop: 'goodsSize25'
+            prop: 'goodsSize25',
+            overHidden: true
           }, {
             label: '26',
-            prop: 'goodsSize26'
+            prop: 'goodsSize26',
+            overHidden: true
           }, {
             label: '27',
-            prop: 'goodsSize27'
+            prop: 'goodsSize27',
+            overHidden: true
           }, {
             label: '28',
-            prop: 'goodsSize28'
+            prop: 'goodsSize28',
+            overHidden: true
           }, {
             label: '其它',
-            prop: 'goodsSizeOther'
+            prop: 'goodsSizeOther',
+            overHidden: true
           }
         ]
       },
@@ -382,7 +404,8 @@ export default {
     }
   },
   async created() {
-    // this.option = await this.getColumnData(this.getColumnName(268), this.optionList);
+    this.option = await this.getColumnData(this.getColumnName(268), this.optionList);
+    this.brandOption = await this.getColumnData(this.getColumnName(374), this.brandOptionList);
     this.option = this.optionList
     this.key++
     let i = 0;
@@ -395,6 +418,7 @@ export default {
       this.option.searchMenuPosition = "right";
     }
     this.option.height = window.innerHeight - 260;
+    this.brandOption.height = window.innerHeight - 230;
     this.getAllWorkDicts()
 
   },
@@ -443,6 +467,8 @@ export default {
       stockBrandList(this.brandSearch).then(res => {
         this.brandList = res.data.data
       }).finally(() => {
+        this.$refs.crudBrand.init();
+        this.$refs.crudBrand.getTableHeight();
         this.loading = false
       })
     },