从test拉回

src/views/modules/shequzhili/xiangmu/cpts/project-info.vue

@@ -26,9 +26,17 @@
             </div>
 
             <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]"
-                 v-if="projectInfo.departmentNameList.length > 0">
+                 v-if="projectInfo.departmentList.length > 0">
               <span class="info-title-2">当前处理部门：</span>
-              <span>{{ projectInfo.departmentNameList.join("、") }}</span>
+              <div class="div_depart">
+                <div v-for="(item,index) in  projectInfo.departmentList"
+                     :key="index"
+                     class="div_depart">
+                  <span>{{item.departmentName+'（'+ item.staffList.join("、")+'）' }}</span>
+
+                </div>
+              </div>
+
             </div>
 
             <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]"
@@ -315,7 +323,17 @@
                     </el-upload>
                   </el-form-item>
 
-                  <el-form-item v-if="fmData.operateType != 'close'"
+                  <el-form-item v-if="fmData.operateType == 'dispose'"
+                                label="公开回复："
+                                :class="{'form-item':source==='visiual'}"
+                                prop="publicReply">
+                    <el-input type="textarea"
+                              :rows="2"
+                              placeholder="请输入内容"
+                              v-model="fmData.publicReply">
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item v-if="fmData.operateType != 'close' && fmData.operateType != 'dispose'"
                                 label="公开回复："
                                 :class="{'form-item':source==='visiual'}"
                                 prop="publicReply">
@@ -327,8 +345,7 @@
                   </el-form-item>
                 </el-form>
               </div>
-            </div>
+              <!-- <div class="m-btns">
-            <!-- <div class="m-btns">
             <el-button size=""
                        style="margin-right: 50px"
                        @click="handleClose">关闭</el-button>
@@ -337,23 +354,23 @@
                        @click="handleSubmit">确定</el-button>
           </div> -->
 
-            <div v-if="source==='manage'"
+              <div v-if="source==='manage'"
-                 class="m-btns ">
+                   class="m-btns ">
-              <el-button size="small"
+                <el-button size="small"
-                         @click="handleClose">关闭</el-button>
+                           @click="handleClose">关闭</el-button>
-              <el-button size=""
+                <el-button size=""
-                         type="danger"
+                           type="danger"
-                         @click="handleSubmit">确定</el-button>
+                           @click="handleSubmit">确定</el-button>
-            </div>
+              </div>
-            <div v-else
+              <div v-else
-                 class="m-btns">
+                   class="m-btns">
-              <div class="item_btn"
+                <div class="item_btn"
-                   @click="handleClose">关闭</div>
+                     @click="handleClose">关闭</div>
-              <div class="item_btn mgl"
+                <div class="item_btn mgl"
-                   @click="handleSubmit">确定</div>
+                     @click="handleSubmit">确定</div>
 
+              </div>
             </div>
-
           </el-card>
         </div>
       </div>
@@ -630,6 +647,10 @@ export default {
           obj.internalRemark = [
             { required: true, message: "请填写内部备注", trigger: "blur" },
           ];
+        } else if (operateType == "dispose") {
+          obj.publicReply = [
+            { required: true, message: "请填写公开回复", trigger: "blur" },
+          ]
         } else {
           obj.internalRemark = [
             { required: true, message: "请填写内部备注", trigger: "blur" },
@@ -981,6 +1002,17 @@ export default {
 
       if (code === 0) {
         this.projectInfo = data;
+        // this.projectInfo.departmentList = [
+        //   {
+        //     departmentName: "市北区",
+        //     staffList: ["薛松", "刘建军"]
+        //   }, {
+        //     departmentName: "市北区",
+        //     staffList: ["薛松", "刘建军"]
+        //   }
+        // ]
+
+
         if (data.projectStatus == "pending") {
           this.getMyDepartmentList();
           this.getAssistanceUnitList();
@@ -1272,3 +1304,10 @@ export default {
   src="@/assets/scss/modules/shequzhili/project-info.scss"
   scoped
 ></style>
+
+<style lang="scss" scoped>
+.div_depart {
+  display: flex;
+  flex-direction: column;
+}
+</style>