提交福达

src/api/basicData/purchaseInquiry.js

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

src/page/index/tags.vue

@@ -363,6 +363,9 @@ export default {
         if(tag.label == "收款结算"){
           this.$store.commit("COLL_CLOSE_EXPORT_DETAIL");
         }
+        if(tag.label == "采购(E)"){
+          this.$store.commit("OUT_CG_STATUS");
+        }
         this.$store.commit("DEL_TAG", tag);
         if (tag.value === this.tag.value) {
           tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个

src/store/getters.js

@@ -56,6 +56,7 @@ const getters = {
   pjxsStatus:state => state.ifdetail.pjxsStatus,
   pjcgStatus:state => state.ifdetail.pjcgStatus,
   maritimeExport:state => state.ifdetail.maritimeExport,
-  collectionSettlement:state => state.ifdetail.collectionSettlement
+  collectionSettlement:state => state.ifdetail.collectionSettlement,
+  cgStatus:state => state.ifdetail.cgStatus
 }
 export default getters

src/store/modules/ifdetail.js

@@ -20,6 +20,7 @@ const ifdetail = {
     entranceXsStatus: false, //进口销售,
     xsStatus: false, //出口销售
     bjStatus: false, //出口报价
+    cgStatus: false, //出口采购
     officePurchaseStatus: false, // 办公采购
     officeLyStatus: false, //办公领用
     handOverStatus: false, // 交接单
@@ -106,6 +107,9 @@ const ifdetail = {
     IN_BJ_STATUS(state) {
       state.bjStatus = true;
     },
+    IN_CG_STATUS(state) {
+      state.cgStatus = true;
+    },
     IN_CKGL_STATUS(state) {
       state.ckglStatus = true;
     },
@@ -125,6 +129,9 @@ const ifdetail = {
     OUT_CKGL_STATUS(state) {
       state.ckglStatus = false;
     },
+    OUT_CG_STATUS(state) {
+      state.cgStatus = false;
+    },
     OUT_PJXS_STATUS(state) {
       state.pjxsStatus = false;
     },
@@ -382,6 +389,9 @@ const ifdetail = {
       if (tag.label == '收款结算') {
         state.collectionSettlement = true
       }
+      if (tag.label == '采购(E)') {
+        state.cgStatus = true
+      }
     }
   }
 

src/views/approveData/index.vue

@@ -184,6 +184,7 @@ export default {
     },
     //跳转页面
     jumpPage(row) {
+      console.log(eval("(" + row.pageStatus + ")"))
       if (row.url) {
         if (eval("(" + row.pageStatus + ")")) {
           this.$alert(

src/views/exportTrade/invoice/config/customerContact.json

@@ -17,20 +17,27 @@
     {
       "label": "产品类别",
       "prop": "priceCategory",
-      "index": 2,
+      "index": 1,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "产品编号",
       "prop": "code",
-      "index": 3,
+      "index": 2,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "产品名称",
       "prop": "cname",
+      "index": 3,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "英文名称",
+      "prop": "ename",
       "index": 4,
       "width": 100,
       "overHidden": true
@@ -38,7 +45,7 @@
     {
       "label": "产品属性",
       "prop": "itemProp",
-      "index": 4,
+      "index": 5,
       "width": 100,
       "overHidden": true,
       "cell": true,

src/views/exportTrade/invoice/detailsPage.vue

@@ -307,7 +307,7 @@
       </el-date-picker>
       </span>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialog = false;pickerValue = ''">取 消</el-button>
+        <el-button @click="dialog = false;">取 消</el-button>
         <el-button type="primary" @click="PSModification(fudaSatus)">确 定</el-button>
       </span>
     </el-dialog>
@@ -334,13 +334,14 @@ import { micrometerFormat, IntegerFormat } from "@/util/validate";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import _ from "lodash";
 import fa from "element-ui/src/locale/lang/fa";
+import {dateFormat} from "@/util/date";
 export default {
   name: "detailsPageEdit",
   data() {
     return {
       fudaSatus:0,
       dialog:false,
-      pickerValue:'',
+      pickerValue:dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00",
       treeStyle: "height:" + (window.innerHeight - 315) + "px",
       configuration2: {
         multipleChoices: false,
@@ -450,6 +451,11 @@ export default {
             disabled: true,
             span: 8
           },{
+            label: "货物类型",
+            prop: "cargoType",
+            span: 8,
+            disabled: true,
+          },{
             label: "起运港",
             prop: "portOfLoad",
             span: 8,
@@ -465,21 +471,6 @@ export default {
             span: 8,
             disabled: true,
           },{
-            label: "日期条款",
-            prop: "dateClause",
-            span: 8,
-            disabled: true,
-          },{
-            label: "日期说明",
-            prop: "dateDesc",
-            span: 8,
-            disabled: true,
-          },{
-            label: "货物类型",
-            prop: "cargoType",
-            span: 8,
-            disabled: true,
-          },{
             label: "价格条款",
             prop: "priceTerms",
             span: 8,
@@ -490,6 +481,11 @@ export default {
             span: 8,
             disabled: true,
           },{
+            label: "币别",
+            prop: "currency",
+            span: 8,
+            disabled: true,
+          },{
             label: "付款方式",
             prop: "paymentType",
             span: 8,
@@ -500,13 +496,18 @@ export default {
             span: 8,
             disabled: true,
           },{
-            label: "币别",
-            prop: "currency",
+            label: "汇率",
+            prop: "exchangeRate",
             span: 8,
             disabled: true,
           },{
-            label: "汇率",
-            prop: "exchangeRate",
+            label: "日期条款",
+            prop: "dateClause",
+            span: 8,
+            disabled: true,
+          },{
+            label: "日期说明",
+            prop: "dateDesc",
             span: 8,
             disabled: true,
           },{
@@ -621,6 +622,13 @@ export default {
       this.findObject(this.tableOption.column, "unit").dicData = res.data.data;
     });
   },
+  watch:{
+    dialog(newVla, oldVal) {
+      if (newVla){
+        this.pickerValue = dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
+      }
+    }
+  },
   filters: {
     IntegerFormat(num) {
       return IntegerFormat(num);
@@ -742,6 +750,7 @@ export default {
           this.selectionList.forEach(e => {
             this.data.forEach((item, index) => {
               if (index == this.reData.index) {
+                item.ename = e.ename;
                 item.itemId = e.id;
                 item.code = e.code;
                 item.cname = e.cname;
@@ -768,6 +777,7 @@ export default {
       } else {
         this.selectionList.forEach(e => {
           this.data.push({
+            ename: e.ename,
             itemId: e.id,
             code: e.code,
             cname: e.cname,

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

@@ -47,6 +47,12 @@
       "index": 3,
       "width": 100,
       "overHidden": true
+    },{
+      "label": "英文名称",
+      "prop": "ename",
+      "overHidden": true,
+      "index": 3,
+      "width": 180
     },
     {
       "label": "产品属性",

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -779,6 +779,7 @@ export default {
           this.selectionList.forEach(e => {
             this.data.forEach((item, index) => {
               if (index == this.reData.index) {
+                item.ename = e.ename;
                 item.itemId = e.id;
                 item.code = e.code;
                 item.cname = e.cname;
@@ -805,6 +806,7 @@ export default {
       } else {
         this.selectionList.forEach(e => {
           this.data.push({
+            ename: e.ename,
             itemId: e.id,
             code: e.code,
             cname: e.cname,
@@ -1056,7 +1058,7 @@ export default {
           id: this.form.id,
           checkType: "cgqh",
           url: "/exportTrade/purchaseContract/index",
-          pageStatus: "this.$store.getters.domPurStatus",
+          pageStatus: "this.$store.getters.cgStatus",
           pageLabel: "采购(E)",
           checkFlag: 2
         };

src/views/exportTrade/purchaseContract/index.vue

@@ -322,6 +322,15 @@ export default {
       return IntegerFormat(num);
     }
   },
+  activated(){
+    if (this.$route.query.check){
+      this.detailData = {
+        id: this.$route.query.check.billId
+      };
+      this.show = false;
+      this.$store.commit("IN_CG_STATUS");
+    }
+    },
   methods: {
     removeStagList(row, index) {
       this.goodsListSave.splice(row.$index, 1);
@@ -497,6 +506,15 @@ export default {
         };
         delete params.businesDate;
       }
+
+      if (this.search.requiredDeliveryDate && this.search.requiredDeliveryDate.length > 0) {
+        params = {
+          ...params,
+          requiredDeliveryStartDate: this.search.requiredDeliveryDate[0],
+          requiredDeliveryEndDate: this.search.requiredDeliveryDate[1]
+        };
+        delete params.requiredDeliveryDate
+      }
       this.loading = true;
       getList(page.currentPage, page.pageSize, params)
         .then(res => {

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -368,9 +368,25 @@ export default {
     this.getWorkDicts("currency").then(res => {
       this.currencyList = res.data.data;
     });
-    selectGoodsAll().then(res => {
-      this.goodsoptions = res.data.data;
+    const method = []
+    getGoods(1, 1).then(res => {
+      if (res.data.data.total > 0) {
+        if (Math.ceil(res.data.data.total / 20) > 1) {
+          for (let i = 1; i <= Math.ceil(res.data.data.total / 20); i++) {
+            method.push(getGoods(i, 20))
+          }
+        }
+      }
+      axios.all(method).then(rest=>{
+        for (let item of rest){
+          this.goodsoptions = this.goodsoptions.concat(item.data.data.records);
+        }
+      })
     })
+
+    // selectGoodsAll().then(res => {
+    //   this.goodsoptions = res.data.data;
+    // })
     // getGoods(1, 10).then(res => {
     //   if (res.data.data.total > 0) {
     //     this.goodsoptions = res.data.data.records;

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

@@ -1376,7 +1376,13 @@ export default {
       }
     }
   },
-  watch: {}
+  watch: {
+    dialog(newVla, oldVal) {
+      if (newVla){
+        this.pickerValue = dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
+      }
+    }
+  }
 };
 </script>
 

src/views/exportTrade/salesContract/detailsPage.vue

@@ -2224,7 +2224,7 @@ export default {
           id: this.form.id,
           checkType: "xsqh",
           url: "/exportTrade/salesContract/index",
-          pageStatus: "this.$store.getters.domSaleStatus",
+          pageStatus: "this.$store.getters.xsStatus",
           pageLabel: "销售(E)",
           checkFlag: 2
         };

src/views/exportTrade/salesContract/index.vue

@@ -248,7 +248,6 @@ export default {
       this.findObject(this.option.column, "createUser").dicData = res.data.data;
     });
   },
-
   filters: {
     IntegerFormat(num) {
       return IntegerFormat(num);
@@ -266,6 +265,13 @@ export default {
         this.editOpen({ id: this.$route.query.id }, 1);
       }, 100);
     }
+    if (this.$route.query.check){
+      this.detailData = {
+        id: this.$route.query.check.billId
+      };
+      this.show = false;
+      this.$store.commit("IN_XS_STATUS");
+    }
   },
   methods: {
     searchCriteriaSwitch(type) {

src/views/wel/components/quick-launch.vue

@@ -103,37 +103,37 @@
         </div>
       </div>
       <div class="content" v-if="sysType == 4 || sysType == 2">
-        <div class="content-icon" @click="inPage('bj')" v-if="sysType == 4&&roleName!='采购'">
+        <div class="content-icon" @click="inPage('bj')" v-if="sysType == 4&&roleName!='采购'" v-show="menuAll.includes('1452458513768214529')">
           <i class="tradingIcon icon-sales" style="color:#606266"></i>
           <span>报价</span>
         </div>
-        <div class="content-icon" @click="inPage('xs')" v-if="roleName!='采购'">
+        <div class="content-icon" @click="inPage('xs')" v-if="roleName!='采购'" v-show="menuAll.includes('1450016264090353666')">
           <i class="tradingIcon icon-sales" style="color:#409EFF"></i>
           <span>销售</span>
         </div>
-        <div class="content-icon" @click="inPage('cg')">
+        <div class="content-icon" @click="inPage('cg')" v-if="menuAll.includes('1450016028588572673')">
           <i class="tradingIcon icon-purchase" style="color:#75CD28"></i>
           <span>采购</span>
         </div>
-        <div class="content-icon" @click="inPage('fh')">
+        <div class="content-icon" @click="inPage('fh')" v-if="menuAll.includes('1450016865054425090')">
           <i class="tradingIcon icon-ship" style="color:#143056"></i>
           <span v-if="sysType == 4">跟单</span>
           <span v-if="sysType == 2">客户收货</span>
         </div>
-        <div class="content-icon" @click="inPage('sh')">
+        <div class="content-icon" @click="inPage('sh')" v-if="menuAll.includes('1450016559952363522')">
           <i class="tradingIcon icon-receipt" style="color:#921939"></i>
           <span v-if="sysType == 4">收货</span>
           <span v-if="sysType == 2">工厂发货</span>
         </div>
-        <div class="content-icon" @click="inPage('sqfk')">
+        <div class="content-icon" @click="inPage('sqfk')" v-if="menuAll.includes('1476082159704887297')">
           <i class="tradingIcon icon-apply" style="color:#BE3216"></i>
           <span>付费申请</span>
         </div>
-        <div class="content-icon" @click="inPage('sf')">
+        <div class="content-icon" @click="inPage('sf')" v-if="menuAll.includes('1450737630586388482')">
           <i class="tradingIcon icon-charge" style="color:#4D6016"></i>
           <span>收费</span>
         </div>
-        <div class="content-icon" @click="inPage('ff')">
+        <div class="content-icon" @click="inPage('ff')" v-if="menuAll.includes('1465162366688710658')">
           <i class="tradingIcon icon-charge" style="color:#7E8270"></i>
           <span>付费</span>
         </div>
@@ -166,13 +166,22 @@ export default {
   data() {
     return {
       largeScreenToken: '',
-      roleName:''
+      roleName:'',
+      menuAll:[] //所有路由菜单id
     };
   },
   props: {
     sysType: Number
   },
   created() {
+    //从缓存中获取所有路由信息
+    let menu = JSON.parse(localStorage.getItem("saber-menuAll")).content
+    for (let item of menu){
+      this.menuAll.push(item.id)
+      if (item.children.length > 0){
+        this.getMenuId(item.children)
+      }
+    }
     if (this.sysType == 2) {
       this.getWorkDicts('large_screen').then(res => {
         this.largeScreenToken = res.data.data[0].dictKey;
@@ -181,6 +190,12 @@ export default {
     this.roleName=localStorage.getItem("roleName")
   },
   methods: {
+    //获取所有路由信息id
+    getMenuId(array){
+      for (let item of array){
+        this.menuAll.push(item.id)
+      }
+    },
     inPage(type) {
       //出口
       if (this.sysType == 4) {

src/views/wel/index.vue

@@ -28,7 +28,6 @@ export default {
   },
   created() {
     getUserInfo().then(res => {
-      console.log(res.data)
       this.billType = res.data.data.billType;
       localStorage.setItem('sysitemType', this.billType)
     });