修改成果归档数据页面的查看

oa-ui/src/views/flowable/form/archiveForm.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="18" :xs="24">
+      <el-col :span="isFlow ? 18:24" :xs="24">
         <h2 class="text-center">成果归档记录表</h2>
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
           <el-form-item label="项目信息" prop="projectId">
             <el-button type="primary" size="mini" @click="openProject = true" v-if="taskName == '成果上传'">选择项目</el-button>
-            <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2" direction="vertical">
+            <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2">
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
               }}</el-descriptions-item>
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
@@ -28,10 +28,10 @@
               <el-descriptions-item label="质检审核员" label-class-name="my-label">{{
                 chooseProject.qualityInspectorName
               }}</el-descriptions-item>
-              <el-descriptions-item label="坐标经度" label-class-name="my-label">{{ chooseProject.kmlLng
+              <!-- <el-descriptions-item label="坐标经度" label-class-name="my-label">{{ chooseProject.kmlLng
               }}</el-descriptions-item>
               <el-descriptions-item label="坐标纬度" label-class-name="my-label">{{ chooseProject.kmlLat
-              }}</el-descriptions-item>
+              }}</el-descriptions-item> -->
             </el-descriptions>
           </el-form-item>
           <el-form-item label="归档状态">
@@ -190,6 +190,11 @@ export default {
       default: true
     }
   },
+  watch:{
+    'taskForm.formId'(){
+      this.initForm()
+    }
+  },
   name: "Archive",
   data() {
     return {

oa-ui/src/views/oa/archive/index.vue

@@ -95,80 +95,8 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
 
-    <!-- 添加或修改cmc成果归档对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
-        </el-form-item>
-        <el-form-item label="成果提交日期" prop="submitTime">
-          <el-date-picker clearable v-model="form.submitTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择成果提交日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="备注说明" prop="submitSituation">
-          <el-input v-model="form.submitSituation" placeholder="请输入备注说明" />
-        </el-form-item>
-        <el-form-item label="坐标经度" prop="locationLng">
-          <el-input v-model="form.locationLng" placeholder="请输入坐标经度" />
-        </el-form-item>
-        <el-form-item label="坐标纬度" prop="locationLat">
-          <el-input v-model="form.locationLat" placeholder="请输入坐标纬度" />
-        </el-form-item>
-        <el-form-item label="生产部门检查员" prop="produceInspector">
-          <el-input v-model="form.produceInspector" placeholder="请输入生产部门检查员" />
-        </el-form-item>
-        <el-form-item label="质量检查员" prop="qualityInspector">
-          <el-input v-model="form.qualityInspector" placeholder="请输入质量检查员" />
-        </el-form-item>
-        <el-form-item label="技术质量与安全部负责人" prop="deptLeader">
-          <el-input v-model="form.deptLeader" placeholder="请输入技术质量与安全部负责人" />
-        </el-form-item>
-        <el-form-item label="归档人" prop="archiver">
-          <el-input v-model="form.archiver" placeholder="请输入归档人" />
-        </el-form-item>
-        <el-form-item label="资料接收时间" prop="receiveTime">
-          <el-date-picker clearable v-model="form.receiveTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择资料接收时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="质量检查时间" prop="qualityTime">
-          <el-date-picker clearable v-model="form.qualityTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择质量检查时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="生产部门检查时间" prop="produceTime">
-          <el-date-picker clearable v-model="form.produceTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择生产部门检查时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="技术质量与安全部审核时间" prop="deptTime">
-          <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择技术质量与安全部审核时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="归档时间" prop="archiveTime">
-          <el-date-picker clearable v-model="form.archiveTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择归档时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="生产部门意见" prop="produceComment">
-          <el-input v-model="form.produceComment" placeholder="请输入生产部门意见" />
-        </el-form-item>
-        <el-form-item label="质量检查意见" prop="qualityComment">
-          <el-input v-model="form.qualityComment" placeholder="请输入质量检查意见" />
-        </el-form-item>
-        <el-form-item label="技术质量与安全部审核意见" prop="deptComment">
-          <el-input v-model="form.deptComment" placeholder="请输入技术质量与安全部审核意见" />
-        </el-form-item>
-        <el-form-item label="归档审核意见" prop="archiveComment">
-          <el-input v-model="form.archiveComment" placeholder="请输入归档审核意见" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+    <el-dialog :title="title" :visible.sync="infoOpen" width="70%" append-to-body>
+      <archive-form :taskForm="taskForm" :taskName="''" :isFlow="false"></archive-form>
     </el-dialog>
   </div>
 </template>
@@ -176,8 +104,10 @@
 <script>
 import { listArchive, getArchive, delArchive, addArchive, updateArchive } from "@/api/oa/archive/archive";
 import { listProject } from '@/api/oa/project/project';
+import archiveForm from '../../flowable/form/archiveForm.vue';
 
 export default {
+  components: { archiveForm },
   name: "Archive",
   data() {
     return {
@@ -226,11 +156,12 @@ export default {
       // 表单参数
       form: {},
       taskForm: {
-        formId:''
+        formId: ''
       },
       // 表单校验
       rules: {
-      }
+      },
+      infoOpen: false
     };
   },
   created() {
@@ -249,7 +180,7 @@ export default {
     remoteMethod(val) {
       listProject({
         pageNum: 1,
-        pageSize: 20, 
+        pageSize: 20,
         projectNumber: val
       }).then(res => {
         this.projectList = res.rows;
@@ -285,8 +216,8 @@ export default {
       };
       this.resetForm("form");
     },
-    handleView(row){
-      this.taskForm.formId = row.projectId;
+    handleView(row) {
+      this.taskForm.formId = row.archiveId;
       this.infoOpen = true;
     },
     /** 搜索按钮操作 */