Prechádzať zdrojové kódy

出库实绩添加查询

Tiroble 3 rokov pred
rodič
commit
47f66d2f5c

+ 2 - 2
build/utils.js

@@ -15,9 +15,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index','appoint','configManager','homepage','inward','queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-let devModules = ['all']
+// let devModules = ['all']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
-// let devModules = ['index','appoint','TMS','WMS'];
+let devModules = ['index','appoint','WMS'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

+ 1 - 1
package.json

@@ -106,7 +106,7 @@
     "less-loader": "~4.1.0",
     "mocha": "^5.2.0",
     "mocha-webpack": "^1.1.0",
-    "moment": "^2.22.2",
+    "moment": "^2.29.1",
     "nightwatch": "^0.9.12",
     "node-notifier": "^5.1.2",
     "node-sass": "^4.7.2",

+ 1 - 0
src/components/DilCommonUI/packages/table/src/table.js

@@ -190,6 +190,7 @@ export default {
     },
     // 更新请求参数
     setDataRequestQuery(value) {
+      console.log(value);
       let q = this.dataRequestQuery;
       for (const key in value) {
         q[key] = value[key];

+ 21 - 6
src/views/WMS/components/steel/steel_outbound.vue

@@ -13,12 +13,14 @@
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-          :picker-options="pickerOptions">
+          value-format="yyyy-MM-dd HH:mm:ss"
+          >
         </el-date-picker>
+         <el-button type="primary" class="btn" @click="onclick">
+          <i class="el-icon-search"></i>查询
+        </el-button>
       </div>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+     
     </div>
     <div class="table">
       <dilTable v-bind.sync="options" ref="tab">
@@ -28,6 +30,8 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
+import moment from "moment";
 export default {
   data(){
     return{
@@ -39,13 +43,24 @@ export default {
       },
     }
   },
+  created(){
+    console.log("5555")
+      this.queryDate=this.getToday();
+      console.log(this.queryDate)
+  },
   methods:{
     onclick(){
        //改变查询条件
-      this.$refs.tab.setDataRequestQuery({"startTime":sjTime(this.queryDate[0]),
-                      "endTime": sjTime(this.queryDate[1])
+      this.$refs.tab.setDataRequestQuery({"startTime":this.queryDate[0],
+                      "endTime": this.queryDate[1]
                       });         
     },
+    getToday() {
+        let obj = [];
+        obj[0] = moment(moment().startOf("day").valueOf()).format("YYYY-MM-DD HH:mm:ss");
+        obj[1]  = moment(moment().valueOf()).format("YYYY-MM-DD HH:mm:ss");
+        return obj
+    },
   }
 }
 </script>