Explorar el Código

Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

GouGengquan hace 11 meses
padre
commit
c3464208c6
Se han modificado 1 ficheros con 36 adiciones y 5 borrados
  1. 36 5
      src/views/personal/todoDetail.vue

+ 36 - 5
src/views/personal/todoDetail.vue

@@ -520,7 +520,7 @@
                     controls-position="right" style="width:30%;margin-left:10%"></el-input-number>
                 </div>
                 <div v-else-if="scope.row.index === '市场状况'">
-                  <el-date-picker v-model="scope.row.compareA.valueA" type="month" style="width:60%" placeholder="选择月">
+                  <el-date-picker v-model="scope.row.compareA.valueA" type="month" style="width:60%" value-format="yyyy-MM-ddT00:00:00.000Z" placeholder="选择月">
                   </el-date-picker>
                   <el-input-number v-model="scope.row.compareA.weight" :max="150" :min="1" size="small"
                     controls-position="right" style="width:30%;margin-left:10%"></el-input-number>
@@ -574,7 +574,7 @@
                     controls-position="right" style="width:30%;margin-left:10%"></el-input-number>
                 </div>
                 <div v-else-if="scope.row.index === '市场状况'">
-                  <el-date-picker v-model="scope.row.compareB.valueA" type="month" style="width:60%" placeholder="选择月">
+                  <el-date-picker v-model="scope.row.compareB.valueA" type="month" value-format="yyyy-MM-ddT00:00:00.000Z" style="width:60%" placeholder="选择月">
                   </el-date-picker>
                   <el-input-number v-model="scope.row.compareB.weight" :max="150" :min="1" size="small"
                     controls-position="right" style="width:30%;margin-left:10%"></el-input-number>
@@ -628,7 +628,7 @@
                     controls-position="right" style="width:30%;margin-left:10%"></el-input-number>
                 </div>
                 <div v-else-if="scope.row.index === '市场状况'">
-                  <el-date-picker v-model="scope.row.compareC.valueA" type="month" style="width:60%" placeholder="选择月">
+                  <el-date-picker v-model="scope.row.compareC.valueA" type="month" value-format="yyyy-MM-ddT00:00:00.000Z" style="width:60%" placeholder="选择月">
                   </el-date-picker>
                   <el-input-number v-model="scope.row.compareC.weight" :max="150" :min="1" size="small"
                     controls-position="right" style="width:30%;margin-left:10%"></el-input-number>
@@ -682,7 +682,7 @@
                     style="width:30%;margin-left:10%"></el-input-number>
                 </div>
                 <div v-else-if="scope.row.index === '市场状况'">
-                  <el-date-picker v-model="scope.row.target.valueA" type="month" style="width:60%" placeholder="选择月">
+                  <el-date-picker v-model="scope.row.target.valueA" type="month" value-format="yyyy-MM-ddT00:00:00.000Z" style="width:60%" placeholder="选择月">
                   </el-date-picker>
                   <el-input-number v-model="scope.row.target.weight" :max="150" :min="1" size="small"
                     controls-position="right" style="width:30%;margin-left:10%"></el-input-number>
@@ -1216,7 +1216,9 @@ export default {
   computed: {
     certificateCouldEdit() {
       let currentNodeCode = this.$route.query.currentNodeCode;
-      if (currentNodeCode === 'GENERATE_STATEMENT' || currentNodeCode === 'WRITE_REPORT' || currentNodeCode === 'WRITE_LETTER') {
+      if (currentNodeCode === 'GENERATE_STATEMENT' || currentNodeCode === 'WRITE_REPORT' || currentNodeCode === 'WRITE_LETTER'
+        || currentNodeCode === 'REVIEW_STATEMENT' || currentNodeCode === 'CHECK_REPORT' || currentNodeCode === 'CHECK_LETTER'
+      ) {
         return true;
       } else {
         return false;
@@ -1962,6 +1964,8 @@ export default {
             this.linkAttributes.atFloor = this.compareList.analysisData[6].target.valueA;
             this.linkAttributes.houseType = this.compareList.analysisData[7].target.valueA;
             this.selectCalculateType();
+          }else {
+            this.defalutYearMonth();
           }
         })
       }
@@ -2475,6 +2479,33 @@ export default {
     },
     showQrCode(url){
       this.qrCodeUrl = url;
+    },
+    defalutYearMonth(){
+      const currentDate = new Date();
+      const currentYear = currentDate.getFullYear();
+      let month = currentDate.getMonth();
+      console.log(month)
+      this.compareList.analysisData[3].target.valueA = new Date(currentYear,month,2);
+      console.log(new Date(currentYear,month,2))
+      if (month==1){
+        this.compareList.analysisData[3].compareC.valueA = new Date(currentYear-1,12,2)
+        this.compareList.analysisData[3].compareB.valueA = new Date(currentYear-1,11,2)
+        this.compareList.analysisData[3].compareA.valueA = new Date(currentYear-1,10,2)
+      }else if(month==2){
+        this.compareList.analysisData[3].compareC.valueA = new Date(currentYear,month-1,2)
+        this.compareList.analysisData[3].compareB.valueA = new Date(currentYear-1,12,2)
+        this.compareList.analysisData[3].compareA.valueA = new Date(currentYear-1,11,2)
+      }else if(month==3){
+        this.compareList.analysisData[3].compareC.valueA = new Date(currentYear,month-1,2)
+        this.compareList.analysisData[3].compareB.valueA = new Date(currentYear,month-2,2)
+        this.compareList.analysisData[3].compareA.valueA = new Date(currentYear-1,12,2)
+      }
+      else{
+        this.compareList.analysisData[3].compareC.valueA = new Date(currentYear,month-1,2)
+        this.compareList.analysisData[3].compareB.valueA = new Date(currentYear,month-2,2)
+        this.compareList.analysisData[3].compareA.valueA = new Date(currentYear,month-3,2)
+      }
+     
     }
   }
 }