修复 需求中心：需求申请时，应用领域无法进行选择

front/src/views/personalCenter/components/addApplication.vue

@@ -9,83 +9,38 @@
         <div class="form-container">
           <div v-if="applySuccess">
             <div class="title">申请人信息</div>
-            <a-form
+            <a-form ref="formRef" :model="formName" name="basic" :label-col="{ style: { width: '106px' } }"
-              ref="formRef"
+              :wrapper-col="{ style: { width: '230px' } }" labelAlign="left" autocomplete="off">
-              :model="formName"
-              name="basic"
-              :label-col="{ style: { width: '106px' } }"
-              :wrapper-col="{ style: { width: '230px' } }"
-              labelAlign="left"
-              autocomplete="off"
-            >
               <div class="base-info">
-                <a-form-item
+                <a-form-item label="申请人" name="applyUserName" :rules="[{ required: true, message: '请输入申请人' }]">
-                  label="申请人"
+                  <a-input placeholder="请输入申请人" v-model:value="formName.applyUserName" />
-                  name="applyUserName"
-                  :rules="[{ required: true, message: '请输入申请人' }]"
-                >
-                  <a-input
-                    placeholder="请输入申请人"
-                    v-model:value="formName.applyUserName"
-                  />
                 </a-form-item>
 
-                <a-form-item
+                <a-form-item style="margin: 0 22px" label="申请人电话" name="applyUserPhone" :rules="[
-                  style="margin: 0 22px"
+                  {
-                  label="申请人电话"
+                    required: true,
-                  name="applyUserPhone"
+                    pattern: /^1[3456789]\d{9}$/,
-                  :rules="[
+                    message: '请输入正确的电话号码',
-                    {
+                  },
-                      required: true,
+                ]">
-                      pattern: /^1[3456789]\d{9}$/,
+                  <a-input placeholder="请输入申请人电话" v-model:value="formName.applyUserPhone" />
-                      message: '请输入正确的电话号码',
-                    },
-                  ]"
-                >
-                  <a-input
-                    placeholder="请输入申请人电话"
-                    v-model:value="formName.applyUserPhone"
-                  />
                 </a-form-item>
 
-                <a-form-item
+                <a-form-item label="申请单位" name="applyUserDeptName" :rules="[{ required: true, message: '请输入申请单位' }]">
-                  label="申请单位"
+                  <a-input placeholder="请输入申请单位" v-model:value="formName.applyUserDeptName" />
-                  name="applyUserDeptName"
-                  :rules="[{ required: true, message: '请输入申请单位' }]"
-                >
-                  <a-input
-                    placeholder="请输入申请单位"
-                    v-model:value="formName.applyUserDeptName"
-                  />
                 </a-form-item>
               </div>
 
               <div class="title">需求信息</div>
 
-              <a-form-item
+              <a-form-item style="margin-bottom: 10px" label="需求标题" name="demandSubject"
-                style="margin-bottom: 10px"
+                :rules="[{ required: true, message: '请输入需求标题' }]">
-                label="需求标题"
+                <a-input style="width: 350px" v-model:value="formName.demandSubject" />
-                name="demandSubject"
-                :rules="[{ required: true, message: '请输入需求标题' }]"
-              >
-                <a-input
-                  style="width: 350px"
-                  v-model:value="formName.demandSubject"
-                />
               </a-form-item>
 
-              <a-form-item
+              <a-form-item style="margin-bottom: 10px" label="需求类型" name="detailsType"
-                style="margin-bottom: 10px"
+                :rules="[{ required: true, message: '请选择需求类型' }]">
-                label="需求类型"
+                <a-select ref="select" v-model:value="formName.detailsType" @focus="focus" style="width: 200px">
-                name="detailsType"
-                :rules="[{ required: true, message: '请选择需求类型' }]"
-              >
-                <a-select
-                  ref="select"
-                  v-model:value="formName.detailsType"
-                  @focus="focus"
-                  style="width: 200px"
-                >
                   <a-select-option value="基础设施">基础设施</a-select-option>
                   <a-select-option value="数据资源">数据资源</a-select-option>
                   <a-select-option value="组件服务">组件服务</a-select-option>
@@ -94,50 +49,24 @@
                 </a-select>
               </a-form-item>
 
