fis产线下拉新增人员权限条件

3 years ago · 90935f4e0f
5 changed files with 51 additions and 31 deletions
--- a/vue/src/router/modules/fis.js
+++ b/vue/src/router/modules/fis.js
@ -79,7 +79,7 @@ const pgfis = {
        {
            path: '/pg-R100Online',
            component: () => import('@/views/pg-fis/basedate/r100Online'),
-            name: 'pg-M100Online',//命名路由
+            name: 'pg-R100Online',//命名路由
            meta: {
                title: 'R100上线信息',
                roles: ['SettleAccount.Reports'],
--- a/vue/src/views/pg-fis/basedate/m100BIll/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
@ -39,7 +39,7 @@
            v-for="item in PLChildList"
            :key="item.id"
            :label="item.productLineName"
-            :value="item.id"/>
+            :value="item.productLineCode"/>
          </el-select>
        </el-form-item>

@ -568,6 +568,7 @@ import CRMTableHead from "../../components/CRMTableHead";
 import importExcel from "@/components/ImportExcel-vw";
 import Lockr from "lockr";
 import moment from "moment";
+import { mapGetters } from 'vuex';
 import Detail from "./detail.vue";
 import { downloadFile } from "@/utils/crmindex.js";

@ -741,8 +742,9 @@ export default {
  },
  created() {
    //this.getKNRList();
-    this.getList();
    this.getProductLine();
+    //this.getList();
+    //console.log(this.userInfo);
  },
  computed: {
    getDefaultField() {
@ -753,7 +755,7 @@ export default {
      tempsTabs.push({
        label: "KNR",
        prop: "knr",
-        width: 120,
+        width: 130,
      });
      // tempsTabs.push({
      //   label: "底盘号",
@ -792,6 +794,7 @@ export default {
      });
      return tempsTabs;
    },
+    ...mapGetters(['userInfo'])//获取当前用户信息
  },
  methods: {
    //抽屉
@ -812,9 +815,10 @@ export default {
        //获取当前时间并打印
        var _this = this;
        let yy = new Date().getFullYear();
-        let mm = new Date().getMonth()+1;
-        let dd = new Date().getDate();
-        let hh = new Date().getHours()<10 ? '0'+new Date().getHours() : new Date().getHours();;
+        let month =  new Date().getMonth()+1;
+        let mm = month<10 ? '0'+month : month;
+        let dd = new Date().getDate()<10 ? '0'+new Date().getDate() : new Date().getDate();
+        let hh = new Date().getHours()<10 ? '0'+new Date().getHours() : new Date().getHours();
        let mf = new Date().getMinutes()<10 ? '0'+new Date().getMinutes() : new Date().getMinutes();
        let ss = new Date().getSeconds()<10 ? '0'+new Date().getSeconds() : new Date().getSeconds();
        _this.gettime = yy+'-'+mm+'-'+dd+' '+hh+':'+mf+':'+ss;
@ -1114,7 +1118,7 @@ export default {
    /** 搜索按钮操作 */
    handleQuery() {
      this.listQuery.SkipCount = 1;
-      this.getList();
+      //this.getList();
    },
    selectValue(params) {
      //版本下拉选择
@ -1308,7 +1312,7 @@ export default {
      this.$forceUpdate();
    },

-    valueselectChange(){},
+    valueselectChange(){this.$forceUpdate();},
    handleImportSAP(){},

    handleFilter() {
@ -1403,6 +1407,7 @@ export default {
    //获取所有产线
    getProductLine()
    {
+      this.listPLQuery.UserId = this.userInfo.userId;
      this.$axios
          .gets(
            "/api/newjit/product-line/list",this.listPLQuery
@ -1411,6 +1416,9 @@ export default {
            //console.log(response);
            this.PLList = response.item;
            this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
+            this.listQuery.productLine = this.PLChildList[0].productLineCode;
+            this.getList();
+            
            //console.log(this.PLList);
          })
          .catch(() => {
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@ -385,6 +385,7 @@ import permission from "@/directive/permission/index.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import importExcel from "@/components/ImportExcel-vw";
 import Lockr from "lockr";
+import { mapGetters } from 'vuex';
 import moment from "moment";
 import Detail from "./detail.vue";
 import { downloadFile } from "@/utils/crmindex.js";
@ -488,7 +489,7 @@ export default {
      },
      listPLQuery:{
        BillType: 2,
-        //UserId: "00000000-0000-0000-0000-000000000000",
+        //UserId: this.userinfo.UserId,
      },
      hostSNQuery:{
        productLine:undefined,
@ -562,7 +563,6 @@ export default {
        this.listQuery.state.push(element.id);
      }
    });
-    this.getList();
    this.getProductLine();
  },
  computed: {
@ -623,13 +623,14 @@ export default {
      });
      return tempsTabs;
    },
+    ...mapGetters(['userInfo'])//获取当前用户信息
  },
  methods: {
    //抽屉
    handleDrawerOpen(param) {
      this.drawer = true;
-      console.log(510)
-      console.log(param)
+      //console.log(510)
+      //console.log(param)
      var parentId = param.assemblyID; //主键id
      this.customerInfos = [
        {
@ -700,7 +701,7 @@ export default {
    /** 搜索按钮操作 */
    handleQuery() {
      this.listQuery.SkipCount = 1;
-      this.getList();
+      //this.getList();
    },
    selectValue(params) {
      //版本下拉选择
@ -736,7 +737,7 @@ export default {
      obj.isKey = false;
      obj.description = "";

-      console.log(this.form.details);
+      //console.log(this.form.details);
      this.form.details.push(obj);
      //console.log(688);
    },
@ -801,7 +802,7 @@ export default {
      this.$axios
        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
        .then((response) => {
-          console.log(partCode)
+          //console.log(partCode)
          if(partCode !== "" && partCode !== undefined)
          {
            //console.log(partCode)
@ -1351,6 +1352,7 @@ export default {
    //获取所有产线
    getProductLine()
    {
+      this.listPLQuery.UserId = this.userInfo.userId;
      this.$axios
          .gets(
            "/api/newjit/product-line/list",this.listPLQuery
@ -1359,6 +1361,8 @@ export default {
            //console.log(response);
            this.PLList = response.item;
            this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
+            this.listQuery.productLine = this.PLChildList[0].productLineCode;
+            this.getList();
            //console.log(this.PLList)
          })
          .catch(() => {
--- a/vue/src/views/pg-fis/basedate/r100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/r100Online/index.vue
@ -277,6 +277,7 @@ import permission from "@/directive/permission/index.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import importExcel from "@/components/ImportExcel-vw";
 import Lockr from "lockr";
+import { mapGetters } from 'vuex';
 import moment from "moment";
 import Detail from "./detail.vue";
 import { downloadFile } from "@/utils/crmindex.js";
@ -295,7 +296,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
 }, {});

 export default {
-  name: "M100Online",
+  name: "R100Online",
  components: { Pagination, CRMTableHead, importExcel , Detail},
  directives: { permission },
  filters: {
@ -318,7 +319,7 @@ export default {
      }
    };
    return {
-      crmType: "M100Online",
+      crmType: "R100Online",
      rules: {
        erpAssemblyName: [
          { required: true, message: "必须输入！", trigger: "blur" },
@ -416,7 +417,6 @@ export default {
        this.listQuery.state.push(element.id);
      }
    });
-    this.getList();
    this.getProductLine();
  },
  computed: {
@ -481,6 +481,7 @@ export default {
      });
      return tempsTabs;
    },
+    ...mapGetters(['userInfo'])//获取当前用户信息
  },
  methods: {
    //抽屉
@ -546,7 +547,7 @@ export default {
    /** 搜索按钮操作 */
    handleQuery() {
      this.listQuery.SkipCount = 1;
-      this.getList();
+      //this.getList();
    },
    selectValue(params) {
      //版本下拉选择
@ -582,7 +583,7 @@ export default {
      obj.isKey = false;
      obj.description = "";

-      console.log(this.form.details);
+      //console.log(this.form.details);
      this.form.details.push(obj);
      //console.log(688);
    },
@ -647,7 +648,7 @@ export default {
      this.$axios
        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
        .then((response) => {
-          console.log(partCode)
+          //console.log(partCode)
          if(partCode !== "" && partCode !== undefined)
          {
            //console.log(partCode)
@ -669,7 +670,7 @@ export default {
        });
    },

-    valueselectChange(){},
+    valueselectChange(){this.$forceUpdate();},
    handleImportSAP(){},

    handleFilter() {
@ -713,6 +714,7 @@ export default {
    //获取所有产线
    getProductLine()
    {
+      this.listPLQuery.UserId = this.userInfo.userId;
      this.$axios
          .gets(
            "/api/newjit/product-line/list",this.listPLQuery
@ -721,6 +723,8 @@ export default {
            //console.log(response);
            this.PLList = response.item;
            this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
+            this.listQuery.productLine = this.PLChildList[0].productLineCode;
+            this.getList();
            //console.log(this.PLList)
          })
          .catch(() => {
--- a/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
+++ b/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
@ -39,7 +39,7 @@
            v-for="item in PLChildList"
            :key="item.id"
            :label="item.productLineName"
-            :value="item.id"/>
+            :value="item.productLineCode"/>
          </el-select>
        </el-form-item>

@ -293,6 +293,7 @@ import permission from "@/directive/permission/index.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import importExcel from "@/components/ImportExcel-vw";
 import Lockr from "lockr";
+import { mapGetters } from 'vuex';
 import moment from "moment";
 import { downloadFile } from "@/utils/crmindex.js";

@ -433,7 +434,6 @@ export default {
      this.listQuery.cstate.push(element.id);
    });
    this.getProductLine();
-    this.getList();
  },
  computed: {
    getDefaultField() {
@ -512,6 +512,7 @@ export default {
      });
      return tempsTabs;
    },
+    ...mapGetters(['userInfo'])//获取当前用户信息
  },
  methods: {
    //抽屉
@ -630,7 +631,7 @@ export default {
    /** 搜索按钮操作 */
    handleQuery() {
      this.listQuery.SkipCount = 1;
-      this.getList();
+      //this.getList();
    },
    selectValue(params) {
      //版本下拉选择
@ -666,7 +667,7 @@ export default {
      obj.isKey = false;
      obj.description = "";

-      console.log(this.form.details);
+      //console.log(this.form.details);
      this.form.details.push(obj);
      //console.log(688);
    },
@ -712,9 +713,9 @@ export default {

      if(this.listQuery.cstate!== undefined && this.listQuery.cstate.length > 0)
      {
-      console.log(this.listQuery.cstate)
+      //console.log(this.listQuery.cstate)
        this.listQuery.cstate.forEach(element => {
-          console.log(element)
+          //console.log(element)
          if(element === 0)
          {
            this.listQuery.HasR100NotHasM100 = true;
@ -748,7 +749,7 @@ export default {
      this.$axios
        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
        .then((response) => {
-          console.log(partCode)
+          //console.log(partCode)
          if(partCode !== "" && partCode !== undefined)
          {
            //console.log(partCode)
@ -770,7 +771,7 @@ export default {
        });
    },

-    valueselectChange(){},
+    valueselectChange(){this.$forceUpdate();},
    handleImportSAP(){},

    handleFilter() {
@ -814,6 +815,7 @@ export default {
    //获取所有产线
    getProductLine()
    {
+      this.listPLQuery.UserId = this.userInfo.userId;
      this.$axios
          .gets(
            "/api/newjit/product-line/list",this.listPLQuery
@ -822,6 +824,8 @@ export default {
            //console.log(response);
            this.PLList = response.item;
            this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
+            this.listQuery.productLine = this.PLChildList[0].productLineCode;
+            this.getList();
          })
          .catch(() => {
          });