Merge pull request 'fix : 修改细节' (#209) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/209

src/components/NameCircle.vue

@@ -15,7 +15,7 @@
       </div>
       <div class="username" v-if="user.auditOpinion">
         <div style="margin-bottom: 10px;color: #909399">{{user.operationTime}}</div>
-        <Tooltip :content="user.auditOpinion" placement="bottom-start" width="150" :lines="true"/>
+        <Tooltip :content="user.auditOpinion" placement="bottom-start" width="140" :lines="true"/>
       </div>
     </div>
   </div>

src/views/project-demand/collection/add.vue

@@ -250,7 +250,7 @@ const handleSubmit = async (instance) => {
   })
 }
 const handleResubmit = () => {
-  resubmit(submitParam()).then(res => {
+  resubmit(submitParam(formData.value)).then(res => {
     if (res.code === 1000) {
       ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)

src/views/project-demand/collection/index.vue

@@ -87,8 +87,6 @@ const tableConfig = reactive({
         let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
         if (row.state === '3' || row.state === '2') {
           btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
-        } else if (row.state === '4') {
-          btn.push({label: '上报', func: () => handleReport(row), type: 'primary'})
         }
         return (
             <div style={{width: '100%'}}>

src/views/project-demand/summary/add.vue

@@ -34,8 +34,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="所属公司" prop="companyName">
-            <el-input v-model="formData.companyName" placeholder="请输入所属公司" clearable></el-input>
+          <el-form-item label="所属公司" prop="affiliatedCompanyId">
+            <el-input v-model="formData.affiliatedCompanyId" placeholder="请输入所属公司" clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -50,6 +50,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="研发主体" prop="rdSubject">
+            <el-input v-model="formData.rdSubject" placeholder="请输入研发主体" clearable></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="结束时间" prop="endTime">
             <el-config-provider>
@@ -315,7 +320,8 @@ const handleSubmit = async (instance) => {
     let params = {
       ...formData.value,
       deploymentId: deploymentId.value,
-      files: files
+      files: files,
+      requirementId:102
     }
     let res = await requirementReported(params)
     ElNotification({

src/views/project-demand/summary/api/index.js

@@ -24,3 +24,9 @@ export const getProcessInfo = () => {
     method: "post"
   });
 };
+export const getDetail = (requirementId) => {
+  return request({
+    url: `/workflow/mosr/requirement/collect/info/${requirementId}`,
+    method: "get"
+  });
+};

src/views/project-demand/summary/detail.vue

@@ -3,17 +3,17 @@
 </template>
 
 <script setup lang="jsx">
-import {getInfo} from "@/api/project-demand";
 import {useProcessStore} from '@/stores/processStore.js';
+import {getDetail} from "./api";
 const route = useRoute()
 const summaryData = ref({})
 const summaryProcessViewer = ref(true)
 const processStore = useProcessStore()
 const getDemandSummaryInfo = async () => {
-  // if (!route.query.id) return
+  if (!route.query.id) return
   // await getCompanyOption()
   summaryProcessViewer.value = false
-  getInfo(101).then(res => {
+  getDetail(route.query.id).then(res => {
     let data = res.data
     summaryData.value = data;
     processStore.setDesign(data)

src/views/project-demand/summary/index.vue

@@ -114,7 +114,13 @@ const tableConfig = reactive({
       label: '状态',
       align: 'center',
       showOverflowTooltip: false,
-      currentRender: ({row, index}) => (<Tag dictType={'demand_collection'} value={row.state}/>)
+      currentRender: ({row, index}) => {
+        if(row.state!==null){
+          return (<Tag dictType={'demand_collection'} value={row.state}/>)
+        }else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'oper',
@@ -124,8 +130,8 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         return (
           <div>
-            <el-button type={'primary'} link onClick={()=>handleDetail()} >详情</el-button>
-            <el-button type={'primary'} link onClick={()=>handleAdd()} >上报</el-button>
+            <el-button type={'primary'} link onClick={()=>handleDetail(row)} >详情</el-button>
+            <el-button type={'primary'} link onClick={()=>handleAdd(row)} >上报</el-button>
           </div>
         )
       }
@@ -164,10 +170,12 @@ const handleAdd = () => {
     query: {}
   })
 }
-const handleDetail = () => {
+const handleDetail = (row) => {
   router.push({
     name: 'Summary/detail',
-    query: {}
+    query: {
+      id:row.requirementId
+    }
   })
 }
 </script>