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

src/views/purchase/DemandSummary/add.vue

@@ -82,7 +82,7 @@
         <el-table-column show-overflow-tooltip label="供应货位" align="center" prop="lastAllocationName" width="150"/>
         <el-table-column show-overflow-tooltip label="默认采购组织" align="center" prop="orgName" width="280px">
           <template slot-scope="scope">
-              <el-input clearable :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.orgName" @clear="clean(scope.row, '默认采购组织')" @focus="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')">
+              <el-input :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.orgName" @clear="clean(scope.row, '默认采购组织')" @focus="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')">
                 <el-button size="mini" :disabled="scope.row.status !== '1' || lineDisable" slot="append" icon="el-icon-more" @click="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')"></el-button>
               </el-input>
           </template>
@@ -143,7 +143,7 @@
 
     <div class="btn_group">
       <el-col :span="1.5">
-        <el-button size="mini" plain @click="back">返回</el-button>
+        <el-button size="mini" plain @click="back" v-if="lineDisable">返回</el-button>
       </el-col>
     </div>