修改不

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', 'statisticalReport', 'appoint']
+let devModules = ['all']
+// let devModules = ['index', 'statisticalReport', 'appoint']
 // let devModules = ['index', 'ADMINISTRATORS']
 
 if (pathSrc.indexOf('node_modules') > -1) {

config/index.js

@@ -72,8 +72,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   '/api/v1': {
-    // target: 'http://172.16.33.166:80',
-    target: 'http://localhost:8080',
+    target: 'http://172.16.33.166:80',
+    // target: 'http://localhost:8080',
     // target: 'http://192.168.1.104:8080',
     ws: true,
     pathRewrite: {

src/views/index/components/printReceipt1.vue

@@ -294,13 +294,14 @@ export default {
           this.deliveryAddress = res.data.deliveryAddress
           this.deliveryOrderMaterialList = res.data.deliveryOrderMaterialList
           this.note = res.data.note
-          console.log("数据的长度"+res.data.deliveryOrderMaterialList.length)
-          if (res.data.deliveryOrderMaterialList.length > 2){
-            this.page=true
-          }else if (res.data.deliveryOrderMaterialList.length ==1){
-            this.deliveryOrderMaterialList.push(deliver)
-            console.log(this.deliveryOrderMaterialList)
-          }
+          //console.log("数据的长度"+res.data.deliveryOrderMaterialList.length)
+          console.log("进入了这个方法")
+          // if (res.data.deliveryOrderMaterialList.length > 2){
+          //   this.page=true
+          // }else if (res.data.deliveryOrderMaterialList.length ==1){
+          //   this.deliveryOrderMaterialList.push(deliver)
+          //   console.log(this.deliveryOrderMaterialList)
+          // }
         })
       document.getElementById('printReceipt').click()
     },
@@ -315,6 +316,7 @@ export default {
     //   // this.axios.post('/api/v1/tms/changeNumber?orderNumber=' + orderNumber)
     // },
     print1() {
+      console.log("进入了打印页面")
       let orderNumber = this.$route.query.orderNumber
       this.axios.post('/api/v1/tms/changeNumber?orderNumber=' + orderNumber)
       window.print()

src/views/sale/components/transport_excute/tareWeightResult.vue

@@ -8,6 +8,21 @@
                 v-model="inputText"
                 clearable>
             </el-input>
+            <el-date-picker
+            v-model="startTime"
+            type="date"
+            placeholder="选择日期"
+            style="width:200px"
+            >
+            </el-date-picker>
+            <span class="text">至</span>
+            <el-date-picker
+            v-model="endTime"
+            type="date"
+            placeholder="选择日期"
+            style="width:200px"
+            >
+            </el-date-picker>
             <el-button type="primary" class="btn" @click="onclick">
                 <i class="el-icon-search"></i>查询
             </el-button>
@@ -18,6 +33,7 @@
     </div>
 </template>
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
     data(){
         return{
@@ -26,11 +42,23 @@ export default {
                 // 表格请求数据的地址
                 requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=2",
             },
+            startTime:'',
+            endTime:''
         }
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=2&con="+this.inputText;
+            let startTime = null;
+            let endTime = null;
+            if (this.startTime && this.endTime) {
+                startTime = sjTime(this.startTime);
+                endTime = sjTime(this.endTime);
+            }
+            console.log("进入了查询")
+            console.log(startTime)
+            console.log(endTime)
+            this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=2&con="+this.inputText
+            +"&startTime="+startTime+"&endTime="+endTime;
         }
     }
 }