zhouhao 2 éve
szülő
commit
7a8f07f08e
2 módosított fájl, 36 hozzáadás és 36 törlés
  1. 18 18
      src/views/supply/apply/apply_list.vue
  2. 18 18
      src/views/supply/apply/engin_list.vue

+ 18 - 18
src/views/supply/apply/apply_list.vue

@@ -381,10 +381,10 @@
               <template slot-scope="scope">
                 <el-popconfirm
                   v-if="
-                    $checkBtnRole('apply', $route.meta.roles) && !isCustomer  &&
-                    ((!scope.row.automaticStatus &&
+                    $checkBtnRole('apply', $route.meta.roles) &&
+                    (( isCustomer  && !scope.row.automaticStatus &&
                     scope.row.examineStatus === 'SAVE') || (
-                      scope.row.automaticStatus &&
+                    !isCustomer  &&  scope.row.automaticStatus &&
                      scope.row.examineStatus === 'SAVE' &&
                      scope.row.type===2
                     ) )
@@ -397,9 +397,9 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                    $checkBtnRole('apply', $route.meta.roles) && !isCustomer  &&
-                    ((!scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT')||(scope.row.automaticStatus &&
+                    $checkBtnRole('apply', $route.meta.roles) &&
+                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT')||( !isCustomer  && scope.row.automaticStatus &&
                     scope.row.examineStatus === 'WAIT'&& scope.row.type==2))
                   "
                   style="margin-right: 10px"
@@ -410,9 +410,9 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                    $checkBtnRole('examine', $route.meta.roles) && !isCustomer &&
-                    ((!scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'OK')||(scope.row.automaticStatus &&
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK')||( !isCustomer && scope.row.automaticStatus &&
                     scope.row.examineStatus === 'OK' && scope.row.type==2))
                   "
                   style="margin-right: 10px"
@@ -435,11 +435,11 @@
                 </el-button>
                 <el-button
                   v-if="
-                    $checkBtnRole('edit', $route.meta.roles) && !isCustomer  &&
-                      ((!scope.row.automaticStatus &&
+                    $checkBtnRole('edit', $route.meta.roles) &&
+                      ((isCustomer  && !scope.row.automaticStatus &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                       scope.row.type === 2) ||
-                      ( scope.row.automaticStatus &&
+                      ( !isCustomer && scope.row.automaticStatus &&
                      (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                      scope.row.type===2)
                       )
@@ -451,9 +451,9 @@
                 </el-button>
                 <el-button
                   v-if="
-                    $checkBtnRole('examine', $route.meta.roles) && !isCustomer  &&
-                    ((!scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT')|| ( scope.row.automaticStatus &&
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT')|| (!isCustomer && scope.row.automaticStatus &&
                     scope.row.examineStatus === 'WAIT' && scope.row.type==2))
                   "
                   type="text"
@@ -464,9 +464,9 @@
                 <el-button type="text" @click="toDetail(scope.row)"> 详情</el-button>
                 <el-popconfirm
                   v-if="
-                    $checkBtnRole('del', $route.meta.roles) && !isCustomer  &&
-                    ((!scope.row.automaticStatus &&
-                    scope.row.examineStatus !== 'OK') || (scope.row.automaticStatus && scope.row.examineStatus !== 'OK' && scope.row.type==2 ) )
+                    $checkBtnRole('del', $route.meta.roles) &&
+                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus !== 'OK') || ( !isCustomer &&scope.row.automaticStatus && scope.row.examineStatus !== 'OK' && scope.row.type==2 ) )
                   "
                   style="margin-left: 10px"
                   title="确定删除吗?"

+ 18 - 18
src/views/supply/apply/engin_list.vue

@@ -410,10 +410,10 @@
               <template slot-scope="scope">
                 <el-popconfirm
                   v-if="
-                    $checkBtnRole('apply', $route.meta.roles) && !isCustomer  &&
-                    ((!scope.row.automaticStatus &&
+                    $checkBtnRole('apply', $route.meta.roles) &&
+                    ((isCustomer  &&!scope.row.automaticStatus &&
                     scope.row.examineStatus === 'SAVE') || (
-                      scope.row.automaticStatus &&
+                     !isCustomer  && scope.row.automaticStatus &&
                      scope.row.examineStatus === 'SAVE' &&
                      scope.row.type===2
                     ) )
@@ -426,9 +426,9 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                  $checkBtnRole('apply', $route.meta.roles) && !isCustomer  &&
-                    ((!scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT')||(scope.row.automaticStatus &&
+                  $checkBtnRole('apply', $route.meta.roles) &&
+                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT')||(!isCustomer  && scope.row.automaticStatus &&
                     scope.row.examineStatus === 'WAIT'&& scope.row.type==2))
                   "
                   style="margin-right: 10px"
@@ -439,9 +439,9 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                    $checkBtnRole('examine', $route.meta.roles) && !isCustomer &&
-                    ((!scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'OK')||(scope.row.automaticStatus &&
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK')||( !isCustomer  && scope.row.automaticStatus &&
                     scope.row.examineStatus === 'OK' && scope.row.type==2))
                   "
                   style="margin-right: 10px"
@@ -464,11 +464,11 @@
                 </el-button>
                 <el-button
                   v-if="
-                  $checkBtnRole('edit', $route.meta.roles) && !isCustomer  &&
-                    ((!scope.row.automaticStatus &&
+                  $checkBtnRole('edit', $route.meta.roles) &&
+                    ((isCustomer  && !scope.row.automaticStatus &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                       scope.row.type === 2 ) ||
-                       (scope.row.automaticStatus &&
+                       (!isCustomer  &&scope.row.automaticStatus &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                      scope.row.type===2))
                   "
@@ -479,9 +479,9 @@
                 </el-button>
                 <el-button
                   v-if="
-                    $checkBtnRole('examine', $route.meta.roles) && !isCustomer  &&
-                    ((!scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT')|| ( scope.row.automaticStatus &&
+                    $checkBtnRole('examine', $route.meta.roles) &&
+                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT')|| ( !isCustomer  &&scope.row.automaticStatus &&
                     scope.row.examineStatus === 'WAIT' && scope.row.type==2))
                   "
                   type="text"
@@ -492,9 +492,9 @@
                 <el-button type="text" @click="toDetail(scope.row)"> 详情</el-button>
                 <!--             !scope.row.automaticStatus &&  -->
                 <el-popconfirm
-                  v-if="  $checkBtnRole('del', $route.meta.roles) && !isCustomer  &&
-                    ((!scope.row.automaticStatus &&
-                    scope.row.examineStatus !== 'OK') || (scope.row.automaticStatus && scope.row.examineStatus !== 'OK' && scope.row.type==2 ) )"
+                  v-if="  $checkBtnRole('del', $route.meta.roles) && 
+                    ((isCustomer  &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus !== 'OK') || ( !isCustomer  && scope.row.automaticStatus && scope.row.examineStatus !== 'OK' && scope.row.type==2 ) )"
                   style="margin-left: 10px"
                   title="确定删除吗?"
                   @onConfirm="handleDelete(scope.row.id)"