From 4bce0328f0b94188b7fb01bc28cd9b024489e104 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Wed, 25 Oct 2023 09:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E4=BC=9A=E3=80=81?=
 =?UTF-8?q?=E5=8F=82=E4=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/process.js                            | 18 +++++++++++++
 .../CustomFormComponents/DatePicker.vue       |  7 +++--
 .../policy/components/editDrawer.vue          |  2 +-
 .../policyTopicEnrollment/index.vue           | 27 ++++++++++++++++---
 .../components/RetrieveTopics.vue             |  2 +-
 .../policyTopicParticipation/index.vue        | 27 +++++++++----------
 6 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/src/api/process.js b/src/api/process.js
index 107d445d7..2ce98ce27 100644
--- a/src/api/process.js
+++ b/src/api/process.js
@@ -1083,3 +1083,21 @@ export function processCreateMeeting (data) {
     data
   })
 }
+
+// 政策课题入会
+export function processLawsTopicMembership (data) {
+  return axios({
+    url: '/api/lawss/sarLawsTopic/processLawsTopicMembership',
+    method: 'post',
+    data
+  })
+}
+
+// 政策课题参会
+export function processLawsTopicParticipation (data) {
+  return axios({
+    url: '/api/lawss/sarLawsTopic/processLawsTopicParticipation',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/components/CustomFormComponents/DatePicker.vue b/src/components/CustomFormComponents/DatePicker.vue
index 665e1b03b..db9fb75cd 100644
--- a/src/components/CustomFormComponents/DatePicker.vue
+++ b/src/components/CustomFormComponents/DatePicker.vue
@@ -18,7 +18,7 @@
         clearable
         :editable="true"
         :disabled="disabled"
-        :placeholder="placeholder"
+        :placeholder="placeholder || defaultPlaceholder"
         @input="handleChange"
       >
       </el-date-picker>
@@ -49,10 +49,13 @@ export default {
     span: {
       type: Number,
       default: 24
+    },
+    placeholder: {
+      type: String
     }
   },
   computed: {
-    placeholder () {
+    defaultPlaceholder () {
       return `请选择${this.config.attrName}`
     },
     showMessage () {
diff --git a/src/pages/policyRegulation/policy/components/editDrawer.vue b/src/pages/policyRegulation/policy/components/editDrawer.vue
index 5d08bca01..d1d908252 100644
--- a/src/pages/policyRegulation/policy/components/editDrawer.vue
+++ b/src/pages/policyRegulation/policy/components/editDrawer.vue
@@ -295,7 +295,7 @@
                     :disabled="formdisableflag"
                 ></custom-SVPPS>
               </template>
-              <!--人员选择：投稿人||责任部门-->
+              <!--人员选择：投稿人||责任工程师-->
               <template v-else-if="field.attrField === 'TGRLAWS' || field.attrField === 'ZRGCSLAWS'">
                 <el-form-item v-if="field.attrField === 'TGRLAWS'"
                     prop="TGRBUSS"
diff --git a/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/index.vue b/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/index.vue
index ea4f37335..e1d649180 100644
--- a/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/index.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/index.vue
@@ -115,7 +115,7 @@ import PersonInfo from "./components/PersonInfo";
 import ReceiptDescription from "@/components/hzwlComponents/ReceiptDescription";
 import ApprovalHistory from "@/components/hzwlComponents/ApprovalHistory";
 
-import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel, saveTaskForPub, changeAssigneeNew } from 'api/process'
+import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel, saveTaskForPub, changeAssigneeNew, processLawsTopicMembership } from 'api/process'
 
 export default {
   name: "policyTopicEnrollment",
@@ -455,8 +455,12 @@ export default {
             this.roleForm = {
               applyUserId: processForm.applyUserId,
               applyUserName: processForm.applyUserName,
-              jlUserId: processForm.jlUserId,
-              jlUserName: processForm.jlUserName,
+              ministerId: processForm.ministerId,
+              ministerIdName: processForm.ministerIdName,
+              inspectorId: processForm.inspectorId,
+              inspectorIdName: processForm.inspectorIdName,
+              presidentId: processForm.presidentId,
+              presidentIdName: processForm.presidentIdName
             }
             this.$nextTick(() => {
               this.reloadForm = true
@@ -608,6 +612,23 @@ export default {
         }
       }
     },
+    // 流程入库
+    processCreate (json) {
+      const _formData = new FormData()
+      _formData.append('infoJson', json)
+      processLawsTopicMembership(_formData).then(res => {
+        if (res.result === '操作成功' || res.data === '入库成功') {
+          this.$message.success(res.data)
+          setTimeout(() => {
+            this.$router.push({ name: 'ProcessCenter' })
+          }, 100)
+        } else {
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        this.footerLoading = false
+      })
+    },
     // 驳回
     handleOver(){
       this.form.approvalOpinion = 1
diff --git a/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/components/RetrieveTopics.vue b/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/components/RetrieveTopics.vue
index 4cf7905a5..1b779b7b1 100644
--- a/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/components/RetrieveTopics.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/components/RetrieveTopics.vue
@@ -242,7 +242,7 @@ export default {
         case 2:
           if (this.selectedList.length === 1) {
             const query = {
-              lawsTopicId: this.selectedList[0].id
+              id: this.selectedList[0].id
             }
             const res = await this.$http._getData(this.api.getLawsTopicInfo, query, {_this:this,loading: 'buttonLoading'})
             if (res && res.data) {
diff --git a/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/index.vue b/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/index.vue
index 7c0b902c2..7c37f895a 100644
--- a/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/index.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/index.vue
@@ -123,7 +123,7 @@ import PersonInfo from "./components/PersonInfo";
 import RetrieveTopics from "./components/RetrieveTopics";
 import ApprovalHistory from "@/components/hzwlComponents/ApprovalHistory";
 
-import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel, saveTaskForPub, changeAssigneeNew } from 'api/process'
+import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel, saveTaskForPub, changeAssigneeNew, processLawsTopicParticipation } from 'api/process'
 import pick from 'lodash/pick'
 
 export default {
@@ -493,19 +493,18 @@ export default {
     processCreate (json) {
       const _formData = new FormData()
       _formData.append('infoJson', json)
-      alert('入库')
-      // processCreateMeeting(_formData).then(res => {
-      //   if (res.result === '操作成功' || res.data === '入库成功') {
-      //     this.$message.success(res.data)
-      //     setTimeout(() => {
-      //       this.$router.push({ name: 'ProcessCenter' })
-      //     }, 100)
-      //   } else {
-      //     this.$message.warning(res.message)
-      //   }
-      // }).finally(() => {
-      //   this.footerLoading = false
-      // })
+      processLawsTopicParticipation(_formData).then(res => {
+        if (res.result === '操作成功' || res.data === '入库成功') {
+          this.$message.success(res.data)
+          setTimeout(() => {
+            this.$router.push({ name: 'ProcessCenter' })
+          }, 100)
+        } else {
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        this.footerLoading = false
+      })
     },
     // 驳回
     handleOver(){