-              <a-form-item
+              <a-form-item label="应用领域" v-if="formName.detailsType === '应用资源' ||
-                label="应用领域"
+              formName.detailsType === '组件服务'" name="detailsField" style="width: 6.93rem" :rules="[
-                name="detailsField"
+    {
-                style="width: 6.93rem"
+      required: true,
-                :rules="[
+      message: '请选择应用领域',
-                  {
+    },
-                    required:
+  ]">
-                      formName.detailsType === '应用资源' ||
+                <a-select v-model:value="formName.detailsField" :options="applicationSceneOpthion" mode="tags"
-                      formName.detailsType === '组件服务'
+                  :size="size" placeholder="请选择应用领域" :filterOption="false" :searchValue="false" style="width: 5.87rem">
-                        ? true
+                </a-select>
-                        : false,
-                    message: '请选择应用领域',
-                  },
-                ]"
-              >
-                <a-select
-                  :disabled="
-                    formName.detailsType === '应用资源' ||
-                    formName.detailsType === '组件服务'
-                      ? false
-                      : true
-                  "
-                  v-model:value="formName.detailsField"
-                  :options="applicationSceneOpthion"
-                  mode="tags"
-                  :size="size"
-                  placeholder="请选择应用领域"
-                  :filterOption="false"
-                  :searchValue="false"
-                  style="width: 5.87rem"
-                ></a-select>
               </a-form-item>
               <!-- <a-form-item label="应用领域" name="detailsField" style="width: 350px"
                 :rules="[{ required: true, message: '请输入应用领域' }]">
                 <a-input placeholder="请输入应用领域" v-model:value="formName.detailsField" />
               </a-form-item> -->
-              <a-form-item
+              <a-form-item style="margin-bottom: 10px" label="需求描述" name="demandDetails"
-                style="margin-bottom: 10px"
+                :rules="[{ required: true, message: '请输入需求描述' }]">
-                label="需求描述"
+                <a-textarea style="
-                name="demandDetails"
-                :rules="[{ required: true, message: '请输入需求描述' }]"
-              >
-                <a-textarea
-                  style="
                     width: 500px;
                     height: 150px;
                     font-size: 16px;
@@ -147,25 +76,12 @@
                     border-radius: 6px;
                     padding: 10px;
                     resize: none;
-                  "
+                  " v-model:value="formName.demandDetails" />
-                  v-model:value="formName.demandDetails"
-                />
               </a-form-item>
-              <a-form-item
+              <a-form-item style="color: #666; font-size: 16px" label="附件上传" name="applyDoc">
-                style="color: #666; font-size: 16px"
+                <a-upload v-model:file-list="fileList" name="file" :action="upLoadUrl" :headers="headers"
-                label="附件上传"
+                  @change="handleChange" :maxCount="1">
-                name="applyDoc"
+                  <a-button style="
-              >
-                <a-upload
-                  v-model:file-list="fileList"
-                  name="file"
-                  :action="upLoadUrl"
-                  :headers="headers"
-                  @change="handleChange"
-                  :maxCount="1"
-                >
-                  <a-button
-                    style="
                       width: 100px;
                       height: 30px;
                       margin-right: 10px;
@@ -176,8 +92,7 @@
                       border: 1px solid #bbd3ef;
                       padding: 0;
                       text-align: center;
-                    "
+                    ">
-                  >
                     <upload-outlined></upload-outlined>
                     文件上传
                   </a-button>
@@ -188,8 +103,7 @@
               </a-form-item>
 
               <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
-                <a-button
+                <a-button style="
-                  style="
                     width: 80px;
                     height: 38px;
                     margin-right: 20px;
@@ -200,15 +114,10 @@
                     border: none;
                     padding: 0;
                     text-align: center;
-                  "
+                  " type="primary" html-type="cancle" @click="signOut">
-                  type="primary"
-                  html-type="cancle"
-                  @click="signOut"
-                >
                   退出申请
                 </a-button>
-                <a-button
+                <a-button style="
-                  style="
                     width: 80px;
                     height: 38px;
                     background: #0087ff;
@@ -218,11 +127,7 @@
                     border: none;
                     padding: 0;
                     text-align: center;
-                  "
+                  " type="primary" html-type="submit" @click="processStartHandle()">
-                  type="primary"
-                  html-type="submit"
-                  @click="processStartHandle()"
-                >
                   提交申请
                 </a-button>
               </a-form-item>
