commit

src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html

@@ -172,12 +172,12 @@ layout("/layouts/platform.html"){
             </div>
 
             <search @search="doSearch" class="mt10">
-                <search-item label="代表团">
+                <!--<search-item label="代表团">
                     <el-select clearable filterable placeholder="请选择所属代表团" v-model="pageForm.delegationId">
                         <el-option :key="item.id" :label="item.name" :value="item.id"
                                    v-for="item in delegationOptions"></el-option>
                     </el-select>
-                </search-item>
+                </search-item>-->
                 <search-item label="所属工会">
                     <el-select clearable filterable placeholder="请选择所属工会" v-model="pageForm.unionId"
                                @change="pageForm.unitId=null;listUnit();">
@@ -329,20 +329,20 @@ layout("/layouts/platform.html"){
                 this.pageForm.delegationId = null
                 this.listDelegation()
             },
-            listDelegation() {
+            /*listDelegation() {
                 this.$axios.post("/platform/proposal/common/listDelegation", {sessionId: this.pageForm.sessionId}).then((res) => {
                     if (res.code === 0) {
                         this.delegationOptions = res.data
                     }
                 })
-            },
+            },*/
             listSession() {
                 this.$axios.post("/platform/proposal/common/listSession").then((res) => {
                     if (res.code === 0) {
                         this.sessionOptions = res.data
                         if (this.sessionOptions) {
-                            this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
-                            this.listDelegation()
+                            /*this.$set(this.pageForm, "sessionId", this.sessionOptions[0].id)
+                            this.listDelegation()*/
                             this.pageData()
                         }
                     }

src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html

@@ -231,6 +231,14 @@ layout("/layouts/platform.html"){
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(() => {
+                    // 是否有协办单位
+                    let tf_helpunitreply;
+                    if (this.formData.tf_slaveUnitIds && this.formData.tf_slaveUnitIds.length > 0) {
+                        tf_helpunitreply = 'HAS_HELP_UNIT'
+                    } else {
+                        tf_helpunitreply = 'NO_HELP_UNIT'
+                    }
+
                     const loading = createLoading('提交中')
                     this.$axios.post("/flow/common/executeTask", {
                         data: JSON.stringify({
@@ -239,6 +247,7 @@ layout("/layouts/platform.html"){
                             tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null,
                             tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
                             tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
+                            tf_helpunitreply: tf_helpunitreply
                         })
                     }).then((res) => {
                         if (res.code === 0) {

src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js

@@ -123,6 +123,14 @@ const merge = {
                 cancelButtonText: "取消",
                 type: "warning"
             }).then(() => {
+                // 是否有协办单位
+                let tf_helpunitreply;
+                if (this.formData.tf_slaveUnitIds && this.formData.tf_slaveUnitIds.length > 0) {
+                    tf_helpunitreply = 'HAS_HELP_UNIT'
+                } else {
+                    tf_helpunitreply = 'NO_HELP_UNIT'
+                }
+
                 const loading = createLoading('提交中')
                 this.$axios.post("/platform/proposal/committeeFiling/merge", {
                     data: JSON.stringify({
@@ -132,6 +140,7 @@ const merge = {
                         tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null,
                         tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
                         tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
+                        tf_helpunitreply: tf_helpunitreply
                     })
                 }).then((res) => {
                     if (res.code === 0) {

src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html

@@ -127,8 +127,8 @@ layout("/layouts/platform.html"){
             },
             openAudit(row) {
 				// 找这个代表团的副团长
-				
-				
+
+
                 this.$refs.guava.edit(() => {
                     this.showApprovalForm = true
                     this.formData = {
@@ -148,6 +148,8 @@ layout("/layouts/platform.html"){
                         cancelButtonText: "取消",
                         type: "warning"
                     }).then(() => {
+                        console.log(this.formData)
+                        return
                         this.$axios.post("/flow/common/executeTask", {
                             data: JSON.stringify({
                                 ...this.formData,