scorpio 2 years ago
parent
commit
345f84f315

+ 12 - 6
src/views/home/component/dash.vue

@@ -62,8 +62,8 @@
       </template>
       <template #plan_storage_time="{row}">
         <div class='flex flex-center'>
-          <div class='mr-5 red' v-if='row.is_storage === 0 '>{{ row.plan_storage_time }}</div>
-          <div class='mr-5 blue' v-else>{{ row.storage_time }}</div>
+          <div class='mr-5 red' v-if='row.is_storage === 0 '>{{ row.plan_storage_time.substring(0, 10) }}</div>
+          <div class='mr-5 blue' v-else>{{ row.storage_time.substring(0, 10) }}</div>
         </div>
       </template>
 
@@ -80,10 +80,10 @@
       <template #plan_commencement_time="{row}">
         <div class='flex flex-center'>
           <div class='mr-5 red' v-if='row.is_start === undefined ||row.is_start === 0 '>{{
-              row.plan_commencement_time
+              row.plan_commencement_time.substring(0, 10)
             }}
           </div>
-          <div class='mr-5 blue' v-else>{{ row.start_time }}</div>
+          <div class='mr-5 blue' v-else>{{ row.start_time.substring(0, 10) }}</div>
         </div>
       </template>
     </avue-crud>
