1

src/views/buyingBack/buyingBackAdd.vue

@@ -4,6 +4,8 @@
       <el-row>
         <el-col style="padding-bottom: 10px">
           <span class="card_title">增购登记</span>
+          <span v-if="!isView">&nbsp;&nbsp;&nbsp;&nbsp;买受人当前最新产权份额占比为（%）:</span>
+          <span v-if="!isView">{{ form.buyerProportion }}</span>
           <el-card shadow="always" style="padding-top: 10px">
             <el-row>
               <el-col :span="4" class="col-txt"><span>*增购编号</span></el-col>
@@ -13,7 +15,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row>
+            <el-row v-if="!isView&&!id">
               <el-col :span="4" class="col-txt"><span>*原签约信息</span></el-col>
               <el-col :span="20" class="col-input">
                 <el-form-item>
@@ -66,31 +68,19 @@
                 </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">
-                <el-form-item>
-                  <el-input v-model="form.buyerProportion" />
-                </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">-->
+            <!--                <el-form-item>-->
+            <!--                  <el-input v-model="form.buyerProportion" />-->
+            <!--                </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">
-                <el-form-item prop="invoiceTax">
-                  <el-select
-                    v-model="form.transferProportion"
-                    filterable
-                    placeholder="请选择"
-                    @change="proportionChange"
-                  >
-                    <el-option
-                      v-for="item in dc_data.TRANSFER_PROPORTION"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
+                <el-form-item>
+                  <el-input v-model="form.transferProportion" @input="proportionChange" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -98,7 +88,7 @@
               <el-col :span="4" class="col-txt"><span>转让后买受人产权份额占比为（%）</span></el-col>
               <el-col :span="20" class="col-input">
                 <el-form-item>
-                  <el-input v-model="form.transferBuyerProportion" readonly />
+                  <el-input v-model="form.transferBuyerProportionAfter" readonly />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -106,7 +96,7 @@
               <el-col :span="4" class="col-txt"><span>转让后安居公司产权份额占比为（%）</span></el-col>
               <el-col :span="20" class="col-input">
                 <el-form-item>
-                  <el-input v-model="form.transferCompanyProportion" readonly />
+                  <el-input v-model="form.transferCompanyProportionAfter" readonly />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -114,7 +104,7 @@
               <el-col :span="4" class="col-txt"><span>转让单价（元/每平方）</span></el-col>
               <el-col :span="20" class="col-input">
                 <el-form-item>
-                  <el-input v-model="form.transferPrice" oninput="value=value.replace(/[^\d.]/g,'')"/>
+                  <el-input v-model="form.transferPrice" oninput="value=value.replace(/[^\d.]/g,'')" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -188,7 +178,6 @@
       :append-to-body="true"
       :modal-append-to-body="true"
       custom-class="tagdialog"
-      @close="getData"
     >
       <contract-index v-if="dialogVisible" ref="contractIndex" from-address="addInvoice" @getChildrenData="getChildrenData" />
     </el-dialog>
