From ac5f98bc4da801e98808b94805be59e37ba98c8e Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 28 Sep 2023 17:18:19 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/enterpriseStandardLibraryApi.js       |  2 +-
 .../detail/EnterpriseStandardDetail.vue       |  6 +--
 .../detail/module/SubmitQuestionModal.vue     | 51 +++++++++++--------
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/api/enterpriseStandardLibraryApi.js b/src/api/enterpriseStandardLibraryApi.js
index b8326879..25c3156d 100644
--- a/src/api/enterpriseStandardLibraryApi.js
+++ b/src/api/enterpriseStandardLibraryApi.js
@@ -32,7 +32,7 @@ const shareStandard = (params) => postAction('/personal/lawsStandardSharing/ente
 // 企标详情-获取更新记录
 const detailGetUpdateRecord = (params) => getAction('/laws/standard/enterprise/getUpdateRecordList', params)
 // 企标详情-提交问题
-const detailSubmitQuestion = (params) => postAction('', params)
+const detailSubmitQuestion = (params) => postAction('/laws/library/lawsProblemLibrary/addProblem/QB', params)
 // 企标详情-企标评价
 const detailEvaluate = (standardId, params) => getAction('/laws/standard/enterprise/evaluateDetailForESInfo/' + `${standardId}`, params)
 
diff --git a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
index 8e190b65..98a1db14 100644
--- a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
+++ b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
@@ -122,8 +122,8 @@ import '@assets/less/common.less'
 import { FieldType } from '@/enums/commonEnums'
 import { downloadFile, getFileAccessHttpUrl } from '@/api/manage'
 import { getEnterpriseStandardInfoById, getEnterpriseStandardAddForm } from '@/api/enterpriseStandardLibraryApi'
-import UpdateRecordModal from '../../../standardRegulationLibrary/commonPage/modules/UpdateRecordModal'
-import SubmitQuestionModal from '../../../standardRegulationLibrary/commonPage/modules/SubmitQuestionModal'
+import UpdateRecordModal from './module/UpdateRecordModal'
+import SubmitQuestionModal from './module/SubmitQuestionModal'
 import EnterpriseStandardEvaluateModal from './module/EnterpriseStandardEvaluateModal'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -288,7 +288,7 @@ export default {
     },
     // 提交问题
     submitQuestion () {
-      this.$refs.submitQuestionModal.open()
+      this.$refs.submitQuestionModal.open(this.detailData.standard_number)
     }
   }
 }
diff --git a/src/views/enterpriseStandardLibrary/standard/detail/module/SubmitQuestionModal.vue b/src/views/enterpriseStandardLibrary/standard/detail/module/SubmitQuestionModal.vue
index 2dc502bc..54220c57 100644
--- a/src/views/enterpriseStandardLibrary/standard/detail/module/SubmitQuestionModal.vue
+++ b/src/views/enterpriseStandardLibrary/standard/detail/module/SubmitQuestionModal.vue
@@ -23,7 +23,7 @@
           <!--          项目-->
           <a-form-item :label="$t('project')" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-select :placeholder="$t('pleaseSelect') + $t('project')" v-decorator="['project', validatorRules.project]">
-              <a-select-option v-for="item in projectSelectOptions" :key="item">{{ item }}</a-select-option>
+              <a-select-option v-for="item in projectSelectOptions" :key="item.id">{{ item.projectName }}</a-select-option>
             </a-select>
           </a-form-item>
         </a-col>
@@ -38,22 +38,15 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <!--          问题发生时间-->
+          <!--   提问时间-->
           <a-form-item :label="$t('standardRegulationLibrary.standardDetail.problemOccurrenceTime')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-date-picker class="box-input"
-                           :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.standardDetail.problemOccurrenceTime')"
+            <a-date-picker :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.standardDetail.problemOccurrenceTime')"
                            :getCalendarContainer="(trigger) => trigger.parentNode"
-                           v-decorator="['problemOccurrenceTime', validatorRules.problemOccurrenceTime]"
+                           v-decorator="['quizTime', validatorRules.quizTime]"
+                           showTime
                            style="width: 100%" />
           </a-form-item>
         </a-col>
-        <a-col :span="12">
-          <!--          回答人-->
-          <a-form-item :label="$t('standardRegulationLibrary.standardDetail.respondent')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <user-selection v-decorator="['respondent', validatorRules.respondent]"
-                            :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.standardDetail.respondent')" />
-          </a-form-item>
-        </a-col>
         <a-col :span="24">
           <!--         问题描述-->
           <a-form-item :label="$t('standardRegulationLibrary.standardDetail.problemDescription')"
@@ -73,12 +66,12 @@
 </template>
 
 <script>
-import UserSelection from '@/components/selection/UserSelection.vue'
 import { detailSubmitQuestion } from '@/api/enterpriseStandardLibraryApi'
+import { getCarTypeProjectList } from '../../../../../api/api'
+import pick from 'lodash.pick'
 
 export default {
   name: 'SubmitQuestionModal',
-  components: { UserSelection },
   data () {
     return {
       width: 800,
@@ -119,15 +112,10 @@ export default {
           validateTrigger: 'blur'
         },
         // 问题发生时间
-        problemOccurrenceTime: {
+        quizTime: {
           rules: [{ required: false, message: this.$t('pleaseSelect') + this.$t('standardRegulationLibrary.standardDetail.problemOccurrenceTime') }],
           validateTrigger: 'change'
         },
-        // 回答人
-        respondent: {
-          rules: [{ required: false, message: this.$t('pleaseSelect') + this.$t('standardRegulationLibrary.standardDetail.respondent') }],
-          validateTrigger: 'change'
-        },
         // 问题描述
         problemDescription: {
           rules: [{ required: true, message: this.$t('pleaseEnter') + this.$t('standardRegulationLibrary.standardDetail.problemDescription') }],
@@ -139,9 +127,29 @@ export default {
       projectSelectOptions: [] // 项目下拉数据
     }
   },
+  mounted () {
+    this.initProjectOptions()
+  },
   methods: {
-    open () {
+    open (standardNumber) {
       this.visible = true
+      const param = {}
+      param.standardNumber = standardNumber
+      param.quizTime = new Date().getFullYear() + '-' + new Date().getMonth() + '-' + new Date().getDay() + ' ' +
+        new Date().getHours() + ':' + new Date().getMinutes() + ':' + new Date().getSeconds()
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(param, 'standardNumber', 'quizTime'))
+      })
+    },
+    // 获取项目下拉框数据
+    initProjectOptions () {
+      getCarTypeProjectList().then(res => {
+        if (res.success) {
+          this.projectSelectOptions = res.result
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
     },
     handleOk () {
       if (this.confirmLoading) return
@@ -149,7 +157,6 @@ export default {
         if (!err) {
           this.confirmLoading = true
           const param = Object.assign({}, values)
-          param.id = this.model.id
           detailSubmitQuestion(param).then(res => {
             if (res.success) {
               this.$message.success(res.message)