@@ -270,7 +270,10 @@ export default {
           {
             label: '计划(实际)入库时间',
             prop: 'plan_storage_time',
-            width: 120
+            width: 120,
+            formatter: (val, value, label) => {
+              return value.substring(0, 10)
+            }
           },
           {
             label: '是否开工',
@@ -290,7 +293,10 @@ export default {
           {
             label: '计划(实际)开工时间',
             prop: 'plan_commencement_time',
-            width: 120
+            width: 120,
+            formatter: (val, value, label) => {
+              return value.substring(0, 10)
+            }
           },
           {
             label: '创建时间',

+ 7 - 0
src/views/home/component/params/params1.vue

@@ -288,5 +288,12 @@ export default {
 .form-content {
   border: 1px solid #eeeeee;
   padding: 20px;
+
+  :deep(.el-input.is-disabled .el-input__inner) {
+    color: #343434;
+  }
+  :deep(.el-textarea.is-disabled .el-textarea__inner) {
+    color: #343434;
+  }
 }
 </style>

+ 6 - 0
src/views/home/component/params/params2.vue

@@ -128,5 +128,11 @@ export default {
 .form-content {
   border: 1px solid #eeeeee;
   padding: 20px;
+  :deep(.el-input.is-disabled .el-input__inner) {
+    color: #343434;
+  }
+  :deep(.el-textarea.is-disabled .el-textarea__inner) {
+    color: #343434;
+  }
 }
 </style>

+ 25 - 15
src/views/home/component/params/params3.vue

@@ -67,12 +67,15 @@
       </el-form>
     </div>
 
-    <el-dialog v-model='show' :title='current ? current.year + "年度" : ""'>
+    <el-dialog v-model='show' :title='current ? current.year + "年度" : ""' width='1260px'>
       <div class='flex flex-center flex-wrap'>
-        <div v-for='item in current.editType === 1 ? current.planMonths : current.months' :key='item'>
-          <div class='bold mb-10 mt-10'>{{ item.name }}月</div>
-          <input :disabled='!detail.can_update' class='input flex flex-center' v-model="item.value" :min="1"
-                 @change='changeMonth(item)'/>
+        <div class='flex flex-center'>
+          <span style='margin-top: 40px;margin-right: 20px' class='bold'>计划投资:</span>
+          <div class='flex flex-center flex-col' v-for='item in current.editType === 1 ? current.planMonths : current.months' :key='item'>
+            <div class='bold mb-10 mt-10'>{{ item.name }}月</div>
+            <input :disabled='!detail.can_update' class='input flex flex-center' v-model="item.value" :min="1"
+                   @change='changeMonth(item)'/>
+          </div>
         </div>
       </div>
       <div class='mt-20 full-width flex text-left red'>* 请按月份进行填报,单位:万元</div>
@@ -176,7 +179,7 @@ export default {
           const planMonths = []
           for (let i = 1; i <= 12; i++) {
             months.push({ index: i, name: i, value: this.form[tmp + '_' + i + '_month_complete_amount'] })
-            planMonths.push({ index: i, name: i, value: this.form[tmp + '_' + i + '_month_plan_complete_amount'] })
+            planMonths.push({ index: i, name: i, value: this.form[tmp + '_' + i + '_plan_month_complete_amount'] })
           }
 
           const item = {
@@ -201,7 +204,7 @@ export default {
           const planMonths = []
           for (let i = 1; i <= 12; i++) {
             months.push({ index: i, name: i, value: this.form[tmp + '_' + i + '_month_investment_amount'] })
-            planMonths.push({ index: i, name: i, value: this.form[tmp + '_' + i + '_month_plan_investment_amount'] })
+            planMonths.push({ index: i, name: i, value: this.form[tmp + '_' + i + '_plan_month_investment_amount'] })
           }
           const item = {
             type: 2,
@@ -243,7 +246,7 @@ export default {
     changeMonth (res) {
       let code = this.current.year + '_' + res.name + (this.current.type === 1 ? '_month_complete_amount' : '_month_investment_amount')
       if (this.current.editType === 1) {
-        code = this.current.year + '_' + res.name + (this.current.type === 1 ? '_month_plan_complete_amount' : '_month_pla_investment_amount')
+        code = this.current.year + '_' + res.name + (this.current.type === 1 ? '_plan_month_complete_amount' : '_plan_month_investment_amount')
       }
       this.form[code] = res.value
       const tmp = this.current.months.map(sub => Number.parseInt(sub.value))
@@ -252,9 +255,8 @@ export default {
       }, 0)
       let codeParent = this.current.year + (this.current.type === 1 ? '_total_complete_amount' : '_total_investment_amount')
       if (this.current.editType === 1) {
-        codeParent = this.current.year + (this.current.type === 1 ? '_total_plan_complete_amount' : '_total_plan_investment_amount')
+        codeParent = this.current.year + (this.current.type === 1 ? '_plan_total_complete_amount' : '_plan_total_investment_amount')
       }
-      console.log(sum)
       this.form[codeParent] = sum
       this.current.value2 = sum
       console.log(this.current)
@@ -268,6 +270,14 @@ export default {
 .form-content {
   border: 1px solid #eeeeee;
   padding: 20px;
+
+  :deep(.el-input.is-disabled .el-input__inner) {
+    color: #343434;
+  }
+
+  :deep(.el-textarea.is-disabled .el-textarea__inner) {
+    color: #343434;
+  }
 }
 
 .grid {
@@ -277,17 +287,17 @@ export default {
 }
 
 .input {
-  width: 120px;
-  height: 40px;
+  width: 60px;
+  height: 30px;
   border: #e7e7e7 solid 1px;
-  padding: 10px;
+  padding: 0 10px;
   border-right: none;
 }
 
 .input:last-child {
-  width: 120px;
+  width: 60px;
   height: 40px;
-  padding: 10px;
+  padding:0 10px;
   border-right: #e7e7e7 solid 1px;
 }
 

+ 6 - 0
src/views/home/component/params/params4.vue

@@ -264,5 +264,11 @@ export default {
 .form-content {
   border: 1px solid #eeeeee;
   padding: 20px;
+  :deep(.el-input.is-disabled .el-input__inner) {
+    color: #343434;
+  }
+  :deep(.el-textarea.is-disabled .el-textarea__inner) {
+    color: #343434;
+  }
 }
 </style>

+ 6 - 0
src/views/home/component/params/params5.vue

@@ -92,5 +92,11 @@ export default {
 .form-content {
   border: 1px solid #eeeeee;
   padding: 20px;
+  :deep(.el-input.is-disabled .el-input__inner) {
+    color: #343434;
+  }
+  :deep(.el-textarea.is-disabled .el-textarea__inner) {
+    color: #343434;
+  }
 }
 </style>

+ 6 - 0
src/views/home/component/params/params6.vue

@@ -77,6 +77,12 @@ export default {
 .form-content {
   border: 1px solid #eeeeee;
   padding: 20px;
+  :deep(.el-input.is-disabled .el-input__inner) {
+    color: #343434;
+  }
+  :deep(.el-textarea.is-disabled .el-textarea__inner) {
+    color: #343434;
+  }
 }
 
 .grid {