Merge pull request 'feat : 需求汇总列表新增当前审批节点字段,阶段变更新增项目终止字段' (#901) from dj into master

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

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

@@ -257,20 +257,19 @@ const tableConfig = reactive({
         return row.startTime + ' 至 ' + row.endTime
       }
     },
-
+    {
-    // {
+      prop: 'approveName',
-    //   prop: 'approveName',
+      label: '当前审批节点',
-    //   label: '当前审批节点',
+      align: 'center',
-    //   align: 'center',
+      width: 120,
-    //   width: 120,
+      currentRender: ({row, index}) => {
-    //   currentRender: ({row, index}) => {
+        if (row.state == '1') {
-    //     if (row.state == '1') {
+          return <span>{row.approveName||'--'}</span>
-    //       return <span>{row.approveName}</span>
+        } else {
-    //     } else {
+          return <span>{row.taskNode||'--'}</span>
-    //       return <span>{row.taskNode}</span>
+        }
-    //     }
+      }
-    //   }
+    },
-    // },
     {
       prop: 'state',
       label: '状态',

src/views/project-management/implementation/phase.vue

@@ -8,19 +8,20 @@
       <el-form-item label="抄送人员" label-width="110">
         <Ttsup :modelValue="chooseUserInfo()" @clickCopyUser="chooseUser"/>
       </el-form-item>
-      <el-form-item label="变更状态" label-width="110" prop="changeState">
+      <el-form-item label="阶段变更" label-width="110" prop="changeState">
-        <el-select v-model="formData.changeState" placeholder="请选择变更状态" filterable clearable style="width: 300px">
+        <el-select v-model="formData.changeState" placeholder="请选择阶段变更" filterable clearable style="width: 300px">
           <el-option v-for="item in cacheStore.getDict('fee_stage')" :key="item.value" :label="item.label"
                      :value="item.value">
           </el-option>
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="是否项目终止" label-width="110"  prop="isStop">-->
+      <el-form-item label="状态变更" label-width="110"  prop="stateChange">
-<!--        <el-radio-group v-model="formData.isStop" >-->
+        <el-select v-model="formData.stateChange" placeholder="请选择状态变更" filterable clearable style="width: 300px">
-<!--          <el-radio label="1">是</el-radio>-->
+          <el-option v-for="item in cacheStore.getDict('state_change')" :key="item.value" :label="item.label"
-<!--          <el-radio label="0">否</el-radio>-->
+                     :value="item.value">
-<!--        </el-radio-group>-->
+          </el-option>
-<!--      </el-form-item>-->
+        </el-select>
+      </el-form-item>
     </el-form>
     <user-picker :multiple="true" ref="userPicker" title="请选择抄送人员" v-model:value="userList"
                  @ok="ccPersonPickerOkOrCancel" @cancelOrClear="ccPersonPickerOkOrCancel"/>
@@ -86,6 +87,7 @@ const name = ref(router.currentRoute.value.name)
 const loading = ref(false)
 const formData = ref({
   changeState:'0',
+  stateChange:'',
   isStop:'0'
 })
 const file = ref({})
@@ -456,7 +458,8 @@ const handleSubmit = async () => {
     // singleFile: formData.value.singleFile,
     projectId: route.query.projectId,
     userIds: userIds,
-    changeState:formData.value.changeState
+    changeState:formData.value.changeState,
+    stateChange:formData.value.stateChange
   }
   if (!attachment.value.isHaveOneFile) {
     attachment.value.validate()
@@ -514,7 +517,8 @@ const handleResubmit = () => {
     // singleFile: attachment.value.singleFile,
     projectId: route.query.projectId,
     userIds: userIds,
-    changeState:formData.value.changeState
+    changeState:formData.value.changeState,
+    stateChange:formData.value.stateChange
   }
   // console.log('重新提交params', params)
   resubmitPhaseForm(params).then(res => {

src/views/project-management/implementation/phaseDetail.vue

@@ -5,10 +5,15 @@
   <baseTitle title="阶段变更详情" style="margin-top: -10px"></baseTitle>
   <div style="color: #606266;font-size: 14px;height:32px;line-height: 32px"><span style="display:inline-block;text-align: right;margin-right: 14px;margin-left: 15px">抄送人</span>{{copyName?copyName:'--'}}</div>
   <div style="color: #606266;font-size: 14px;display: flex;height:40px;line-height: 32px">
-    <span style="display:inline-block;text-align: right;margin-right: 14px;margin-left: 15px">变更状态</span>
+    <span style="display:inline-block;text-align: right;margin-right: 14px;margin-left: 15px">阶段变更</span>
 <!--    {{changeState=='1'?'开发阶段':'研究阶段'}}-->
     <tag dict-type="fee_stage" :value="changeState"/>
   </div>
+  <div style="color: #606266;font-size: 14px;display: flex;height:40px;line-height: 32px">
+    <span style="display:inline-block;text-align: right;margin-right: 14px;margin-left: 15px">状态变更</span>
+    <tag dict-type="state_change" v-if="stateChange" :value="stateChange"/>
+    <span v-else>--</span>
+  </div>
   <ApprovalDetail :formData="summaryData.formData" :data="summaryData" type="phase"
                   :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"  v-model:value="auditOpinion"/>
   <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"  :taskUserOptionList="summaryData.taskUserOptionList"  v-model:value="auditOpinion"></opinion>
@@ -34,6 +39,7 @@ const loading = ref(false)
 const auditOpinion = ref('')
 const copyName = ref('')
 const changeState = ref('')
+const stateChange = ref('')
 const fileListShow = ref('READ')
 const baseFormData = ref([])
 const schema = computed(() => {
@@ -307,6 +313,7 @@ const getInfo = async () => {
     summaryData.value = data;
     copyName.value= data.formData.userInfoList?.map(item=>item.name).join('，')
     changeState.value= data.formData.changeState
+    stateChange.value= data.formData.stateChange
     loading.value = false
     processStore.setDesign(data)
     processStore.runningList.value = data.runningList;