update 征求意见流程

src/views/documentTool/modules/ImportResult.vue

@@ -1,173 +0,0 @@
-<template>
-  <a-drawer
-    :title="$t('docTool.split.importResults')"
-    placement="right"
-    :visible="visible"
-    @close="onClose"
-    width="1100"
-  >
-    <div class="table-page-search-wrapper">
-      <search :url="url" :flag="'condition'"></search>
-    </div>
-    <div class="table-operator">
-      <div class="operator-text">
-        <!--  拆分文件  -->
-        <split-upload ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></split-upload>
-      </div>
-      <div class="operator-text" @click="downLoadTemplate">
-        <a-icon type="download"/>
-        {{$t('templateDownload')}}
-      </div>
-    </div>
-    <tableData
-      :flag="'header'"
-      :url="url"
-      :type="type"
-      selectionType="radio"
-      :showAction="false"
-      :operationList="operationList"
-      @onSelectChange="onSelectChange"
-    />
-
-    <div class="drawer-bootom-button">
-      <a-button style="margin-right: 15px" @click="cancelImports">{{$t('cancel')}}</a-button>
-      <a-button type="primary" @click="handleSubmit" :loading="loading">{{$t('submit')}}</a-button>
-    </div>
-
-<!--    <a-modal-->
-<!--      :title="titleItem"-->
-<!--      class="split-error"-->
-<!--      :visible="preErrVisible"-->
-<!--      @cancel="handleErrCancel"-->
-<!--      :footer="false"-->
-<!--    >-->
-<!--      <div class="err-value" v-html="errValue"></div>-->
-<!--    </a-modal>-->
-  </a-drawer>
-</template>
-
-<script>
-import { downloadFile, httpAction } from '@/api/manage'
-import Search from '@/components/customField/Search'
-import TableData from '@/components/customField/TableData'
-import SplitUpload from '@/components/splitUpload/SplitUpload'
-import { Modal } from 'ant-design-vue'
-
-export default {
-  name: 'ImportResult',
-  components: { Search, TableData, SplitUpload },
-  data () {
-    return {
-      loading: false,
-      visible: false,
-      disabled: false,
-      selectedRowKeys: [],
-      selectedRows: [],
-      type: 'pdfdoc',
-      form: {},
-      url: {
-        tableHeader: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult', // 表格头部字段
-        searchList: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult', // 搜索字段
-        tableList: 'split/sarFileSplitInfo/splitResultPageInfo', // 表格数据
-        downloadTemplate: '',
-        submit: ''
-      },
-      operationList: [],
-      accept: 'application/x-zip-compressed,application/zip',
-      // preErrVisible: false,
-      // errValue: '',
-      // titleItem: '' // 错误标题
-    }
-  },
-  methods: {
-    open () {
-      this.visible = true
-    },
-    onClose () {
-      this.visible = false
-      this.$emit('visible', false)
-    },
-    onSelectChange (keys, rows) {
-      this.selectedRowKeys = keys
-      this.selectedRows = rows
-    },
-    cancelImports () {
-      this.$emit('visible', false)
-    },
-    // 上传文件
-    uploadSuccess (data) {
-      const attIdList = []
-      if (data && data.length > 0) {
-        data.map(item => {
-          attIdList.push(item.id || data.name)
-        })
-      }
-      // 赋值给当前对应的表单文件
-      this.form.file = attIdList.join(',')
-    },
-    // 模板下载
-    downLoadTemplate () {
-      const name = this.$t('docTool.split.documentSplitTemplate') + '.xlsx'
-      downloadFile(this.url.downloadTemplate, name, {})
-    },
-    // 保存
-    handleSubmit () {
-      if (this.loading) {
-        return
-      }
-      if (this.selectedRowKeys.length === 0) {
-        this.$message.warning(this.$t('pleaseSelectOne'))
-      } else if (!this.form.file) {
-        this.$message.warning(this.$t('docTool.split.pleaseUploadSplitFile'))
-      } else if (this.selectedRowKeys && this.selectedRowKeys.length === 1) {
-        const row = this.selectedRows[0]
-        const params = {
-          connectId: row.connect_id,
-          splitFileId: this.form.file,
-          fileName: row.file_name,
-          serialNumber: row.serial_number,
-          title: row.title,
-          titleEn: row.title_en,
-          fileType: row.text_info_id
-        }
-        if (this.form.file) {
-          this.loading = true
-          httpAction(this.url.submit, params, 'post').then(res => {
-            if (res.data.success) {
-              this.$message.success(this.$t('operationSuccessful'))
-              this.visible = false
-              this.$emit('visible', false, 1)
-            } else {
-              if (res.data.code === 1) {
-                this.$message.warning(res.data.message)
-              } else {
-                Modal.info({
-                  title: '失败',
-                  content: res.data.message,
-                  class: 'err-modal' // 去掉一下footer的按钮
-                })
-                // this.titleItem = '失败'
-                // this.preErrVisible = true
-                // this.errValue = res.data.message
-              }
-            }
-          }).finally(() => {
-            this.loading = false
-          })
-        }
-      }
-    },
-    handleErrCancel () {
-      this.preErrVisible = false
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-@import '~@assets/less/common.less';
-.table-operator {
-  margin-bottom: 29px;
-  text-align: right;
-}
-</style>

src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue

@@ -90,7 +90,6 @@
                          v-decorator="['standardTextFileName', validatorRules.standardText]"
                          readonly
                          disabled
-
                          :placeholder="$t('pleaseSelect') + $t('workCenter.standardConsultationProcess.standardText')" />
                 <a-button type="primary" class="button-box" @click="chooseStandardText">
                   {{ this.$t('workCenter.standardConsultationProcess.selectText') }}
@@ -743,7 +742,7 @@ export default {
     },
     columns () {
       // 设计工程师填写征求意见表头
-      if (this.currentNode.indexOf(ConsultationProcess.designEngineerFillIn.value)) {
+      if (this.currentNode.indexOf(ConsultationProcess.designEngineerFillIn.value) === 0) {
         return this.designEngineerFillInColumns
       }
       // 模块负责人汇总填写意见表头
@@ -843,8 +842,8 @@ export default {
      * 征求意见列表-新增
      */
     handleAdd () {
-      const pdfId = '1723899113057075201'
+      const pdfId = this.basicServiceInfo.standardTextFileId
-      this.$refs.consultationModal.add(pdfId, '1716698213217865729')
+      this.$refs.consultationModal.add(pdfId, this.basicServiceInfo.standardText)
     },
     /**
      * 表单填写完成，新增数据
@@ -1045,6 +1044,8 @@ export default {
      * 同意
      */
     handleAgree () {
+      this.validatorRules.handleText.rules[0].required = false
+      this.approvalInfoForm.setFieldsValue({ handleText: '同意' })
       const formData = this.dealFormData()
       if (!formData) {
         return

src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue

@@ -437,6 +437,8 @@ export default {
      * 同意
      */
     handleAgree () {
+      this.validatorRules.handleText.rules[0].required = false
+      this.approvalInfoForm.setFieldsValue({ handleText: '同意' })
       const formData = this.dealFormData()
       if (!formData) {
         return
@@ -457,6 +459,7 @@ export default {
      * 驳回
      */
     handleReject () {
+      this.validatorRules.handleText.rules[0].required = true
       const formData = this.dealFormData()
       if (!formData) {
         return