Merge branch '11_3_week' into develop

src/views/supply/apply/apply_list.vue

@@ -399,9 +399,11 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
+                                    !isCustomer &&
                     $checkBtnRole('apply', $route.meta.roles) &&
                     (!scope.row.automaticStatus &&
                     scope.row.examineStatus === 'WAIT') ||
+                    !isCustomer &&
                      $checkBtnRole('apply', $route.meta.roles) &&
                     (scope.row.automaticStatus &&
                       scope.row.examineStatus === 'WAIT' &&
@@ -415,9 +417,11 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
+                  !isCustomer &&
                     $checkBtnRole('examine', $route.meta.roles) &&
                     (!scope.row.automaticStatus &&
                     scope.row.examineStatus === 'OK') ||
+                    !isCustomer &&
                      $checkBtnRole('apply', $route.meta.roles) &&
                     (scope.row.automaticStatus && !isCustomer &&
                       scope.row.examineStatus === 'OK' &&

src/views/supply/apply/engin_list.vue

@@ -427,9 +427,10 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                                      $checkBtnRole('apply', $route.meta.roles) &&
+                              !isCustomer &&        $checkBtnRole('apply', $route.meta.roles) &&
                     (!scope.row.automaticStatus &&
                     scope.row.examineStatus === 'WAIT') ||
+                    !isCustomer &&
                      $checkBtnRole('apply', $route.meta.roles) &&
                       (scope.row.automaticStatus &&
                       scope.row.examineStatus === 'OK' &&
@@ -443,9 +444,11 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
+                  !isCustomer &&
                     $checkBtnRole('examine', $route.meta.roles) &&
                     (!scope.row.automaticStatus &&
                     scope.row.examineStatus === 'OK') ||
+                    !isCustomer &&
                      $checkBtnRole('apply', $route.meta.roles) &&
                       (scope.row.automaticStatus && !isCustomer &&
                       scope.row.examineStatus === 'OK' &&