Merge remote-tracking branch 'origin/master'

src/views/modules/noOrderIssue/noOrderNotification.vue

@@ -174,7 +174,8 @@
           <el-table-column fixed="right" header-align="center" align="center" width="100" label="操作">
             <template slot-scope="scope">
               <a type="text" size="small" @click="enterSOSDetail(scope.row)">物料</a>
-              <a type="text" size="small" @click="deleteNotifySOS(scope.row)">删除</a>
+              <!-- 不需要删除，这里如果删掉了，没地方添加，只允许关闭申请单重新下 -->
+              <!-- <a type="text" size="small" @click="deleteNotifySOS(scope.row)">删除</a> -->
             </template>
           </el-table-column>
         </el-table>
@@ -1686,7 +1687,7 @@ export default {
     this.$nextTick(() => {
       this.height = window.innerHeight / 2 - 100
       /*第二个表格高度的动态调整*/
-      this.secondHeight = window.innerHeight - this.height - 170
+      this.secondHeight = window.innerHeight - this.height - 140
     })
   },
 

src/views/modules/orderIssure/inboundNotification.vue

@@ -176,7 +176,8 @@
           <el-table-column fixed="right" header-align="center" align="center" width="100" label="操作">
             <template slot-scope="scope">
               <a type="text" size="small" @click="enterSOSDetail(scope.row)">修改</a>
-              <a type="text" size="small" @click="deleteNotifySOS(scope.row)">删除</a>
+              <!-- 不需要删除，这里如果删掉了，没地方添加，只允许关闭申请单重新下 -->
+              <!-- <a type="text" size="small" @click="deleteNotifySOS(scope.row)">删除</a> -->
             </template>
           </el-table-column>
         </el-table>
@@ -1413,7 +1414,7 @@ export default {
     this.$nextTick(() => {
       this.height = window.innerHeight / 2 - 100
       /*第二个表格高度的动态调整*/
-      this.secondHeight = window.innerHeight - this.height - 170
+      this.secondHeight = window.innerHeight - this.height - 140
     })
   },
 

src/views/modules/orderIssure/searchIssureNotify.vue

@@ -170,7 +170,8 @@
             label="操作">
             <template slot-scope="scope">
               <a type="text" size="small" v-if="scope.row.pushWmsFlag !== 'Y' && currentRow && currentRow.pushWcsFlag === '未推送'" @click="enterSOSDetail(scope.row)" style="margin-right: 10px;">修改</a>
-              <a type="text" size="small" v-if="scope.row.pushWmsFlag !== 'Y' && currentRow && currentRow.pushWcsFlag === '未推送'" @click="deleteNotifySOSPlus(scope.row)">删除</a>
+              <!-- 不需要删除，这里如果删掉了，没地方添加，只允许关闭申请单重新下 -->
+              <!-- <a type="text" size="small" v-if="scope.row.pushWmsFlag !== 'Y' && currentRow && currentRow.pushWcsFlag === '未推送'" @click="deleteNotifySOSPlus(scope.row)">删除</a> -->
             </template>
           </el-table-column>
         </el-table>

src/views/modules/shipment/shipmentNotification.vue

@@ -186,7 +186,8 @@
           <el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
             <template slot-scope="scope">
               <a type="text" size="small" @click="enterSOSDetail(scope.row)">修改</a>
-              <a type="text" size="small" @click="deleteNotifySOS(scope.row)" style="margin-left: 10px;">删除</a>
+              <!-- 不需要删除，这里如果删掉了，没地方添加，只允许关闭申请单重新下 -->
+              <!-- <a type="text" size="small" @click="deleteNotifySOS(scope.row)" style="margin-left: 10px;">删除</a> -->
             </template>
           </el-table-column>
         </el-table>