修改

build/utils.js

@@ -16,8 +16,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
-let devModules = ['all']
-// let devModules = ['index', 'appoint', 'sale', 'statisticalReport']
+// let devModules = ['all']
+let devModules = ['index', 'appoint']
 // let devModules = ['all']
 // let devModules = ['index', 'sale']
 

config/index.js

@@ -10,7 +10,11 @@ let proxyTable = {
   '/icore.icp.web/pass/v1/sysusers/user/token': {
     //https://portal.steerinfo.com/icore.icp.web/pass/sso/v1/sysusers/user/token
     //target: 'https://portal-dev.steerinfo.com/icore.icp.web/pass/sso/v1/sysusers/user/token',
-    target: 'http://172.16.33.166:9001/v1/sysusers/user/token',
+    // target: 'http://172.16.33.166:9001/v1/sysusers/user/token',
+    target:
+      'https://wl.dasteel.cn:32322/icore.icp.web/pass/v1/sysusers/user/token',
+    secure: true,
+
     changeOrigin: true,
     pathRewrite: {
       '^/icore.icp.web/pass/v1/sysusers/user/token': '/'
@@ -18,7 +22,9 @@ let proxyTable = {
   },
   '/icore.icp.web/pass/v1': {
     //target: 'http://172.16.33.161:80/v1', //加http
-    target: 'http://172.16.33.166:9001/v1',
+    // target: 'http://172.16.33.166:9001/v1',
+    target: 'https://wl.dasteel.cn:32322/icore.icp.web/pass/v1',
+    secure: true,
     changeOrigin: true,
     pathRewrite: {
       '^/icore.icp.web/pass/v1': '/' //这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
@@ -27,7 +33,9 @@ let proxyTable = {
   },
   '/icore.icp.web/pass/auth/login': {
     //target: 'http://sso-dev.steerinfo.com/icore.icp.web/pass/auth/login',
-    target: 'http://172.16.33.166:9001/auth/login',
+    // target: 'http://172.16.33.166:9001/auth/login',
+    target: 'https://wl.dasteel.cn:32322/icore.icp.web/pass/auth/login',
+    secure: true,
     changeOrigin: true,
     pathRewrite: {
       '^/icore.icp.web/pass/auth/login': ''
@@ -41,7 +49,9 @@ let proxyTable = {
     }
   },
   '/icore-api': {
-    target: 'http://172.16.33.166:9001',
+    // target: 'http://172.16.33.166:9001',
+    secure: true,
+    target: 'https://wl.dasteel.cn:32322/icore-api',
     changeOrigin: true,
     pathRewrite: {
       '^/icore-api': '/'
@@ -72,16 +82,21 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   '/api/v1': {
-    target: 'http://172.16.33.166:80',
+    // target: 'http://172.16.33.166:80',
+    target: 'https://wl.dasteel.cn:32322/api/v1',
+    secure: false,
     // target: 'http://localhost:8080',
     // target: 'http://192.168.1.104:8080',
     ws: true,
     pathRewrite: {
-      '^/api/v1': '/api/v1'
+      // '^/api/v1': '/api/v1'
+      '^/api/v1': ''
     }
   },
   '/views/api/v1': {
-    target: 'http://172.16.33.166:80',
+    // target: 'http://172.16.33.166:80',
+    target: 'https://wl.dasteel.cn:32322',
+    secure: false,
     // target: 'http://localhost:8080',
     ws: true,
     pathRewrite: {
@@ -89,7 +104,9 @@ let proxyTable = {
     }
   },
   '/icore.icp.web/pass/logout': {
-    target: 'http://172.16.33.166:9001/logout',
+    // target: 'http://172.16.33.166:9001/logout',
+    target: 'https://wl.dasteel.cn:32322/icore.icp.web/pass/logout',
+    secure: true,
     changeOrigin: true,
     pathRewrite: {
       '^/icore.icp.web/pass/logout': '/'

src/config/axios.js

@@ -61,10 +61,13 @@ axios.interceptors.request.use(
     //     return config;
     //   }
     //  判断是否平台接口
+    console.log(config.url, 'url')
     if (config.url.indexOf('configCenter') === 0) {
       config.url = 'pass/' + config.url
     }
     config = requestConfig(config)
+    console.log(config.url, 'url')
+
     return config
   },
   error => {

src/views/appoint/components/saleContract/addSaleOrderArrange.vue

@@ -94,6 +94,14 @@
                   @change="updateArragneCxh(scope.row.cxh)"
                 ></el-input>
               </template>
+              <!-- 订单日期 -->
+              <template v-if="item.prop == 'orderDate'">
+                <el-date-picker
+                  class="textinput3"
+                  type="date"
+                  v-model.number="scope.row.orderDate"
+                ></el-date-picker>
+              </template>
               <template v-if="item.prop == 'carrierName'">
                 <el-autocomplete
                   class="textinput1"
@@ -355,6 +363,12 @@ export default {
           width: '60',
           slot: true
         },
+        {
+          prop: 'orderDate',
+          label: '订单日期',
+          width: '60',
+          slot: true
+        },
         {
           prop: 'materialName',
           label: '物资名称',

src/views/appoint/components/saleContract/saleOrderSteelCarrier.vue

@@ -27,107 +27,106 @@
   </div>
 </template>
 <script>
-import { getCookie } from "@/utils/util.js";
+import { getCookie } from '@/utils/util.js'
 export default {
-  name: "saleOrder",
+  name: 'saleOrder',
   data() {
     return {
-      activeName: "four",
+      activeName: 'four',
       drawer: false,
-      input: "",
-      index: "",
+      input: '',
+      index: '',
       carrierId: null,
       carrierName: null,
       option4: {
         // 表格请求数据的地址
-        requestUrl: "",
-        comparison: "saleNumber",
+        requestUrl: '',
+        comparison: 'saleNumber',
         columnIndexs: [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15, 16]
       },
       mapList: [],
       mapItemList: [],
       //(销售公司已审批)
       tableData: []
-    };
+    }
   },
   created() {
-    this.initUrl();
+    this.initUrl()
   },
   methods: {
     initUrl() {
-      if (getCookie("orgCode") == "chengyunshang") {
+      if (getCookie('orgCode') == 'chengyunshang') {
         this.option4.requestUrl =
-          "/api/v1/ams/getSaleOrderListToCarrier?apiId=467&carrierSsoId=" +
-          getCookie("userId");
+          '/api/v1/ams/getSaleOrderListToCarrier?apiId=467&carrierSsoId=' +
+          getCookie('userId')
       } else {
         this.option4.requestUrl =
-          "/api/v1/ams/getSaleOrderListToCarrier?apiId=467&carrierSsoId=" +
-          null;
+          '/api/v1/ams/getSaleOrderListToCarrier?apiId=467&carrierSsoId=' + null
       }
     },
     refresh() {
-      this.$router.go(0);
+      this.$router.go(0)
     },
     handleClick(tab, event) {
-      console.log(tab, event);
+      console.log(tab, event)
     },
     onclick() {
-      if (getCookie("orgCode") == "chengyunshang") {
-        if (this.activeName == "four") {
+      if (getCookie('orgCode') == 'chengyunshang') {
+        if (this.activeName == 'four') {
           this.option4.requestUrl =
-            "/api/v1/ams/getSaleOrderListToCarrier?apiId=467&carrierSsoId=" +
-            getCookie("userId") +
-            "&con=" +
-            this.input;
+            '/api/v1/ams/getSaleOrderListToCarrier?apiId=467&carrierSsoId=' +
+            getCookie('userId') +
+            '&con=' +
+            this.input
         }
       } else {
-        if (this.activeName == "four") {
+        if (this.activeName == 'four') {
           this.option4.requestUrl =
-            "/api/v1/ams/getSaleOrderListToCarrier?apiId=467&con=" +
+            '/api/v1/ams/getSaleOrderListToCarrier?apiId=467&con=' +
             this.input +
-            "&carrierSsoId=" +
-            "";
+            '&carrierSsoId=' +
+            ''
         }
       }
     },
     seeclick(saleOrderId) {
-      this.$router.push("/saleOrderDetail/" + saleOrderId);
+      this.$router.push('/saleOrderDetail/' + saleOrderId)
     },
     steelSendClick(saleOrderId) {
-      this.$router.push("/addSaleOrderSteelSendCarrier/" + saleOrderId);
+      this.$router.push('/addSaleOrderSteelSendCarrier/' + saleOrderId)
     },
     // -------查看物资详情 (已审批)
     detailclick(row) {
       // 记录重复点击次数
       if (this.oldRow === row) {
-        this.oldRowCount += 1;
+        this.oldRowCount += 1
       }
       // 切换当前详情表
-      this.$refs.table.toggleRowExpansion(row);
+      this.$refs.table.toggleRowExpansion(row)
       // 打开前关闭上一个详情表
-      if (this.oldRow != "") {
+      if (this.oldRow != '') {
         if (this.oldRow != row) {
           if (this.oldRowCount % 2 === 1) {
-            this.$refs.table.toggleRowExpansion(this.oldRow);
+            this.$refs.table.toggleRowExpansion(this.oldRow)
           } else {
-            this.oldRowCount = 1;
+            this.oldRowCount = 1
           }
         } else {
-          this.oldRow = null;
-          return;
+          this.oldRow = null
+          return
         }
       }
       // 重置上一个点击对象
-      this.oldRow = row;
+      this.oldRow = row
       // 根据销售订单id查询物资信息
       this.axios
-        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" + row.saleOrderId)
+        .post('/api/v1/ams/getSaleMaterialList?saleOrderId=' + row.saleOrderId)
         .then(res => {
-          this.tableData = res.data.data;
-        });
+          this.tableData = res.data.data
+        })
     }
   }
-};
+}
 </script>
 <style lang="scss" scoped>
 .salePlan {