Merge remote-tracking branch 'origin/dev' into dev

src/views/financialManagementF/agreementprice/index.vue

@@ -68,7 +68,7 @@
         selectionList: [],
         option:{},
         optionBack: {
-
+            addBtn:false,
           height:'auto',
           calcHeight: 30,
           tip: false,

src/views/iosBasicData/btrademodes/index.vue

@@ -377,9 +377,6 @@ export default {
     rowEditfun(row, index) {
       getBtrademodesDetail(row.id).then(res => {
         this.form = res.data.data;
-        this.form.extendedDataArr.map(item => {
-          item.edit = false
-        })
         this.$refs.crud.rowEdit(row, index)
       });
     },