@@ -234,7 +139,7 @@
             </div>
             <p>
               您已成功申请{{
-                formName.demandSubject || ''
+    formName.demandSubject || ''
               }},请耐心等待审批结果，结果会第一时间通知您！
             </p>
           </div>
@@ -245,250 +150,248 @@
 </template>
 
 <script>
-  import HomeHeader from '@/views/home/components/header'
+import HomeHeader from '@/views/home/components/header'
-  import { reactive, ref } from 'vue'
+import { reactive, ref } from 'vue'
-  import { message } from 'ant-design-vue'
+import { message } from 'ant-design-vue'
-  // import { UploadOutlined } from '@ant-design/icons-vue'
+// import { UploadOutlined } from '@ant-design/icons-vue'
-  import { getUser, getUserInfo, relaunch } from '@/api/home'
+import { getUser, getUserInfo, relaunch } from '@/api/home'
-  import {
+import {
-    demandApply,
+  demandApply,
-    getDemandForm,
+  getDemandForm,
-    updateDemandForm,
+  updateDemandForm,
-    getCategoryTreePage,
+  getCategoryTreePage,
-  } from '@/api/personalCenter'
+} from '@/api/personalCenter'
-  // import { baseURL } from '@/config'
+// import { baseURL } from '@/config'
-  import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 
-  export default {
+export default {
-    name: '',
+  name: '',
-    props: {},
+  props: {},
-    components: {
+  components: {
-      HomeHeader,
+    HomeHeader,
-      // UploadOutlined,
+    // UploadOutlined,
-    },
+  },
-    setup() {
+  setup() {
-      const disabled = ref(false)
+    const disabled = ref(false)
-      const upLoadUrl = ref(window.SITE_CONFIG.apiURL + '/upload')
+    const upLoadUrl = ref(window.SITE_CONFIG.apiURL + '/upload')
-      const formName = reactive({
+    const formName = reactive({
-        applyUserDeptId: '',
+      applyUserDeptId: '',
-        applyUserDeptName: '',
+      applyUserDeptName: '',
-        applyUserId: '',
+      applyUserId: '',
-        applyUserName: '',
+      applyUserName: '',
-        applyUserPhone: '',
+      applyUserPhone: '',
-        demandDetails: '',
+      demandDetails: '',
-        demandSubject: '',
+      demandSubject: '',
-        detailsField: [],
+      detailsField: [],
-        detailsType: '',
+      detailsType: '',
-        enclosure: '',
+      enclosure: '',
+    })
+    // console.log(formName.demandSubject)
+
+    const router = useRouter()
+    const id = ref(router.currentRoute.value.query.id)
+    const taskId = ref(router.currentRoute.value.query.taskId)
+    if (id.value) {
+      getDemandForm(id.value).then((res) => {
+        console.log('回填数据===============>', res)
+        formName.applyUserPhone = res.data.data.applyUserPhone
+        formName.demandSubject = res.data.data.demandSubject
+        formName.detailsType = res.data.data.detailsType
+        formName.detailsField = res.data.data.detailsField
+        formName.demandDetails = res.data.data.demandDetails
+        formName.enclosure = res.data.data.enclosure
       })
-      // console.log(formName.demandSubject)
+    }
+    const applicationSceneOpthion = ref([])
+    getCategoryTreePage({
+      page: 1,
+      limit: 20,
+      dictTypeId: '1513712507692818433',
+      deFlage: 0,
+    }).then((res) => {
+      res.data.data.list.map((val) => {
+        applicationSceneOpthion.value.push({
+          value: val.dictLabel,
+          label: val.dictLabel,
+        })
+      })
+      // console.log('字典值========>', applicationSceneOpthion.value)
+    })
+    getUser().then((res) => {
+      formName.applyUserName = res.data.data.realName
+      formName.applyUserId = res.data.data.id
+      getUserInfo(formName.applyUserId).then((res) => {
+        if (res.data.data.mobile) {
+          formName.applyUserPhone = res.data.data.mobile
+        }
+        formName.applyUserDeptName = res.data.data.deptName
+        formName.applyUserDeptId = res.data.data.deptId
+      })
+    })
+
+    const formRef = ref()
+    const applySuccess = ref(true)
+
+    // 退出
+    const signOut = () => {
+      window.close()
+    }
+    const handleChange = (info) => {
+      if (info.file.status !== 'uploading') {
+        console.log(info.file, info.fileList)
+      }
+
+      if (info.file.status === 'done') {
+        message.success(`${info.file.name} 文件上传成功`)
+        formName.enclosure = info.file.response.data
+      } else if (info.file.status === 'error') {
+        message.error(`${info.file.name} 文件上传失败`)
+      }
+    }
+
+    const fileList = ref([])
+    const processStartHandle = () => {
+      let detailsField = '';
+      if (formName.detailsField.length > 0) {
+        formName.detailsField.map((item) => {
+          detailsField += item + ';'
+        })
+      }
+      // copy传参
+      let _postData = JSON.parse(JSON.stringify(formName))
+      _postData.detailsField = detailsField;
 
-      const router = useRouter()
-      const id = ref(router.currentRoute.value.query.id)
-      const taskId = ref(router.currentRoute.value.query.taskId)
       if (id.value) {
-        getDemandForm(id.value).then((res) => {
+        updateDemandForm(_postData).then((upres) => {
-          console.log('回填数据===============>', res)
+          if (upres.data.code == 0) {
-          formName.applyUserPhone = res.data.data.applyUserPhone
+            relaunch({ data: _postData, taskId: taskId.value }).then((res) => {
-          formName.demandSubject = res.data.data.demandSubject
+              console.log('驳回================>', res)
-          formName.detailsType = res.data.data.detailsType
+              if (res.data.code == 0) {
-          formName.detailsField = res.data.data.detailsField
+                message.success('重新发起流程成功！')
-          formName.demandDetails = res.data.data.demandDetails
+                window.setTimeout(() => {
-          formName.enclosure = res.data.data.enclosure
+                  window.close()
-        })
+                }, 1000)
-      }
+              } else {
-      const applicationSceneOpthion = ref([])
+                message.error('重新发起流程失败！')
-      getCategoryTreePage({
+              }
-        page: 1,
-        limit: 20,
-        dictTypeId: '1513712507692818433',
-        deFlage: 0,
-      }).then((res) => {
-        res.data.data.list.map((val) => {
-          applicationSceneOpthion.value.push({
-            value: val.dictLabel,
-            label: val.dictLabel,
-          })
-        })
-        // console.log('字典值========>', applicationSceneOpthion.value)
-      })
-      getUser().then((res) => {
-        formName.applyUserName = res.data.data.realName
-        formName.applyUserId = res.data.data.id
-        getUserInfo(formName.applyUserId).then((res) => {
-          if (res.data.data.mobile) {
-            formName.applyUserPhone = res.data.data.mobile
-          }
-          formName.applyUserDeptName = res.data.data.deptName
-          formName.applyUserDeptId = res.data.data.deptId
-        })
-      })
-
-      const formRef = ref()
-      const applySuccess = ref(true)
-
-      // 退出
-      const signOut = () => {
-        window.close()
-      }
-      const handleChange = (info) => {
-        if (info.file.status !== 'uploading') {
-          console.log(info.file, info.fileList)
-        }
-
-        if (info.file.status === 'done') {
-          message.success(`${info.file.name} 文件上传成功`)
-          formName.enclosure = info.file.response.data
-        } else if (info.file.status === 'error') {
-          message.error(`${info.file.name} 文件上传失败`)
-        }
-      }
-
-      const fileList = ref([])
-      const subimtFlag = ref(true)
-      const processStartHandle = () => {
-        if (formName.detailsField.length > 0) {
-          let detailsField = ''
-          formName.detailsField.map((item) => {
-            detailsField += item + ';'
-          })
-          formName.detailsField = detailsField
-        }
-        if (id.value) {
-          updateDemandForm(formName).then((upres) => {
-            if (upres.data.code == 0) {
-              relaunch({ data: formName, taskId: taskId.value }).then((res) => {
-                console.log('驳回================>', res)
-                if (res.data.code == 0) {
-                  message.success('重新发起流程成功！')
-                  window.setTimeout(() => {
-                    window.close()
-                  }, 1000)
-                } else {
-                  message.error('重新发起流程失败！')
-                }
-              })
-            } else {
-              message.error('数据更新失败！')
-            }
-          })
-        } else {
-          if (subimtFlag.value) {
-            subimtFlag.value = false
-            formRef.value.validate().then(() => {
-              const detString = String(formName.detailsField)
-              formName.detailsField = detString
-              console.log(detString, formName.detailsField, 'detString')
-              demandApply(formName).then((res) => {
-                applySuccess.value = false
-                message.success('操作成功！')
-                console.log('能力申请================>', res)
-                subimtFlag.value = true
-              })
             })
+          } else {
+            message.error('数据更新失败！')
           }
-        }
+        })
+      } else {
+        formRef.value.validate().then((valid) => {
+          const detString = String(_postData.detailsField)
+          _postData.detailsField = detString
+          console.log(detString, _postData.detailsField, 'detString')
+          demandApply(_postData).then((res) => {
+            applySuccess.value = false
+            message.success('操作成功！')
+            console.log('能力申请================>', res)
+          })
+        })
       }
+    }
 
-      return {
+    return {
-        formRef,
+      formRef,
-        formName,
+      formName,
-        fileList,
+      fileList,
-        headers: {
+      headers: {
-          authorization: 'authorization-text',
+        authorization: 'authorization-text',
-        },
+      },
-        handleChange,
+      handleChange,
-        applySuccess,
+      applySuccess,
-        disabled,
+      disabled,
-        signOut,
+      signOut,
-        processStartHandle,
+      processStartHandle,
-        upLoadUrl,
+      upLoadUrl,
-        // baseURL,
+      // baseURL,
-        applicationSceneOpthion,
+      applicationSceneOpthion,
-      }
+    }
-    },
+  },
-  }
+}
 </script>
 
 <style scoped lang="less">
-  #apply-container {
+#apply-container {
-    background-color: #f5f8fc;
+  background-color: #f5f8fc;
-    height: 100%;
+  height: 100%;
-    width: 100%;
+  width: 100%;
-    margin: 90px auto 0;
+  margin: 90px auto 0;
-    display: flex;
+  display: flex;
-    justify-content: space-between;
+  justify-content: space-between;
 
-    aside {
+  aside {
-      width: 282px;
+    width: 282px;
-      height: 96%;
+    height: 96%;
-      overflow-y: auto;
+    overflow-y: auto;
-      background-color: #fff;
+    background-color: #fff;
-      margin: 1% 0 3%;
+    margin: 1% 0 3%;
-    }
+  }
 
-    article {
+  article {
-      width: 1090px;
+    width: 1090px;
-      height: 99%;
+    height: 99%;
-      overflow-y: auto;
+    overflow-y: auto;
-      background-color: #fff;
+    background-color: #fff;
-      margin: 5% auto;
+    margin: 5% auto;
-    }
+  }
 
-    .form-container {
+  .form-container {
-      padding: 20px 20px 30px 20px;
+    padding: 20px 20px 30px 20px;
 
-      .title {
+    .title {
-        font-size: 20px;
-        color: #000;
-        font-weight: bold;
-        margin-bottom: 20px;
-      }
-    }
-
-    .base-info {
-      display: flex;
-    }
-
-    :deep(.ant-form-item-label) {
-      label {
-        color: #666;
-        font-size: 16px;
-
-        &::after {
-          content: '';
-        }
-      }
-    }
-
-    :deep(.ant-form-item-required) {
-      &::before {
-        font-size: 8px;
-        margin-right: 10px;
-      }
-    }
-
-    :deep(.ant-input) {
-      border: 1px solid #e0e0e0;
-      border-radius: 6px;
-    }
-
-    .success {
-      div {
-        width: 100px;
-        margin: 80px auto 40px;
-      }
-
-      text-align: center;
       font-size: 20px;
-      font-weight: bold;
       color: #000;
+      font-weight: bold;
+      margin-bottom: 20px;
     }
   }
+
+  .base-info {
+    display: flex;
+  }
+
+  :deep(.ant-form-item-label) {
+    label {
+      color: #666;
+      font-size: 16px;
+
+      &::after {
+        content: '';
+      }
+    }
+  }
+
+  :deep(.ant-form-item-required) {
+    &::before {
+      font-size: 8px;
+      margin-right: 10px;
+    }
+  }
+
+  :deep(.ant-input) {
+    border: 1px solid #e0e0e0;
+    border-radius: 6px;
+  }
+
+  .success {
+    div {
+      width: 100px;
+      margin: 80px auto 40px;
+    }
+
+    text-align: center;
+    font-size: 20px;
+    font-weight: bold;
+    color: #000;
+  }
+}
 </style>
 <style>
-  body,
+body,
-  html {
+html {
-    height: unset;
+  height: unset;
-  }
+}
 </style>