From 08c63c9d0682a7d3fa92ee80998fb58b0b1db562 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Fri, 8 Oct 2021 14:05:18 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E8=B5=84=E6=96=99=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=94=AF=E5=87=BA?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E5=8D=95=E4=BD=8D=E3=80=81=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E6=94=B9=E4=B8=BAinput"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7ab837f86f26ab72177b2e61df454034263a2629.
---
 .../modules/ExpenditureContractModule.vue     | 45 +++++++++----------
 .../WorkingGroupProjectDataMaintenance.vue    | 14 +-----
 2 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
index 82398a7..edd05c9 100644
--- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
+++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
@@ -28,18 +28,17 @@
               </a-col>
               <a-col :xxl="6" :xl="8" :sm="12">
                 <a-form-item label="签订单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入签订单位"
-                           v-decorator="['signedCompanyTemporaryName',validatorRules.signedCompanyTemporaryName]"
-                           :maxLength='50'
-                           @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+                  <company-select placeholder="请选择签订单位"
+                                  v-decorator="['signedCompany',validatorRules.signedCompany]"
+                                  @change="handleSignedCompanyChange"></company-select>
                 </a-form-item>
               </a-col>
               <a-col :xxl="6" :xl="8" :sm="12" style="margin-bottom: 0">
                 <a-form-item label="签订联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入签订联系人"
-                           v-decorator="['signedContactsTemporaryName',validatorRules.signedContactsTemporaryName]"
-                           :maxLength='50'
-                           @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+                  <select-contacts placeholder="请选择签订联系人"
+                                   :selected-company="selectedCompany"
+                                   :init-contacts="selectedContact"
+                                   v-decorator="['signedContactsId',validatorRules.signedContactsId]"></select-contacts>
                 </a-form-item>
               </a-col>
               <a-col :xxl="6" :xl="8" :sm="12">
@@ -288,11 +287,11 @@ export default {
           rules: [{ required: true, message: '请输入合同名称' }],
           validateTrigger: 'blur'
         },
-        signedCompanyTemporaryName: {
-          rules: [{ required: true, message: '请输入签订单位' }],
-          validateTrigger: 'blur'
+        signedCompany: {
+          rules: [{ required: true, message: '请选择签订单位' }],
+          validateTrigger: 'change'
         },
-        signedContactsTemporaryName: {
+        signedContactsId: {
           rules: [{ required: true, message: '请选择签订联系人' }],
           validateTrigger: 'blur'
         },
@@ -365,17 +364,17 @@ export default {
           let record
           record = res.result
           // 回显企业
-          // record.signedCompany = {
-          //   id: record.signedCompanyTemporaryId,
-          //   companyName: record.signedCompanyTemporaryName
-          // }
+          record.signedCompany = {
+            id: record.signedCompanyTemporaryId,
+            companyName: record.signedCompanyTemporaryName
+          }
           // 回显联系人
-          // this.selectedCompany = record.signedCompany
-          // record.signedContactsId = record.signedContactsTemporaryId
-          // this.selectedContact = {
-          //   id: record.signedContactsTemporaryId,
-          //   name: record.signedContactsTemporaryName
-          // }
+          this.selectedCompany = record.signedCompany
+          record.signedContactsId = record.signedContactsTemporaryId
+          this.selectedContact = {
+            id: record.signedContactsTemporaryId,
+            name: record.signedContactsTemporaryName
+          }
           this.model = Object.assign({}, record)
           // 回显负责人部门
           this.principalChange(this.model.principalId)
@@ -384,7 +383,7 @@ export default {
           // 回显打包年份
           this.isPackage = this.model.pack === 1
           this.$nextTick(() => {
-            this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompanyTemporaryName', 'signedContactsTemporaryName', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear'))
+            this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear'))
             this.confirmLoading = false
           })
         } else {
diff --git a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue
index a94dd19..ed842e0 100644
--- a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue
@@ -87,7 +87,6 @@ import { JeroListMixin } from '../../mixins/JeroListMixin'
 import PageHeaderTitle from '../../components/layouts/PageHeaderTitle'
 import WorkGroupFileUploadModal from './modules/WorkGroupFileUploadModal'
 import WorkGroupDistributeModule from './modules/WorkGroupDistributeModule'
-import { downloadFile } from '../../api/manage'
 
 export default {
   name: 'WorkingGroupProjectDataMaintenance',
@@ -196,18 +195,7 @@ export default {
       this.dataId = id
       this.distributeModalVisible = true
       this.isBatchDistribute = false
-    },
-    handleExportXls(fileName) {
-      if (!fileName || typeof fileName != 'string') {
-        fileName = '导出文件'
-      }
-      let param = this.getQueryParams()
-      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-        param['selections'] = this.selectedRowKeys.join(',')
-      }
-      console.log('导出参数', param)
-      downloadFile(this.url.exportXlsUrl, fileName + '.zip', param)
-    },
+    }
   }
 }
 </script>