Merge pull request 'master' (#866) from master into prod

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

src/components/steps/index.vue

@@ -153,27 +153,6 @@ const baseForm = ref()
 const baseFormData = ref([])
 const schema = computed(() => {
   return [
-    // {
-    //   label: '征集公司',
-    //   prop: 'affiliatedCompany',
-    //   colProps: {
-    //     span: 6
-    //   }
-    // },
-    // {
-    //   label: '征集名称',
-    //   prop: 'requirementName',
-    //   colProps: {
-    //     span: 6
-    //   }
-    // },
-    // {
-    //   label: '征集说明',
-    //   prop: 'collectExplain',
-    //   colProps: {
-    //     span: 24
-    //   }
-    // },
     {
       label: '承办单位',
       prop: 'affiliatedCompany',
@@ -347,13 +326,6 @@ const schema = computed(() => {
           </div>
       )
     },
-    // {
-    //   label: '是否专项资金项目',
-    //   prop: 'isSpecialFund',
-    //   colProps: {
-    //     span: 6
-    //   }
-    // },
     {
       label: '所属专项资金',
       prop: 'specialFund',
@@ -377,6 +349,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '是否在预算内',
+      prop: 'isWithinBudget',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget?
+                  <span>{'预算内'}</span>
+                  : <span>{'预算外'}</span>:'--'
+            }
+          </div>
+      )
+    },
     {
       label: '部门分管领导',
       prop: 'optionalChargeLeadership',
@@ -393,7 +381,7 @@ const handlePrint = (print) => {
 }
 // 格式化详情步骤条
 const formatProcedure = (data) => {
-  console.info("🚀 ~method:formatProcedure -----", data)
+  // console.info("🚀 ~method:formatProcedure -----", data)
   let arr = []
   if (data instanceof Array) {
     data.forEach(item => {

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

@@ -184,7 +184,15 @@
 <!--            <el-input-number v-model="formData.specialFundAmount" placeholder="请输入申请总部专项资金" :controls="false"/>-->
           </el-form-item>
         </el-col>
-        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':'-40px'}">
+        <el-col :span="6"  :style="{marginLeft:!formData.isSpecialFund?'0':'-40px'}">
+          <el-form-item label="是否在预算内" prop="isWithinBudget" required >
+            <el-select v-model="formData.isWithinBudget" clearable  placeholder="请选择是否在预算内">
+              <el-option label="是" :value="true"/>
+              <el-option label="否" :value="false"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'-10px':'0'}">
           <el-form-item label="部门分管领导" prop="">
             <el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
               {{ optionalChargeLeadershipList.length !== 0 ? '更改' : '请选择' }}
@@ -197,6 +205,7 @@
                          v-model:value="optionalChargeLeadershipList" @ok="optionalChargeLeaderPickerOkOrCancel"/>
           </el-form-item>
         </el-col>
+
       </el-row>
       <baseTitle title="预期知识产权"></baseTitle>
       <el-row gutter="30" style="margin-bottom: -18px;"
@@ -352,6 +361,7 @@ const showSingleTable = ref(false)
 const otherFileList = ref([])
 const singleList = ref([])
 const formData = ref({
+  isWithinBudget: false,
   isSpecialFund: false,
   industryUniversityResearch: '1',
   governmentDeclaration: '1',
@@ -380,6 +390,7 @@ const rules = reactive({
   other: [{required: true, message: '请输入其他数量', trigger: ['blur', 'change']}],
   economicEstimate: [{required: true, message: '请输入经费预算', trigger: ['blur', 'change']}],
   isSpecialFund: [{required: true, message: '请选择是否为专项资金', trigger: ['blur', 'change']}],
+  isWithinBudget: [{required: true, message: '请选择是否在预算内', trigger: ['blur', 'change']}],
   specialFundAmount: [{required: true, message: '请输入专项资金', trigger: ['blur', 'change']}],
   serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: ['blur', 'change']}],
   contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: ['blur', 'change']}]

src/views/project-management/filing/attachment.vue

@@ -230,6 +230,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '是否在预算内',
+      prop: 'isWithinBudget',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget?
+                  <span>{'预算内'}</span>
+                  : <span>{'预算外'}</span>:'--'
+            }
+          </div>
+      )
+    },
     {
       label: '部门分管领导',
       prop: 'optionalChargeLeadership',
@@ -242,6 +258,10 @@ const schema = computed(() => {
 
 const baseForm = ref()
 const paneList = ref([
+  {
+    label: '全部',
+    name: '111'
+  },
   {
     label: '需求征集',
     name: '00'
@@ -353,7 +373,9 @@ const upload = () => {
 }
 watchEffect(() => {
   if (requirementId.value === '-1') {
-    paneList.value = paneList.value.slice(1)
+    console.info("🚀 ~method: -----", paneList.value.filter(item=>item.name!=='00'))
+    paneList.value = paneList.value.filter(item=>item.name!=='00')
+
   }
 })
 search({})

src/views/project-management/filing/upload.vue

@@ -238,6 +238,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '是否在预算内',
+      prop: 'isWithinBudget',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget?
+                  <span>{'预算内'}</span>
+                  : <span>{'预算外'}</span>:'--'
+            }
+          </div>
+      )
+    },
     {
       label: '部门分管领导',
       prop: 'optionalChargeLeadership',

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

@@ -233,6 +233,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '是否在预算内',
+      prop: 'isWithinBudget',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              basicData.value?.isWithinBudget!=null ? basicData.value?.isWithinBudget?
+                  <span>{'预算内'}</span>
+                  : <span>{'预算外'}</span>:'--'
+            }
+          </div>
+      )
+    },
     {
       label: '部门分管领导',
       prop: 'optionalChargeLeadership',

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

@@ -247,6 +247,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '是否在预算内',
+      prop: 'isWithinBudget',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget?
+                  <span>{'预算内'}</span>
+                  : <span>{'预算外'}</span>:'--'
+            }
+          </div>
+      )
+    },
     {
       label: '部门分管领导',
       prop: 'optionalChargeLeadership',

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

@@ -234,6 +234,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '是否在预算内',
+      prop: 'isWithinBudget',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget?
+                  <span>{'预算内'}</span>
+                  : <span>{'预算外'}</span>:'--'
+            }
+          </div>
+      )
+    },
     {
       label: '部门分管领导',
       prop: 'optionalChargeLeadership',

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

@@ -215,6 +215,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '是否在预算内',
+      prop: 'isWithinBudget',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget?
+                  <span>{'预算内'}</span>
+                  : <span>{'预算外'}</span>:'--'
+            }
+          </div>
+      )
+    },
     {
       label: '部门分管领导',
       prop: 'optionalChargeLeadership',

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

@@ -252,6 +252,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '是否在预算内',
+      prop: 'isWithinBudget',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget?
+                  <span>{'预算内'}</span>
+                  : <span>{'预算外'}</span>:'--'
+            }
+          </div>
+      )
+    },
     {
       label: '部门分管领导',
       prop: 'optionalChargeLeadership',

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

@@ -330,6 +330,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '是否在预算内',
+      prop: 'isWithinBudget',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.isWithinBudget!=null ? baseFormData.value?.isWithinBudget?
+                  <span>{'预算内'}</span>
+                  : <span>{'预算外'}</span>:'--'
+            }
+          </div>
+      )
+    },
     {
       label: '部门分管领导',
       prop: 'optionalChargeLeadership',