diff --git a/src/components/dvplanSelect/index.vue b/src/components/dvplanSelect/index.vue
index b8986ff..b5f3e37 100644
--- a/src/components/dvplanSelect/index.vue
+++ b/src/components/dvplanSelect/index.vue
@@ -77,24 +77,18 @@
               type="text"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
-              v-if="scope.row.status =='PREPARE'"
-              v-hasPermi="['mes:dv:checkplan:edit']"
             >修改</el-button>
             <el-button
               size="mini"
               type="text"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
-              v-if="scope.row.status =='PREPARE'"
-              v-hasPermi="['mes:dv:checkplan:remove']"
             >删除</el-button>
             <el-button
               size="mini"
               type="text"
               icon="el-icon-delete"
               @click="handleUpdate(scope.row)"
-              v-if="scope.row.status =='FINISHED'"
-              v-hasPermi="['mes:dv:checkplan:edit']"
             >停用</el-button>
           </template>
         </el-table-column>
diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue
index 6e16dd7..85af3d2 100644
--- a/src/views/dashboard/PanelGroup.vue
+++ b/src/views/dashboard/PanelGroup.vue
@@ -9,7 +9,7 @@
           <div class="card-panel-text">
             设备总数
           </div>
-          <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="37" :duration="2600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -22,7 +22,7 @@
           <div class="card-panel-text">
             运行中
           </div>
-          <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="23" :duration="3000" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -35,7 +35,7 @@
           <div class="card-panel-text">
             待机
           </div>
-          <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="14" :duration="3200" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -48,7 +48,7 @@
           <div class="card-panel-text">
             故障
           </div>
-          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="0" :duration="3600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
diff --git a/src/views/mes/cal/plan/index.vue b/src/views/mes/cal/plan/index.vue
index c74bf34..84c3245 100644
--- a/src/views/mes/cal/plan/index.vue
+++ b/src/views/mes/cal/plan/index.vue
@@ -132,17 +132,13 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:cal:calplan:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:cal:calplan:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/cg/order/index.vue b/src/views/mes/cg/order/index.vue
index 1d213a3..b2206ce 100644
--- a/src/views/mes/cg/order/index.vue
+++ b/src/views/mes/cg/order/index.vue
@@ -190,7 +190,6 @@
       <el-table-column label="税金" align="center" prop="tax" />
       <el-table-column label="总金额" align="center" prop="totalAmount" />
       <el-table-column label="付款方式" align="center" prop="paymentTerms" />
-      <el-table-column label="付款状态" align="center" prop="paymentStatus" />
       <el-table-column label="交货地址" align="center" prop="deliveryAddress" />
       <el-table-column
         label="预期交货日期"
@@ -218,7 +217,6 @@
       </el-table-column>
       <el-table-column label="运输方式" align="center" prop="shippingMethod" />
       <el-table-column label="运输费用" align="center" prop="shippingCost" />
-      <el-table-column label="订单状态" align="center" prop="status" />
       <el-table-column
         label="发起日期"
         align="center"
@@ -253,6 +251,7 @@
       <el-table-column
         label="操作"
         align="center"
+        width="100px"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
@@ -335,11 +334,6 @@
         <el-form-item label="付款方式" prop="paymentTerms">
           <el-input v-model="form.paymentTerms" placeholder="请输入付款方式" />
         </el-form-item>
-        <el-form-item label="付款状态">
-          <el-radio-group v-model="form.paymentStatus">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <el-form-item label="交货地址" prop="deliveryAddress">
           <el-input
             v-model="form.deliveryAddress"
@@ -375,11 +369,6 @@
         <el-form-item label="运输费用" prop="shippingCost">
           <el-input v-model="form.shippingCost" placeholder="请输入运输费用" />
         </el-form-item>
-        <el-form-item label="订单状态">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <el-form-item label="发起日期" prop="initiateDate">
           <el-date-picker
             clearable
