no message

page_task/property/components/add-register.vue

@@ -22,9 +22,9 @@
 </template>
 
 <script>
-import txUploadFile from "@/common/js/txOssSts";
-import tools from "@/common/js/tools";
 import {getBaiDuImgRecognition} from "@/api/common";
+import txUploadFile from "@/service/txOssSts";
+import tools from "@/service/tools";
 
 export default {
   name: "add-register",
@@ -119,7 +119,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-@import "../../../static/css/common/wh-common";
+@import "@/static/css/wh-common";
 
 .license-box {
   .account-name {

page_task/property/components/car.vue

@@ -1,24 +1,24 @@
 <template>
   <view class="">
     <view class="data-from" v-for="item in carList">
-      <en-input label="车辆品牌" type="text" placeholder="请输入车辆品牌" v-model="item.brand_id"
+      <en-input label="车辆品牌" type="text" placeholder="请输入车辆品牌" v-model="item.data.brand_id"
                 v-if="verifyKey('brand_id')"></en-input>
-      <en-radio label="车牌类型" :radio-data="carTypeData" v-model="item.car_type"
+      <en-radio label="车牌类型" :radio-data="carTypeData" v-model="item.data.car_type"
                 v-if="verifyKey('car_type')"></en-radio>
-      <en-input label="车牌号" type="text" placeholder="请输入车牌号" v-model="carItem.car_num"
+      <en-input label="车牌号" type="text" placeholder="请输入车牌号" v-model="caritem.data.car_num"
                 v-if="verifyKey('car_num')"></en-input>
-      <en-input label="车架号" type="text" placeholder="请输入车架号" v-model="item.car_vin"
+      <en-input label="车架号" type="text" placeholder="请输入车架号" v-model="item.data.car_vin"
                 v-if="verifyKey('car_vin')"></en-input>
-      <en-input label="车辆颜色" type="text" placeholder="请输入车俩颜色" v-model="item.colour"
+      <en-input label="车辆颜色" type="text" placeholder="请输入车俩颜色" v-model="item.data.colour"
                 v-if="verifyKey('colour')"></en-input>
-      <en-input label="裸车价格" type="number" placeholder="请输入金额" v-model="item.car_price"
+      <en-input label="裸车价格" type="number" placeholder="请输入金额" v-model="item.data.car_price"
                 v-if="verifyKey('car_price')" rightText="元"></en-input>
-      <en-date label="登记时间" placeholder="选择车辆登记时间" v-model="item.register_date"
+      <en-date label="登记时间" placeholder="选择车辆登记时间" v-model="item.data.register_date"
                v-if="verifyKey('register_date')"></en-date>
-      <add-register img-type="2" v-model="item.register_img" @setCarData="setCarData" v-if="verifyKey('register_img')"></add-register>
-      <add-register v-model="item.driving_img" @setCarData="setCarData" v-if="verifyKey('driving_img')"></add-register>
-      <en-upload label="上传车辆相关图片" :imageWidth="180" v-model="item.car_img" v-if="verifyKey('car_img')"></en-upload>
-      <en-input label="备注" type="text" placeholder="请输入备注信息" v-model="item.remark"
+      <add-register img-type="2" v-model="item.data.register_img" @setCarData="setCarData" v-if="verifyKey('register_img')"></add-register>
+      <add-register v-model="item.data.driving_img" @setCarData="setCarData" v-if="verifyKey('driving_img')"></add-register>
+      <en-upload label="上传车辆相关图片" :imageWidth="180" v-model="item.data.car_img" v-if="verifyKey('car_img')"></en-upload>
+      <en-input label="备注" type="text" placeholder="请输入备注信息" v-model="item.data.remark"
                 v-if="verifyKey('remark')" :noBox="true"></en-input>
     </view>
     <en-blank message="暂无车辆信息,快来添加吧！" v-if="carList.length<=0"></en-blank>
@@ -37,6 +37,8 @@ import md5 from "js-md5";
 import EnDate from "@/components/en-from/en-date/en-date.vue";
 import EnBlank from "@/components/en-utils/en-blank/en-blank.vue";
 import AddRegister from "@/page_task/property/components/add-register.vue";
+import tools from "@/service/tools";
+import {getSn} from "@/api/common";
 
 export default {
   name:'property-car',
@@ -106,27 +108,35 @@ export default {
     setCarData(carData){
       console.log('carData')
       console.log(this.carData)
-      if(carData.car_num){
-        this.carItem.car_num=carData.car_num
-      }
-      if(carData.car_vin){
-        this.carItem.car_vin=carData.car_vin
-      }
-      if(carData.colour){
-        this.carItem.colour=carData.colour
-      }
-      if(carData.register_date){
-        this.carItem.register_date=carData.register_date
-      }
-      if(carData.car_type){
-        this.carItem.car_type=carData.car_type
-      }
-      if(carData.brand_id){
-        this.carItem.brand_id=carData.brand_id
-      }
+      // if(carData.car_num){
+      //   this.caritem.data.car_num=carData.car_num
+      // }
+      // if(carData.car_vin){
+      //   this.carItem.car_vin=carData.car_vin
+      // }
+      // if(carData.colour){
+      //   this.carItem.colour=carData.colour
+      // }
+      // if(carData.register_date){
+      //   this.carItem.register_date=carData.register_date
+      // }
+      // if(carData.car_type){
+      //   this.carItem.car_type=carData.car_type
+      // }
+      // if(carData.brand_id){
+      //   this.carItem.brand_id=carData.brand_id
+      // }
     },
     addItem(){
-      this.carList.push(this.carItem)
+      tools.showLoading()
+      getSn().then((res)=>{
+        if(res.code===1){
+          this.carList.push({'property_type':2,'property_sn':res.data,'data':this.carItem})
+        }else {
+          tools.error('编号生成失败')
+        }
+        tools.hideLoading()
+      })
     },
     setSendMd5() {
       let str = JSON.stringify(this.value)

page_task/property/components/company.vue

@@ -1,24 +1,30 @@
 <template>
   <view class="">
-    <view class="data-from" v-for="item in insuranceList">
-      <en-input label="保险公司" type="text" placeholder="请输入保险公司名称" v-model="item.insurance_name"
-                v-if="verifyKey('insurance_name')"></en-input>
-      <en-select label="保险类型" placeholder="请选择保险类型" v-model="item.insurance_type"
-                 v-if="verifyKey('insurance_type')" :local-data="insuranceTypeData"></en-select>
-      <en-input label="年交费额" type="number"  v-model="item.year_money"
-                v-if="verifyKey('year_money')" placeholder="请输入年交费额" rightText="元"></en-input>
-      <en-radio label="满足缴费情况" v-model="item.is_fees"
-                v-if="verifyKey('is_fees')" :radio-data="payData"></en-radio>
-      <en-date label="保单有效期" v-model="item.validity_date"
-               v-if="verifyKey('validity_date')" item="选择保单有效期"></en-date>
-      <en-upload label="上传保单相关图片" v-model="insuranceItem.insurance_img"
-                 v-if="verifyKey('insurance_img')" :imageWidth="180"></en-upload>
-      <en-input label="备注" v-model="item.remark"
-                v-if="verifyKey('remark')" type="text" placeholder="请输入备注信息" :noBox="true"></en-input>
+    <view class="data-from" v-for="item in firmList">
+      <en-input label="企业名称" type="text"  v-model="item.firm_name"
+                v-if="verifyKey('firm_name')" placeholder="请输入公司名称"></en-input>
+      <en-date label="成立时间" v-model="item.establish_date"
+               v-if="verifyKey('establish_date')" placeholder="选择成立时间"></en-date>
+      <en-input label="年交费额" v-model="item.year_money"
+                v-if="verifyKey('year_money')" type="number" placeholder="请输入年交费额" rightText="元"></en-input>
+      <en-city label="实际经营地" v-model="item.establish_city"
+               v-if="verifyKey('establish_city')"  placeholder="请选择省、市、区"></en-city>
+      <en-input label="经营详细地址" v-model="item.establish_address"
+                v-if="verifyKey('establish_address')" type="text" placeholder="请输入经营详细地址"></en-input>
+      <en-upload label="上传企业相关图片" v-model="item.firm_img"
+                 v-if="verifyKey('firm_img')" :imageWidth="180"></en-upload>
+      <en-input label="年交税额" v-model="item.year_tax"
+                v-if="verifyKey('year_tax')" type="number" placeholder="请输入年交税额" rightText="元"></en-input>
+      <en-input label="年开票额" v-model="item.year_invoice"
+                v-if="verifyKey('year_invoice')" type="number" placeholder="请输入年开票额" rightText="元"></en-input>
+      <en-select label="税务等级" v-model="item.tax_grade"
+                 v-if="verifyKey('tax_grade')" placeholder="请选择税务等级" :local-data="taxGradeData" ></en-select>
+      <en-radio label="税务有无断缴" v-model="item.is_end_tax"
+                v-if="verifyKey('is_end_tax')" :radio-data="endData" :noBox="true"></en-radio>
     </view>
-    <en-blank message="暂无保单信息,快来添加吧！" v-if="insuranceList.length<=0"></en-blank>
+    <en-blank message="暂无企业信息,快来添加吧！" v-if="firmList.length<=0"></en-blank>
     <button class="size-26 r-10 button-color house-button m-t30" hover-class="is-hover"
-            @click="addItem">+添加保单</button>
+            @click="addItem">+添加企业</button>
   </view>
 </template>
 
@@ -31,9 +37,11 @@ import {getTaskOptions} from "@/api/task";
 import md5 from "js-md5";
 import EnDate from "@/components/en-from/en-date/en-date.vue";
 import EnBlank from "@/components/en-utils/en-blank/en-blank.vue";
+import tools from "@/service/tools";
+import {getSn} from "@/api/common";
 
 export default {
-  name:'property-company',
+  name:'property-guarantee',
   components: {
     EnBlank,
     EnDate,
@@ -47,9 +55,7 @@ export default {
       default: []
     },
     'value': {
-      default: {
-
-      }
+      default: {}
     },
     'itemKey': {
       default: 0
@@ -57,24 +63,27 @@ export default {
   },
   data() {
     return {
-      payData:[{'id':1,'name':'满足'},{'id':0,'name':'未足'}],
-      insuranceTypeData:[],
-      insuranceItem: {
-        'insurance_name':'',
-        'insurance_type':'',
+      endData:[{'id':1,'name':'有'},{'id':0,'name':'无'}],
+      taxGradeData:[],
+      firmItem:{
+        'firm_name':'',
+        'establish_date':'',
         'year_money':'',
-        'is_fees':'1',
-        'validity_date':'',
-        'insurance_img':[],
-        'remark':'',
+        'establish_city':'',
+        'establish_address':'',
+        'firm_img':[],
+        'year_tax':'',
+        'tax_grade':'',
+        'is_end_tax':'0',
+        'year_invoice':'',
       },
-      insuranceList:[]
+      firmList:[]
     }
   },
   watch: {
-    'insuranceList': {
+    'firmList': {
       handler() {
-        this.$emit("input", this.insuranceList);
+        this.$emit("input", this.firmList);
       },
       deep: true
     },
@@ -92,19 +101,27 @@ export default {
     this.setValue()
   },
   methods: {
-    addItem(){
-      this.insuranceList.push(this.insuranceItem)
+    addItem() {
+      tools.showLoading()
+      getSn().then((res)=>{
+        if(res.code===1){
+          this.firmList.push({'property_type':4,'property_sn':res.data,'data':this.firmItem})
+        }else {
+          tools.error('编号生成失败')
+        }
+        tools.hideLoading()
+      })
     },
     setSendMd5() {
       let str = JSON.stringify(this.value)
-      this.sendMd5=md5(JSON.stringify(this.insuranceList))
+      this.sendMd5 = md5(JSON.stringify(this.firmList))
       return md5(str)
     },
-    setValue(){
+    setValue() {
       if (this.value) {
         let sendMd5 = this.setSendMd5()
         if (sendMd5 !== this.sendMd5) {
-          this.insuranceList=this.value
+          this.firmList = this.value
         }
       }
     },
@@ -112,20 +129,20 @@ export default {
       return this.showKeys.indexOf(field) >= 0
     },
     async getTaskOptions() {
-      const res = await getTaskOptions({'type': 4})
+      const res = await getTaskOptions({'type': 5})
       if (res.code === 1) {
-        res.data.insuranceType.forEach((val) => {
-          this.insuranceTypeData.push({'text': val.name, 'value': val.value})
+        res.data.taxGrade.forEach((val) => {
+          this.taxGradeData.push({'text': val.name, 'value': val.value})
         })
       }
     },
-    delItem(){
+    delItem() {
       uni.showModal({
         title: '警告',
-        content: '是否删除当前保单信息！',
+        content: '是否删除当前企业信息！',
         success: (res) => {
           if (res.confirm) {
-            this.$emit('delItem',this.itemKey)
+            this.$emit('delItem', this.itemKey)
           }
         }
       });

page_task/property/components/guarantee.vue

@@ -1,21 +1,24 @@
 <template>
   <view class="">
-    <view class="data-from" v-for="item in houseList">
-      <en-input label="产权人" type="text" placeholder="请输入产权人" v-model="item.property_owner" v-if="verifyKey('property_owner')"></en-input>
-      <en-input label="房产证号" v-model="item.deed_num" v-if="verifyKey('deed_num')" type="text" placeholder="请输入房产证号"></en-input>
-      <en-city label="房产城市" v-model="item.house_city" v-if="verifyKey('house_city')"  placeholder="请选择省、市、区"></en-city>
-      <en-input label="房产地址" v-model="item.house_address" v-if="verifyKey('house_address')" type="text" placeholder="请输入房产详细地址"></en-input>
-      <en-select label="房屋用途"  v-model="item.house_use" v-if="verifyKey('house_use')" placeholder="请选择房屋用途" :local-data="houseTypeData" ></en-select>
-      <en-date label="建成年份" v-model="item.build_date" v-if="verifyKey('build_date')" placeholder="选择房屋建成年份"></en-date>
-      <en-radio label="材料费" v-model="item.is_pay" v-if="verifyKey('is_pay')" :radio-data="payData"></en-radio>
-      <en-input label="建筑面积" v-model="item.covered_area" v-if="verifyKey('covered_area')" type="digit" placeholder="请输入建筑面积" rightText="㎡"></en-input>
-      <en-upload label="上传房产证件" v-model="item.certificate_img" v-if="verifyKey('certificate_img')" :imageWidth="180"></en-upload>
-      <en-upload label="上传房产关联图片" v-model="item.property" v-if="verifyKey('property')" :imageWidth="180"></en-upload>
-      <en-input label="备注" v-model="item.remark" v-if="verifyKey('remark')" type="text" placeholder="请输入备注信息" :noBox="true"></en-input>
+    <view class="data-from" v-for="item in insuranceList">
+      <en-input label="保险公司" type="text" placeholder="请输入保险公司名称" v-model="item.insurance_name"
+                v-if="verifyKey('insurance_name')"></en-input>
+      <en-select label="保险类型" placeholder="请选择保险类型" v-model="item.insurance_type"
+                 v-if="verifyKey('insurance_type')" :local-data="insuranceTypeData"></en-select>
+      <en-input label="年交费额" type="number"  v-model="item.year_money"
+                v-if="verifyKey('year_money')" placeholder="请输入年交费额" rightText="元"></en-input>
+      <en-radio label="满足缴费情况" v-model="item.is_fees"
+                v-if="verifyKey('is_fees')" :radio-data="payData"></en-radio>
+      <en-date label="保单有效期" v-model="item.validity_date"
+               v-if="verifyKey('validity_date')" item="选择保单有效期"></en-date>
+      <en-upload label="上传保单相关图片" v-model="insuranceItem.insurance_img"
+                 v-if="verifyKey('insurance_img')" :imageWidth="180"></en-upload>
+      <en-input label="备注" v-model="item.remark"
+                v-if="verifyKey('remark')" type="text" placeholder="请输入备注信息" :noBox="true"></en-input>
     </view>
-    <en-blank message="暂无房产信息,快来添加吧！" v-if="houseList.length<=0"></en-blank>
+    <en-blank message="暂无保单信息,快来添加吧！" v-if="insuranceList.length<=0"></en-blank>
     <button class="size-26 r-10 button-color house-button m-t30" hover-class="is-hover"
-            @click="addHouse">+添加房产</button>
+            @click="addItem">+添加保单</button>
   </view>
 </template>
 
@@ -28,6 +31,8 @@ import {getTaskOptions} from "@/api/task";
 import md5 from "js-md5";
 import EnDate from "@/components/en-from/en-date/en-date.vue";
 import EnBlank from "@/components/en-utils/en-blank/en-blank.vue";
+import tools from "@/service/tools";
+import {getSn} from "@/api/common";
 
 export default {
   name:'property-guarantee',
@@ -44,9 +49,7 @@ export default {
       default: []
     },
     'value': {
-      default: {
-
-      }
+      default: {}
     },
     'itemKey': {
       default: 0
@@ -54,28 +57,24 @@ export default {
   },
   data() {
     return {
-      payData:[{'id':1,'name':'已支付'},{'id':2,'name':'未支付'}],
-      houseTypeData:[],
-      houseItem:{
-        'property_owner':'',
-        'deed_num':'',
-        'house_city':'',
-        'house_address':'',
-        'house_use':'',
-        'build_date':'',
-        'is_pay':'',
-        'covered_area':'',
-        'certificate_img':[],
-        'property':[],
-        'remark':'',
+      payData: [{'id': 1, 'name': '满足'}, {'id': 0, 'name': '未足'}],
+      insuranceTypeData: [],
+      insuranceItem: {
+        'insurance_name': '',
+        'insurance_type': '',
+        'year_money': '',
+        'is_fees': '1',
+        'validity_date': '',
+        'insurance_img': [],
+        'remark': '',
       },
-      houseList:[]
+      insuranceList: []
     }
   },
   watch: {
-    'houseList': {
+    'insuranceList': {
       handler() {
-        this.$emit("input", this.houseList);
+        this.$emit("input", this.insuranceList);
       },
       deep: true
     },
@@ -93,19 +92,27 @@ export default {
     this.setValue()
   },
   methods: {
-    addHouse(){
-      this.houseList.push(this.houseItem)
+    addItem() {
+      tools.showLoading()
+      getSn().then((res)=>{
+        if(res.code===1){
+          this.insuranceList.push({'property_type':3,'property_sn':res.data,'data':this.insuranceItem})
+        }else {
+          tools.error('编号生成失败')
+        }
+        tools.hideLoading()
+      })
     },
     setSendMd5() {
       let str = JSON.stringify(this.value)
-      this.sendMd5=md5(JSON.stringify(this.houseList))
+      this.sendMd5 = md5(JSON.stringify(this.insuranceList))
       return md5(str)
     },
-    setValue(){
+    setValue() {
       if (this.value) {
         let sendMd5 = this.setSendMd5()
         if (sendMd5 !== this.sendMd5) {
-          this.houseList=this.value
+          this.insuranceList = this.value
         }
       }
     },
@@ -113,20 +120,20 @@ export default {
       return this.showKeys.indexOf(field) >= 0
     },
     async getTaskOptions() {
-      const res = await getTaskOptions({'type':3})
+      const res = await getTaskOptions({'type': 4})
       if (res.code === 1) {
-        res.data.houseTypeArr.forEach((val)=>{
-          this.houseTypeData.push({'text':val.name,'value':val.value})
+        res.data.insuranceType.forEach((val) => {
+          this.insuranceTypeData.push({'text': val.name, 'value': val.value})
         })
       }
     },
-    delItem(){
+    delItem() {
       uni.showModal({
         title: '警告',
-        content: '是否删除当前资产信息！',
+        content: '是否删除当前保单信息！',
         success: (res) => {
           if (res.confirm) {
-            this.$emit('delItem',this.itemKey)
+            this.$emit('delItem', this.itemKey)
           }
         }
       });

page_task/property/components/house.vue

@@ -1,17 +1,17 @@
 <template>
 	<view class="">
     <view class="data-from" v-for="item in houseList">
-      <en-input label="产权人" type="text" placeholder="请输入产权人" v-model="item.property_owner" v-if="verifyKey('property_owner')"></en-input>
-      <en-input label="房产证号" v-model="item.deed_num" v-if="verifyKey('deed_num')" type="text" placeholder="请输入房产证号"></en-input>
-      <en-city label="房产城市" v-model="item.house_city" v-if="verifyKey('house_city')"  placeholder="请选择省、市、区"></en-city>
-      <en-input label="房产地址" v-model="item.house_address" v-if="verifyKey('house_address')" type="text" placeholder="请输入房产详细地址"></en-input>
-      <en-select label="房屋用途"  v-model="item.house_use" v-if="verifyKey('house_use')" placeholder="请选择房屋用途" :local-data="houseTypeData" ></en-select>
-      <en-date label="建成年份" v-model="item.build_date" v-if="verifyKey('build_date')" placeholder="选择房屋建成年份"></en-date>
-      <en-radio label="材料费" v-model="item.is_pay" v-if="verifyKey('is_pay')" :radio-data="payData"></en-radio>
-      <en-input label="建筑面积" v-model="item.covered_area" v-if="verifyKey('covered_area')" type="digit" placeholder="请输入建筑面积" rightText="㎡"></en-input>
-      <en-upload label="上传房产证件" v-model="item.certificate_img" v-if="verifyKey('certificate_img')" :imageWidth="180"></en-upload>
-      <en-upload label="上传房产关联图片" v-model="item.property" v-if="verifyKey('property')" :imageWidth="180"></en-upload>
-      <en-input label="备注" v-model="item.remark" v-if="verifyKey('remark')" type="text" placeholder="请输入备注信息" :noBox="true"></en-input>
+      <en-input label="产权人" type="text" placeholder="请输入产权人" v-model="item.data.property_owner" v-if="verifyKey('property_owner')"></en-input>
+      <en-input label="房产证号" v-model="item.data.deed_num" v-if="verifyKey('deed_num')" type="text" placeholder="请输入房产证号"></en-input>
+      <en-city label="房产城市" v-model="item.data.house_city" v-if="verifyKey('house_city')"  placeholder="请选择省、市、区"></en-city>
+      <en-input label="房产地址" v-model="item.data.house_address" v-if="verifyKey('house_address')" type="text" placeholder="请输入房产详细地址"></en-input>
+      <en-select label="房屋用途"  v-model="item.data.house_use" v-if="verifyKey('house_use')" placeholder="请选择房屋用途" :local-data="houseTypeData" ></en-select>
+      <en-date label="建成年份" v-model="item.data.build_date" v-if="verifyKey('build_date')" placeholder="选择房屋建成年份"></en-date>
+      <en-radio label="材料费" v-model="item.data.is_pay" v-if="verifyKey('is_pay')" :radio-data="payData"></en-radio>
+      <en-input label="建筑面积" v-model="item.data.covered_area" v-if="verifyKey('covered_area')" type="digit" placeholder="请输入建筑面积" rightText="㎡"></en-input>
+      <en-upload label="上传房产证件" v-model="item.data.certificate_img" v-if="verifyKey('certificate_img')" :imageWidth="180"></en-upload>
+      <en-upload label="上传房产关联图片" v-model="item.data.property" v-if="verifyKey('property')" :imageWidth="180"></en-upload>
+      <en-input label="备注" v-model="item.data.remark" v-if="verifyKey('remark')" type="text" placeholder="请输入备注信息" :noBox="true"></en-input>
     </view>
     <en-blank message="暂无房产信息,快来添加吧！" v-if="houseList.length<=0"></en-blank>
 		<button class="size-26 r-10 button-color house-button m-t30" hover-class="is-hover"
@@ -28,6 +28,8 @@
   import md5 from "js-md5";
   import EnDate from "@/components/en-from/en-date/en-date.vue";
   import EnBlank from "@/components/en-utils/en-blank/en-blank.vue";
+  import tools from "@/service/tools";
+  import {getSn} from "@/api/common";
 
 	export default {
     name:'property-house',
@@ -94,7 +96,16 @@
     },
 		methods: {
       addHouse(){
-        this.houseList.push(this.houseItem)
+        tools.showLoading()
+        getSn().then((res)=>{
+          if(res.code===1){
+            this.houseList.push({'property_type':1,'property_sn':res.data,'data':this.houseItem})
+          }else {
+            tools.error('编号生成失败')
+          }
+         tools.hideLoading()
+        })
+
       },
       setSendMd5() {
         let str = JSON.stringify(this.value)

page_task/property/property.vue

@@ -55,7 +55,7 @@
 							</view>
 						</template>
 						<view class="content">
-							<property-guarantee></property-guarantee>
+							<property-guarantee v-model="insuranceList" :show-keys="propertyKey"></property-guarantee>
 						</view>
 					</uni-collapse-item>
 					<uni-collapse-item titleBorder="none" :border="false"
@@ -69,13 +69,13 @@
 							</view>
 						</template>
 						<view class="content">
-							<property-company></property-company>
+							<property-company v-model="firmList" :show-keys="propertyKey"></property-company>
 						</view>
 					</uni-collapse-item>
 				</uni-collapse>
 			</view>
 		</view>
-		<EnButton is_both :leftText="'保存'" :rightText="'提交'" @onLeftSubmit="onLeftSubmit" @onSubmit="onSubmit">
+		<EnButton  :text="'保存'"  @onSubmit="onSubmit">
 		</EnButton>
 	</view>
 </template>
@@ -135,9 +135,6 @@
           })
         }
       },
-			onLeftSubmit() {
-				console.log('预览');
-			},
 			onSubmit() {
 				console.log('提交资料');
 			},