Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/project-demand/requirement/add.vue

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

@@ -50,8 +50,8 @@
       <!--      </div>-->
     </div>
     <div class="oper-page-btn">
-      <el-button color="#DED0B2" @click="handleSubmit(demandForm)">提交</el-button>
-      <el-button color="#DED0B2" @click="handleResubmit">重新提交</el-button>
+      <el-button color="#DED0B2" v-if="routerName==='Requirement/add'" @click="handleSubmit(demandForm)">提交</el-button>
+      <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
@@ -90,6 +90,7 @@ const formData = ref({
   fileList: []
 })
 const showTinymce = ref(true)
+const routerName = ref(router.currentRoute.value.name)
 const processDiagramViewer = ref(false)
 const typeOption = ref([
   {
@@ -106,7 +107,7 @@ const processStore = useProcessStore()
 const processInstanceData = ref()
 const formPermMap = ref(new Map());
 const rules = reactive({
-  requirementName: [{required: true, message: '请输入名称', trigger: 'blur'}],
+  requirementName: [{required: true, message: '请输入需求名称', trigger: 'blur'}],
   companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}],
   collectType: [{required: true, message: '请选择征集类型', trigger: 'blur'}],
   deadline: [{required: true, message: '请选择截止时间', trigger: 'blur'}],
@@ -174,11 +175,10 @@ const handleDownload = (row) => {
   })
 }
 const compositeParam = (item) => {
-  let name=router.currentRoute.value.name
   let tag = ''
-  if (!formData.value.collectType && name === 'Requirement/add') {
+  if (!formData.value.collectType && routerName.value === 'Requirement/add') {
     tag = '需求征集'
-  }else if(name === 'Requirement/edit'){
+  }else if(routerName.value === 'Requirement/edit'){
     tag = '需求征集'
   }
   return {

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

@@ -22,7 +22,7 @@ const searchConfig = reactive([
     prop: 'requirementName',
     component: 'el-input',
     props: {
-      placeholder: '请输入名称查询',
+      placeholder: '请输入需求名称查询',
       clearable: true,
       filterable: true,
       checkStrictly: true
@@ -38,7 +38,17 @@ const searchConfig = reactive([
       filterable: true,
       cacheKey: 'todo_type'
     }
-  }
+  },
+  {
+    label: '状态',
+    prop: 'state',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择状态',
+      clearable: true,
+      cacheKey: 'demand_collection'
+    }
+  },
 ])
 const tableIns = ref()
 const userInfo = ref(authStore.userinfo)