Browse Source

修改填报窗口的大小和lable间距,修改审核流的字段显示

Sanmu8 1 year ago
parent
commit
16d5baaa16
3 changed files with 44 additions and 27 deletions
  1. 1 1
      src/views/ARTICLE/enterData.vue
  2. 8 6
      src/views/ARTICLE/index.vue
  3. 35 20
      src/views/ARTICLE/task/index.vue

+ 1 - 1
src/views/ARTICLE/enterData.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="cmain">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="本月投资金额" prop="">
           <el-input
             type="number"

+ 8 - 6
src/views/ARTICLE/index.vue

@@ -139,6 +139,7 @@
           <el-button
             size="mini"
             type="text"
+            v-if="scope.row.status == 3"
             @click="showEnterData(scope.row)"
             v-hasPermi="['business:ARTICLE:edit']"
             >数据填报</el-button
@@ -230,8 +231,8 @@ export default {
         obj: enterData,
         param: { id: id },
         title: "数据填报",
-        width: "1050px",
-        height: "80%",
+        width: "400px",
+        height: "250px",
       });
     },
     // 多选框选中数据
@@ -287,10 +288,11 @@ export default {
     },
     handleTask(row) {
       row.status = 1;
-      console.log(row);
-      addARTICLE(this.form).then((response) => {
-        this.$modal.msgSuccess("提交审核成功");
-        this.getList();
+      addARTICLE(row).then((response) => {
+        if (response.code == 200) {
+          this.$modal.msgSuccess("提交审核成功");
+          this.getList();
+        }
       });
     },
     /** 删除按钮操作 */

+ 35 - 20
src/views/ARTICLE/task/index.vue

@@ -2,32 +2,49 @@
   <div>
     <el-tabs v-model="activeName">
       <el-tab-pane label="详细信息" name="详细信息">
-        <el-descriptions border>
+        <el-descriptions border :labelStyle="{'width':'120px'}">
           <el-descriptions-item label="项目名称">{{
-            taskList.atvName
+            taskList.formobj.atvName
           }}</el-descriptions-item>
           <el-descriptions-item label="建设规模">
-            <el-tag v-if="taskList.scale == 1" type="success">小型</el-tag>
-            <el-tag v-else-if="taskList.scale == 2" type="success">中型</el-tag>
-            <el-tag v-else-if="taskList.scale == 3" type="success">大型</el-tag>
+            <el-tag v-if="taskList.formobj.scale == 1" type="success"
+              >小型</el-tag
+            >
+            <el-tag v-else-if="taskList.formobj.scale == 2" type="success"
+              >中型</el-tag
+            >
+            <el-tag v-else-if="taskList.formobj.scale == 3" type="success"
+              >大型</el-tag
+            >
           </el-descriptions-item>
-          <el-descriptions-item label="建设内容">{{
-            taskList.content
-          }}</el-descriptions-item>
+
           <el-descriptions-item label="年度投资计划">{{
-            taskList.plan
+            taskList.formobj.plan
           }}</el-descriptions-item>
-          <el-descriptions-item label="审核状态">
-            <el-tag v-if="taskList.status == 1" type="success">同意</el-tag>
-            <el-tag v-else-if="taskList.status == 2" type="danger">驳回</el-tag>
-            <el-tag v-else-if="taskList.status == 3" type="info">退回</el-tag>
-            <el-tag v-else-if="taskList.status == 0">待审核</el-tag>
-          </el-descriptions-item>
+          <!-- <el-descriptions-item label="审核状态">
+            <el-tag v-if="taskList.formobj.status == 1" type="success"
+              >同意</el-tag
+            >
+            <el-tag v-else-if="taskList.formobj.status == 2" type="danger"
+              >驳回</el-tag
+            >
+            <el-tag v-else-if="taskList.formobj.status == 3" type="info"
+              >退回</el-tag
+            >
+            <el-tag v-else-if="taskList.formobj.status == 0">待审核</el-tag>
+          </el-descriptions-item> -->
           <el-descriptions-item label="实际投资金额">{{
-            taskList.comments ? taskList.comments : "无"
+            taskList.formobj.comments ? taskList.formobj.comments : "无"
           }}</el-descriptions-item>
         </el-descriptions>
 
+        <el-descriptions border :labelStyle="{'width':'120px'}" style="">
+          <el-descriptions-item label="建设内容" :contentStyle="{'padding': '20px'}">{{
+            taskList.formobj.content
+          }}</el-descriptions-item>
+        </el-descriptions>
+
+
       </el-tab-pane>
       <el-tab-pane label="审批记录" name="审批记录">
         <el-timeline>
@@ -67,12 +84,10 @@ export default {
     };
   },
   props: ["taskList"],
-  created(){
+  created() {
     console.log(this.taskList);
   },
-  methods: {
-
-  },
+  methods: {},
 };
 </script>