1

src/views/buyingBack/buyingBackAdd.vue

@@ -243,23 +243,34 @@ export default {
         },
         confirmSubmit() {
             const _this = this
-            _this.loadingFlag = true
-            const soaUrl = 'add'
-            const extraData = {
-                type: '2'
+            if (!_this.form.contractId) {
+                _this.$message.warning('请选择合同')
+                return
             }
-            const postData = Object.assign({}, _this.form, extraData)
-            this.baseRequest(soaUrl, postData).then(res => {
-                if (res.data.code === 200) {
-                    this.$message.success('保存成功')
-                    this.cancel()
-                } else {
-                    this.$message.error(res.data.msg)
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    _this.loadingFlag = true
+                    let soaUrl = 'add'
+                    if (_this.form.id) {
+                        soaUrl = 'edit'
+                    }
+                    const extraData = {
+                        type: '2'
+                    }
+                    const postData = Object.assign({}, _this.form, extraData)
+                    this.baseRequest(soaUrl, postData).then(res => {
+                        if (res.data.code === 200) {
+                            this.$message.success('保存成功')
+                            this.cancel()
+                        } else {
+                            this.$message.error(res.data.msg)
+                        }
+                        _this.loadingFlag = false
+                    }).catch(err => {
+                        // this.$message.error(err)
+                        _this.loadingFlag = false
+                    })
                 }
-                _this.loadingFlag = false
-            }).catch(err => {
-                // this.$message.error(err)
-                _this.loadingFlag = false
             })
         },
         handleContract() {

src/views/buyingMore/buyingMoreAdd.vue

@@ -255,7 +255,10 @@ export default {
             this.$refs.form.validate(valid => {
                 if (valid) {
                     _this.loadingFlag = true
-                    const soaUrl = 'add'
+                    let soaUrl = 'add'
+                    if (_this.form.id) {
+                        soaUrl = 'edit'
+                    }
                     const extraData = {
                         type: '1'
                     }

src/views/customerManagement/intentionalDeposit/addIntentionalDeposit.vue

@@ -1,9 +1,37 @@
 <template>
   <div>
     <el-form ref="form" v-loading="addLoading" :model="form" style="width: 100%;padding: 5px" :rules="rules">
+      <el-row class="handle-box">
+        <el-col :span="24">
+          <span class="card_title">客户信息</span>
+        </el-col>
+      </el-row>
+      <el-row class="handle-box">
+        <el-col :span="4">
+          <span>小区-分期:</span>
+          <span>{{ customerForm.groupDiscName }}</span>
+        </el-col>
+        <el-col :span="4">
+          <span>批次号:</span>
+          <span>{{ customerForm.batchNumber }}</span>
+        </el-col>
+        <el-col :span="4">
+          <span>选房号:</span>
+          <span>{{ customerForm.roomSelectionNumber }}</span>
+        </el-col>
+        <el-col :span="4">
+          <span>买受人:</span>
+          <span>{{ customerForm.buyerName }}</span>
+        </el-col>
+        <el-col :span="4">
+          <span>选房日期:</span>
+          <span>{{ customerForm.roomSelectionDate }}</span>
+        </el-col>
+      </el-row>
+      <el-divider />
       <el-row>
         <el-col style="padding-bottom: 10px">
-          <span class="card_title">意向金登记</span>
+          <span class="card_title">意向金信息</span>
           <el-card shadow="always" style="padding: 15px 5px 5px 15px">
             <el-row>
               <el-col :span="3" class="col-txt"><span>意向金编号:</span></el-col>
@@ -75,6 +103,12 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="3" class="col-txt"><span>银行流水号</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-input v-model="form.ncBankSerialId" />
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="3" class="col-txt"><span>备注</span></el-col>
@@ -158,11 +192,15 @@ export default {
             serialNumber: '',
             fileList: [],
             customerManagementId: '',
+            intentionalDepositId: '',
             dateStr: '',
             username: '',
             isView: false,
             bankOptions: [],
-            bankObject: ''
+            bankObject: '',
+            customerForm: {
+
+            }
         }
     },
     mounted() {
@@ -176,8 +214,10 @@ export default {
         initData(data) {
             this.getBankOptions()
             this.customerManagementId = data.id
+            this.intentionalDepositId = data.intentionalDepositId
             this.initDict(this.dc_key).then(res => {
                 this.getByCustomerManagementId(data)
+                this.getCustomerById(this.customerManagementId)
             })
         },
         handleChange(value) {
@@ -225,8 +265,9 @@ export default {
                 if (valid) {
                     let soaUrl = 'add'
                     // 已收取状态
-                    if (_this.form.id) {
+                    if (_this.intentionalDepositId) {
                         soaUrl = 'edit'
+                        _this.form.id = _this.intentionalDepositId
                     }
                     const extraData = {
                         customerManagementId: this.customerManagementId,
@@ -293,6 +334,13 @@ export default {
                 }
             })
         },
+        getCustomerById(val) {
+            this.customerForm = {}
+            this.baseCustomerRequest('getById', { id: val }).then(res => {
+                this.customerForm = res.data
+            }).catch((err) => {
+            })
+        },
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('IntentionalDepositController', opUrl, postData, 'project')
         },
@@ -304,6 +352,9 @@ export default {
         },
         fundRequest(opUrl, postData) {
             return this.$channel.globeRequest('MaintenanceFundsManagementController', opUrl, postData, 'project')
+        },
+        baseCustomerRequest(opUrl, postData) {
+            return this.$channel.globeRequest('CustomerManagementController', opUrl, postData, 'project')
         }
 
     }

src/views/customerManagement/subscribe/addSubscribe.vue

@@ -75,6 +75,12 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="3" class="col-txt"><span>银行流水号</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-input v-model="form.ncBankSerialId" />
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="3" class="col-txt"><span>备注</span></el-col>

src/views/customerManagement/subscribe/subscribeIndex.vue

@@ -203,7 +203,8 @@ export default {
             const data = {
                 isView: false,
                 id: val.intentionalDepositId,
-                buyerName: val.buyerName
+                buyerName: val.buyerName,
+                fromAddress: '认购'
             }
 
             // 新vue时调用的方法

src/views/parkAssets/parkFloorDisc/index.vue

@@ -184,13 +184,13 @@
                 <el-col :span="4" class="col-txt"><span>施工许可证:</span></el-col>
                 <el-col :span="8" class="col-input">
                   <el-form-item prop="">
-                    <el-input v-model="groupForm.construction_permit" />
+                    <el-input v-model="groupForm.constructionPermit" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="4" class="col-txt"><span>土地证号:</span></el-col>
                 <el-col :span="8" class="col-input">
                   <el-form-item prop="">
-                    <el-input v-model="groupForm.land_certificate_number" />
+                    <el-input v-model="groupForm.landCertificateNumber" />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -286,6 +286,14 @@
                   </el-form-item>
                 </el-col>
               </el-row>
+              <el-row>
+                <el-col :span="4" class="col-txt"><span><span class="red-asterisk">*</span>项目编号</span></el-col>
+                <el-col :span="8" class="col-input">
+                  <el-form-item prop="archiveCode">
+                    <el-input v-model="groupForm.archiveCode" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <el-row>
                 <el-col :span="4" class="col-txt"><span>详细地址</span></el-col>
                 <el-col :span="20" class="col-input">
@@ -468,7 +476,7 @@
                         >
                           <el-button size="small" type="primary">点击上传</el-button>
                           <div slot="file" slot-scope="{file}" class="file-row">
-                            <a :href="file.url">{{ file.name }}</a>
+                            <a target="_blank" :href="file.url">{{ file.name }}</a>
                             <span class="el-upload-list__item-actions">
                               <i class="el-icon-delete" @click="handlePictureRemove(file,item.fileList)" />
                             </span>
@@ -549,7 +557,8 @@ export default {
             groupFormRules: {
                 groupName: [{ required: true, trigger: 'blur', message: '请输入楼盘/小区名称' }],
                 nature: [{ required: true, trigger: 'change', message: '请选择性质' }],
-                preSalesLicenseNumber: [{ required: true, trigger: 'blur', message: '请输入预销售许可证编号' }]
+                preSalesLicenseNumber: [{ required: true, trigger: 'blur', message: '请输入预销售许可证编号' }],
+                archiveCode: [{ required: true, trigger: 'blur', message: '请输入项目编号' }]
             },
             commitRules: {
                 groupId: [{ required: true, trigger: 'change', message: '请选择小区' }],
@@ -632,7 +641,7 @@ export default {
             this.baseRequest('/getById', { id: val.id }).then((res) => {
                 console.log('获取详情——：', res)
                 if (res.status == 200) {
-                    this.dialogTitle = '修改园区'
+                    this.dialogTitle = '修改楼盘'
                     this.groupForm = res.data
                     if (res.data.areaStatus) {
                         this.groupForm.areaStatus = res.data.areaStatus + ''
@@ -647,7 +656,7 @@ export default {
 
         groupRemove: function(val) {
             console.log('删除阐述——：', val)
-            this.$confirm('此操作将删除园区, 是否继续?', '提示', {
+            this.$confirm('此操作将删除楼盘, 是否继续?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
@@ -839,13 +848,17 @@ export default {
                 _this.baseHouseTypeRequest('listAll', { discId: val.id }).then((res) => {
                     if (res.data) {
                         res.data.forEach(item => {
+                            const fileList = Object.values(JSON.parse(item.fileList))
+                            fileList.forEach(item => {
+                                item.url = item.url.replace('FileController', 'FileZtController')
+                            })
                             const data = {
                                 id: item.id,
                                 discId: item.discId,
                                 name: item.name,
                                 buildArea: item.buildArea,
                                 useArea: item.useArea,
-                                fileList: Object.values(JSON.parse(item.fileList))
+                                fileList: fileList
                             }
                             _this.formLP.dynamicItem.push(data)
                         })

src/views/receiveRefundsManagement/intentionalDepositManagement/index.vue

@@ -25,18 +25,19 @@
           <el-table-column label="小区-分期" prop="groupDiscName" />
           <el-table-column label="意向金流水号" prop="serialNumber" />
           <el-table-column label="买受人" prop="buyerName" width="200" />
-          <el-table-column label="意向金金额" prop="receivableMoney" width="200" />
+          <el-table-column label="意向金金额" prop="receivedAmount" width="200" />
           <el-table-column label="状态" prop="statusStr" width="110" />
           <el-table-column label="定金编号" prop="depositSerialNumber" />
           <el-table-column label="认购房屋" prop="houseName" />
           <el-table-column label="经办人" prop="createdName" />
           <el-table-column label="经办时间" prop="createdAt" />
-          <el-table-column header-align="center" label="操作" width="380">
+          <el-table-column header-align="center" label="操作" width="430">
             <template scope="scope">
-              <el-button :disabled="scope.row.status !== 1" size="mini" type="text" @click="handleEdit(scope.row)">转定金</el-button>
+              <el-button :disabled="scope.row.status !== 1" size="mini" type="text" @click="handleToDeposit(scope.row)">转定金</el-button>
               <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
               <el-button :disabled="scope.row.status === 1" size="mini" type="text" @click="downLoad(scope.row)">意向金收据</el-button>
               <el-button :disabled="scope.row.status === 2" size="mini" type="text" @click="handleRefund(scope.row)">退意向金</el-button>
+              <el-button :disabled="!(scope.row.status === 1)" size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -89,6 +90,23 @@
       <refund-intentional-deposit v-if="dialogRefundVisible" ref="refund" @cancel="cancel" />
     </el-dialog>
 
+    <!--意向金编辑-->
+    <el-dialog
+      :visible.sync="dialogIntentionalVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title=""
+      width="90%"
+      top="20px"
+      class="statistic_base"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      custom-class="tagdialog"
+      @close="getData"
+    >
+      <add-intentional-deposit v-if="dialogIntentionalVisible" ref="addIntentionalDeposit" @cancel="cancel" />
+    </el-dialog>
+
   </div>
 </template>
 <script>
@@ -97,10 +115,11 @@ import BaseData from '@/views/base/baseData'
 import ToDeposit from '@/views/receiveRefundsManagement/intentionalDepositManagement/toDeposit.vue'
 import RefundIntentionalDeposit from '@/views/receiveRefundsManagement/intentionalDepositManagement/refundIntentionalDeposit.vue'
 import constant from '@/static/utils/constant'
+import AddIntentionalDeposit from '@/views/customerManagement/intentionalDeposit/addIntentionalDeposit.vue'
 
 export default {
     name: 'Index',
-    components: { ToDeposit, RefundIntentionalDeposit },
+    components: { AddIntentionalDeposit, ToDeposit, RefundIntentionalDeposit },
     mixins: [Base, BaseData],
     data() {
         return {
@@ -113,7 +132,8 @@ export default {
             // 弹框相关
             dialogVisible: false,
             dialogTitle: '新增',
-            dialogRefundVisible: false
+            dialogRefundVisible: false,
+            dialogIntentionalVisible: false
         }
     },
     mounted() {
@@ -159,8 +179,8 @@ export default {
             item.statusStr = this.dc_map.INTENTIONAL_DEPOSIT_STATUS[item.status]
             return item
         },
-        /* 编辑*/
-        handleEdit: function(val) {
+        /* 转定金*/
+        handleToDeposit: function(val) {
             this.dialogVisible = true
             val.isView = false
             // 新vue时调用的方法
@@ -168,6 +188,17 @@ export default {
                 this.$refs.toDeposit.initData(val)
             })
         },
+        handleEdit(val) {
+            this.dialogIntentionalVisible = true
+            const postData = {
+                id: val.customerManagementId,
+                intentionalDepositId: val.id
+            }
+            // 新vue时调用的方法
+            this.$nextTick(() => {
+                this.$refs.addIntentionalDeposit.initData(postData)
+            })
+        },
         handleView(val) {
             this.dialogVisible = true
             this.dialogTitle = '查看'
@@ -192,6 +223,7 @@ export default {
         cancel: function() {
             this.dialogVisible = false
             this.dialogRefundVisible = false
+            this.dialogIntentionalVisible = false
         },
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('IntentionalDepositController', opUrl, postData, '')

src/views/receiveRefundsManagement/intentionalDepositManagement/toDeposit.vue

@@ -42,7 +42,7 @@
               </el-col>
               <el-col :span="3" class="col-txt">
                 <el-form-item>
-                  <el-button type="text" @click="handleHouse()">去选房</el-button>
+                  <el-button v-if="fromAddress!=='认购'" type="text" @click="handleHouse()">去选房</el-button>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -143,7 +143,8 @@ export default {
             dateStr: '',
             username: '',
             dialogHouseVisible: false,
-            isView: false
+            isView: false,
+            fromAddress: ''
         }
     },
     mounted() {
@@ -156,6 +157,7 @@ export default {
     methods: {
         initData(data) {
             this.isView = data.isView
+            this.fromAddress = data.fromAddress
             this.initDict(this.dc_key).then(res => {
                 this.getById(data)
             })