Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/views/maintenance/rebate/index.vue

@@ -12,7 +12,7 @@
               </el-button>
             </template>
             <template slot="menu" slot-scope="{row,index}">
-              <el-button size="small" icon="el-icon-edit" type="text" @click.stop="rowCell(row)">
+              <el-button size="small" icon="el-icon-edit" :disabled="row.id"  type="text" @click.stop="rowCell(row)">
                 {{ row.$cellEdit ?
                     "保存" :
                     "修改"

src/views/workManagement/main-items/detailsPage.vue

@@ -730,7 +730,7 @@ export default {
         this.goodsDescList = res.data.data
         let form = this.detailData.data
         this.form.corpId = form.corpId
-        this.form.corpName = form.corpName
+        // this.form.corpName = form.corpName
         form.itemList.forEach(e => {
           this.goodsDescList.forEach(item => {
             if (e.spId == item.id) {
@@ -1122,6 +1122,7 @@ export default {
           const params = {
             ...this.form,
             ...this.formTwo,
+            corpName:null,
             itemList: this.dataList,
             filesList: this.upLoadData
           }