snow hai 1 ano
pai
achega
160056477a

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/0.js


+ 4 - 4
src/config/env.development.js

@@ -3,10 +3,10 @@ module.exports = {
   title: '采销平台',
   baseUrl: 'http://wx.wxhr.sit.futurelab.tv',
   api: {
-    baseApi: 'http://stocknew.test241.wanyuhengtong.com/'
+    baseApi: 'http://stock.api.caixiao365.com/'
     // baseApi: 'http://stockwm.test241.wanyuhengtong.com/'
   },
-  webUrl: 'http://project.web.caixiao365.com/#/test-good-share?id=',
+  webUrl: 'http://project.web.caixiao365.com/#/good-share?id=',
   fileURL: `https://api2.edu.futurelab.tv`,
   shareWebUrl: 'http://post.web.caixiao365.com/?prod=1&outCode=',
   // 分仓
@@ -21,9 +21,9 @@ module.exports = {
   // 结算平台url
   // settlementPlatformUrl: 'http://127.0.0.1:8848',
   // 结算平台url
-  settlementPlatformUrl: 'http://webcx.test241.wanyuhengtong.com/',
+  settlementPlatformUrl: 'http://fin.caixiao365.com/',
   // 工单管理系统url
-  GDUrl: 'http://localhost:8080/',
+  GDUrl: 'http://http://bugweb.test241.wanyuhengtong.com/',
   // token加密key
   secretKey: 'key123',
   loginTitle: '',

+ 10 - 0
src/views/dataReport/columns.js

@@ -134,6 +134,11 @@ const table3 = [
 ]
 
 const table4 = [
+  {
+    prop: 'outChildCode',
+    label: '发货工单号',
+    minWidth: '155px'
+  },
   {
     prop: 'outCode',
     label: '发货单编号',
@@ -265,6 +270,11 @@ const table4 = [
 ]
 
 const table5 = [
+  {
+    prop: 'outCode',
+    label: '发货单编号',
+    minWidth: '155px'
+  },
   {
     prop: 'orderCode',
     label: '订单编号',

+ 65 - 56
src/views/dataReport/period-date-picker/main.vue

@@ -17,9 +17,9 @@
     />
     <samp style="padding: 0 3px; margin: 0">至</samp>
     <el-date-picker
+      v-model="endTime"
       style="margin: 0"
       :size="size"
-      v-model="endTime"
       class="date-picker"
       :style="{ width: width }"
       type="date"
@@ -35,11 +35,12 @@
 </template>
 
 <script>
+import dayjs from 'dayjs'
 // 选择时间段(只有日期)组件
 // timeReturned 返回值{startTime: Number,endTime: Number}
 export default {
-  name: "PeriodDatePicker",
-  props: ["start", "end", "disabled", "size", "width", "type", "placeholder"],
+  name: 'PeriodDatePicker',
+  props: ['start', 'end', 'disabled', 'size', 'width', 'type', 'placeholder'],
   data() {
     return {
       startTime: this.start,
@@ -47,98 +48,106 @@ export default {
       isEdit: this.disabled,
       pickerOptions1: {
         disabledDate: (time) => {
-          if (this.endTime != null && this.endTime != "" && time) {
-            return time.getTime() > new Date(this.endTime).valueOf();
+          if (this.endTime != null && this.endTime != '' && time) {
+            const start = dayjs(time).format('YYYY-MM-DD')
+            if (start === this.endTime) return false
+            return (time.getTime() >= new Date(this.endTime).valueOf())
           }
-        },
+        }
       },
       pickerOptions2: {
         disabledDate: (time) => {
-          if (this.startTime != null && this.startTime != "" && time) {
-            return time.getTime() < new Date(this.startTime).valueOf();
+          if (this.startTime != null && this.startTime != '' && time) {
+            const end = dayjs(time).format('YYYY-MM-DD')
+            if (end === this.startTime) return false
+            return (time.getTime() <= new Date(this.startTime).valueOf())
           }
-        },
-      },
-    };
+        }
+      }
+    }
   },
   watch: {
-    disabled: function (val) {
-      this.isEdit = val;
+    disabled: function(val) {
+      this.isEdit = val
     },
     start(val) {
-      this.startTime = val;
+      this.startTime = val
     },
     end(val) {
-      this.endTime = val;
-    },
+      this.endTime = val
+    }
   },
   mounted() {},
   methods: {
     timeChange() {
       if (
-        this.startTime !== "" &&
+        this.startTime !== '' &&
         this.startTime !== null &&
-        this.endTime !== "" &&
+        this.endTime !== '' &&
         this.endTime !== null
       ) {
-        if (this.type + "" === "1" && !this.setType(365)) {
-          this.showMessage("时间跨度不能超过一年!");
-          return;
-        } else if (this.type + "" === "2" && !this.setType(90)) {
-          this.showMessage("时间跨度不能超过90天!");
-          return;
-        }else if (this.type + "" === "3" && !this.setType(30)) {
-          this.showMessage("时间跨度不能超过30天!");
-          return;
+        if (this.type + '' === '1' && !this.setType(365)) {
+          this.showMessage('时间跨度不能超过一年!')
+          return
+        } else if (this.type + '' === '2' && !this.setType(90)) {
+          this.showMessage('时间跨度不能超过90天!')
+          return
+        } else if (this.type + '' === '3' && !this.setType(30)) {
+          this.showMessage('时间跨度不能超过30天!')
+          return
         } else if (
           new Date(this.endTime).valueOf() < new Date(this.startTime).valueOf()
         ) {
-          this.showMessage("结束时间不大于开始时间!");
-          return;
+          this.showMessage('结束时间不大于开始时间!')
+          return
         } else {
-          this.timeReturned();
+          this.timeReturned()
         }
       } else {
-        this.timeReturned();
+        this.timeReturned()
       }
     },
+    dealDisabledDate(time) {
+      var times = Date.now() - 3600 * 1000 * 24
+      return time > times
+    },
     timeReturned() {
-      let s = this.startTime == null ? "" : this.startTime;
-      let e = this.endTime == null ? "" : this.endTime;
-      let model = {
-        startTime: s == "" ? "" : this.transformTime(s),
-        endTime: e == "" ? "" : this.transformTime(e),
-      };
+      const s = this.startTime == null ? '' : this.startTime
+      const e = this.endTime == null ? '' : this.endTime
+      const model = {
+        startTime: s == '' ? '' : this.transformTime(s),
+        endTime: e == '' ? '' : this.transformTime(e)
+      }
 
-      this.$emit("timeReturned", model);
+      this.$emit('timeReturned', model)
     },
 
     transformTime(tTime) {
-      let time = new Date(tTime);
-      let y = time.getFullYear();
-      let M = time.getMonth() + 1;
-      let d = time.getDate();
-      return y + "-" + (M < 10 ? "0" + M : M) + "-" + (d < 10 ? "0" + d : d);
+      const time = new Date(tTime)
+      const y = time.getFullYear()
+      const M = time.getMonth() + 1
+      const d = time.getDate()
+      return y + '-' + (M < 10 ? '0' + M : M) + '-' + (d < 10 ? '0' + d : d)
     },
     showMessage(message) {
-      this.$message.error(message);
-      this.startTime = "";
-      this.endTime = "";
-      this.timeReturned();
+      this.$message.error(message)
+      this.startTime = ''
+      this.endTime = ''
+      this.timeReturned()
     },
     setType(days) {
-      let step = 24 * 3600 * 1000;
-      let sDay = new Date(this.startTime).valueOf();
-      let eDay = new Date(this.endTime).valueOf();
-      let isok = true;
+      const step = 24 * 3600 * 1000
+      const sDay = new Date(this.startTime).valueOf()
+      const eDay = new Date(this.endTime).valueOf()
+      let isok = true
       if (eDay - sDay > step * days) {
-        isok = false;
+        isok = false
       }
 
-      return isok;
-    },
-  },
-};
+      return isok
+    }
+  }
+}
 </script>
 <style lang="scss">
 .date-picker.el-input {

+ 2 - 2
src/views/dataReport/table1.vue

@@ -139,7 +139,7 @@ export default {
   },
   mounted() {
     this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-    this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+    this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
     this.searchList()
   },
 
@@ -200,7 +200,7 @@ export default {
         supplier_name: '',
         supplierNo: [],
         start_day: dayjs().subtract(0, 'day').format('YYYY-MM-DD'),
-        end_day: dayjs().subtract(-1, 'day').format('YYYY-MM-DD'),
+        end_day: dayjs().subtract(0, 'day').format('YYYY-MM-DD'),
         page: 1, // 页码
         size: 15 // 每页显示条数
       }

+ 2 - 2
src/views/dataReport/table2.vue

@@ -150,7 +150,7 @@ export default {
   },
   mounted() {
     this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-    this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+    this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
     this.searchList()
   },
 
@@ -208,7 +208,7 @@ export default {
         size: 15 // 每页显示条数
       }
       this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-      this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+      this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
       // 表格 - 分页
       this.pageInfo = {
         size: 15,

+ 2 - 2
src/views/dataReport/table3.vue

@@ -149,7 +149,7 @@ export default {
   },
   mounted() {
     this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-    this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+    this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
     this.searchList()
   },
 
@@ -210,7 +210,7 @@ export default {
         size: 15 // 每页显示条数
       }
       this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-      this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+      this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
       // 表格 - 分页
       this.pageInfo = {
         size: 15,

+ 6 - 7
src/views/dataReport/table4.vue

@@ -187,8 +187,8 @@ export default {
     }
   },
   mounted() {
-    this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-    this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+    // this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+    // this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
     this.searchList()
   },
 
@@ -256,8 +256,8 @@ export default {
         size: 15 // 每页显示条数
       }
 
-      this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-      this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+      // this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+      // this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
@@ -305,15 +305,14 @@ export default {
       const start_day = new Date(this.parmValue.start_day).valueOf()
       const end_day = new Date(this.parmValue.end_day).valueOf()
       const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
+      
       if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
         if (flag) {
           this.$message.warning('导出文件的时间区间不能超过31天')
           return
         }
-      } else {
-        this.$message.warning('请选择导出文件的时间区间')
-        return
       }
+
       if (!this.loading) {
         this.loading = true
         const httpType = `aplication/zip`

+ 8 - 9
src/views/dataReport/table5.vue

@@ -186,8 +186,8 @@ export default {
     }
   },
   mounted() {
-    this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-    this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+    // this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+    // this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
     this.searchList()
   },
 
@@ -254,8 +254,8 @@ export default {
         size: 15 // 每页显示条数
       }
 
-      this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-      this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+      // this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+      // this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
@@ -304,15 +304,14 @@ export default {
       const start_day = new Date(this.parmValue.start_day).valueOf()
       const end_day = new Date(this.parmValue.end_day).valueOf()
       const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
+
       if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
         if (flag) {
           this.$message.warning('导出文件的时间区间不能超过31天')
           return
         }
-      } else {
-        this.$message.warning('请选择导出文件的时间区间')
-        return
-      }
+      } 
+
       if (!this.loading) {
         this.loading = true
         const httpType = `aplication/zip`
@@ -335,7 +334,7 @@ export default {
               const link = document.createElement('a')
               link.style.display = 'none'
               link.href = url
-              const excelName = '待库管发货.zip'
+              const excelName = '待采购备货.zip'
               link.setAttribute('download', excelName)
               document.body.appendChild(link)
               link.click()

+ 4 - 16
src/views/dataReport/table6.vue

@@ -237,8 +237,8 @@ export default {
     }
   },
   mounted() {
-    this.parmValue.start_date = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-    this.parmValue.end_date = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+    // this.parmValue.start_date = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+    // this.parmValue.end_date = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
     this.searchList()
   },
 
@@ -293,8 +293,8 @@ export default {
         order_type: ''
       }
 
-      this.parmValue.start_date = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
-      this.parmValue.end_date = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+      // this.parmValue.start_date = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+      // this.parmValue.end_date = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
 
       // 表格 - 分页
       this.pageInfo = {
@@ -345,18 +345,6 @@ export default {
         }
       }
 
-      const start_date = new Date(this.parmValue.start_date).valueOf()
-      const end_date = new Date(this.parmValue.end_date).valueOf()
-      // let flag = end_date - start_date > 30 * 24 * 60 * 60 * 1000;
-      if (this.parmValue.start_date != '' && this.parmValue.end_date != '') {
-        // if (flag) {
-        //   this.$message.warning("导出文件的时间区间不能超过30天");
-        //   return;
-        // }
-      } else {
-        this.$message.warning('请选择导出文件的时间区间')
-        return
-      }
       const model = JSON.parse(JSON.stringify(this.parmValue))
       // model.is_export = 1;
       if (!this.loading) {

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio