Merge branch 'test' of http://106.55.241.82:3000/lzf/zhbsq-vue-web into test

src/views/ARTICLE/edit.vue

@@ -31,6 +31,14 @@
           placeholder="请输入建设内容"
         ></el-input>
       </el-form-item>
+      <el-form-item label="总投资金额(万)" prop="totalPlan">
+        <el-input
+          type="number"
+          v-model="form.totalPlan"
+          placeholder="请输入总投资金额"
+          style="width: 50%"
+        ></el-input>
+      </el-form-item>
       <el-form-item label="年度投资计划(万)" prop="plan">
         <el-input
           type="number"
@@ -92,6 +100,9 @@ export default {
         plan: [
           { required: true, message: "年度投资计划不能为空", trigger: "blur" },
         ],
+        totalPlan: [
+          { required: true, message: "总投资金额不能为空", trigger: "blur" },
+        ],
         reality: [
           {
             required: true,

src/views/ARTICLE/index.vue

@@ -121,6 +121,15 @@
         </template>
       </el-table-column>
       <el-table-column
+        label="总投资金额(万)"
+        align="center"
+        prop="totalPlan"
+      >
+        <template slot-scope="scope">
+          {{ scope.row.totalPlan }}
+        </template>
+      </el-table-column>
+      <el-table-column
         label="实际完成投资额(万)"
         align="center"
         prop="reality"

src/views/ENTERPRISETRADEPERFORMANCE/index.vue

@@ -627,9 +627,7 @@ export default {
     },
     changeDate(val){
       this.form.year = this.form.dateValue.slice(0,4)
-      console.log('年'+this.form.year);
       this.form.month = this.form.dateValue.slice(5)
-      console.log('月'+this.form.month);
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -644,6 +642,7 @@ export default {
       const id = row.id || this.ids;
       getENTERPRISETRADEPERFORMANCE(id).then((response) => {
         this.form = response.data;
+        this.form.dateValue = this.form.year + '-' +this.form.month
         this.open = true;
         this.title = "修改企业贸易绩效数据（每个月填报）";
       });