Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/stock/stockOutOrder.vue

@@ -144,6 +144,7 @@
               <el-button
                 size="mini"
                 type="danger"
+                v-if="scope.row.is_sys != 1"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.$index, scope.row)"
               >

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -23,8 +23,8 @@
       </div>
 
       <div class="filter-container" style="margin-top: 10px">
-        <el-button size="small" icon="el-icon-edit" @click="editRecord">编辑</el-button>
-        <el-button size="small" icon="el-icon-delete" @click="deleteRecord">删除</el-button>
+        <el-button size="small" icon="el-icon-edit" @click="editRecord" v-if="warehousingOutInfo.info.is_sys != 1">编辑</el-button>
+        <el-button size="small" icon="el-icon-delete" @click="deleteRecord" v-if="warehousingOutInfo.info.is_sys != 1">删除</el-button>
       </div>
 
       <el-row :gutter="12" style="margin-top: 10px">
@@ -195,7 +195,7 @@
         }
         getWarehouseOutInfo(params).then(response => {
           if (response.data.state == 0) {
-           
+
             this.$message.error(response.data.msg)
             return false
           } else {