瀏覽代碼

修改显示问题

caojunjie 4 年之前
父節點
當前提交
37ec037f91

+ 8 - 4
src/views/purchaseIssue/index.vue

@@ -1130,7 +1130,11 @@ export default {
           this.isItHidden = true
           this.inDex = 4
           let y = moment(Date.parse(new Date())).format('YYYY-MM-DD')
-          this.$set(this.formDataList,'timeInterval',[ y + ' 00:00:00', y + ' 23:59:59'])
+          if (this.formDataList.timeInterval === undefined){
+            this.$set(this.formDataList,'timeInterval',[ y + ' 00:00:00', y + ' 23:59:59'])
+          }else {
+            this.$set(this.formDataList,'timeInterval',this.formDataList.timeInterval)
+          }
           this.$refs.avatar.assignmentTime(this.formDataList)
         }
         if (list) {
@@ -1368,9 +1372,9 @@ export default {
         } else {
           submit(formData).then(res => {
             if (res.code == 200) {
-              // if (res) {
-              //   this.$refs.avatar.form = res.data.warehouseBills
-              // }
+              if (res) {
+                this.$refs.avatar.form = res.data.warehouseBills
+              }
               this.contentList = res.data.tWarehousebillsCntrs
               this.$message.success('保存成功')
             }

+ 9 - 5
src/views/purchaseRequest/index.vue

@@ -806,7 +806,7 @@ export default {
       userId: Cookies.get('userName')
     }
     let y = moment(Date.parse(new Date())).format('YYYY-MM-DD')
-    this.$set(this.formDataList,'timeInterval',[ y + ' 00:00:00', y + ' 23:59:59'])
+    // this.$set(this.formDataList,'timeInterval',[ y + ' 00:00:00', y + ' 23:59:59'])
     this.getRow(data)
     this.query(this.formDataList)
     productName().then(res => {
@@ -1066,7 +1066,11 @@ export default {
           this.isItHidden = true
           this.inDex = 4
           let y = moment(Date.parse(new Date())).format('YYYY-MM-DD')
-          this.$set(this.formDataList,'timeInterval',[ y + ' 00:00:00', y + ' 23:59:59'])
+          if (this.formDataList.timeInterval === undefined){
+            this.$set(this.formDataList,'timeInterval',[ y + ' 00:00:00', y + ' 23:59:59'])
+          }else {
+            this.$set(this.formDataList,'timeInterval',this.formDataList.timeInterval)
+          }
           this.$refs.avatar.assignmentTime(this.formDataList)
         }
         if (list){
@@ -1263,9 +1267,9 @@ export default {
         }else {
           submit(formData).then(res => {
             if (res.code == 200) {
-              // if(res){
-              //   this.$refs.avatar.form = res.data.warehouseBills
-              // }
+              if(res){
+                this.$refs.avatar.form = res.data.warehouseBills
+              }
               this.contentList = res.data.tWarehousebillsCntrs
               this.$message.success('保存成功')
             }

+ 9 - 1
src/views/reportAnalysis/inoutStatistics.vue

@@ -57,7 +57,7 @@ export default {
   name: 'salesStatistics',
   data(){
     return{
-      tatolLabel:['数量'],
+      tatolLabel:['数量','金额'],
       dataList:{
         fBilltype:[{ label: '出库',value:'CK'},{ label: '入库',value:'RK'}],
         fFeeType:[],
@@ -250,6 +250,14 @@ export default {
           checked: 0,
           width: 100,
           onabort: ''
+        },
+        {
+          surface: '20',
+          label: 'fAmount',
+          name: '金额',
+          checked: 0,
+          width: 100,
+          onabort: ''
         }
         ],
       formOption:[