Browse Source

Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

csx 4 years ago
parent
commit
51692831e6

+ 1 - 0
src/xt_pages/stock/stockOutOrder.vue View File

144
               <el-button
144
               <el-button
145
                 size="mini"
145
                 size="mini"
146
                 type="danger"
146
                 type="danger"
147
+                v-if="scope.row.is_sys != 1"
147
                 icon="el-icon-delete"
148
                 icon="el-icon-delete"
148
                 @click="handleDelete(scope.$index, scope.row)"
149
                 @click="handleDelete(scope.$index, scope.row)"
149
               >
150
               >

+ 3 - 3
src/xt_pages/stock/stockOutOrderDetail.vue View File

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