Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/OP/AffairsBackward.vue

@@ -1,13 +1,22 @@
 <template>
     <div class="affairbackward-all">
         <el-table :data="tableDatass" :span-method="objectSpanMethod" border style="width: 100%; margin-top: 20px">
-            <el-table-column prop="title" label="项目">
+            <el-table-column prop="title" label="项目" width="180">
             </el-table-column>
-            <el-table-column prop="date" label="时间">
+            <el-table-column prop="date" label="时间"  width="180">
+                <template slot-scope="scope">
+                    <el-input v-model="scope.row.date" placeholder="请输入内容"></el-input>
+                </template>
             </el-table-column>
             <el-table-column prop="content" label="内容">
+                <template slot-scope="scope">
+                    <el-input v-model="scope.row.content" placeholder="请输入内容"></el-input>
+                </template>
             </el-table-column>
             <el-table-column prop="remark" label="备注">
+                <template slot-scope="scope">
+                    <el-input v-model="scope.row.remark" placeholder="请输入内容"></el-input>
+                </template>
             </el-table-column>
         </el-table>
     </div>
@@ -228,4 +237,5 @@ export default {
     min-height: 830px;
     
 }
-</style>
+</style>
+ 

src/components/OP/DepartProcessList.vue

@@ -48,7 +48,7 @@
         </el-step>
     </el-steps>
 </div> -->
-                                        <div style="display: flex;">
+                                        <div class="toppx" style="display: flex;flex-wrap: wrap;">
                                             <div class="step_icon">主要任务：</div>
                                             <div v-for="(stepItem, index) in props.row.stepInfo.steps">
                                                 <div
@@ -68,7 +68,7 @@
                                         </div>
                                         <div v-if="props.row.stepInfo.extraStep.length > 0">
                                             <br />
-                                            <div style="display: flex;">
+                                            <div class="toppx" style="display: flex;flex-wrap: wrap;">
                                                 <div class="step_icon">额外任务：</div>
                                                 <div v-for="(stepItem, index) in props.row.stepInfo.extraStep">
                                                     <div
@@ -594,4 +594,7 @@ export default {
 .over_input .el-textarea {
     width: 70%;
 }
+.toppx>div{
+    margin-top: 5px;
+}
 </style>