@@ -203,7 +192,7 @@ import { upload } from '@/static/utils/channel'
 import ContractIndex from '@/views/signingManagement/contractManagement/index.vue'
 
 export default {
-    name: 'BuyingMoreAdd',
+    name: 'BuyingBackAdd',
     components: { ContractIndex },
     mixins: [Base, BaseData],
     data() {
@@ -217,7 +206,8 @@ export default {
             bankOptions: [],
             loadingFlag: false,
             fileList: [],
-            username: ''
+            username: '',
+            id: ''
         }
     },
     mounted() {
@@ -229,12 +219,13 @@ export default {
     methods: {
         initData(data) {
             this.isView = data.isView
-            this.getBankOptions()
-            if (data) {
+            this.id = data.id
+            if (data.id) {
                 this.getData(data)
             }
         },
         getData(data) {
+            console.log(data)
             const postData = {
                 id: data.id
             }
@@ -255,7 +246,7 @@ export default {
             _this.loadingFlag = true
             const soaUrl = 'add'
             const extraData = {
-                type: '1'
+                type: '2'
             }
             const postData = Object.assign({}, _this.form, extraData)
             this.baseRequest(soaUrl, postData).then(res => {
@@ -276,8 +267,8 @@ export default {
             this.dialogTitle = ''
         },
         getChildrenData(data) {
-            console.log('data', data)
             this.dialogVisible = false
+            if (!data) return
             const postData = {
                 contractId: data
             }
@@ -293,9 +284,10 @@ export default {
             })
         },
         proportionChange() {
+            // 最新买受人份额占比
             const buyerProportion = Number(this.form.buyerProportion)
-            this.form.transferBuyerProportion = buyerProportion + Number(this.form.transferProportion)
-            this.form.transferCompanyProportion = buyerProportion - Number(this.form.transferProportion)
+            this.form.transferBuyerProportionAfter = buyerProportion - this.form.transferProportion
+            this.form.transferCompanyProportionAfter = 100 - Number(this.form.transferBuyerProportionAfter)
         },
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('BuyingMoreController', opUrl, postData, 'project')

src/views/buyingBack/index.vue

@@ -10,7 +10,7 @@
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px">
       <el-col :span="24" style="margin-top: 20px">
-        <el-button class="ch-button" size="small" style="float: right;margin-left: 10px" @click="handleAdd()"><i class="el-icon-search" />&nbsp;新增</el-button>
+        <el-button class="ch-button" size="small" style="float: right;margin-left: 10px" @click="handleAdd()">&nbsp;新增</el-button>
         <el-button class="ch-button-warning" size="small" style="float: right" @click="handleReset()"><i class="el-icon-search" />&nbsp;重置</el-button>
         <el-button class="ch-button" size="small" style="float: right" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
       </el-col>
@@ -37,6 +37,7 @@
           <el-table-column label="登记时间" prop="createdAt" />
           <el-table-column header-align="center" label="操作" width="380">
             <template scope="scope">
+              <el-button size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>
               <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
               <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>
             </template>
@@ -80,8 +81,9 @@
 import Base from '@/views/base/base'
 import BaseData from '@/views/base/baseData'
 import BuyingBackAdd from '@/views/buyingBack/buyingBackAdd.vue'
+
 export default {
-    name: 'BuyingBack',
+    name: 'BuyingBackIndex',
     components: { BuyingBackAdd },
     mixins: [Base, BaseData],
     data() {
@@ -111,6 +113,7 @@ export default {
 
             this.search.pageNum = this.currentPage
             this.search.pageSize = this.pageSize
+            this.search.type = '2'
             this.baseRequest('list', this.search).then((res) => {
                 if (res.data.rows) {
                     res.data.rows.forEach(function(item) {
@@ -140,13 +143,24 @@ export default {
             item.transferProportionStr = item.transferProportion + '%'
             return item
         },
-        handleAdd(val) {
+        handleAdd() {
             this.dialogVisible = true
             this.dialogTitle = '新增'
-            val.isView = true
+            const postData = {
+                isView: false
+            }
+            // 新vue时调用的方法
+            this.$nextTick(() => {
+                this.$refs.buyingBackAdd.initData(postData)
+            })
+        },
+        handleEdit(val) {
+            this.dialogVisible = true
+            this.dialogTitle = '编辑'
+            val.isView = false
             // 新vue时调用的方法
             this.$nextTick(() => {
-                this.$refs.buyingMoreAdd.initData(val)
+                this.$refs.buyingBackAdd.initData(val)
             })
         },
         handleView(val) {
@@ -155,7 +169,7 @@ export default {
             val.isView = true
             // 新vue时调用的方法
             this.$nextTick(() => {
-                this.$refs.buyingMoreAdd.initData(val)
+                this.$refs.buyingBackAdd.initData(val)
             })
         },
         handleDelete(val) {

src/views/buyingMore/buyingMoreAdd.vue

@@ -4,8 +4,8 @@
       <el-row>
         <el-col style="padding-bottom: 10px">
           <span class="card_title">增购登记</span>
-          <span v-if="!form.id">&nbsp;&nbsp;&nbsp;&nbsp;买受人当前最新产权份额占比为（%）:</span>
-          <span v-if="!form.id">{{ form.buyerProportion }}</span>
+          <span v-if="!isView">&nbsp;&nbsp;&nbsp;&nbsp;买受人当前最新产权份额占比为（%）:</span>
+          <span v-if="!isView">{{ form.buyerProportion }}</span>
           <el-card shadow="always" style="padding-top: 10px">
             <el-row>
               <el-col :span="4" class="col-txt"><span>*增购编号</span></el-col>
@@ -15,7 +15,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row v-if="!form.id">
+            <el-row v-if="!isView&&!id">
               <el-col :span="4" class="col-txt"><span>*原签约信息</span></el-col>
               <el-col :span="20" class="col-input">
                 <el-form-item>
@@ -68,19 +68,19 @@
                 </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">-->
-<!--                <el-form-item>-->
-<!--                  <el-input v-model="form.buyerProportion" />-->
-<!--                </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">-->
+            <!--                <el-form-item>-->
+            <!--                  <el-input v-model="form.buyerProportion" />-->
+            <!--                </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">
                 <el-form-item>
-                  <el-input v-model="form.transferProportion" @input="proportionChange"/>
+                  <el-input v-model="form.transferProportion" @input="proportionChange" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -88,7 +88,7 @@
               <el-col :span="4" class="col-txt"><span>转让后买受人产权份额占比为（%）</span></el-col>
               <el-col :span="20" class="col-input">
                 <el-form-item>
-                  <el-input v-model="form.transferBuyerProportion" readonly />
+                  <el-input v-model="form.transferBuyerProportionAfter" readonly />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -96,7 +96,7 @@
               <el-col :span="4" class="col-txt"><span>转让后安居公司产权份额占比为（%）</span></el-col>
               <el-col :span="20" class="col-input">
                 <el-form-item>
-                  <el-input v-model="form.transferCompanyProportion" readonly />
+                  <el-input v-model="form.transferCompanyProportionAfter" readonly />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -178,7 +178,6 @@
       :append-to-body="true"
       :modal-append-to-body="true"
       custom-class="tagdialog"
-      @close="getData"
     >
       <contract-index v-if="dialogVisible" ref="contractIndex" from-address="addInvoice" @getChildrenData="getChildrenData" />
     </el-dialog>
@@ -207,7 +206,8 @@ export default {
             bankOptions: [],
             loadingFlag: false,
             fileList: [],
-            username: ''
+            username: '',
+            id: ''
         }
     },
     mounted() {
@@ -219,12 +219,13 @@ export default {
     methods: {
         initData(data) {
             this.isView = data.isView
-            this.getBankOptions()
-            if (data) {
+            this.id = data.id
+            if (data.id) {
                 this.getData(data)
             }
         },
         getData(data) {
+            console.log(data)
             const postData = {
                 id: data.id
             }
@@ -266,8 +267,8 @@ export default {
             this.dialogTitle = ''
         },
         getChildrenData(data) {
-            console.log('data', data)
             this.dialogVisible = false
+            if (!data) return
             const postData = {
                 contractId: data
             }
@@ -284,8 +285,8 @@ export default {
         },
         proportionChange() {
             const buyerProportion = Number(this.form.buyerProportion)
-            this.form.transferBuyerProportion = buyerProportion + Number(this.form.transferProportion)
-            this.form.transferCompanyProportion = buyerProportion - Number(this.form.transferProportion)
+            this.form.transferBuyerProportionAfter = buyerProportion + Number(this.form.transferProportion)
+            this.form.transferCompanyProportionAfter = 100 - Number(this.form.transferBuyerProportionAfter)
         },
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('BuyingMoreController', opUrl, postData, 'project')

src/views/buyingMore/index.vue

@@ -10,7 +10,7 @@
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px">
       <el-col :span="24" style="margin-top: 20px">
-        <el-button class="ch-button" size="small" style="float: right;margin-left: 10px" @click="handleAdd()"><i class="el-icon-search" />&nbsp;新增</el-button>
+        <el-button class="ch-button" size="small" style="float: right;margin-left: 10px" @click="handleAdd()">&nbsp;新增</el-button>
         <el-button class="ch-button-warning" size="small" style="float: right" @click="handleReset()"><i class="el-icon-search" />&nbsp;重置</el-button>
         <el-button class="ch-button" size="small" style="float: right" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
       </el-col>
@@ -37,6 +37,7 @@
           <el-table-column label="登记时间" prop="createdAt" />
           <el-table-column header-align="center" label="操作" width="380">
             <template scope="scope">
+              <el-button size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>
               <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
               <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>
             </template>
@@ -112,6 +113,7 @@ export default {
 
             this.search.pageNum = this.currentPage
             this.search.pageSize = this.pageSize
+            this.search.type = '1'
             this.baseRequest('list', this.search).then((res) => {
                 if (res.data.rows) {
                     res.data.rows.forEach(function(item) {
@@ -141,10 +143,21 @@ export default {
             item.transferProportionStr = item.transferProportion + '%'
             return item
         },
-        handleAdd(val) {
+        handleAdd() {
             this.dialogVisible = true
             this.dialogTitle = '新增'
-            val.isView = true
+            const postData = {
+                isView: false
+            }
+            // 新vue时调用的方法
+            this.$nextTick(() => {
+                this.$refs.buyingMoreAdd.initData(postData)
+            })
+        },
+        handleEdit(val) {
+            this.dialogVisible = true
+            this.dialogTitle = '编辑'
+            val.isView = false
             // 新vue时调用的方法
             this.$nextTick(() => {
                 this.$refs.buyingMoreAdd.initData(val)

src/views/signingManagement/contractManagement/index.vue

@@ -133,6 +133,7 @@ import BaseData from '@/views/base/baseData'
 import contractAdd from '@/views/signingManagement/contractManagement/contractAdd.vue'
 
 export default {
+
     name: 'ContractIndex',
     components: { contractAdd },
     mixins: [Base, BaseData],
@@ -140,6 +141,10 @@ export default {
         fromAddress: {
             type: String,
             default: ''
+        },
+        getChildrenData: {
+            type: Function,
+            default: null
         }
     },
     data() {
@@ -233,7 +238,7 @@ export default {
             this.$emit('getChildrenData', this.selectId)
         },
         handleConnectCancel() {
-            this.$emit('getChildrenData')
+            this.$emit('getChildrenData', null)
         },
         handleSelectionChange(val) {
             // 若存在一条数据 再次点击 该函数会执行三次 若没有数据选中，执行一次