Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -11,13 +11,28 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 // 指定开发模式下需要加载的模块（可以做到只加载当前模块，提高开发效率）
 // index模块（登录）为必须，all 为所有
+
+//   index    销售    采购     规范          质量          生产      车间
+// ['index', 'sales', '  ', 'standard', 'qualityControl', 'produce', 'workshop',
+//    物流         进程     成本   报表          基础配置        系统配置
+//  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
+
+// let devModules = ['index','RMS','systemConfig']
+//let devModules = ['TMS','WMS','systemConfig','index'];
+// let devModules = ['index','RMS']
+
+
+// let devModules = ['index','RMS','systemConfig','TMS']
+let devModules = ['all'];
+// let devModules = ['index','inward','appoint','sale']
+// let devModules = ['index','SporadicManage','RMS']
+
 //    登录     合同                       首页       内转     排队   资源   销售                       零星物资
 // ['index','appoint'，'configManager','homepage','inward','queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-let devModules = ['all'];
-// let devModules = ['index','statisticalReport','appoint','RMS','TMS'];
-// let devModules = ['index'];
+// let devModules = ['all'];
+
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

config/index.js

@@ -65,8 +65,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:8080",
-    // target: "http://192.168.1.102:8019",
-    // target: "http://localhost:8019",
+    // target: "http://192.168.1.109:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

src/views/RMS/components/editConsignee.vue

@@ -21,7 +21,6 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
 export default {
   components: { PageTitle },
   data() {
@@ -68,7 +67,7 @@ console.log(this.$route.params)
          consigneeAbbreviation:this.form1.consigneeAbbreviation,
          consigneeRegisteredAddress:this.form1.consigneeRegisteredAddress,
          consigneeReceiveAddress:this.form1.consigneeReceiveAddress,
-         consigneeRegistrationTime:this.form1. consigneeRegistrationTime,
+         consigneeRegistrationTime:this.form1.consigneeRegistrationTime,
          consigneeContactName:this.form1.consigneeContactName,
          consigneeContactTel:this.form1.consigneeContactTel,
        };

src/views/RMS/components/editSupplier.vue

@@ -21,7 +21,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

src/views/RMS/components/supplier.vue

@@ -71,6 +71,7 @@ export default {
         center: true,
       })
         .then(() => {
+          console.log("scope.row.supplierId",scope.row.supplierId)
           this.axios
             .post("/api/v1/rms/deleteSupplier/" + scope.row.supplierId)
             .then((res) => {