更新

src/views/profitable/contractOtherMoney.vue

@@ -64,7 +64,7 @@
                 v-show="scope.row.reexType == '支出'" @click="showAudit(scope.row)"></i>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="500">
+          <el-table-column label="操作" min-width="400">
             <template slot-scope="scope">
               <el-button @click="audit(1,scope.row)" v-if="scope.row.reexType == '支出' && scope.row.taskId">审核
               </el-button>
@@ -104,7 +104,8 @@
             </el-select>
           </el-form-item>
           <el-form-item label="款项名称">
-            <el-input v-model="formData.expenseName" placeholder="输入费用名称" :disabled="disabled" maxlength="15"></el-input>
+            <el-input v-model="formData.expenseName" placeholder="输入费用名称" :disabled="disabled" maxlength="15">
+            </el-input>
           </el-form-item>
           <el-form-item label="金额（元）" v-if="btnChange == 3 || btnChange == 4 || btnChange == 5">
             <el-input v-model="formData.amountMoney" placeholder="输入请款金额" type="number"></el-input>
@@ -157,12 +158,15 @@
       <div v-for="(item,index) in auditRecord" :key="index" class="audit">
         <div class="audit_item">
           <div class="audit_left">
-            <span class="audit_name">{{item.operateUser}}</span><span v-if="item.approveResult">{{item.approveResult == 0 ? "驳回" : "通过"}}</span><span v-else>{{item.dealMsg}}</span>
+            <span class="audit_name">{{item.operateUser}}</span><span
+              v-if="item.approveResult">{{item.approveResult == 0 ? "驳回" : "通过"}}</span><span
+              v-else>{{item.dealMsg}}</span>
           </div>
           <span class="audit_date">{{item.operateDate}}</span>
         </div>
         <div class="audit_opinion" v-if="item.dealMsg != '付款' && item.approveResult">审核意见：{{item.verifyRemark}}</div>
-        <div class="audit_opinion" v-if="item.dealMsg == '请款' && item.approveResult == null">备注信息：{{item.verifyRemark}}</div>
+        <div class="audit_opinion" v-if="item.dealMsg == '请款' && item.approveResult == null">备注信息：{{item.verifyRemark}}
+        </div>
       </div>
 
     </el-dialog>
@@ -211,7 +215,7 @@
         value: "",
         warehouseList: [],
         formData: {},
-        radio:"1",
+        radio: "1",
         appendixIdss: [],
         editable: false,
         auditShow: false,
@@ -329,30 +333,30 @@
       },
       submit() {
         this.formData.expenseType = this.radio
-        if(this.formData.expenseType == 2){
-          if(!this.formData.warehouseName){
+        if (this.formData.expenseType == 2) {
+          if (!this.formData.warehouseName) {
             this.$message.error("请选择仓库")
             return
           }
         }
-        if(!this.formData.expenseName){
+        if (!this.formData.expenseName) {
           this.$message.error("款项名称不能为空！")
           return
         }
-        if(!this.formData.amountMoney){
+        if (!this.formData.amountMoney) {
           this.$message.error("金额不能为空！")
           return
         }
-        if(Number(this.formData.amountMoney) < 0 || Number(this.formData.amountMoney ) > 100000000){
+        if (Number(this.formData.amountMoney) < 0 || Number(this.formData.amountMoney) > 100000000) {
           this.$message.error("金额输入错误！")
         }
         console.log(this.formData.amountMoney.split(".")[1].length)
-        if(this.formData.amountMoney.split(".")[1].length > 2){
+        if (this.formData.amountMoney.split(".")[1].length > 2) {
           this.$message.error("金额请保留两位小数！")
           return
         }
-        if(this.btnChange == 4){
-          if(!this.formData.addressUrl){
+        if (this.btnChange == 4) {
+          if (!this.formData.addressUrl) {
             this.$message.error("请上传附件！")
             return
           }

src/views/profitable/earningsLook.vue

@@ -40,7 +40,7 @@
           <el-table-column prop="date" label="货名"></el-table-column>
           <el-table-column prop="date" label="货名"></el-table-column>
           <el-table-column prop="date" label="合计" min-width="130">
-              <div slot-scope="scope">
+            <div slot-scope="scope">
               <span v-if="scope.$index == 0">合计：</span>
               <span v-if="scope.$index == 1">合计：1000000000</span>
             </div>
@@ -57,7 +57,7 @@
     components: {},
     data() {
       return {
-        value: "",
+        value: [],
         profitList: [{
           name: "玉米",
           count: 2000,
@@ -76,6 +76,7 @@
     activated() {
       this.makeWordData = this.getData(2)
       this.initCharts()
+      this.getPassYearFormatDate()
       this.getList()
     },
     methods: {
@@ -90,6 +91,33 @@
         // })
 
       },
+      getPassYearFormatDate() {
+        var nowDate = new Date()
+        var _date = new Date()
+        nowDate.setTime(nowDate.getTime() - 24 * 60 * 60 * 1000 * 30)
+        var year = nowDate.getFullYear()
+        var year1 = _date.getFullYear()
+        var month = nowDate.getMonth() + 1
+        var month1 = _date.getMonth() + 1
+        var strDate = nowDate.getDate()
+        var strDate1 = _date.getDate()
+        if (month >= 1 && month <= 9) {
+          month = '0' + month
+        }
+        if (month1 >= 1 && month1 <= 9) {
+          month1 = '0' + month1
+        }
+
+        if (strDate >= 0 && strDate <= 9) {
+          strDate = '0' + strDate
+        }
+        if (strDate1 >= 0 && strDate1 <= 9) {
+          strDate1 = '0' + strDate1
+        }
+        this.startDate = year + '-' + month + '-' + strDate
+        this.endDate = year1 + '-' + month1 + '-' + strDate1
+        this.value = [this.startDate, this.endDate]
+      },
       pickerOptions() {
 
       },
@@ -179,10 +207,17 @@
                 name: '支出',
                 type: 'bar',
                 right: 0,
-                   label: {
-                show: true,
-                position: 'inside'
-              },
+                // label: {
+                //   show: true,
+                //   position: 'inside'
+                // },
+                 label: {
+                  show: true,
+                  precision: 1,
+                  position: 'top',
+                  valueAnimation: true,
+                  fontFamily: 'monospace'
+                },
                 data: [
                   6.0, 60.9, 90.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0
                 ],
@@ -195,9 +230,12 @@
                 type: 'bar',
                 right: 20,
                 label: {
-                show: true,
-                position: 'inside'
-              },
+                  show: true,
+                  precision: 1,
+                  position: 'top',
+                  valueAnimation: true,
+                  fontFamily: 'monospace'
+                },
                 data: [
                   102.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8
                 ],
@@ -291,7 +329,7 @@
     height: 60px;
     line-height: 60px;
     margin-left: 30px;
-    
+
   }
 
   .chart_css {
@@ -309,8 +347,11 @@
       margin-left: 30px;
     }
   }
-  .table_css{
-    /deep/.el-table th{
+
+  .table_css {
+
+    /deep/.el-table th,
+    /deep/.el-table td {
       text-align: center;
     }