diff --git a/src/views/mes/cg/plan/index.vue b/src/views/mes/cg/plan/index.vue
index f24ffc9..018dc29 100644
--- a/src/views/mes/cg/plan/index.vue
+++ b/src/views/mes/cg/plan/index.vue
@@ -228,11 +228,11 @@
           <span>{{ parseTime(scope.row.approvalDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" />
       <el-table-column label="备注" align="center" prop="remarks" />
       <el-table-column
         label="操作"
         align="center"
+        width="100px"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
@@ -345,11 +345,6 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
diff --git a/src/views/mes/cg/quotation/index.vue b/src/views/mes/cg/quotation/index.vue
index 9ddad05..ccf77f0 100644
--- a/src/views/mes/cg/quotation/index.vue
+++ b/src/views/mes/cg/quotation/index.vue
@@ -76,15 +76,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择状态"
-          clearable
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -189,11 +180,11 @@
         </template>
       </el-table-column>
       <el-table-column label="付款方式" align="center" prop="paymentTerms" />
-      <el-table-column label="状态" align="center" prop="status" />
       <el-table-column label="备注" align="center" prop="remarks" />
       <el-table-column
         label="操作"
         align="center"
+        width="100px"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
@@ -262,9 +253,6 @@
         <el-form-item label="规格" prop="specs">
           <el-input v-model="form.specs" placeholder="请输入规格" />
         </el-form-item>
-        <el-form-item label="供应商ID" prop="vendorId">
-          <el-input v-model="form.vendorId" placeholder="请输入供应商ID" />
-        </el-form-item>
         <el-form-item label="供应商名称" prop="vendorName">
           <el-input v-model="form.vendorName" placeholder="请输入供应商名称" />
         </el-form-item>
@@ -287,11 +275,6 @@
         <el-form-item label="付款方式" prop="paymentTerms">
           <el-input v-model="form.paymentTerms" placeholder="请输入付款方式" />
         </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
diff --git a/src/views/mes/dv/checkplan/index.vue b/src/views/mes/dv/checkplan/index.vue
index 01a20be..a6b97b9 100644
--- a/src/views/mes/dv/checkplan/index.vue
+++ b/src/views/mes/dv/checkplan/index.vue
@@ -134,24 +134,18 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.status =='PREPARE'"
-            v-hasPermi="['mes:dv:checkplan:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="scope.row.status =='PREPARE'"
-            v-hasPermi="['mes:dv:checkplan:remove']"
           >删除</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.status =='FINISHED'"
-            v-hasPermi="['mes:dv:checkplan:edit']"
           >停用</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/dv/checkrecord/index.vue b/src/views/mes/dv/checkrecord/index.vue
index f06245a..5eb41e9 100644
--- a/src/views/mes/dv/checkrecord/index.vue
+++ b/src/views/mes/dv/checkrecord/index.vue
@@ -116,17 +116,13 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:dv:checkrecord:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:dv:checkrecord:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/dv/machinerytype/index.vue b/src/views/mes/dv/machinerytype/index.vue
index 684937b..4a6942a 100644
--- a/src/views/mes/dv/machinerytype/index.vue
+++ b/src/views/mes/dv/machinerytype/index.vue
@@ -54,15 +54,12 @@
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
-            v-hasPermi="['mes:dv:machinerytype:add']"
           >新增</el-button>
           <el-button
-            v-if="scope.row.parentTypeId != 0"
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:dv:machinerytype:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/dv/maintenrecord/index.vue b/src/views/mes/dv/maintenrecord/index.vue
index 86d3fb4..b9911db 100644
--- a/src/views/mes/dv/maintenrecord/index.vue
+++ b/src/views/mes/dv/maintenrecord/index.vue
@@ -119,16 +119,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.status === 'PREPARE'"
-            v-hasPermi="['dv:maintenrecord:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="scope.row.status === 'PREPARE'"
-            v-hasPermi="['dv:maintenrecord:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/gys/qualification/index.vue b/src/views/mes/gys/qualification/index.vue
index 9643cd0..17d5fbc 100644
--- a/src/views/mes/gys/qualification/index.vue
+++ b/src/views/mes/gys/qualification/index.vue
@@ -22,7 +22,10 @@
           placeholder="请选择资质类型"
           clearable
         >
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="一级资质" value="一级资质" />
+          <el-option label="二级资质" value="二级资质" />
+          <el-option label="三级资质" value="三级资质" />
+          <el-option label="四级资质" value="四级资质" />
         </el-select>
       </el-form-item>
       <el-form-item label="有效期" prop="validDate">
@@ -163,7 +166,10 @@
         </el-form-item>
         <el-form-item label="资质类型" prop="qualType">
           <el-select v-model="form.qualType" placeholder="请选择资质类型">
-            <el-option label="请选择字典生成" value="" />
+            <el-option label="一级资质" value="一级资质" />
+            <el-option label="二级资质" value="二级资质" />
+            <el-option label="三级资质" value="三级资质" />
+            <el-option label="四级资质" value="四级资质" />
           </el-select>
         </el-form-item>
         <el-form-item label="有效期" prop="validDate">
diff --git a/src/views/mes/gys/record/index.vue b/src/views/mes/gys/record/index.vue
index bd8341a..7a46e9d 100644
--- a/src/views/mes/gys/record/index.vue
+++ b/src/views/mes/gys/record/index.vue
@@ -118,8 +118,8 @@
           <span>{{ parseTime(scope.row.cooperationTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="	合作内容" align="center" prop="content" />
-      <el-table-column label="	合作金额" align="center" prop="amount" />
+      <el-table-column label="合作内容" align="center" prop="content" />
+      <el-table-column label="合作金额" align="center" prop="amount" />
       <el-table-column label="备注" align="center" prop="remarks" />
       <el-table-column
         label="操作"
@@ -175,7 +175,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="	合作内容">
-          <editor v-model="form.content" :min-height="192" />
+          <el-input v-model="form.content" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="	合作金额" prop="amount">
           <el-input v-model="form.amount" placeholder="请输入	合作金额" />
diff --git a/src/views/mes/md/itemtype/index.vue b/src/views/mes/md/itemtype/index.vue
index b8a25f4..91fd3ea 100644
--- a/src/views/mes/md/itemtype/index.vue
+++ b/src/views/mes/md/itemtype/index.vue
@@ -81,12 +81,10 @@
             v-hasPermi="['mes:md:itemtype:add']"
           >新增</el-button>
           <el-button
-            v-if="scope.row.parentTypeId != 0"
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:md:itemtype:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue
index 2155083..1abed52 100644
--- a/src/views/mes/pro/feedback/index.vue
+++ b/src/views/mes/pro/feedback/index.vue
@@ -148,16 +148,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:pro:feedback:edit']"
-            v-if="scope.row.status =='PREPARE'"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:pro:feedback:remove']"
-            v-if="scope.row.status =='PREPARE'"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue
index 9b2f6d9..a8f2827 100644
--- a/src/views/mes/pro/schedule/index.vue
+++ b/src/views/mes/pro/schedule/index.vue
@@ -130,9 +130,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='CONFIRMED'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:pro:protask:edit']"
           >排产</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/pro/workorder/bom/bom.vue b/src/views/mes/pro/workorder/bom/bom.vue
index 8ee2bcc..adc8c2e 100644
--- a/src/views/mes/pro/workorder/bom/bom.vue
+++ b/src/views/mes/pro/workorder/bom/bom.vue
@@ -32,9 +32,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status == 'PREPARE'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:pro:workorder:edit']"
           >修改</el-button>
 
           <el-button
@@ -42,8 +40,6 @@
             type="text"
             icon="el-icon-edit"
             @click="handleAddSubWorkorder(scope.row)"
-            v-if="workorder.status == 'CONFIRMED' && scope.row.itemOrProduct=='PRODUCT' && workorder.workorderType =='SELF'"
-            v-hasPermi="['mes:pro:workorder:edit']"
           >生成工单</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index c6e7b84..35bc1cd 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -182,33 +182,25 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:pro:workorder:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
-            v-if="scope.row.status =='CONFIRMED' && scope.row.workorderType =='SELF'"
             @click="handleAdd(scope.row)"
-            v-hasPermi="['mes:pro:workorder:update']"
           >新增</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-circle-check"
-            v-if="scope.row.status =='CONFIRMED'"
             @click="handleFinish(scope.row)"
-            v-hasPermi="['mes:pro:workorder:update']"
           >完成</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:pro:workorder:remove']"
           >删除</el-button>
           <el-button
               size="mini"
diff --git a/src/views/mes/qc/ipqc/index.vue b/src/views/mes/qc/ipqc/index.vue
index d0a47d3..03b2ce7 100644
--- a/src/views/mes/qc/ipqc/index.vue
+++ b/src/views/mes/qc/ipqc/index.vue
@@ -151,16 +151,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.status =='PREPARE'"
-            v-hasPermi="['mes:qc:ipqc:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="scope.row.status =='PREPARE'"
-            v-hasPermi="['mes:qc:ipqc:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/qc/iqc/iqc.vue b/src/views/mes/qc/iqc/iqc.vue
index ac0198b..bf99c8a 100644
--- a/src/views/mes/qc/iqc/iqc.vue
+++ b/src/views/mes/qc/iqc/iqc.vue
@@ -181,17 +181,13 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:qc:iqc:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:qc:iqc:remove']"
           >删除</el-button>
           <el-button
             size="mini"
diff --git a/src/views/mes/qc/oqc/index.vue b/src/views/mes/qc/oqc/index.vue
index 5640bc1..05dc052 100644
--- a/src/views/mes/qc/oqc/index.vue
+++ b/src/views/mes/qc/oqc/index.vue
@@ -156,16 +156,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.status =='PREPARE'"
-            v-hasPermi="['mes:qc:oqc:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="scope.row.status =='PREPARE'"
-            v-hasPermi="['mes:qc:oqc:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/qc/pendinginspect/index.vue b/src/views/mes/qc/pendinginspect/index.vue
index 63cdab3..035494b 100644
--- a/src/views/mes/qc/pendinginspect/index.vue
+++ b/src/views/mes/qc/pendinginspect/index.vue
@@ -53,24 +53,18 @@
               type="text"
               icon="el-icon-edit"
               @click="handleAddIQC(scope.row)"
-              v-if="scope.row.qcType == 'IQC'"
-              v-hasPermi="['mes:qc:iqc:edit']"
             >来料检验</el-button>
             <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
-              v-if="scope.row.qcType == 'IPQC'"
               @click="handleAddPQC(scope.row)"
-              v-hasPermi="['mes:qc:ipqc:edit']"
             >过程检验</el-button>
             <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
-              v-if="scope.row.qcType == 'OQC'"
               @click="handleAddOQC(scope.row)"
-              v-hasPermi="['mes:qc:oqc:edit']"
             >出货检验</el-button>
           </template>
         </el-table-column>
diff --git a/src/views/mes/wm/arrivalnotice/index.vue b/src/views/mes/wm/arrivalnotice/index.vue
index d8f3afc..38ab406 100644
--- a/src/views/mes/wm/arrivalnotice/index.vue
+++ b/src/views/mes/wm/arrivalnotice/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="通知单编号" prop="noticeCode">
         <el-input
           v-model="queryParams.noticeCode"
@@ -34,21 +41,35 @@
         />
       </el-form-item>
       <el-form-item label="到货日期" prop="arrivalDate">
-        <el-date-picker clearable
+        <el-date-picker
+          clearable
           v-model="queryParams.arrivalDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择到货日期">
+          placeholder="请选择到货日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="单据状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择单据状态"
+          clearable
+        >
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -61,7 +82,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:wm:arrivalnotice:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -72,7 +94,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:wm:arrivalnotice:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -83,61 +106,91 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:wm:arrivalnotice:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="arrivalnoticeList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="arrivalnoticeList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="入库单编号" align="center" width="180px" prop="noticeCode" >
+      <el-table-column
+        label="入库单编号"
+        align="center"
+        width="180px"
+        prop="noticeCode"
+      >
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleView(scope.row)"
             v-hasPermi="['mes:wm:arrivalnotice:query']"
-          >{{scope.row.noticeCode}}</el-button>
+            >{{ scope.row.noticeCode }}</el-button
+          >
         </template>
       </el-table-column>
       <el-table-column label="通知单名称" align="center" prop="noticeName" />
       <el-table-column label="采购订单号" align="center" prop="poCode" />
-      <el-table-column label="供应商名称" width="200px" align="center" prop="vendorName" />
+      <el-table-column
+        label="供应商名称"
+        width="200px"
+        align="center"
+        prop="vendorName"
+      />
       <el-table-column label="联系人" align="center" prop="contact" />
       <el-table-column label="联系方式" align="center" prop="tel" />
-      <el-table-column label="到货日期" align="center" prop="arrivalDate" width="180">
+      <el-table-column
+        label="到货日期"
+        align="center"
+        prop="arrivalDate"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.arrivalDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.arrivalDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单据状态" align="center" prop="status" >
+      <el-table-column label="单据状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_rn_status" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.mes_rn_status"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        width="100"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status == 'PREPARE'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:wm:arrivalnotice:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status == 'PREPARE'"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:wm:arrivalnotice:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -150,34 +203,54 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="通知单编号" prop="noticeCode">
-              <el-input v-model="form.noticeCode" placeholder="请输入入库单编号" />
+              <el-input
+                v-model="form.noticeCode"
+                placeholder="请输入入库单编号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item  label-width="80">
-              <el-switch v-model="autoGenFlag"
-                  active-color="#13ce66"
-                  active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+                v-if="optType != 'view' && form.status == 'PREPARE'"
+              >
               </el-switch>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model="form.noticeName" placeholder="请输入通知单名称" />
+              <el-input
+                v-model="form.noticeName"
+                placeholder="请输入通知单名称"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="采购订单编号" prop="poCode">
-              <el-input v-model="form.poCode" placeholder="请输入采购订单编号" />
+              <el-input
+                v-model="form.poCode"
+                placeholder="请输入采购订单编号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="16">
             <el-form-item label="供应商" prop="vendorName">
-              <el-input v-model="form.vendorName" readonly="readonly" placeholder="请选择供应商" >
-                <el-button slot="append" @click="handleSelectVendor" icon="el-icon-search"></el-button>
+              <el-input
+                v-model="form.vendorName"
+                readonly="readonly"
+                placeholder="请选择供应商"
+              >
+                <el-button
+                  slot="append"
+                  @click="handleSelectVendor"
+                  icon="el-icon-search"
+                ></el-button>
               </el-input>
               <VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
             </el-form-item>
@@ -186,11 +259,13 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="到货日期" prop="arrivalDate">
-              <el-date-picker clearable
+              <el-date-picker
+                clearable
                 v-model="form.arrivalDate"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="请选择到货日期">
+                placeholder="请选择到货日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -208,18 +283,38 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <el-divider v-if="form.noticeId !=null" content-position="center">物料信息</el-divider>
-      <el-card shadow="always" v-if="form.noticeId !=null" class="box-card">
+      <el-divider v-if="form.noticeId != null" content-position="center"
+        >物料信息</el-divider
+      >
+      <el-card shadow="always" v-if="form.noticeId != null" class="box-card">
         <NoticeLine :noticeId="form.noticeId" :optType="optType"></NoticeLine>
       </el-card>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
-        <el-button type="success" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' && form.noticeId !== null ">提 交</el-button>
+        <el-button
+          type="primary"
+          @click="saveForm"
+          v-if="form.status == 'PREPARE' && optType != 'view'"
+          >保 存</el-button
+        >
+        <el-button
+          type="success"
+          @click="submitForm"
+          v-if="
+            form.status == 'PREPARE' &&
+            optType != 'view' &&
+            form.noticeId !== null
+          "
+          >提 交</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -227,17 +322,23 @@
 </template>
 
 <script>
-import { listArrivalnotice, getArrivalnotice, delArrivalnotice, addArrivalnotice, updateArrivalnotice } from "@/api/mes/wm/arrivalnotice";
-import {genCode} from "@/api/system/autocode/rule"
+import {
+  listArrivalnotice,
+  getArrivalnotice,
+  delArrivalnotice,
+  addArrivalnotice,
+  updateArrivalnotice,
+} from "@/api/mes/wm/arrivalnotice";
+import { genCode } from "@/api/system/autocode/rule";
 import VendorSelect from "@/components/vendorSelect/single.vue";
-import NoticeLine from "./line.vue"
+import NoticeLine from "./line.vue";
 export default {
   name: "Arrivalnotice",
-  dicts:['mes_rn_status'],
-  components :{VendorSelect,NoticeLine},
+  dicts: ["mes_rn_status"],
+  components: { VendorSelect, NoticeLine },
   data() {
     return {
-      autoGenFlag:false,
+      autoGenFlag: false,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -261,38 +362,39 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        noticeCode: null,        noticeName: null,        poCode: null,        vendorId: null,        vendorCode: null,        vendorName: null,        vendorNick: null,        arrivalDate: null,        status: null,      },
+        noticeCode: null,
+        noticeName: null,
+        poCode: null,
+        vendorId: null,
+        vendorCode: null,
+        vendorName: null,
+        vendorNick: null,
+        arrivalDate: null,
+        status: null,
+      },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         noticeCode: [
           { required: true, message: "入库单编号不能为空", trigger: "blur" },
-          { max: 64, message: "字段过长", trigger: "blur" }
+          { max: 64, message: "字段过长", trigger: "blur" },
         ],
         noticeName: [
           { required: true, message: "入库单名称不能为空", trigger: "blur" },
-          { max: 100, message: "字段过长", trigger: "blur" }
-        ],
-        poCode: [
-          { max: 64, message: "字段过长", trigger: "blur" }
+          { max: 100, message: "字段过长", trigger: "blur" },
         ],
+        poCode: [{ max: 64, message: "字段过长", trigger: "blur" }],
         vendorName: [
-          { required: true, message: "请选择供应商", trigger: "blur" }
+          { required: true, message: "请选择供应商", trigger: "blur" },
         ],
         arrivalDate: [
-          { required: true, message: "请选择到货日期", trigger: "blur" }
+          { required: true, message: "请选择到货日期", trigger: "blur" },
         ],
-        contact: [
-          { max: 32, message: "字段过长", trigger: "blur" }
-        ],
-        tel: [
-          { max: 60, message: "字段过长", trigger: "blur" }
-        ],
-        remark: [
-          { max: 250, message: "字段过长", trigger: "blur" }
-        ]
-      }
+        contact: [{ max: 32, message: "字段过长", trigger: "blur" }],
+        tel: [{ max: 60, message: "字段过长", trigger: "blur" }],
+        remark: [{ max: 250, message: "字段过长", trigger: "blur" }],
+      },
     };
   },
   created() {
@@ -302,7 +404,7 @@ export default {
     /** 查询到货通知单列表 */
     getList() {
       this.loading = true;
-      listArrivalnotice(this.queryParams).then(response => {
+      listArrivalnotice(this.queryParams).then((response) => {
         this.arrivalnoticeList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -316,7 +418,26 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        noticeId: null,        noticeCode: null,        noticeName: null,        poCode: null,        vendorId: null,        vendorCode: null,        vendorName: null,        vendorNick: null,        arrivalDate: null,        status: "PREPARE",        remark: null,        attr1: null,        attr2: null,        attr3: null,        attr4: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
+        noticeId: null,
+        noticeCode: null,
+        noticeName: null,
+        poCode: null,
+        vendorId: null,
+        vendorCode: null,
+        vendorName: null,
+        vendorNick: null,
+        arrivalDate: null,
+        status: "PREPARE",
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+      };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -331,9 +452,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.noticeId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.noticeId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -345,18 +466,18 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const noticeId = row.noticeId || this.ids
-      getArrivalnotice(noticeId).then(response => {
+      const noticeId = row.noticeId || this.ids;
+      getArrivalnotice(noticeId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改到货通知单";
         this.optType = "edit";
       });
     },
-    handleView(row){
+    handleView(row) {
       this.reset();
-      const noticeId = row.noticeId || this.ids
-      getArrivalnotice(noticeId).then(response => {
+      const noticeId = row.noticeId || this.ids;
+      getArrivalnotice(noticeId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "查看到货通知单";
@@ -366,17 +487,17 @@ export default {
     /**
      * 保存
      */
-    saveForm(){
-      this.$refs["form"].validate(valid => {
+    saveForm() {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.noticeId != null) {
-            updateArrivalnotice(this.form).then(response => {
+            updateArrivalnotice(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addArrivalnotice(this.form).then(response => {
+            addArrivalnotice(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -387,11 +508,11 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
-          this.form.status = 'APPROVING';
+          this.form.status = "APPROVING";
           if (this.form.noticeId != null) {
-            updateArrivalnotice(this.form).then(response => {
+            updateArrivalnotice(this.form).then((response) => {
               this.$modal.msgSuccess("提交成功");
               this.open = false;
               this.getList();
@@ -403,43 +524,51 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const noticeIds = row.noticeId || this.ids;
-      this.$modal.confirm('是否确认删除到货通知单编号为"' + noticeIds + '"的数据项？').then(function() {
-        return delArrivalnotice(noticeIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除到货通知单编号为"' + noticeIds + '"的数据项？')
+        .then(function () {
+          return delArrivalnotice(noticeIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('wm/arrivalnotice/export', {
-        ...this.queryParams
-      }, `arrivalnotice_${new Date().getTime()}.xlsx`)
+      this.download(
+        "wm/arrivalnotice/export",
+        {
+          ...this.queryParams,
+        },
+        `arrivalnotice_${new Date().getTime()}.xlsx`
+      );
     },
     //供应商选择
-    handleSelectVendor(){
+    handleSelectVendor() {
       this.resetForm("form");
-      this.$refs.vendorSelect.handleOpen(this.form.vendorId)
+      this.$refs.vendorSelect.handleOpen(this.form.vendorId);
     },
     //供应商选择弹出框
-    onVendorSelected(obj){
-        if(obj != undefined && obj != null){
-          this.form.vendorId = obj.vendorId;
-          this.form.vendorCode = obj.vendorCode;
-          this.form.vendorName = obj.vendorName;
-          this.form.vendorNick = obj.vendorNick;
-        }
+    onVendorSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.vendorId = obj.vendorId;
+        this.form.vendorCode = obj.vendorCode;
+        this.form.vendorName = obj.vendorName;
+        this.form.vendorNick = obj.vendorNick;
+      }
     },
     //自动生成编码
-    handleAutoGenChange(autoGenFlag){
-      if(autoGenFlag){
-        genCode('ARRIVALNOTICE_CODE').then(response =>{
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        genCode("ARRIVALNOTICE_CODE").then((response) => {
           this.form.noticeCode = response;
         });
-      }else{
+      } else {
         this.form.noticeCode = null;
       }
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/views/mes/wm/issue/index.vue b/src/views/mes/wm/issue/index.vue
index 3b79c50..2dae091 100644
--- a/src/views/mes/wm/issue/index.vue
+++ b/src/views/mes/wm/issue/index.vue
@@ -127,23 +127,18 @@
             size="mini"
             type="text"
             icon="el-icon-video-play"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleExecute(scope.row)"
-            v-hasPermi="['mes:wm:issueheader:edit']"
           >执行领出</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:wm:issueheader:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:wm:issueheader:remove']"
           >删除</el-button>
diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue
index 8621bf4..2e6b7ab 100644
--- a/src/views/mes/wm/itemrecpt/index.vue
+++ b/src/views/mes/wm/itemrecpt/index.vue
@@ -123,25 +123,19 @@
             size="mini"
             type="text"
             icon="el-icon-video-play"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleExecute(scope.row)"
-            v-hasPermi="['mes:wm:itemrecpt:edit']"
           >执行入库</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:wm:itemrecpt:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:wm:itemrecpt:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/outsourceissue/index.vue b/src/views/mes/wm/outsourceissue/index.vue
index 98d2d11..f46bfbe 100644
--- a/src/views/mes/wm/outsourceissue/index.vue
+++ b/src/views/mes/wm/outsourceissue/index.vue
@@ -105,25 +105,19 @@
             size="mini"
             type="text"
             icon="el-icon-video-play"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleExecute(scope.row)"
-            v-hasPermi="['mes:wm:outsourceissue:edit']"
           >执行发料</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.status =='PREPARE'"
-            v-hasPermi="['mes:wm:outsourceissue:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="scope.row.status =='PREPARE'"
-            v-hasPermi="['mes:wm:outsourceissue:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/outsourcerecpt/index.vue b/src/views/mes/wm/outsourcerecpt/index.vue
index 326a572..49b727e 100644
--- a/src/views/mes/wm/outsourcerecpt/index.vue
+++ b/src/views/mes/wm/outsourcerecpt/index.vue
@@ -109,25 +109,19 @@
             size="mini"
             type="text"
             icon="el-icon-video-play"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleExecute(scope.row)"
-            v-hasPermi="['mes:wm:outsourcerecpt:edit']"
           >执行入库</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:wm:outsourcerecpt:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:wm:outsourcerecpt:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/package/index.vue b/src/views/mes/wm/package/index.vue
index 1bf2c21..52742ff 100644
--- a/src/views/mes/wm/package/index.vue
+++ b/src/views/mes/wm/package/index.vue
@@ -106,16 +106,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:wm:package:edit']"
-            v-if="scope.row.status =='PREPARE'"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:wm:package:remove']"
-            v-if="scope.row.status =='PREPARE'"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue
index b4bc749..3e44fc2 100644
--- a/src/views/mes/wm/productrecpt/index.vue
+++ b/src/views/mes/wm/productrecpt/index.vue
@@ -116,25 +116,19 @@
             size="mini"
             type="text"
             icon="el-icon-video-play"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleExecute(scope.row)"
-            v-hasPermi="['mes:wm:productrecpt:edit']"
           >执行入库</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.status =='PREPARE'"
-            v-hasPermi="['mes:wm:productrecpt:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="scope.row.status =='PREPARE'"
-            v-hasPermi="['mes:wm:productrecpt:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/productsalse/index.vue b/src/views/mes/wm/productsalse/index.vue
index 9fd6d5e..f700dd8 100644
--- a/src/views/mes/wm/productsalse/index.vue
+++ b/src/views/mes/wm/productsalse/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="出库单编号" prop="salseCode">
         <el-input
           v-model="queryParams.salseCode"
@@ -26,15 +33,21 @@
         />
       </el-form-item>
       <el-form-item label="出库日期" prop="salseDate">
-        <el-date-picker clearable
+        <el-date-picker
+          clearable
           v-model="queryParams.salseDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择出库日期">
+          placeholder="请选择出库日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="单据状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择单据状态"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.mes_order_status"
             :key="dict.value"
@@ -44,8 +57,16 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -58,7 +79,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:wm:productsalse:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -69,7 +91,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:wm:productsalse:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -80,69 +103,102 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:wm:productsalse:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="productsalseList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="productsalseList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="出库单编号" width="150px" align="center" prop="salseCode" >
+      <el-table-column
+        label="出库单编号"
+        width="150px"
+        align="center"
+        prop="salseCode"
+      >
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleView(scope.row)"
             v-hasPermi="['mes:wm:productsalse:query']"
-          >{{scope.row.salseCode}}</el-button>
+            >{{ scope.row.salseCode }}</el-button
+          >
         </template>
       </el-table-column>
-      <el-table-column label="出库单名称" width="150px" align="center" prop="salseName" />
-      <el-table-column label="销售订单编号" width="120px" align="center" prop="soCode" />
+      <el-table-column
+        label="出库单名称"
+        width="150px"
+        align="center"
+        prop="salseName"
+      />
+      <el-table-column
+        label="销售订单编号"
+        width="120px"
+        align="center"
+        prop="soCode"
+      />
       <el-table-column label="客户编码" align="center" prop="clientCode" />
       <el-table-column label="客户名称" align="center" prop="clientName" />
-      <el-table-column label="出库日期" align="center" prop="salseDate" width="180">
+      <el-table-column
+        label="出库日期"
+        align="center"
+        prop="salseDate"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.salseDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.salseDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="单据状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.mes_order_status"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="120px" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        width="120px"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.status == 'PREPARE'"
-            v-hasPermi="['mes:wm:productsalse:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="scope.row.status == 'PREPARE'"
-            v-hasPermi="['mes:wm:productsalse:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-video-play"
             @click="handleExecute(scope.row)"
-            v-if="scope.row.status == 'PREPARE'"
-            v-hasPermi="['mes:wm:productsalse:edit']"
-          >执行出库</el-button>
-
+            >执行出库</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -155,59 +211,81 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="出库单编号" prop="salseCode">
-              <el-input v-model="form.salseCode" placeholder="请输入出库单编号" />
+              <el-input
+                v-model="form.salseCode"
+                placeholder="请输入出库单编号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item  label-width="80">
-              <el-switch v-model="autoGenFlag"
-                  active-color="#13ce66"
-                  active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+                v-if="optType != 'view' && form.status == 'PREPARE'"
+              >
               </el-switch>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="出库单名称" prop="salseName">
-              <el-input v-model="form.salseName" placeholder="请输入出库单名称" />
+              <el-input
+                v-model="form.salseName"
+                placeholder="请输入出库单名称"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="销售订单编号" prop="soCode">
-              <el-input v-model="form.soCode" placeholder="请输入销售订单编号" />
+              <el-input
+                v-model="form.soCode"
+                placeholder="请输入销售订单编号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="客户编码" prop="clientCode">
-              <el-input v-model="form.clientCode" placeholder="请输入客户编码" >
-                <el-button slot="append" @click="handleSelectClient" icon="el-icon-search"></el-button>
+              <el-input v-model="form.clientCode" placeholder="请输入客户编码">
+                <el-button
+                  slot="append"
+                  @click="handleSelectClient"
+                  icon="el-icon-search"
+                ></el-button>
               </el-input>
-              <ClientSelect ref="clientSelect" @onSelected="onClientSelected" > </ClientSelect>
+              <ClientSelect ref="clientSelect" @onSelected="onClientSelected">
+              </ClientSelect>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="客户名称" prop="clientName">
-              <el-input v-model="form.clientName" readonly="readonly"/>
+              <el-input v-model="form.clientName" readonly="readonly" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-
           <el-col :span="8">
             <el-form-item label="出库日期" prop="salseDate">
-              <el-date-picker clearable
+              <el-date-picker
+                clearable
                 v-model="form.salseDate"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="请选择出库日期">
+                placeholder="请选择出库日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="单据状态" prop="status">
-              <el-select v-model="form.status" disabled placeholder="请选择单据状态">
+              <el-select
+                v-model="form.status"
+                disabled
+                placeholder="请选择单据状态"
+              >
                 <el-option
                   v-for="dict in dict.type.mes_order_status"
                   :key="dict.value"
@@ -221,17 +299,35 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <el-divider v-if="form.salseId !=null" content-position="center">物料信息</el-divider>
-        <el-card shadow="always" v-if="form.salseId !=null" class="box-card">
-          <Productsalseline ref="line" :salseId="form.salseId" :warehouseId="form.warehouseId" :locationId="form.locationId" :areaId="form.areaId" :optType="optType"></Productsalseline>
-        </el-card>
+      <el-divider v-if="form.salseId != null" content-position="center"
+        >物料信息</el-divider
+      >
+      <el-card shadow="always" v-if="form.salseId != null" class="box-card">
+        <Productsalseline
+          ref="line"
+          :salseId="form.salseId"
+          :warehouseId="form.warehouseId"
+          :locationId="form.locationId"
+          :areaId="form.areaId"
+          :optType="optType"
+        ></Productsalseline>
+      </el-card>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
+        <el-button
+          type="primary"
+          @click="submitForm"
+          v-if="form.status == 'PREPARE' && optType != 'view'"
+          >保 存</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -239,27 +335,34 @@
 </template>
 
 <script>
-import { listProductsalse, getProductsalse, delProductsalse, addProductsalse, updateProductsalse,execute } from "@/api/mes/wm/productsalse";
-import Productsalseline from "./line.vue"
-import OqcSelectSingle from "@/components/oqcSelect/single.vue"
+import {
+  listProductsalse,
+  getProductsalse,
+  delProductsalse,
+  addProductsalse,
+  updateProductsalse,
+  execute,
+} from "@/api/mes/wm/productsalse";
+import Productsalseline from "./line.vue";
+import OqcSelectSingle from "@/components/oqcSelect/single.vue";
 import ClientSelect from "@/components/clientSelect/single.vue";
-import {getTreeList} from "@/api/mes/wm/warehouse"
-import {genCode} from "@/api/system/autocode/rule"
+import { getTreeList } from "@/api/mes/wm/warehouse";
+import { genCode } from "@/api/system/autocode/rule";
 export default {
   name: "Productsalse",
-  dicts: ['mes_order_status'],
-  components: {OqcSelectSingle,Productsalseline,ClientSelect},
+  dicts: ["mes_order_status"],
+  components: { OqcSelectSingle, Productsalseline, ClientSelect },
   data() {
     return {
       //自动生成编码
-      autoGenFlag:false,
+      autoGenFlag: false,
       optType: undefined,
-      warehouseInfo:[],
-      warehouseOptions:[],
-      warehouseProps:{
+      warehouseInfo: [],
+      warehouseOptions: [],
+      warehouseProps: {
         multiple: false,
-        value: 'pId',
-        label: 'pName',
+        value: "pId",
+        label: "pName",
       },
       // 遮罩层
       loading: true,
@@ -310,22 +413,22 @@ export default {
       rules: {
         salseCode: [
           { required: true, message: "出库单编号不能为空", trigger: "blur" },
-          { max: 64, message: "字段过长", trigger: "blur" }
+          { max: 64, message: "字段过长", trigger: "blur" },
         ],
         salseName: [
           { required: true, message: "出库单名称不能为空", trigger: "blur" },
-          { max: 100, message: "字段过长", trigger: "blur" }
+          { max: 100, message: "字段过长", trigger: "blur" },
         ],
         clientCode: [
-          { required: true, message: "请指定客户", trigger: "blur" }
+          { required: true, message: "请指定客户", trigger: "blur" },
         ],
         salseDate: [
-          { required: true, message: "请选择出库日期", trigger: "blur" }
+          { required: true, message: "请选择出库日期", trigger: "blur" },
         ],
         remark: [
-          { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
-        ]
-      }
+          { max: 250, message: "长度必须小于250个字符", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -336,33 +439,40 @@ export default {
     /** 查询销售出库单列表 */
     getList() {
       this.loading = true;
-      listProductsalse(this.queryParams).then(response => {
+      listProductsalse(this.queryParams).then((response) => {
         this.productsalseList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
     //获取仓库信息
-    getWarehouseList(){
-      getTreeList().then( response =>{
+    getWarehouseList() {
+      getTreeList().then((response) => {
         this.warehouseOptions = response.data;
-        this.warehouseOptions.map(w =>{
-          w.children.map(l =>{
-                  let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
-                  l.children = JSON.parse(lstr);
+        this.warehouseOptions.map((w) => {
+          w.children.map((l) => {
+            let lstr = JSON.stringify(l.children)
+              .replace(/locationId/g, "lId")
+              .replace(/areaId/g, "pId")
+              .replace(/areaName/g, "pName");
+            l.children = JSON.parse(lstr);
           });
 
-          let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
-          w.children =  JSON.parse(wstr);
-
+          let wstr = JSON.stringify(w.children)
+            .replace(/warehouseId/g, "wId")
+            .replace(/locationId/g, "pId")
+            .replace(/locationName/g, "pName");
+          w.children = JSON.parse(wstr);
         });
-        let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
+        let ostr = JSON.stringify(this.warehouseOptions)
+          .replace(/warehouseId/g, "pId")
+          .replace(/warehouseName/g, "pName");
         this.warehouseOptions = JSON.parse(ostr);
       });
     },
     //选择默认的仓库、库区、库位
-    handleWarehouseChanged(obj){
-      if(obj !=null){
+    handleWarehouseChanged(obj) {
+      if (obj != null) {
         this.form.warehouseId = obj[0];
         this.form.locationId = obj[1];
         this.form.areaId = obj[2];
@@ -405,7 +515,7 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
       };
       this.autoGenFlag = false;
       this.resetForm("form");
@@ -422,15 +532,15 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.salseId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.salseId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     // 查询明细按钮操作
-    handleView(row){
+    handleView(row) {
       this.reset();
-      const salseId = row.salseId
-      getProductsalse(salseId).then(response => {
+      const salseId = row.salseId;
+      getProductsalse(salseId).then((response) => {
         this.form = response.data;
         this.warehouseInfo[0] = response.data.warehouseId;
         this.warehouseInfo[1] = response.data.locationId;
@@ -450,8 +560,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const salseId = row.salseId || this.ids
-      getProductsalse(salseId).then(response => {
+      const salseId = row.salseId || this.ids;
+      getProductsalse(salseId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改销售出库单";
@@ -460,16 +570,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.salseId != null) {
-            updateProductsalse(this.form).then(response => {
+            updateProductsalse(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addProductsalse(this.form).then(response => {
+            addProductsalse(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -481,66 +591,78 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const salseIds = row.salseId || this.ids;
-      this.$modal.confirm('是否确认删除销售出库单编号为"' + salseIds + '"的数据项？').then(function() {
-        return delProductsalse(salseIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除销售出库单编号为"' + salseIds + '"的数据项？')
+        .then(function () {
+          return delProductsalse(salseIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('wm/productsalse/export', {
-        ...this.queryParams
-      }, `productsalse_${new Date().getTime()}.xlsx`)
+      this.download(
+        "wm/productsalse/export",
+        {
+          ...this.queryParams,
+        },
+        `productsalse_${new Date().getTime()}.xlsx`
+      );
     },
     //执行出库
-    handleExecute(row){
+    handleExecute(row) {
       const salseIds = row.salseId || this.ids;
-      this.$modal.confirm('确认执行出库？').then(function() {
-        return execute(salseIds)//执行入库
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("出库成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm("确认执行出库？")
+        .then(function () {
+          return execute(salseIds); //执行入库
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("出库成功");
+        })
+        .catch(() => {});
     },
     //OQC检验单选择
-    handleSelectOqc(){
+    handleSelectOqc() {
       this.$refs.oqcSelect.showFlag = true;
     },
     //OQC检验单选择弹出框
-    onOqcSelected(obj){
-        if(obj != undefined && obj != null){
-          this.form.oqcId = obj.oqcId;
-          this.form.oqcCode = obj.oqcCode;
-          this.form.clientId = obj.clientId;
-          this.form.clientCode = obj.clientCode;
-          this.form.clientName = obj.clientName;
-          this.form.clientNick = obj.clientNick;
-        }
+    onOqcSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.oqcId = obj.oqcId;
+        this.form.oqcCode = obj.oqcCode;
+        this.form.clientId = obj.clientId;
+        this.form.clientCode = obj.clientCode;
+        this.form.clientName = obj.clientName;
+        this.form.clientNick = obj.clientNick;
+      }
     },
-    handleSelectClient(){
-      this.$refs["form"].clearValidate()
-      this.$refs.clientSelect.handleOpen(this.form.clientId)
+    handleSelectClient() {
+      this.$refs["form"].clearValidate();
+      this.$refs.clientSelect.handleOpen(this.form.clientId);
     },
     //客户选择弹出框
-    onClientSelected(obj){
-        if(obj != undefined && obj != null){
-          this.form.clientId = obj.clientId;
-          this.form.clientCode = obj.clientCode;
-          this.form.clientName = obj.clientName;
-        }
+    onClientSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.clientId = obj.clientId;
+        this.form.clientCode = obj.clientCode;
+        this.form.clientName = obj.clientName;
+      }
     },
     //自动生成编码
-    handleAutoGenChange(autoGenFlag){
-      if(autoGenFlag){
-        genCode('PRODUCTSALSE_CODE').then(response =>{
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        genCode("PRODUCTSALSE_CODE").then((response) => {
           this.form.salseCode = response;
         });
-      }else{
+      } else {
         this.form.salseCode = null;
       }
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/views/mes/wm/rtissue/index.vue b/src/views/mes/wm/rtissue/index.vue
index f59a339..c36f6bc 100644
--- a/src/views/mes/wm/rtissue/index.vue
+++ b/src/views/mes/wm/rtissue/index.vue
@@ -99,25 +99,19 @@
             size="mini"
             type="text"
             icon="el-icon-video-play"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleExecute(scope.row)"
-            v-hasPermi="['mes:wm:rtissue:edit']"
           >执行退料</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:wm:rtissue:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:wm:rtissue:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/rtsalse/index.vue b/src/views/mes/wm/rtsalse/index.vue
index 64f3e00..489f313 100644
--- a/src/views/mes/wm/rtsalse/index.vue
+++ b/src/views/mes/wm/rtsalse/index.vue
@@ -124,24 +124,18 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.status == 'PREPARE'"
-            v-hasPermi="['mes:wm:rtsalse:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="scope.row.status == 'PREPARE'"
-            v-hasPermi="['mes:wm:rtsalse:remove']"
           >删除</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-video-play"
             @click="handleExecute(scope.row)"
-            v-if="scope.row.status == 'PREPARE'"
-            v-hasPermi="['mes:wm:rtsalse:edit']"
           >执行退货</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/rtvendor/index.vue b/src/views/mes/wm/rtvendor/index.vue
index 9ec67b6..ad4918b 100644
--- a/src/views/mes/wm/rtvendor/index.vue
+++ b/src/views/mes/wm/rtvendor/index.vue
@@ -116,25 +116,19 @@
             size="mini"
             type="text"
             icon="el-icon-video-play"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleExecute(scope.row)"
-            v-hasPermi="['mes:wm:rtvendor:edit']"
           >执行退货</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:wm:rtvendor:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.status =='PREPARE'"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:wm:rtvendor:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/transfer/index.vue b/src/views/mes/wm/transfer/index.vue
index 754b714..2d1f1ee 100644
--- a/src/views/mes/wm/transfer/index.vue
+++ b/src/views/mes/wm/transfer/index.vue
@@ -145,16 +145,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.status == 'PREPARE'"
-            v-hasPermi="['mes:wm:transfer:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="scope.row.status == 'PREPARE'"
-            v-hasPermi="['mes:wm:transfer:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 704a780..7b8d693 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -83,15 +83,12 @@
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
           >新增</el-button>
           <el-button
-            v-if="scope.row.parentId != 0"
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
           >删除</el-button>
         </template>
       </el-table-column>