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

src/views/storehouse/inStockManage/inStockPlan/detailsPage.vue

@@ -240,10 +240,10 @@
               @saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 478)"
             >
               <template slot-scope="{ scope, row }" slot="menuLeft">
-                <el-button type="primary" icon="el-icon-printer" size="small" @click="feeSubmit()">一键保存</el-button>
+                <el-button type="primary" size="small" @click="feeSubmit()">一键保存</el-button>
               </template>
               <template slot="indexHeader" slot-scope="{ row, index }">
-                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editButton" circle @click="addRow()"> </el-button>
+                <el-button type="primary" size="mini" icon="el-icon-plus" circle @click="addRow()"> </el-button>
               </template>
               <template slot="index" slot-scope="{ row, index }">
                 <span>{{ index + 1 }}</span>

src/views/storehouse/outStockManage/outStockPlan/detailsPage.vue

@@ -211,7 +211,7 @@
               @saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 475)"
             >
               <template slot-scope="{ scope, row }" slot="menuLeft">
-                <el-button type="primary" icon="el-icon-printer" size="small" @click="feeSubmit('D')">一键保存</el-button>
+                <el-button type="primary" size="small" @click="feeSubmit('D')">一键保存</el-button>
               </template>
               <template slot="indexHeader" slot-scope="{ row, index }">
                 <el-button type="primary" size="mini" icon="el-icon-plus" circle @click="addRowD()"> </el-button>
@@ -293,7 +293,7 @@
               @saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 475)"
             >
               <template slot-scope="{ scope, row }" slot="menuLeft">
-                <el-button type="primary" icon="el-icon-printer" size="small" @click="feeSubmit('C')">一键保存</el-button>
+                <el-button type="primary" size="small" @click="feeSubmit('C')">一键保存</el-button>
               </template>
               <template slot="indexHeader" slot-scope="{ row, index }">
                 <el-button type="primary" size="mini" icon="el-icon-plus" circle @click="addRowC()"> </el-button>